From 52f2c1386139d067b682d3c1c17a76abcf237e90 Mon Sep 17 00:00:00 2001
From: chenrl <raymond2366@outlook.com>
Date: Sun, 21 Mar 2021 16:46:15 +0800
Subject: [PATCH 001/735] check file with realPath is existing

---
 .../web/context/support/ServletContextResource.java    |  9 +++++++--
 .../web/context/support/ResourceTests.java             | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
index 9f19b76d9971..ad236509d88d 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
@@ -139,10 +139,15 @@ public boolean isFile() {
 				return true;
 			}
 			else {
-				return (this.servletContext.getRealPath(this.path) != null);
+				String realPath = this.servletContext.getRealPath(this.path);
+				if (realPath == null) {
+					return false;
+				}
+				File file = new File(realPath);
+				return (file.exists() && file.isFile());
 			}
 		}
-		catch (MalformedURLException ex) {
+		catch (IOException ex) {
 			return false;
 		}
 	}
diff --git a/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java b/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
index 340838871814..937885e107f7 100644
--- a/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
@@ -36,6 +36,8 @@ public void testServletContextResource() throws IOException {
 		MockServletContext sc = new MockServletContext();
 		Resource resource = new ServletContextResource(sc, "org/springframework/core/io/Resource.class");
 		doTestResource(resource);
+		Resource resourceNotExists = new ServletContextResource(sc, "org/springframework/core/io/ResourceNotExists.class");
+		doTestNotExistsResource(resourceNotExists);
 		assertThat(new ServletContextResource(sc, "org/springframework/core/../core/io/./Resource.class")).isEqualTo(resource);
 	}
 
@@ -48,6 +50,9 @@ public void testServletContextResourceWithRelativePath() throws IOException {
 	}
 
 	private void doTestResource(Resource resource) throws IOException {
+		assertThat(resource.getFile()).isNotNull();
+		assertThat(resource.exists()).isTrue();
+		assertThat(resource.isFile()).isTrue();
 		assertThat(resource.getFilename()).isEqualTo("Resource.class");
 		assertThat(resource.getURL().getFile().endsWith("Resource.class")).isTrue();
 
@@ -61,4 +66,9 @@ private void doTestResource(Resource resource) throws IOException {
 		assertThat(relative2.getURL().getFile().endsWith("ResourcePatternResolver.class")).isTrue();
 		assertThat(relative2.exists()).isTrue();
 	}
+
+	private void doTestNotExistsResource(Resource resource) throws IOException {
+		assertThat(resource.exists()).isFalse();
+		assertThat(resource.isFile()).isFalse();
+	}
 }

From 462e19d417dc1e3513211ef5d5a3ea4c351f1c14 Mon Sep 17 00:00:00 2001
From: Erik van Paassen <erik@evpwebdesign.nl>
Date: Sun, 22 Aug 2021 14:10:25 +0200
Subject: [PATCH 002/735] Fix UrlPathHelper#shouldRemoveSemicolonContent()
 (#27303)

The checkReadOnly() method should only be called from
methods that modify properties to prevent modification
of read-only instances.

Fixes #27256
---
 .../java/org/springframework/web/util/UrlPathHelper.java    | 1 -
 .../org/springframework/web/util/UrlPathHelperTests.java    | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 575f822f957f..663dbb7566c4 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -147,7 +147,6 @@ public void setRemoveSemicolonContent(boolean removeSemicolonContent) {
 	 * Whether configured to remove ";" (semicolon) content from the request URI.
 	 */
 	public boolean shouldRemoveSemicolonContent() {
-		checkReadOnly();
 		return this.removeSemicolonContent;
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 0aea5a0b51d9..1b2921205f51 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -22,6 +22,7 @@
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 
 /**
  * Unit tests for {@link UrlPathHelper}.
@@ -165,6 +166,11 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
 		assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/welcome.html;c=d");
 	}
 
+	@Test // gh-27303
+	public void shouldRemoveSemicolonContentWithReadOnlyInstance() {
+		assertThatCode(UrlPathHelper.defaultInstance::shouldRemoveSemicolonContent).doesNotThrowAnyException();
+	}
+
 
 	//
 	// suite of tests root requests for default servlets (SRV 11.2) on Websphere vs Tomcat and other containers

From 99970a5ddc063b6747970973c3bfdf803e21b1b3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 14:22:51 +0200
Subject: [PATCH 003/735] Polish contribution

See gh-27303
---
 .../web/util/UrlPathHelperTests.java          | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 1b2921205f51..3c1bbd282015 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * Unit tests for {@link UrlPathHelper}.
@@ -167,8 +167,24 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
 	}
 
 	@Test // gh-27303
-	public void shouldRemoveSemicolonContentWithReadOnlyInstance() {
-		assertThatCode(UrlPathHelper.defaultInstance::shouldRemoveSemicolonContent).doesNotThrowAnyException();
+	public void defaultInstanceReadOnlyBehavior() {
+		UrlPathHelper helper = UrlPathHelper.defaultInstance;
+
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setAlwaysUseFullPath(true))
+			.withMessage("This instance cannot be modified");
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setUrlDecode(true))
+			.withMessage("This instance cannot be modified");
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setRemoveSemicolonContent(true))
+			.withMessage("This instance cannot be modified");
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setDefaultEncoding("UTF-8"))
+			.withMessage("This instance cannot be modified");
+
+		assertThat(helper.isUrlDecode()).isTrue();
+		assertThat(helper.shouldRemoveSemicolonContent()).isTrue();
 	}
 
 

From 6c71cf2f96d8ccb46965753d5a47847b2adfdcdf Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 14:27:47 +0200
Subject: [PATCH 004/735] Polishing

---
 .../web/util/UrlPathHelperTests.java          | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 3c1bbd282015..094e33d419fd 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -31,7 +31,7 @@
  * @author Juergen Hoeller
  * @author Costin Leau
  */
-public class UrlPathHelperTests {
+class UrlPathHelperTests {
 
 	private static final String WEBSPHERE_URI_ATTRIBUTE = "com.ibm.websphere.servlet.uri_non_decoded";
 
@@ -41,7 +41,7 @@ public class UrlPathHelperTests {
 
 
 	@Test
-	public void getPathWithinApplication() {
+	void getPathWithinApplication() {
 		request.setContextPath("/petclinic");
 		request.setRequestURI("/petclinic/welcome.html");
 
@@ -49,7 +49,7 @@ public void getPathWithinApplication() {
 	}
 
 	@Test
-	public void getPathWithinApplicationForRootWithNoLeadingSlash() {
+	void getPathWithinApplicationForRootWithNoLeadingSlash() {
 		request.setContextPath("/petclinic");
 		request.setRequestURI("/petclinic");
 
@@ -57,7 +57,7 @@ public void getPathWithinApplicationForRootWithNoLeadingSlash() {
 	}
 
 	@Test
-	public void getPathWithinApplicationForSlashContextPath() {
+	void getPathWithinApplicationForSlashContextPath() {
 		request.setContextPath("/");
 		request.setRequestURI("/welcome.html");
 
@@ -65,7 +65,7 @@ public void getPathWithinApplicationForSlashContextPath() {
 	}
 
 	@Test
-	public void getPathWithinServlet() {
+	void getPathWithinServlet() {
 		request.setContextPath("/petclinic");
 		request.setServletPath("/main");
 		request.setRequestURI("/petclinic/main/welcome.html");
@@ -74,7 +74,7 @@ public void getPathWithinServlet() {
 	}
 
 	@Test
-	public void alwaysUseFullPath() {
+	void alwaysUseFullPath() {
 		helper.setAlwaysUseFullPath(true);
 		request.setContextPath("/petclinic");
 		request.setServletPath("/main");
@@ -84,7 +84,7 @@ public void alwaysUseFullPath() {
 	}
 
 	@Test // SPR-11101
-	public void getPathWithinServletWithoutUrlDecoding() {
+	void getPathWithinServletWithoutUrlDecoding() {
 		request.setContextPath("/SPR-11101");
 		request.setServletPath("/test_url_decoding/a/b");
 		request.setRequestURI("/test_url_decoding/a%2Fb");
@@ -96,7 +96,7 @@ public void getPathWithinServletWithoutUrlDecoding() {
 	}
 
 	@Test
-	public void getRequestUri() {
+	void getRequestUri() {
 		request.setRequestURI("/welcome.html");
 		assertThat(helper.getRequestUri(request)).isEqualTo("/welcome.html");
 
@@ -111,7 +111,7 @@ public void getRequestUri() {
 	}
 
 	@Test
-	public void getRequestRemoveSemicolonContent() {
+	void getRequestRemoveSemicolonContent() {
 		helper.setRemoveSemicolonContent(true);
 		request.setRequestURI("/foo;f=F;o=O;o=O/bar;b=B;a=A;r=R");
 		assertThat(helper.getRequestUri(request)).isEqualTo("/foo/bar");
@@ -126,7 +126,7 @@ public void getRequestRemoveSemicolonContent() {
 	}
 
 	@Test
-	public void getRequestKeepSemicolonContent() {
+	void getRequestKeepSemicolonContent() {
 		helper.setRemoveSemicolonContent(false);
 
 		testKeepSemicolonContent("/foo;a=b;c=d", "/foo;a=b;c=d");
@@ -145,7 +145,7 @@ private void testKeepSemicolonContent(String requestUri, String expectedPath) {
 	}
 
 	@Test
-	public void getLookupPathWithSemicolonContent() {
+	void getLookupPathWithSemicolonContent() {
 		helper.setRemoveSemicolonContent(false);
 
 		request.setContextPath("/petclinic");
@@ -156,7 +156,7 @@ public void getLookupPathWithSemicolonContent() {
 	}
 
 	@Test
-	public void getLookupPathWithSemicolonContentAndNullPathInfo() {
+	void getLookupPathWithSemicolonContentAndNullPathInfo() {
 		helper.setRemoveSemicolonContent(false);
 
 		request.setContextPath("/petclinic");
@@ -167,7 +167,7 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
 	}
 
 	@Test // gh-27303
-	public void defaultInstanceReadOnlyBehavior() {
+	void defaultInstanceReadOnlyBehavior() {
 		UrlPathHelper helper = UrlPathHelper.defaultInstance;
 
 		assertThatExceptionOfType(IllegalArgumentException.class)
@@ -199,7 +199,7 @@ public void defaultInstanceReadOnlyBehavior() {
 	//
 
 	@Test
-	public void tomcatDefaultServletRoot() {
+	void tomcatDefaultServletRoot() {
 		request.setContextPath("/test");
 		request.setServletPath("/");
 		request.setPathInfo(null);
@@ -208,7 +208,7 @@ public void tomcatDefaultServletRoot() {
 	}
 
 	@Test
-	public void tomcatDefaultServletFile() {
+	void tomcatDefaultServletFile() {
 		request.setContextPath("/test");
 		request.setServletPath("/foo");
 		request.setPathInfo(null);
@@ -218,7 +218,7 @@ public void tomcatDefaultServletFile() {
 	}
 
 	@Test
-	public void tomcatDefaultServletFolder() {
+	void tomcatDefaultServletFolder() {
 		request.setContextPath("/test");
 		request.setServletPath("/foo/");
 		request.setPathInfo(null);
@@ -228,7 +228,7 @@ public void tomcatDefaultServletFolder() {
 	}
 
 	@Test //SPR-12372, SPR-13455
-	public void removeDuplicateSlashesInPath() {
+	void removeDuplicateSlashesInPath() {
 		request.setContextPath("/SPR-12372");
 		request.setPathInfo(null);
 		request.setServletPath("/foo/bar/");
@@ -249,7 +249,7 @@ public void removeDuplicateSlashesInPath() {
 	}
 
 	@Test
-	public void wasDefaultServletRoot() {
+	void wasDefaultServletRoot() {
 		request.setContextPath("/test");
 		request.setPathInfo("/");
 		request.setServletPath("");
@@ -260,13 +260,13 @@ public void wasDefaultServletRoot() {
 	}
 
 	@Test
-	public void wasDefaultServletRootWithCompliantSetting() {
+	void wasDefaultServletRootWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/");
 		tomcatDefaultServletRoot();
 	}
 
 	@Test
-	public void wasDefaultServletFile() {
+	void wasDefaultServletFile() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo");
 		request.setServletPath("");
@@ -277,13 +277,13 @@ public void wasDefaultServletFile() {
 	}
 
 	@Test
-	public void wasDefaultServletFileWithCompliantSetting() {
+	void wasDefaultServletFileWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo");
 		tomcatDefaultServletFile();
 	}
 
 	@Test
-	public void wasDefaultServletFolder() {
+	void wasDefaultServletFolder() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo/");
 		request.setServletPath("");
@@ -294,7 +294,7 @@ public void wasDefaultServletFolder() {
 	}
 
 	@Test
-	public void wasDefaultServletFolderWithCompliantSetting() {
+	void wasDefaultServletFolderWithCompliantSetting() {
 		UrlPathHelper.websphereComplianceFlag = true;
 		try {
 			request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/");
@@ -311,7 +311,7 @@ public void wasDefaultServletFolderWithCompliantSetting() {
 	//
 
 	@Test
-	public void tomcatCasualServletRoot() {
+	void tomcatCasualServletRoot() {
 		request.setContextPath("/test");
 		request.setPathInfo("/");
 		request.setServletPath("/foo");
@@ -321,9 +321,9 @@ public void tomcatCasualServletRoot() {
 	}
 
 	@Disabled
-	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
 	@Test
-	public void tomcatCasualServletRootWithMissingSlash() {
+	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
+	void tomcatCasualServletRootWithMissingSlash() {
 		request.setContextPath("/test");
 		request.setPathInfo(null);
 		request.setServletPath("/foo");
@@ -333,7 +333,7 @@ public void tomcatCasualServletRootWithMissingSlash() {
 	}
 
 	@Test
-	public void tomcatCasualServletFile() {
+	void tomcatCasualServletFile() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo");
 		request.setServletPath("/foo");
@@ -343,7 +343,7 @@ public void tomcatCasualServletFile() {
 	}
 
 	@Test
-	public void tomcatCasualServletFolder() {
+	void tomcatCasualServletFolder() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo/");
 		request.setServletPath("/foo");
@@ -353,7 +353,7 @@ public void tomcatCasualServletFolder() {
 	}
 
 	@Test
-	public void wasCasualServletRoot() {
+	void wasCasualServletRoot() {
 		request.setContextPath("/test");
 		request.setPathInfo(null);
 		request.setServletPath("/foo/");
@@ -364,15 +364,15 @@ public void wasCasualServletRoot() {
 	}
 
 	@Test
-	public void wasCasualServletRootWithCompliantSetting() {
+	void wasCasualServletRootWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/");
 		tomcatCasualServletRoot();
 	}
 
 	@Disabled
-	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
 	@Test
-	public void wasCasualServletRootWithMissingSlash() {
+	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
+	void wasCasualServletRootWithMissingSlash() {
 		request.setContextPath("/test");
 		request.setPathInfo(null);
 		request.setServletPath("/foo");
@@ -384,13 +384,13 @@ public void wasCasualServletRootWithMissingSlash() {
 
 	@Disabled
 	@Test
-	public void wasCasualServletRootWithMissingSlashWithCompliantSetting() {
+	void wasCasualServletRootWithMissingSlashWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo");
 		tomcatCasualServletRootWithMissingSlash();
 	}
 
 	@Test
-	public void wasCasualServletFile() {
+	void wasCasualServletFile() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo");
 		request.setServletPath("/foo");
@@ -401,13 +401,13 @@ public void wasCasualServletFile() {
 	}
 
 	@Test
-	public void wasCasualServletFileWithCompliantSetting() {
+	void wasCasualServletFileWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/foo");
 		tomcatCasualServletFile();
 	}
 
 	@Test
-	public void wasCasualServletFolder() {
+	void wasCasualServletFolder() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo/");
 		request.setServletPath("/foo");
@@ -418,33 +418,33 @@ public void wasCasualServletFolder() {
 	}
 
 	@Test
-	public void wasCasualServletFolderWithCompliantSetting() {
+	void wasCasualServletFolderWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/foo/");
 		tomcatCasualServletFolder();
 	}
 
 	@Test
-	public void getOriginatingRequestUri() {
+	void getOriginatingRequestUri() {
 		request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/path");
 		request.setRequestURI("/forwarded");
 		assertThat(helper.getOriginatingRequestUri(request)).isEqualTo("/path");
 	}
 
 	@Test
-	public void getOriginatingRequestUriWebsphere() {
+	void getOriginatingRequestUriWebsphere() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/path");
 		request.setRequestURI("/forwarded");
 		assertThat(helper.getOriginatingRequestUri(request)).isEqualTo("/path");
 	}
 
 	@Test
-	public void getOriginatingRequestUriDefault() {
+	void getOriginatingRequestUriDefault() {
 		request.setRequestURI("/forwarded");
 		assertThat(helper.getOriginatingRequestUri(request)).isEqualTo("/forwarded");
 	}
 
 	@Test
-	public void getOriginatingQueryString() {
+	void getOriginatingQueryString() {
 		request.setQueryString("forward=on");
 		request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/path");
 		request.setAttribute(WebUtils.FORWARD_QUERY_STRING_ATTRIBUTE, "original=on");
@@ -452,13 +452,13 @@ public void getOriginatingQueryString() {
 	}
 
 	@Test
-	public void getOriginatingQueryStringNotPresent() {
+	void getOriginatingQueryStringNotPresent() {
 		request.setQueryString("forward=true");
 		assertThat(this.helper.getOriginatingQueryString(request)).isEqualTo("forward=true");
 	}
 
 	@Test
-	public void getOriginatingQueryStringIsNull() {
+	void getOriginatingQueryStringIsNull() {
 		request.setQueryString("forward=true");
 		request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/path");
 		assertThat(this.helper.getOriginatingQueryString(request)).isNull();

From b28f403bf8314d27704b789a0eeda11f74aaf886 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 14:45:55 +0200
Subject: [PATCH 005/735] Fix Checkstyle violation

See gh-27303
---
 .../springframework/web/util/UrlPathHelperTests.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 094e33d419fd..e3281e55273f 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -22,7 +22,7 @@
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
 /**
  * Unit tests for {@link UrlPathHelper}.
@@ -170,16 +170,16 @@ void getLookupPathWithSemicolonContentAndNullPathInfo() {
 	void defaultInstanceReadOnlyBehavior() {
 		UrlPathHelper helper = UrlPathHelper.defaultInstance;
 
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setAlwaysUseFullPath(true))
 			.withMessage("This instance cannot be modified");
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setUrlDecode(true))
 			.withMessage("This instance cannot be modified");
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setRemoveSemicolonContent(true))
 			.withMessage("This instance cannot be modified");
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setDefaultEncoding("UTF-8"))
 			.withMessage("This instance cannot be modified");
 

From 7da7a976e67fad30b2e5e5caaf9bf2fa8045d5d1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 15:54:35 +0200
Subject: [PATCH 006/735] Document when prepareTestInstance() is invoked by the
 SpringMethodRule

Closes gh-27305
---
 .../test/annotation/Repeat.java               |  8 ++++++--
 .../test/context/TestContextManager.java      | 10 +++++++---
 .../test/context/TestExecutionListener.java   | 20 +++++++++++--------
 .../junit4/rules/SpringMethodRule.java        |  6 +++++-
 src/docs/asciidoc/testing.adoc                |  6 ++++--
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
index e81bb9c85690..dfa062ceb2ba 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,11 @@
  *
  * <p>Note that the scope of execution to be repeated includes execution of the
  * test method itself as well as any <em>set up</em> or <em>tear down</em> of
- * the test fixture.
+ * the test fixture. When used with the
+ * {@link org.springframework.test.context.junit4.rules.SpringMethodRule
+ * SpringMethodRule}, the scope additionally includes
+ * {@linkplain org.springframework.test.context.TestExecutionListener#prepareTestInstance
+ * preparation of the test instance}.
  *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em>.
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
index 30d67923e4fb..d93b78d88d56 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -221,8 +221,12 @@ public void beforeTestClass() throws Exception {
 
 	/**
 	 * Hook for preparing a test instance prior to execution of any individual
-	 * test methods, for example for injecting dependencies, etc. Should be
-	 * called immediately after instantiation of the test instance.
+	 * test methods &mdash; for example, to inject dependencies.
+	 * <p>This method should be called immediately after instantiation of the test
+	 * class or as soon after instantiation as possible (as is the case with the
+	 * {@link org.springframework.test.context.junit4.rules.SpringMethodRule
+	 * SpringMethodRule}). In any case, this method must be called prior to any
+	 * framework-specific lifecycle callbacks.
 	 * <p>The managed {@link TestContext} will be updated with the supplied
 	 * {@code testInstance}.
 	 * <p>An attempt will be made to give each registered
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
index a9b188e6e92d..e10d2422bdcc 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,10 +86,14 @@ default void beforeTestClass(TestContext testContext) throws Exception {
 	}
 
 	/**
-	 * Prepares the {@link Object test instance} of the supplied
-	 * {@link TestContext test context}, for example by injecting dependencies.
+	 * Prepares the {@linkplain Object test instance} of the supplied
+	 * {@linkplain TestContext test context} &mdash; for example, to inject
+	 * dependencies.
 	 * <p>This method should be called immediately after instantiation of the test
-	 * instance but prior to any framework-specific lifecycle callbacks.
+	 * class or as soon after instantiation as possible (as is the case with the
+	 * {@link org.springframework.test.context.junit4.rules.SpringMethodRule
+	 * SpringMethodRule}). In any case, this method must be called prior to any
+	 * framework-specific lifecycle callbacks.
 	 * <p>The default implementation is <em>empty</em>. Can be overridden by
 	 * concrete classes as necessary.
 	 * @param testContext the test context for the test; never {@code null}
@@ -123,8 +127,8 @@ default void beforeTestMethod(TestContext testContext) throws Exception {
 
 	/**
 	 * Pre-processes a test <em>immediately before</em> execution of the
-	 * {@link java.lang.reflect.Method test method} in the supplied
-	 * {@link TestContext test context} &mdash; for example, for timing
+	 * {@linkplain java.lang.reflect.Method test method} in the supplied
+	 * {@linkplain TestContext test context} &mdash; for example, for timing
 	 * or logging purposes.
 	 * <p>This method <strong>must</strong> be called after framework-specific
 	 * <em>before</em> lifecycle callbacks.
@@ -143,8 +147,8 @@ default void beforeTestExecution(TestContext testContext) throws Exception {
 
 	/**
 	 * Post-processes a test <em>immediately after</em> execution of the
-	 * {@link java.lang.reflect.Method test method} in the supplied
-	 * {@link TestContext test context} &mdash; for example, for timing
+	 * {@linkplain java.lang.reflect.Method test method} in the supplied
+	 * {@linkplain TestContext test context} &mdash; for example, for timing
 	 * or logging purposes.
 	 * <p>This method <strong>must</strong> be called before framework-specific
 	 * <em>after</em> lifecycle callbacks.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java
index 639ee9d6f623..57478d4bd8a6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,6 +79,10 @@
  * <p><strong>NOTE:</strong> As of Spring Framework 4.3, this class requires JUnit 4.12 or higher.
  *
  * <p><strong>WARNING:</strong> Due to the shortcomings of JUnit rules, the
+ * {@code SpringMethodRule}
+ * {@linkplain org.springframework.test.context.TestExecutionListener#prepareTestInstance
+ * prepares the test instance} before {@code @Before} lifecycle methods instead of
+ * immediately after instantiation of the test class. In addition, the
  * {@code SpringMethodRule} does <strong>not</strong> support the
  * {@code beforeTestExecution()} and {@code afterTestExecution()} callbacks of the
  * {@link org.springframework.test.context.TestExecutionListener TestExecutionListener}
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 81455ea5ac12..90c463fbe6fa 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -1657,8 +1657,10 @@ before failing.
 times that the test method is to be run is specified in the annotation.
 
 The scope of execution to be repeated includes execution of the test method itself as
-well as any setting up or tearing down of the test fixture. The following example shows
-how to use the `@Repeat` annotation:
+well as any setting up or tearing down of the test fixture. When used with the
+<<testcontext-junit4-rules, `SpringMethodRule`>>, the scope additionally includes
+preparation of the test instance by `TestExecutionListener` implementations. The
+following example shows how to use the `@Repeat` annotation:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java

From 8a7c4fc10d60168ebded312e2b02b3a052c46d33 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 17:44:14 +0200
Subject: [PATCH 007/735] Support HtmlFileInput.setData() with HtmlUnit and
 MockMvc

Prior to this commit, if the user tested file upload support with
HtmlUnit and MockMvc by invoking HtmlFileInput.setData() instead of
HtmlFileInput.setFiles(), the in-memory file data was simply ignored.

This commit addresses this issue by creating a MockPart from the
in-memory data in HtmlUnitRequestBuilder.

Closes gh-27199
---
 .../htmlunit/HtmlUnitRequestBuilder.java      | 14 +++++---
 .../htmlunit/HtmlUnitRequestBuilderTests.java | 32 +++++++++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index fa52c987c667..7d76e63e7511 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -377,12 +377,18 @@ private void params(MockHttpServletRequest request, UriComponents uriComponents)
 				MockPart part;
 				if (file != null) {
 					part = new MockPart(pair.getName(), file.getName(), readAllBytes(file));
-					part.getHeaders().setContentType(MediaType.valueOf(pair.getMimeType()));
 				}
-				else { // mimic empty file upload
-					part = new MockPart(pair.getName(), "", null);
-					part.getHeaders().setContentType(MediaType.APPLICATION_OCTET_STREAM);
+				else {
+					// Support empty file upload OR file upload via setData().
+					// For an empty file upload, getValue() returns an empty string, and
+					// getData() returns null.
+					// For a file upload via setData(), getData() returns the file data, and
+					// getValue() returns the file name (if set) or an empty string.
+					part = new MockPart(pair.getName(), pair.getValue(), pair.getData());
 				}
+				MediaType mediaType = (pair.getMimeType() != null ? MediaType.valueOf(pair.getMimeType()) :
+						MediaType.APPLICATION_OCTET_STREAM);
+				part.getHeaders().setContentType(mediaType);
 				request.addPart(part);
 			}
 			else {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index b1f73b4741f9..96ebbb4ed529 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.servlet.htmlunit;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -443,6 +444,33 @@ public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithFile
 		assertThat(part.getContentType()).isEqualTo(MimeType.TEXT_PLAIN);
 	}
 
+	@Test // gh-27199
+	public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithFileDataAsParameter() throws Exception {
+		String data = "{}";
+		KeyDataPair keyDataPair = new KeyDataPair("key", new File("test.json"), null, MimeType.APPLICATION_JSON, StandardCharsets.UTF_8);
+		keyDataPair.setData(data.getBytes());
+
+		webRequest.setRequestParameters(Collections.singletonList(keyDataPair));
+
+		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
+
+		assertThat(actualRequest.getParts()).hasSize(1);
+		Part part = actualRequest.getPart("key");
+
+		assertSoftly(softly -> {
+			softly.assertThat(part).as("part").isNotNull();
+			softly.assertThat(part.getName()).as("name").isEqualTo("key");
+			softly.assertThat(part.getSubmittedFileName()).as("file name").isEqualTo("test.json");
+			softly.assertThat(part.getContentType()).as("content type").isEqualTo(MimeType.APPLICATION_JSON);
+			try {
+				softly.assertThat(IOUtils.toString(part.getInputStream(), StandardCharsets.UTF_8)).as("content").isEqualTo(data);
+			}
+			catch (IOException ex) {
+				softly.fail("failed to get InputStream", ex);
+			}
+		});
+	}
+
 	@Test // gh-26799
 	public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithNullFileToUploadAsParameter() throws Exception {
 		webRequest.setRequestParameters(Collections.singletonList(new KeyDataPair("key", null, null, null, (Charset) null)));
@@ -453,11 +481,11 @@ public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithNull
 		Part part = actualRequest.getPart("key");
 
 		assertSoftly(softly -> {
-			softly.assertThat(part).isNotNull();
+			softly.assertThat(part).as("part").isNotNull();
 			softly.assertThat(part.getName()).as("name").isEqualTo("key");
 			softly.assertThat(part.getSize()).as("size").isEqualTo(0);
 			try {
-				softly.assertThat(part.getInputStream()).isEmpty();
+				softly.assertThat(part.getInputStream()).as("input stream").isEmpty();
 			}
 			catch (IOException ex) {
 				softly.fail("failed to get InputStream", ex);

From 81a6ba42a36230ad7cdbf1d4e699e09dad012ad1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 11:37:22 +0200
Subject: [PATCH 008/735] Introduce ExceptionCollector testing utility

This commit introduces a new ExceptionCollector testing utility in order
to support "soft assertion" use cases.

Closes gh-27316
---
 .../test/util/ExceptionCollector.java         | 127 +++++++++++++++
 .../test/util/ExceptionCollectorTests.java    | 151 ++++++++++++++++++
 2 files changed, 278 insertions(+)
 create mode 100644 spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
 create mode 100644 spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
new file mode 100644
index 000000000000..1c5ffaa33236
--- /dev/null
+++ b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
@@ -0,0 +1,127 @@
+/*
+ * 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.test.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * {@code ExceptionCollector} is a test utility for executing code blocks,
+ * collecting exceptions, and generating a single {@link AssertionError}
+ * containing any exceptions encountered as {@linkplain Throwable#getSuppressed()
+ * suppressed exceptions}.
+ *
+ * <p>This utility is intended to support <em>soft assertion</em> use cases
+ * similar to the {@code SoftAssertions} support in AssertJ and the
+ * {@code assertAll()} support in JUnit Jupiter.
+ *
+ * @author Sam Brannen
+ * @since 5.3.10
+ */
+public class ExceptionCollector {
+
+	private final List<Throwable> exceptions = new ArrayList<>();
+
+
+	/**
+	 * Execute the supplied {@link Executable} and track any exception thrown.
+	 * @param executable the {@code Executable} to execute
+	 * @see #getExceptions()
+	 * @see #assertEmpty()
+	 */
+	public void execute(Executable executable) {
+		try {
+			executable.execute();
+		}
+		catch (Throwable ex) {
+			this.exceptions.add(ex);
+		}
+	}
+
+	/**
+	 * Get the list of exceptions encountered in {@link #execute(Executable)}.
+	 * @return an unmodifiable copy of the list of exceptions, potentially empty
+	 * @see #assertEmpty()
+	 */
+	public List<Throwable> getExceptions() {
+		return Collections.unmodifiableList(this.exceptions);
+	}
+
+	/**
+	 * Assert that this {@code ExceptionCollector} does not contain any
+	 * {@linkplain #getExceptions() exceptions}.
+	 * <p>If this collector is empty, this method is effectively a no-op.
+	 * <p>If this collector contains a single {@link Error} or {@link Exception},
+	 * this method rethrows the error or exception.
+	 * <p>If this collector contains a single {@link Throwable}, this method throws
+	 * an {@link AssertionError} with the error message of the {@code Throwable}
+	 * and with the {@code Throwable} as the {@linkplain Throwable#getCause() cause}.
+	 * <p>If this collector contains multiple exceptions, this method throws an
+	 * {@code AssertionError} whose message is "Multiple Exceptions (#):"
+	 * followed by a new line with the error message of each exception separated
+	 * by a new line, with {@code #} replaced with the number of exceptions present.
+	 * In addition, each exception will be added to the {@code AssertionError} as
+	 * a {@link Throwable#addSuppressed(Throwable) suppressed exception}.
+	 * @see #execute(Executable)
+	 * @see #getExceptions()
+	 */
+	public void assertEmpty() throws Exception {
+		if (this.exceptions.isEmpty()) {
+			return;
+		}
+
+		if (this.exceptions.size() == 1) {
+			Throwable exception = this.exceptions.get(0);
+			if (exception instanceof Error) {
+				throw (Error) exception;
+			}
+			if (exception instanceof Exception) {
+				throw (Exception) exception;
+			}
+			AssertionError assertionError = new AssertionError(exception.getMessage());
+			assertionError.initCause(exception);
+			throw assertionError;
+		}
+
+		StringBuilder message = new StringBuilder();
+		message.append("Multiple Exceptions (").append(this.exceptions.size()).append("):");
+		for (Throwable exception : this.exceptions) {
+			message.append('\n');
+			message.append(exception.getMessage());
+		}
+		AssertionError assertionError = new AssertionError(message);
+		this.exceptions.forEach(assertionError::addSuppressed);
+		throw assertionError;
+	}
+
+
+	/**
+	 * {@code Executable} is a functional interface that can be used to implement
+	 * any generic block of code that potentially throws a {@link Throwable}.
+	 *
+	 * <p>The {@code Executable} interface is similar to {@link java.lang.Runnable},
+	 * except that an {@code Executable} can throw any kind of exception.
+	 */
+	@FunctionalInterface
+	interface Executable {
+
+		void execute() throws Throwable;
+
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java b/spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java
new file mode 100644
index 000000000000..6bb39d407b01
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java
@@ -0,0 +1,151 @@
+/*
+ * 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.test.util;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.util.ExceptionCollector.Executable;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
+
+/**
+ * Unit tests for {@link ExceptionCollector}.
+ *
+ * @author Sam Brannen
+ * @since 5.3.10
+ */
+public class ExceptionCollectorTests {
+
+	private static final char EOL = '\n';
+
+	private final ExceptionCollector collector = new ExceptionCollector();
+
+
+	@Test
+	void noExceptions() {
+		this.collector.execute(() -> {});
+
+		assertThat(this.collector.getExceptions()).isEmpty();
+		assertThatNoException().isThrownBy(this.collector::assertEmpty);
+	}
+
+	@Test
+	void oneError() {
+		this.collector.execute(error());
+
+		assertOneFailure(Error.class, "error");
+	}
+
+	@Test
+	void oneAssertionError() {
+		this.collector.execute(assertionError());
+
+		assertOneFailure(AssertionError.class, "assertion");
+	}
+
+	@Test
+	void oneCheckedException() {
+		this.collector.execute(checkedException());
+
+		assertOneFailure(Exception.class, "checked");
+	}
+
+	@Test
+	void oneUncheckedException() {
+		this.collector.execute(uncheckedException());
+
+		assertOneFailure(RuntimeException.class, "unchecked");
+	}
+
+	@Test
+	void oneThrowable() {
+		this.collector.execute(throwable());
+
+		assertThatExceptionOfType(AssertionError.class)
+			.isThrownBy(this.collector::assertEmpty)
+			.withMessage("throwable")
+			.withCauseExactlyInstanceOf(Throwable.class)
+			.satisfies(error -> assertThat(error.getCause()).hasMessage("throwable"))
+			.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	private void assertOneFailure(Class<? extends Throwable> expectedType, String failureMessage) {
+		assertThatExceptionOfType(expectedType)
+			.isThrownBy(this.collector::assertEmpty)
+			.satisfies(exception ->
+				assertThat(exception)
+					.isExactlyInstanceOf(expectedType)
+					.hasNoSuppressedExceptions()
+					.hasNoCause()
+					.hasMessage(failureMessage));
+	}
+
+	@Test
+	void multipleFailures() {
+		this.collector.execute(assertionError());
+		this.collector.execute(checkedException());
+		this.collector.execute(uncheckedException());
+		this.collector.execute(error());
+		this.collector.execute(throwable());
+
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(this.collector::assertEmpty)
+				.withMessage("Multiple Exceptions (5):" + EOL + //
+					"assertion" + EOL + //
+					"checked" + EOL + //
+					"unchecked" + EOL + //
+					"error" + EOL + //
+					"throwable"//
+				)
+				.satisfies(exception ->
+					assertThat(exception.getSuppressed()).extracting(Object::getClass).map(Class::getSimpleName)
+						.containsExactly("AssertionError", "Exception", "RuntimeException", "Error", "Throwable"));
+	}
+
+	private Executable throwable() {
+		return () -> {
+			throw new Throwable("throwable");
+		};
+	}
+
+	private Executable error() {
+		return () -> {
+			throw new Error("error");
+		};
+	}
+
+	private Executable assertionError() {
+		return () -> {
+			throw new AssertionError("assertion");
+		};
+	}
+
+	private Executable checkedException() {
+		return () -> {
+			throw new Exception("checked");
+		};
+	}
+
+	private Executable uncheckedException() {
+		return () -> {
+			throw new RuntimeException("unchecked");
+		};
+	}
+
+}

From 4c153b80eef662af0d5ae3b316aa4f9f3d874e8a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 11:57:54 +0200
Subject: [PATCH 009/735] Make ExceptionCollector.Executable public

See gh-27316
---
 .../java/org/springframework/test/util/ExceptionCollector.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
index 1c5ffaa33236..f53190b7aff7 100644
--- a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
+++ b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
@@ -118,7 +118,7 @@ public void assertEmpty() throws Exception {
 	 * except that an {@code Executable} can throw any kind of exception.
 	 */
 	@FunctionalInterface
-	interface Executable {
+	public interface Executable {
 
 		void execute() throws Throwable;
 

From 35bec8102b014feac18c5b096b39c3592c27b76e Mon Sep 17 00:00:00 2001
From: Michal Rowicki <Michal.Rowicki@vimn.com>
Date: Sun, 9 May 2021 23:57:41 +0200
Subject: [PATCH 010/735] Introduce soft assertions for MockMvc

It happens very often that MockMvc is used in heavyweight integration
tests. It's no use to waste time to check if another condition has been
fixed or not. Soft assertions help a lot by checking all conditions at
once even if one of them fails.

See gh-26917

Co-authored-by: Sach Nguyen <sachnbbkhn@gmail.com>
---
 .../test/web/servlet/ResultActions.java       | 12 +++-
 .../test/web/servlet/ResultMatcher.java       | 29 ++++++++
 .../test/web/servlet/ResultMatcherTests.java  | 66 +++++++++++++++++++
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index d63a5dd4884e..bbcb0a2e127d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -42,7 +42,7 @@ public interface ResultActions {
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
 	 *
-	 * <p>Or alternatively provide all matchers as a vararg:
+	 * <p>Either provide all matchers as a vararg:
 	 * <pre class="code">
 	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
 	 *
@@ -56,6 +56,16 @@ public interface ResultActions {
 	 *       flash().attribute("message", "success!"))
 	 *   );
 	 * </pre>
+	 *
+	 * <p>Or provide all matchers to be evaluated no matter if one of them fail:
+	 * <pre class="code">
+	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
+	 * mockMvc.perform(post("/form"))
+	 *   .andExpect(matchAllSoftly(
+	 *       status().isOk(),
+	 *       redirectedUrl("/person/1")
+	 *   );
+	 * </pre>
 	 */
 	ResultActions andExpect(ResultMatcher matcher) throws Exception;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 1b6b409806d4..6c4d054d2359 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -16,6 +16,9 @@
 
 package org.springframework.test.web.servlet;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -70,4 +73,30 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 		};
 	}
 
+	/**
+	 * Static method for matching with an array of result matchers whose assertion failures are caught and stored.
+	 * Only when all of them would be called a {@link AssertionError} be thrown containing the error messages of those
+	 * previously caught assertion failures.
+	 * @param matchers the matchers
+	 * @author Michał Rowicki
+	 * @since 5.2
+	 */
+	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
+		return result -> {
+			List<String> failedMessages = new ArrayList<>();
+			for (int i = 0; i < matchers.length; i++) {
+				ResultMatcher matcher = matchers[i];
+				try {
+					matcher.match(result);
+				}
+				catch (AssertionError assertionException) {
+					failedMessages.add("[" + i + "] " + assertionException.getMessage());
+				}
+			}
+			if (!failedMessages.isEmpty()) {
+				throw new AssertionError(String.join("\n", failedMessages));
+			}
+		};
+	}
+
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
new file mode 100644
index 000000000000..40cbb56063f9
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
@@ -0,0 +1,66 @@
+/*
+ * 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.test.web.servlet;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
+
+class ResultMatcherTests {
+
+	@Test
+	void whenProvidedMatcherPassesThenSoftAssertionsAlsoPasses() {
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(this::doNothing);
+		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+
+		assertThatNoException().isThrownBy(() -> resultMatcher.match(stubMvcResult));
+	}
+
+	@Test
+	void whenOneOfMatcherFailsThenSoftAssertionFailsWithTheVerySameMessage() {
+		String failMessage = "fail message";
+		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(failMessage));
+
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage("[0] " + failMessage);
+	}
+
+	@Test
+	void whenMultipleMatchersFailsThenSoftAssertionFailsWithOneErrorWithMessageContainingAllErrorMessagesWithTheSameOrder() {
+		String firstFail = "firstFail";
+		String secondFail = "secondFail";
+		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(firstFail), failMatcher(secondFail));
+
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage("[0] " + firstFail + "\n[1] " + secondFail);
+	}
+
+	@NotNull
+	private ResultMatcher failMatcher(String failMessage) {
+		return result -> {
+			throw new AssertionError(failMessage);
+		};
+	}
+
+	void doNothing(MvcResult mvcResult) {}
+}

From 5f47d3be227e115c57b03e73f5df97993c44fdd8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 18:32:05 +0200
Subject: [PATCH 011/735] Polish soft assertions for MockMvc

See gh-26917
---
 .../test/web/servlet/ResultActions.java       | 19 ++++----
 .../test/web/servlet/ResultMatcher.java       | 32 ++++++-------
 .../test/web/servlet/ResultMatcherTests.java  | 45 ++++++++++++-------
 3 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index bbcb0a2e127d..8259a19508b7 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,9 +32,11 @@ public interface ResultActions {
 	/**
 	 * Perform an expectation.
 	 *
-	 * <h4>Example</h4>
+	 * <h4>Examples</h4>
+	 *
+	 * <p>You can invoke {@code andExpect()} multiple times.
 	 * <pre class="code">
-	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
 	 * mockMvc.perform(get("/person/1"))
 	 *   .andExpect(status().isOk())
@@ -42,9 +44,9 @@ public interface ResultActions {
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
 	 *
-	 * <p>Either provide all matchers as a vararg:
+	 * <p>You can provide all matchers as a var-arg list with {@code matchAll()}.
 	 * <pre class="code">
-	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
 	 *
 	 * mockMvc.perform(post("/form"))
 	 *   .andExpect(matchAll(
@@ -57,13 +59,14 @@ public interface ResultActions {
 	 *   );
 	 * </pre>
 	 *
-	 * <p>Or provide all matchers to be evaluated no matter if one of them fail:
+	 * <p>Alternatively, you can provide all matchers to be evaluated using
+	 * <em>soft assertions</em> with {@code matchAllSoftly()}.
 	 * <pre class="code">
-	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
 	 * mockMvc.perform(post("/form"))
 	 *   .andExpect(matchAllSoftly(
 	 *       status().isOk(),
-	 *       redirectedUrl("/person/1")
+	 *       redirectedUrl("/person/1"))
 	 *   );
 	 * </pre>
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 6c4d054d2359..13624102988f 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.test.web.servlet;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -47,6 +44,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 3.2
  */
 @FunctionalInterface
@@ -74,27 +72,29 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 	}
 
 	/**
-	 * Static method for matching with an array of result matchers whose assertion failures are caught and stored.
-	 * Only when all of them would be called a {@link AssertionError} be thrown containing the error messages of those
-	 * previously caught assertion failures.
+	 * Static method for matching with an array of result matchers whose assertion
+	 * failures are caught and stored. Once all matchers have been called, if any
+	 * failures occurred, an {@link AssertionError} will be thrown containing the
+	 * error messages of all assertion failures.
 	 * @param matchers the matchers
-	 * @author Michał Rowicki
-	 * @since 5.2
+	 * @since 5.3.10
 	 */
 	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
 		return result -> {
-			List<String> failedMessages = new ArrayList<>();
-			for (int i = 0; i < matchers.length; i++) {
-				ResultMatcher matcher = matchers[i];
+			String message = "";
+			for (ResultMatcher matcher : matchers) {
 				try {
 					matcher.match(result);
 				}
-				catch (AssertionError assertionException) {
-					failedMessages.add("[" + i + "] " + assertionException.getMessage());
+				catch (Error | Exception ex) {
+					if (!message.isEmpty()) {
+						message += System.lineSeparator();
+					}
+					message += ex.getMessage();
 				}
 			}
-			if (!failedMessages.isEmpty()) {
-				throw new AssertionError(String.join("\n", failedMessages));
+			if (!message.isEmpty()) {
+				throw new AssertionError(message);
 			}
 		};
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
index 40cbb56063f9..17ff0588269f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
@@ -16,51 +16,62 @@
 
 package org.springframework.test.web.servlet;
 
-import org.jetbrains.annotations.NotNull;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
+/**
+ * Unit tests for {@link ResultMatcher}.
+ *
+ * @author Michał Rowicki
+ * @author Sam Brannen
+ * @since 5.3.10
+ */
 class ResultMatcherTests {
 
+	private final StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+
+
 	@Test
-	void whenProvidedMatcherPassesThenSoftAssertionsAlsoPasses() {
+	void softAssertionsWithNoFailures() {
 		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(this::doNothing);
-		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
 
 		assertThatNoException().isThrownBy(() -> resultMatcher.match(stubMvcResult));
 	}
 
 	@Test
-	void whenOneOfMatcherFailsThenSoftAssertionFailsWithTheVerySameMessage() {
-		String failMessage = "fail message";
-		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(failMessage));
+	void softAssertionsWithOneFailure() {
+		String failureMessage = "failure message";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(failureMessage));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage("[0] " + failMessage);
+				.withMessage(failureMessage);
 	}
 
 	@Test
-	void whenMultipleMatchersFailsThenSoftAssertionFailsWithOneErrorWithMessageContainingAllErrorMessagesWithTheSameOrder() {
-		String firstFail = "firstFail";
-		String secondFail = "secondFail";
-		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(firstFail), failMatcher(secondFail));
+	void softAssertionsWithTwoFailures() {
+		String firstFailure = "firstFailure";
+		String secondFailure = "secondFailure";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(firstFailure), exceptionalMatcher(secondFailure));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage("[0] " + firstFail + "\n[1] " + secondFail);
+				.withMessage(firstFailure + System.lineSeparator() + secondFailure);
 	}
 
-	@NotNull
-	private ResultMatcher failMatcher(String failMessage) {
+	private ResultMatcher failingMatcher(String failureMessage) {
+		return result -> Assertions.fail(failureMessage);
+	}
+
+	private ResultMatcher exceptionalMatcher(String failureMessage) {
 		return result -> {
-			throw new AssertionError(failMessage);
+			throw new RuntimeException(failureMessage);
 		};
 	}
 
 	void doNothing(MvcResult mvcResult) {}
+
 }

From cd078eaad83e2c6cb441719086b460e665c20f35 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 19:03:32 +0200
Subject: [PATCH 012/735] Use ExceptionCollector for soft assertions in MockMvc

See gh-26917
---
 .../test/web/servlet/ResultMatcher.java       | 18 ++----
 .../test/web/servlet/ResultMatcherTests.java  | 62 +++++++++++++++----
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 13624102988f..ac40b9d71619 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -16,6 +16,8 @@
 
 package org.springframework.test.web.servlet;
 
+import org.springframework.test.util.ExceptionCollector;
+
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -81,21 +83,11 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 	 */
 	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
 		return result -> {
-			String message = "";
+			ExceptionCollector exceptionCollector = new ExceptionCollector();
 			for (ResultMatcher matcher : matchers) {
-				try {
-					matcher.match(result);
-				}
-				catch (Error | Exception ex) {
-					if (!message.isEmpty()) {
-						message += System.lineSeparator();
-					}
-					message += ex.getMessage();
-				}
-			}
-			if (!message.isEmpty()) {
-				throw new AssertionError(message);
+				exceptionCollector.execute(() -> matcher.match(result));
 			}
+			exceptionCollector.assertEmpty();
 		};
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
index 17ff0588269f..dd7cd3527cd5 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
@@ -16,9 +16,9 @@
 
 package org.springframework.test.web.servlet;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
@@ -31,6 +31,8 @@
  */
 class ResultMatcherTests {
 
+	private static final String EOL = "\n";
+
 	private final StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
 
 
@@ -42,36 +44,74 @@ void softAssertionsWithNoFailures() {
 	}
 
 	@Test
-	void softAssertionsWithOneFailure() {
-		String failureMessage = "failure message";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(failureMessage));
+	void softAssertionsWithOneAssertionError() {
+		String failureMessage = "error";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(failureMessage));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage);
+				.withMessage(failureMessage)
+				.withNoCause()
+				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	@Test
+	void softAssertionsWithOneRuntimeException() {
+		String failureMessage = "exception";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(uncheckedExceptionMatcher(failureMessage));
+
+		assertThatExceptionOfType(RuntimeException.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage(failureMessage)
+				.withNoCause()
+				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	@Test
+	void softAssertionsWithOneCheckedException() {
+		String failureMessage = "exception";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(checkedExceptionMatcher(failureMessage));
+
+		assertThatExceptionOfType(Exception.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage(failureMessage)
+				.withNoCause()
+				.satisfies(exception -> assertThat(exception).hasNoSuppressedExceptions());
 	}
 
 	@Test
 	void softAssertionsWithTwoFailures() {
 		String firstFailure = "firstFailure";
 		String secondFailure = "secondFailure";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(firstFailure), exceptionalMatcher(secondFailure));
+		String thirdFailure = "thirdFailure";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(firstFailure),
+			checkedExceptionMatcher(secondFailure), uncheckedExceptionMatcher(thirdFailure));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(firstFailure + System.lineSeparator() + secondFailure);
+				.withMessage("Multiple Exceptions (3):" + EOL + firstFailure + EOL + secondFailure + EOL + thirdFailure)
+				.satisfies(error -> assertThat(error.getSuppressed()).hasSize(3));
 	}
 
-	private ResultMatcher failingMatcher(String failureMessage) {
-		return result -> Assertions.fail(failureMessage);
+	private ResultMatcher assertionErrorMatcher(String failureMessage) {
+		return result -> {
+			throw new AssertionError(failureMessage);
+		};
 	}
 
-	private ResultMatcher exceptionalMatcher(String failureMessage) {
+	private ResultMatcher uncheckedExceptionMatcher(String failureMessage) {
 		return result -> {
 			throw new RuntimeException(failureMessage);
 		};
 	}
 
-	void doNothing(MvcResult mvcResult) {}
+	private ResultMatcher checkedExceptionMatcher(String failureMessage) {
+		return result -> {
+			throw new Exception(failureMessage);
+		};
+	}
+
+	void doNothing(MvcResult mvcResult) {
+	}
 
 }

From dd9b99e13d6b30462fb168799e6bbca1456123da Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 13:05:50 +0200
Subject: [PATCH 013/735] Introduce ResultActions.andExpectAll() for soft
 assertions in MockMvc

Closes gh-26917
---
 .../test/web/servlet/ResultActions.java       |  65 ++++++----
 .../test/web/servlet/ResultMatcher.java       |  29 +----
 .../test/web/servlet/ResultMatcherTests.java  | 117 ------------------
 .../samples/context/JavaConfigTests.java      |  40 +++++-
 src/docs/asciidoc/testing.adoc                |  20 ++-
 5 files changed, 102 insertions(+), 169 deletions(-)
 delete mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index 8259a19508b7..f4fd6da14b58 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -16,6 +16,8 @@
 
 package org.springframework.test.web.servlet;
 
+import org.springframework.test.util.ExceptionCollector;
+
 /**
  * Allows applying actions, such as expectations, on the result of an executed
  * request.
@@ -25,6 +27,8 @@
  * {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 3.2
  */
 public interface ResultActions {
@@ -32,9 +36,9 @@ public interface ResultActions {
 	/**
 	 * Perform an expectation.
 	 *
-	 * <h4>Examples</h4>
-	 *
-	 * <p>You can invoke {@code andExpect()} multiple times.
+	 * <h4>Example</h4>
+	 * <p>You can invoke {@code andExpect()} multiple times as in the following
+	 * example.
 	 * <pre class="code">
 	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
@@ -44,33 +48,48 @@ public interface ResultActions {
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
 	 *
-	 * <p>You can provide all matchers as a var-arg list with {@code matchAll()}.
+	 * @see #andExpectAll(ResultMatcher...)
+	 */
+	ResultActions andExpect(ResultMatcher matcher) throws Exception;
+
+	/**
+	 * Perform multiple expectations, with the guarantee that all expectations
+	 * will be asserted even if one or more expectations fail with an exception.
+	 * <p>If a single {@link Error} or {@link Exception} is thrown, it will
+	 * be rethrown.
+	 * <p>If multiple exceptions are thrown, this method will throw an
+	 * {@link AssertionError} whose error message is a summary of all of the
+	 * exceptions. In addition, each exception will be added as a
+	 * {@linkplain Throwable#addSuppressed(Throwable) suppressed exception} to
+	 * the {@code AssertionError}.
+	 * <p>This feature is similar to the {@code SoftAssertions} support in AssertJ
+	 * and the {@code assertAll()} support in JUnit Jupiter.
+	 *
+	 * <h4>Example</h4>
+	 * <p>Instead of invoking {@code andExpect()} multiple times, you can invoke
+	 * {@code andExpectAll()} as in the following example.
 	 * <pre class="code">
-	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
-	 * mockMvc.perform(post("/form"))
-	 *   .andExpect(matchAll(
+	 * mockMvc.perform(get("/person/1"))
+	 *   .andExpectAll(
 	 *       status().isOk(),
-	 *       redirectedUrl("/person/1"),
-	 *   	 model().size(1),
-	 *       model().attributeExists("person"),
-	 *       flash().attributeCount(1),
-	 *       flash().attribute("message", "success!"))
+	 *       content().contentType(MediaType.APPLICATION_JSON),
+	 *       jsonPath("$.person.name").value("Jason")
 	 *   );
 	 * </pre>
 	 *
-	 * <p>Alternatively, you can provide all matchers to be evaluated using
-	 * <em>soft assertions</em> with {@code matchAllSoftly()}.
-	 * <pre class="code">
-	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
-	 * mockMvc.perform(post("/form"))
-	 *   .andExpect(matchAllSoftly(
-	 *       status().isOk(),
-	 *       redirectedUrl("/person/1"))
-	 *   );
-	 * </pre>
+	 * @since 5.3.10
+	 * @see #andExpect(ResultMatcher)
 	 */
-	ResultActions andExpect(ResultMatcher matcher) throws Exception;
+	default ResultActions andExpectAll(ResultMatcher... matchers) throws Exception {
+		ExceptionCollector exceptionCollector = new ExceptionCollector();
+		for (ResultMatcher matcher : matchers) {
+			exceptionCollector.execute(() -> this.andExpect(matcher));
+		}
+		exceptionCollector.assertEmpty();
+		return this;
+	}
 
 	/**
 	 * Perform a general action.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index ac40b9d71619..44aae68e150c 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -16,8 +16,6 @@
 
 package org.springframework.test.web.servlet;
 
-import org.springframework.test.util.ExceptionCollector;
-
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -40,13 +38,13 @@
  * MockMvc mockMvc = webAppContextSetup(wac).build();
  *
  * mockMvc.perform(get("/form"))
- *   .andExpect(status().isOk())
- *   .andExpect(content().mimeType(MediaType.APPLICATION_JSON));
+ *   .andExpectAll(
+ *       status().isOk(),
+ *       content().mimeType(MediaType.APPLICATION_JSON));
  * </pre>
  *
  * @author Rossen Stoyanchev
  * @author Sam Brannen
- * @author Michał Rowicki
  * @since 3.2
  */
 @FunctionalInterface
@@ -64,7 +62,10 @@ public interface ResultMatcher {
 	 * Static method for matching with an array of result matchers.
 	 * @param matchers the matchers
 	 * @since 5.1
+	 * @deprecated as of Spring Framework 5.3.10, in favor of
+	 * {@link ResultActions#andExpectAll(ResultMatcher...)}
 	 */
+	@Deprecated
 	static ResultMatcher matchAll(ResultMatcher... matchers) {
 		return result -> {
 			for (ResultMatcher matcher : matchers) {
@@ -73,22 +74,4 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 		};
 	}
 
-	/**
-	 * Static method for matching with an array of result matchers whose assertion
-	 * failures are caught and stored. Once all matchers have been called, if any
-	 * failures occurred, an {@link AssertionError} will be thrown containing the
-	 * error messages of all assertion failures.
-	 * @param matchers the matchers
-	 * @since 5.3.10
-	 */
-	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
-		return result -> {
-			ExceptionCollector exceptionCollector = new ExceptionCollector();
-			for (ResultMatcher matcher : matchers) {
-				exceptionCollector.execute(() -> matcher.match(result));
-			}
-			exceptionCollector.assertEmpty();
-		};
-	}
-
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
deleted file mode 100644
index dd7cd3527cd5..000000000000
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
+++ /dev/null
@@ -1,117 +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.test.web.servlet;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatNoException;
-
-/**
- * Unit tests for {@link ResultMatcher}.
- *
- * @author Michał Rowicki
- * @author Sam Brannen
- * @since 5.3.10
- */
-class ResultMatcherTests {
-
-	private static final String EOL = "\n";
-
-	private final StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
-
-
-	@Test
-	void softAssertionsWithNoFailures() {
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(this::doNothing);
-
-		assertThatNoException().isThrownBy(() -> resultMatcher.match(stubMvcResult));
-	}
-
-	@Test
-	void softAssertionsWithOneAssertionError() {
-		String failureMessage = "error";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(failureMessage));
-
-		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage)
-				.withNoCause()
-				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
-	}
-
-	@Test
-	void softAssertionsWithOneRuntimeException() {
-		String failureMessage = "exception";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(uncheckedExceptionMatcher(failureMessage));
-
-		assertThatExceptionOfType(RuntimeException.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage)
-				.withNoCause()
-				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
-	}
-
-	@Test
-	void softAssertionsWithOneCheckedException() {
-		String failureMessage = "exception";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(checkedExceptionMatcher(failureMessage));
-
-		assertThatExceptionOfType(Exception.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage)
-				.withNoCause()
-				.satisfies(exception -> assertThat(exception).hasNoSuppressedExceptions());
-	}
-
-	@Test
-	void softAssertionsWithTwoFailures() {
-		String firstFailure = "firstFailure";
-		String secondFailure = "secondFailure";
-		String thirdFailure = "thirdFailure";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(firstFailure),
-			checkedExceptionMatcher(secondFailure), uncheckedExceptionMatcher(thirdFailure));
-
-		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage("Multiple Exceptions (3):" + EOL + firstFailure + EOL + secondFailure + EOL + thirdFailure)
-				.satisfies(error -> assertThat(error.getSuppressed()).hasSize(3));
-	}
-
-	private ResultMatcher assertionErrorMatcher(String failureMessage) {
-		return result -> {
-			throw new AssertionError(failureMessage);
-		};
-	}
-
-	private ResultMatcher uncheckedExceptionMatcher(String failureMessage) {
-		return result -> {
-			throw new RuntimeException(failureMessage);
-		};
-	}
-
-	private ResultMatcher checkedExceptionMatcher(String failureMessage) {
-		return result -> {
-			throw new Exception(failureMessage);
-		};
-	}
-
-	void doNothing(MvcResult mvcResult) {
-	}
-
-}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
index e96c0c1f6cbe..9cde95fe2ce3 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +47,13 @@
 import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -61,6 +63,7 @@
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  * @author Sebastien Deleuze
+ * @author Michał Rowicki
  */
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration("classpath:META-INF/web-resources")
@@ -93,9 +96,38 @@ public void setup() {
 	public void person() throws Exception {
 		this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON))
 			.andDo(print())
-			.andExpect(status().isOk())
-			.andExpect(request().asyncNotStarted())
-			.andExpect(content().string("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}"));
+			.andExpectAll(
+				status().isOk(),
+				request().asyncNotStarted(),
+				content().string("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}"),
+				jsonPath("$.name").value("Joe")
+			);
+	}
+
+	@Test
+	public void andExpectAllWithOneFailure() {
+		assertThatExceptionOfType(AssertionError.class)
+			.isThrownBy(() -> this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON))
+					.andExpectAll(
+						status().isBadGateway(),
+						request().asyncNotStarted(),
+						jsonPath("$.name").value("Joe")))
+			.withMessage("Status expected:<502> but was:<200>")
+			.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	@Test
+	public void andExpectAllWithMultipleFailures() {
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
+			this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON))
+				.andExpectAll(
+					status().isBadGateway(),
+					request().asyncNotStarted(),
+					jsonPath("$.name").value("Joe"),
+					jsonPath("$.name").value("Jane")
+				))
+			.withMessage("Multiple Exceptions (2):\nStatus expected:<502> but was:<200>\nJSON path \"$.name\" expected:<Jane> but was:<Joe>")
+			.satisfies(error -> assertThat(error.getSuppressed()).hasSize(2));
 	}
 
 	@Test
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 90c463fbe6fa..bc3af10d0891 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -7219,8 +7219,9 @@ they must be specified on every request.
 [[spring-mvc-test-server-defining-expectations]]
 ===== Defining Expectations
 
-You can define expectations by appending one or more `.andExpect(..)` calls after
-performing a request, as the following example shows:
+You can define expectations by appending one or more `andExpect(..)` calls after
+performing a request, as the following example shows. As soon as one expectation fails,
+no other expectations will be asserted.
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -7240,6 +7241,21 @@ performing a request, as the following example shows:
 	}
 ----
 
+You can define multiple expectations by appending `andExpectAll(..)` after performing a
+request, as the following example shows. In contrast to `andExpect(..)`,
+`andExpectAll(..)` guarantees that all supplied expectations will be asserted and that
+all failures will be tracked and reported.
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+	// static import of MockMvcRequestBuilders.* and MockMvcResultMatchers.*
+
+	mockMvc.perform(get("/accounts/1")).andExpectAll(
+		status().isOk(),
+		content().contentType("application/json;charset=UTF-8"));
+----
+
 `MockMvcResultMatchers.*` provides a number of expectations, some of which are further
 nested with more detailed expectations.
 

From 25dca404138e85e8864e4bfa4b37c88f236a559e Mon Sep 17 00:00:00 2001
From: Michal Rowicki <Michal.Rowicki@vimn.com>
Date: Sun, 23 May 2021 13:21:31 +0200
Subject: [PATCH 014/735] Introduce soft assertions for WebTestClient

It happens very often that WebTestClient is used in heavyweight
integration tests, and it's a hindrance to developer productivity to
fix one failed assertion after another. Soft assertions help a lot by
checking all conditions at once even if one of them fails.

This commit introduces a new expectAllSoftly(..) method in
WebTestClient to address this issue.

client.get().uri("/hello")
	.exchange()
	.expectAllSoftly(
		spec -> spec.expectStatus().isOk(),
		spec -> spec.expectBody(String.class).isEqualTo("Hello, World")
	);

Closes gh-26969
---
 .../reactive/server/DefaultWebTestClient.java | 19 +++++
 .../web/reactive/server/WebTestClient.java    |  6 ++
 .../server/samples/SoftAssertionTests.java    | 75 +++++++++++++++++++
 3 files changed, 100 insertions(+)
 create mode 100644 spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
index 8d0ec7de0c5d..06dab2ea38a6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
@@ -21,6 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -507,6 +508,24 @@ public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elem
 			Flux<T> body = this.response.bodyToFlux(elementTypeRef);
 			return new FluxExchangeResult<>(this.exchangeResult, body);
 		}
+
+		@Override
+		public ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts) {
+			List<String> failedMessages = new ArrayList<>();
+			for (int i = 0; i < asserts.length; i++) {
+				ResponseSpecMatcher anAssert = asserts[i];
+				try {
+					anAssert.accept(this);
+				}
+				catch (AssertionError assertionException) {
+					failedMessages.add("[" + i + "] " + assertionException.getMessage());
+				}
+			}
+			if (!failedMessages.isEmpty()) {
+				throw new AssertionError(String.join("\n", failedMessages));
+			}
+			return this;
+		}
 	}
 
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 6d2fcefebd70..8f0159aa70ad 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -845,6 +845,11 @@ interface ResponseSpec {
 		 * about a target type with generics.
 		 */
 		<T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef);
+
+		/**
+		 * Array of assertions to test together a.k.a. soft assertions.
+		 */
+		ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts);
 	}
 
 
@@ -1006,4 +1011,5 @@ default XpathAssertions xpath(String expression, Object... args) {
 		EntityExchangeResult<byte[]> returnResult();
 	}
 
+	interface ResponseSpecMatcher extends Consumer<ResponseSpec> {}
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
new file mode 100644
index 000000000000..17d5cc1a3d34
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
@@ -0,0 +1,75 @@
+/*
+ * 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.test.web.reactive.server.samples;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+/**
+ * Samples of tests using {@link WebTestClient} with soft assertions.
+ *
+ * @author Michał Rowicki
+ * @since 5.3
+ */
+public class SoftAssertionTests {
+
+	private WebTestClient client;
+
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		this.client = WebTestClient.bindToController(new TestController()).build();
+	}
+
+
+	@Test
+	public void test() throws Exception {
+		this.client.get().uri("/test")
+				.exchange()
+				.expectAllSoftly(
+						exchange -> exchange.expectStatus().isOk(),
+						exchange -> exchange.expectBody(String.class).isEqualTo("It works!")
+				);
+	}
+
+	@Test
+	public void testAllFails() throws Exception {
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
+				this.client.get().uri("/test")
+						.exchange()
+						.expectAllSoftly(
+								exchange -> exchange.expectStatus().isBadRequest(),
+								exchange -> exchange.expectBody(String.class).isEqualTo("It won't work :(")
+						)
+		).withMessage("[0] Status expected:<400 BAD_REQUEST> but was:<200 OK>\n[1] Response body expected:<It won't work :(> but was:<It works!>");
+	}
+
+
+	@RestController
+	static class TestController {
+
+		@GetMapping("/test")
+		public String handle() {
+			return "It works!";
+		}
+	}
+}

From 3c2dfebf4ec5e9d791c1f3c9fa0ad35a5a9fcd6b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 18:59:41 +0200
Subject: [PATCH 015/735] Polish soft assertion support for WebTestClient

See gh-26969
---
 .../reactive/server/DefaultWebTestClient.java | 34 ++++++++-----
 .../web/reactive/server/WebTestClient.java    | 40 +++++++++++++--
 .../server/samples/SoftAssertionTests.java    | 51 +++++++++----------
 .../testing/testing-webtestclient.adoc        | 33 +++++++++---
 4 files changed, 106 insertions(+), 52 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
index 06dab2ea38a6..8628ef262261 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
@@ -21,7 +21,6 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -45,6 +44,7 @@
 import org.springframework.http.client.reactive.ClientHttpRequest;
 import org.springframework.lang.Nullable;
 import org.springframework.test.util.AssertionErrors;
+import org.springframework.test.util.ExceptionCollector;
 import org.springframework.test.util.JsonExpectationsHelper;
 import org.springframework.test.util.XmlExpectationsHelper;
 import org.springframework.util.Assert;
@@ -64,6 +64,8 @@
  * Default implementation of {@link WebTestClient}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 5.0
  */
 class DefaultWebTestClient implements WebTestClient {
@@ -510,19 +512,25 @@ public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elem
 		}
 
 		@Override
-		public ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts) {
-			List<String> failedMessages = new ArrayList<>();
-			for (int i = 0; i < asserts.length; i++) {
-				ResponseSpecMatcher anAssert = asserts[i];
-				try {
-					anAssert.accept(this);
-				}
-				catch (AssertionError assertionException) {
-					failedMessages.add("[" + i + "] " + assertionException.getMessage());
-				}
+		public ResponseSpec expectAll(ResponseSpecConsumer... consumers) {
+			ExceptionCollector exceptionCollector = new ExceptionCollector();
+			for (ResponseSpecConsumer consumer : consumers) {
+				exceptionCollector.execute(() -> consumer.accept(this));
+			}
+			try {
+				exceptionCollector.assertEmpty();
+			}
+			catch (RuntimeException ex) {
+				throw ex;
 			}
-			if (!failedMessages.isEmpty()) {
-				throw new AssertionError(String.join("\n", failedMessages));
+			catch (Exception ex) {
+				// In theory, a ResponseSpecConsumer should never throw an Exception
+				// that is not a RuntimeException, but since ExceptionCollector may
+				// throw a checked Exception, we handle this to appease the compiler
+				// and in case someone uses a "sneaky throws" technique.
+				AssertionError assertionError = new AssertionError(ex.getMessage());
+				assertionError.initCause(ex);
+				throw assertionError;
 			}
 			return this;
 		}
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 8f0159aa70ad..84adf85013c5 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -86,6 +86,8 @@
  *
  * @author Rossen Stoyanchev
  * @author Brian Clozel
+ * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 5.0
  * @see StatusAssertions
  * @see HeaderAssertions
@@ -781,6 +783,34 @@ interface RequestBodyUriSpec extends RequestBodySpec, RequestHeadersUriSpec<Requ
 	 */
 	interface ResponseSpec {
 
+		/**
+		 * Apply multiple assertions to a response with the given
+		 * {@linkplain ResponseSpecConsumer consumers}, with the guarantee that
+		 * all assertions will be applied even if one or more assertions fails
+		 * with an exception.
+		 * <p>If a single {@link Error} or {@link RuntimeException} is thrown,
+		 * it will be rethrown.
+		 * <p>If multiple exceptions are thrown, this method will throw an
+		 * {@link AssertionError} whose error message is a summary of all of the
+		 * exceptions. In addition, each exception will be added as a
+		 * {@linkplain Throwable#addSuppressed(Throwable) suppressed exception} to
+		 * the {@code AssertionError}.
+		 * <p>This feature is similar to the {@code SoftAssertions} support in
+		 * AssertJ and the {@code assertAll()} support in JUnit Jupiter.
+		 *
+		 * <h4>Example</h4>
+		 * <pre class="code">
+		 * webTestClient.get().uri("/hello").exchange()
+		 *     .expectAll(
+		 *         responseSpec -> responseSpec.expectStatus().isOk(),
+		 *         responseSpec -> responseSpec.expectBody(String.class).isEqualTo("Hello, World!")
+		 *     );
+		 * </pre>
+		 * @param consumers the list of {@code ResponseSpec} consumers
+		 * @since 5.3.10
+		 */
+		ResponseSpec expectAll(ResponseSpecConsumer... consumers);
+
 		/**
 		 * Assertions on the response status.
 		 */
@@ -847,9 +877,14 @@ interface ResponseSpec {
 		<T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef);
 
 		/**
-		 * Array of assertions to test together a.k.a. soft assertions.
+		 * {@link Consumer} of a {@link ResponseSpec}.
+		 * @since 5.3.10
+		 * @see ResponseSpec#expectAll(ResponseSpecConsumer...)
 		 */
-		ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts);
+		@FunctionalInterface
+		interface ResponseSpecConsumer extends Consumer<ResponseSpec> {
+		}
+
 	}
 
 
@@ -1011,5 +1046,4 @@ default XpathAssertions xpath(String expression, Object... args) {
 		EntityExchangeResult<byte[]> returnResult();
 	}
 
-	interface ResponseSpecMatcher extends Consumer<ResponseSpec> {}
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
index 17d5cc1a3d34..a4d4bb8c72fe 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -25,42 +25,36 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
- * Samples of tests using {@link WebTestClient} with soft assertions.
+ * Integration tests for {@link WebTestClient} with soft assertions.
  *
  * @author Michał Rowicki
- * @since 5.3
+ * @author Sam Brannen
+ * @since 5.3.10
  */
-public class SoftAssertionTests {
-
-	private WebTestClient client;
+class SoftAssertionTests {
 
-
-	@BeforeEach
-	public void setUp() throws Exception {
-		this.client = WebTestClient.bindToController(new TestController()).build();
-	}
+	private final WebTestClient webTestClient = WebTestClient.bindToController(new TestController()).build();
 
 
 	@Test
-	public void test() throws Exception {
-		this.client.get().uri("/test")
-				.exchange()
-				.expectAllSoftly(
-						exchange -> exchange.expectStatus().isOk(),
-						exchange -> exchange.expectBody(String.class).isEqualTo("It works!")
-				);
+	void expectAll() {
+		this.webTestClient.get().uri("/test").exchange()
+			.expectAll(
+				responseSpec -> responseSpec.expectStatus().isOk(),
+				responseSpec -> responseSpec.expectBody(String.class).isEqualTo("hello")
+			);
 	}
 
 	@Test
-	public void testAllFails() throws Exception {
+	void expectAllWithMultipleFailures() throws Exception {
 		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
-				this.client.get().uri("/test")
-						.exchange()
-						.expectAllSoftly(
-								exchange -> exchange.expectStatus().isBadRequest(),
-								exchange -> exchange.expectBody(String.class).isEqualTo("It won't work :(")
-						)
-		).withMessage("[0] Status expected:<400 BAD_REQUEST> but was:<200 OK>\n[1] Response body expected:<It won't work :(> but was:<It works!>");
+			this.webTestClient.get().uri("/test").exchange()
+				.expectAll(
+					responseSpec -> responseSpec.expectStatus().isBadRequest(),
+					responseSpec -> responseSpec.expectStatus().isOk(),
+					responseSpec -> responseSpec.expectBody(String.class).isEqualTo("bogus")
+				)
+		).withMessage("Multiple Exceptions (2):\nStatus expected:<400 BAD_REQUEST> but was:<200 OK>\nResponse body expected:<bogus> but was:<hello>");
 	}
 
 
@@ -68,8 +62,9 @@ public void testAllFails() throws Exception {
 	static class TestController {
 
 		@GetMapping("/test")
-		public String handle() {
-			return "It works!";
+		String handle() {
+			return "hello";
 		}
 	}
+
 }
diff --git a/src/docs/asciidoc/testing/testing-webtestclient.adoc b/src/docs/asciidoc/testing/testing-webtestclient.adoc
index 6c5dfb80da51..4335760e1048 100644
--- a/src/docs/asciidoc/testing/testing-webtestclient.adoc
+++ b/src/docs/asciidoc/testing/testing-webtestclient.adoc
@@ -262,19 +262,36 @@ To assert the response status and headers, use the following:
 .Java
 ----
 	client.get().uri("/persons/1")
-				.accept(MediaType.APPLICATION_JSON)
-				.exchange()
-				.expectStatus().isOk()
-				.expectHeader().contentType(MediaType.APPLICATION_JSON)
+		.accept(MediaType.APPLICATION_JSON)
+		.exchange()
+		.expectStatus().isOk()
+		.expectHeader().contentType(MediaType.APPLICATION_JSON);
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	client.get().uri("/persons/1")
-			.accept(MediaType.APPLICATION_JSON)
-			.exchange()
-			.expectStatus().isOk()
-			.expectHeader().contentType(MediaType.APPLICATION_JSON)
+		.accept(MediaType.APPLICATION_JSON)
+		.exchange()
+		.expectStatus().isOk()
+		.expectHeader().contentType(MediaType.APPLICATION_JSON)
+----
+
+If you would like for all expectations to be asserted even if one of them fails, you can
+use `expectAll(..)` instead of multiple chained `expect*(..)` calls. This feature is
+similar to the _soft assertions_ support in AssertJ and the `assertAll()` support in
+JUnit Jupiter.
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+	client.get().uri("/persons/1")
+		.accept(MediaType.APPLICATION_JSON)
+		.exchange()
+		.expectAll(
+			spec -> spec.expectStatus().isOk(),
+			spec -> spec.expectHeader().contentType(MediaType.APPLICATION_JSON)
+		);
 ----
 
 You can then choose to decode the response body through one of the following:

From e99b43b91e2a02b1cf18261ee85dccae5e6494e7 Mon Sep 17 00:00:00 2001
From: Axzial <axzial@protonmail.com>
Date: Sat, 21 Aug 2021 18:00:26 +0200
Subject: [PATCH 016/735] Support TimeUnit in the @Scheduled annotation

This commit introduces a new `timeUnit` attribute in the @Scheduled
annotation to allow the user to specify a time unit other than
milliseconds.

Closes gh-27309
---
 .../scheduling/annotation/Scheduled.java      |  36 ++-
 .../ScheduledAnnotationBeanPostProcessor.java |  15 +-
 ...duledAnnotationBeanPostProcessorTests.java | 216 +++++++++++++++++-
 3 files changed, 249 insertions(+), 18 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index 415c72381792..de7866073931 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -22,6 +22,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.concurrent.TimeUnit;
 
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 
@@ -46,6 +47,7 @@
  * @author Juergen Hoeller
  * @author Dave Syer
  * @author Chris Beams
+ * @author Victor Brown
  * @since 3.0
  * @see EnableScheduling
  * @see ScheduledAnnotationBeanPostProcessor
@@ -101,52 +103,64 @@
 	String zone() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between the
+	 * Execute the annotated method with a fixed period between the
 	 * end of the last invocation and the start of the next.
-	 * @return the delay in milliseconds
+	 * Using milliseconds by default with timeUnit().
+	 * @return the delay
 	 */
 	long fixedDelay() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between the
+	 * Execute the annotated method with a fixed period between the
 	 * end of the last invocation and the start of the next.
-	 * @return the delay in milliseconds as a String value, e.g. a placeholder
+	 * Using milliseconds by default with fixedDelayTimeUnit().
+	 * @return the delay as a String value, e.g. a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedDelayString() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between
+	 * Execute the annotated method with a fixed period between
 	 * invocations.
-	 * @return the period in milliseconds
+	 * Using milliseconds by default with timeUnit().
+	 * @return the period
 	 */
 	long fixedRate() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between
+	 * Execute the annotated method with a fixed period between
 	 * invocations.
-	 * @return the period in milliseconds as a String value, e.g. a placeholder
+	 * Using milliseconds by default with fixedRateTimeUnit().
+	 * @return the period as a String value, e.g. a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedRateString() default "";
 
 	/**
-	 * Number of milliseconds to delay before the first execution of a
+	 * Number to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
-	 * @return the initial delay in milliseconds
+	 * Using milliseconds by default with timeUnit().
+	 * @return the initial
 	 * @since 3.2
 	 */
 	long initialDelay() default -1;
 
 	/**
-	 * Number of milliseconds to delay before the first execution of a
+	 * Number to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
+	 * Using milliseconds by default with initialDelayTimeUnit().
 	 * @return the initial delay in milliseconds as a String value, e.g. a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String initialDelayString() default "";
 
+	/**
+	 * Specify the {@link TimeUnit} to use for initialDelay, fixedRate and fixedDelay values.
+	 * @return the {@link TimeUnit}, by default milliseconds will be used.
+	 */
+	TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
index 14b73d6d7f7c..52fae5dbab98 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -30,6 +30,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -94,6 +95,7 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  * @author Elizabeth Chatman
+ * @author Victor Brown
  * @since 3.0
  * @see Scheduled
  * @see EnableScheduling
@@ -398,7 +400,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			Set<ScheduledTask> tasks = new LinkedHashSet<>(4);
 
 			// Determine initial delay
-			long initialDelay = scheduled.initialDelay();
+			long initialDelay = TimeUnit.MILLISECONDS.convert(scheduled.initialDelay(), scheduled.timeUnit());
 			String initialDelayString = scheduled.initialDelayString();
 			if (StringUtils.hasText(initialDelayString)) {
 				Assert.isTrue(initialDelay < 0, "Specify 'initialDelay' or 'initialDelayString', not both");
@@ -407,7 +409,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 				}
 				if (StringUtils.hasLength(initialDelayString)) {
 					try {
-						initialDelay = parseDelayAsLong(initialDelayString);
+						initialDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(initialDelayString), scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -446,12 +448,13 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed delay
-			long fixedDelay = scheduled.fixedDelay();
+			long fixedDelay = TimeUnit.MILLISECONDS.convert(scheduled.fixedDelay(), scheduled.timeUnit());
 			if (fixedDelay >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
 				tasks.add(this.registrar.scheduleFixedDelayTask(new FixedDelayTask(runnable, fixedDelay, initialDelay)));
 			}
+
 			String fixedDelayString = scheduled.fixedDelayString();
 			if (StringUtils.hasText(fixedDelayString)) {
 				if (this.embeddedValueResolver != null) {
@@ -461,7 +464,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedDelay = parseDelayAsLong(fixedDelayString);
+						fixedDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedDelayString), scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -472,7 +475,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed rate
-			long fixedRate = scheduled.fixedRate();
+			long fixedRate = TimeUnit.MILLISECONDS.convert(scheduled.fixedRate(), scheduled.timeUnit());
 			if (fixedRate >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
@@ -487,7 +490,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedRate = parseDelayAsLong(fixedRateString);
+						fixedRate = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedRateString), scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
index 842910070227..494bf075c6df 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -67,6 +68,7 @@
  * @author Chris Beams
  * @author Sam Brannen
  * @author Stevo Slavić
+ * @author Victor Brown
  */
 public class ScheduledAnnotationBeanPostProcessorTests {
 
@@ -107,6 +109,62 @@ public void fixedDelayTask() {
 		assertThat(task.getInterval()).isEqualTo(5000L);
 	}
 
+	@Test
+	public void fixedDelayWithSecondsTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithSecondsTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
+		assertThat(fixedDelayTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedDelayTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(5000L);
+	}
+
+	@Test
+	public void fixedDelayWithMinutesTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithMinutesTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
+		assertThat(fixedDelayTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedDelayTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(180000L);
+	}
+
 	@Test
 	public void fixedRateTask() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
@@ -135,6 +193,62 @@ public void fixedRateTask() {
 		assertThat(task.getInterval()).isEqualTo(3000L);
 	}
 
+	@Test
+	public void fixedRateWithSecondsTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(5000L);
+	}
+
+	@Test
+	public void fixedRateWithMinutesTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(180000L);
+	}
+
 	@Test
 	public void fixedRateTaskWithInitialDelay() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
@@ -163,6 +277,62 @@ public void fixedRateTaskWithInitialDelay() {
 		assertThat(task.getInterval()).isEqualTo(3000L);
 	}
 
+	@Test
+	public void fixedRateTaskWithSecondsTimeUnitWithInitialDelay() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitInitialDelayTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(5000L);
+		assertThat(task.getInterval()).isEqualTo(3000L);
+	}
+
+	@Test
+	public void fixedRateTaskWithMinutesTimeUnitWithInitialDelay() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitInitialDelayTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(60000L);
+		assertThat(task.getInterval()).isEqualTo(180000L);
+	}
+
 	@Test
 	public void severalFixedRatesWithRepeatedScheduledAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
@@ -702,6 +872,22 @@ public void fixedDelay() {
 		}
 	}
 
+	static class FixedDelayWithSecondsTimeUnitTestBean {
+
+		@Scheduled(fixedDelay = 5, timeUnit = TimeUnit.SECONDS)
+		public void fixedDelay() {
+		}
+
+	}
+
+	static class FixedDelayWithMinutesTimeUnitTestBean {
+
+		@Scheduled(fixedDelay = 3, timeUnit = TimeUnit.MINUTES)
+		public void fixedDelay() {
+		}
+
+	}
+
 
 	static class FixedRateTestBean {
 
@@ -709,6 +895,20 @@ static class FixedRateTestBean {
 		public void fixedRate() {
 		}
 	}
+	static class FixedRateWithSecondsTimeUnitTestBean {
+
+		@Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)
+		public void fixedRate() {
+		}
+	}
+
+
+	static class FixedRateWithMinutesTimeUnitTestBean {
+
+		@Scheduled(fixedRate = 3, timeUnit = TimeUnit.MINUTES)
+		public void fixedRate() {
+		}
+	}
 
 
 	static class FixedRateWithInitialDelayTestBean {
@@ -718,6 +918,20 @@ public void fixedRate() {
 		}
 	}
 
+	static class FixedRateWithSecondsTimeUnitInitialDelayTestBean {
+
+		@Scheduled(fixedRate = 3, initialDelay = 5, timeUnit = TimeUnit.SECONDS)
+		public void fixedRate() {
+		}
+	}
+
+	static class FixedRateWithMinutesTimeUnitInitialDelayTestBean {
+
+		@Scheduled(fixedRate = 3, initialDelay = 1, timeUnit = TimeUnit.MINUTES)
+		public void fixedRate() {
+		}
+	}
+
 
 	static class SeveralFixedRatesWithSchedulesContainerAnnotationTestBean {
 

From bd72e4498b9d1824646c88fa6fa08c1780484d2f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 25 Aug 2021 20:46:51 +0200
Subject: [PATCH 017/735] Revise and document TimeUnit support in @Scheduled

This commit also fixes a bug introduced in commit e99b43b91e, where
java.time.Duration strings were converted to milliseconds and then
converted again using the configured TimeUnit.

See gh-27309
---
 .../scheduling/annotation/Scheduled.java      |  54 ++-
 .../ScheduledAnnotationBeanPostProcessor.java |  29 +-
 ...duledAnnotationBeanPostProcessorTests.java | 454 +++++++-----------
 src/docs/asciidoc/integration.adoc            |  41 +-
 4 files changed, 253 insertions(+), 325 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index de7866073931..ce55aeb82cbd 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -48,6 +48,7 @@
  * @author Dave Syer
  * @author Chris Beams
  * @author Victor Brown
+ * @author Sam Brannen
  * @since 3.0
  * @see EnableScheduling
  * @see ScheduledAnnotationBeanPostProcessor
@@ -103,63 +104,74 @@
 	String zone() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period between the
-	 * end of the last invocation and the start of the next.
-	 * Using milliseconds by default with timeUnit().
+	 * Execute the annotated method with a fixed period between the end of the
+	 * last invocation and the start of the next.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
 	 * @return the delay
 	 */
 	long fixedDelay() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period between the
-	 * end of the last invocation and the start of the next.
-	 * Using milliseconds by default with fixedDelayTimeUnit().
-	 * @return the delay as a String value, e.g. a placeholder
+	 * Execute the annotated method with a fixed period between the end of the
+	 * last invocation and the start of the next.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
+	 * @return the delay as a String value &mdash; for example, a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedDelayString() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period between
-	 * invocations.
-	 * Using milliseconds by default with timeUnit().
+	 * Execute the annotated method with a fixed period between invocations.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
 	 * @return the period
 	 */
 	long fixedRate() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period between
-	 * invocations.
-	 * Using milliseconds by default with fixedRateTimeUnit().
-	 * @return the period as a String value, e.g. a placeholder
+	 * Execute the annotated method with a fixed period between invocations.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
+	 * @return the period as a String value &mdash; for example, a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedRateString() default "";
 
 	/**
-	 * Number to delay before the first execution of a
+	 * Number of units of time to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
-	 * Using milliseconds by default with timeUnit().
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
 	 * @return the initial
 	 * @since 3.2
 	 */
 	long initialDelay() default -1;
 
 	/**
-	 * Number to delay before the first execution of a
+	 * Number of units of time to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
-	 * Using milliseconds by default with initialDelayTimeUnit().
-	 * @return the initial delay in milliseconds as a String value, e.g. a placeholder
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
+	 * @return the initial delay as a String value &mdash; for example, a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String initialDelayString() default "";
 
 	/**
-	 * Specify the {@link TimeUnit} to use for initialDelay, fixedRate and fixedDelay values.
-	 * @return the {@link TimeUnit}, by default milliseconds will be used.
+	 * The {@link TimeUnit} to use for {@link #fixedDelay}, {@link #fixedDelayString},
+	 * {@link #fixedRate}, {@link #fixedRateString}, {@link #initialDelay}, and
+	 * {@link #initialDelayString}.
+	 * <p>Defaults to {@link TimeUnit#MICROSECONDS}.
+	 * <p>This attribute is ignored for {@linkplain #cron() cron expressions}
+	 * and for {@link java.time.Duration} values supplied via {@link #fixedDelayString},
+	 * {@link #fixedRateString}, or {@link #initialDelayString}.
+	 * @return the {@code TimeUnit} to use
+	 * @since 5.3.10
 	 */
 	TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
index 52fae5dbab98..5e47ccda548f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -96,6 +96,7 @@
  * @author Chris Beams
  * @author Elizabeth Chatman
  * @author Victor Brown
+ * @author Sam Brannen
  * @since 3.0
  * @see Scheduled
  * @see EnableScheduling
@@ -385,7 +386,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 
 	/**
 	 * Process the given {@code @Scheduled} method declaration on the given bean.
-	 * @param scheduled the @Scheduled annotation
+	 * @param scheduled the {@code @Scheduled} annotation
 	 * @param method the method that the annotation has been declared on
 	 * @param bean the target bean instance
 	 * @see #createRunnable(Object, Method)
@@ -400,7 +401,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			Set<ScheduledTask> tasks = new LinkedHashSet<>(4);
 
 			// Determine initial delay
-			long initialDelay = TimeUnit.MILLISECONDS.convert(scheduled.initialDelay(), scheduled.timeUnit());
+			long initialDelay = convertToMillis(scheduled.initialDelay(), scheduled.timeUnit());
 			String initialDelayString = scheduled.initialDelayString();
 			if (StringUtils.hasText(initialDelayString)) {
 				Assert.isTrue(initialDelay < 0, "Specify 'initialDelay' or 'initialDelayString', not both");
@@ -409,7 +410,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 				}
 				if (StringUtils.hasLength(initialDelayString)) {
 					try {
-						initialDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(initialDelayString), scheduled.timeUnit());
+						initialDelay = convertToMillis(initialDelayString, scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -448,7 +449,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed delay
-			long fixedDelay = TimeUnit.MILLISECONDS.convert(scheduled.fixedDelay(), scheduled.timeUnit());
+			long fixedDelay = convertToMillis(scheduled.fixedDelay(), scheduled.timeUnit());
 			if (fixedDelay >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
@@ -464,7 +465,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedDelayString), scheduled.timeUnit());
+						fixedDelay = convertToMillis(fixedDelayString, scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -475,7 +476,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed rate
-			long fixedRate = TimeUnit.MILLISECONDS.convert(scheduled.fixedRate(), scheduled.timeUnit());
+			long fixedRate = convertToMillis(scheduled.fixedRate(), scheduled.timeUnit());
 			if (fixedRate >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
@@ -490,7 +491,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedRate = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedRateString), scheduled.timeUnit());
+						fixedRate = convertToMillis(fixedRateString, scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -530,11 +531,19 @@ protected Runnable createRunnable(Object target, Method method) {
 		return new ScheduledMethodRunnable(target, invocableMethod);
 	}
 
-	private static long parseDelayAsLong(String value) throws RuntimeException {
-		if (value.length() > 1 && (isP(value.charAt(0)) || isP(value.charAt(1)))) {
+	private static long convertToMillis(long value, TimeUnit timeUnit) {
+		return TimeUnit.MILLISECONDS.convert(value, timeUnit);
+	}
+
+	private static long convertToMillis(String value, TimeUnit timeUnit) {
+		if (isDurationString(value)) {
 			return Duration.parse(value).toMillis();
 		}
-		return Long.parseLong(value);
+		return convertToMillis(Long.parseLong(value), timeUnit);
+	}
+
+	private static boolean isDurationString(String value) {
+		return (value.length() > 1 && (isP(value.charAt(0)) || isP(value.charAt(1))));
 	}
 
 	private static boolean isP(char ch) {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
index 494bf075c6df..04a08b00e64c 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -33,6 +33,12 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.converter.ArgumentConversionException;
+import org.junit.jupiter.params.converter.ArgumentConverter;
+import org.junit.jupiter.params.converter.ConvertWith;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.scope.ScopedProxyUtils;
@@ -61,8 +67,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 /**
+ * Tests for {@link ScheduledAnnotationBeanPostProcessor}.
+ *
  * @author Mark Fisher
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -70,77 +79,25 @@
  * @author Stevo Slavić
  * @author Victor Brown
  */
-public class ScheduledAnnotationBeanPostProcessorTests {
+class ScheduledAnnotationBeanPostProcessorTests {
 
 	private final StaticApplicationContext context = new StaticApplicationContext();
 
 
 	@AfterEach
-	public void closeContextAfterTest() {
+	void closeContextAfterTest() {
 		context.close();
 	}
 
-
-	@Test
-	public void fixedDelayTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
-		assertThat(fixedDelayTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedDelayTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void fixedDelayWithSecondsTimeUnitTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithSecondsTimeUnitTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
-		assertThat(fixedDelayTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedDelayTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void fixedDelayWithMinutesTimeUnitTask() {
+	@ParameterizedTest
+	@CsvSource({
+		"FixedDelay, 5000",
+		"FixedDelayInSeconds, 5000",
+		"FixedDelayInMinutes, 180000"
+	})
+	void fixedDelayTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithMinutesTimeUnitTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
 		context.refresh();
@@ -154,7 +111,7 @@ public void fixedDelayWithMinutesTimeUnitTask() {
 		@SuppressWarnings("unchecked")
 		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
 				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
-		assertThat(fixedDelayTasks.size()).isEqualTo(1);
+		assertThat(fixedDelayTasks).hasSize(1);
 		IntervalTask task = fixedDelayTasks.get(0);
 		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
 		Object targetObject = runnable.getTarget();
@@ -162,125 +119,18 @@ public void fixedDelayWithMinutesTimeUnitTask() {
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
 		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(180000L);
-	}
-
-	@Test
-	public void fixedRateTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
-	}
-
-	@Test
-	public void fixedRateWithSecondsTimeUnitTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void fixedRateWithMinutesTimeUnitTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(180000L);
-	}
-
-	@Test
-	public void fixedRateTaskWithInitialDelay() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithInitialDelayTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(1000L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
+		assertThat(task.getInterval()).isEqualTo(expectedInterval);
 	}
 
-	@Test
-	public void fixedRateTaskWithSecondsTimeUnitWithInitialDelay() {
+	@ParameterizedTest
+	@CsvSource({
+		"FixedRate, 3000",
+		"FixedRateInSeconds, 5000",
+		"FixedRateInMinutes, 180000"
+	})
+	void fixedRateTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitInitialDelayTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
 		context.refresh();
@@ -301,14 +151,21 @@ public void fixedRateTaskWithSecondsTimeUnitWithInitialDelay() {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(5000L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
-	}
-
-	@Test
-	public void fixedRateTaskWithMinutesTimeUnitWithInitialDelay() {
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(0);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
+	}
+
+	@ParameterizedTest
+	@CsvSource({
+		"FixedRateWithInitialDelay, 1000, 3000",
+		"FixedRateWithInitialDelayInSeconds, 5000, 3000",
+		"FixedRateWithInitialDelayInMinutes, 60000, 180000"
+	})
+	void fixedRateTaskWithInitialDelay(@NameToClass Class<?> beanClass, long expectedInitialDelay, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitInitialDelayTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
 		context.refresh();
@@ -329,40 +186,42 @@ public void fixedRateTaskWithMinutesTimeUnitWithInitialDelay() {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(60000L);
-		assertThat(task.getInterval()).isEqualTo(180000L);
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
 	}
 
 	@Test
-	public void severalFixedRatesWithRepeatedScheduledAnnotation() {
+	void severalFixedRatesWithRepeatedScheduledAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesWithSchedulesContainerAnnotation() {
+	void severalFixedRatesWithSchedulesContainerAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(SeveralFixedRatesWithSchedulesContainerAnnotationTestBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesOnBaseClass() {
+	void severalFixedRatesOnBaseClass() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRatesSubBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesOnDefaultMethod() {
+	void severalFixedRatesOnDefaultMethod() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRatesDefaultBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesAgainstNestedCglibProxy() {
+	void severalFixedRatesAgainstNestedCglibProxy() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean.class);
 		targetDefinition.setFactoryMethodName("nestedProxy");
@@ -405,7 +264,7 @@ private void severalFixedRates(StaticApplicationContext context,
 	}
 
 	@Test
-	public void cronTask() {
+	void cronTask() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -432,7 +291,7 @@ public void cronTask() {
 	}
 
 	@Test
-	public void cronTaskWithZone() {
+	void cronTaskWithZone() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronWithTimezoneTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -478,7 +337,7 @@ public void cronTaskWithZone() {
 	}
 
 	@Test
-	public void cronTaskWithInvalidZone() {
+	void cronTaskWithInvalidZone() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronWithInvalidTimezoneTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -488,7 +347,7 @@ public void cronTaskWithInvalidZone() {
 	}
 
 	@Test
-	public void cronTaskWithMethodValidation() {
+	void cronTaskWithMethodValidation() {
 		BeanDefinition validationDefinition = new RootBeanDefinition(MethodValidationPostProcessor.class);
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronTestBean.class);
@@ -500,7 +359,7 @@ public void cronTaskWithMethodValidation() {
 	}
 
 	@Test
-	public void cronTaskWithScopedProxy() {
+	void cronTaskWithScopedProxy() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		new AnnotatedBeanDefinitionReader(context).register(ProxiedCronTestBean.class, ProxiedCronTestBeanDependent.class);
@@ -525,7 +384,7 @@ public void cronTaskWithScopedProxy() {
 	}
 
 	@Test
-	public void metaAnnotationWithFixedRate() {
+	void metaAnnotationWithFixedRate() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(MetaAnnotationFixedRateTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -552,7 +411,7 @@ public void metaAnnotationWithFixedRate() {
 	}
 
 	@Test
-	public void composedAnnotationWithInitialDelayAndFixedRate() {
+	void composedAnnotationWithInitialDelayAndFixedRate() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(ComposedAnnotationFixedRateTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -580,7 +439,7 @@ public void composedAnnotationWithInitialDelayAndFixedRate() {
 	}
 
 	@Test
-	public void metaAnnotationWithCronExpression() {
+	void metaAnnotationWithCronExpression() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(MetaAnnotationCronTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -607,7 +466,7 @@ public void metaAnnotationWithCronExpression() {
 	}
 
 	@Test
-	public void propertyPlaceholderWithCron() {
+	void propertyPlaceholderWithCron() {
 		String businessHoursCronExpression = "0 0 9-17 * * MON-FRI";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
@@ -640,7 +499,7 @@ public void propertyPlaceholderWithCron() {
 	}
 
 	@Test
-	public void propertyPlaceholderWithInactiveCron() {
+	void propertyPlaceholderWithInactiveCron() {
 		String businessHoursCronExpression = "-";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
@@ -657,24 +516,23 @@ public void propertyPlaceholderWithInactiveCron() {
 		assertThat(postProcessor.getScheduledTasks().isEmpty()).isTrue();
 	}
 
-	@Test
-	public void propertyPlaceholderWithFixedDelayInMillis() {
-		propertyPlaceholderWithFixedDelay(false);
-	}
-
-	@Test
-	public void propertyPlaceholderWithFixedDelayInDuration() {
-		propertyPlaceholderWithFixedDelay(true);
-	}
+	@ParameterizedTest
+	@CsvSource({
+		"PropertyPlaceholderWithFixedDelay, 5000, 1000, 5000, 1000",
+		"PropertyPlaceholderWithFixedDelay, PT5S, PT1S, 5000, 1000",
+		"PropertyPlaceholderWithFixedDelayInSeconds, 5000, 1000, 5000000, 1000000",
+		"PropertyPlaceholderWithFixedDelayInSeconds, PT5S, PT1S, 5000, 1000"
+	})
+	void propertyPlaceholderWithFixedDelay(@NameToClass Class<?> beanClass, String fixedDelay, String initialDelay,
+			long expectedInterval, long expectedInitialDelay) {
 
-	private void propertyPlaceholderWithFixedDelay(boolean durationFormat) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
 		Properties properties = new Properties();
-		properties.setProperty("fixedDelay", (durationFormat ? "PT5S" : "5000"));
-		properties.setProperty("initialDelay", (durationFormat ? "PT1S" : "1000"));
+		properties.setProperty("fixedDelay", fixedDelay);
+		properties.setProperty("initialDelay", initialDelay);
 		placeholderDefinition.getPropertyValues().addPropertyValue("properties", properties);
-		BeanDefinition targetDefinition = new RootBeanDefinition(PropertyPlaceholderWithFixedDelayTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("placeholder", placeholderDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
@@ -696,28 +554,29 @@ private void propertyPlaceholderWithFixedDelay(boolean durationFormat) {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
-		assertThat(task.getInitialDelay()).isEqualTo(1000L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void propertyPlaceholderWithFixedRateInMillis() {
-		propertyPlaceholderWithFixedRate(false);
-	}
-
-	@Test
-	public void propertyPlaceholderWithFixedRateInDuration() {
-		propertyPlaceholderWithFixedRate(true);
-	}
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
+	}
+
+	@ParameterizedTest
+	@CsvSource({
+		"PropertyPlaceholderWithFixedRate, 3000, 1000, 3000, 1000",
+		"PropertyPlaceholderWithFixedRate, PT3S, PT1S, 3000, 1000",
+		"PropertyPlaceholderWithFixedRateInSeconds, 3000, 1000, 3000000, 1000000",
+		"PropertyPlaceholderWithFixedRateInSeconds, PT3S, PT1S, 3000, 1000"
+	})
+	void propertyPlaceholderWithFixedRate(@NameToClass Class<?> beanClass, String fixedRate, String initialDelay,
+			long expectedInterval, long expectedInitialDelay) {
 
-	private void propertyPlaceholderWithFixedRate(boolean durationFormat) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
 		Properties properties = new Properties();
-		properties.setProperty("fixedRate", (durationFormat ? "PT3S" : "3000"));
-		properties.setProperty("initialDelay", (durationFormat ? "PT1S" : "1000"));
+		properties.setProperty("fixedRate", fixedRate);
+		properties.setProperty("initialDelay", initialDelay);
 		placeholderDefinition.getPropertyValues().addPropertyValue("properties", properties);
-		BeanDefinition targetDefinition = new RootBeanDefinition(PropertyPlaceholderWithFixedRateTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("placeholder", placeholderDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
@@ -739,12 +598,14 @@ private void propertyPlaceholderWithFixedRate(boolean durationFormat) {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(1000L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
 	}
 
 	@Test
-	public void expressionWithCron() {
+	void expressionWithCron() {
 		String businessHoursCronExpression = "0 0 9-17 * * MON-FRI";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(ExpressionWithCronTestBean.class);
@@ -775,7 +636,7 @@ public void expressionWithCron() {
 	}
 
 	@Test
-	public void propertyPlaceholderForMetaAnnotation() {
+	void propertyPlaceholderForMetaAnnotation() {
 		String businessHoursCronExpression = "0 0 9-17 * * MON-FRI";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
@@ -808,7 +669,7 @@ public void propertyPlaceholderForMetaAnnotation() {
 	}
 
 	@Test
-	public void nonVoidReturnType() {
+	void nonVoidReturnType() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(NonVoidReturnTypeTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -835,7 +696,7 @@ public void nonVoidReturnType() {
 	}
 
 	@Test
-	public void emptyAnnotation() {
+	void emptyAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(EmptyAnnotationTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -845,7 +706,7 @@ public void emptyAnnotation() {
 	}
 
 	@Test
-	public void invalidCron() throws Throwable {
+	void invalidCron() throws Throwable {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(InvalidCronTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -855,7 +716,7 @@ public void invalidCron() throws Throwable {
 	}
 
 	@Test
-	public void nonEmptyParamList() {
+	void nonEmptyParamList() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(NonEmptyParamListTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -865,70 +726,68 @@ public void nonEmptyParamList() {
 	}
 
 
-	static class FixedDelayTestBean {
+	static class FixedDelay {
 
 		@Scheduled(fixedDelay = 5000)
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
 	}
 
-	static class FixedDelayWithSecondsTimeUnitTestBean {
+	static class FixedDelayInSeconds {
 
 		@Scheduled(fixedDelay = 5, timeUnit = TimeUnit.SECONDS)
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
-
 	}
 
-	static class FixedDelayWithMinutesTimeUnitTestBean {
+	static class FixedDelayInMinutes {
 
 		@Scheduled(fixedDelay = 3, timeUnit = TimeUnit.MINUTES)
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
-
 	}
 
 
-	static class FixedRateTestBean {
+	static class FixedRate {
 
 		@Scheduled(fixedRate = 3000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
-	static class FixedRateWithSecondsTimeUnitTestBean {
+
+	static class FixedRateInSeconds {
 
 		@Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
-
-	static class FixedRateWithMinutesTimeUnitTestBean {
+	static class FixedRateInMinutes {
 
 		@Scheduled(fixedRate = 3, timeUnit = TimeUnit.MINUTES)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
 
-	static class FixedRateWithInitialDelayTestBean {
+	static class FixedRateWithInitialDelay {
 
 		@Scheduled(fixedRate = 3000, initialDelay = 1000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
-	static class FixedRateWithSecondsTimeUnitInitialDelayTestBean {
+	static class FixedRateWithInitialDelayInSeconds {
 
 		@Scheduled(fixedRate = 3, initialDelay = 5, timeUnit = TimeUnit.SECONDS)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
-	static class FixedRateWithMinutesTimeUnitInitialDelayTestBean {
+	static class FixedRateWithInitialDelayInMinutes {
 
 		@Scheduled(fixedRate = 3, initialDelay = 1, timeUnit = TimeUnit.MINUTES)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
@@ -936,7 +795,7 @@ public void fixedRate() {
 	static class SeveralFixedRatesWithSchedulesContainerAnnotationTestBean {
 
 		@Schedules({@Scheduled(fixedRate = 4000), @Scheduled(fixedRate = 4000, initialDelay = 2000)})
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
@@ -945,7 +804,7 @@ static class SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean {
 
 		@Scheduled(fixedRate = 4000)
 		@Scheduled(fixedRate = 4000, initialDelay = 2000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 
 		static SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean nestedProxy() {
@@ -962,7 +821,7 @@ static class FixedRatesBaseBean {
 
 		@Scheduled(fixedRate = 4000)
 		@Scheduled(fixedRate = 4000, initialDelay = 2000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
@@ -1006,7 +865,7 @@ protected void cron() throws IOException {
 	static class CronWithInvalidTimezoneTestBean {
 
 		@Scheduled(cron = "0 0 0-4,6-23 * * ?", zone = "FOO")
-		public void cron() throws IOException {
+		void cron() throws IOException {
 			throw new IOException("no no no");
 		}
 	}
@@ -1017,7 +876,7 @@ public void cron() throws IOException {
 	static class ProxiedCronTestBean {
 
 		@Scheduled(cron = "*/7 * * * * ?")
-		public void cron() throws IOException {
+		void cron() throws IOException {
 			throw new IOException("no no no");
 		}
 	}
@@ -1025,7 +884,7 @@ public void cron() throws IOException {
 
 	static class ProxiedCronTestBeanDependent {
 
-		public ProxiedCronTestBeanDependent(ProxiedCronTestBean testBean) {
+		ProxiedCronTestBeanDependent(ProxiedCronTestBean testBean) {
 		}
 	}
 
@@ -1033,7 +892,7 @@ public ProxiedCronTestBeanDependent(ProxiedCronTestBean testBean) {
 	static class NonVoidReturnTypeTestBean {
 
 		@Scheduled(cron = "0 0 9-17 * * MON-FRI")
-		public String cron() {
+		String cron() {
 			return "oops";
 		}
 	}
@@ -1042,7 +901,7 @@ public String cron() {
 	static class EmptyAnnotationTestBean {
 
 		@Scheduled
-		public void invalid() {
+		void invalid() {
 		}
 	}
 
@@ -1050,7 +909,7 @@ public void invalid() {
 	static class InvalidCronTestBean {
 
 		@Scheduled(cron = "abc")
-		public void invalid() {
+		void invalid() {
 		}
 	}
 
@@ -1058,7 +917,7 @@ public void invalid() {
 	static class NonEmptyParamListTestBean {
 
 		@Scheduled(fixedRate = 3000)
-		public void invalid(String oops) {
+		void invalid(String oops) {
 		}
 	}
 
@@ -1090,7 +949,7 @@ public void invalid(String oops) {
 	static class MetaAnnotationFixedRateTestBean {
 
 		@EveryFiveSeconds
-		public void checkForUpdates() {
+		void checkForUpdates() {
 		}
 	}
 
@@ -1098,7 +957,7 @@ public void checkForUpdates() {
 	static class ComposedAnnotationFixedRateTestBean {
 
 		@WaitASec(fixedRate = 5000)
-		public void checkForUpdates() {
+		void checkForUpdates() {
 		}
 	}
 
@@ -1106,7 +965,7 @@ public void checkForUpdates() {
 	static class MetaAnnotationCronTestBean {
 
 		@Hourly
-		public void generateReport() {
+		void generateReport() {
 		}
 	}
 
@@ -1114,23 +973,37 @@ public void generateReport() {
 	static class PropertyPlaceholderWithCronTestBean {
 
 		@Scheduled(cron = "${schedules.businessHours}")
-		public void x() {
+		void x() {
 		}
 	}
 
 
-	static class PropertyPlaceholderWithFixedDelayTestBean {
+	static class PropertyPlaceholderWithFixedDelay {
 
 		@Scheduled(fixedDelayString = "${fixedDelay}", initialDelayString = "${initialDelay}")
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
 	}
 
+	static class PropertyPlaceholderWithFixedDelayInSeconds {
+
+		@Scheduled(fixedDelayString = "${fixedDelay}", initialDelayString = "${initialDelay}", timeUnit = TimeUnit.SECONDS)
+		void fixedDelay() {
+		}
+	}
 
-	static class PropertyPlaceholderWithFixedRateTestBean {
+
+	static class PropertyPlaceholderWithFixedRate {
 
 		@Scheduled(fixedRateString = "${fixedRate}", initialDelayString = "${initialDelay}")
-		public void fixedRate() {
+		void fixedRate() {
+		}
+	}
+
+	static class PropertyPlaceholderWithFixedRateInSeconds {
+
+		@Scheduled(fixedRateString = "${fixedRate}", initialDelayString = "${initialDelay}", timeUnit = TimeUnit.SECONDS)
+		void fixedRate() {
 		}
 	}
 
@@ -1138,7 +1011,7 @@ public void fixedRate() {
 	static class ExpressionWithCronTestBean {
 
 		@Scheduled(cron = "#{schedules.businessHours}")
-		public void x() {
+		void x() {
 		}
 	}
 
@@ -1153,7 +1026,24 @@ public void x() {
 	static class PropertyPlaceholderMetaAnnotationTestBean {
 
 		@BusinessHours
-		public void y() {
+		void y() {
+		}
+	}
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@ConvertWith(NameToClass.Converter.class)
+	private @interface NameToClass {
+		class Converter implements ArgumentConverter {
+			@Override
+			public Class<?> convert(Object beanClassName, ParameterContext context) throws ArgumentConversionException {
+				try {
+					String name = getClass().getEnclosingClass().getEnclosingClass().getName() + "$" + beanClassName;
+					return getClass().getClassLoader().loadClass(name);
+				}
+				catch (Exception ex) {
+					throw new ArgumentConversionException("Failed to convert class name to Class", ex);
+				}
+			}
 		}
 	}
 
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 15e49e487d23..dae0ac82ac01 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -4923,37 +4923,54 @@ switching to `aspectj` mode in combination with compile-time or load-time weavin
 ==== The `@Scheduled` annotation
 
 You can add the `@Scheduled` annotation to a method, along with trigger metadata. For
-example, the following method is invoked every five seconds with a fixed delay,
-meaning that the period is measured from the completion time of each preceding
-invocation:
+example, the following method is invoked every five seconds (5000 milliseconds) with a
+fixed delay, meaning that the period is measured from the completion time of each
+preceding invocation.
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Scheduled(fixedDelay=5000)
+	@Scheduled(fixedDelay = 5000)
 	public void doSomething() {
 		// something that should run periodically
 	}
 ----
 
-If you need a fixed-rate execution, you can change the property name specified within
-the annotation. The following method is invoked every five seconds (measured between the
-successive start times of each invocation):
+[NOTE]
+====
+By default, milliseconds will be used as the time unit for fixed delay, fixed rate, and
+initial delay values. If you would like to use a different time unit such as seconds or
+minutes, you can configure this via the `timeUnit` attribute in `@Scheduled`.
+
+For example, the previous example can also be written as follows.
+
+[source,java,indent=0,subs="verbatim,quotes"]
+----
+	@Scheduled(fixedDelay = 5, timeUnit = TimeUnit.SECONDS)
+	public void doSomething() {
+		// something that should run periodically
+	}
+----
+====
+
+If you need a fixed-rate execution, you can use the `fixedRate` attribute within the
+annotation. The following method is invoked every five seconds (measured between the
+successive start times of each invocation).
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Scheduled(fixedRate=5000)
+	@Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)
 	public void doSomething() {
 		// something that should run periodically
 	}
 ----
 
 For fixed-delay and fixed-rate tasks, you can specify an initial delay by indicating the
-number of milliseconds to wait before the first execution of the method, as the following
-`fixedRate` example shows:
+amount of time to wait before the first execution of the method, as the following
+`fixedRate` example shows.
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Scheduled(initialDelay=1000, fixedRate=5000)
+	@Scheduled(initialDelay = 1000, fixedRate = 5000)
 	public void doSomething() {
 		// something that should run periodically
 	}
@@ -4975,7 +4992,7 @@ The following example runs only on weekdays:
 TIP: You can also use the `zone` attribute to specify the time zone in which the cron
 expression is resolved.
 
-Notice that the methods to be scheduled must have void returns and must not expect any
+Notice that the methods to be scheduled must have void returns and must not accept any
 arguments. If the method needs to interact with other objects from the application
 context, those would typically have been provided through dependency injection.
 

From 9a7fb7022dd5b7d2d8d5514ab2fb827b3e32854a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 26 Aug 2021 13:43:48 +0200
Subject: [PATCH 018/735] Fix typo in @Scheduled

See gh-27309
---
 .../org/springframework/scheduling/annotation/Scheduled.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index ce55aeb82cbd..468906a61445 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -166,7 +166,7 @@
 	 * The {@link TimeUnit} to use for {@link #fixedDelay}, {@link #fixedDelayString},
 	 * {@link #fixedRate}, {@link #fixedRateString}, {@link #initialDelay}, and
 	 * {@link #initialDelayString}.
-	 * <p>Defaults to {@link TimeUnit#MICROSECONDS}.
+	 * <p>Defaults to {@link TimeUnit#MILLISECONDS}.
 	 * <p>This attribute is ignored for {@linkplain #cron() cron expressions}
 	 * and for {@link java.time.Duration} values supplied via {@link #fixedDelayString},
 	 * {@link #fixedRateString}, or {@link #initialDelayString}.

From c27ec00ae94bb3a2555c7762264ff009fa57ee0c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 26 Aug 2021 14:09:23 +0200
Subject: [PATCH 019/735] Polish scheduling Javadoc

---
 .../annotation/EnableScheduling.java          | 30 ++++++++-----------
 .../scheduling/annotation/Scheduled.java      |  2 +-
 .../ScheduledAnnotationBeanPostProcessor.java | 15 ++++++----
 .../annotation/SchedulingConfigurer.java      | 18 +++++------
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
index d94b5f5e9c79..e35b0a799291 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 /**
  * Enables Spring's scheduled task execution capability, similar to
  * functionality found in Spring's {@code <task:*>} XML namespace. To be used
- * on @{@link Configuration} classes as follows:
+ * on {@link Configuration @Configuration} classes as follows:
  *
  * <pre class="code">
  * &#064;Configuration
@@ -41,8 +41,8 @@
  *     // various &#064;Bean definitions
  * }</pre>
  *
- * This enables detection of @{@link Scheduled} annotations on any Spring-managed
- * bean in the container. For example, given a class {@code MyTask}
+ * <p>This enables detection of {@link Scheduled @Scheduled} annotations on any
+ * Spring-managed bean in the container. For example, given a class {@code MyTask}:
  *
  * <pre class="code">
  * package com.myco.tasks;
@@ -55,7 +55,7 @@
  *     }
  * }</pre>
  *
- * the following configuration would ensure that {@code MyTask.work()} is called
+ * <p>the following configuration would ensure that {@code MyTask.work()} is called
  * once every 1000 ms:
  *
  * <pre class="code">
@@ -69,7 +69,7 @@
  *     }
  * }</pre>
  *
- * Alternatively, if {@code MyTask} were annotated with {@code @Component}, the
+ * <p>Alternatively, if {@code MyTask} were annotated with {@code @Component}, the
  * following configuration would ensure that its {@code @Scheduled} method is
  * invoked at the desired interval:
  *
@@ -80,7 +80,7 @@
  * public class AppConfig {
  * }</pre>
  *
- * Methods annotated with {@code @Scheduled} may even be declared directly within
+ * <p>Methods annotated with {@code @Scheduled} may even be declared directly within
  * {@code @Configuration} classes:
  *
  * <pre class="code">
@@ -94,7 +94,7 @@
  *     }
  * }</pre>
  *
- * <p>By default, will be searching for an associated scheduler definition: either
+ * <p>By default, Spring will search for an associated scheduler definition: either
  * a unique {@link org.springframework.scheduling.TaskScheduler} bean in the context,
  * or a {@code TaskScheduler} bean named "taskScheduler" otherwise; the same lookup
  * will also be performed for a {@link java.util.concurrent.ScheduledExecutorService}
@@ -141,11 +141,7 @@
  *     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
  *         taskRegistrar.setScheduler(taskScheduler());
  *         taskRegistrar.addTriggerTask(
- *             new Runnable() {
- *                 public void run() {
- *                     myTask().work();
- *                 }
- *             },
+ *             () -&gt; myTask().work(),
  *             new CustomTrigger()
  *         );
  *     }
@@ -165,7 +161,7 @@
  * configuration:
  *
  * <pre class="code">
- * &lt;beans>
+ * &lt;beans&gt;
  *
  *     &lt;task:annotation-driven scheduler="taskScheduler"/&gt;
  *
@@ -180,13 +176,13 @@
  * &lt;/beans&gt;
  * </pre>
  *
- * The examples are equivalent save that in XML a <em>fixed-rate</em> period is used
+ * <p>The examples are equivalent save that in XML a <em>fixed-rate</em> period is used
  * instead of a custom <em>{@code Trigger}</em> implementation; this is because the
  * {@code task:} namespace {@code scheduled} cannot easily expose such support. This is
  * but one demonstration how the code-based approach allows for maximum configurability
- * through direct access to actual componentry.<p>
+ * through direct access to actual componentry.
  *
- * <b>Note: {@code @EnableScheduling} applies to its local application context only,
+ * <p><b>Note: {@code @EnableScheduling} applies to its local application context only,
  * allowing for selective scheduling of beans at different levels.</b> Please redeclare
  * {@code @EnableScheduling} in each individual context, e.g. the common root web
  * application context and any separate {@code DispatcherServlet} application contexts,
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index 468906a61445..f3aa81296a23 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -38,7 +38,7 @@
  * <p>Processing of {@code @Scheduled} annotations is performed by
  * registering a {@link ScheduledAnnotationBeanPostProcessor}. This can be
  * done manually or, more conveniently, through the {@code <task:annotation-driven/>}
- * element or @{@link EnableScheduling} annotation.
+ * XML element or {@link EnableScheduling @EnableScheduling} annotation.
  *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em> with attribute overrides.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
index 5e47ccda548f..f0aae203468a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -78,9 +78,10 @@
 import org.springframework.util.StringValueResolver;
 
 /**
- * Bean post-processor that registers methods annotated with @{@link Scheduled}
- * to be invoked by a {@link org.springframework.scheduling.TaskScheduler} according
- * to the "fixedRate", "fixedDelay", or "cron" expression provided via the annotation.
+ * Bean post-processor that registers methods annotated with
+ * {@link Scheduled @Scheduled} to be invoked by a
+ * {@link org.springframework.scheduling.TaskScheduler} according to the
+ * "fixedRate", "fixedDelay", or "cron" expression provided via the annotation.
  *
  * <p>This post-processor is automatically registered by Spring's
  * {@code <task:annotation-driven>} XML element, and also by the
@@ -88,8 +89,9 @@
  *
  * <p>Autodetects any {@link SchedulingConfigurer} instances in the container,
  * allowing for customization of the scheduler to be used or for fine-grained
- * control over task registration (e.g. registration of {@link Trigger} tasks.
- * See the @{@link EnableScheduling} javadocs for complete usage details.
+ * control over task registration (e.g. registration of {@link Trigger} tasks).
+ * See the {@link EnableScheduling @EnableScheduling} javadocs for complete usage
+ * details.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -153,7 +155,8 @@ public ScheduledAnnotationBeanPostProcessor() {
 	/**
 	 * Create a {@code ScheduledAnnotationBeanPostProcessor} delegating to the
 	 * specified {@link ScheduledTaskRegistrar}.
-	 * @param registrar the ScheduledTaskRegistrar to register @Scheduled tasks on
+	 * @param registrar the ScheduledTaskRegistrar to register {@code @Scheduled}
+	 * tasks on
 	 * @since 5.1
 	 */
 	public ScheduledAnnotationBeanPostProcessor(ScheduledTaskRegistrar registrar) {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
index 05283e3fd503..26f0076077f7 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 
 /**
- * Optional interface to be implemented by @{@link
- * org.springframework.context.annotation.Configuration Configuration} classes annotated
- * with @{@link EnableScheduling}. Typically used for setting a specific
+ * Optional interface to be implemented by {@link
+ * org.springframework.context.annotation.Configuration @Configuration} classes annotated
+ * with {@link EnableScheduling @EnableScheduling}. Typically used for setting a specific
  * {@link org.springframework.scheduling.TaskScheduler TaskScheduler} bean to be used when
  * executing scheduled tasks or for registering scheduled tasks in a <em>programmatic</em>
- * fashion as opposed to the <em>declarative</em> approach of using the @{@link Scheduled}
- * annotation. For example, this may be necessary when implementing {@link
- * org.springframework.scheduling.Trigger Trigger}-based tasks, which are not supported by
- * the {@code @Scheduled} annotation.
+ * fashion as opposed to the <em>declarative</em> approach of using the
+ * {@link Scheduled @Scheduled} annotation. For example, this may be necessary
+ * when implementing {@link org.springframework.scheduling.Trigger Trigger}-based
+ * tasks, which are not supported by the {@code @Scheduled} annotation.
  *
- * <p>See @{@link EnableScheduling} for detailed usage examples.
+ * <p>See {@link EnableScheduling @EnableScheduling} for detailed usage examples.
  *
  * @author Chris Beams
  * @since 3.1

From b120e0b8f4e48b44ffba59b0002d6d04883dc4a4 Mon Sep 17 00:00:00 2001
From: Steve Wei <wzj3335@gmail.com>
Date: Mon, 30 Aug 2021 23:47:31 +0900
Subject: [PATCH 020/735] Fix Kotlin example for filtering handler functions

Closes gh-#27337
---
 src/docs/asciidoc/web/webmvc-functional.adoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/docs/asciidoc/web/webmvc-functional.adoc b/src/docs/asciidoc/web/webmvc-functional.adoc
index 368654f02c8d..1dd3779e1ed4 100644
--- a/src/docs/asciidoc/web/webmvc-functional.adoc
+++ b/src/docs/asciidoc/web/webmvc-functional.adoc
@@ -799,10 +799,10 @@ For instance, consider the following example:
 				ServerRequest.from(it)
 						.header("X-RequestHeader", "Value").build()
 			}
-			POST("/person", handler::createPerson)
-			after { _, response -> // <2>
-				logResponse(response)
-			}
+		}
+		POST("/person", handler::createPerson)
+		after { _, response -> // <2>
+			logResponse(response)
 		}
 	}
 ----

From debf61b948fd44a8757c4a8c286202ca3b6762b5 Mon Sep 17 00:00:00 2001
From: Philippe Marschall <philippe.marschall@gmail.com>
Date: Mon, 30 Aug 2021 16:51:59 +0200
Subject: [PATCH 021/735] Remove unused private loggers

Closes gh-27336
---
 .../aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java | 5 -----
 .../expression/ApplicationContextExpressionTests.java       | 6 ------
 .../support/TransactionSynchronizationManager.java          | 5 -----
 .../http/converter/json/Jackson2ObjectMapperBuilder.java    | 4 ----
 4 files changed, 20 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 0b6d3394ffba..0ea96012223e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -20,8 +20,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -40,7 +38,6 @@
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
@@ -66,8 +63,6 @@
  */
 public class AspectJAutoProxyCreatorTests {
 
-	private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class);
-
 
 	@Test
 	public void testAspectsAreApplied() {
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index e3c9921a504c..c2dfc35dce8d 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -28,8 +28,6 @@
 import java.util.Optional;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.ObjectFactory;
@@ -40,7 +38,6 @@
 import org.springframework.beans.factory.config.Scope;
 import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.support.AutowireCandidateQualifier;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.TestBean;
@@ -64,9 +61,6 @@
  */
 class ApplicationContextExpressionTests {
 
-	private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class);
-
-
 	@Test
 	@SuppressWarnings("deprecation")
 	void genericApplicationContext() throws Exception {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
index 3b6e1558acfc..55b3b8c788c6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
@@ -24,9 +24,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.springframework.core.NamedThreadLocal;
 import org.springframework.core.OrderComparator;
 import org.springframework.lang.Nullable;
@@ -76,8 +73,6 @@
  */
 public abstract class TransactionSynchronizationManager {
 
-	private static final Log logger = LogFactory.getLog(TransactionSynchronizationManager.class);
-
 	private static final ThreadLocal<Map<Object, Object>> resources =
 			new NamedThreadLocal<>("Transactional resources");
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
index 0157d4efb61d..415113ff0596 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -55,13 +55,11 @@
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
 import com.fasterxml.jackson.dataformat.xml.XmlFactory;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.commons.logging.Log;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.KotlinDetector;
-import org.springframework.http.HttpLogging;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -105,8 +103,6 @@
  */
 public class Jackson2ObjectMapperBuilder {
 
-	private final Log logger = HttpLogging.forLogName(getClass());
-
 	private final Map<Class<?>, Class<?>> mixIns = new LinkedHashMap<>();
 
 	private final Map<Class<?>, JsonSerializer<?>> serializers = new LinkedHashMap<>();

From ae56f2ac09248c3d97288acb044ff30c5ea16897 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 30 Aug 2021 16:54:16 +0200
Subject: [PATCH 022/735] Polish contribution

See gh-27336
---
 .../aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java    | 3 +--
 .../context/expression/ApplicationContextExpressionTests.java  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 0ea96012223e..279e600ec9e8 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,6 @@
  */
 public class AspectJAutoProxyCreatorTests {
 
-
 	@Test
 	public void testAspectsAreApplied() {
 		ClassPathXmlApplicationContext bf = newContext("aspects.xml");
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index c2dfc35dce8d..657597bc23f9 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 8d3e8ca3a2d534f6ee872bb6a65a89c44e987cf6 Mon Sep 17 00:00:00 2001
From: Daniel Knittl-Frank <knittl89+git@googlemail.com>
Date: Wed, 23 Dec 2020 21:53:08 +0100
Subject: [PATCH 023/735] Optimize allocation in StringUtils#cleanPath

This commit applies several optimizations to StringUtils#cleanPath and
related methods:

* pre-size pathElements deque in StringUtils#cleanPath with
  pathElements.length elements, since this this is the maximum size and
  the most likely case.
* optimize StringUtils#collectionToDelimitedString to calculate the size
  of the resulting String and avoid array auto-resizing in the
  StringBuilder.
* If the path did not contain any components that required cleaning,
  return the (normalized) path as-is. No need to concatenate the prefix
  and the trailing path.

See gh-26316
---
 .../org/springframework/util/StringUtils.java | 44 +++++++++++++++++--
 .../util/StringUtilsTests.java                |  2 +
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index edbbaea91d45..e320e9bd4c5a 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -667,7 +667,9 @@ public static String cleanPath(String path) {
 		if (!hasLength(path)) {
 			return path;
 		}
-		String pathToUse = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
+
+		String normalizedPath = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
+		String pathToUse = normalizedPath;
 
 		// Shortcut if there is no work to do
 		if (pathToUse.indexOf('.') == -1) {
@@ -695,7 +697,8 @@ public static String cleanPath(String path) {
 		}
 
 		String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR);
-		Deque<String> pathElements = new ArrayDeque<>();
+		// we never require more elements than pathArray and in the common case the same number
+		Deque<String> pathElements = new ArrayDeque<>(pathArray.length);
 		int tops = 0;
 
 		for (int i = pathArray.length - 1; i >= 0; i--) {
@@ -721,7 +724,7 @@ else if (TOP_PATH.equals(element)) {
 
 		// All path elements stayed the same - shortcut
 		if (pathArray.length == pathElements.size()) {
-			return prefix + pathToUse;
+			return normalizedPath;
 		}
 		// Remaining top paths need to be retained.
 		for (int i = 0; i < tops; i++) {
@@ -732,7 +735,40 @@ else if (TOP_PATH.equals(element)) {
 			pathElements.addFirst(CURRENT_PATH);
 		}
 
-		return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
+		final String joined = joinStrings(pathElements, FOLDER_SEPARATOR);
+		// avoid string concatenation with empty prefix
+		return prefix.isEmpty() ? joined : prefix + joined;
+	}
+
+	/**
+	 * Convert a {@link Collection Collection&lt;String&gt;} to a delimited {@code String} (e.g. CSV).
+	 * <p>This is an optimized variant of {@link #collectionToDelimitedString(Collection, String)}, which does not
+	 * require dynamic resizing of the StringBuilder's backing array.
+	 * @param coll the {@code Collection Collection&lt;String&gt;} to convert (potentially {@code null} or empty)
+	 * @param delim the delimiter to use (typically a ",")
+	 * @return the delimited {@code String}
+	 */
+	private static String joinStrings(@Nullable Collection<String> coll, String delim) {
+
+		if (CollectionUtils.isEmpty(coll)) {
+			return "";
+		}
+
+		// precompute total length of resulting string
+		int totalLength = (coll.size() - 1) * delim.length();
+		for (String str : coll) {
+			totalLength += str.length();
+		}
+
+		StringBuilder sb = new StringBuilder(totalLength);
+		Iterator<?> it = coll.iterator();
+		while (it.hasNext()) {
+			sb.append(it.next());
+			if (it.hasNext()) {
+				sb.append(delim);
+			}
+		}
+		return sb.toString();
 	}
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index 9d81c82d5f1c..2aae6260dd0e 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -402,6 +402,8 @@ void cleanPath() {
 		assertThat(StringUtils.cleanPath("file:.././")).isEqualTo("file:../");
 		assertThat(StringUtils.cleanPath("file:/mypath/spring.factories")).isEqualTo("file:/mypath/spring.factories");
 		assertThat(StringUtils.cleanPath("file:///c:/some/../path/the%20file.txt")).isEqualTo("file:///c:/path/the%20file.txt");
+		assertThat(StringUtils.cleanPath("jar:file:///c:\\some\\..\\path\\.\\the%20file.txt")).isEqualTo("jar:file:///c:/path/the%20file.txt");
+		assertThat(StringUtils.cleanPath("jar:file:///c:/some/../path/./the%20file.txt")).isEqualTo("jar:file:///c:/path/the%20file.txt");
 	}
 
 	@Test

From cc026fcb8ae51172f3d063e7ed07a32927e23d8e Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 30 Aug 2021 17:58:12 +0200
Subject: [PATCH 024/735] Polish "Optimize allocation in StringUtils#cleanPath"

This commit also introduces JMH benchmarks related to the code
optimizations.

Closes gh-2631
---
 .../util/StringUtilsBenchmark.java            | 116 ++++++++++++++++++
 .../org/springframework/util/StringUtils.java |  40 ++----
 2 files changed, 123 insertions(+), 33 deletions(-)
 create mode 100644 spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java

diff --git a/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java b/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java
new file mode 100644
index 000000000000..1fc7753b2218
--- /dev/null
+++ b/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java
@@ -0,0 +1,116 @@
+/*
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.infra.Blackhole;
+
+/**
+ * Benchmarks for {@link StringUtils}.
+ *
+ * @author Brian Clozel
+ */
+@BenchmarkMode(Mode.Throughput)
+public class StringUtilsBenchmark {
+
+	@Benchmark
+	public void collectionToDelimitedString(DelimitedStringState state, Blackhole bh) {
+		bh.consume(StringUtils.collectionToCommaDelimitedString(state.elements));
+	}
+
+	@State(Scope.Benchmark)
+	public static class DelimitedStringState {
+
+		@Param("10")
+		int elementMinSize;
+
+		@Param("20")
+		int elementMaxSize;
+
+		@Param("10")
+		int elementCount;
+
+		Collection<String> elements;
+
+		@Setup(Level.Iteration)
+		public void setup() {
+			Random random = new Random();
+			this.elements = new ArrayList<>(this.elementCount);
+			int bound = this.elementMaxSize - this.elementMinSize;
+			for (int i = 0; i < this.elementCount; i++) {
+				this.elements.add(String.format("%0" + (random.nextInt(bound) + this.elementMinSize) + "d", 1));
+			}
+		}
+	}
+
+	@Benchmark
+	public void cleanPath(CleanPathState state, Blackhole bh) {
+		for (String path : state.paths) {
+			bh.consume(StringUtils.cleanPath(path));
+		}
+	}
+
+	@State(Scope.Benchmark)
+	public static class CleanPathState {
+
+		private static final List<String> SEGMENTS = Arrays.asList("some", "path", ".", "..", "springspring");
+
+		@Param("10")
+		int segmentCount;
+
+		@Param("20")
+		int pathsCount;
+
+		Collection<String> paths;
+
+		@Setup(Level.Iteration)
+		public void setup() {
+			this.paths = new ArrayList<>(this.pathsCount);
+			Random random = new Random();
+			for (int i = 0; i < this.pathsCount; i++) {
+				this.paths.add(createSamplePath(random));
+			}
+		}
+
+		private String createSamplePath(Random random) {
+			String separator = random.nextBoolean() ? "/" : "\\";
+			StringBuilder sb = new StringBuilder();
+			sb.append("jar:file:///c:");
+			for (int i = 0; i < this.segmentCount; i++) {
+				sb.append(separator);
+				sb.append(SEGMENTS.get(random.nextInt(SEGMENTS.size())));
+			}
+			sb.append(separator);
+			sb.append("the%20file.txt");
+			return sb.toString();
+		}
+
+	}
+}
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index e320e9bd4c5a..80a996d481fb 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -735,42 +735,11 @@ else if (TOP_PATH.equals(element)) {
 			pathElements.addFirst(CURRENT_PATH);
 		}
 
-		final String joined = joinStrings(pathElements, FOLDER_SEPARATOR);
+		final String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
 		// avoid string concatenation with empty prefix
 		return prefix.isEmpty() ? joined : prefix + joined;
 	}
 
-	/**
-	 * Convert a {@link Collection Collection&lt;String&gt;} to a delimited {@code String} (e.g. CSV).
-	 * <p>This is an optimized variant of {@link #collectionToDelimitedString(Collection, String)}, which does not
-	 * require dynamic resizing of the StringBuilder's backing array.
-	 * @param coll the {@code Collection Collection&lt;String&gt;} to convert (potentially {@code null} or empty)
-	 * @param delim the delimiter to use (typically a ",")
-	 * @return the delimited {@code String}
-	 */
-	private static String joinStrings(@Nullable Collection<String> coll, String delim) {
-
-		if (CollectionUtils.isEmpty(coll)) {
-			return "";
-		}
-
-		// precompute total length of resulting string
-		int totalLength = (coll.size() - 1) * delim.length();
-		for (String str : coll) {
-			totalLength += str.length();
-		}
-
-		StringBuilder sb = new StringBuilder(totalLength);
-		Iterator<?> it = coll.iterator();
-		while (it.hasNext()) {
-			sb.append(it.next());
-			if (it.hasNext()) {
-				sb.append(delim);
-			}
-		}
-		return sb.toString();
-	}
-
 	/**
 	 * Compare two paths after normalization of them.
 	 * @param path1 first path for comparison
@@ -1330,7 +1299,12 @@ public static String collectionToDelimitedString(
 			return "";
 		}
 
-		StringBuilder sb = new StringBuilder();
+		int totalLength = coll.size() * (prefix.length() + suffix.length()) + (coll.size() - 1) * delim.length();
+		for (Object element : coll) {
+			totalLength += element.toString().length();
+		}
+
+		StringBuilder sb = new StringBuilder(totalLength);
 		Iterator<?> it = coll.iterator();
 		while (it.hasNext()) {
 			sb.append(prefix).append(it.next()).append(suffix);

From e5a5f8b20b00a896bb1edad5fbc13f982cd0e6ca Mon Sep 17 00:00:00 2001
From: Georgi Ushev <ushev.georgi@gmail.com>
Date: Tue, 31 Aug 2021 10:37:29 +0300
Subject: [PATCH 025/735] Remove unnecessary brace in websocket documenation

Closes gh-#27339
---
 src/docs/asciidoc/web/websocket.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 272e4669cc07..080a75e0ab3f 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1177,7 +1177,7 @@ We can trace the flow through a simple example. Consider the following example,
 	@Controller
 	public class GreetingController {
 
-		@MessageMapping("/greeting") {
+		@MessageMapping("/greeting")
 		public String handle(String greeting) {
 			return "[" + getTimestamp() + ": " + greeting;
 		}

From 871e378ed054d95f19bcb75fa0f01e202e83f367 Mon Sep 17 00:00:00 2001
From: Inmord <53592130+Inmord@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:40:28 +0800
Subject: [PATCH 026/735] Polish AbstractAspectJAdvisorFactory

Closes gh-27340
---
 .../aspectj/annotation/AbstractAspectJAdvisorFactory.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index e76156bf8265..78573e429d9a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -103,10 +103,11 @@ private boolean compiledByAjc(Class<?> clazz) {
 	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		// If the parent has the annotation and isn't abstract it's an error
-		if (aspectClass.getSuperclass().getAnnotation(Aspect.class) != null &&
-				!Modifier.isAbstract(aspectClass.getSuperclass().getModifiers())) {
+		Class<?> superclass = aspectClass.getSuperclass();
+		if (superclass.getAnnotation(Aspect.class) != null &&
+				!Modifier.isAbstract(superclass.getModifiers())) {
 			throw new AopConfigException("[" + aspectClass.getName() + "] cannot extend concrete aspect [" +
-					aspectClass.getSuperclass().getName() + "]");
+					superclass.getName() + "]");
 		}
 
 		AjType<?> ajType = AjTypeSystem.getAjType(aspectClass);

From 88af24c1cb5cb0325c2322e0efdc109e4eceb487 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 31 Aug 2021 09:46:10 +0200
Subject: [PATCH 027/735] Update copyright date

---
 .../aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index 78573e429d9a..58f3c23b459f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 310bdbb1b204bcb1e4b241d73b81df9bc153e9ac Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 1 Sep 2021 10:34:16 +0200
Subject: [PATCH 028/735] Fix error in ApplicationEvents example

---
 src/docs/asciidoc/testing.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index bc3af10d0891..64f07918d46e 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -2613,7 +2613,7 @@ published while invoking a method in a Spring-managed component:
 			// Invoke method in OrderService that publishes an event
 			orderService.submitOrder(new Order(/* ... */));
 			// Verify that an OrderSubmitted event was published
-			int numEvents = events.stream(OrderSubmitted.class).count(); // <3>
+			long numEvents = events.stream(OrderSubmitted.class).count(); // <3>
 			assertThat(numEvents).isEqualTo(1);
 		}
 	}

From 164dcef6ae3ca05e03c828cbdc0bfd97b8043bd0 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:19:57 +0200
Subject: [PATCH 029/735] Tracking ASM master

See gh-27069
---
 .../springframework/asm/AnnotationVisitor.java    | 12 ++++++------
 .../java/org/springframework/asm/ByteVector.java  |  3 +++
 .../org/springframework/asm/ClassVisitor.java     | 13 ++++++-------
 .../org/springframework/asm/FieldVisitor.java     | 15 ++++++---------
 .../org/springframework/asm/MethodVisitor.java    | 12 ++++++------
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java b/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
index 51357068800b..c3c236aefabb 100644
--- a/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
@@ -38,8 +38,8 @@
 public abstract class AnnotationVisitor {
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -52,8 +52,8 @@ public abstract class AnnotationVisitor {
   /**
    * Constructs a new {@link AnnotationVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public AnnotationVisitor(final int api) {
     this(api, null);
@@ -62,8 +62,8 @@ public AnnotationVisitor(final int api) {
   /**
    * Constructs a new {@link AnnotationVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param annotationVisitor the annotation visitor to which this visitor must delegate method
    *     calls. May be {@literal null}.
    */
diff --git a/spring-core/src/main/java/org/springframework/asm/ByteVector.java b/spring-core/src/main/java/org/springframework/asm/ByteVector.java
index 3789eec3fd6d..6187c1e22c7d 100644
--- a/spring-core/src/main/java/org/springframework/asm/ByteVector.java
+++ b/spring-core/src/main/java/org/springframework/asm/ByteVector.java
@@ -352,6 +352,9 @@ public ByteVector putByteArray(
    * @param size number of additional bytes that this byte vector should be able to receive.
    */
   private void enlarge(final int size) {
+    if (length > data.length) {
+      throw new AssertionError("Internal error");
+    }
     int doubleCapacity = 2 * data.length;
     int minimalCapacity = length + size;
     byte[] newData = new byte[doubleCapacity > minimalCapacity ? doubleCapacity : minimalCapacity];
diff --git a/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java b/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
index b49c3eebce5e..05b448321afc 100644
--- a/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
@@ -40,8 +40,8 @@
 public abstract class ClassVisitor {
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -51,8 +51,8 @@ public abstract class ClassVisitor {
   /**
    * Constructs a new {@link ClassVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public ClassVisitor(final int api) {
     this(api, null);
@@ -61,9 +61,8 @@ public ClassVisitor(final int api) {
   /**
    * Constructs a new {@link ClassVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param classVisitor the class visitor to which this visitor must delegate method calls. May be
    *     null.
    */
diff --git a/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java b/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
index 841b4a3cb78f..727417045faa 100644
--- a/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
@@ -37,9 +37,8 @@
 public abstract class FieldVisitor {
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   * Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -49,9 +48,8 @@ public abstract class FieldVisitor {
   /**
    * Constructs a new {@link FieldVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public FieldVisitor(final int api) {
     this(api, null);
@@ -60,9 +58,8 @@ public FieldVisitor(final int api) {
   /**
    * Constructs a new {@link FieldVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-   *     Opcodes#ASM8}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param fieldVisitor the field visitor to which this visitor must delegate method calls. May be
    *     null.
    */
diff --git a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
index ff5ce1056d27..15ca4a5e4eb3 100644
--- a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
@@ -51,8 +51,8 @@ public abstract class MethodVisitor {
   private static final String REQUIRES_ASM5 = "This feature requires ASM5";
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -64,8 +64,8 @@ public abstract class MethodVisitor {
   /**
    * Constructs a new {@link MethodVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public MethodVisitor(final int api) {
     this(api, null);
@@ -74,8 +74,8 @@ public MethodVisitor(final int api) {
   /**
    * Constructs a new {@link MethodVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param methodVisitor the method visitor to which this visitor must delegate method calls. May
    *     be null.
    */

From 837301fdb3a92b1e40535a404dbdbf57b01c3816 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:20:52 +0200
Subject: [PATCH 030/735] Convenient configuration of type permissions for
 XStream 1.4.18

Closes gh-27343
---
 .../oxm/xstream/XStreamMarshaller.java        | 33 ++++++++++++++++---
 .../oxm/xstream/XStreamMarshallerTests.java   | 12 ++++---
 .../oxm/xstream/XStreamUnmarshallerTests.java | 28 ++++++++++------
 3 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index a992ab814188..ccb10d27c172 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,6 +63,8 @@
 import com.thoughtworks.xstream.mapper.CannotResolveClassException;
 import com.thoughtworks.xstream.mapper.Mapper;
 import com.thoughtworks.xstream.mapper.MapperWrapper;
+import com.thoughtworks.xstream.security.ForbiddenClassException;
+import com.thoughtworks.xstream.security.TypePermission;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -106,7 +108,7 @@
  * Therefore, it has limited namespace support. As such, it is rather unsuitable for
  * usage within Web Services.
  *
- * <p>This marshaller requires XStream 1.4.5 or higher, as of Spring 4.3.
+ * <p>This marshaller requires XStream 1.4.7 or higher, as of Spring 5.2.17.
  * Note that {@link XStream} construction has been reworked in 4.0, with the
  * stream driver and the class loader getting passed into XStream itself now.
  *
@@ -146,6 +148,9 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo
 	@Nullable
 	private ConverterMatcher[] converters;
 
+	@Nullable
+	private TypePermission[] typePermissions;
+
 	@Nullable
 	private MarshallingStrategy marshallingStrategy;
 
@@ -268,6 +273,20 @@ public void setConverters(ConverterMatcher... converters) {
 		this.converters = converters;
 	}
 
+	/**
+	 * Set XStream type permissions such as
+	 * {@link com.thoughtworks.xstream.security.AnyTypePermission},
+	 * {@link com.thoughtworks.xstream.security.ExplicitTypePermission} etc,
+	 * as an alternative to overriding the {@link #customizeXStream} method.
+	 * <p>Note: As of XStream 1.4.18, the default type permissions are
+	 * restricted to well-known core JDK types. For any custom types,
+	 * explicit type permissions need to be registered.
+	 * @since 5.2.17
+	 */
+	public void setTypePermissions(TypePermission... typePermissions) {
+		this.typePermissions = typePermissions;
+	}
+
 	/**
 	 * Set a custom XStream {@link MarshallingStrategy} to use.
 	 * @since 4.0
@@ -407,7 +426,7 @@ public void setBeanClassLoader(ClassLoader classLoader) {
 
 	@Override
 	public void afterPropertiesSet() {
-		// no-op due to use of SingletonSupplier for the XStream field.
+		// no-op due to use of SingletonSupplier for the XStream field
 	}
 
 	/**
@@ -479,6 +498,12 @@ else if (this.converters[i] instanceof SingleValueConverter) {
 			}
 		}
 
+		if (this.typePermissions != null) {
+			for (TypePermission permission : this.typePermissions) {
+				xstream.addPermission(permission);
+			}
+		}
+
 		if (this.marshallingStrategy != null) {
 			xstream.setMarshallingStrategy(this.marshallingStrategy);
 		}
@@ -844,7 +869,7 @@ private Object doUnmarshal(HierarchicalStreamReader streamReader, @Nullable Data
 	 */
 	protected XmlMappingException convertXStreamException(Exception ex, boolean marshalling) {
 		if (ex instanceof StreamException || ex instanceof CannotResolveClassException ||
-				ex instanceof ConversionException) {
+				ex instanceof ForbiddenClassException || ex instanceof ConversionException) {
 			if (marshalling) {
 				return new MarshallingFailureException("XStream marshalling exception",  ex);
 			}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index 5f05936d751a..304d3fcc771b 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JsonWriter;
+import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
@@ -67,18 +68,21 @@
 /**
  * @author Arjen Poutsma
  * @author Sam Brannen
+ * @author Juergen Hoeller
  */
 class XStreamMarshallerTests {
 
 	private static final String EXPECTED_STRING = "<flight><flightNumber>42</flightNumber></flight>";
 
-	private final XStreamMarshaller marshaller = new XStreamMarshaller();
-
 	private final Flight flight = new Flight();
 
+	private XStreamMarshaller marshaller;
+
 
 	@BeforeEach
 	void createMarshaller() {
+		marshaller = new XStreamMarshaller();
+		marshaller.setTypePermissions(AnyTypePermission.ANY);
 		marshaller.setAliases(Collections.singletonMap("flight", Flight.class.getName()));
 		flight.setFlightNumber(42L);
 	}
@@ -143,7 +147,7 @@ void marshalStreamResultOutputStream() throws Exception {
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		StreamResult result = new StreamResult(os);
 		marshaller.marshal(flight, result);
-		String s = new String(os.toByteArray(), "UTF-8");
+		String s = os.toString("UTF-8");
 		assertThat(XmlContent.of(s)).isSimilarTo(EXPECTED_STRING);
 	}
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
index 1c864545aa68..7c87eda2253b 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,6 +30,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
+import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
@@ -40,6 +42,7 @@
 
 /**
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  */
 public class XStreamUnmarshallerTests {
 
@@ -47,21 +50,16 @@ public class XStreamUnmarshallerTests {
 
 	private XStreamMarshaller unmarshaller;
 
+
 	@BeforeEach
-	public void createUnmarshaller() throws Exception {
+	public void createUnmarshaller() {
 		unmarshaller = new XStreamMarshaller();
+		unmarshaller.setTypePermissions(AnyTypePermission.ANY);
 		Map<String, Class<?>> aliases = new HashMap<>();
 		aliases.put("flight", Flight.class);
 		unmarshaller.setAliases(aliases);
 	}
 
-	private void testFlight(Object o) {
-		boolean condition = o instanceof Flight;
-		assertThat(condition).as("Unmarshalled object is not Flights").isTrue();
-		Flight flight = (Flight) o;
-		assertThat(flight).as("Flight is null").isNotNull();
-		assertThat(flight.getFlightNumber()).as("Number is invalid").isEqualTo(42L);
-	}
 
 	@Test
 	public void unmarshalDomSource() throws Exception {
@@ -83,7 +81,7 @@ public void unmarshalStaxSourceXmlStreamReader() throws Exception {
 
 	@Test
 	public void unmarshalStreamSourceInputStream() throws Exception {
-		StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING.getBytes("UTF-8")));
+		StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING.getBytes(StandardCharsets.UTF_8)));
 		Object flights = unmarshaller.unmarshal(source);
 		testFlight(flights);
 	}
@@ -94,5 +92,15 @@ public void unmarshalStreamSourceReader() throws Exception {
 		Object flights = unmarshaller.unmarshal(source);
 		testFlight(flights);
 	}
+
+
+	private void testFlight(Object o) {
+		boolean condition = o instanceof Flight;
+		assertThat(condition).as("Unmarshalled object is not Flights").isTrue();
+		Flight flight = (Flight) o;
+		assertThat(flight).as("Flight is null").isNotNull();
+		assertThat(flight.getFlightNumber()).as("Number is invalid").isEqualTo(42L);
+	}
+
 }
 

From b6c2c11805993a7d0b6e2520ee205fbb54ad215f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:21:27 +0200
Subject: [PATCH 031/735] Polishing

---
 .../beans/factory/config/ConstructorArgumentValues.java     | 6 ++++--
 .../org/springframework/web/servlet/FrameworkServlet.java   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
index 4fbfb435875d..c4d779e697b8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -351,7 +351,9 @@ public ValueHolder getArgumentValue(int index, Class<?> requiredType, String req
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	@Nullable
-	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType, @Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
+	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType,
+			@Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
+
 		Assert.isTrue(index >= 0, "Index must not be negative");
 		ValueHolder valueHolder = getIndexedArgumentValue(index, requiredType, requiredName);
 		if (valueHolder == null) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 6d3e8d3d2b45..40e1d1030e91 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -1085,7 +1085,7 @@ private void logResult(HttpServletRequest request, HttpServletResponse response,
 		}
 
 		DispatcherType dispatchType = request.getDispatcherType();
-		boolean initialDispatch = DispatcherType.REQUEST == dispatchType;
+		boolean initialDispatch = (dispatchType == DispatcherType.REQUEST);
 
 		if (failureCause != null) {
 			if (!initialDispatch) {
@@ -1109,7 +1109,7 @@ else if (logger.isTraceEnabled()) {
 		}
 
 		int status = response.getStatus();
-		String headers = ""; // nothing below trace
+		String headers = "";  // nothing below trace
 
 		if (logger.isTraceEnabled()) {
 			Collection<String> names = response.getHeaderNames();

From 2f60392fe347066b6bacab00b4ff0437a00203b4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:22:37 +0200
Subject: [PATCH 032/735] Upgrade to Netty 4.1.67, RxJava 3.1.1, Gson 2.8.8,
 XStream 1.4.18

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f41d37257b9..69b6cf85bb30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.4"
-			mavenBom "io.netty:netty-bom:4.1.66.Final"
+			mavenBom "io.netty:netty-bom:4.1.67.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.10"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
@@ -67,7 +67,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.0"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
 			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
@@ -75,10 +75,10 @@ configure(allprojects) { project ->
 			dependency("com.fasterxml.woodstox:woodstox-core:6.2.6") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependency "com.google.code.gson:gson:2.8.7"
+			dependency "com.google.code.gson:gson:2.8.8"
 			dependency "com.google.protobuf:protobuf-java-util:3.17.3"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
-			dependency("com.thoughtworks.xstream:xstream:1.4.17") {
+			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}

From b2eaa7c1c3025dddd197df62a46d80ee2a84b8dd Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:59:33 +0200
Subject: [PATCH 033/735] Polishing

---
 .../beans/BeanWrapperAutoGrowingTests.java    |  2 +-
 .../beans/BeanWrapperGenericsTests.java       | 52 ++++++++-----------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
index 2dddf884e319..78524e632b0c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
@@ -38,7 +38,7 @@ public class BeanWrapperAutoGrowingTests {
 
 
 	@BeforeEach
-	public void setUp() {
+	public void setup() {
 		wrapper.setAutoGrowNestedPaths(true);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
index f5fef0b04a84..760e98cf9351 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.beans;
 
-import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -85,7 +84,7 @@ void testGenericSetWithConversionFailure() {
 	}
 
 	@Test
-	void testGenericList() throws MalformedURLException {
+	void testGenericList() throws Exception {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		List<String> input = new ArrayList<>();
@@ -97,7 +96,7 @@ void testGenericList() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericListElement() throws MalformedURLException {
+	void testGenericListElement() throws Exception {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setResourceList(new ArrayList<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -162,10 +161,8 @@ void testGenericMapWithCollectionValue() {
 		value2.add(Boolean.TRUE);
 		input.put("2", value2);
 		bw.setPropertyValue("collectionMap", input);
-		boolean condition1 = gb.getCollectionMap().get(1) instanceof HashSet;
-		assertThat(condition1).isTrue();
-		boolean condition = gb.getCollectionMap().get(2) instanceof ArrayList;
-		assertThat(condition).isTrue();
+		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
+		assertThat(gb.getCollectionMap().get(2) instanceof ArrayList).isTrue();
 	}
 
 	@Test
@@ -177,8 +174,7 @@ void testGenericMapElementWithCollectionValue() {
 		HashSet<Integer> value1 = new HashSet<>();
 		value1.add(1);
 		bw.setPropertyValue("collectionMap[1]", value1);
-		boolean condition = gb.getCollectionMap().get(1) instanceof HashSet;
-		assertThat(condition).isTrue();
+		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
 	}
 
 	@Test
@@ -194,7 +190,7 @@ void testGenericMapFromProperties() {
 	}
 
 	@Test
-	void testGenericListOfLists() throws MalformedURLException {
+	void testGenericListOfLists() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -206,7 +202,7 @@ void testGenericListOfLists() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericListOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericListOfListsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -218,7 +214,7 @@ void testGenericListOfListsWithElementConversion() throws MalformedURLException
 	}
 
 	@Test
-	void testGenericListOfArrays() throws MalformedURLException {
+	void testGenericListOfArrays() {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -230,7 +226,7 @@ void testGenericListOfArrays() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericListOfArraysWithElementConversion() throws MalformedURLException {
+	void testGenericListOfArraysWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -243,7 +239,7 @@ void testGenericListOfArraysWithElementConversion() throws MalformedURLException
 	}
 
 	@Test
-	void testGenericListOfMaps() throws MalformedURLException {
+	void testGenericListOfMaps() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
@@ -267,7 +263,7 @@ void testGenericListOfMapsWithElementConversion() {
 	}
 
 	@Test
-	void testGenericMapOfMaps() throws MalformedURLException {
+	void testGenericMapOfMaps() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
@@ -279,7 +275,7 @@ void testGenericMapOfMaps() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfMapsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
@@ -291,7 +287,7 @@ void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericMapOfLists() throws MalformedURLException {
+	void testGenericMapOfLists() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -303,7 +299,7 @@ void testGenericMapOfLists() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfListsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -315,7 +311,7 @@ void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericTypeNestingMapOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfInteger() {
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "100");
 
@@ -324,12 +320,11 @@ void testGenericTypeNestingMapOfInteger() throws Exception {
 		bw.setPropertyValue("mapOfInteger", map);
 
 		Object obj = gb.getMapOfInteger().get("testKey");
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 	}
 
 	@Test
-	void testGenericTypeNestingMapOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfInteger() {
 		Map<String, List<String>> map = new HashMap<>();
 		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", list);
@@ -339,13 +334,12 @@ void testGenericTypeNestingMapOfListOfInteger() throws Exception {
 		bw.setPropertyValue("mapOfListOfInteger", map);
 
 		Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}
 
 	@Test
-	void testGenericTypeNestingListOfMapOfInteger() throws Exception {
+	void testGenericTypeNestingListOfMapOfInteger() {
 		List<Map<String, String>> list = new ArrayList<>();
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "5");
@@ -356,13 +350,12 @@ void testGenericTypeNestingListOfMapOfInteger() throws Exception {
 		bw.setPropertyValue("listOfMapOfInteger", list);
 
 		Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(5);
 	}
 
 	@Test
-	void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfListOfInteger() {
 		Map<String, List<List<String>>> map = new HashMap<>();
 		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", Collections.singletonList(list));
@@ -372,8 +365,7 @@ void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
 		bw.setPropertyValue("mapOfListOfListOfInteger", map);
 
 		Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}
 

From 434cbab6a7147ebb7f51078cb14422fe26f1798a Mon Sep 17 00:00:00 2001
From: Leeseojune <sung07288346@gmail.com>
Date: Fri, 3 Sep 2021 17:50:50 +0900
Subject: [PATCH 034/735] Update copyright date in tests in spring-test

Closes gh-27354
---
 .../org/springframework/test/web/servlet/StubMvcResult.java     | 2 +-
 .../test/web/servlet/htmlunit/DelegatingWebConnectionTests.java | 2 +-
 .../test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java  | 2 +-
 .../test/web/servlet/result/HeaderResultMatchersTests.java      | 2 +-
 .../test/web/servlet/samples/context/PersonController.java      | 2 +-
 .../test/web/servlet/samples/context/PersonDao.java             | 2 +-
 .../resulthandlers/PrintingResultHandlerSmokeTests.java         | 2 +-
 .../standalone/resultmatchers/FlashAttributeAssertionTests.java | 2 +-
 .../samples/standalone/resultmatchers/ModelAssertionTests.java  | 2 +-
 .../resultmatchers/RequestAttributeAssertionTests.java          | 2 +-
 .../resultmatchers/SessionAttributeAssertionTests.java          | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java b/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
index 12bde4ea41aa..f5c3bba6d6a7 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
index 1a093caf907f..05506cfbe3b2 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
index ba7e3cda66c9..457e8fc4750d 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
index 19d79f1f4c75..496e9e7834b8 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
index 31781062ba63..0ef78f3a6d4f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
index 4001526e94c7..e06c983d720d 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
index 7d23bebc0b56..1600c095263a 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
index a6a5b7fc086b..0ffc879e9029 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
index 11473a31ab1f..a22b760bc82f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
index 7f98ce330070..c28a9190c67b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
index d60a4c1428b8..9479894033a4 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.

From bec0bb0c53a4e2a3cee0c03b3bd274953c93e7ae Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 2 Sep 2021 20:12:41 +0100
Subject: [PATCH 035/735] Revert "Add doOnDiscard hook for streaming mode"

This reverts commit 77a562dfee04cfb4a76a84257cf33fd73ab6b696.

As per findings under
https://github.com/reactor/reactor-netty/issues/1746 it looks this
wasn't the issue and isn't required.
---
 .../http/codec/EncoderHttpMessageWriter.java         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
index cf1d14644673..3fe192077388 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
@@ -141,18 +141,16 @@ public Mono<Void> write(Publisher<? extends T> inputStream, ResolvableType eleme
 		}
 
 		if (isStreamingMediaType(contentType)) {
-			return message
-					.writeAndFlushWith(body.map(buffer -> {
-						Hints.touchDataBuffer(buffer, hints, logger);
-						return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
-					}))
-					.doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
+			return message.writeAndFlushWith(body.map(buffer -> {
+				Hints.touchDataBuffer(buffer, hints, logger);
+				return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
+			}));
 		}
 
 		if (logger.isDebugEnabled()) {
 			body = body.doOnNext(buffer -> Hints.touchDataBuffer(buffer, hints, logger));
 		}
-		return message.writeWith(body).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
+		return message.writeWith(body);
 	}
 
 	@Nullable

From b2a17a8d86a50dc8844edfa9b9c1dd3fc7519132 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 3 Sep 2021 18:44:42 +0200
Subject: [PATCH 036/735] Fix typo

---
 .../build/optional/OptionalDependenciesPlugin.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index 55537c2d8259..93ae77995d10 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 /**
  * A {@code Plugin} that adds support for Maven-style optional dependencies. Creates a new
  * {@code optional} configuration. The {@code optional} configuration is part of the
- * project's compile and runtime classpath's but does not affect the classpath of
+ * project's compile and runtime classpaths but does not affect the classpath of
  * dependent projects.
  *
  * @author Andy Wilkinson

From 9cf8cca96d9c8280eac87595a7933aa338ec5599 Mon Sep 17 00:00:00 2001
From: Manish <manish.in.java@GMAIL.COM>
Date: Sun, 5 Sep 2021 15:44:44 +0530
Subject: [PATCH 037/735] Minor language corrections.

---
 src/docs/asciidoc/integration.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index dae0ac82ac01..aa17752e28e5 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -7,8 +7,8 @@
 :tabsize: 4
 :docinfo1:
 
-This part of the reference documentation covers the Spring Framework's integration with
-a number technologies.
+This part of the reference documentation covers Spring Framework's integration with
+a number of technologies.
 
 
 [[rest-client-access]]
@@ -63,7 +63,7 @@ overloaded methods:
 
 | `patchForObject`
 | Updates a resource by using PATCH and returns the representation from the response.
-Note that the JDK `HttpURLConnection` does not support the `PATCH`, but Apache
+Note that the JDK `HttpURLConnection` does not support `PATCH`, but Apache
 HttpComponents and others do.
 
 | `delete`

From 5ea7592d7014c19140a867c9b57e8026653a80d3 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 6 Sep 2021 13:56:27 +0100
Subject: [PATCH 038/735] Polishing in ExchangeResult

---
 .../test/web/reactive/server/ExchangeResult.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
index 2359b1384738..27c93773bfa2 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
@@ -56,7 +56,7 @@
  */
 public class ExchangeResult {
 
-	private static Log logger = LogFactory.getLog(ExchangeResult.class);
+	private static final Log logger = LogFactory.getLog(ExchangeResult.class);
 
 	private static final List<MediaType> PRINTABLE_MEDIA_TYPES = Arrays.asList(
 			MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
@@ -77,7 +77,7 @@ public class ExchangeResult {
 	private final String uriTemplate;
 
 	@Nullable
-	final Object mockServerResult;
+	private final Object mockServerResult;
 
 
 	/**
@@ -218,9 +218,9 @@ public Object getMockServerResult() {
 	}
 
 	/**
-	 * Execute the given Runnable, catch any {@link AssertionError}, decorate
-	 * with {@code AssertionError} containing diagnostic information about the
-	 * request and response, and then re-throw.
+	 * Execute the given Runnable, catch any {@link AssertionError}, log details
+	 * about the request and response at ERROR level under the class log
+	 * category, and after that re-throw the error.
 	 */
 	public void assertWithDiagnostics(Runnable assertion) {
 		try {

From 1b3fd9edfffd78a90da820d04455acbdbc3d4661 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 6 Sep 2021 13:53:30 +0100
Subject: [PATCH 039/735] Ensure one time logging for request details

Closes gh-26969
---
 .../web/reactive/server/ExchangeResult.java   |  7 ++++++-
 .../server/samples/SoftAssertionTests.java    | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
index 27c93773bfa2..e44c3b9f06c8 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
@@ -79,6 +79,9 @@ public class ExchangeResult {
 	@Nullable
 	private final Object mockServerResult;
 
+	/** Ensure single logging, e.g. for expectAll. */
+	private boolean diagnosticsLogged;
+
 
 	/**
 	 * Create an instance with an HTTP request and response along with promises
@@ -121,6 +124,7 @@ public class ExchangeResult {
 		this.timeout = other.timeout;
 		this.uriTemplate = other.uriTemplate;
 		this.mockServerResult = other.mockServerResult;
+		this.diagnosticsLogged = other.diagnosticsLogged;
 	}
 
 
@@ -227,7 +231,8 @@ public void assertWithDiagnostics(Runnable assertion) {
 			assertion.run();
 		}
 		catch (AssertionError ex) {
-			if (logger.isErrorEnabled()) {
+			if (!this.diagnosticsLogged && logger.isErrorEnabled()) {
+				this.diagnosticsLogged = true;
 				logger.error("Request details for assertion failure:\n" + this);
 			}
 			throw ex;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
index a4d4bb8c72fe..db7b242fffd9 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
@@ -46,15 +46,19 @@ void expectAll() {
 	}
 
 	@Test
-	void expectAllWithMultipleFailures() throws Exception {
-		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
-			this.webTestClient.get().uri("/test").exchange()
-				.expectAll(
-					responseSpec -> responseSpec.expectStatus().isBadRequest(),
-					responseSpec -> responseSpec.expectStatus().isOk(),
-					responseSpec -> responseSpec.expectBody(String.class).isEqualTo("bogus")
+	void expectAllWithMultipleFailures() {
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(() ->
+						this.webTestClient.get().uri("/test").exchange()
+								.expectAll(
+										responseSpec -> responseSpec.expectStatus().isBadRequest(),
+										responseSpec -> responseSpec.expectStatus().isOk(),
+										responseSpec -> responseSpec.expectBody(String.class).isEqualTo("bogus")
+								)
 				)
-		).withMessage("Multiple Exceptions (2):\nStatus expected:<400 BAD_REQUEST> but was:<200 OK>\nResponse body expected:<bogus> but was:<hello>");
+				.withMessage("Multiple Exceptions (2):\n" +
+						"Status expected:<400 BAD_REQUEST> but was:<200 OK>\n" +
+						"Response body expected:<bogus> but was:<hello>");
 	}
 
 

From 87d3d1bbd1e5620fb8c2583c487507bab9614fb2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 6 Sep 2021 16:52:23 +0200
Subject: [PATCH 040/735] Throw UnsupportedOperationException in
 defaultResponseCharacterEncoding()

This commit updates the defaultResponseCharacterEncoding() `default`
method in ConfigurableMockMvcBuilder so that it throws an
UnsupportedOperationException instead of silently ignoring the user's
request to set the default response character encoding.

Note, however, that AbstractMockMvcBuilder already overrides the
default method with a concrete implementation which is used by default
in MockMvc.

See gh-27230
---
 .../web/servlet/setup/ConfigurableMockMvcBuilder.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
index 43ef6ca9547e..145dccc8a3aa 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
@@ -86,14 +86,14 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder
 
 	/**
 	 * Define the default character encoding to be applied to every response.
-	 * <p>The default implementation of this method ignores the supplied value.
-	 * Concrete implementations are therefore encouraged to override this method.
+	 * <p>The default implementation of this method throws an
+	 * {@link UnsupportedOperationException}. Concrete implementations are therefore
+	 * encouraged to override this method.
 	 * @param defaultResponseCharacterEncoding the default response character encoding
 	 * @since 5.3.10
 	 */
-	@SuppressWarnings("unchecked")
 	default <T extends B> T defaultResponseCharacterEncoding(Charset defaultResponseCharacterEncoding) {
-		return (T) this;
+		throw new UnsupportedOperationException();
 	}
 
 	/**

From d1a00b43019843c59a24b89ff97ed43d00768cf9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 6 Sep 2021 16:58:32 +0200
Subject: [PATCH 041/735] Polishing

See gh-27230
---
 .../test/web/servlet/setup/ConfigurableMockMvcBuilder.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
index 145dccc8a3aa..45b9f05d04a4 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
@@ -93,7 +93,7 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder
 	 * @since 5.3.10
 	 */
 	default <T extends B> T defaultResponseCharacterEncoding(Charset defaultResponseCharacterEncoding) {
-		throw new UnsupportedOperationException();
+		throw new UnsupportedOperationException("defaultResponseCharacterEncoding is not supported by this MockMvcBuilder");
 	}
 
 	/**

From 532b4b636d6b347df18f897aaa769aa734477f8b Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 6 Sep 2021 18:13:41 +0200
Subject: [PATCH 042/735] Update CI pipeline with JDK16

This commit replaces the JDK15 build with a JDK16 variant.
This also updates the CI image with a new OS version and updated
JDK versions.
---
 ci/images/ci-image/Dockerfile |  4 ++--
 ci/images/get-jdk-url.sh      |  8 ++++----
 ci/images/setup.sh            |  2 +-
 ci/pipeline.yml               | 18 +++++++++---------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index 1ce41f37a932..df1be9f33457 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210119
+FROM ubuntu:focal-20210827
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
@@ -6,6 +6,6 @@ RUN ./setup.sh java8
 
 ENV JAVA_HOME /opt/openjdk/java8
 ENV JDK11 /opt/openjdk/java11
-ENV JDK15 /opt/openjdk/java15
+ENV JDK16 /opt/openjdk/java16
 
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index f4f3ab84cf40..e170d55171c3 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -3,13 +3,13 @@ set -e
 
 case "$1" in
 	java8)
-		 echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz"
+		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
+		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
 	;;
-  java15)
-		 echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz"
+  java16)
+		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
   ;;
   *)
 		echo $"Unknown java version"
diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index b226ab7de75c..ff18f849f40c 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -22,7 +22,7 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java8 java11 java15
+for jdk in java8 java11 java16
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index eb752fe705cc..f919a1b681fc 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -45,7 +45,7 @@ resource_types:
   type: registry-image
   source:
     repository: springio/artifactory-resource
-    tag: 0.0.13
+    tag: 0.0.17
 - name: github-status-resource
   type: registry-image
   source:
@@ -119,14 +119,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk15-build
+- name: repo-status-jdk16-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
     access_token: ((github-ci-status-token))
     branch: ((branch))
-    context: jdk15-build
+    context: jdk16-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -244,7 +244,7 @@ jobs:
           <<: *slack-fail-params
   - put: repo-status-jdk11-build
     params: { state: "success", commit: "git-repo" }
-- name: jdk15-build
+- name: jdk16-build
   serial: true
   public: true
   plan:
@@ -252,7 +252,7 @@ jobs:
     - get: git-repo
     - get: every-morning
       trigger: true
-    - put: repo-status-jdk15-build
+    - put: repo-status-jdk16-build
       params: { state: "pending", commit: "git-repo" }
     - do:
       - task: check-project
@@ -265,12 +265,12 @@ jobs:
           <<: *build-project-task-params
       on_failure:
         do:
-          - put: repo-status-jdk15-build
+          - put: repo-status-jdk16-build
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
               <<: *slack-fail-params
-    - put: repo-status-jdk15-build
+    - put: repo-status-jdk16-build
       params: { state: "success", commit: "git-repo" }
 - name: build-pull-requests
   serial: true
@@ -292,7 +292,7 @@ jobs:
         privileged: true
         timeout: ((task-timeout))
         params:
-          <<: *build-project-task-params
+          BRANCH: ((branch))
       on_success:
         put: git-pull-request
         params:
@@ -453,7 +453,7 @@ jobs:
 
 groups:
 - name: "builds"
-  jobs: ["build", "jdk11-build", "jdk15-build"]
+  jobs: ["build", "jdk11-build", "jdk16-build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"

From 0ec4be37d591bcc8a3f5ae10ac3daa905599bb84 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 6 Sep 2021 16:21:24 +0100
Subject: [PATCH 043/735] Configure optional configuration to consume its
 dependencies' API

Previously, the optional configuration had no usage attribute. This
resulted in it using the default, JAVA_RUNTIME, which caused it to
only consume the runtime produced by its dependencies and not the
API. Given that the optional configuration is added to the compile
classpath, this was incorrect.

This commit updates the optional configuration to be configured to
consume the Java API of its dependencies. The configuration has
also been marked as not being for consumption. This prevents other
projects attempting to consume the optional variant of a project
that has the optional dependencies plugin applied and further
aligns it with Gradle's built-in configurations of a similar nature.

See gh-27365
---
 .../build/optional/OptionalDependenciesPlugin.java           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index 93ae77995d10..f4a51cb0e8b8 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -19,6 +19,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.attributes.Usage;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -43,6 +44,10 @@ public class OptionalDependenciesPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
 		Configuration optional = project.getConfigurations().create("optional");
+		optional.attributes((attributes) -> attributes.attribute(Usage.USAGE_ATTRIBUTE,
+				project.getObjects().named(Usage.class, Usage.JAVA_API)));
+		optional.setCanBeConsumed(false);
+		optional.setCanBeResolved(true);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
 			SourceSetContainer sourceSets = project.getConvention()
 					.getPlugin(JavaPluginConvention.class).getSourceSets();

From d23afea168b8360d08bf296ac2189239ab9db7fc Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 6 Sep 2021 17:19:29 +0100
Subject: [PATCH 044/735] Extend optional rather than adding it to existing
 classpath

This allows the attributes configured on compileClasspath and
runtimeClasspath to independently influence the variant selection when
resolving the optional configuration, allowing it to contribute compile
dependencies (JAVA_API) to the former and runtime dependencies
(JAVA_RUNTIME) to the latter.

Fixes gh-27365
---
 .../build/optional/OptionalDependenciesPlugin.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index f4a51cb0e8b8..ec4f8b4b1939 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -44,18 +44,14 @@ public class OptionalDependenciesPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
 		Configuration optional = project.getConfigurations().create("optional");
-		optional.attributes((attributes) -> attributes.attribute(Usage.USAGE_ATTRIBUTE,
-				project.getObjects().named(Usage.class, Usage.JAVA_API)));
 		optional.setCanBeConsumed(false);
-		optional.setCanBeResolved(true);
+		optional.setCanBeResolved(false);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
-			SourceSetContainer sourceSets = project.getConvention()
-					.getPlugin(JavaPluginConvention.class).getSourceSets();
+			SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
+					.getSourceSets();
 			sourceSets.all((sourceSet) -> {
-				sourceSet.setCompileClasspath(
-						sourceSet.getCompileClasspath().plus(optional));
-				sourceSet.setRuntimeClasspath(
-						sourceSet.getRuntimeClasspath().plus(optional));
+				project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(optional);
+				project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(optional);
 			});
 		});
 		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {

From 77a6dce1b58bbd11ec4c7c110c08cb20af38d8d8 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 6 Sep 2021 19:15:00 +0200
Subject: [PATCH 045/735] Review Servlet API version in Spring OXM tests

This commit ensures that Servlet 4.0+ is used in the Spring OXM test
suite, as Servlet 4 specific APIs are used in the tests.

This problem was uncovered while fixing gh-27365
---
 spring-orm/spring-orm.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
index 8a8ad57ac4c3..285e044a14b4 100644
--- a/spring-orm/spring-orm.gradle
+++ b/spring-orm/spring-orm.gradle
@@ -10,7 +10,7 @@ dependencies {
 	optional(project(":spring-web"))
 	optional("org.eclipse.persistence:org.eclipse.persistence.jpa")
 	optional("org.hibernate:hibernate-core")
-	optional("javax.servlet:javax.servlet-api:3.1.0")
+	optional("javax.servlet:javax.servlet-api")
 	testCompile(testFixtures(project(":spring-beans")))
 	testCompile(testFixtures(project(":spring-context")))
 	testCompile(testFixtures(project(":spring-core")))

From e7b499f7b6d0020e0c8ac38bd9e267f1e7f2506c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 10:45:44 +0200
Subject: [PATCH 046/735] Upgrade to JMH 1.32 and avoid accidental dependency
 on jopt-simple 4.6

JMH is now implicitly configured to use jopt-simple 5.0.4 instead of 4.6.

This problem was uncovered while fixing gh-27365
---
 gradle/spring-module.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle
index e0faef367adb..4b2b23d60ade 100644
--- a/gradle/spring-module.gradle
+++ b/gradle/spring-module.gradle
@@ -8,9 +8,9 @@ apply plugin: 'me.champeau.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 'net.sf.jopt-simple:jopt-simple:4.6'
+	jmh 'org.openjdk.jmh:jmh-core:1.32'
+	jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.32'
+	jmh 'net.sf.jopt-simple:jopt-simple'
 }
 
 jmh {

From d7ea4d230f3e00b54e12c823d710b2f3c8422524 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 10:49:48 +0200
Subject: [PATCH 047/735] Remove Eclipse-specific code from
 OptionalDependenciesPlugin

To support the recent changes to our `optional` dependencies plugin,
this commit removes the Eclipse-specific code which no longer appears
to be necessary.

Closes gh-27365
---
 .../build/optional/OptionalDependenciesPlugin.java          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index ec4f8b4b1939..a7e7101daee7 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -54,12 +54,6 @@ public void apply(Project project) {
 				project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(optional);
 			});
 		});
-		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {
-			project.getExtensions().getByType(EclipseModel.class)
-					.classpath((classpath) -> {
-						classpath.getPlusConfigurations().add(optional);
-					});
-		});
 	}
 
 }
\ No newline at end of file

From 19283c92459aef68cdfe738fd8bdf17b49597058 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 11:32:28 +0200
Subject: [PATCH 048/735] Avoid accidental dependency on older version of Byte
 Buddy

This commit allows Mockito-based tests in spring-test to work again
in Eclipse IDE.

This problem was uncovered while fixing gh-27365
---
 spring-test/spring-test.gradle | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 1223fdff57a9..e27977c1af02 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -30,8 +30,12 @@ dependencies {
 	optional("org.hamcrest:hamcrest")
 	optional("org.apache.taglibs:taglibs-standard-jstlel")
 	optional("net.sourceforge.htmlunit:htmlunit")
-	optional("org.seleniumhq.selenium:htmlunit-driver")
-	optional("org.seleniumhq.selenium:selenium-java")
+	optional("org.seleniumhq.selenium:htmlunit-driver") {
+		exclude group: "net.bytebuddy", module: "byte-buddy"
+	}
+	optional("org.seleniumhq.selenium:selenium-java") {
+		exclude group: "net.bytebuddy", module: "byte-buddy"
+	}
 	optional("org.xmlunit:xmlunit-matchers")
 	optional("org.skyscreamer:jsonassert")
 	optional("com.jayway.jsonpath:json-path")

From 417bce8be5e32ae43c2e3b25de1e24cd03c71e93 Mon Sep 17 00:00:00 2001
From: Yin-Jui <ckjimmy634@gmail.com>
Date: Thu, 27 May 2021 01:38:49 -0700
Subject: [PATCH 049/735] Add tests for MessageBodyClientHttpResponseWrapper

Closes gh-26984
---
 ...ageBodyClientHttpResponseWrapperTests.java | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java

diff --git a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
new file mode 100644
index 000000000000..2c116ac5a917
--- /dev/null
+++ b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
@@ -0,0 +1,55 @@
+/*
+ * 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.web.client;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Unit tests for {MessageBodyClientHttpResponseWrapper}.
+ *
+ * @author Yin-Jui Liao
+ */
+class MessageBodyClientHttpResponseWrapperTests {
+
+	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+
+	@Test
+	void testMessageBodyNotExist() throws IOException {
+		given(response.getBody()).willReturn(null);
+		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
+		assertThat(responseWrapper.hasEmptyMessageBody()).isTrue();
+	}
+
+	@Test
+	void testMessageBodyExist() throws IOException {
+		String body = "Accepted request";
+		InputStream stream = new ByteArrayInputStream(body.getBytes());
+		given(response.getBody()).willReturn(stream);
+		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
+		assertThat(responseWrapper.hasEmptyMessageBody()).isFalse();
+	}
+}

From d8191b48088b0ac2843b64beac861ddfcb99d9dd Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 14:23:58 +0200
Subject: [PATCH 050/735] Polish contribution

See gh-26984
---
 .../MessageBodyClientHttpResponseWrapper.java |  4 +--
 ...ageBodyClientHttpResponseWrapperTests.java | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java
index 85e1c8f1b7e8..6565adc45f93 100644
--- a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ class MessageBodyClientHttpResponseWrapper implements ClientHttpResponse {
 	private PushbackInputStream pushbackInputStream;
 
 
-	public MessageBodyClientHttpResponseWrapper(ClientHttpResponse response) throws IOException {
+	public MessageBodyClientHttpResponseWrapper(ClientHttpResponse response) {
 		this.response = response;
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
index 2c116ac5a917..19568910672d 100644
--- a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
@@ -13,43 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.client;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
 import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
+
 import org.springframework.http.client.ClientHttpResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
- * Unit tests for {MessageBodyClientHttpResponseWrapper}.
+ * Unit tests for {@link MessageBodyClientHttpResponseWrapper}.
  *
+ * @since 5.3.10
  * @author Yin-Jui Liao
  */
 class MessageBodyClientHttpResponseWrapperTests {
 
 	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
 
+	private final MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
+
+
 	@Test
-	void testMessageBodyNotExist() throws IOException {
+	void messageBodyDoesNotExist() throws Exception {
 		given(response.getBody()).willReturn(null);
-		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
 		assertThat(responseWrapper.hasEmptyMessageBody()).isTrue();
 	}
 
 	@Test
-	void testMessageBodyExist() throws IOException {
-		String body = "Accepted request";
-		InputStream stream = new ByteArrayInputStream(body.getBytes());
+	void messageBodyExists() throws Exception {
+		InputStream stream = new ByteArrayInputStream("content".getBytes());
 		given(response.getBody()).willReturn(stream);
-		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
 		assertThat(responseWrapper.hasEmptyMessageBody()).isFalse();
 	}
+
 }

From 3f66ef7aeebdcc9f599487357294143099242abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Tue, 7 Sep 2021 15:08:15 +0200
Subject: [PATCH 051/735] Compile with parameter names

Compiled code should contain parameter names to avoid the need
for class resources to be included in native image builds.

Closes gh-27369
---
 .../build/compile/CompilerConventionsPlugin.java            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
index 5284df28f124..f2424c549e50 100644
--- a/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
@@ -32,6 +32,7 @@
  *
  * @author Brian Clozel
  * @author Sam Brannen
+ * @author Sebastien Deleuze
  */
 public class CompilerConventionsPlugin implements Plugin<Project> {
 
@@ -43,7 +44,8 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 		List<String> commonCompilerArgs = Arrays.asList(
 				"-Xlint:serial", "-Xlint:cast", "-Xlint:classfile", "-Xlint:dep-ann",
 				"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
-				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options"
+				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options",
+				"-parameters"
 		);
 		COMPILER_ARGS = new ArrayList<>();
 		COMPILER_ARGS.addAll(commonCompilerArgs);
@@ -54,7 +56,7 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 		TEST_COMPILER_ARGS = new ArrayList<>();
 		TEST_COMPILER_ARGS.addAll(commonCompilerArgs);
 		TEST_COMPILER_ARGS.addAll(Arrays.asList("-Xlint:-varargs", "-Xlint:-fallthrough", "-Xlint:-rawtypes",
-				"-Xlint:-deprecation", "-Xlint:-unchecked", "-parameters"));
+				"-Xlint:-deprecation", "-Xlint:-unchecked"));
 	}
 
 	@Override

From a3655c48581dd3977de02f13dd3a7ecc3dcde6c2 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 7 Sep 2021 16:33:31 +0100
Subject: [PATCH 052/735] Add tip related to user destinations in STOMP

See gh-26986
---
 src/docs/asciidoc/web/websocket.adoc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 080a75e0ab3f..07751ff57317 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1818,12 +1818,16 @@ its own implementation of `WebSocketMessageBrokerConfigurer` that is marked with
 An application can send messages that target a specific user, and Spring's STOMP support
 recognizes destinations prefixed with `/user/` for this purpose.
 For example, a client might subscribe to the `/user/queue/position-updates` destination.
-This destination is handled by the `UserDestinationMessageHandler` and
-transformed into a destination unique to the user session
-(such as `/queue/position-updates-user123`). This provides the convenience of subscribing
-to a generically named destination while, at the same time, ensuring no collisions
-with other users who subscribe to the same destination so that each user can receive
-unique stock position updates.
+`UserDestinationMessageHandler` handles this destination and transforms it into a
+destination unique to the user session (such as `/queue/position-updates-user123`).
+This provides the convenience of subscribing to a generically named destination while,
+at the same time, ensuring no collisions with other users who subscribe to the same
+destination so that each user can receive unique stock position updates.
+
+TIP: When working with user destinations, it is important to configure broker and
+application destination prefixes as shown in <<websocket-stomp-enable>>, or otherwise the
+broker would handle "/user" prefixed messages that should only be handled by
+`UserDestinationMessageHandler`.
 
 On the sending side, messages can be sent to a destination such as
 pass:q[`/user/{username}/queue/position-updates`], which in turn is translated

From 55b3e064e93c376b9c60ec9458b56b0b20f6f184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Wed, 8 Sep 2021 09:32:25 +0200
Subject: [PATCH 053/735] Upgrade to Kotlin 1.5.30

Also upgrades related libraries:
- Coroutines upgraded to 1.5.2
- Serialization upgraded to 1.2.2

Closes gh-27371
---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 69b6cf85bb30..2236e11b462e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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.21' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.5.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'
@@ -10,7 +10,7 @@ plugins {
 	id "com.github.ben-manes.versions" version '0.28.0'
 	id "com.github.johnrengelman.shadow" version "6.1.0" apply false
 	id "me.champeau.jmh" version "0.6.4" apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.21" apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
 }
 
@@ -33,9 +33,9 @@ configure(allprojects) { project ->
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.21"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.1"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.1"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
 			mavenBom "org.junit:junit-bom:5.7.2"
 		}
 		dependencies {

From 8f33450df20352ad6eabe632c082d9b02cb46c9a Mon Sep 17 00:00:00 2001
From: Grant Fleming <grantgfleming@googlemail.com>
Date: Thu, 9 Sep 2021 12:26:44 +0100
Subject: [PATCH 054/735] Fix typo in core-beans.adoc

Closes gh-27377
---
 src/docs/asciidoc/core/core-beans.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 487ef6f4a1ea..2a8c526d2617 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -11188,7 +11188,7 @@ The following table lists features provided by the `BeanFactory` and
 | No
 | Yes
 
-| Convenient `MessageSource` access (for internalization)
+| Convenient `MessageSource` access (for internationalization)
 | No
 | Yes
 

From 1dc128361f87b3708f796ec0b4b3565ca28f8ba6 Mon Sep 17 00:00:00 2001
From: hantsy <hantsy@gmail.com>
Date: Sat, 28 Aug 2021 11:20:12 +0800
Subject: [PATCH 055/735] Add SmallRye Mutiny adapters

Closes gh-26222
---
 build.gradle                                  |  1 +
 spring-core/spring-core.gradle                |  1 +
 .../core/ReactiveAdapterRegistry.java         | 27 +++++++++++
 .../core/ReactiveAdapterRegistryTests.java    | 48 +++++++++++++++++++
 4 files changed, 77 insertions(+)

diff --git a/build.gradle b/build.gradle
index 2236e11b462e..b7a5d0330faa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,6 +68,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
+			dependency "io.smallrye.reactive:mutiny:1.0.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index a4166705d32d..822b6ed58acd 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -49,6 +49,7 @@ dependencies {
 	optional("io.reactivex:rxjava-reactive-streams")
 	optional("io.reactivex.rxjava2:rxjava")
 	optional("io.reactivex.rxjava3:rxjava")
+	optional("io.smallrye.reactive:mutiny")
 	optional("io.netty:netty-buffer")
 	testCompile("io.projectreactor:reactor-test")
 	testCompile("com.google.code.findbugs:jsr305")
diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index a5a8b9295092..4cbb90c0c606 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -24,6 +24,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 import kotlinx.coroutines.CompletableDeferredKt;
 import kotlinx.coroutines.Deferred;
 import org.reactivestreams.Publisher;
@@ -72,6 +74,8 @@ public class ReactiveAdapterRegistry {
 
 	private static final boolean kotlinCoroutinesPresent;
 
+	private static final boolean mutinyPresent;
+
 	static {
 		ClassLoader classLoader = ReactiveAdapterRegistry.class.getClassLoader();
 		reactorPresent = ClassUtils.isPresent("reactor.core.publisher.Flux", classLoader);
@@ -81,6 +85,7 @@ public class ReactiveAdapterRegistry {
 		rxjava3Present = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", classLoader);
 		flowPublisherPresent = ClassUtils.isPresent("java.util.concurrent.Flow.Publisher", classLoader);
 		kotlinCoroutinesPresent = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", classLoader);
+		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Uni", classLoader);
 	}
 
 	private final List<ReactiveAdapter> adapters = new ArrayList<>();
@@ -121,6 +126,11 @@ public ReactiveAdapterRegistry() {
 		if (reactorPresent && kotlinCoroutinesPresent) {
 			new CoroutinesRegistrar().registerAdapters(this);
 		}
+
+		// SmallRye Mutiny
+		if (mutinyPresent) {
+			new MutinyRegistrar().registerAdapters(this);
+		}
 	}
 
 
@@ -417,6 +427,23 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 		}
 	}
 
+	private static class MutinyRegistrar {
+
+		void registerAdapters(ReactiveAdapterRegistry registry) {
+			registry.registerReactiveType(
+					ReactiveTypeDescriptor.singleOptionalValue(Uni.class, ()-> Uni.createFrom().nothing()),
+					uni ->((Uni<?>)uni).convert().toPublisher(),
+					publisher ->  Uni.createFrom().publisher(publisher)
+			);
+
+			registry.registerReactiveType(
+					ReactiveTypeDescriptor.multiValue(Multi.class, ()-> Multi.createFrom().empty()),
+					multi -> (Multi<?>) multi,
+					publisher-> Multi.createFrom().publisher(publisher)
+			);
+		}
+	}
+
 
 	/**
 	 * {@code BlockHoundIntegration} for spring-core classes.
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index 4dc08a704f29..535891e6ff3e 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 import kotlinx.coroutines.Deferred;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -357,6 +359,52 @@ void deferred() {
 		}
 	}
 
+	// SmallRye Mutiny
+	@Nested
+	class Mutiny {
+
+		@Test
+		void defaultAdapterRegistrations() {
+			assertThat(getAdapter(io.smallrye.mutiny.Uni.class)).isNotNull();
+			assertThat(getAdapter(io.smallrye.mutiny.Multi.class)).isNotNull();
+		}
+
+		@Test
+		void toUni() {
+			Publisher<Integer> source = Mono.just(1);
+			Object target = getAdapter(Uni.class).fromPublisher(source);
+			assertThat(target).isInstanceOf(Uni.class);
+			assertThat(((Uni<Integer>) target).await().atMost(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+		}
+
+		@Test
+		void fromUni() {
+			Uni<Integer> source = Uni.createFrom().item(1);
+			Object target = getAdapter(Uni.class).toPublisher(source);
+			assertThat(target).isInstanceOf(Mono.class);
+			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+		}
+
+		@Test
+		void toMulti() {
+			List<Integer> sequence = Arrays.asList(1, 2, 3);
+			Publisher<Integer> source = Flux.fromIterable(sequence);
+			Object target = getAdapter(Multi.class).fromPublisher(source);
+			assertThat(target).isInstanceOf(Multi.class);
+			assertThat(((Multi<Integer>) target).collect().asList().await().atMost(Duration.ofMillis(1000))).isEqualTo(sequence);
+		}
+
+		@Test
+		void fromMulti() {
+			List<Integer> sequence = Arrays.asList(1, 2, 3);
+			Multi<Integer> source = Multi.createFrom().iterable(sequence);
+			Object target = getAdapter(Multi.class).toPublisher(source);
+			assertThat(target).isInstanceOf(Flux.class);
+			assertThat(((Flux<Integer>) target).blockLast(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(3));
+		}
+
+	}
+
 	private ReactiveAdapter getAdapter(Class<?> reactiveType) {
 		ReactiveAdapter adapter = this.registry.getAdapter(reactiveType);
 		assertThat(adapter).isNotNull();

From 41ab2687338c6419cb0f04c1bf79a9c52157a861 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 8 Sep 2021 16:59:28 +0100
Subject: [PATCH 056/735] Polishing contribution

See gh-27331
---
 .../core/ReactiveAdapterRegistry.java         | 21 +++++-----
 .../core/ReactiveAdapterRegistryTests.java    | 40 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index 4cbb90c0c606..cfeaffcaf734 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -24,8 +24,6 @@
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
-import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.Uni;
 import kotlinx.coroutines.CompletableDeferredKt;
 import kotlinx.coroutines.Deferred;
 import org.reactivestreams.Publisher;
@@ -85,7 +83,7 @@ public class ReactiveAdapterRegistry {
 		rxjava3Present = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", classLoader);
 		flowPublisherPresent = ClassUtils.isPresent("java.util.concurrent.Flow.Publisher", classLoader);
 		kotlinCoroutinesPresent = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", classLoader);
-		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Uni", classLoader);
+		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Multi", classLoader);
 	}
 
 	private final List<ReactiveAdapter> adapters = new ArrayList<>();
@@ -427,19 +425,24 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 		}
 	}
 
+
 	private static class MutinyRegistrar {
 
 		void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
-					ReactiveTypeDescriptor.singleOptionalValue(Uni.class, ()-> Uni.createFrom().nothing()),
-					uni ->((Uni<?>)uni).convert().toPublisher(),
-					publisher ->  Uni.createFrom().publisher(publisher)
+					ReactiveTypeDescriptor.singleOptionalValue(
+							io.smallrye.mutiny.Uni.class,
+							() -> io.smallrye.mutiny.Uni.createFrom().nothing()),
+					uni -> ((io.smallrye.mutiny.Uni<?>) uni).convert().toPublisher(),
+					publisher -> io.smallrye.mutiny.Uni.createFrom().publisher(publisher)
 			);
 
 			registry.registerReactiveType(
-					ReactiveTypeDescriptor.multiValue(Multi.class, ()-> Multi.createFrom().empty()),
-					multi -> (Multi<?>) multi,
-					publisher-> Multi.createFrom().publisher(publisher)
+					ReactiveTypeDescriptor.multiValue(
+							io.smallrye.mutiny.Multi.class,
+							() -> io.smallrye.mutiny.Multi.createFrom().empty()),
+					multi -> (io.smallrye.mutiny.Multi<?>) multi,
+					publisher -> io.smallrye.mutiny.Multi.createFrom().publisher(publisher)
 			);
 		}
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index 535891e6ff3e..579e1a463afc 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -40,6 +40,9 @@
 @SuppressWarnings("unchecked")
 class ReactiveAdapterRegistryTests {
 
+	private static final Duration ONE_SECOND = Duration.ofSeconds(1);
+
+
 	private final ReactiveAdapterRegistry registry = ReactiveAdapterRegistry.getSharedInstance();
 
 
@@ -85,7 +88,7 @@ void toFlux() {
 			Publisher<Integer> source = io.reactivex.rxjava3.core.Flowable.fromIterable(sequence);
 			Object target = getAdapter(Flux.class).fromPublisher(source);
 			assertThat(target instanceof Flux).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -93,7 +96,7 @@ void toMono() {
 			Publisher<Integer> source = io.reactivex.rxjava3.core.Flowable.fromArray(1, 2, 3);
 			Object target = getAdapter(Mono.class).fromPublisher(source);
 			assertThat(target instanceof Mono).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -110,7 +113,7 @@ void fromCompletableFuture() {
 			future.complete(1);
 			Object target = getAdapter(CompletableFuture.class).toPublisher(future);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 	}
 
@@ -155,7 +158,7 @@ void fromObservable() {
 			Object source = rx.Observable.from(sequence);
 			Object target = getAdapter(rx.Observable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -163,7 +166,7 @@ void fromSingle() {
 			Object source = rx.Single.just(1);
 			Object target = getAdapter(rx.Single.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -171,7 +174,7 @@ void fromCompletable() {
 			Object source = rx.Completable.complete();
 			Object target = getAdapter(rx.Completable.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(Duration.ofMillis(1000));
+			((Mono<Void>) target).block(ONE_SECOND);
 		}
 	}
 
@@ -229,7 +232,7 @@ void fromFlowable() {
 			Object source = io.reactivex.Flowable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.Flowable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -238,7 +241,7 @@ void fromObservable() {
 			Object source = io.reactivex.Observable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.Observable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -246,7 +249,7 @@ void fromSingle() {
 			Object source = io.reactivex.Single.just(1);
 			Object target = getAdapter(io.reactivex.Single.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -254,7 +257,7 @@ void fromCompletable() {
 			Object source = io.reactivex.Completable.complete();
 			Object target = getAdapter(io.reactivex.Completable.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(Duration.ofMillis(1000));
+			((Mono<Void>) target).block(ONE_SECOND);
 		}
 	}
 
@@ -312,7 +315,7 @@ void fromFlowable() {
 			Object source = io.reactivex.rxjava3.core.Flowable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.rxjava3.core.Flowable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -321,7 +324,7 @@ void fromObservable() {
 			Object source = io.reactivex.rxjava3.core.Observable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.rxjava3.core.Observable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -329,7 +332,7 @@ void fromSingle() {
 			Object source = io.reactivex.rxjava3.core.Single.just(1);
 			Object target = getAdapter(io.reactivex.rxjava3.core.Single.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -337,7 +340,7 @@ void fromCompletable() {
 			Object source = io.reactivex.rxjava3.core.Completable.complete();
 			Object target = getAdapter(io.reactivex.rxjava3.core.Completable.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(Duration.ofMillis(1000));
+			((Mono<Void>) target).block(ONE_SECOND);
 		}
 	}
 
@@ -359,7 +362,6 @@ void deferred() {
 		}
 	}
 
-	// SmallRye Mutiny
 	@Nested
 	class Mutiny {
 
@@ -374,7 +376,7 @@ void toUni() {
 			Publisher<Integer> source = Mono.just(1);
 			Object target = getAdapter(Uni.class).fromPublisher(source);
 			assertThat(target).isInstanceOf(Uni.class);
-			assertThat(((Uni<Integer>) target).await().atMost(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Uni<Integer>) target).await().atMost(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -382,7 +384,7 @@ void fromUni() {
 			Uni<Integer> source = Uni.createFrom().item(1);
 			Object target = getAdapter(Uni.class).toPublisher(source);
 			assertThat(target).isInstanceOf(Mono.class);
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -391,7 +393,7 @@ void toMulti() {
 			Publisher<Integer> source = Flux.fromIterable(sequence);
 			Object target = getAdapter(Multi.class).fromPublisher(source);
 			assertThat(target).isInstanceOf(Multi.class);
-			assertThat(((Multi<Integer>) target).collect().asList().await().atMost(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Multi<Integer>) target).collect().asList().await().atMost(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -400,7 +402,7 @@ void fromMulti() {
 			Multi<Integer> source = Multi.createFrom().iterable(sequence);
 			Object target = getAdapter(Multi.class).toPublisher(source);
 			assertThat(target).isInstanceOf(Flux.class);
-			assertThat(((Flux<Integer>) target).blockLast(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(3));
+			assertThat(((Flux<Integer>) target).blockLast(ONE_SECOND)).isEqualTo(Integer.valueOf(3));
 		}
 
 	}

From b6037d0d07efee37ddc7200f80f31b862cbed04c Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 9 Sep 2021 15:37:58 +0100
Subject: [PATCH 057/735] Correctly format class name in default package

Closes gh-27247
---
 .../invocation/AbstractMethodMessageHandler.java     | 12 ++++++++----
 .../reactive/AbstractMethodMessageHandler.java       | 12 ++++++++----
 .../result/method/AbstractHandlerMethodMapping.java  | 10 +++++++---
 .../handler/AbstractHandlerMethodMapping.java        | 10 +++++++---
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
index fc50155039c4..f160d506eed7 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
 
@@ -319,9 +320,12 @@ protected final void detectHandlerMethods(final Object handler) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
index 1d85930585cb..a240f4d8efa0 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.RouteMatcher;
+import org.springframework.util.StringUtils;
 
 /**
  * Abstract base class for reactive HandlerMethod-based message handling.
@@ -341,9 +342,12 @@ protected final void detectHandlerMethods(Object handler) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
index 93ff062651e1..c2e01aaeff70 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
@@ -42,6 +42,7 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.reactive.CorsUtils;
 import org.springframework.web.method.HandlerMethod;
@@ -222,9 +223,12 @@ else if (mappingsLogger.isDebugEnabled()) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
index 367ca74997da..46f1707d1cfb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
@@ -44,6 +44,7 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsUtils;
 import org.springframework.web.method.HandlerMethod;
@@ -301,9 +302,12 @@ else if (mappingsLogger.isDebugEnabled()) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));

From 63ffa710d6d9b8f5b6e615b7c7c92ff62f6c421a Mon Sep 17 00:00:00 2001
From: Ruslan Stelmachenko <xak2000@gmail.com>
Date: Thu, 9 Sep 2021 01:43:20 +0300
Subject: [PATCH 058/735] Include all bytes of body in
 UnknownContentTypeException

HttpMessageConverterExtractor uses MessageBodyClientHttpResponseWrapper
which may read the first byte of the response stream to check if there
is content. After that it is necessary to use the wrapper to get the
full body.

This commit ensures that when UnknownContentTypeException is raised
it gets the body through the wrapper, or otherwise the first byte is
missed if the InputStream is not markable.

Closes gh-27374
---
 .../client/HttpMessageConverterExtractor.java |  4 ++--
 .../HttpMessageConverterExtractorTests.java   | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
index 771a444bd731..dc515cc91d6a 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -122,8 +122,8 @@ public T extractData(ClientHttpResponse response) throws IOException {
 		}
 
 		throw new UnknownContentTypeException(this.responseType, contentType,
-				response.getRawStatusCode(), response.getStatusText(), response.getHeaders(),
-				getResponseBody(response));
+				responseWrapper.getRawStatusCode(), responseWrapper.getStatusText(), responseWrapper.getHeaders(),
+				getResponseBody(responseWrapper));
 	}
 
 	/**
diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index 2374a0d95487..de86b8671de0 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -38,6 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.catchThrowableOfType;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -194,4 +195,23 @@ public void converterThrowsHttpMessageNotReadableException() throws IOException
 			.withCauseInstanceOf(HttpMessageNotReadableException.class);
 	}
 
+	@Test
+	public void unknownContentTypeExceptionContainsCorrectResponseBody() throws IOException {
+		responseHeaders.setContentType(contentType);
+		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
+		given(response.getHeaders()).willReturn(responseHeaders);
+		given(response.getBody()).willReturn(new ByteArrayInputStream("Foobar".getBytes())  {
+			@Override
+			public boolean markSupported() {
+				return false;
+			}
+		});
+		given(converter.canRead(String.class, contentType)).willReturn(false);
+
+		UnknownContentTypeException unknownContentTypeException =
+				catchThrowableOfType(() -> extractor.extractData(response), UnknownContentTypeException.class);
+		assertThat(unknownContentTypeException).isNotNull();
+		assertThat(unknownContentTypeException.getResponseBodyAsString()).isEqualTo("Foobar");
+	}
+
 }

From c23f0cd070aa2e5429fadf4a41e670533c4016c8 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 10 Sep 2021 11:22:01 +0100
Subject: [PATCH 059/735] Polishing contribution

See gh-27374
---
 .../web/client/HttpMessageConverterExtractor.java      |  4 ++--
 .../web/client/HttpMessageConverterExtractorTests.java | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
index dc515cc91d6a..45cc426a0679 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -122,8 +122,8 @@ public T extractData(ClientHttpResponse response) throws IOException {
 		}
 
 		throw new UnknownContentTypeException(this.responseType, contentType,
-				responseWrapper.getRawStatusCode(), responseWrapper.getStatusText(), responseWrapper.getHeaders(),
-				getResponseBody(responseWrapper));
+				responseWrapper.getRawStatusCode(), responseWrapper.getStatusText(),
+				responseWrapper.getHeaders(), getResponseBody(responseWrapper));
 	}
 
 	/**
diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index de86b8671de0..bb4acdf5e061 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -208,10 +208,10 @@ public boolean markSupported() {
 		});
 		given(converter.canRead(String.class, contentType)).willReturn(false);
 
-		UnknownContentTypeException unknownContentTypeException =
-				catchThrowableOfType(() -> extractor.extractData(response), UnknownContentTypeException.class);
-		assertThat(unknownContentTypeException).isNotNull();
-		assertThat(unknownContentTypeException.getResponseBodyAsString()).isEqualTo("Foobar");
+		UnknownContentTypeException exception = catchThrowableOfType(
+				() -> extractor.extractData(response), UnknownContentTypeException.class);
+		assertThat(exception).isNotNull();
+		assertThat(exception.getResponseBodyAsString()).isEqualTo("Foobar");
 	}
 
 }

From c3e424c29a5c72c3e9d69e9722f91d52f4a0c6fe Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 10 Sep 2021 16:01:23 +0200
Subject: [PATCH 060/735] Polishing

---
 .../HttpMessageConverterExtractorTests.java   | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index bb4acdf5e061..e9d6bd1da382 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -38,7 +38,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.catchThrowableOfType;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -51,7 +50,7 @@
  * @author Brian Clozel
  * @author Sam Brannen
  */
-public class HttpMessageConverterExtractorTests {
+class HttpMessageConverterExtractorTests {
 
 	@SuppressWarnings("unchecked")
 	private final HttpMessageConverter<String> converter = mock(HttpMessageConverter.class);
@@ -62,7 +61,7 @@ public class HttpMessageConverterExtractorTests {
 
 
 	@Test
-	public void constructorPreconditions() {
+	void constructorPreconditions() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new HttpMessageConverterExtractor<>(String.class, (List<HttpMessageConverter<?>>) null))
 				.withMessage("'messageConverters' must not be empty");
@@ -72,7 +71,7 @@ public void constructorPreconditions() {
 	}
 
 	@Test
-	public void noContent() throws IOException {
+	void noContent() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.NO_CONTENT.value());
 
 		Object result = extractor.extractData(response);
@@ -80,7 +79,7 @@ public void noContent() throws IOException {
 	}
 
 	@Test
-	public void notModified() throws IOException {
+	void notModified() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.NOT_MODIFIED.value());
 
 		Object result = extractor.extractData(response);
@@ -88,7 +87,7 @@ public void notModified() throws IOException {
 	}
 
 	@Test
-	public void informational() throws IOException {
+	void informational() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.CONTINUE.value());
 
 		Object result = extractor.extractData(response);
@@ -96,7 +95,7 @@ public void informational() throws IOException {
 	}
 
 	@Test
-	public void zeroContentLength() throws IOException {
+	void zeroContentLength() throws IOException {
 		responseHeaders.setContentLength(0);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -106,7 +105,7 @@ public void zeroContentLength() throws IOException {
 	}
 
 	@Test
-	public void emptyMessageBody() throws IOException {
+	void emptyMessageBody() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
 		given(response.getBody()).willReturn(new ByteArrayInputStream("".getBytes()));
@@ -116,7 +115,7 @@ public void emptyMessageBody() throws IOException {
 	}
 
 	@Test // gh-22265
-	public void nullMessageBody() throws IOException {
+	void nullMessageBody() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
 		given(response.getBody()).willReturn(null);
@@ -126,7 +125,7 @@ public void nullMessageBody() throws IOException {
 	}
 
 	@Test
-	public void normal() throws IOException {
+	void normal() throws IOException {
 		responseHeaders.setContentType(contentType);
 		String expected = "Foo";
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
@@ -140,7 +139,7 @@ public void normal() throws IOException {
 	}
 
 	@Test
-	public void cannotRead() throws IOException {
+	void cannotRead() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -151,7 +150,7 @@ public void cannotRead() throws IOException {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void generics() throws IOException {
+	void generics() throws IOException {
 		responseHeaders.setContentType(contentType);
 		String expected = "Foo";
 		ParameterizedTypeReference<List<String>> reference = new ParameterizedTypeReference<List<String>>() {};
@@ -171,7 +170,7 @@ public void generics() throws IOException {
 	}
 
 	@Test  // SPR-13592
-	public void converterThrowsIOException() throws IOException {
+	void converterThrowsIOException() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -184,7 +183,7 @@ public void converterThrowsIOException() throws IOException {
 	}
 
 	@Test  // SPR-13592
-	public void converterThrowsHttpMessageNotReadableException() throws IOException {
+	void converterThrowsHttpMessageNotReadableException() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -196,7 +195,7 @@ public void converterThrowsHttpMessageNotReadableException() throws IOException
 	}
 
 	@Test
-	public void unknownContentTypeExceptionContainsCorrectResponseBody() throws IOException {
+	void unknownContentTypeExceptionContainsCorrectResponseBody() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -208,10 +207,8 @@ public boolean markSupported() {
 		});
 		given(converter.canRead(String.class, contentType)).willReturn(false);
 
-		UnknownContentTypeException exception = catchThrowableOfType(
-				() -> extractor.extractData(response), UnknownContentTypeException.class);
-		assertThat(exception).isNotNull();
-		assertThat(exception.getResponseBodyAsString()).isEqualTo("Foobar");
+		assertThatExceptionOfType(UnknownContentTypeException.class).isThrownBy(() -> extractor.extractData(response))
+			.satisfies(exception -> assertThat(exception.getResponseBodyAsString()).isEqualTo("Foobar"));
 	}
 
 }

From bb45a7ae5ea45670884434ba15924d3490527e8a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sat, 11 Sep 2021 00:00:57 +0200
Subject: [PATCH 061/735] Fix bug fix icon in changelog configuration

Closes gh-27384
---
 ci/config/changelog-generator.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/config/changelog-generator.yml b/ci/config/changelog-generator.yml
index 248e58db739e..a029e25582e4 100644
--- a/ci/config/changelog-generator.yml
+++ b/ci/config/changelog-generator.yml
@@ -4,7 +4,7 @@ changelog:
     - title: ":star: New Features"
       labels:
         - "type: enhancement"
-    - title: ":beetle: Bug Fixes"
+    - title: ":lady_beetle: Bug Fixes"
       labels:
         - "type: bug"
         - "type: regression"

From 78dd219787c7087a4804c5b3a815ee1c614324a5 Mon Sep 17 00:00:00 2001
From: Radek Crlik <radekcrlik@gmail.com>
Date: Sat, 11 Sep 2021 17:42:51 +0200
Subject: [PATCH 062/735] Fix misplaced comma in AOP doc

See gh-27387
---
 src/docs/asciidoc/core/core-aop.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc
index d4e4a9a6e7ce..a6412096e492 100644
--- a/src/docs/asciidoc/core/core-aop.adoc
+++ b/src/docs/asciidoc/core/core-aop.adoc
@@ -2830,7 +2830,7 @@ The corresponding Spring configuration is as follows:
 	</bean>
 ----
 
-Notice that, for the time, being we assume that all business services are idempotent. If
+Notice that, for the time being, we assume that all business services are idempotent. If
 this is not the case, we can refine the aspect so that it retries only genuinely
 idempotent operations, by introducing an `Idempotent` annotation and using the annotation
 to annotate the implementation of service operations, as the following example shows:

From cecc0849a8c9a912004a843561a8458e7925ce3c Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Fri, 21 May 2021 21:16:30 +0200
Subject: [PATCH 063/735] Upgrade to Gradle 7.2

This commit upgrades Gradle to 7.2.
Gradle configuration names are updated accordingly.
This also upgrades Gradle build plugins.

See gh-26870
---
 build.gradle                                  |  38 +--
 gradle/docs.gradle                            |  79 +++---
 gradle/spring-module.gradle                   |   4 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       | 257 +++++++++++-------
 integration-tests/integration-tests.gradle    |  40 +--
 spring-aop/spring-aop.gradle                  |   9 +-
 spring-aspects/spring-aspects.gradle          |  16 +-
 spring-beans/spring-beans.gradle              |   6 +-
 .../spring-context-indexer.gradle             |  10 +-
 .../spring-context-support.gradle             |  30 +-
 spring-context/spring-context.gradle          |  38 +--
 .../kotlin-coroutines.gradle                  |  10 +-
 spring-core/spring-core.gradle                |  32 +--
 spring-expression/spring-expression.gradle    |   8 +-
 spring-jdbc/spring-jdbc.gradle                |  10 +-
 spring-jms/spring-jms.gradle                  |  14 +-
 spring-messaging/spring-messaging.gradle      |  46 ++--
 spring-orm/spring-orm.gradle                  |  22 +-
 spring-oxm/spring-oxm.gradle                  |  22 +-
 spring-r2dbc/spring-r2dbc.gradle              |  24 +-
 spring-test/spring-test.gradle                |  64 ++---
 spring-tx/spring-tx.gradle                    |  18 +-
 spring-web/spring-web.gradle                  |  52 ++--
 spring-webflux/spring-webflux.gradle          |  66 ++---
 spring-webmvc/spring-webmvc.gradle            |  72 ++---
 spring-websocket/spring-websocket.gradle      |  16 +-
 28 files changed, 521 insertions(+), 484 deletions(-)

diff --git a/build.gradle b/build.gradle
index b7a5d0330faa..059b5fec1d3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.5.RELEASE'
 	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
-	id 'org.jetbrains.dokka' version '0.10.1' apply false
+	id 'org.jetbrains.dokka' version '1.5.0' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.1.0'
 	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
-	id 'de.undercouch.download' version '4.1.1'
-	id "io.freefair.aspectj" version '5.1.1' apply false
-	id "com.github.ben-manes.versions" version '0.28.0'
-	id "com.github.johnrengelman.shadow" version "6.1.0" apply false
-	id "me.champeau.jmh" version "0.6.4" apply false
+	id 'de.undercouch.download' version '4.1.2'
+	id "io.freefair.aspectj" version '6.1.0' apply false
+	id "com.github.ben-manes.versions" version '0.39.0'
+	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
+	id "me.champeau.jmh" version "0.6.6" apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
 }
@@ -342,18 +342,18 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	dependencies {
-		testCompile("org.junit.jupiter:junit-jupiter-api")
-		testCompile("org.junit.jupiter:junit-jupiter-params")
-		testCompile("org.mockito:mockito-core")
-		testCompile("org.mockito:mockito-junit-jupiter")
-		testCompile("io.mockk:mockk")
-		testCompile("org.assertj:assertj-core")
+		testImplementation("org.junit.jupiter:junit-jupiter-api")
+		testImplementation("org.junit.jupiter:junit-jupiter-params")
+		testImplementation("org.mockito:mockito-core")
+		testImplementation("org.mockito:mockito-junit-jupiter")
+		testImplementation("io.mockk:mockk")
+		testImplementation("org.assertj:assertj-core")
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
-		testRuntime("org.junit.platform:junit-platform-launcher")
-		testRuntime("org.junit.jupiter:junit-jupiter-engine")
-		testRuntime("org.apache.logging.log4j:log4j-core")
-		testRuntime("org.apache.logging.log4j:log4j-slf4j-impl")
-		testRuntime("org.apache.logging.log4j:log4j-jul")
+		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
@@ -364,7 +364,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.oracle.com/javase/8/docs/api/",
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
-			"https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
 			"https://glassfish.java.net/nonav/docs/v3/api/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 4b6e139b6513..3d1ee01934b8 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -61,58 +61,41 @@ task api(type: Javadoc) {
 /**
  * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
  */
-dokka {
-	dependsOn {
-		tasks.getByName("api")
-	}
-
-	doFirst {
-		configuration {
-			classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
-			classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
-
-			moduleProjects.findAll {
-				it.pluginManager.hasPlugin("kotlin")
-			}.each { project ->
-				def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
-				kotlinDirs -= project.sourceSets.main.java.srcDirs
-				kotlinDirs.each { dir ->
-					if (dir.exists()) {
-						sourceRoot {
-							path = dir.path
-						}
-					}
+/*
+moduleProjects.each { module ->
+	dokkaHtmlPartial {
+		dokkaSourceSets {
+			configureEach {
+				externalDocumentationLink {
+					url.set(URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/"))
+					packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
+				}
+				externalDocumentationLink {
+					url.set(URL("https://projectreactor.io/docs/core/release/api/"))
+				}
+				externalDocumentationLink {
+					url.set(URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
+				}
+				/*
+			This link causes errors, removing to fix the build.
+			externalDocumentationLink {
+				url.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/"))
+			}
+			//
+				externalDocumentationLink {
+					url.set(URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/"))
 				}
 			}
 		}
 	}
-
-	outputFormat = "html"
-	outputDirectory = "$buildDir/docs/kdoc"
-
-	configuration {
-		moduleName = "spring-framework"
-
-		externalDocumentationLink {
-			url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
-			packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
-		}
-		externalDocumentationLink {
-			url = new URL("https://projectreactor.io/docs/core/release/api/")
-		}
-		externalDocumentationLink {
-			url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
-		}
-/*
-		This link causes errors, removing to fix the build.
-		externalDocumentationLink {
-			url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
-		}
+}
 */
-		externalDocumentationLink {
-			url = new URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/")
-		}
+tasks.dokkaHtmlMultiModule.configure {
+	dependsOn {
+		tasks.getByName("api")
 	}
+	moduleName.set("spring-framework")
+	outputDirectory.set(project.file("$buildDir/docs/kdoc"))
 }
 
 task downloadResources(type: Download) {
@@ -193,7 +176,7 @@ asciidoctorPdf {
 /**
  * Zip all docs (API and reference) into a single archive
  */
-task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokka']) {
+task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokkaHtmlMultiModule']) {
 	group = "Distribution"
 	description = "Builds -${archiveClassifier} archive containing api and reference " +
 			"for deployment at https://docs.spring.io/spring-framework/docs."
@@ -212,7 +195,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 	from ("$asciidoctorPdf.outputDir") {
 		into "reference/pdf"
 	}
-	from (dokka) {
+	from (dokkaHtmlMultiModule) {
 		into "kdoc-api"
 	}
 }
diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle
index 4b2b23d60ade..7628127cb5d4 100644
--- a/gradle/spring-module.gradle
+++ b/gradle/spring-module.gradle
@@ -17,6 +17,10 @@ jmh {
 	duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
+tasks.findByName("processJmhResources").configure {
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 jmhJar {
 	// Uncomment the following for Shadow's Transformer support.
 	// mergeServiceFiles()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
zcmY&<19zBR)MXm8v2EM7ZQHi-#I|kQZfv7Tn#Q)%81v4zX3d)U4d<S{&&C~|14~>4
zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW<b;`{sz_0x=?HD$
zfRd}z!dlzv65-&;kfVv!%#n8?Y%uh6t_yvK3%vZ!=sQhW#x&$16>%^3U(Wg>{qkAF
z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$
z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH<Qh2bO23s<c<b?kJSx>
zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC
zX*Bw3rFz3R)DXpCVBkI!SoOHt<r_Zw4g3Jlhii6BC+0g(i?Vec^cYS1yA*tD`4TKj
zOApa7lBa#WaS!-2<I(+955H!14q3}J>Ystv*e-May|+?b80ZRh$MZ$FerlC`)ZKt}
zTd0Arf9N2dimjs>mg5&@sfTP<FMra4imH+_IBlL4Nc_~AL#%VJCxe3)stbd02AEM|
z&D0&Tn5H7hbWpsy=sT;pxOd15(iWc{al!mn&C#+i%f3lDS<jx_mG|11KCBpX%ouSo
z@?~hUsz{+<!8=d398xo&@l@S~*jz8h-YM#AGsF0WGkRz@$<m!>sRXKXI;0L~&t+GH
zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs
zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL<g~w=Zk9z5S1jDI
z71nU2i<Es|#qXTuJIRx-HjX+gJ*LMd1jHM#UfOkw#&q`-<mI*srz-Ay05DEYB_)#v
zvk_+YZbpT72OHLyzK&`<6&<^A=1Fr^E7_0s%OXF6r^I$M)pZ_3F4o5d`%I9#uyBlZ
zX1C9_iSi<5viI;Yrq>>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp
zifvzV<QA3qQ_icfAX<_Uh_AWeD00fmmOez9t>V1!Dj*dxG%BsQyRP6${X+Tc$+XOG
zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(<kbHS<d%uD<k^y4GS
z_@nGkSrluLeGBfOtQ55e=_#qB)a=_z-;eBz1(Z7to$`|!g;(i3z=gq~yvKKK5sNc#
zl$gJ2XIR<<L*cw&uktYWH>VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qw<A`W4NXV_{
zECxbg>i`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB<A>`mLUmo_>@2R&nj7&CiH
zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+
zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+
zYgj;<`j)GzINJA>{HeSHC)<cjl~xrBv-Ad;_(!35VQHb!n{j_(E9gc}-sAqiZ7)~T
zGr>bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX}
zFiB>dvc1+If!><mtjfI+&uNcAL5R+)16aVAdoC-IdLWfR^loo9quT)qg_~Y<A<|%J
z{4}JG)2I+AA+2M<X=n8Tj%Y@|gL;a0cu?_0nya~Ds$JH`tyme!ug%h)y+8F-aj3Vs
zM_OOr;e%?DW<F8GdQP&*MHN=uF5OQ@*^d|_+48he#kR1%(q8FHxG~1)pjWd#*S~<-
zsO)|Q{2i9C8z1<O>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur-
zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P
z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@
z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R
zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(?
zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK
z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED
ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4
z9gwAot<F`HDf<=vVlS~}$IUDtF0klA`^#pB|G?>i2ICvUWxE&RZ~}E)#M8*zy1iwz
zHqN%q;u+f6Ti|SzI<FRGwCIa?0!fO9WN;kBsxILjw5}w5BK>Lm0s-)=4)>eb5o-0K
zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC
zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ=<DzSWjCiKD^*;5J$
zl4gOX?qd<vHF|&G>=cT#;!<B?QV)Sxf^HT@cL_2la1`-IR6ZJ;P$+RaV<afLePi-(
z`iA)b_c_5yafTWN1f-H8r4X4C7}bXH(p^at7}wcudBoe0*%y<B25sgtkcNi&V-$%G
zMSGX5<q?c3;?<OIPu@&cT0xgeo?7m!1=~tj=2jG1wy=Q0Jt$O25951g=k|2gnn%q#
z)8}Dz@%7wCsofkVeUfvN<9Fx(obP+xb&~&3;CkI=_&w{&h_XoYrA)m7ECODqf@l4F
zr=J~G0aXj%UK8SkUZ>7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19ad<I
zm9QB;RzH152H*y3tMn*3EvxkEox&n8T*@N+`8Grw?(i08(CyTVvrdYB<~KAN?m-af
z48ifc{b0Ob(DjSYG@#1{T-ASiogxS*?mdh?gD%n`&#ElaJuKw(ZVs>Xim<W6u2t)u
z6s_ppklZx{7yd_UKBw+|N=In~2BVl!;x!QFZ9|x}y<?)9OHecoqZy3Ivt=}#Q4OL}
zHX1K1MQ2CF*2uHy#a$|F7h=ma*&JbOw43$!kcjqs7DeysG@f1n)sS!+XLYaik%I6Q
zipAB_g8OF4y#?ZDYDeW}jgwU3o7%OecZ~=o`u6c&jknOzmB`r7um)wXimA2gUfH7y
zwN>?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$
z_O<cn@nUEGUT$oFPywe(&63O<$H?qH$ZdDGyOrByWM-n!VN96r=4Si%R!g1l+UnD`
zQey?KU7qiwzmKU}0s?3Fj2Rin=8W1ZMnah!zlFm}iM17m<$e2;<DZ4?9$K``?YR+Q
zC}no$*}t0`uIi4yRIN32V9oeLrVI6T6+Jz_>JWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU
z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXp<hVQ+lx!L-&x;bs6sTWy
z5-jLZ!#e0u)=!m;6eq(oP?P9YA*Tr@kg*nGSid%#)&Itd;r2X&XUd2s?PWTYrzq|2
z53Ns^<9hG_We_Zz8R90$En!t{KH(+#ajodOS-JLijl^nkBeB<yrw*j+6*uuXLyLF9
z{N3t`5+i>ocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|<oUQ1dylfIc7Y5Z3j1x;-E4})
zlPALqD3U1psXL!B;q*ehz{Llf;>(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g
zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS
zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL<m6VWFb>`G^(X43g<oal-E1{f_!
zMM~2F^%K|Fu~`x<<&sTAc`V5n;Rw6{XkE{;s3-|c+NIU#Skt3b199qOwzF!22Tqf*
zE16<4@?5ePsR(z@^xu8!CWvB;_CSM&hm~uwsrVnilwfgKIQSi1c+dzpZ8QColu7eB
zT&F_jgPa+roCfk+v!rsEdW#ZFy2((cA!saskfsl5@-js1&&gA?clYAmax@Nf1=?Q4
zy-!%e31-Pm3`OUe=&CWnia;bDEY^Qu5IhxOnKWJv>Wbo!6(q*u%HxWh$$^2EOq`Hj
zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~
zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{<AUkIQ?T$#YvpqqHZZT}0w>RyfezB^;fceBk
znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEV<B*)702m>Qxt{
zKSfJf;lk$0XO8~4<V91^$-vD;;s6SSgg|GI(=zrZRux(KOs}+`xmO>8Xn2d<xw$ML
z-Nox99yuWO;%tc<D!o9)3662vJevDRmH3`X>nh8tMC9WHu`%DZj&a`2!tNB`5%;Md
zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il<kZ3mGp>%+I<Y$q}
zk%HyZpWUh@6{prl<|AyV2rx<i=^VB%K0@I+<ln!^usw3Em(Miio93@zcZ%-v{4&N2
zcYE0Tpd>5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~
zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA
z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik<t|
zD0oMP!MWpM*U(u`s*F9Hx|}0|3{SpW3>@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l
z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4<deXWj{kD3-?t{z(at
z5F960+Lt}Rd_`N{v%m1^3E9$wcvIbH!uR*j0b^-{f_3#Jis!WwN*J7@HbvqL8Zdjq
z$T6F?1c?FFl=g%g8UXxRntAEHa6ofPAW?d>(xV5WgWMd3mB9A(>@XE292#k(HdI7P
zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ
z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R
zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs
zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l
zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&G<UJ=R?LuB}PDO7HVNF<3
zfCse)dXXnk@duX_x6gxT#znrXeb8;xk?)n8E`2<|0F?)>aG5hX_NK!?)iq`t7q*F#
zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf
zVmGeOO#v159KV@1g`m%gJ<w@$Jfr|I+t<O1vhU+3{qM1CnOgkF@lDWIFY2P&R7=ZP
z8`(YDAz*YyvmlEiqc#;+fy8?1CW()FxYZFSGN+f<<VQg&@m?XNaI27R(!Y^I-zolX
zPCRK)8i0Y7fjRSFQh*v<puB(gBc(MsA|^8jB6IY9u-_<pCipoS@#KuXUh!bv66|sJ
z@P<R+ErTIV%VE03mMc&bKh;NS(uYg30Kyk-WT%%e1g)=e#1+)!2MFss5qM=tVqWUJ
zq~^bP4dz-ZXl-uw@HZ;Ee0<FPo#JTdn9|^s3;-k4yD8(Rg7Q1B5V}fp8dvCBvO-&&
zP<En#@06*@fduhJn_yI@#Nj@hur=#<#27q0QXHv-e#oMi3}5Z28GP}@{CSkcPJVX9
zEhbEH)dxGPDRBmMS)0sW$HHzTu}xfXfFz%}&ac@@z(W!98m-Gh_Aiq9YRq+bsQ@3%
z4j>)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA<Sh;28pD1
zIFs~Z><MDBdusACPh#gSuba$Zxq9XQ9zHgTm9jJRWBl;6MmD|7#OCb+r-NVhSxD`l
zpz{#9n=TYzv1i>=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<<peV!m
z=VC0_KSpi7FpU+=-~zA*iYIY`A$OK=V*+<-;yaWEHTS+fpQ9nF0e2pd-&@Jw1WOD3
z8GVsYvW1sKoZNTx4OK_oZ>VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN
zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_
zL1~<WJ)Q75x^h;pF?{k_oIs!CDg4%}(~+#drio{%*&0bN?<+bgXDB){8A}v4#SS*<
zI#7-8DmoH|MGeJJ^ryCu?tbd$K%t}510M-_>L0xw@C<fO#AAX{JzQ=;ULY)<=J5}B
z9Z`iyf-Y%TuNp~D5)2(pu9Ft(%eU-|wt$z2&#v?|6IUFZ08w=fc1d*h-vc#mRUp@o
zJ>bMSTmQflpRyjif*Y*O-IVQ_OFhUw-zh<q;LT5p+$IR7zEGtb#X(0BaIHkAvMxDl
z&9|x2$0;2BOM24Yox5>PrXXW>6X}+73IoMsu2?uuK3lT>;W<df@J_cgG_U&D8b<+U
z3qBv6Z5ieNpqShbUSE@10^#D8JvDB<Cxnnc7^ASjodT6b&UsxZ-kMZhrAlLO-#Mi5
zrhImmEN-CGFF$Vg@GnIasHba~Uf74v>#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv
zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq
zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ
z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5
zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~!
zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8
z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ
zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs
zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R
z9<jpXM|@nDonMBF{3f<~Ch;-n8pq}dJ3Jn7z+9MKkVKZ6GC|_U4LQ}uqT7Qzdw&FT
z5rS%8>+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU
zQ9-`t^ys=6DzgLcWt0U{Q(<zOjFK;@HBO@&MI050VARn}8^41fX2E~H8v7oK7t#cH
zT3cr37+EIOoR3$Tf{>F<SaIxIq6Ub`pA9KKWBtPeF7PVo!TPrUGQ;L27vT$GZ|f!6
zJ3t-%EM4F&3lV=3B&-O?3LtyEID6hjqP^*ia)+pq9l7DVnt4FWB~meyMR+>Bs22=r
zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA
zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@<y697Pif_+Ask(KR3DV%AUDhMyUIANX3Dk
zwg)}aPAa<Qw({y>ajLV!Fb?OYAO3jFv*W-_;AX<NdmAQ7#KC=m{U8w@o~;*9u@fe3
zI-q=kJGTIh6>d;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ
zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58
zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O
zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA
zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT
zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b
z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E
zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+
zE6Oyapd<Pnn%^T*29yI$_#2T8ky75p(qWs)ooqKI2gN`dZpK3Y<kOCF-bmb>G$HC&
z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3<wB41_%hv|2W21e=t+(=n#Nn
zm*Oar0&(6b5;<nAAtYiLGCv|A6tP{9nAYT<*AAoG1mp_)ZWYNA(fAdZl+LgUxhajH
zBMP2AH!EkqQueuCEuY=Gn~D5i1=u<sj%R7VeIK^r69n!S%t35NNg(Fcnjq#?iuTuC
zyyEflYj(Y9WXQU}=QW)&f-zt2L<9i?G8jgUJCxqv39bRXa)Z<AYSLpgy&?>KDx)<{
z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzB<W-|f
z1HB&QMc+Ib?@<fAbwIxv{Jg*T<>FO<w|z4X_0d^ajD|Sz3Z?D`jadD{q(TEoFqiL>
z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld
zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl
zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3
z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG>
z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaH<C2uc@|>yzF+B
zF6a@1<cQrSK@^T2Jz<j^!(U`lVrtN6^K1{@&|Y%V?lh(s<qUgEfNklI&6tUgpAb*a
z_+C-rQUGf}bnsy~!Ygj~JcS);J7o!ttkA^>$CT0xGVjofcct4SyxA40uQ`b#9kI)&
z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b
z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g(
zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}`
zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb
z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2
zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@
z{&vDs)V!rd=pS<gKlbfhp}ufon^L`I$St3=B`fTo6?X~-5*!da$WSC=wN0h_b|&|p
zL8tjMJDRM>?G(ri<ha&~1a}iabvy_b$vscbC%Y*}zodb|0`?CGVC9w*d$a$bIvm)g
zxfr>cfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2`
z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh-
ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5`
zCw1f&c4o;LbBSp0=*q<rKWROphY%8*dT*+-xv<)}6rSe7#pa+C2sRvc#pf}_5pS#>
z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp
zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW
z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f}
zI&h$FK<SfuVxz$9jz$%JfEvVgm?oA_vk80Mb*vtU&mY6DKMPelC~6k4d~PHleiT=i
z9i`)yHZ|VLG@A>)Mo*x?2`0npTD~jRd}5G~-h8=w<geTkn^ei*h^P_#kt4Dk-Ig(P
zw7emsMnh4haOAFEvCI*}Q6rgiCIEj<0mLdYm1>L#Y-G+a^C?d>OzsVl7BFAaM==(H
zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ
z3EFXWcpsRlB%l<ouYWjr+SUt7L1F}F&JAqs2YnGI@EauMTs3Lx>_0Vdu`0G(11F7(
zsl~*@XP{jS@?M#<a*IJCG;!^-k0mpcYSL3TA`mO-osDqvZe)rvFyj`CZ>ec~%Pr~h
z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h<Ixt`{;>~qg%
zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv
zg|c}mKTCM=Z8Y<XhcneSe|&PEGL?KEjv?$97<=EoEY%e)Y^wY7E2xeqEUPM20hy+h
zOBop<mL$3-WOlS|^wIV?j-e=QOSa4yQ;&3&vJ^e`I9~INys-f+JG)*Muyc444Xj{c
zOq>msFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy
z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t
z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb;
zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p
z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw
z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ
zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7
z^$|%sj2?8wtPQR>@D3sA0-<U}>M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB<xFe8
zIcRoD<goMv8Qu{5p3F6>&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7
z6+@nP^TZ5HX#<H$*7$uZ^GJ)1l2_$4(ITNpbx11}-7Un19g4X?I6t&yby7^z8u_JG
z`AC$r&O%j3{*}u^#Roz?ZomEGRIFtrtzs00Z+Nf!0r=n1VG8UzPD-gMYD*Z0J`6&L
zrB#|AC<q8P<bMa={~UKhf1y&~g@^z<xK%_nv}iSIi1qs-80FZc5i6BP&}HzO@{J-o
zI{J0{72ps7Gh2!++v_Y$aLUWV<6RoTK080Fh4;pFyM?s}`1*Q*Fv3rOA4$qE<`y;<
z4~JsWUr|mx$PNNub+==}Qcuv-yK4?0!BQC|{mR!>*z(!y+-KJ3+Ku0M90BTY{SC^{
z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX
zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p
z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8%
z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@
z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4
zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH
z6BJO$_jVx0<q=4oQ4^4&LjvZ?IFywiS^=+kIsr#`i;VVi*)oB%BBriVjqoaV2E?pE
z@XMJ$e#;GIWlvg=J_03_gz4T2CA}FlK-d#*_Y;iHV=RMMPp?H!FNNqW-KS|}te|O%
zX=X|Fk9k;c=4O1}iwo|p(I{gB7b!nXILr~V^6wx73`=LnKrWu#mjK^!-u;_MJqiVy
zI}_iQp3zGd=f-(%^bDpdj{*U0@S?aksQ)+FMid4y$fG+bLIVL2r3V2a`af?IA!S_z
z4w$_CLqZInLy9sX^Cv^7Ng5gjJ_scpQs*DJx3q-C!z^yfg19bvM*HgOQnbEZU0QoF
zdK$RAc-@Ll$Et(J%3uFw2SZF<oj1YfSviVH(Se<D#?ANbUnlv#>EGPXy}XK_&x597
zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ<
zV7`cXgry((wDMJB55a6<Cvg5*V@E&gp_hK?RXM9Cmb<zqULQcPsE{hc9a$%h#e|?8
zp9vcb$%gzMm_BsxVxuk9=8liQs|H!K>D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo
zN3@}T!ZdpiV7<a`6mgu8))0n;&aR0X#=P(j$>rkNvqP3KbpEn|9aB;@V;gMS1iSb@
zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi
zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi
zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN;
z`yW<tZkAtgD1K4rH^*7E7L8y2DKR)GUqND5p=KRL(^>26bMSp=k6C4Ja{xB}s`dNp
zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(*
zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQ<L?J}Py63aFL_JrF3
zuKjS?Xwj{ufizn|oPl*svKX+?myF1gv1i#2Pp%t_6Frc|49o-M$q1U(SoF1?czk~K
zQB+{`_(7#~5HDJ@$p0t9X4Bnjw_4k=Gtm&qcw$d~4o6S;S}fQ;i|ux0)${W9g+C7d
zoMy9g)h9D&t#es1s#qQ_(oec>HUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2
z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS
z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V}
za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)&
zdpJf@tZ{j>B;<<gei3eS+J#ghUE;%Jmd7Pk8%UGHJG8~c^XJ5t4rPt~H~LSUt)e@q
z%yI(@ouv9NKR5?@vcOt632S~0Yt3FWCmv2gPT|mGKc-q%RRCXu?Cj;w26j{76<LJf
zaS8h@vUzynu#YGS<gh$GHq+;%-9o4&y&kK|Wm^q<pRv}g+zU;U%KoOgxhXnt*?y!Q
z{V^AU0u#?=E3&#0wH*19Mnn~;N$z?E8?Rl9>MVHiPl_U&KlqBT)$ic+M0uUQWK|N1
zCMl~@o|}!!7yyT%7p#G4?T^Azxt=D(KP{tyx^lD_(q&|zNFgO%!i%7T`>mUuU^FeR
zHP&uClWgXm6iXgI8*DEA!O&X#X(zdrNctF{T#pyax16EZ5Lt5Z=RtAja!x+0Z31U8
zjfaky?W)wzd+66$L>o`n;DISQNs09g{GAv%8q2k>2n8q)O^M}=5r#^WR^=se#WSCt
zQ`7E1w4qdChz4r@v6hgR?nsaE7pg2<I`;}n^@4MI6vCedZ=C;ol}^bQ*dx&&8nb-&
z3)#xA-8T2gcffMYzDDo_+}wz+P8h>B6<gZ&R)|4Ts?jXVZVoqNhN_k%xHg&3BJR#@
zW~R&|0R@=eu%3D?zM3tcN^a`0bU8Qi)Uc&dq-Yp9jKcw-U#_Ld-XE55mxGO64=eaR
z!|?ouRtds{6xA*X*ir?L8T2|6t2X}m%@CA-7hu;HIu^0Tlxp+QjjALKeWuRI>~+i5
zcTTbBQ2ghUbC-PV(@xvIR(a>Kh?{%YAsMV#4gt1nxBF?$FZ2~nFLKMS!aK=(`WllA
zHS<_7ugqKw!#0aUtQwd#A$8|kPN3Af?Tkn)dHF?_?r#X68Wj;|$aw)Wj2Dkw{6)*^
zZfy!TWwh=%g~ECDCy1s8tTgWCi}F1BvTJ9p3H6IFq&zn#3FjZoecA_L_bxGWgeQup
zAAs~1IPCnI@H>g|6Lp^Bk)mjrA3_qD4(D(65}l=2RzF-8@h>|Aq!2K-qxt(Q9w7c^
z;gtx`I+=gKOl;h=#f<B(e8}^YI_Y_F$m<_@mU7iP@qM+(yD7oUVh}K##GPwk9D0yd
zeHhMzVMULpykwfv+lU+)mgprk!<ah^1r7%w_Qqy@;J2ghF_eBcu1B=+{UtO=Ex9lZ
zTr$(@oW060(mHv6jhqAHt9(%I%Q?HEL?>zSgw-V*YT~2_nnSz|!9hIxFb{~dKB!{H
zSi??dnmr@%(1w^Be=*Jz5bZeofEKKN&@@uHUMFr-DHS!pb1I&;x9*${bmg6=2I4Zt
zHb5LSvojY7ubCNGhp)=95jQ00sMAC{IZdAFsN!lAVQDeiec^HAu=8);2AKqNTT!&E
zo+FAR`!A1#T6w@0A+o%&*yzkvxsrqbrfVTG+@z8l4+mRi@j<&)U9n6L>uZoezW>qS
zA<uWB>4YfO;_9dQSyEYpkWnsk0IY}Nr2m(q<?iJ&^0JJY*WJVZ3B6DY<FXJr8Go@r
z6CZy0n;pNAl$k|qKz7;}tzyFUzN($R$VjbqGJYnWSFqb~_EE~`kN>l@KuQjLgY-@g
z4=$uai6^)A5+~^TvLdvhgfd+y?@+tRE^AJabamheJFnpA#O*5_B%s=t8<;?I;qJ}j
z&g-9?hbwWEez-!GIhqpB>nFvyi{>Yv>dPU=)qXnr;3v-cd`l}BV?6!v{|cHDOx@IG
z;TSiQQ(8=vlH^rCEaZ@Yw}?4#a_Qvx=}BJuxACxm(E7tP4<LzOM5%&sPL0AD{=s;s
z$R415QgAo#{smDow(OHv45*wK-Zi*?A$()F*V<y2E!TYT<^hcHA7K5-ZMT_!rB5`;
z|9vWN^0~I6awJfJRvcCAeNZ=j7mVNot7n9dih18do*-eAieGXMiY-4y>hki^jU@8A
zUS|4tTLd)gr@T|F$1eQXPY%fXb7u}(>&9gsd3It^B{W#6F2_g40cgo1^)@-xO&R5X
z>qKon+Nvp!4v?-rGQu#M_J2v+3e+?N-WbgPQWf`ZL{Xd9KO^s{uIHT<vv%?Nh+;B}
zmyBo-Ds%q}cQg+!oZgz$`xg$^mZZUJf3!&})t~fQTjTmEq}n-f2FtW>J6~@d=mc7i
z+##ya1p+ZHEL<ks3xMG;xOBNv36AC^Vp3h8`CZjBX4sayH7_@oJq-ndaT`jqB@IRP
zv!WtzH@kF&Wb?7eR`V`9dzcL0t|&Wer_hFfyyTy^`=Yg*D>mi%3C>g5V#yZt*jMv(
zc{m*Y;7v*sjVZ-3mBuaT{$g+^sbs8Rp7BU%Ypi+c%JxtC4O}|9pkF-p-}F{Z7-+45
zDaJQx&CNR)8x~0Yf&M|-1rw%KW3ScjWmKH%J1fBxUp(;F%E+w!U470e_3%+U_q7~P
zJm9VSWmZ->K`NfswW(|~fGdMQ!K2z%k-XS?Bh`zrjZDyBMu74Fb4q^A=j6+Vg@{Wc
zPRd5Vy*-RS4p1OE-&8f^Fo}^yDj$rb+^>``iDy%t)^pHSV=En5B5~*|32#VkH6S%9
zxgIbsG+|{-$v7mhOww#v-ejaS>u(9KV9_*X!AY#N*LXIxor9h<byy@5cbGEZK3=io
zT2V8>Dv%aie@+??X6@Et=xz>6ev9U>6Pn$g4^!}w2Z%Kpqpp+M%mk~?GE-jL&0xLC
zy(`*|&gm#mLeoRU8IU?Ujsv=;a<uB2wOxxbt+x_CGPXzy#@rDRkgcBVuX$j~bAGRw
zPYots=o?hh?dXy^E>b*URmsCl+r?%xcS1BVF*rP}XRR%MO_C!a9J^fOe>U;Y&3aj3
zX`3?i12*^W_|D@VEYR;h&b^s#Kd;JMNbZ#*x8*ZXm(jgw3!jyeHo14Zq!@_Q`V;Dv
zKik~!-&%xx`F|l^z2A92aCt4x*I|_oMH9oeqsQgQDgI0j2p!W@BOtCTK8Jp#txi}7
z9kz);EX-2~XmxF5kyAa@n_$YYP^Hd4UPQ>O0-U^-pw1*n{*kdX`Jhz6{!W=V8a$0S
z9mYboj#o)!d$gs6vf8I$OVOdZu7L5%)Vo0NhN`SwrQFhP3y4iXe2uV@(G{N{yjNG(
zKvcN{k@pXkxyB~9<aVnCIiZ=*k!Q8~L1tKaxVd|op5jWsB}Nz|CZHq!epa%JQd;)N
z4E$LOX+w8o^~cMe4a_enR1CKHIa{i@H>ucR(uPSZ7{~sC=lQtz&V(^A^HppuN!@B4
zS>B=kb14>M-sR>{`teApuHlca6YXs6&sRvRV;9G!XI08CHS~M$=%T~g5Xt~$exVk`
zWP^*0h{W%`>K{BktGr@+?ZP}2t0&smjKEVw@3=!rSjw5$gzlx`{dEajg$A58m|Okx
zG8@BTPODSk@iqLbS*6>FdVqk}KKHuAHb0UJNnPm!(XO{zg--&@#!niF4T!dGVdNif
z3_&r^3+rfQuV^8}2U?bkI5Ng*;&G>(O4&M<86GNxZK{IgKNbRfpg>+32I>(h`T&uv
zUN{PRP&onFj$tn1+Yh|0AF330en{b~R+#i9^QIbl9fBv>pN|k&IL2W~j7xbkPyTL^
z*TFONZUS2f3<j5d>3w3)fdzr?)Yg;(s|||=aWZV(nkDaACGSxNCF>XLJSZ=W@?$*`
z#sUftY&KqTV+l@2AP5$P-k^N`Bme-xcWPS|5O~arUq~%(z8z87JFB|llS&h>a>Som
zC34(_uDViE!H2jI3<@d+F)LYhY)hoW6)i=9u~lM*WH?hI(yA$X<G=8N1HS1Fvj49Y
zr{!e0ILA0423drY%0DfXJI9?mv)P9Sb^{}Ddi1|;33N^#;xwZ1s;uEy?|&@^T31A4
z1v}0pzH#c>#ip}yYld3RAv#1+sBt<)V_9c4(SN9Fn#$}_F}A-}P>N+8io}I3mh!}>
z*~*N}ZF4Zergb;`R_g49>ZtTCaEsCHiFb(V{9c@X0`YV2O<Utuc)<>^@c6~LXg2AE
zhA=a~!ALnP6aO9XOC^X15(1T)3!1lNXBEVj5s*G|Wm4YBPV`EOhU&)tTI9-KoLI-U
zFI@adu6{w$dvT(zu*#aW*4F=i=!7`P!?hZy(9iL;Z^De3?AW`-gYTPALhrZ*K2|3_
zfz;6xQN9?|;#_U=4t^uS2VkQ8$|?Ub5CgKOj#Ni5j|(zX>x#K(h7LgDP-QHwok~-I
zOu9rn%y97qrtKdG=ep)4MKF=TY9^n6CugQ3#G2yx;{))hvlxZGE~rzZ$qEHy-<GG^
zCw~Hee9AnIJK5!W2KGioRF>8?pU#G;bwufgSN6?*BeA!7N3RZEh{xS>>-G1!C(e1^
zzd#;39~PE_wFX3Tv;zo>5cc=md{Q}(Rb?37{;YPtAUGZo7j*yHfGH|TOVR#4ACaM2
z;1R0hO(Gl}+0gm9Bo}e@lW)J2OU4nukOTV<IRWfJ?LxQ}Cs$wH=@pn;(E!pGh(4PT
zCSf?oD0HK(b<eq@2#T{&XH0pqKhi2e@F&60q&GZT0!VOz3O!(?fv9x_9?Jl!@ic&&
zvAovwm9zWE2KtEoa+tIGL>KshHy7u)tLH^9@QI-jAnDBp(|J8&{fKu=_97$v&F67Z
zq+QsJ=gUx3_h_%=+q47msQ*Ub=gMzoSa@S<C&>2>`Y9Cj*@Op4plTc!jDhu51nSGI
z^sfZ(4=yzlR}kP2rcHRzAY9@T7f`z>fdCU0zibx^gVg&fMkcl)-0bRyWe12bT0}<@
z^h(RgGqS|1y#M;mER;8!CVmX!j=rfNa6>#_^j{^C+SxGhbSJ_a0O|ae!ZxiQCN2qA
zKs_Z#Zy|9BOw6x{0*APNm$6tYVG2F$K~JNZ!6>}gJ_NLRYhcIsxY1z~)mt#Yl0pvC
zO8#Nod;iow5{B*rUn(0WnN_~~M4|guwfkT(xv;z)olmj=f=aH<b>#Y|#f_*d1H!o(
z!E<ZksS#Iaz>XNxKxth9w1oRr0+1laQceWfgi8z`YS#uzg#s9-QlTT7y2O^^M1PZx
z3YS7iegfp6Cs0-ixlG93(JW4wuE7)mfihw}G~Uue{Xb+#F!BkDWs#*cHX^%(We}3%
zT%^;m&Juw{hLp^6eyM}J({luCL_$7iRFA6^8B!v|B9P{$42F>|M`4Z_yA{kK()WcM
zu#xAZWG%QtiANfX?@+QQOtbU;Avr*_>Yu0C2>=u}zhH9VLp6M>fS&yp*-7}yo8ZWB
z{h>ce@HgV?^HgwRThCYnHt{Py0MS=Ja{nIj5%z;0S@?nGQ`z`*EVs&WWNwbzlk`(t
zxDSc)$dD+4G6N(p?K>iEKXIk>GlGKTH{08Wvreh<CAf?TJ>nHhh%tgpp&8db4*FLN
zETA@<$V=I7S^_KxvYv$Em4S{gO>(J#(Wf;Y%(NeECoG3n+o;d~Bjme-4dldKukd`S
zRVAnKxOGjWc;L#OL{*BDEA8T=zL8^`J=2N)d&E#?OMUqk&9j_`GX*A<zR<6(@2+L7
z@1$o_@SdQ`j0ne14Py8~N$N(bF^OEP4yf&4{)E?@3uqgKCl~oc9JGOl%*Hj(+(E%G
z61_ReO+5gw$@3rF7*zTt16$e`KZAyGV)!rJwJ!yKjS4(jVys!9BpagJUf1M>9?V-G
zdA5QQ#(_Eb^+wDkDiZ6RXL`fck|rVy%)BVv;dvY#`msZ}<bv)Vrqcf?ms>{x5fmd!
zInmWSxvRgXbJ{unxAi*7=Lt&7_e0B#8M5a=Ad0yX#0rvMacnKnXgh>4<kzFZZ+q2=
zSI@wc!e-hJ!WKWxZcvCb6r;@e6kZ)gU~$!}pY}zm1`BBiO&Cp>iiRq<&wit93n!&p
zeq~-o37qf)L{KJo3!{l9l9AQb;&>)^-QO4RhG>j`rBlJ09~cbfNMR_~pJD1$UzcGp
zOEGTzz01j$=-kLC+O$r8B|VzBotz}sj(rUGOa7PDYwX~9Tum^sW^xjjoncxSz;kqz
z$Pz$Ze|sBCTjk7oM&`b5g2mFtuTx>xl{dj<a{IGbs&Xr_Lnl~=L#C-3f_=262-*SN
zks}N?-dkm-=nWk~RaP*30U<!1%uw|>*U$L%y-xeQL~|i>KzdUHeep-Yd@}p&L*ig<
zgg__3l9T=nbM3bw0Sq&Z2*FA)P~sx0h634BXz0AxV69cED7QGTbK3?P?MENkiy-mV
zZ1xV5ry3zIpy>xmThBL0Q!g+Wz@#?6fY<EaoNR>vzmEczs(rcujrfCN=^!iWQ6$EM
zaCnRThqt~gI-&6v@KZ78unqgv9j6-%TOxpbV`tK{KaoBbhc}$h+rK)5h<YjQ73BXl
zpM^mR_u6^E|NA0I`x69&;(xqnK0Q2uo^<*EVpO`Z33U{viEa`@8YY#iRIEJ;osRdP
zL>|bT6wY*t6st-4$e99+Egb#3ip+ERbve08G@Ref&hP)qB&?>B94<kOj@Q1fJNzg4
zo+oqf&lQ9L@Vi_Bum@NgI>?eq5i3k;dOuU#!y-@+&5>~!FZik=z4&4|YHy=~!F254
zQAOTZr26}Nc7jzgJ;V~+9ry#?7Z0o*;|Q)k+@a^87lC}}1C)S))f5tk+lMNqw>vh(
z`A9E~5m#b9!ZDBltf7QIuMh+VheCoD7nCFhuzThlhA?|8NCt3w?oWW|NDin&&eDU6
zwH`aY=<IrWwJm6AY&rFqmNW+-KZ@4)eR-L6R~2;>))lpWG?{fda=-auXYp1WIPu&3
zwK|t(Qiqvc@<;1_W#ALDJ}bR;3&v4$9rP)eAg`-~iCte`O^MY+SaP!w%~+{{1tMo`
zbp?T%ENs|mHP)Lsxno=nWL&qizR+!Ib=9i%4=B@(Umf$|7!WVxkD%hfRjvxV`Co<;
zG*g4QG_>;RE{3V_DOblu$GYm&!+}%>G*yO{-|V9GYG|bH2JIU2iO}ZvY>}Fl%1!OE
zZFsirH^$G>BDIy`8;R?lZl|uu@qWj2T5}((RG``6*05AWsVVa2Iu>!F5U>~7_Tlv{
zt=Dpgm~0QVa5mxta+fUt)I0gToeEm9eJX{yYZ~3sLR&nCuyuFWuiDIVJ+-lwViO(E
zH+@Rg$&GLueMR$*K8kOl>+aF84Hss5p+dZ8hbW$=bWNIk0paB!qEK$xIm5{*^ad&(
zgtA&gb&6FwaaR2G&+L+Pp>t^LrG*-B&Hv;-s(h0QTuYWdnUObu8LRSZoAVd7SJ;%$
zh%V?58mD~3G2X<$H7I)@x?lmbeeSY7X~QiE`dfQ5&K^FB#9e!6!@d9vrSt!);@ZQZ
zO#84N5yH$kjm9X4iY#f+U`FKhg=x*FiDoUeu1O5LcC2w&$~5hKB9ZnH+8BpbTGh5T
zi_nfmyQY$v<uZ;l&g@c%q;+Vgch$G^zJI*;eLwf}d#~$x|9P(K{XKVada<9+sIfYB
zKAm@-U=yZ;64wg$H}Z;yL)GoR=u$~I;@cnfU5TMi>Qh%ildbR7T;7TKPxS<Ob4E3(
znTaa+H!rSqa0vbx%SAld=m88TC+A_c(usssUb>s#vhKR|u<i0Ko**prU~S9yhY2+1
zPX%J@>up`qi1PufMa(tNCjRbllakshQgn1)a8OO-j8W&aBc_#q1hKDF5-X$h`!CeT
z+c#Ial~fDsGAenv7~f@!icm(~)a3OKi((=^zcOb^<lLk;-tgW3Xq;u|w+kECe)CSK
zcriMg^rmc3Yr@_+rl3D>qH$#DVciGXslUwTd$gt{7)<evvuvMrg(Ti)md>&#a`&Lp
ze%AnL0#U?lAl8vUkv$n>bxH*`qOujO0HZkPWZnE0;}0DSEu1O!hg-d9#{&#B1Dm)L
zvN%r^hdEt1vR<4zwshg*0_BNrDWjo65be1&_82SW8#iKWs7>TCjUT;-K~*NxpG2P%
zovXUo@S|fMGudVSRQrP}J3-Wxq;4xIxJJC|Y#TQBr>pwfy*%=`EUNE*dr-Y?9y9xK
zmh1zS@z{^|UL}v**LNYY!?1<k__7o+p+4(1NBmVoECA0-KiaC}AV_?C+7J`NK6$84
zBBqrmc2Of6i%(I;M!$`SXjC=j*Jb1-z1V$vmVAv$?q7A-UNUbIjPc&$&dCZYdrovY
zYk!tOxHv@D?D9y!F}6RcP($xyne%TppYSv>qIRPTvr!gNXzE{%=-`oKclPrfMKwn`
zUwPeIvLcxkIV>(SZ<gIk>-SeBo-yw~{p!<&_}eELG?wxp<p7ueiB^ha`u<BZpHY)>
zee-V59%@<kWnQ!o$=ScYaN1eg<h0xJ+n{>BtB+Z&Xs=O(@P$}v_qy1m=+`!~r^aT>
zY+l?+6(L-=<Qwd6r+5D1gjtj||7^9yk+4?S=Ggr8A1DHM$HUa2z2LxvD6=8#&qY;Z
zt8)xOz>P%m4ScfAYR8;f<Dr$LNuTmbgXDXglYV1=E&7Wn5{y|K*%IZ{6JLH|Dmg(}
znR2;>9dyVw)@(;v{|nO#lAPI1xDHXMYt~-BGiP&9y2OQsYdh7-Q1(vL<<EACIT8XT
z1qBbB|I*^xWzq`9+Gz$W)b?o0;B_{07?)m#_X&4NiqZ!@dMI95k-D2y@#kI!654RD
zYjUTZNp<Jd!Zn^%3j)3$jIWM4-Qun*WT<1+ge_~RzCUVOk8MJ|QtuNIQhY1uMB$;h
zMYbE)LIT&;DS?{%MXv&WEx~h?bBn#UB?S0m9+k!hKZsX-kfe7B^B<*@su?}#wF4VB
z?;H|rx{AeM@(Z*>$u6W0nxVn-qh=nwuRk}{d!uACozccRGx6~xZQ;=#JCE?OuA@;4
zadp$sm}jfgW4?La(pb!3f0B=HUI{5A4b$2rsB|ZGb?3@CTA{|zBf07pYpQ$NM<dsE
z+)HCvvfx}7?%s(mGoXS5m%y~{D7-?vfIM*E-Br$2)`nbbeI(JuN@9us|G8x)CDV5<
z`Lmq6gxN5v!A!|MaD3-`+9x>({C6Srv6%_{rVkCndT=1nS}qyEf}Wjtg<e&Ks@rVk
zCTmzRh=zK-IH2i_l=1F$2220Iw|x(Vy@q&&jtGSk7d?<UZ;dm(=6HqQ(+WnK_lD6C
z*aagnyAQvy-@DtV52PW8=n|p@r}`}M3VRKOLe0lFjJnWp7!6O#BVRO5AyO^F7?H{&
z(VFk3lyh;>$e{ng7Wgz$7itYy0sWW_$qld);iUm85GBH)fk3b=2|5mvflm?~inoVo
zDH_%e;y`DzoNj|NgZ`U%a9(N*=~8!q<HF%wJbappLVVp)97sNgNZK+YXiAqubI6nt
zz^x1f3S?e@nzaE{ASzP}l7_5+M-C#bWf{R<85&j(;XpwyA}tJ2fp5MXx<Tp~8p2^5
zVDpg?+d?DwY}g9Kl_K<Dg(`F?Hb7jFBRG&${$9Q_LIUX(@2T%~4C1mM#ex5Qw;}5w
z-+yc6zt@a=dt*=&%0@|mbr+$oV`R`;g+R{T?MS63V>qy0Etkxo#`r!!{|(NyT0;5=
z8nVZ6AiM+SjMG8J@6c4_f-KXd_}{My?Se1GWP|@wROFpD^5_lu?I%CBzpwi(`x~xh
B8dv}T

delta 17845
zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l
zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9
zXZjcT^`bL6qvL}g<Hw9Mj^|#&N2h?(F`1lu_ndpq?{_}-=D|N7-vjUr-ZBx#3-xHh
z2`L7p$e1Kf*5QAYiPLzo0STOunzJU(VW<Ja7%`AF@RErrUXGlZf%=%pVN{Cq2F46r
zFfh&#alCR__zWF+&o8ITJ})^Uz2x(S1>vXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV
z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY
zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*!
z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc
zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq
zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV%
z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB`
z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX
zQg*0)$G3%Es<rMi9IFkILZk8W3*zmnaEl_-v&C>$otA@<d5B&i@NKtDgSW_?su;gQ
zolk$}wmPmIAgB0t!H8pWXh)p3t<)yxd~Zn^WNM9@hA}ROLYwE;<qYL=a)z{do7&c~
zOU=+lw_zN_7aE%7#L)HEEQf~HkenM@!(`u&10)a9(=6#VTH~n|uvG6dLaDxGXen(O
z;XBH!lVmG&lAn|B7pTXVXv9~9^flpue#(Cz-8iJK+qlAIYA2CHw5Qpu;k}OteSyKQ
z`kU`!PwGQxpTSIZwT4%qle~EgQBsDQBOk$-mgY|plS?ld@1iaO$x2hK4#FV$4PEx%
z64rN=-S>p_1N!hIPT(iSE=8OPZG+t)o<dTw8$=ITLu%Kn&h^n=hZc{ukec4F8s&cn
zHOkqTnd<CbL4C}0<_7eHehWv4SvaA;hXayxLSKbRv}1?wq9KIoR6?gJ-bT}){t2Qp
z?fMED@841214PiOrSSynNd8Pk{e>FyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5
zbn<D{nCwP+S(Ox1JDHTGlB$C?aL!zS)j)aC4N=Q$g0hm{@mNXgzR`KZi=*k<JFD2U
zislbCS|3r-{@$V0$7^VDJg3k?#9Vqlk0;eXFI_&!Q-<chP)h>@3IG5I2mk;8K>*RZ
zPV6iL006)S001<T5fUDgJPsUxQxZ`W|6N2E*F}j?Q}ZJ=15{A^(lk>s%0eYj)9hu1
z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror=
z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz
z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL
zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF
z<z)BC1fvX1DaDLZ_@-`uBujj%t}%3ZeUVr4TREsHX7F?nWpHMA-Xk|J!iq`DS}GVf
z4OL4K$Uz`ePv~ieY74)ZRfxYcZpw+*vvS6&Rlqbur}xYv21j`ZZCe8j?dJd)#JHX_
z5=vO*eRLkV0-T?O1~f`|h(`h*OPIkE2~QCbFe_mW^9+sURZQi7)O1oYBt-FyQU{7<
zNQhxxKwQEC78z;-Weov$5b5@FdMV(!gk`L7YA+<TqeH+dL*W0uDMLf?oH9r2nf+pL
z(JaK2H#sFs@P+LRZ(7;jTRIZQ(sv(2QuDhnf@7$R#^#q-7<w+6w}d5qmBm<uOr@;I
zLMW+p&rrk1yf}h?o+JG6A+6#q(ddiydr!JgMid5uPq(QbnutmXYCCHx8^yD!+vYaa
zd7<2tbodnD1w&osHX>o_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp
z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo
zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O%
zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj
z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq
ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@
z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2
z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1<oe`Z&D<40Ft
zBcd&T{H%vo)9-oc7=5c8y|+a3`=a>+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe
z(qDM!FX_7;`U3rxX#QHT{f%h;)<e7LdkX!XLVxd}I{F6>Eursw=*#qvV)~y%^Uo^%
zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg
zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~`
zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh
z@_Lmwc<AfAQRRAtHwjXM%8e>FDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q
z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3
z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S
z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU
zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD<x?C$Ix95~e-?CJ`JIx({^gvA?wYnXif
zoqP8cWngm0%+XP?j}={}HQF+2>5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV*
ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv}
zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX
zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI
z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6
zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H
zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd
z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB
zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va
z%z<AsBy*Nm$qcPRtn58~4;F#DO3=3TTAjKTiwdqKd0hD(l8ifl@)+GRtI%1Rw?ZO(
zmz+Szx|nJK58+fyw~fJ^C)O5^R^hg#=i(9@)dYl2m=<>9Ef6QmfoXAlQ3)PF8#3Y%
zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnX<x$C{{p37Ks8vjz*8r1<^dA(Ff^4
zjUJ+uMh{bpsciv&6kGQ$XCNeUw?-eL^BR4Oo<Ib~Y&#K12;>r*SGY&xUb>2678A+Y
z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5|
zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl
zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{?
z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4
z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz
z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0
zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq
zaHT($Qy2=MMuj@lir(iyxI1HnMlaJ<jX%sE(fCn*3?3Gn4nSlq&@KU5<Hz}<NX%K-
zMTN~lIE^px$DD-EU%M{1qACNs17;@Nj-Gt*Rrm>wpX86je}e=2n|Esb6hB?SmtDH3
z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ
z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT
z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jS<ljwsU5!7<p8}i}
zL7L#c+-+~wLLj;s_n}*|CFnpNPNHIW9&Eq(bs-;&;(6@(b=_4E{(&*eoXA{DmlQp8
znGXNI-Kxc9CO;b|K^L%!!T>Lp+LQ7uU(iib%IyB<ywG`)hV2}Kh*;jWpny-xs1#~{
zbqmCdt821{{_GXnJ$@z<wUY88e+*@1o6>(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E
z$Sk-hd$Fs2<K7hR`?HSPSmeG}{4J#x%N=>nL4w<PeNfsVCF_wKy$W6_$epEmZYjK4
zi+d!*BDQw+O#prhLbfH}8_MdBw~JwaO+mWJsY>9p@O*Y$c;U)W#d~)&8Js;i^Dp^*
z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8
zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q<u__?-*+Lj0<oJ4_lDPNp1xOi0I-
zBk-Z{m?6MYLI0qcv@^Xv0JziBMLwwL9Z4DDm=IOI-_l3N<qbRWo|1PyCHQ|^CaiX&
zfb>{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3
zeBPRTDf3?3mfdI$&WOg(nr9Gyzg<O~aeU!4%Dw6dhqX`I;`>`&u^o!f2rKJ57D_>p
z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS
z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3<qeI0+|)cpd`XIV
zR5F&JZ6TFzp~ui`$S~65^ilbpw_GY>*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C
zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3
zB<F0}kh5un+-`~NJtS>^5<Ov^3sk&XI@aAOttDFN^<1Hf*Qvs*;dz~^rm1q6r>N=*
zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{
zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U
zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0
z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v
zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2
z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A=
zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX
zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I
zd<toLH_|bTXh!IH%zTALX`0694LSoG67(Iqm%d9DeGe<Xj|6_3#_1i3!<q!IqkDN1
zSsWmnw@`|Ix6=gg0)mMAc@}xHg?^SkjWr6i-%rocXOLkD==cd>MmhAJrO%@0f%YW!
z^gLByE<rzqUM2SO4f<*N8D!WybTfSpk`$3u*?dIL$w%}u`B=g`>GSk+R0<o|SzE^2
z=mq+Dc&Un;=ojc0k)5JQzDX4`P*$nXYK3+y^aX`~zNpZP3VlhTFDrCXSj;X!&J5Kr
z$i<TD=DHaeuN372_|0IC1(W1Vu|iuT3SFE5w$v13aQ=V=%?vhqBOQ6wsEW@=4#3<G
zKMNRYo~GTy4QblLXl}>v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s-
z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5
zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C
zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv
z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T<RSTf!OM5X3QT;)A80apUYQ<$z#K%jo!P`
zbOH>=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO
zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g
zXJ`-N?D-n~5_<grn_osx<j94buP;cy;tm9e`4#$A*eE>QNF_5+Un<iW1@v`M1E*$?
zJ+2%H1WCn`>-4&l$<JXVg1Oln#u3?n?Tw)AX}V5pfSfCwe8Ks)vj$jeG-vYVBC>1b
zVlHFq<avD&0lWm;Uqa1&1#o#eFH<(>tluoN85b^C{A==lp#hS9J(npJ#6P4aY41r)
zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE
zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu
zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8
z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9
zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f
z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oG<nU}c+^yg_Dk>zo
z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9
z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AW<LxTK
zc!!F2;$8CV-Ew%39Nz24ML#a7sKoo^{QW9EfDfw3U|7Wn9#VhtFh&)8NWo<l>v2WJ
zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d
zud3LNuL;cR*xS+;X+N^Br+x2{&hDM<N4j_Sc6IL(2t-ckr}d_|o*ZcEv8`BgV1vNa
zRx_Eh^`yODkEeePfl$fzw)WnZu1I@Z4yP{5vS(jcdvA_9uYg*zsbXU+8M8MFl!Y7i
z3;0^ieoCu}#FECYbmEv{_3FpshE&pw>hb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L
z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD
zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y
zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At
z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0
zZV<RBTo{nTnT)OKN^+H6P{iI)9M0OTLisYLg-h7{ab~5|Ete5V!*1HQw~K3na^@Eh
zd(I_o{cO%2@`UmdZI{^^*HfuB<M=i+o$PP7EXRNTsXewHJ-JgKa&lh5Hw0FNCyr`~
zs#_+t=|&+`d(5;IHQe-`S#rKsNP$cP4~RDNOfqij{TlY7N5d15)?g#0;V9_W&_t&~
z!#D9Q`oH*4GKVH}@EHoSPIK9orwO=xkXfMN+xU)x?`rrSzE7T00_CUDF~b&E{eK)g
z4L^Ut4>kM<KUVM)4Ugid%%br_)TyTi8AJ^~!_O7`Lc=fdD-AI`MZ*wIX*hwWD)_aA
z-{7|bb3DxIlI1ua=izo2&QRr*(xJaA^xzo(ZrvViNu`Vgv&NEqzn8-w1nNDQx3X5H
zY)+)Vm~gH^f5e{zwER4xN$$=S<K<4m{#k#)Uo`v`f79@H8Qg#1nudSk8q33-%nNIg
zKvlt(f8pP9-(w2?qv3J<SD_#w#1uu8X~HMU6;YuHMfjOdH#kA`)Ob$pO(*SG!pJQW
zUsP&Bm0I|YQ+Z8P2~A*gtDa1ncBtQ=kqL${6qV<0i2e#4H?2_CCn47P&~eL5gra|J
zNyqe*5vpIDs$Wr%huz0c7*SgjQ$@8DSEGn&ny3{4Mbv3xI?}8(H$LE+n1O4Gn5l_b
zVm32U1Qjty6LTeTp3DzI1h0E2rOf#(iQ_WzT%+YXPS(wM+&r@{c{0hv*ge)C7KIxo
z)08UAEa*DV)_DVn?p&#xh=(aMsHcBgtbugGNZJ#rmcy0(@_1|@Z813)m(;jYV`MKV
zcRKQ9t?_J`dE1=gz(PG>*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG
ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?|
zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B
z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JC<e{LvdZ+7pxTd*M}z+T`$b~$!(=qYR0Kf
zt#wVO(KgF8>qVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p
zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc
zJx&MB$me(a*@lLLWZ=<H=nUNL9^OCXvBxWNGd%W6P27%^Wai1n>>PhKs!}#!ICa0!
zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK
z++G*8j)K=$#57N)hj_gSA8go<n<4*~1n?n<2zEkX7iUvY#d&w$T;qIq-n@qMJ$dtK
z@bjBDb&kEHH1SvPx4eIG7*j4eEc-ZCIK&Y4bJSc09KaL!TZuj#Bo{Y}d#F?uX;(*3
z7Fjw1-%bwYyGBvbHw>lO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q
zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f<dm#Y4(2y{mVx%S5D?NS1udD
z{AM+%HjZLJU$Al%f@9#OKxh~@k78k8&_9e@hOuZAiwU$OgZgo^w<Ex@o?Z^q&<0dv
zDQ00A=3_b5U<Ep{lHR<Pj#$m-%~}|^4QH_)PeU{A#zvfHj4ogcuAtR%-H_`Z9KxMW
z>_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG
zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh
z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9
z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI
z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h
zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb
z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y
zfvOC)-HYjN<T>fcpi`<nf-dRCvb<3DQ>=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O*
zitR+Np{QZ(D2~p_Jh<vCoM0+TuBZPGvkW<o2?W>-k|dL!LPmexLM?tEqI^qRDq9Mg
z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB%
zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D
zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M}
z!e`jbUR3AG4X<hiCae!0Z#IQzg_MO}8r9LZ8v9gatnAdq>vnBVcyIZht6Vi~?pC<x
z$UMBL*Un7qe%rPwVc5u??{Jvv@h48*X+33_?}H3zszQHeTZax+9HxTd_!Z$f2aech
zh-P!|7*abeZXa*+X4sU$RVNFp#Ueu?du6y}MLrh0fRY4k3<2mr8fTz23ECVQbp8Y-
z&)QObbuwkr*lDyqTgbBA1GXX|CT`-EiBViLVIpP1K+?n%?&?@)Sh}Jk6BD>C!$XF2
z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq
zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP
zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F
zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC%
zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G
z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^
zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5<Y<
znaL!12>AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm
z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn
zgLD^{X<Qzp>0A+{ySY+&7Rp<dye-mragf3s3i1+O8l*a2CZEftSs~5J@pO#O4)7|C
zt7Uj~klxE{r1P8rua)PyL4F6<1h{`zM(RZRbwXGlq#|A);Pd3ULF0xXt>ldwpC6=E
zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA
ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#Q<WBCACK9Bb(sOZ;c5{Cyz<cBw
zm1bp-V;m1~BFNo*$vCz+DJt0kPRa995vWJw-XL{}RlB%vJiX3)rFpN$?+a3lo1}Ta
z5Pm@8%QU_`NS4rE!XK0g9};Ch9HckI4PDZ_!B=Sf5sj~8(i`GQ+lWT%y3Dpc>N9Ry
zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU<?oOa+Y>8<!eYQ6t`2)ofdl
zc;{-S33UnK7q@p9(UckBeN6snqO;Sqm}WF4tj?-V%V>|9RXvu`-ECS`jcO1x1MP{P
zcr;<OGtG7*Y*?2bmsPqAyQ>Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM?
zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2
z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK
ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5-
zE1FX=ru?X=zAk4_<Ezl!IJ%o@*-5QDZ_F&LtjWsjB34$YVV!lg_^wE|e8ZN&iP<gF
zk{VwPw_va>6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd<mrDhd(j_(Z#&e2c`*dZ
zEQdkTY)e@YyRT{!&<SX+i*%Yv8@xOn0)xWrstxh(l#P{4BPP+-+6V6&w!t(G>>UZ1
zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+(
z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d?
zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg
zyUjM+Y*!<JsDnwU8g|E1uIfHP3rHvJ9!aXvBUq$4(iwj@?39JY7oCLH7;6A1Nz<<H
z1@>$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq<vwyg-f
zQ6xX`>25_L&oSl}D<NsQHWi6FoUn<~8Dj}##2gV0o3l~7I_rNmqaltZtyDLRo=Y;p
z0a9He7Bhe1h(8@f2`e3S8ea>OMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m
zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R
zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1
zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt
z(kzx{$*>g5L<;u}HzS4XD%m<I!)UoMT66l0a_guJuN5cfb<%8;;k8nDRh|y7UBi>l
zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN
zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n
z{3+hA^QZYnjXxtF2XwxPZ`S#<d^2juw?KdUVqx|<op0e=p+c^Pi1+3VHI*oQbiR#0
zkD$*T%?V;~fUbNye?jLj@|Se}GGC|jLH-JIk9!%S@mF>J8h>5qLwtwM-{5abbEnRS
z`9_`Zq8FJiI#0<P&Mg(f3yPBq!tDt&8IC9HFe+Bth{VH2yboj+w%3HDvxVXM^j?1(
zwiDqFWb&}ti)}gD7hasD>syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv
zw<m$lNBLfj@6&mZzs0oi<Qj|X3`>}1bq~AD0_Xerm`<Ok+jV|`AJqBVFe!KKkg_Mz
zrgD2Y(cv~V++o1E?Q@Fb#qkz^+m(MNX7q)-j7!aMt7*o=wh`-=A|TuovAY%)$JOb;
ziiPbi!$xC<7r55`3&P!20u$}NF!bn?wH%06rXjj8Jr0A0r2+~^l2F?c>%ryiG9_$S
z5G|btfiAUNdV09SO2l9v+e#(H6HYO<P!tR27Pw*5XVu~2WN|!`P{UGP%8-B4o%Ll~
zx=yTCUICkMjVkuW4CwqFz7h4!Fut~?;&vovX6q0Mx`$8|3}@dO%QE^T1?&7>dQs=^
z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>r<C#s-EpgVIa@U?Zt5-52*E0-_V`G<%#aCubc
z#~9)JgaCf3du7KIa@o9{F`a*Z#7_#Nr=<Du2&J->pUzK<MZ989iL#$$$VOIhI{#G2
zX1{e2r}58peujUp^RtpWi^k@dv<b@U5~*mriX4==h`~&q8}1%1bi*A9t2!+C=NB43
zr}OjT7%h=p7)QmY@e4Y?$S-O9vd*vYt2+OZe}&;5r#{sA*Zdouf6ITrLrLmd5$W`2
z{=LqB5J&!z|CF)tn6gdh*Ch4*S=>Bxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe
z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC
z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs
ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z
zvzEdIc2|HA2RFN_4#EkzMqKnb<pLBO4+WJ5@iu6<*yZ}5^dx`RJ6@oyUGTNLwp4D6
zQr+!_EwvXq9LV|FqKPDW{O#$8@RpRybyEJwEUB(P$J>bw!?!?%B@M0^^5Z<!X?H1X
z%bH?4ISS7xsT)h5y*R2kv373c0XvbALyIKqW8F4Rt^N+RBdC+p7-qZ2TG&<mY|Xw{
zYW8zn#X9x#oi~3O*$eA>;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8
z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p
z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF
ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E
z&1oTd%!Qbw$W58s!<?E8yP8T26Viz&^F4A~aC%qEomHk#Qm5Ec3e?P1Tj+$>6ms>F
z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH<SuY~bM{B5oPpIUn>8kSkk$>!f0;FM
zX<XOP5P@dz=8h9!x<TDSCLIj9Udx3_a=kV3LTpl(k=&H9%=)MqgIf>_<Kt$po&Fr{
zpKJorU@qqh(I4C6Tylqoku~P>t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax
z9(|As<jw)_1#$tQo>$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z
zKSC4A%8!s%R&j*<WtB&0;$gMI$I(tFKiavN8Kx<87G#)5v#A(w^XXcQlsP=<6ZA<U
z^(KEZv3e7!^3<Ei<w5UtbUk`RnxhmX4bQdZ{WNJ4n#oON_s~SV<X3w`-hL{m_Q~Un
zYCrlXg#3dvrKK$75BVy}D+j2spQb)YMR$&pvlKd(fpZ09t)v;W5Rxxaa&B-|%gVWy
zZlF&=A|I`y{q$*Y3DPpU5%%?9ZW(=sZiatmGoa^Z>2si(OEc*fy!q)?%=TjDZJ2}O
zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VT<m;!IE4+o?TZaBx
z5%PHoq2#QCL%*u*r`ZQdulCDJ$p1h^Kb=|a9i(u}0L`iPc~<xf{UPtM+i6ig4TXQa
zh5n@<I7)M?wUE|NXL)a<@gd*jMg25yXUHdA#XGO?^TDAfWV!iwLdZ#UHk}Ir&!rmm
z^eD6KphC1AP^%LZ5kTi+xOfkpNl{urF&HwAc^0jqBxYGukLLzTQ4{shPU@vr>Z5J|
zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho
z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr
z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z
zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr
z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$
zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~<TRX$8LWfcRo
zq}p34A-eP?S`4%<+gY$&Qwo+hw|LR9qPfLa+1vuuio(^tL0Z`o@(s}04;;?o&(V25
zmb;P0Bj~2U&>^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ<s0WLmfS&Qlz{|
zxaO(1@2apqtdc1I3k-8L{2o1=b$p(R;f;f|3Q<=rX=(KVT7$=$CTP91Qk;2gg%ga0
zzT0Vz1mY4W2+uh{dPPXPm)7Qy6MQdLjCStV!T%5peg_o&22BHi7X!kpAX+WnHvohg
z=Pssv6$Tn8m(lm>5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b
zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX
z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K
z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH
z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL
z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu
zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X}
zP!<CZsjx;t3k>~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7&
zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)(
zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{<jL<V=~a)y5R&g!ma8yZh)3rp&)QiP
z*be8EDL{W#%vu6O4v<&2)|<%ZIdp{wA@~wVmko<FSH<^Bu>8wd_!Y#~tMJ7yk!F8|
zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB
zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8C<A|XF(+o?2dGGttB{Wb)a$2igu>H<
zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u
z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+<Uj
z5G8+DxD62w6ZAeLoXgllSFo4%;dw2d*Rf9-dn@cRkKP5-{}C3u0K3(n=rwqJGHQ%J
zV=YO1*Jq7=J^eMk(_If41oYS8%b^P*ApZ`jyvh{@Y5%6l8oiD<J5E&^#fFepwH%zw
z2)Z?TgHS9Sd6UNF4Z-WaEQtzH85)A;e4~G6Vu{Q?vK?al1150x5!q@5uEqJ-asy4}
zsOV<4tnl7U6DulJz1Mee=rsUyHnLOC@Ls4&SPqb%$5TG*G?OQxTA57qI6r64FV0$`
z81}wHS)v$K&TDGVcWNvTAX`NLr|Pc5D#r4TOKo(|aVq3tp(h96t>bB->oH3#t(AY3
zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa
zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD
zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV
zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+
zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$
zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpW<KRGsVy9Os
zNyU)fm61&L7?yMWP5o&7oWUu^HNh}amXSDW-&BNuI^&g)GJZL(^6;E1sc|pqBv-P<
zFlK5cTBl^Coya(1@D8I$sA9-lEkP~Y<yh5&y5hA^1b2!zn?eOAJh|GZ`V9?JYd?n2
z4SroDUsL9s(cJp?TeH+hub>fu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{
z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~
zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I
z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h
z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil
z(nOv_nlZB^c4<p#(?a)_u4(B)SGtQ9q!hQL%eVebEx+D7GnQ;27x<v}?t8lL+;f+A
z=l%QbH{Swq3jdODKh`@i3QfXQT$4yD@lfVL7h&-B1}~lwVM>s&&O3h=OLiCz&(|f0
zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov
zVi;eNa1>t-<14KERUW>^KwoF+8zNo`<C`pgD~xZ4@f``@#rK%RtuVeH#t-=LEfFsZ
zI51=6l~P)>Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT
zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml&
zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51
zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX<GHIG*=s;|*X|~o=RPDX-Sc|p7dfc1I
z+bdepF%{N5JNm9xkG~_}9JBmx6ag(^S{f7(&MB5Ut8gI01%ma&PSY^R4bxkR{0FUk
z>5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l`
zW^bjkyZ<KrU~bFi>TJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+<GMP%
zX{);BhCQIW(Gn;+LWW}KSArMA5#JMCwNuLrnSDaQ;az_=OZB4O(I)T>DgzNe6d)1q
zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8
ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b
z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS
z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#|
z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%T<QrU8a
zoQYBuMl~zy=+|`P2J!7}I5U^Ks^;xITZ?|FpLmb=m=4EAn+x?|Qv;lIYp*ZXvf!JQ
z*?%I>rgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5G<LECu4)?S?zq`}l-6Be9igL+N
zh`N7hDOc2GQxkBc_04ZYOy0dF-2c<LysnaQzmR#Nd~*K)?c4go+&{eT7l@5={|h-A
z1;r+~VC?cFyA~?=)<Ut2x6>cXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY
zzr%8JJ5BdcEYsR9e<J*1QJ-;?lGTLgRri0{(Mx*^e9N-cvKPd8)1ZvmTl)}Mp*PMb
zJ>GzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe<H<wNM(*(dvGh1)78L8idze)sN69(F_bD
zfFpRAB-vBKc}&vG08>7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~--
z`<QQ&C6VTv@kABvH3YKpWDUXD_*kNb(3!wC#8v()Ttmk;q}3WaX(d<D73rp7AV5PE
zJvH>63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X
zdYtQ?-K5xDAdfomEd6(yP<r4XU0e%L6Gs?6mZyM_@USHu0!gS4d3Fj?NQ4o2RTLE!
zsZeABR7EXMsfc7!I><w4;nzxeSu{*)rP3*7pbb=qhn4}Y2n9kR0m4&2#L{A=NS7O+
zq<gb--~a#L?(KhfJM+)&{^xa2;9hFiS^M-I@96A#^P5^~n|$x<`ddB`%@&&L<Q!2c
z3T)0gzIbLnIPU9=rs~b%+*kaqOYa3~2NrY$**DZ_28oj!E0}c#hEXZW5#1F%_rp2Y
z@7+$!3(WI<_EWCV)`TqCTTmmZb^3u}aj?mmoaBAb!n-={l6S|)$2$1IvpT^qzBZEw
z8e=}4<>tZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W&
zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT(
zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(>
z(=5Bg?EWq-ldEywgzXW9<IVcZw0PFB^dyb+qfMQWtjsj)vresv4TXCoZ567G0y;gP
z?>65%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oT<WD#3|w3t>iMzzlx8KnHqUi
z<C-MSdTAJmKaI>8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8
z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?`
zW(>$oktzY@GO{|Ln~Bt^A4)(%?<rC#>l-&(D<Yw`9>m!iL#$K_xOyhwAf=K2<+Bom
z<r)*8MZ!$_D%ll%W4Ye$$4y&cK*~WyOiCrNvVfg^98_+DMF;q@k4CQVgxx|A9Hkzk
zY%$3c2K(I6As4DS?_GUJlhQ!Vji$Rs6$y9lpo|T>w7|hl6E5}B$d%n0sfZv<a3(um
z6<;qRVVB1$nE}(k(@3SY^L5&aKgBpn4?AzyzXPQPQ}9ARNm5~`3PH@`&Rv!G*6&j!
z{V*$-!6Q(LiIj*sp{qn3B5ACQ7T%2B=uQTovb#r{!Sw+S`r-sQoh4y>fQRy9Fyz2~
z83#=#LaHnf1th^k*<o}w3D|OX)SLtn@-US^I4);^RK5=p7oq$X3H5?EAaoFSl}3p%
z6LeUX>p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{
zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL
z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN
zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132ea32..ffed3a254e91 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c811f..1b6c787337ff 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/integration-tests/integration-tests.gradle b/integration-tests/integration-tests.gradle
index 71e23b906049..f7408e5c6ec4 100644
--- a/integration-tests/integration-tests.gradle
+++ b/integration-tests/integration-tests.gradle
@@ -1,26 +1,26 @@
 description = "Spring Integration Tests"
 
 dependencies {
-	testCompile(project(":spring-aop"))
-	testCompile(project(":spring-beans"))
-	testCompile(project(":spring-context"))
-	testCompile(project(":spring-core"))
-	testCompile(testFixtures(project(":spring-aop")))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile(project(":spring-expression"))
-	testCompile(project(":spring-jdbc"))
-	testCompile(project(":spring-orm"))
-	testCompile(project(":spring-test"))
-	testCompile(project(":spring-tx"))
-	testCompile(project(":spring-web"))
-	testCompile("javax.inject:javax.inject")
-	testCompile("javax.resource:javax.resource-api")
-	testCompile("javax.servlet:javax.servlet-api")
-	testCompile("org.aspectj:aspectjweaver")
-	testCompile("org.hsqldb:hsqldb")
-	testCompile("org.hibernate:hibernate-core")
+	testImplementation(project(":spring-aop"))
+	testImplementation(project(":spring-beans"))
+	testImplementation(project(":spring-context"))
+	testImplementation(project(":spring-core"))
+	testImplementation(testFixtures(project(":spring-aop")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation(project(":spring-expression"))
+	testImplementation(project(":spring-jdbc"))
+	testImplementation(project(":spring-orm"))
+	testImplementation(project(":spring-test"))
+	testImplementation(project(":spring-tx"))
+	testImplementation(project(":spring-web"))
+	testImplementation("javax.inject:javax.inject")
+	testImplementation("javax.resource:javax.resource-api")
+	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("org.aspectj:aspectjweaver")
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.hibernate:hibernate-core")
 }
 
 normalization {
diff --git a/spring-aop/spring-aop.gradle b/spring-aop/spring-aop.gradle
index 73bb378f39a7..67bf95e8dd6c 100644
--- a/spring-aop/spring-aop.gradle
+++ b/spring-aop/spring-aop.gradle
@@ -1,12 +1,13 @@
 description = "Spring AOP"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	optional("org.aspectj:aspectjweaver")
 	optional("org.apache.commons:commons-pool2")
 	optional("com.jamonapi:jamon")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testFixturesImplementation(testFixtures(project(":spring-beans")))
 	testFixturesImplementation(testFixtures(project(":spring-core")))
 }
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 12adbfb7e5f4..4ee0ef3fda68 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -11,7 +11,7 @@ sourceSets.test.java.srcDirs = files()
 aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
 
 dependencies {
-	compile("org.aspectj:aspectjweaver")
+	api("org.aspectj:aspectjweaver")
 	compileOnly("org.aspectj:aspectjrt")
 	optional(project(":spring-aop"))  // for @Async support
 	optional(project(":spring-beans"))  // for @Configurable support
@@ -21,13 +21,13 @@ dependencies {
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
 	optional("javax.cache:cache-api")  // for JCache aspect
 	optional("javax.transaction:javax.transaction-api")  // for @javax.transaction.Transactional support
-	testCompile(project(":spring-core"))  // for CodeStyleAspect
-	testCompile(project(":spring-test"))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-context-support")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile("javax.mail:javax.mail-api")
+	testImplementation(project(":spring-core"))  // for CodeStyleAspect
+	testImplementation(project(":spring-test"))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-context-support")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation("javax.mail:javax.mail-api")
 	testCompileOnly("org.aspectj:aspectjrt")
 }
 
diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index db894e8b83bc..e3f6f73b763b 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -4,14 +4,14 @@ apply plugin: "groovy"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-core"))
+	api(project(":spring-core"))
 	optional("javax.inject:javax.inject")
 	optional("org.yaml:snakeyaml")
 	optional("org.codehaus.groovy:groovy-xml")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("javax.annotation:javax.annotation-api")
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("javax.annotation:javax.annotation-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 }
diff --git a/spring-context-indexer/spring-context-indexer.gradle b/spring-context-indexer/spring-context-indexer.gradle
index a9769ada026a..2c1df2e91dc3 100644
--- a/spring-context-indexer/spring-context-indexer.gradle
+++ b/spring-context-indexer/spring-context-indexer.gradle
@@ -1,9 +1,9 @@
 description = "Spring Context Indexer"
 
 dependencies {
-	testCompile(project(":spring-context"))
-	testCompile("javax.inject:javax.inject")
-	testCompile("javax.annotation:javax.annotation-api")
-	testCompile("javax.transaction:javax.transaction-api")
-	testCompile("org.eclipse.persistence:javax.persistence")
+	testImplementation(project(":spring-context"))
+	testImplementation("javax.inject:javax.inject")
+	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("javax.transaction:javax.transaction-api")
+	testImplementation("org.eclipse.persistence:javax.persistence")
 }
diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle
index f8a8631293ad..843d1920ebe4 100644
--- a/spring-context-support/spring-context-support.gradle
+++ b/spring-context-support/spring-context-support.gradle
@@ -1,9 +1,9 @@
 description = "Spring Context Support"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-context"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-context"))
+	api(project(":spring-core"))
 	optional(project(":spring-jdbc"))  // for Quartz support
 	optional(project(":spring-tx"))  // for Quartz support
 	optional("javax.activation:javax.activation-api")
@@ -14,18 +14,18 @@ dependencies {
 	optional("org.quartz-scheduler:quartz")
 	optional("org.codehaus.fabric3.api:commonj")
 	optional("org.freemarker:freemarker")
-	testCompile(project(":spring-context"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile("org.hsqldb:hsqldb")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.annotation:javax.annotation-api")
-	testRuntime("org.ehcache:jcache")
-	testRuntime("org.ehcache:ehcache")
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.mail:javax.mail")
+	testImplementation(project(":spring-context"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.annotation:javax.annotation-api")
+	testRuntimeOnly("org.ehcache:jcache")
+	testRuntimeOnly("org.ehcache:ehcache")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.mail:javax.mail")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.mockito:mockito-core")
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 0b06a7c56f0f..221e0f12fe1a 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -4,10 +4,10 @@ apply plugin: "groovy"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-aop"))
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-expression"))
+	api(project(":spring-aop"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-expression"))
 	optional(project(":spring-instrument"))
 	optional("javax.annotation:javax.annotation-api")
 	optional("javax.ejb:javax.ejb-api")
@@ -26,22 +26,22 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
-	testCompile(testFixtures(project(":spring-aop")))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("io.projectreactor:reactor-core")
-	testCompile("org.codehaus.groovy:groovy-jsr223")
-	testCompile("org.codehaus.groovy:groovy-test")
-	testCompile("org.codehaus.groovy:groovy-xml")
-	testCompile("org.apache.commons:commons-pool2")
-	testCompile("javax.inject:javax.inject-tck")
-	testCompile("org.awaitility:awaitility")
-	testRuntime("javax.xml.bind:jaxb-api")
-	testRuntime("org.glassfish:javax.el")
+	testImplementation(testFixtures(project(":spring-aop")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("io.projectreactor:reactor-core")
+	testImplementation("org.codehaus.groovy:groovy-jsr223")
+	testImplementation("org.codehaus.groovy:groovy-test")
+	testImplementation("org.codehaus.groovy:groovy-xml")
+	testImplementation("org.apache.commons:commons-pool2")
+	testImplementation("javax.inject:javax.inject-tck")
+	testImplementation("org.awaitility:awaitility")
+	testRuntimeOnly("javax.xml.bind:jaxb-api")
+	testRuntimeOnly("org.glassfish:javax.el")
 	// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
-	testRuntime("org.glassfish.external:opendmk_jmxremote_optional_jar")
-	testRuntime("org.javamoney:moneta")
-	testRuntime("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
+	testRuntimeOnly("org.glassfish.external:opendmk_jmxremote_optional_jar")
+	testRuntimeOnly("org.javamoney:moneta")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation(testFixtures(project(":spring-beans")))
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
diff --git a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle b/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
index 24efbb4fea70..94d7f1531456 100644
--- a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
+++ b/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
@@ -14,11 +14,11 @@ artifacts {
 }
 
 dependencies {
-	compile("org.jetbrains.kotlin:kotlin-reflect")
-	compile("org.jetbrains.kotlin:kotlin-stdlib")
-	compile("io.projectreactor:reactor-core")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+	api("org.jetbrains.kotlin:kotlin-reflect")
+	api("org.jetbrains.kotlin:kotlin-stdlib")
+	api("io.projectreactor:reactor-core")
+	api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+	api("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 }
 
 eclipse {
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index 822b6ed58acd..d0b294876ef3 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -17,16 +17,16 @@ configurations {
 }
 
 task cglibRepackJar(type: ShadowJar) {
-	archiveBaseName = 'spring-cglib-repack'
-	archiveVersion = cglibVersion
+	archiveBaseName.set('spring-cglib-repack')
+	archiveVersion.set(cglibVersion)
 	configurations = [project.configurations.cglib]
 	relocate 'net.sf.cglib', 'org.springframework.cglib'
 	relocate 'org.objectweb.asm', 'org.springframework.asm'
 }
 
 task objenesisRepackJar(type: ShadowJar) {
-	archiveBaseName = 'spring-objenesis-repack'
-	archiveVersion = objenesisVersion
+	archiveBaseName.set('spring-objenesis-repack')
+	archiveVersion.set(objenesisVersion)
 	configurations = [project.configurations.objenesis]
 	relocate 'org.objenesis', 'org.springframework.objenesis'
 }
@@ -35,9 +35,9 @@ dependencies {
 	cglib("cglib:cglib:${cglibVersion}@jar")
 	objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
 	coroutines(project(path: ":kotlin-coroutines", configuration: 'classesOnlyElements'))
-	compile(files(cglibRepackJar))
-	compile(files(objenesisRepackJar))
-	compile(project(":spring-jcl"))
+	api(files(cglibRepackJar))
+	api(files(objenesisRepackJar))
+	api(project(":spring-jcl"))
 	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional("net.sf.jopt-simple:jopt-simple")
@@ -51,15 +51,15 @@ dependencies {
 	optional("io.reactivex.rxjava3:rxjava")
 	optional("io.smallrye.reactive:mutiny")
 	optional("io.netty:netty-buffer")
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("com.google.code.findbugs:jsr305")
-	testCompile("javax.annotation:javax.annotation-api")
-	testCompile("javax.xml.bind:jaxb-api")
-	testCompile("com.fasterxml.woodstox:woodstox-core")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile("io.projectreactor.tools:blockhound")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("com.google.code.findbugs:jsr305")
+	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("javax.xml.bind:jaxb-api")
+	testImplementation("com.fasterxml.woodstox:woodstox-core")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation("io.projectreactor.tools:blockhound")
 	testFixturesImplementation("io.projectreactor:reactor-test")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
 	testFixturesImplementation("org.junit.platform:junit-platform-launcher")
diff --git a/spring-expression/spring-expression.gradle b/spring-expression/spring-expression.gradle
index 9f8299d4db90..920f7c7bc07f 100644
--- a/spring-expression/spring-expression.gradle
+++ b/spring-expression/spring-expression.gradle
@@ -3,8 +3,8 @@ description = "Spring Expression Language (SpEL)"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-core"))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("org.jetbrains.kotlin:kotlin-reflect")
-	testCompile("org.jetbrains.kotlin:kotlin-stdlib")
+	api(project(":spring-core"))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 }
diff --git a/spring-jdbc/spring-jdbc.gradle b/spring-jdbc/spring-jdbc.gradle
index e0737be91f53..41aa3f198720 100644
--- a/spring-jdbc/spring-jdbc.gradle
+++ b/spring-jdbc/spring-jdbc.gradle
@@ -3,9 +3,9 @@ description = "Spring JDBC"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-tx"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-tx"))
 	optional(project(":spring-context"))  // for JndiDataSourceLookup
 	optional("javax.transaction:javax.transaction-api")
 	optional("org.hsqldb:hsqldb")
@@ -14,6 +14,6 @@ dependencies {
 	optional("org.apache.derby:derbyclient")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
 }
diff --git a/spring-jms/spring-jms.gradle b/spring-jms/spring-jms.gradle
index a447c97a8084..32485dff84ba 100644
--- a/spring-jms/spring-jms.gradle
+++ b/spring-jms/spring-jms.gradle
@@ -1,10 +1,10 @@
 description = "Spring JMS"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-messaging"))
-	compile(project(":spring-tx"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-messaging"))
+	api(project(":spring-tx"))
 	compileOnly("javax.jms:javax.jms-api")
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
@@ -12,8 +12,8 @@ dependencies {
 	optional("javax.resource:javax.resource-api")
 	optional("javax.transaction:javax.transaction-api")
 	optional("com.fasterxml.jackson.core:jackson-databind")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile("org.apache.activemq:activemq-broker")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation("org.apache.activemq:activemq-broker")
 	testImplementation("javax.jms:javax.jms-api")
 }
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index 2973da314984..eed544b526b3 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -4,8 +4,8 @@ apply plugin: "kotlin"
 apply plugin: "kotlinx-serialization"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
@@ -19,25 +19,25 @@ dependencies {
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("javax.inject:javax.inject-tck")
-	testCompile("javax.servlet:javax.servlet-api")
-	testCompile("javax.validation:validation-api")
-	testCompile("com.thoughtworks.xstream:xstream")
-	testCompile("org.apache.activemq:activemq-broker")
-	testCompile("org.apache.activemq:activemq-kahadb-store")
-	testCompile("org.apache.activemq:activemq-stomp")
-	testCompile("io.projectreactor:reactor-test")
-	testCompile "io.reactivex.rxjava3:rxjava"
-	testCompile("org.jetbrains.kotlin:kotlin-reflect")
-	testCompile("org.jetbrains.kotlin:kotlin-stdlib")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testRuntime("com.sun.activation:javax.activation")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("javax.json:javax.json-api")
-	testRuntime("org.apache.johnzon:johnzon-jsonb")
-	testRuntime(project(":spring-context"))
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("javax.inject:javax.inject-tck")
+	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("com.thoughtworks.xstream:xstream")
+	testImplementation("org.apache.activemq:activemq-broker")
+	testImplementation("org.apache.activemq:activemq-kahadb-store")
+	testImplementation("org.apache.activemq:activemq-stomp")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.reactivex.rxjava3:rxjava")
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testRuntimeOnly("com.sun.activation:javax.activation")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("javax.json:javax.json-api")
+	testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
+	testRuntimeOnly(project(":spring-context"))
 }
diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
index 285e044a14b4..7870f5d77d72 100644
--- a/spring-orm/spring-orm.gradle
+++ b/spring-orm/spring-orm.gradle
@@ -1,21 +1,21 @@
 description = "Spring Object/Relational Mapping"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-jdbc"))
-	compile(project(":spring-tx"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-jdbc"))
+	api(project(":spring-tx"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
 	optional(project(":spring-web"))
 	optional("org.eclipse.persistence:org.eclipse.persistence.jpa")
 	optional("org.hibernate:hibernate-core")
 	optional("javax.servlet:javax.servlet-api")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("org.aspectj:aspectjweaver")
-	testCompile("org.hsqldb:hsqldb")
-	testRuntime("javax.xml.bind:jaxb-api")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("org.aspectj:aspectjweaver")
+	testImplementation("org.hsqldb:hsqldb")
+	testRuntimeOnly("javax.xml.bind:jaxb-api")
 }
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index 901c4ba072b4..a78b41049e0c 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -23,23 +23,23 @@ sourceSets {
 }
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	optional("javax.xml.bind:jaxb-api")
 	optional("javax.activation:javax.activation-api")
 	optional("com.thoughtworks.xstream:xstream")
 	optional("org.jibx:jibx-run")
-	testCompile(project(":spring-context"))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("org.ogce:xpp3")
-	testCompile("org.codehaus.jettison:jettison") {
+	testImplementation(project(":spring-context"))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("org.ogce:xpp3")
+	testImplementation("org.codehaus.jettison:jettison") {
 		exclude group: "stax", module: "stax-api"
 	}
-	//testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
+	//testImplementation(files(genJaxb.classesDir).builtBy(genJaxb))
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
 
 // JiBX compiler is currently not compatible with JDK 9+.
diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle
index 8fd50bf2e780..5c60dd7d3ad6 100644
--- a/spring-r2dbc/spring-r2dbc.gradle
+++ b/spring-r2dbc/spring-r2dbc.gradle
@@ -3,23 +3,23 @@ description = "Spring R2DBC"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-tx"))
-	compile("io.r2dbc:r2dbc-spi")
-	compile("io.projectreactor:reactor-core")
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-tx"))
+	api("io.r2dbc:r2dbc-spi")
+	api("io.projectreactor:reactor-core")
 	compileOnly(project(":kotlin-coroutines"))
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("io.r2dbc:r2dbc-h2")
-	testCompile("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.r2dbc:r2dbc-h2")
+	testImplementation("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
 		exclude group: "org.springframework", module: "spring-jdbc"
 	}
 }
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index e27977c1af02..e15134600b87 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -3,7 +3,7 @@ description = "Spring TestContext Framework"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-core"))
+	api(project(":spring-core"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-beans"))
 	optional(project(":spring-context"))
@@ -45,41 +45,41 @@ dependencies {
 	optional("io.projectreactor:reactor-test")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":spring-context-support"))
-	testCompile(project(":spring-oxm"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("javax.annotation:javax.annotation-api")
-	testCompile("javax.cache:cache-api")
-	testCompile("javax.ejb:javax.ejb-api")
-	testCompile("javax.interceptor:javax.interceptor-api")
-	testCompile("javax.mail:javax.mail-api")
-	testCompile("org.hibernate:hibernate-core")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.validation:validation-api")
-	testCompile("org.junit.platform:junit-platform-runner") {
+	testImplementation(project(":spring-context-support"))
+	testImplementation(project(":spring-oxm"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("javax.cache:cache-api")
+	testImplementation("javax.ejb:javax.ejb-api")
+	testImplementation("javax.interceptor:javax.interceptor-api")
+	testImplementation("javax.mail:javax.mail-api")
+	testImplementation("org.hibernate:hibernate-core")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("org.junit.platform:junit-platform-runner") {
 		exclude group: "junit", module: "junit"
 	}
-	testCompile("org.junit.platform:junit-platform-testkit")
-	testCompile("com.fasterxml.jackson.core:jackson-databind")
-	testCompile("com.thoughtworks.xstream:xstream")
-	testCompile("com.rometools:rome")
-	testCompile("org.apache.tiles:tiles-api")
-	testCompile("org.apache.tiles:tiles-core")
-	testCompile("org.apache.tiles:tiles-servlet")
-	testCompile("org.hsqldb:hsqldb")
-	testCompile("org.apache.httpcomponents:httpclient")
-	testCompile("io.projectreactor.netty:reactor-netty-http")
-	testCompile("de.bechte.junit:junit-hierarchicalcontextrunner")
-	testRuntime("org.junit.vintage:junit-vintage-engine") {
+	testImplementation("org.junit.platform:junit-platform-testkit")
+	testImplementation("com.fasterxml.jackson.core:jackson-databind")
+	testImplementation("com.thoughtworks.xstream:xstream")
+	testImplementation("com.rometools:rome")
+	testImplementation("org.apache.tiles:tiles-api")
+	testImplementation("org.apache.tiles:tiles-core")
+	testImplementation("org.apache.tiles:tiles-servlet")
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.apache.httpcomponents:httpclient")
+	testImplementation("io.projectreactor.netty:reactor-netty-http")
+	testImplementation("de.bechte.junit:junit-hierarchicalcontextrunner")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
 		exclude group: "junit", module: "junit"
 	}
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
 
 task junit(type: Test) {
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
index 99c829892646..c9447732bc59 100644
--- a/spring-tx/spring-tx.gradle
+++ b/spring-tx/spring-tx.gradle
@@ -3,8 +3,8 @@ description = "Spring Transaction"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
 	optional(project(":kotlin-coroutines"))
@@ -19,11 +19,11 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("org.aspectj:aspectjweaver")
-	testCompile("org.codehaus.groovy:groovy")
-	testCompile("org.eclipse.persistence:javax.persistence")
-	testCompile("io.projectreactor:reactor-test")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("org.aspectj:aspectjweaver")
+	testImplementation("org.codehaus.groovy:groovy")
+	testImplementation("org.eclipse.persistence:javax.persistence")
+	testImplementation("io.projectreactor:reactor-test")
 }
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index 6d1ca73a86b2..f774f0afb8a9 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -4,8 +4,8 @@ apply plugin: "kotlin"
 apply plugin: "kotlinx-serialization"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional(project(":spring-aop"))
@@ -58,30 +58,30 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("org.apache.taglibs:taglibs-standard-jstlel")
-	testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
-	testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda")
-	testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-	testCompile("com.fasterxml.jackson.module:jackson-module-kotlin")
-	testCompile("org.apache.tomcat:tomcat-util")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core")
-	testCompile("org.eclipse.jetty:jetty-server")
-	testCompile("org.eclipse.jetty:jetty-servlet")
-	testCompile("com.squareup.okhttp3:mockwebserver")
-	testCompile("org.jetbrains.kotlin:kotlin-reflect")
-	testCompile("org.skyscreamer:jsonassert")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testCompile("io.projectreactor.tools:blockhound")
-	testRuntime("com.sun.mail:javax.mail")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("javax.json:javax.json-api")
-	testRuntime("org.apache.johnzon:johnzon-jsonb")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("org.apache.taglibs:taglibs-standard-jstlel")
+	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
+	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-joda")
+	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+	testImplementation("org.apache.tomcat:tomcat-util")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
+	testImplementation("org.eclipse.jetty:jetty-server")
+	testImplementation("org.eclipse.jetty:jetty-servlet")
+	testImplementation("com.squareup.okhttp3:mockwebserver")
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+	testImplementation("org.skyscreamer:jsonassert")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testImplementation("io.projectreactor.tools:blockhound")
+	testRuntimeOnly("com.sun.mail:javax.mail")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("javax.json:javax.json-api")
+	testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
 	testFixturesApi("javax.servlet:javax.servlet-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-params")
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index c793b31804ea..7e9e49c69fde 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -3,10 +3,10 @@ description = "Spring WebFlux"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-web"))
-	compile("io.projectreactor:reactor-core")
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-web"))
+	api("io.projectreactor:reactor-core")
 	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-context-support"))  // for FreeMarker support
@@ -27,35 +27,35 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("javax.xml.bind:jaxb-api")
-	testCompile("com.fasterxml:aalto-xml")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.validation:validation-api")
-	testCompile("io.reactivex.rxjava3:rxjava")
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("io.undertow:undertow-core")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core")
-	testCompile("org.apache.tomcat:tomcat-util")
-	testCompile("org.eclipse.jetty:jetty-server")
-	testCompile("org.eclipse.jetty:jetty-servlet")
-	testCompile("org.eclipse.jetty:jetty-reactive-httpclient")
-	testCompile('org.apache.httpcomponents.client5:httpclient5')
-	testCompile('org.apache.httpcomponents.core5:httpcore5-reactive')
-	testCompile("com.squareup.okhttp3:mockwebserver")
-	testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
-	testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223")
-	testRuntime("org.jruby:jruby")
-	testRuntime("org.python:jython-standalone")
-	testRuntime("org.synchronoss.cloud:nio-multipart-parser")
-	testRuntime("org.webjars:underscorejs")
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("com.sun.activation:javax.activation")
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("javax.xml.bind:jaxb-api")
+	testImplementation("com.fasterxml:aalto-xml")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("io.reactivex.rxjava3:rxjava")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.undertow:undertow-core")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
+	testImplementation("org.apache.tomcat:tomcat-util")
+	testImplementation("org.eclipse.jetty:jetty-server")
+	testImplementation("org.eclipse.jetty:jetty-servlet")
+	testImplementation("org.eclipse.jetty:jetty-reactive-httpclient")
+	testImplementation('org.apache.httpcomponents.client5:httpclient5')
+	testImplementation('org.apache.httpcomponents.core5:httpcore5-reactive')
+	testImplementation("com.squareup.okhttp3:mockwebserver")
+	testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
+	testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
+	testRuntimeOnly("org.jruby:jruby")
+	testRuntimeOnly("org.python:jython-standalone")
+	testRuntimeOnly("org.synchronoss.cloud:nio-multipart-parser")
+	testRuntimeOnly("org.webjars:underscorejs")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("com.sun.activation:javax.activation")
 }
 
 test {
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index 92deba6aa2f6..36ad9f649ef3 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -3,12 +3,12 @@ description = "Spring Web MVC"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-aop"))
-	compile(project(":spring-beans"))
-	compile(project(":spring-context"))
-	compile(project(":spring-core"))
-	compile(project(":spring-expression"))
-	compile(project(":spring-web"))
+	api(project(":spring-aop"))
+	api(project(":spring-beans"))
+	api(project(":spring-context"))
+	api(project(":spring-core"))
+	api(project(":spring-expression"))
+	api(project(":spring-web"))
 	compileOnly("javax.servlet:javax.servlet-api")
 	compileOnly("com.google.code.findbugs:findbugs")  // for groovy-templates
 	optional(project(":spring-context-support"))  // for FreeMarker support
@@ -37,38 +37,38 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("javax.servlet:javax.servlet-api")
-	testCompile("org.eclipse.jetty:jetty-servlet") {
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("org.eclipse.jetty:jetty-servlet") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	testCompile("org.eclipse.jetty:jetty-server") {
+	testImplementation("org.eclipse.jetty:jetty-server") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	testCompile("org.apache.httpcomponents:httpclient")
-	testCompile("commons-fileupload:commons-fileupload")
-	testCompile("commons-io:commons-io")
-	testCompile("joda-time:joda-time")
-	testCompile("org.mozilla:rhino")
-	testCompile("org.dom4j:dom4j")
-	testCompile("jaxen:jaxen")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.validation:validation-api")
-	testCompile("io.projectreactor:reactor-core")
-	testCompile("io.reactivex.rxjava3:rxjava")
-	testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
-	testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223")
-	testRuntime("org.jruby:jruby")
-	testRuntime("org.python:jython-standalone")
-	testRuntime("org.webjars:underscorejs")
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("com.sun.activation:javax.activation")
+	testImplementation("org.apache.httpcomponents:httpclient")
+	testImplementation("commons-fileupload:commons-fileupload")
+	testImplementation("commons-io:commons-io")
+	testImplementation("joda-time:joda-time")
+	testImplementation("org.mozilla:rhino")
+	testImplementation("org.dom4j:dom4j")
+	testImplementation("jaxen:jaxen")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("io.projectreactor:reactor-core")
+	testImplementation("io.reactivex.rxjava3:rxjava")
+	testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
+	testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
+	testRuntimeOnly("org.jruby:jruby")
+	testRuntimeOnly("org.python:jython-standalone")
+	testRuntimeOnly("org.webjars:underscorejs")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("com.sun.activation:javax.activation")
 }
diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle
index 6b311234386b..4ffe0ef667bd 100644
--- a/spring-websocket/spring-websocket.gradle
+++ b/spring-websocket/spring-websocket.gradle
@@ -1,9 +1,9 @@
 description = "Spring WebSocket"
 
 dependencies {
-	compile(project(":spring-context"))
-	compile(project(":spring-core"))
-	compile(project(":spring-web"))
+	api(project(":spring-context"))
+	api(project(":spring-core"))
+	api(project(":spring-web"))
 	optional(project(":spring-messaging"))
 	optional(project(":spring-webmvc"))
 	optional("javax.servlet:javax.servlet-api")
@@ -21,9 +21,9 @@ dependencies {
 	optional("io.undertow:undertow-servlet")
 	optional("io.undertow:undertow-websockets-jsr")
 	optional("com.fasterxml.jackson.core:jackson-databind")
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-websocket")
-	testCompile("io.projectreactor.netty:reactor-netty-http")
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket")
+	testImplementation("io.projectreactor.netty:reactor-netty-http")
 }

From ab41db474e2a94d672fa44f4f66c34c136f7db46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Sat, 12 Sep 2020 19:41:08 +0200
Subject: [PATCH 064/735] Update dokka to 1.5.0

See gh-26870
---
 build.gradle             |  2 ++
 gradle/docs-dokka.gradle | 30 ++++++++++++++++++++++++++++++
 settings.gradle          |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 gradle/docs-dokka.gradle

diff --git a/build.gradle b/build.gradle
index 059b5fec1d3d..474a370a7657 100644
--- a/build.gradle
+++ b/build.gradle
@@ -313,6 +313,8 @@ configure([rootProject] + javaProjects) { project ->
 
 	pluginManager.withPlugin("kotlin") {
 		apply plugin: "org.jetbrains.dokka"
+		apply from: "${rootDir}/gradle/docs-dokka.gradle"
+
 		compileKotlin {
 			kotlinOptions {
 				languageVersion = "1.3"
diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
new file mode 100644
index 000000000000..ee5e4f15d701
--- /dev/null
+++ b/gradle/docs-dokka.gradle
@@ -0,0 +1,30 @@
+tasks.findByName("dokkaHtmlPartial")?.configure {
+    outputDirectory.set(new File(buildDir, "docs/kdoc"))
+    dokkaSourceSets {
+        configureEach {
+            sourceRoots.setFrom(file("src/main/kotlin"))
+            classpath.from(sourceSets["main"].runtimeClasspath)
+            externalDocumentationLink {
+                url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
+            }
+        }
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index 6c2fb1952c6b..8af23c7ca953 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven { url 'https://repo.spring.io/plugins-release' }
+		maven { url "https://repo.spring.io/plugins-release" }
 	}
 }
 

From ca34d0cce8cb10a989ad60f98114c62c734f834c Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 13 Sep 2021 09:36:07 +0200
Subject: [PATCH 065/735] Polish Gradle upgrade

Closes gh-26870
---
 build.gradle             |  9 +++++---
 gradle/docs-dokka.gradle | 48 ++++++++++++++++++++--------------------
 gradle/docs.gradle       | 45 ++++++++-----------------------------
 3 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/build.gradle b/build.gradle
index 474a370a7657..5d930a2240cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.5.RELEASE'
 	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
-	id 'org.asciidoctor.jvm.convert' version '3.1.0'
-	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
+	id 'org.asciidoctor.jvm.convert' version '3.3.2'
+	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id 'de.undercouch.download' version '4.1.2'
 	id "io.freefair.aspectj" version '6.1.0' apply false
 	id "com.github.ben-manes.versions" version '0.39.0'
@@ -381,7 +381,10 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.7.2/api/"
+			"https://junit.org/junit5/docs/5.7.2/api/",
+			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
+			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
+			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"
 	] as String[]
 }
 
diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
index ee5e4f15d701..85c7a62468a2 100644
--- a/gradle/docs-dokka.gradle
+++ b/gradle/docs-dokka.gradle
@@ -2,29 +2,29 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
     outputDirectory.set(new File(buildDir, "docs/kdoc"))
     dokkaSourceSets {
         configureEach {
-            sourceRoots.setFrom(file("src/main/kotlin"))
-            classpath.from(sourceSets["main"].runtimeClasspath)
-            externalDocumentationLink {
-                url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
-            }
-        }
+			sourceRoots.setFrom(file("src/main/kotlin"))
+			classpath.from(sourceSets["main"].runtimeClasspath)
+			externalDocumentationLink {
+				url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
+			}
+		}
     }
 }
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 3d1ee01934b8..bfb26d152b9c 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -61,42 +61,15 @@ task api(type: Javadoc) {
 /**
  * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
  */
-/*
-moduleProjects.each { module ->
-	dokkaHtmlPartial {
-		dokkaSourceSets {
-			configureEach {
-				externalDocumentationLink {
-					url.set(URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/"))
-					packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
-				}
-				externalDocumentationLink {
-					url.set(URL("https://projectreactor.io/docs/core/release/api/"))
-				}
-				externalDocumentationLink {
-					url.set(URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
-				}
-				/*
-			This link causes errors, removing to fix the build.
-			externalDocumentationLink {
-				url.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/"))
-			}
-			//
-				externalDocumentationLink {
-					url.set(URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/"))
-				}
-			}
+pluginManager.withPlugin("kotlin") {
+	tasks.dokkaHtmlMultiModule.configure {
+		dependsOn {
+			tasks.getByName("api")
 		}
+		moduleName.set("spring-framework")
+		outputDirectory.set(project.file("$buildDir/docs/kdoc"))
 	}
 }
-*/
-tasks.dokkaHtmlMultiModule.configure {
-	dependsOn {
-		tasks.getByName("api")
-	}
-	moduleName.set("spring-framework")
-	outputDirectory.set(project.file("$buildDir/docs/kdoc"))
-}
 
 task downloadResources(type: Download) {
 	def version = "0.2.5"
@@ -195,7 +168,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 	from ("$asciidoctorPdf.outputDir") {
 		into "reference/pdf"
 	}
-	from (dokkaHtmlMultiModule) {
+	from (dokkaHtmlMultiModule.outputDirectory) {
 		into "kdoc-api"
 	}
 }
@@ -252,11 +225,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 		expand(copyright: new Date().format("yyyy"), version: project.version)
 	}
 
-	from(zipTree(docsZip.archivePath)) {
+	from(zipTree(docsZip.archiveFile)) {
 		into "${baseDir}/docs"
 	}
 
-	from(zipTree(schemaZip.archivePath)) {
+	from(zipTree(schemaZip.archiveFile)) {
 		into "${baseDir}/schema"
 	}
 

From c02ae7bcb86a0aeddc66812d8cadec6cd45a6037 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 13 Sep 2021 10:14:58 +0200
Subject: [PATCH 066/735] Fix noHttp failure

---
 gradle/docs-dokka.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
index 85c7a62468a2..ef06f904185c 100644
--- a/gradle/docs-dokka.gradle
+++ b/gradle/docs-dokka.gradle
@@ -17,7 +17,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
 			}
 			externalDocumentationLink {
-				url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+				url.set(new URL("https://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))

From a087d13aea77cd93b39b36b6e9b68270b140f9da Mon Sep 17 00:00:00 2001
From: Mustafa Ulu <mustafau@sabanciuniv.edu>
Date: Sun, 12 Sep 2021 14:18:54 +0300
Subject: [PATCH 067/735] Fix wording in Javadoc of ClientResponse.mutate()

Removed an extra "the".
---
 .../web/reactive/function/client/ClientResponse.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
index 897a1a28b5d7..5895c4294b00 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
@@ -193,7 +193,7 @@ public interface ClientResponse {
 	String logPrefix();
 
 	/**
-	 * Return a builder to mutate the this response, for example to change
+	 * Return a builder to mutate this response, for example to change
 	 * the status, headers, cookies, and replace or transform the body.
 	 * @return a builder to mutate the request with
 	 * @since 5.3

From db424d0bc5b5a8b6d77062039f260edea02bfb66 Mon Sep 17 00:00:00 2001
From: Mustafa Ulu <mustafau@sabanciuniv.edu>
Date: Sun, 12 Sep 2021 14:27:33 +0300
Subject: [PATCH 068/735] Replace word "request" with "response"

---
 .../web/reactive/function/client/ClientResponse.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
index 5895c4294b00..90384a6ede04 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
@@ -195,7 +195,7 @@ public interface ClientResponse {
 	/**
 	 * Return a builder to mutate this response, for example to change
 	 * the status, headers, cookies, and replace or transform the body.
-	 * @return a builder to mutate the request with
+	 * @return a builder to mutate the response with
 	 * @since 5.3
 	 */
 	default Builder mutate() {

From 04e6b233cade1510a2d32bc2f7bfcf2d6e21b9c7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 6 Sep 2021 16:38:37 +0200
Subject: [PATCH 069/735] Upgrade to JUnit 5.8

Closes gh-27392
---
 build.gradle                                     |  6 ++++--
 .../SpringTestContextFrameworkTestSuite.java     | 11 ++++-------
 .../context/env/TestPropertySourceTestSuite.java | 11 ++++-------
 .../junit/SpringJUnitJupiterTestSuite.java       | 16 +++++-----------
 .../reactive/ClientHttpConnectorTests.java       | 11 +++++++----
 .../handler/PathPatternsParameterizedTest.java   |  7 +++++--
 6 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5d930a2240cf..f5419026e941 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ configure(allprojects) { project ->
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
-			mavenBom "org.junit:junit-bom:5.7.2"
+			mavenBom "org.junit:junit-bom:5.8.0"
 		}
 		dependencies {
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
@@ -346,6 +346,7 @@ configure([rootProject] + javaProjects) { project ->
 	dependencies {
 		testImplementation("org.junit.jupiter:junit-jupiter-api")
 		testImplementation("org.junit.jupiter:junit-jupiter-params")
+		testImplementation("org.junit.platform:junit-platform-suite-api")
 		testImplementation("org.mockito:mockito-core")
 		testImplementation("org.mockito:mockito-junit-jupiter")
 		testImplementation("io.mockk:mockk")
@@ -353,6 +354,7 @@ configure([rootProject] + javaProjects) { project ->
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
 		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
@@ -381,7 +383,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.7.2/api/",
+			"https://junit.org/junit5/docs/5.8.0/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"
diff --git a/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java
index d1532dfcffc1..4500d5566899 100644
--- a/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java
+++ b/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
 
 package org.springframework.test.context;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.ExcludeTags;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.platform.suite.api.UseTechnicalNames;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * JUnit Platform based test suite for tests that involve the Spring TestContext
@@ -42,10 +40,9 @@
  * @author Sam Brannen
  * @since 5.2
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("org.springframework.test.context")
 @IncludeClassNamePatterns(".*Tests?$")
 @ExcludeTags("failing-test-case")
-@UseTechnicalNames
-public class SpringTestContextFrameworkTestSuite {
+class SpringTestContextFrameworkTestSuite {
 }
diff --git a/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java
index 97c5c62e2527..e67528774a8b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java
+++ b/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
 
 package org.springframework.test.context.env;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.platform.suite.api.UseTechnicalNames;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 import org.springframework.test.context.TestPropertySource;
 
@@ -35,10 +33,9 @@
  * @author Sam Brannen
  * @since 5.2
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @IncludeEngines("junit-jupiter")
 @SelectPackages("org.springframework.test.context.env")
 @IncludeClassNamePatterns(".*Tests$")
-@UseTechnicalNames
-public class TestPropertySourceTestSuite {
+class TestPropertySourceTestSuite {
 }
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java
index 0a0cf2f84ead..28c8071e1c8c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,17 @@
 
 package org.springframework.test.context.junit;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.ExcludeTags;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.platform.suite.api.UseTechnicalNames;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
- * JUnit 4 based test suite for tests that involve the Spring TestContext
+ * JUnit Platform based test suite for tests that involve the Spring TestContext
  * Framework and JUnit Jupiter (i.e., JUnit 5's programming model).
  *
- * <p>This class intentionally does not reside in the "jupiter" package
- * so that the entire "jupiter" package can be excluded from the Gradle
- * build. This class is therefore responsible for executing all JUnit
- * Jupiter based tests in Spring's official test suite.
+ * <p><strong>This suite is only intended to be used manually within an IDE.</strong>
  *
  * <h3>Logging Configuration</h3>
  *
@@ -46,11 +41,10 @@
  * @author Sam Brannen
  * @since 5.0
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @IncludeEngines("junit-jupiter")
 @SelectPackages("org.springframework.test.context.junit.jupiter")
 @IncludeClassNamePatterns(".*Tests$")
 @ExcludeTags("failing-test-case")
-@UseTechnicalNames
 public class SpringJUnitJupiterTestSuite {
 }
diff --git a/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java b/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
index 3c3debef9790..0f30c2391e05 100644
--- a/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +77,9 @@ void stopServer() throws IOException {
 		server.shutdown();
 	}
 
-	@ParameterizedTest
+	// Do not auto-close arguments since HttpComponentsClientHttpConnector implements
+	// AutoCloseable and is shared between parameterized test invocations.
+	@ParameterizedTest(autoCloseArguments = false)
 	@MethodSource("org.springframework.http.client.reactive.ClientHttpConnectorTests#methodsWithConnectors")
 	void basic(ClientHttpConnector connector, HttpMethod method) throws Exception {
 		URI uri = this.server.url("/").uri();
@@ -198,10 +200,11 @@ private void expectRequest(Consumer<RecordedRequest> consumer) {
 
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.METHOD)
-	@ParameterizedTest
+	// Do not auto-close arguments since HttpComponentsClientHttpConnector implements
+	// AutoCloseable and is shared between parameterized test invocations.
+	@ParameterizedTest(autoCloseArguments = false)
 	@MethodSource("org.springframework.http.client.reactive.ClientHttpConnectorTests#connectors")
 	public @interface ParameterizedConnectorTest {
-
 	}
 
 	static List<ClientHttpConnector> connectors() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java
index 7dc77ff73d18..ead6e38ab1da 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.handler;
 
 import java.lang.annotation.ElementType;
@@ -30,7 +31,9 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-@org.junit.jupiter.params.ParameterizedTest
+// Do not auto-close arguments since ConfigurableWebApplicationContext implements
+// AutoCloseable and is shared between parameterized test invocations.
+@org.junit.jupiter.params.ParameterizedTest(autoCloseArguments = false)
 @org.junit.jupiter.params.provider.MethodSource("pathPatternsArguments")
 public @interface PathPatternsParameterizedTest {
 }

From d55cbf8b4dc2c45259bf69bf983f6b575e188938 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 13 Sep 2021 16:52:00 +0200
Subject: [PATCH 070/735] Avoid use of deprecated API in aggregateTestReports
 task

See gh-26870
---
 spring-test/spring-test.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index e15134600b87..365ce7d316f9 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -112,7 +112,7 @@ test {
 
 task aggregateTestReports(type: TestReport) {
 	description = "Aggregates JUnit and TestNG test reports."
-	destinationDir = test.reports.html.destination
+	destinationDir = test.reports.html.outputLocation.get().getAsFile()
 	reportOn junit, testNG
 }
 

From 52b03e3326559189c329ec3851164a76cc4ee530 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Mon, 2 Aug 2021 10:28:20 -0700
Subject: [PATCH 071/735] Migrate CoroutinesUtils to Java

Migrate `CoroutinesUtils` from Kotlin code to Java and drop the
`kotlin-coroutines` module.

This update removes the need for Kotlin tooling IDE plugins to be
installed.

Closes gh-27379
---
 settings.gradle                               |  4 +-
 .../kotlin-coroutines.gradle                  | 35 -------
 .../springframework/core/CoroutinesUtils.kt   | 71 --------------
 spring-core/spring-core.gradle                |  8 +-
 .../springframework/core/CoroutinesUtils.java | 98 +++++++++++++++++++
 spring-messaging/spring-messaging.gradle      |  2 -
 spring-r2dbc/spring-r2dbc.gradle              |  2 -
 spring-tx/spring-tx.gradle                    |  1 -
 spring-web/spring-web.gradle                  |  1 -
 spring-webflux/spring-webflux.gradle          |  2 -
 spring-webmvc/spring-webmvc.gradle            |  1 -
 11 files changed, 101 insertions(+), 124 deletions(-)
 delete mode 100644 spring-core/kotlin-coroutines/kotlin-coroutines.gradle
 delete mode 100644 spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt
 create mode 100644 spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java

diff --git a/settings.gradle b/settings.gradle
index 8af23c7ca953..811aa851d64e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,8 +17,6 @@ include "spring-context"
 include "spring-context-indexer"
 include "spring-context-support"
 include "spring-core"
-include "kotlin-coroutines"
-project(':kotlin-coroutines').projectDir = file('spring-core/kotlin-coroutines')
 include "spring-expression"
 include "spring-instrument"
 include "spring-jcl"
@@ -51,7 +49,7 @@ settings.gradle.projectsLoaded {
 			buildScanPublished { scan ->
 				if (buildDir.exists()) {
 					new File(buildDir, "build-scan-uri.txt").text = "${scan.buildScanUri}\n"
-				} 
+				}
 			}
 		}
 	}
diff --git a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle b/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
deleted file mode 100644
index 94d7f1531456..000000000000
--- a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-description = "Spring Core Coroutines support"
-
-apply plugin: "kotlin"
-
-configurations {
-	classesOnlyElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-}
-
-artifacts {
-	classesOnlyElements(compileKotlin.destinationDir)
-}
-
-dependencies {
-	api("org.jetbrains.kotlin:kotlin-reflect")
-	api("org.jetbrains.kotlin:kotlin-stdlib")
-	api("io.projectreactor:reactor-core")
-	api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-	api("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-}
-
-eclipse {
-	project {
-		buildCommand "org.jetbrains.kotlin.ui.kotlinBuilder"
-		buildCommand "org.eclipse.jdt.core.javabuilder"
-		natures "org.jetbrains.kotlin.core.kotlinNature"
-		natures "org.eclipse.jdt.core.javanature"
-		linkedResource name: "kotlin_bin", type: "2", locationUri: "org.jetbrains.kotlin.core.filesystem:/" + project.name + "/kotlin_bin"
-	}
-	classpath {
-		containers "org.jetbrains.kotlin.core.KOTLIN_CONTAINER"
-	}
-}
diff --git a/spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt b/spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt
deleted file mode 100644
index 3d716bb685e0..000000000000
--- a/spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt
+++ /dev/null
@@ -1,71 +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.
- */
-
-@file:JvmName("CoroutinesUtils")
-package org.springframework.core
-
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.reactive.awaitSingleOrNull
-import kotlinx.coroutines.reactor.asFlux
-
-import kotlinx.coroutines.reactor.mono
-import org.reactivestreams.Publisher
-import reactor.core.publisher.Mono
-import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.Method
-import kotlin.reflect.full.callSuspend
-import kotlin.reflect.jvm.kotlinFunction
-
-/**
- * Convert a [Deferred] instance to a [Mono] one.
- *
- * @author Sebastien Deleuze
- * @since 5.2
- */
-internal fun <T: Any> deferredToMono(source: Deferred<T>) =
-		mono(Dispatchers.Unconfined) { source.await() }
-
-/**
- * Convert a [Mono] instance to a [Deferred] one.
- *
- * @author Sebastien Deleuze
- * @since 5.2
- */
-@Suppress("DEPRECATION")
-@OptIn(DelicateCoroutinesApi::class)
-internal fun <T: Any> monoToDeferred(source: Mono<T>) =
-		GlobalScope.async(Dispatchers.Unconfined) { source.awaitSingleOrNull() }
-
-/**
- * Invoke a suspending function and converts it to [Mono] or [reactor.core.publisher.Flux].
- *
- * @author Sebastien Deleuze
- * @since 5.2
- */
-@Suppress("UNCHECKED_CAST")
-fun invokeSuspendingFunction(method: Method, target: Any, vararg args: Any?): Publisher<*> {
-	val function = method.kotlinFunction!!
-	val mono = mono(Dispatchers.Unconfined) {
-		function.callSuspend(target, *args.sliceArray(0..(args.size-2))).let { if (it == Unit) null else it }
-	}.onErrorMap(InvocationTargetException::class.java) { it.targetException }
-	return if (function.returnType.classifier == Flow::class) {
-		mono.flatMapMany { (it as Flow<Any>).asFlux() }
-	}
-	else {
-		mono
-	}
-}
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index d0b294876ef3..a6e5e309b073 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -13,7 +13,6 @@ def objenesisVersion = "3.2"
 configurations {
 	cglib
 	objenesis
-	coroutines
 }
 
 task cglibRepackJar(type: ShadowJar) {
@@ -34,16 +33,16 @@ task objenesisRepackJar(type: ShadowJar) {
 dependencies {
 	cglib("cglib:cglib:${cglibVersion}@jar")
 	objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
-	coroutines(project(path: ":kotlin-coroutines", configuration: 'classesOnlyElements'))
 	api(files(cglibRepackJar))
 	api(files(objenesisRepackJar))
 	api(project(":spring-jcl"))
-	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional("net.sf.jopt-simple:jopt-simple")
 	optional("org.aspectj:aspectjweaver")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
+	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("io.projectreactor:reactor-core")
 	optional("io.reactivex:rxjava")
 	optional("io.reactivex:rxjava-reactive-streams")
@@ -58,7 +57,6 @@ dependencies {
 	testImplementation("com.fasterxml.woodstox:woodstox-core")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation("io.projectreactor.tools:blockhound")
 	testFixturesImplementation("io.projectreactor:reactor-test")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
@@ -91,8 +89,6 @@ jar {
 	from(zipTree(objenesisRepackJar.archivePath)) {
 		include "org/springframework/objenesis/**"
 	}
-
-	from configurations.coroutines
 }
 
 test {
diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
new file mode 100644
index 000000000000..e942ff48ee11
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -0,0 +1,98 @@
+/*
+ * 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.core;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import kotlin.Unit;
+import kotlin.jvm.JvmClassMappingKt;
+import kotlin.reflect.KClassifier;
+import kotlin.reflect.KFunction;
+import kotlin.reflect.full.KCallables;
+import kotlin.reflect.jvm.ReflectJvmMapping;
+import kotlinx.coroutines.BuildersKt;
+import kotlinx.coroutines.CoroutineStart;
+import kotlinx.coroutines.Deferred;
+import kotlinx.coroutines.Dispatchers;
+import kotlinx.coroutines.GlobalScope;
+import kotlinx.coroutines.flow.Flow;
+import kotlinx.coroutines.reactor.MonoKt;
+import kotlinx.coroutines.reactor.ReactorFlowKt;
+import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * Utilities for working with Kotlin Coroutines.
+ *
+ * @author Sebastien Deleuze
+ * @author Phillip Webb
+ * @since 5.2
+ */
+public final class CoroutinesUtils {
+
+	private CoroutinesUtils() {
+	}
+
+	/**
+	 * Convert a {@link Deferred} instance to a {@link Mono}.
+	 */
+	public static <T> Mono<T> deferredToMono(Deferred<T> source) {
+		return MonoKt.mono(Dispatchers.getUnconfined(),
+				(scope, continuation) -> source.await(continuation));
+	}
+
+	/**
+	 * Convert a {@link Mono} instance to a {@link Deferred}.
+	 */
+	public static <T> Deferred<T> monoToDeferred(Mono<T> source) {
+		return BuildersKt.async(GlobalScope.INSTANCE, Dispatchers.getUnconfined(),
+				CoroutineStart.DEFAULT,
+				(scope, continuation) -> MonoKt.awaitSingleOrNull(source, continuation));
+	}
+
+	/**
+	 * Invoke a suspending function and converts it to {@link Mono} or
+	 * {@link Flux}.
+	 */
+	public static Publisher<?> invokeSuspendingFunction(Method method, Object target, Object... args) {
+		KFunction<?> function = Objects.requireNonNull(ReflectJvmMapping.getKotlinFunction(method));
+		KClassifier classifier = function.getReturnType().getClassifier();
+		Mono<Object> mono = MonoKt.mono(Dispatchers.getUnconfined(), (scope, continuation) ->
+					KCallables.callSuspend(function, getSuspendedFunctionArgs(target, args), continuation))
+				.filter(result -> !Objects.equals(result, Unit.INSTANCE))
+				.onErrorMap(InvocationTargetException.class, InvocationTargetException::getTargetException);
+		if (classifier.equals(JvmClassMappingKt.getKotlinClass(Flow.class))) {
+			return mono.flatMapMany(CoroutinesUtils::asFlux);
+		}
+		return mono;
+	}
+
+	private static Object[] getSuspendedFunctionArgs(Object target, Object... args) {
+		Object[] functionArgs = new Object[args.length];
+		functionArgs[0] = target;
+		System.arraycopy(args, 0, functionArgs, 1, args.length - 1);
+		return functionArgs;
+	}
+
+	private static Flux<?> asFlux(Object flow) {
+		return ReactorFlowKt.asFlux(((Flow<?>) flow));
+	}
+
+}
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index eed544b526b3..c0c7270ebde2 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -6,7 +6,6 @@ apply plugin: "kotlinx-serialization"
 dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
-	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
 	optional("io.projectreactor.netty:reactor-netty-http")
@@ -19,7 +18,6 @@ dependencies {
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("javax.inject:javax.inject-tck")
 	testImplementation("javax.servlet:javax.servlet-api")
diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle
index 5c60dd7d3ad6..dfb6b1ece9d6 100644
--- a/spring-r2dbc/spring-r2dbc.gradle
+++ b/spring-r2dbc/spring-r2dbc.gradle
@@ -8,12 +8,10 @@ dependencies {
 	api(project(":spring-tx"))
 	api("io.r2dbc:r2dbc-spi")
 	api("io.projectreactor:reactor-core")
-	compileOnly(project(":kotlin-coroutines"))
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-context")))
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
index c9447732bc59..f3ec8c3f3ac3 100644
--- a/spring-tx/spring-tx.gradle
+++ b/spring-tx/spring-tx.gradle
@@ -7,7 +7,6 @@ dependencies {
 	api(project(":spring-core"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
-	optional(project(":kotlin-coroutines"))
 	optional("javax.ejb:javax.ejb-api")
 	optional("javax.interceptor:javax.interceptor-api")
 	optional("javax.resource:javax.resource-api")
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index f774f0afb8a9..716ecb4cecf3 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -6,7 +6,6 @@ apply plugin: "kotlinx-serialization"
 dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
-	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index 7e9e49c69fde..b762e09c5cb6 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -7,7 +7,6 @@ dependencies {
 	api(project(":spring-core"))
 	api(project(":spring-web"))
 	api("io.projectreactor:reactor-core")
-	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-context-support"))  // for FreeMarker support
 	optional("javax.servlet:javax.servlet-api")
@@ -27,7 +26,6 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-web")))
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index 36ad9f649ef3..99e70f68f622 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -37,7 +37,6 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-context")))

From 0a776a76d114c95361105a9b7917874815bf3a2e Mon Sep 17 00:00:00 2001
From: yokotaso <tomoya-yokota@cybozu.co.jp>
Date: Thu, 9 Sep 2021 13:58:05 +0900
Subject: [PATCH 072/735] Fix memory leak on AOP Proxy class definition cache

---
 .../org/springframework/aop/framework/AdvisedSupport.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
index 5664cf7ffd55..b2b8060b8a6a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -521,8 +521,8 @@ AdvisedSupport getConfigurationOnlyCopy() {
 		copy.copyFrom(this);
 		copy.targetSource = EmptyTargetSource.forClass(getTargetClass(), getTargetSource().isStatic());
 		copy.advisorChainFactory = this.advisorChainFactory;
-		copy.interfaces = this.interfaces;
-		copy.advisors = this.advisors;
+		copy.interfaces = new ArrayList<>(this.interfaces);
+		copy.advisors = new ArrayList<>(this.advisors);
 		return copy;
 	}
 

From 6c17e9375b0d277ea28cb7220b4a162cc9ec0436 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 13 Sep 2021 18:13:41 +0200
Subject: [PATCH 073/735] Reduce log statement for non-unique JavaBean property
 to debug level

Closes gh-27372
---
 .../beans/GenericTypeAwarePropertyDescriptor.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
index 603f5aae150e..b4052b7b84e9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@ public Method getWriteMethodForActualAccess() {
 		Set<Method> ambiguousCandidates = this.ambiguousWriteMethods;
 		if (ambiguousCandidates != null) {
 			this.ambiguousWriteMethods = null;
-			LogFactory.getLog(GenericTypeAwarePropertyDescriptor.class).warn("Invalid JavaBean property '" +
+			LogFactory.getLog(GenericTypeAwarePropertyDescriptor.class).debug("Non-unique JavaBean property '" +
 					getName() + "' being accessed! Ambiguous write methods found next to actually used [" +
 					this.writeMethod + "]: " + ambiguousCandidates);
 		}

From 6540e87ac0660f5ec0bc9610656fe658ea75159f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 13 Sep 2021 18:14:05 +0200
Subject: [PATCH 074/735] Upgrade to Netty 4.1.68, Jackson 2.12.5, Mockito
 3.12.4, MockK 1.12, JsonPath 2.6

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index f5419026e941..881ed62e7ea2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ configure(allprojects) { project ->
 
 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.4"
-			mavenBom "io.netty:netty-bom:4.1.67.Final"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
+			mavenBom "io.netty:netty-bom:4.1.68.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.10"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
@@ -197,13 +197,13 @@ configure(allprojects) { project ->
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '3.11.0') {
+			dependencySet(group: 'org.mockito', version: '3.12.4') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 				entry 'mockito-junit-jupiter'
 			}
-			dependency "io.mockk:mockk:1.11.0"
+			dependency "io.mockk:mockk:1.12.0"
 
 			dependency("net.sourceforge.htmlunit:htmlunit:2.52.0") {
 				exclude group: "commons-logging", name: "commons-logging"
@@ -216,7 +216,7 @@ configure(allprojects) { project ->
 				exclude group: "io.netty", name: "netty"
 			}
 			dependency "org.skyscreamer:jsonassert:1.5.0"
-			dependency "com.jayway.jsonpath:json-path:2.5.0"
+			dependency "com.jayway.jsonpath:json-path:2.6.0"
 			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
 
 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {

From 18ee308e4e3c59117f4bd41da16e837f88db0933 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 10:58:38 +0200
Subject: [PATCH 075/735] Delete obsolete Assume test utility

---
 .../core/testfixture/Assume.java              | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java

diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java
deleted file mode 100644
index 83c3dd8d9e90..000000000000
--- a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- * 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.core.testfixture;
-
-import org.apache.commons.logging.Log;
-
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-
-/**
- * Utility methods that allow JUnit tests to assume certain conditions hold
- * {@code true}. If an assumption fails, it means the test should be aborted.
- *
- * @author Rob Winch
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 3.2
- * @see #notLogging(Log)
- * @see EnabledForTestGroups @EnabledForTestGroups
- */
-public abstract class Assume {
-
-	/**
-	 * Assume that the specified log is not set to Trace or Debug.
-	 * @param log the log to test
-	 * @throws org.opentest4j.TestAbortedException if the assumption fails
-	 */
-	public static void notLogging(Log log) {
-		assumeFalse(log.isTraceEnabled());
-		assumeFalse(log.isDebugEnabled());
-	}
-
-}

From 8c14251a1a9b0d0f5a2c4fbdcd1d1703fb07cea3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 11:24:28 +0200
Subject: [PATCH 076/735] Upgrade to nohttp 0.0.10

This upgrade avoids warnings about the following on Gradle 7.1+.

- The Report.destination property has been deprecated.
- The JavaExec.main property has been deprecated.

See gh-26870
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 881ed62e7ea2..c7fb7843f22f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
-	id 'io.spring.nohttp' version '0.0.5.RELEASE'
+	id 'io.spring.nohttp' version '0.0.10'
 	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'

From b1a4d3033be769073d3b4408ececf2cef63164d9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 11:35:12 +0200
Subject: [PATCH 077/735] Avoid usage of deprecated Gradle API in
 spring-oxm.gradle

This upgrade avoids the warning about the following on Gradle 7.1+.

- The SourceDirectorySet.outputDir property has been deprecated.

Closes gh-26870
---
 spring-oxm/spring-oxm.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index a78b41049e0c..f47726a8bd5b 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -16,6 +16,7 @@ dependencies {
 xjc {
 	xjcVersion = '2.2'
 }
+
 sourceSets {
 	test {
 		xjcTargetPackage = 'org.springframework.oxm.jaxb.test'
@@ -55,7 +56,7 @@ if ((JavaVersion.current() == JavaVersion.VERSION_1_8) && !project.hasProperty("
 						classpath: configurations.jibx.asPath)
 
 				jibx(verbose: false, load: true, binding: bindingXml) {
-					classpathset(dir: sourceSets.test.java.outputDir) {
+					classpathset(dir: sourceSets.test.java.classesDirectory.get().getAsFile()) {
 						include(name: "**/jibx/**/*")
 					}
 				}

From 8adf28763bd01bec4647ce70f9111481141cf5f1 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 14 Sep 2021 14:24:47 +0200
Subject: [PATCH 078/735] Upgrade to Reactor 2020.0.11

Closes gh-27399
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c7fb7843f22f..8a3207ccc859 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.68.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.10"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.11"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"

From 674dc2f2039fb6186b35ab674c3046ecd5809bb3 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 14 Sep 2021 13:40:26 +0100
Subject: [PATCH 079/735] Do not log request parameters for multipart requests

Closes gh-27350
---
 .../org/springframework/web/servlet/DispatcherServlet.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 19cb32564ce7..5be28f3e13e0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -978,7 +978,10 @@ protected void doService(HttpServletRequest request, HttpServletResponse respons
 	private void logRequest(HttpServletRequest request) {
 		LogFormatUtils.traceDebug(logger, traceOn -> {
 			String params;
-			if (isEnableLoggingRequestDetails()) {
+			if (StringUtils.startsWithIgnoreCase(request.getContentType(), "multipart/")) {
+				params = "multipart";
+			}
+			else if (isEnableLoggingRequestDetails()) {
 				params = request.getParameterMap().entrySet().stream()
 						.map(entry -> entry.getKey() + ":" + Arrays.toString(entry.getValue()))
 						.collect(Collectors.joining(", "));

From c46cc666d6bd5b26860964d8bceddb528d7897b2 Mon Sep 17 00:00:00 2001
From: Dmitriy Bogdanov <d@di72nn.com>
Date: Fri, 10 Sep 2021 17:38:42 +0400
Subject: [PATCH 080/735] Fix some typos and mistakes in ref docs

Closes gh-27388
---
 src/docs/asciidoc/core/core-aop.adoc          |  4 +-
 src/docs/asciidoc/core/core-beans.adoc        | 99 ++++++++++---------
 .../asciidoc/core/core-databuffer-codec.adoc  |  6 +-
 src/docs/asciidoc/core/core-expressions.adoc  |  4 +-
 src/docs/asciidoc/core/core-validation.adoc   |  9 +-
 src/docs/asciidoc/data-access.adoc            | 43 ++++----
 src/docs/asciidoc/integration.adoc            | 27 ++---
 src/docs/asciidoc/overview.adoc               |  2 +-
 src/docs/asciidoc/testing.adoc                |  1 +
 src/docs/asciidoc/web/integration.adoc        |  6 +-
 src/docs/asciidoc/web/web-uris.adoc           |  6 +-
 src/docs/asciidoc/web/webflux-view.adoc       |  2 +-
 src/docs/asciidoc/web/webmvc-cors.adoc        |  2 +-
 src/docs/asciidoc/web/webmvc-functional.adoc  |  4 +-
 src/docs/asciidoc/web/webmvc-view.adoc        |  4 +-
 src/docs/asciidoc/web/webmvc.adoc             | 38 +++----
 src/docs/asciidoc/web/websocket.adoc          |  6 +-
 17 files changed, 134 insertions(+), 129 deletions(-)

diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc
index a6412096e492..6479f329b5d9 100644
--- a/src/docs/asciidoc/core/core-aop.adoc
+++ b/src/docs/asciidoc/core/core-aop.adoc
@@ -366,7 +366,7 @@ the https://www.eclipse.org/aspectj/doc/released/progguide/index.html[AspectJ
 Programming Guide] (and, for extensions, the
 https://www.eclipse.org/aspectj/doc/released/adk15notebook/index.html[AspectJ 5
 Developer's Notebook]) or one of the books on AspectJ (such as _Eclipse AspectJ_, by Colyer
-et. al., or _AspectJ in Action_, by Ramnivas Laddad).
+et al., or _AspectJ in Action_, by Ramnivas Laddad).
 
 
 [[aop-pointcuts-designators]]
@@ -893,7 +893,7 @@ scoping). You can include the contextual designators to match based on
 join point context or bind that context for use in the advice. Supplying only a
 kinded designator or only a contextual designator works but could affect weaving
 performance (time and memory used), due to extra processing and analysis. Scoping
-designators are very fast to match, and using them usage means AspectJ can very quickly
+designators are very fast to match, and using them means AspectJ can very quickly
 dismiss groups of join points that should not be further processed. A good
 pointcut should always include one if possible.
 
diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 2a8c526d2617..5ba741761f28 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -1024,7 +1024,7 @@ by type without help. Consider the following class:
 
 	class ExampleBean(
 		private val years: Int, // Number of years to calculate the Ultimate Answer
-		private val ultimateAnswer: String// The Answer to Life, the Universe, and Everything
+		private val ultimateAnswer: String // The Answer to Life, the Universe, and Everything
 	)
 ----
 
@@ -1608,7 +1608,7 @@ listings shows how to use the `parent` attribute:
 ----
 	<!-- in the parent context -->
 	<bean id="accountService" class="com.something.SimpleAccountService">
-		<!-- insert dependencies as required as here -->
+		<!-- insert dependencies as required here -->
 	</bean>
 ----
 
@@ -1690,7 +1690,7 @@ respectively. The following example shows how to use them:
 		<property name="someMap">
 			<map>
 				<entry key="an entry" value="just some string"/>
-				<entry key ="a ref" value-ref="myDataSource"/>
+				<entry key="a ref" value-ref="myDataSource"/>
 			</map>
 		</property>
 		<!-- results in a setSomeSet(java.util.Set) call -->
@@ -1834,7 +1834,7 @@ class SomeClass {
 When the `accounts` property of the `something` bean is prepared for injection, the generics
 information about the element type of the strongly-typed `Map<String, Float>` is
 available by reflection. Thus, Spring's type conversion infrastructure recognizes the
-various value elements as being of type `Float`, and the string values (`9.99, 2.75`, and
+various value elements as being of type `Float`, and the string values (`9.99`, `2.75`, and
 `3.99`) are converted into an actual `Float` type.
 
 
@@ -2028,7 +2028,7 @@ not commonly used since the plain order of declaration is usually sufficient the
 In practice, the constructor resolution
 <<beans-factory-ctor-arguments-resolution,mechanism>> is quite efficient in matching
 arguments, so unless you really need to, we recommend using the name notation
-through-out your configuration.
+throughout your configuration.
 
 
 [[beans-compound-property-names]]
@@ -2503,13 +2503,13 @@ declared return type of the lookup method:
 	public abstract class CommandManager {
 
 		public Object process(Object commandState) {
-			MyCommand command = createCommand();
+			Command command = createCommand();
 			command.setState(commandState);
 			return command.execute();
 		}
 
 		@Lookup
-		protected abstract MyCommand createCommand();
+		protected abstract Command createCommand();
 	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
@@ -2604,9 +2604,9 @@ interface provides the new method definition, as the following example shows:
 .Kotlin
 ----
 	/**
-	* meant to be used to override the existing computeValue(String)
-	* implementation in MyValueCalculator
-	*/
+	 * meant to be used to override the existing computeValue(String)
+	 * implementation in MyValueCalculator
+	 */
 	class ReplacementComputeValue : MethodReplacer {
 
 		override fun reimplement(obj: Any, method: Method, args: Array<out Any>): Any {
@@ -2806,7 +2806,7 @@ prototype-scoped bean repeatedly at runtime. You cannot dependency-inject a
 prototype-scoped bean into your singleton bean, because that injection occurs only
 once, when the Spring container instantiates the singleton bean and resolves
 and injects its dependencies. If you need a new instance of a prototype bean at
-runtime more than once, see <<beans-factory-method-injection>>
+runtime more than once, see <<beans-factory-method-injection>>.
 
 
 
@@ -2984,7 +2984,7 @@ The Spring container creates a new instance of the `AppPreferences` bean by usin
 `appPreferences` bean is scoped at the `ServletContext` level and stored as a regular
 `ServletContext` attribute. This is somewhat similar to a Spring singleton bean but
 differs in two important ways: It is a singleton per `ServletContext`, not per Spring
-'ApplicationContext' (for which there may be several in any given web application),
+`ApplicationContext` (for which there may be several in any given web application),
 and it is actually exposed and therefore visible as a `ServletContext` attribute.
 
 When using annotation-driven components or Java configuration, you can use the
@@ -3100,7 +3100,7 @@ to the HTTP `Session`-scoped bean (`userPreferences`). The salient point here is
 `userManager` bean is a singleton: it is instantiated exactly once per
 container, and its dependencies (in this case only one, the `userPreferences` bean) are
 also injected only once. This means that the `userManager` bean operates only on the
-exact same `userPreferences` object (that is, the one with which it was originally injected.
+exact same `userPreferences` object (that is, the one with which it was originally injected).
 
 This is not the behavior you want when injecting a shorter-lived scoped bean into a
 longer-lived scoped bean (for example, injecting an HTTP `Session`-scoped collaborating
@@ -3928,7 +3928,7 @@ shows the definition of the BeanNameAware interface:
 ----
 
 The callback is invoked after population of normal bean properties but before an
-initialization callback such as `InitializingBean`, `afterPropertiesSet`, or a custom
+initialization callback such as `InitializingBean.afterPropertiesSet()` or a custom
 init-method.
 
 
@@ -3960,7 +3960,7 @@ dependency type. The following table summarizes the most important `Aware` inter
 
 | `BeanFactoryAware`
 | Declaring `BeanFactory`.
-| <<beans-factory-aware>>
+| <<beans-beanfactory>>
 
 | `BeanNameAware`
 | Name of the declaring bean.
@@ -4142,7 +4142,7 @@ or it may wrap a bean with a proxy. Some Spring AOP infrastructure classes are
 implemented as bean post-processors in order to provide proxy-wrapping logic.
 
 An `ApplicationContext` automatically detects any beans that are defined in the
-configuration metadata that implements the `BeanPostProcessor` interface. The
+configuration metadata that implement the `BeanPostProcessor` interface. The
 `ApplicationContext` registers these beans as post-processors so that they can be called
 later, upon bean creation. Bean post-processors can be deployed in the container in the
 same fashion as any other beans.
@@ -4673,11 +4673,11 @@ example:
 ----
 	class SimpleMovieLister {
 
-	@Required
-	lateinit var movieFinder: MovieFinder
+		@Required
+		lateinit var movieFinder: MovieFinder
 
-	// ...
-}
+		// ...
+	}
 ----
 
 This annotation indicates that the affected bean property must be populated at
@@ -5373,7 +5373,7 @@ Letting qualifier values select against target bean names, within the type-match
 candidates, does not require a `@Qualifier` annotation at the injection point.
 If there is no other resolution indicator (such as a qualifier or a primary marker),
 for a non-unique dependency situation, Spring matches the injection point name
-(that is, the field name or parameter name) against the target bean names and choose the
+(that is, the field name or parameter name) against the target bean names and chooses the
 same-named candidate, if any.
 ====
 
@@ -6042,14 +6042,14 @@ example shows:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-    @Configuration
-    public class AppConfig {
+	@Configuration
+	public class AppConfig {
 
-         @Bean
-         public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
-               return new PropertySourcesPlaceholderConfigurer();
-         }
-    }
+		@Bean
+		public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+			return new PropertySourcesPlaceholderConfigurer();
+		}
+	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
@@ -6075,7 +6075,7 @@ will get properties from `application.properties` and `application.yml` files.
 
 Built-in converter support provided by Spring allows simple type conversion (to `Integer`
 or `int` for example) to be automatically handled. Multiple comma-separated values can be
-automatically converted to String array without extra effort.
+automatically converted to `String` array without extra effort.
 
 It is possible to provide a default value as following:
 
@@ -6099,8 +6099,8 @@ It is possible to provide a default value as following:
 	class MovieRecommender(@Value("\${catalog.name:defaultCatalog}") private val catalog: String)
 ----
 
-A Spring `BeanPostProcessor` uses a `ConversionService` behind the scene to handle the
-process for converting the String value in `@Value` to the target type. If you want to
+A Spring `BeanPostProcessor` uses a `ConversionService` behind the scenes to handle the
+process for converting the `String` value in `@Value` to the target type. If you want to
 provide conversion support for your own custom type, you can provide your own
 `ConversionService` bean instance as the following example shows:
 
@@ -6126,7 +6126,7 @@ provide conversion support for your own custom type, you can provide your own
 
 		@Bean
 		fun conversionService(): ConversionService {
-				return DefaultFormattingConversionService().apply {
+			return DefaultFormattingConversionService().apply {
 				addConverter(MyCustomConverter())
 			}
 		}
@@ -6315,7 +6315,7 @@ is meta-annotated with `@Component`, as the following example shows:
 		// ...
 	}
 ----
-<1> The `Component` causes `@Service` to be treated in the same way as `@Component`.
+<1> The `@Component` causes `@Service` to be treated in the same way as `@Component`.
 
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
@@ -6329,7 +6329,7 @@ is meta-annotated with `@Component`, as the following example shows:
 		// ...
 	}
 ----
-<1> The `Component` causes `@Service` to be treated in the same way as `@Component`.
+<1> The `@Component` causes `@Service` to be treated in the same way as `@Component`.
 
 You can also combine meta-annotations to create "`composed annotations`". For example,
 the `@RestController` annotation from Spring MVC is composed of `@Controller` and
@@ -6591,7 +6591,7 @@ and using "`stub`" repositories instead:
 			includeFilters = @Filter(type = FilterType.REGEX, pattern = ".*Stub.*Repository"),
 			excludeFilters = @Filter(Repository.class))
 	public class AppConfig {
-		...
+		// ...
 	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
@@ -7157,7 +7157,7 @@ configuration, as shown in the following example:
 With Gradle 4.6 and later, the dependency should be declared in the `annotationProcessor`
 configuration, as shown in the following example:
 
-[source,groovy,indent=0subs="verbatim,quotes,attributes"]
+[source,groovy,indent=0,subs="verbatim,quotes,attributes"]
 ----
 	dependencies {
 		annotationProcessor "org.springframework:spring-context-indexer:{spring-version}"
@@ -7631,7 +7631,7 @@ to reduce subtle bugs that can be hard to track down when operating in "`lite`"
 ****
 
 The `@Bean` and `@Configuration` annotations are discussed in depth in the following sections.
-First, however, we cover the various ways of creating a spring container using by
+First, however, we cover the various ways of creating a spring container by using
 Java-based configuration.
 
 
@@ -7758,7 +7758,7 @@ To enable component scanning, you can annotate your `@Configuration` class as fo
 	@Configuration
 	@ComponentScan(basePackages = "com.acme") // <1>
 	public class AppConfig  {
-		...
+		// ...
 	}
 ----
 <1> This annotation enables component scanning.
@@ -7892,6 +7892,7 @@ init-param):
 
 `@Bean` is a method-level annotation and a direct analog of the XML `<bean/>` element.
 The annotation supports some of the attributes offered by `<bean/>`, such as:
+
 * <<beans-factory-lifecycle-initializingbean, init-method>>
 * <<beans-factory-lifecycle-disposablebean, destroy-method>>
 * <<beans-factory-autowire,autowiring>>
@@ -7980,7 +7981,7 @@ return type, as the following example shows:
 
 However, this limits the visibility for advance type prediction to the specified
 interface type (`TransferService`). Then, with the full type (`TransferServiceImpl`)
-known to the container only once, the affected singleton bean has been instantiated.
+known to the container only once the affected singleton bean has been instantiated.
 Non-lazy singleton beans get instantiated according to their declaration order,
 so you may see different type matching results depending on when another component
 tries to match by a non-declared type (such as `@Autowired TransferServiceImpl`,
@@ -8295,7 +8296,7 @@ as the following example shows:
 	@Configuration
 	public class AppConfig {
 
-		@Bean(name = "myThing")
+		@Bean("myThing")
 		public Thing thing() {
 			return new Thing();
 		}
@@ -8388,7 +8389,7 @@ annotation, as the following example shows:
 === Using the `@Configuration` annotation
 
 `@Configuration` is a class-level annotation indicating that an object is a source of
-bean definitions. `@Configuration` classes declare beans through `@Bean` annotated
+bean definitions. `@Configuration` classes declare beans through `@Bean`-annotated
 methods. Calls to `@Bean` methods on `@Configuration` classes can also be used to define
 inter-bean dependencies. See <<beans-java-basic-concepts>> for a general introduction.
 
@@ -9137,7 +9138,7 @@ method that returns `true` or `false`. For example, the following listing shows
 		val attrs = metadata.getAllAnnotationAttributes(Profile::class.java.name)
 		if (attrs != null) {
 			for (value in attrs["value"]!!) {
-				if (context.environment.acceptsProfiles(Profiles .of(*value as Array<String>))) {
+				if (context.environment.acceptsProfiles(Profiles.of(*value as Array<String>))) {
 					return true
 				}
 			}
@@ -9901,7 +9902,7 @@ as a way to provide a default definition for one or more beans. If any
 profile is enabled, the default profile does not apply.
 
 You can change the name of the default profile by using `setDefaultProfiles()` on
-the `Environment` or ,declaratively, by using the `spring.profiles.default` property.
+the `Environment` or, declaratively, by using the `spring.profiles.default` property.
 
 
 
@@ -10720,7 +10721,7 @@ following example shows how to do so:
 ----
 
 It is also possible to add additional runtime filtering by using the `condition` attribute
-of the annotation that defines a <<expressions, `SpEL` expression>> , which should match
+of the annotation that defines a <<expressions, `SpEL` expression>>, which should match
 to actually invoke the method for a particular event.
 
 The following example shows how our notifier can be rewritten to be invoked only if the
@@ -10832,10 +10833,12 @@ The following example shows how to do so:
 Be aware of the following limitations when using asynchronous events:
 
 * If an asynchronous event listener throws an `Exception`, it is not propagated to the
-  caller. See `AsyncUncaughtExceptionHandler` for more details.
+  caller. See
+  {api-spring-framework}/aop/interceptor/AsyncUncaughtExceptionHandler.html[`AsyncUncaughtExceptionHandler`]
+  for more details.
 * Asynchronous event listener methods cannot publish a subsequent event by returning a
   value. If you need to publish another event as the result of the processing, inject an
-  {api-spring-framework}/aop/interceptor/AsyncUncaughtExceptionHandler.html[`ApplicationEventPublisher`]
+  {api-spring-framework}/context/ApplicationEventPublisher.html[`ApplicationEventPublisher`]
   to publish the event manually.
 
 
@@ -11093,8 +11096,8 @@ For a simple deployment of a Spring ApplicationContext as a Java EE RAR file:
 . Package
 all application classes into a RAR file (which is a standard JAR file with a different
 file extension).
-.Add all required library JARs into the root of the RAR archive.
-.Add a
+. Add all required library JARs into the root of the RAR archive.
+. Add a
 `META-INF/ra.xml` deployment descriptor (as shown in the {api-spring-framework}/jca/context/SpringContextResourceAdapter.html[javadoc for `SpringContextResourceAdapter`])
 and the corresponding Spring XML bean definition file(s) (typically
 `META-INF/applicationContext.xml`).
diff --git a/src/docs/asciidoc/core/core-databuffer-codec.adoc b/src/docs/asciidoc/core/core-databuffer-codec.adoc
index ca5065144961..7abf40a0cdaa 100644
--- a/src/docs/asciidoc/core/core-databuffer-codec.adoc
+++ b/src/docs/asciidoc/core/core-databuffer-codec.adoc
@@ -12,7 +12,7 @@ APIs as follows:
 * <<databuffers-buffer>> represents a byte buffer, which may be
 <<databuffers-buffer-pooled, pooled>>.
 * <<databuffers-utils>> offers utility methods for data buffers.
-* <<Codecs>> decode or encode streams data buffer streams into higher level objects.
+* <<Codecs>> decode or encode data buffer streams into higher level objects.
 
 
 
@@ -127,9 +127,9 @@ others that prefetch and cache data items internally, or is using operators such
 `filter`, `skip`, and others that leave out items, then
 `doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release)` must be added to the
 composition chain to ensure such buffers are released prior to being discarded, possibly
-also as a result an error or cancellation signal.
+also as a result of an error or cancellation signal.
 . If a `Decoder` holds on to one or more data buffers in any other way, it must
-ensure they are released when fully read, or in case an error or cancellation signals that
+ensure they are released when fully read, or in case of an error or cancellation signals that
 take place before the cached data buffers have been read and released.
 
 Note that `DataBufferUtils#join` offers a safe and efficient way to aggregate a data
diff --git a/src/docs/asciidoc/core/core-expressions.adoc b/src/docs/asciidoc/core/core-expressions.adoc
index c0cd157e2fb2..074523d392d1 100644
--- a/src/docs/asciidoc/core/core-expressions.adoc
+++ b/src/docs/asciidoc/core/core-expressions.adoc
@@ -357,7 +357,7 @@ the list:
 	// Turn on:
 	// - auto null reference initialization
 	// - auto collection growing
-	SpelParserConfiguration config = new SpelParserConfiguration(true,true);
+	SpelParserConfiguration config = new SpelParserConfiguration(true, true);
 
 	ExpressionParser parser = new SpelExpressionParser(config);
 
@@ -465,7 +465,7 @@ following example shows how to do so:
 .Java
 ----
 	SpelParserConfiguration config = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE,
-		this.getClass().getClassLoader());
+			this.getClass().getClassLoader());
 
 	SpelExpressionParser parser = new SpelExpressionParser(config);
 
diff --git a/src/docs/asciidoc/core/core-validation.adoc b/src/docs/asciidoc/core/core-validation.adoc
index 5d80f2a0820a..cded5e664ee0 100644
--- a/src/docs/asciidoc/core/core-validation.adoc
+++ b/src/docs/asciidoc/core/core-validation.adoc
@@ -382,7 +382,7 @@ properties:
 ----
 
 The following code snippets show some examples of how to retrieve and manipulate some of
-the properties of instantiated `Companies` and `Employees`:
+the properties of instantiated ``Company``s and ``Employee``s:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -629,7 +629,7 @@ Note that all bean factories and application contexts automatically use a number
 built-in property editors, through their use of a `BeanWrapper` to
 handle property conversions. The standard property editors that the `BeanWrapper`
 registers are listed in the <<beans-beans-conversion, previous section>>.
-Additionally, `ApplicationContexts` also override or add additional editors to handle
+Additionally, ``ApplicationContext``s also override or add additional editors to handle
 resource lookups in a manner appropriate to the specific application context type.
 
 Standard JavaBeans `PropertyEditor` instances are used to convert property values
@@ -790,7 +790,7 @@ The following example shows how to create your own `PropertyEditorRegistrar` imp
 
 See also the `org.springframework.beans.support.ResourceEditorRegistrar` for an example
 `PropertyEditorRegistrar` implementation. Notice how in its implementation of the
-`registerCustomEditors(..)` method ,it creates new instances of each property editor.
+`registerCustomEditors(..)` method, it creates new instances of each property editor.
 
 The next example shows how to configure a `CustomEditorConfigurer` and inject an instance of our
 `CustomPropertyEditorRegistrar` into it:
@@ -1347,6 +1347,7 @@ listing shows the definition of the `AnnotationFormatterFactory` interface:
 ----
 
 To create an implementation:
+
 . Parameterize A to be the field `annotationType` with which you wish to associate
 formatting  logic -- for example `org.springframework.format.annotation.DateTimeFormat`.
 . Have `getFieldTypes()` return the types of fields on which the annotation can be used.
@@ -1470,7 +1471,7 @@ The following example uses `@DateTimeFormat` to format a `java.util.Date` as an
 .Kotlin
 ----
 	class MyModel(
-		@DateTimeFormat(iso= ISO.DATE) private val date: Date
+		@DateTimeFormat(iso=ISO.DATE) private val date: Date
 	)
 ----
 
diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index 61c8b6330c6f..388e4bbf5cd8 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -445,7 +445,7 @@ relevant `TransactionManager`.
 [[tx-resource-synchronization-high]]
 ==== High-level Synchronization Approach
 
-The preferred approach is to use Spring's highest-level template based persistence
+The preferred approach is to use Spring's highest-level template-based persistence
 integration APIs or to use native ORM APIs with transaction-aware factory beans or
 proxies for managing the native resource factories. These transaction-aware solutions
 internally handle resource creation and reuse, cleanup, optional transaction
@@ -1878,7 +1878,7 @@ rollback rules, timeouts, and other features.
 ==== Transaction Propagation
 
 This section describes some semantics of transaction propagation in Spring. Note
-that this section is not an introduction to transaction propagation proper. Rather, it
+that this section is not a proper introduction to transaction propagation. Rather, it
 details some of the semantics regarding transaction propagation in Spring.
 
 In Spring-managed transactions, be aware of the difference between physical and
@@ -2121,7 +2121,7 @@ declarative approach:
 
 		<aop:config>
 			<aop:pointcut id="entryPointMethod" expression="execution(* x.y..*Service.*(..))"/>
-			<!-- runs after the profiling advice (c.f. the order attribute) -->
+			<!-- runs after the profiling advice (cf. the order attribute) -->
 
 			<aop:advisor advice-ref="txAdvice" pointcut-ref="entryPointMethod" order="2"/>
 			<!-- order value is higher than the profiling aspect -->
@@ -2164,7 +2164,7 @@ container by means of an AspectJ aspect. To do so, first annotate your classes
 (and optionally your classes' methods) with the `@Transactional` annotation,
 and then link (weave) your application with the
 `org.springframework.transaction.aspectj.AnnotationTransactionAspect` defined in the
-`spring-aspects.jar` file. You must also configure The aspect with a transaction
+`spring-aspects.jar` file. You must also configure the aspect with a transaction
 manager. You can use the Spring Framework's IoC container to take care of
 dependency-injecting the aspect. The simplest way to configure the transaction
 management aspect is to use the `<tx:annotation-driven/>` element and specify the `mode`
@@ -2585,8 +2585,7 @@ following example shows how to do so:
 	TransactionStatus status = txManager.getTransaction(def);
 	try {
 		// put your business logic here
-	}
-	catch (MyException ex) {
+	} catch (MyException ex) {
 		txManager.rollback(status);
 		throw ex;
 	}
@@ -3295,7 +3294,7 @@ For example, it may be better to write the preceding code snippet as follows:
 	};
 
 	public List<Actor> findAllActors() {
-		return this.jdbcTemplate.query( "select first_name, last_name from t_actor", actorRowMapper);
+		return this.jdbcTemplate.query("select first_name, last_name from t_actor", actorRowMapper);
 	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
@@ -3605,7 +3604,7 @@ variable and the corresponding value that is plugged into the `namedParameters`
 variable (of type `MapSqlParameterSource`).
 
 Alternatively, you can pass along named parameters and their corresponding values to a
-`NamedParameterJdbcTemplate` instance by using the `Map`-based style.The remaining
+`NamedParameterJdbcTemplate` instance by using the `Map`-based style. The remaining
 methods exposed by the `NamedParameterJdbcOperations` and implemented by the
 `NamedParameterJdbcTemplate` class follow a similar pattern and are not covered here.
 
@@ -3743,7 +3742,7 @@ See also <<jdbc-JdbcTemplate-idioms>> for guidelines on using the
 ==== Using `SQLExceptionTranslator`
 
 `SQLExceptionTranslator` is an interface to be implemented by classes that can translate
-between `SQLExceptions` and Spring's own `org.springframework.dao.DataAccessException`,
+between ``SQLException``s and Spring's own `org.springframework.dao.DataAccessException`,
 which is agnostic in regard to data access strategy. Implementations can be generic (for
 example, using SQLState codes for JDBC) or proprietary (for example, using Oracle error
 codes) for greater precision.
@@ -3799,9 +3798,9 @@ You can extend `SQLErrorCodeSQLExceptionTranslator`, as the following example sh
 
 		override fun customTranslate(task: String, sql: String?, sqlEx: SQLException): DataAccessException? {
 			if (sqlEx.errorCode == -12345) {
-					return DeadlockLoserDataAccessException(task, sqlEx)
-				}
-				return null;
+				return DeadlockLoserDataAccessException(task, sqlEx)
+			}
+			return null
 		}
 	}
 ----
@@ -4034,7 +4033,7 @@ The following example updates a column for a certain primary key:
 
 In the preceding example,
 an SQL statement has placeholders for row parameters. You can pass the parameter values
-in as varargs or ,alternatively, as an array of objects. Thus, you should explicitly wrap primitives
+in as varargs or, alternatively, as an array of objects. Thus, you should explicitly wrap primitives
 in the primitive wrapper classes, or you should use auto-boxing.
 
 
@@ -4577,7 +4576,7 @@ The following example shows a batch update that uses a batch size of 100:
 	}
 ----
 
-The batch update methods for this call returns an array of `int` arrays that contains an
+The batch update method for this call returns an array of `int` arrays that contains an
 array entry for each batch with an array of the number of affected rows for each update.
 The top-level array's length indicates the number of batches run, and the second level
 array's length indicates the number of updates in that batch. The number of updates in
@@ -5173,11 +5172,9 @@ as the following example shows:
 ----
 	public class JdbcActorDao implements ActorDao {
 
-		private JdbcTemplate jdbcTemplate;
 		private SimpleJdbcCall funcGetActorName;
 
 		public void setDataSource(DataSource dataSource) {
-			this.jdbcTemplate = new JdbcTemplate(dataSource);
 			JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 			jdbcTemplate.setResultsMapCaseInsensitive(true);
 			this.funcGetActorName = new SimpleJdbcCall(jdbcTemplate)
@@ -5443,7 +5440,7 @@ example shows such a method:
 The `SqlUpdate` class encapsulates an SQL update. As with a query, an update object is
 reusable, and, as with all `RdbmsOperation` classes, an update can have parameters and is
 defined in SQL. This class provides a number of `update(..)` methods analogous to the
-`execute(..)` methods of query objects. The `SQLUpdate` class is concrete. It can be
+`execute(..)` methods of query objects. The `SqlUpdate` class is concrete. It can be
 subclassed -- for example, to add a custom update method.
 However, you do not have to subclass the `SqlUpdate`
 class, since it can easily be parameterized by setting SQL and declaring parameters.
@@ -6031,7 +6028,7 @@ limit is 1000.
 In addition to the primitive values in the value list, you can create a `java.util.List`
 of object arrays. This list can support multiple expressions being defined for the `in`
 clause, such as `select * from T_ACTOR where (id, last_name) in \((1, 'Johnson'), (2,
-'Harrop'\))`. This, of course, requires that your database supports this syntax.
+'Harrop'))`. This, of course, requires that your database supports this syntax.
 
 
 [[jdbc-complex-types]]
@@ -7093,7 +7090,7 @@ databases, you may want multiple `DatabaseClient` instances, which requires mult
 instances.
 
 [[r2dbc-auto-generated-keys]]
-== Retrieving Auto-generated Keys
+=== Retrieving Auto-generated Keys
 
 `INSERT` statements may generate keys when inserting rows into a table
 that defines an auto-increment or identity column. To get full control over
@@ -7387,7 +7384,9 @@ examples (one for Java configuration and one for XML configuration) show how to
 ----
 	@Repository
 	class ProductDaoImpl : ProductDao {
+
 		// class body here...
+
 	}
 ----
 
@@ -7427,7 +7426,7 @@ cover the other ORM technologies and show brief examples.
 
 NOTE: As of Spring Framework 5.3, Spring requires Hibernate ORM 5.2+ for Spring's
 `HibernateJpaVendorAdapter` as well as for a native Hibernate `SessionFactory` setup.
-Is is strongly recommended to go with Hibernate ORM 5.4 for a newly started application.
+It is strongly recommended to go with Hibernate ORM 5.4 for a newly started application.
 For use with `HibernateJpaVendorAdapter`, Hibernate Search needs to be upgraded to 5.11.6.
 
 
@@ -7958,7 +7957,7 @@ persistence unit name. The following XML example configures such a bean:
 This form of JPA deployment is the simplest and the most limited. You cannot refer to an
 existing JDBC `DataSource` bean definition, and no support for global transactions
 exists. Furthermore, weaving (byte-code transformation) of persistent classes is
-provider-specific, often requiring a specific JVM agent to specified on startup. This
+provider-specific, often requiring a specific JVM agent to be specified on startup. This
 option is sufficient only for stand-alone applications and test environments, for which
 the JPA specification is designed.
 
@@ -8093,7 +8092,7 @@ more insight regarding the `LoadTimeWeaver` implementations and their setup, eit
 generic or customized to various platforms (such as Tomcat, JBoss and WebSphere).
 
 As described in <<core.adoc#aop-aj-ltw-spring, Spring configuration>>, you can configure
-a context-wide `LoadTimeWeaver` by using the `@EnableLoadTimeWeaving` annotation of the
+a context-wide `LoadTimeWeaver` by using the `@EnableLoadTimeWeaving` annotation or the
 `context:load-time-weaver` XML element. Such a global weaver is automatically picked up
 by all JPA `LocalContainerEntityManagerFactoryBean` instances. The following example
 shows the preferred way of setting up a load-time weaver, delivering auto-detection
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index aa17752e28e5..883acc17867a 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -390,7 +390,7 @@ model and corresponding services:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	public class Account implements Serializable{
+	public class Account implements Serializable {
 
 		private String name;
 
@@ -445,7 +445,7 @@ section of the Spring AMQP reference.
 [[remoting-autodection-remote-interfaces]]
 [NOTE]
 ====
-Auto-detection is not implemented for remote interfaces
+Auto-detection is not implemented for remote interfaces.
 
 The main reason why auto-detection of implemented interfaces does not occur for remote
 interfaces is to avoid opening too many doors to remote callers. The target object might
@@ -514,7 +514,7 @@ Spring provides full support for the standard Java web services APIs:
 * Accessing web services using JAX-WS
 
 In addition to stock support for JAX-WS in Spring Core, the Spring portfolio also
-features http://www.springframework.org/spring-ws[Spring Web Services], which is a solution for
+features https://projects.spring.io/spring-ws[Spring Web Services], which is a solution for
 contract-first, document-driven web services -- highly recommended for building modern,
 future-proof web services.
 
@@ -711,7 +711,7 @@ as the following example shows:
 ----
 
 NOTE: The above is slightly simplified in that JAX-WS requires endpoint interfaces
-and implementation classes to be annotated with `@WebService`, `@SOAPBinding` etc
+and implementation classes to be annotated with `@WebService`, `@SOAPBinding`, etc.
 annotations. This means that you cannot (easily) use plain Java interfaces and
 implementation classes as JAX-WS endpoint artifacts; you need to annotate them
 accordingly first. Check the JAX-WS documentation for details on those requirements.
@@ -1610,7 +1610,7 @@ cache size is set to `1`. You can use the `sessionCacheSize` property to increas
 cached sessions. Note that the number of actual cached sessions is more than that
 number, as sessions are cached based on their acknowledgment mode, so there can be up to
 four cached session instances (one for each
-acknowledgment mode) when `sessionCacheSize` is set to one . `MessageProducer` and `MessageConsumer` instances are cached within their
+acknowledgment mode) when `sessionCacheSize` is set to one. `MessageProducer` and `MessageConsumer` instances are cached within their
 owning session and also take into account the unique properties of the producers and
 consumers when caching. MessageProducers are cached based on their destination.
 MessageConsumers are cached based on a key composed of the destination, selector,
@@ -1621,7 +1621,7 @@ noLocal delivery flag, and the durable subscription name (if creating durable co
 ==== Destination Management
 
 Destinations, as `ConnectionFactory` instances, are JMS administered objects that you can store
-and retrieved in JNDI. When configuring a Spring application context, you can use the
+and retrieve in JNDI. When configuring a Spring application context, you can use the
 JNDI `JndiObjectFactoryBean` factory class or `<jee:jndi-lookup>` to perform dependency
 injection on your object's references to JMS destinations. However, this strategy
 is often cumbersome if there are a large number of destinations in the application or if there
@@ -1734,7 +1734,7 @@ use a proper cache level in such a case.
 This container also has recoverable capabilities when the broker goes down. By default,
 a simple `BackOff` implementation retries every five seconds. You can specify
 a custom `BackOff` implementation for more fine-grained recovery options. See
-api-spring-framework/util/backoff/ExponentialBackOff.html[`ExponentialBackOff`] for an example.
+{api-spring-framework}/util/backoff/ExponentialBackOff.html[`ExponentialBackOff`] for an example.
 
 NOTE: Like its sibling (<<jms-mdp-simple, `SimpleMessageListenerContainer`>>),
 `DefaultMessageListenerContainer` supports native JMS transactions and allows for
@@ -1747,7 +1747,7 @@ Any such arrangements are significantly more efficient than the alternative:
 wrapping your entire processing with an XA transaction (through configuring your
 `DefaultMessageListenerContainer` with an `JtaTransactionManager`) to cover the
 reception of the JMS message as well as the execution of the business logic in your
-message listener (including database operations etc).
+message listener (including database operations, etc.).
 
 IMPORTANT: The default `AUTO_ACKNOWLEDGE` mode does not provide proper reliability guarantees.
 Messages can get lost when listener execution fails (since the provider automatically
@@ -1864,7 +1864,7 @@ content. The overloaded methods `convertAndSend()` and `receiveAndConvert()` met
 `JmsTemplate` delegate the conversion process to an instance of the `MessageConverter`
 interface. This interface defines a simple contract to convert between Java objects and
 JMS messages. The default implementation (`SimpleMessageConverter`) supports conversion
-between `String` and `TextMessage`, `byte[]` and `BytesMesssage`, and `java.util.Map`
+between `String` and `TextMessage`, `byte[]` and `BytesMessage`, and `java.util.Map`
 and `MapMessage`. By using the converter, you and your application code can focus on the
 business object that is being sent or received through JMS and not be concerned with the
 details of how it is represented as a JMS message.
@@ -4392,7 +4392,7 @@ email when someone places an order:
 					+ order.getCustomer().getLastName()
 					+ ", thank you for placing order. Your order number is "
 					+ order.getOrderNumber());
-			try{
+			try {
 				this.mailSender.send(msg);
 			}
 			catch (MailException ex) {
@@ -5646,15 +5646,16 @@ compliant caches (such as Ehcache 3.x). See <<cache-plug>> for more information
 plugging in other cache stores and providers.
 
 IMPORTANT: The caching abstraction has no special handling for multi-threaded and
-multi-process environments, as such features are handled by the cache implementation. .
+multi-process environments, as such features are handled by the cache implementation.
 
 If you have a multi-process environment (that is, an application deployed on several nodes),
 you need to configure your cache provider accordingly. Depending on your use cases, a copy
 of the same data on several nodes can be enough. However, if you change the data during
 the course of the application, you may need to enable other propagation mechanisms.
 
-Caching a particular item is a direct equivalent of the typical get-if-not-found-then-
-proceed-and-put-eventually code blocks found with programmatic cache interaction.
+Caching a particular item is a direct equivalent of the typical
+get-if-not-found-then-proceed-and-put-eventually code blocks
+found with programmatic cache interaction.
 No locks are applied, and several threads may try to load the same item concurrently.
 The same applies to eviction. If several threads are trying to update or evict data
 concurrently, you may use stale data. Certain cache providers offer advanced features
diff --git a/src/docs/asciidoc/overview.adoc b/src/docs/asciidoc/overview.adoc
index ba74cd35647b..fb24ceef6352 100644
--- a/src/docs/asciidoc/overview.adoc
+++ b/src/docs/asciidoc/overview.adoc
@@ -44,7 +44,7 @@ parallel, the Spring WebFlux reactive web framework.
 A note about modules: Spring's framework jars allow for deployment to JDK 9's module path
 ("Jigsaw"). For use in Jigsaw-enabled applications, the Spring Framework 5 jars come with
 "Automatic-Module-Name" manifest entries which define stable language-level module names
-("spring.core", "spring.context" etc) independent from jar artifact names (the jars follow
+("spring.core", "spring.context", etc.) independent from jar artifact names (the jars follow
 the same naming pattern with "-" instead of ".", e.g. "spring-core" and "spring-context").
 Of course, Spring's framework jars keep working fine on the classpath on both JDK 8 and 9+.
 
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 64f07918d46e..6c03726905f5 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -503,6 +503,7 @@ The following example shows such a case:
 		// class body...
 	}
 ----
+<1> Declaring an initializer class.
 
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
diff --git a/src/docs/asciidoc/web/integration.adoc b/src/docs/asciidoc/web/integration.adoc
index 3bac6bb28b96..62d0ef27516b 100644
--- a/src/docs/asciidoc/web/integration.adoc
+++ b/src/docs/asciidoc/web/integration.adoc
@@ -29,12 +29,12 @@ entry points into a server-side application, and it delegates to service objects
 (facades) that are defined in a service layer to satisfy business-specific (and
 presentation-technology agnostic) use cases. In Spring, these service objects, any other
 business-specific objects, data-access objects, and others exist in a distinct "`business
-context`", which contains no web or presentation layer objects (presentation objects
-,such as Spring MVC controllers, are typically configured in a distinct "`presentation
+context`", which contains no web or presentation layer objects (presentation objects,
+such as Spring MVC controllers, are typically configured in a distinct "`presentation
 context`"). This section details how you can configure a Spring container (a
 `WebApplicationContext`) that contains all of the 'business beans' in your application.
 
-Moving on to specifics, all you one need to do is declare a
+Moving on to specifics, all you need to do is declare a
 {api-spring-framework}/web/context/ContextLoaderListener.html[`ContextLoaderListener`]
 in the standard Java EE servlet `web.xml` file of your web application and add a
 `contextConfigLocation`<context-param/> section (in the same file) that defines which
diff --git a/src/docs/asciidoc/web/web-uris.adoc b/src/docs/asciidoc/web/web-uris.adoc
index a36394043b10..11fffde9226f 100644
--- a/src/docs/asciidoc/web/web-uris.adoc
+++ b/src/docs/asciidoc/web/web-uris.adoc
@@ -95,8 +95,8 @@ You can shorten it further still with a full URI template, as the following exam
 .Kotlin
 ----
 	val uri = UriComponentsBuilder
-		.fromUriString("https://example.com/hotels/{hotel}?q={q}")
-		.build("Westin", "123")
+			.fromUriString("https://example.com/hotels/{hotel}?q={q}")
+			.build("Westin", "123")
 ----
 
 
@@ -278,7 +278,7 @@ You can shorten it further still with a full URI template, as the following exam
 ----
 
 The `WebClient` and the `RestTemplate` expand and encode URI templates internally through
-the `UriBuilderFactory` strategy. Both can be configured with a custom strategy.
+the `UriBuilderFactory` strategy. Both can be configured with a custom strategy,
 as the following example shows:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
diff --git a/src/docs/asciidoc/web/webflux-view.adoc b/src/docs/asciidoc/web/webflux-view.adoc
index 51a7a1500879..379d5e1a29ff 100644
--- a/src/docs/asciidoc/web/webflux-view.adoc
+++ b/src/docs/asciidoc/web/webflux-view.adoc
@@ -232,7 +232,7 @@ Java 8+. Using the latest update release available is highly recommended.
  line should be added for Kotlin script support. See
  https://github.com/sdeleuze/kotlin-script-templating[this example] for more detail.
 
-You need to have the script templating library. One way to do that for Javascript is
+You need to have the script templating library. One way to do that for JavaScript is
 through https://www.webjars.org/[WebJars].
 
 
diff --git a/src/docs/asciidoc/web/webmvc-cors.adoc b/src/docs/asciidoc/web/webmvc-cors.adoc
index f86e775c39c6..c73e88bebf22 100644
--- a/src/docs/asciidoc/web/webmvc-cors.adoc
+++ b/src/docs/asciidoc/web/webmvc-cors.adoc
@@ -50,7 +50,7 @@ Each `HandlerMapping` can be
 {api-spring-framework}/web/servlet/handler/AbstractHandlerMapping.html#setCorsConfigurations-java.util.Map-[configured]
 individually with URL pattern-based `CorsConfiguration` mappings. In most cases, applications
 use the MVC Java configuration or the XML namespace to declare such mappings, which results
-in a single global map being passed to all `HandlerMappping` instances.
+in a single global map being passed to all `HandlerMapping` instances.
 
 You can combine global CORS configuration at the `HandlerMapping` level with more
 fine-grained, handler-level CORS configuration. For example, annotated controllers can use
diff --git a/src/docs/asciidoc/web/webmvc-functional.adoc b/src/docs/asciidoc/web/webmvc-functional.adoc
index 1dd3779e1ed4..e40758a781e6 100644
--- a/src/docs/asciidoc/web/webmvc-functional.adoc
+++ b/src/docs/asciidoc/web/webmvc-functional.adoc
@@ -103,7 +103,7 @@ as the following example shows:
 
 
 If you register the `RouterFunction` as a bean, for instance by exposing it in a
-@Configuration class, it will be auto-detected by the servlet, as explained in <<webmvc-fn-running>>.
+`@Configuration` class, it will be auto-detected by the servlet, as explained in <<webmvc-fn-running>>.
 
 
 
@@ -475,7 +475,7 @@ For instance, the router function builder offers the method `GET(String, Handler
 Besides HTTP method-based mapping, the route builder offers a way to introduce additional
 predicates when mapping to requests.
 For each HTTP method there is an overloaded variant that takes a `RequestPredicate` as a
-parameter, though which additional constraints can be expressed.
+parameter, through which additional constraints can be expressed.
 
 
 [[webmvc-fn-predicates]]
diff --git a/src/docs/asciidoc/web/webmvc-view.adoc b/src/docs/asciidoc/web/webmvc-view.adoc
index fdca1d02bca4..c127d1ffe43a 100644
--- a/src/docs/asciidoc/web/webmvc-view.adoc
+++ b/src/docs/asciidoc/web/webmvc-view.adoc
@@ -615,7 +615,7 @@ Java 8+. Using the latest update release available is highly recommended.
  line should be added for Kotlin script support. See
  https://github.com/sdeleuze/kotlin-script-templating[this example] for more details.
 
-You need to have the script templating library. One way to do that for Javascript is
+You need to have the script templating library. One way to do that for JavaScript is
 through https://www.webjars.org/[WebJars].
 
 
@@ -1697,7 +1697,7 @@ located in the `WEB-INF/defs` directory. At initialization of the `WebApplicatio
 the files are loaded, and the definitions factory are initialized. After that has
 been done, the Tiles included in the definition files can be used as views within your
 Spring web application. To be able to use the views, you have to have a `ViewResolver`
-as with any other view technology in Spring : typically a convenient `TilesViewResolver`.
+as with any other view technology in Spring: typically a convenient `TilesViewResolver`.
 
 You can specify locale-specific Tiles definitions by adding an underscore and then
 the locale, as the following example shows:
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 077bcf39cc56..d12b6ab923e8 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -580,12 +580,12 @@ itself, excluding the `contextPath` and any `servletMapping` prefix, if present.
 
 The `servletPath` and `pathInfo` are decoded and that makes them impossible to compare
 directly to the full `requestURI` in order to derive the lookupPath and that makes it
-necessary to decode the `requestUri`. However this introduces its own issues because the
+necessary to decode the `requestURI`. However this introduces its own issues because the
 path may contain encoded reserved characters such as `"/"` or `";"` that can in turn
 alter the structure of the path after they are decoded which can also lead to security
 issues. In addition, Servlet containers may normalize the `servletPath` to varying
 degrees which makes it further impossible to perform `startsWith` comparisons against
-the `requestUri`.
+the `requestURI`.
 
 This is why it is best to avoid reliance on the `servletPath` which comes with the
 prefix-based `servletPath` mapping type. If the `DispatcherServlet` is mapped as the
@@ -597,7 +597,7 @@ a `UrlPathHelper` with `alwaysUseFullPath=true` via <<mvc-config-path-matching>>
 the MVC config.
 
 Fortunately the default Servlet mapping `"/"` is a good choice. However, there is still
-an issue in that the `requestUri` needs to be decoded to make it possible to compare to
+an issue in that the `requestURI` needs to be decoded to make it possible to compare to
 controller mappings. This is again undesirable because of the potential to decode
 reserved characters that alter the path structure. If such characters are not expected,
 then you can reject them (like the Spring Security HTTP firewall), or you can configure
@@ -787,7 +787,7 @@ The following table provides more details on the `ViewResolver` hierarchy:
   you can use the `removeFromCache(String viewName, Locale loc)` method.
 
 | `UrlBasedViewResolver`
-| Simple implementation of the `ViewResolver` interface that affects the direct
+| Simple implementation of the `ViewResolver` interface that effects the direct
   resolution of logical view names to URLs without an explicit mapping definition.
   This is appropriate if your logical names match the names of your view resources
   in a straightforward manner, without the need for arbitrary mappings.
@@ -1545,8 +1545,8 @@ There are also HTTP method specific shortcut variants of `@RequestMapping`:
 
 The shortcuts are <<mvc-ann-requestmapping-composed>> that are provided because,
 arguably, most controller methods should be mapped to a specific HTTP method versus
-using `@RequestMapping`, which, by default, matches to all HTTP methods. At the same,
-a `@RequestMapping` is still needed at the class level to express shared mappings.
+using `@RequestMapping`, which, by default, matches to all HTTP methods.
+A `@RequestMapping` is still needed at the class level to express shared mappings.
 
 The following example has type and method level mappings:
 
@@ -1723,7 +1723,7 @@ one of the following depending on whether use of parsed `PathPattern` is enabled
 * {api-spring-framework}/web/util/pattern/PathPattern.html#SPECIFICITY_COMPARATOR[`PathPattern.SPECIFICITY_COMPARATOR`]
 * {api-spring-framework}/util/AntPathMatcher.html#getPatternComparator-java.lang.String-[`AntPathMatcher.getPatternComparator(String path)`]
 
-Both help to sorts patterns with more specific ones on top. A pattern is less specific if
+Both help to sort patterns with more specific ones on top. A pattern is less specific if
 it has a lower count of URI variables (counted as 1), single wildcards (counted as 1),
 and double wildcards (counted as 2). Given an equal score, the longer pattern is chosen.
 Given the same score and length, the pattern with more URI variables than wildcards is
@@ -1752,7 +1752,7 @@ using the `Accept` header should be the preferred choice.
 Over time, the use of file name extensions has proven problematic in a variety of ways.
 It can cause ambiguity when overlain with the use of URI variables, path parameters, and
 URI encoding. Reasoning about URL-based authorization
-and security (see next section for more details) also become more difficult.
+and security (see next section for more details) also becomes more difficult.
 
 To completely disable the use of path extensions in versions prior to 5.3, set the following:
 
@@ -2171,7 +2171,7 @@ and others) and is equivalent to `required=false`.
 | If a method argument is not matched to any of the earlier values in this table and it is
   a simple type (as determined by
 	{api-spring-framework}/beans/BeanUtils.html#isSimpleProperty-java.lang.Class-[BeanUtils#isSimpleProperty],
-  it is a resolved as a `@RequestParam`. Otherwise, it is resolved as a `@ModelAttribute`.
+  it is resolved as a `@RequestParam`. Otherwise, it is resolved as a `@ModelAttribute`.
 |===
 
 
@@ -2300,7 +2300,7 @@ argument as `@Nullable`.
 ====
 As of 5.3, non-null arguments will be enforced even after type conversion. If your handler
 method intends to accept a null value as well, either declare your argument as `@Nullable`
-or mark it as `required=false` in the corresponding `@RequestParam` etc annotation. This is
+or mark it as `required=false` in the corresponding `@RequestParam`, etc. annotation. This is
 a best practice and the recommended solution for regressions encountered in a 5.3 upgrade.
 
 Alternatively, you may specifically handle e.g. the resulting `MissingPathVariableException`
@@ -2777,8 +2777,8 @@ alternatively, set `@ModelAttribute(binding=false)`, as the following example sh
 <1> Setting `@ModelAttribute(binding=false)`.
 
 You can automatically apply validation after data binding by adding the
-`javax.validation.Valid` annotation or Spring's `@Validated` annotation (
-<<core.adoc#validation-beanvalidation, Bean Validation>> and
+`javax.validation.Valid` annotation or Spring's `@Validated` annotation
+(<<core.adoc#validation-beanvalidation, Bean Validation>> and
 <<core.adoc#validation, Spring validation>>). The following example shows how to do so:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
@@ -2841,7 +2841,7 @@ The following example uses the `@SessionAttributes` annotation:
 ----
 	@Controller
 	@SessionAttributes("pet") // <1>
-	public class EditPetForm {
+	class EditPetForm {
 		// ...
 	}
 ----
@@ -2866,9 +2866,8 @@ storage, as the following example shows:
 			if (errors.hasErrors) {
 				// ...
 			}
-				status.setComplete(); // <2>
-				// ...
-			}
+			status.setComplete(); // <2>
+			// ...
 		}
 	}
 ----
@@ -4357,7 +4356,7 @@ Spring MVC has an extensive integration with Servlet 3.0 asynchronous request
 <<mvc-ann-async-processing,processing>>:
 
 * <<mvc-ann-async-deferredresult, `DeferredResult`>> and <<mvc-ann-async-callable, `Callable`>>
-return values in controller methods and provide basic support for a single asynchronous
+return values in controller methods provide basic support for a single asynchronous
 return value.
 * Controllers can <<mvc-ann-async-http-streaming,stream>> multiple values, including
 <<mvc-ann-async-sse, SSE>> and <<mvc-ann-async-output-stream, raw data>>.
@@ -4889,7 +4888,7 @@ use case-oriented approach that focuses on the common scenarios:
 	val ccCustom = CacheControl.maxAge(10, TimeUnit.DAYS).noTransform().cachePublic()
 ----
 
-`WebContentGenerator` also accept a simpler `cachePeriod` property (defined in seconds) that
+`WebContentGenerator` also accepts a simpler `cachePeriod` property (defined in seconds) that
 works as follows:
 
 * A `-1` value does not generate a `Cache-Control` response header.
@@ -4941,7 +4940,7 @@ settings to a `ResponseEntity`, as the following example shows:
 	}
 ----
 
-The preceding example sends an 304 (NOT_MODIFIED) response with an empty body if the comparison
+The preceding example sends a 304 (NOT_MODIFIED) response with an empty body if the comparison
 to the conditional request headers indicates that the content has not changed. Otherwise, the
 `ETag` and `Cache-Control` headers are added to the response.
 
@@ -5104,6 +5103,7 @@ following example shows:
 	@Configuration
 	@EnableWebMvc
 	class WebConfig : WebMvcConfigurer {
+
 		// Implement configuration methods...
 	}
 ----
diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 07751ff57317..e4ee1e49c055 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1118,7 +1118,7 @@ Contract for sending a message that enables loose coupling between producers and
 `SubscribableChannel` that uses an `Executor` for delivering messages.
 
 Both the Java configuration (that is, `@EnableWebSocketMessageBroker`) and the XML namespace configuration
-(that is,`<websocket:message-broker>`) use the preceding components to assemble a message
+(that is, `<websocket:message-broker>`) use the preceding components to assemble a message
 workflow. The following diagram shows the components used when the simple built-in message
 broker is enabled:
 
@@ -1191,7 +1191,7 @@ is established, STOMP frames begin to flow on it.
 . The client sends a SUBSCRIBE frame with a destination header of `/topic/greeting`. Once received
 and decoded, the message is sent to the `clientInboundChannel` and is then routed to the
 message broker, which stores the client subscription.
-. The client sends a aSEND frame to `/app/greeting`. The `/app` prefix helps to route it to
+. The client sends a SEND frame to `/app/greeting`. The `/app` prefix helps to route it to
 annotated controllers. After the `/app` prefix is stripped, the remaining `/greeting`
 part of the destination is mapped to the `@MessageMapping` method in `GreetingController`.
 . The value returned from `GreetingController` is turned into a Spring `Message` with
@@ -1768,7 +1768,7 @@ WebSocket and SockJS requests.
 
 Therefore, applications that wish to avoid the use of cookies may not have any good
 alternatives for authentication at the HTTP protocol level. Instead of using cookies,
-they may prefer to authenticate with headers at the STOMP messaging protocol level
+they may prefer to authenticate with headers at the STOMP messaging protocol level.
 Doing so requires two simple steps:
 
 . Use the STOMP client to pass authentication headers at connect time.

From 813dbbce5894231193a3006c5d72e8a58e0863f9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 15:05:45 +0200
Subject: [PATCH 081/735] Polish contribution

See gh-27388
---
 src/docs/asciidoc/data-access.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index 388e4bbf5cd8..fa0ccbe73f4a 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -6027,7 +6027,7 @@ limit is 1000.
 
 In addition to the primitive values in the value list, you can create a `java.util.List`
 of object arrays. This list can support multiple expressions being defined for the `in`
-clause, such as `select * from T_ACTOR where (id, last_name) in \((1, 'Johnson'), (2,
+clause, such as `select * from T_ACTOR where (id, last_name) in ((1, 'Johnson'), (2,
 'Harrop'))`. This, of course, requires that your database supports this syntax.
 
 

From caf88ff2cc311b345f5fc0a5ced54d24bd9d553f Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 14 Sep 2021 14:57:45 +0100
Subject: [PATCH 082/735] Improve HandlerMethod#bridgedMethod initialization

Ensure makeAccessible is called once when the bridgedMethod is
initialized.

Closes gh-19795
---
 .../springframework/messaging/handler/HandlerMethod.java    | 6 +++++-
 .../handler/invocation/InvocableHandlerMethod.java          | 4 +---
 .../handler/invocation/reactive/InvocableHandlerMethod.java | 4 +---
 .../java/org/springframework/web/method/HandlerMethod.java  | 4 ++++
 .../web/method/support/InvocableHandlerMethod.java          | 2 --
 .../web/reactive/result/method/InvocableHandlerMethod.java  | 4 +---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
index 496266b1089d..4ace844929fb 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -87,6 +88,7 @@ public HandlerMethod(Object bean, Method method) {
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 	}
 
@@ -102,6 +104,7 @@ public HandlerMethod(Object bean, String methodName, Class<?>... parameterTypes)
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = bean.getClass().getMethod(methodName, parameterTypes);
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(this.method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 	}
 
@@ -123,6 +126,7 @@ public HandlerMethod(String beanName, BeanFactory beanFactory, Method method) {
 		this.beanType = ClassUtils.getUserClass(beanType);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 	}
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
index b9430fdb9aa6..3dc5e2ec2630 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.HandlerMethod;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Extension of {@link HandlerMethod} that invokes the underlying method with
@@ -166,7 +165,6 @@ protected Object[] getMethodArgumentValues(Message<?> message, Object... provide
 	 */
 	@Nullable
 	protected Object doInvoke(Object... args) throws Exception {
-		ReflectionUtils.makeAccessible(getBridgedMethod());
 		try {
 			return getBridgedMethod().invoke(getBean(), args);
 		}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
index d4dfe1530683..aad9384af251 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
 import org.springframework.messaging.handler.HandlerMethod;
 import org.springframework.messaging.handler.invocation.MethodArgumentResolutionException;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Extension of {@link HandlerMethod} that invokes the underlying method with
@@ -130,7 +129,6 @@ public Mono<Object> invoke(Message<?> message, Object... providedArgs) {
 			boolean isSuspendingFunction = false;
 			try {
 				Method method = getBridgedMethod();
-				ReflectionUtils.makeAccessible(method);
 				if (KotlinDetector.isSuspendingFunction(method)) {
 					isSuspendingFunction = true;
 					value = CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);
diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
index 35bf35ac01c5..80d6e7999eb4 100644
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -42,6 +42,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
@@ -119,6 +120,7 @@ protected HandlerMethod(Object bean, Method method, @Nullable MessageSource mess
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 		evaluateResponseStatus();
 		this.description = initDescription(this.beanType, this.method);
@@ -137,6 +139,7 @@ public HandlerMethod(Object bean, String methodName, Class<?>... parameterTypes)
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = bean.getClass().getMethod(methodName, parameterTypes);
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(this.method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 		evaluateResponseStatus();
 		this.description = initDescription(this.beanType, this.method);
@@ -172,6 +175,7 @@ public HandlerMethod(
 		this.beanType = ClassUtils.getUserClass(beanType);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 		evaluateResponseStatus();
 		this.description = initDescription(this.beanType, this.method);
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
index 80f98393f3a3..970afd65503d 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
@@ -28,7 +28,6 @@
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.support.SessionStatus;
 import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -199,7 +198,6 @@ protected Object[] getMethodArgumentValues(NativeWebRequest request, @Nullable M
 	@Nullable
 	protected Object doInvoke(Object... args) throws Exception {
 		Method method = getBridgedMethod();
-		ReflectionUtils.makeAccessible(method);
 		try {
 			if (KotlinDetector.isSuspendingFunction(method)) {
 				return CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
index fb2e31a52479..b117a197aa8e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerResult;
@@ -137,7 +136,6 @@ public Mono<HandlerResult> invoke(
 		return getMethodArgumentValues(exchange, bindingContext, providedArgs).flatMap(args -> {
 			Object value;
 			try {
-				ReflectionUtils.makeAccessible(getBridgedMethod());
 				Method method = getBridgedMethod();
 				if (KotlinDetector.isSuspendingFunction(method)) {
 					value = CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);

From 92cd680a2c3e93f7415562f03e3e96cc4d8fb526 Mon Sep 17 00:00:00 2001
From: takeaction21 <90566622+takeaction21@users.noreply.github.com>
Date: Sun, 12 Sep 2021 23:50:07 +0800
Subject: [PATCH 083/735] Support float and double primitive default values in
 BeanUtils.instantiateClass()

See gh-27390
---
 .../src/main/java/org/springframework/beans/BeanUtils.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 6e97683f889a..3d9f9000efd4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -88,6 +88,8 @@ public abstract class BeanUtils {
 		values.put(short.class, (short) 0);
 		values.put(int.class, 0);
 		values.put(long.class, (long) 0);
+		values.put(float.class, (float) 0);
+		values.put(double.class, (double) 0);
 		DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values);
 	}
 

From 5cc09849cedfc21a5922930d17bce7a61fccd238 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 15:59:33 +0200
Subject: [PATCH 084/735] Introduce test for gh-27390

---
 .../springframework/beans/BeanUtilsTests.java | 95 +++++++++++++++----
 1 file changed, 75 insertions(+), 20 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
index f3e9d2eaa9a1..5240d97f7a1e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -49,6 +49,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 /**
  * Unit tests for {@link BeanUtils}.
@@ -85,19 +86,42 @@ void instantiateClassWithOptionalNullableType() throws NoSuchMethodException {
 	}
 
 	@Test  // gh-22531
-	void instantiateClassWithOptionalPrimitiveType() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
-		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(ctor, null, null, "foo");
-		assertThat(bean.getCounter()).isEqualTo(0);
-		assertThat(bean.isFlag()).isEqualTo(false);
-		assertThat(bean.getValue()).isEqualTo("foo");
+	void instantiateClassWithFewerArgsThanParameters() throws NoSuchMethodException {
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
+		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
+				BeanUtils.instantiateClass(constructor, null, null, "foo"));
 	}
 
 	@Test  // gh-22531
 	void instantiateClassWithMoreArgsThanParameters() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
 		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
-				BeanUtils.instantiateClass(ctor, null, null, "foo", null));
+				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo", null));
+	}
+
+	@Test  // gh-22531, gh-27390
+	void instantiateClassWithOptionalPrimitiveTypes() throws NoSuchMethodException {
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
+		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo");
+
+		assertSoftly(softly -> {
+			softly.assertThat(bean.isFlag()).isEqualTo(false);
+			softly.assertThat(bean.getByteCount()).isEqualTo((byte) 0);
+			softly.assertThat(bean.getShortCount()).isEqualTo((short) 0);
+			softly.assertThat(bean.getIntCount()).isEqualTo(0);
+			softly.assertThat(bean.getLongCount()).isEqualTo(0L);
+			softly.assertThat(bean.getFloatCount()).isEqualTo(0F);
+			softly.assertThat(bean.getDoubleCount()).isEqualTo(0D);
+			softly.assertThat(bean.getText()).isEqualTo("foo");
+		});
+	}
+
+	private Constructor<BeanWithPrimitiveTypes> getBeanWithPrimitiveTypesConstructor() throws NoSuchMethodException {
+		return BeanWithPrimitiveTypes.class.getConstructor(boolean.class, byte.class, short.class, int.class,
+				long.class, float.class, double.class, String.class);
 	}
 
 	@Test
@@ -628,30 +652,61 @@ public String getValue() {
 
 	private static class BeanWithPrimitiveTypes {
 
-		private int counter;
-
 		private boolean flag;
+		private byte byteCount;
+		private short shortCount;
+		private int intCount;
+		private long longCount;
+		private float floatCount;
+		private double doubleCount;
+		private String text;
 
-		private String value;
 
 		@SuppressWarnings("unused")
-		public BeanWithPrimitiveTypes(int counter, boolean flag, String value) {
-			this.counter = counter;
+		public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, int intCount, long longCount,
+				float floatCount, double doubleCount, String text) {
 			this.flag = flag;
-			this.value = value;
-		}
-
-		public int getCounter() {
-			return counter;
+			this.byteCount = byteCount;
+			this.shortCount = shortCount;
+			this.intCount = intCount;
+			this.longCount = longCount;
+			this.floatCount = floatCount;
+			this.doubleCount = doubleCount;
+			this.text = text;
 		}
 
 		public boolean isFlag() {
 			return flag;
 		}
 
-		public String getValue() {
-			return value;
+		public byte getByteCount() {
+			return byteCount;
+		}
+
+		public short getShortCount() {
+			return shortCount;
+		}
+
+		public int getIntCount() {
+			return intCount;
+		}
+
+		public long getLongCount() {
+			return longCount;
+		}
+
+		public float getFloatCount() {
+			return floatCount;
+		}
+
+		public double getDoubleCount() {
+			return doubleCount;
+		}
+
+		public String getText() {
+			return text;
 		}
+
 	}
 
 	private static class PrivateBeanWithPrivateConstructor {

From f07e6a1b9de59331647b2c8dd54f696d59a8b902 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 16:05:29 +0200
Subject: [PATCH 085/735] Support char primitive default values in
 BeanUtils.instantiateClass()

Closes gh-27390
---
 .../org/springframework/beans/BeanUtils.java   |  7 ++++---
 .../springframework/beans/BeanUtilsTests.java  | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 3d9f9000efd4..8ddd6ff74467 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -87,9 +87,10 @@ public abstract class BeanUtils {
 		values.put(byte.class, (byte) 0);
 		values.put(short.class, (short) 0);
 		values.put(int.class, 0);
-		values.put(long.class, (long) 0);
-		values.put(float.class, (float) 0);
-		values.put(double.class, (double) 0);
+		values.put(long.class, 0L);
+		values.put(float.class, 0F);
+		values.put(double.class, 0D);
+		values.put(char.class, '\0');
 		DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
index 5240d97f7a1e..b90fd515dc36 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -98,30 +98,31 @@ void instantiateClassWithMoreArgsThanParameters() throws NoSuchMethodException {
 		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
 
 		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
-				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo", null));
+				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo", null));
 	}
 
 	@Test  // gh-22531, gh-27390
 	void instantiateClassWithOptionalPrimitiveTypes() throws NoSuchMethodException {
 		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
 
-		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo");
+		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo");
 
 		assertSoftly(softly -> {
-			softly.assertThat(bean.isFlag()).isEqualTo(false);
+			softly.assertThat(bean.isFlag()).isFalse();
 			softly.assertThat(bean.getByteCount()).isEqualTo((byte) 0);
 			softly.assertThat(bean.getShortCount()).isEqualTo((short) 0);
 			softly.assertThat(bean.getIntCount()).isEqualTo(0);
 			softly.assertThat(bean.getLongCount()).isEqualTo(0L);
 			softly.assertThat(bean.getFloatCount()).isEqualTo(0F);
 			softly.assertThat(bean.getDoubleCount()).isEqualTo(0D);
+			softly.assertThat(bean.getCharacter()).isEqualTo('\0');
 			softly.assertThat(bean.getText()).isEqualTo("foo");
 		});
 	}
 
 	private Constructor<BeanWithPrimitiveTypes> getBeanWithPrimitiveTypesConstructor() throws NoSuchMethodException {
 		return BeanWithPrimitiveTypes.class.getConstructor(boolean.class, byte.class, short.class, int.class,
-				long.class, float.class, double.class, String.class);
+				long.class, float.class, double.class, char.class, String.class);
 	}
 
 	@Test
@@ -659,12 +660,14 @@ private static class BeanWithPrimitiveTypes {
 		private long longCount;
 		private float floatCount;
 		private double doubleCount;
+		private char character;
 		private String text;
 
 
 		@SuppressWarnings("unused")
 		public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, int intCount, long longCount,
-				float floatCount, double doubleCount, String text) {
+				float floatCount, double doubleCount, char character, String text) {
+
 			this.flag = flag;
 			this.byteCount = byteCount;
 			this.shortCount = shortCount;
@@ -672,6 +675,7 @@ public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, in
 			this.longCount = longCount;
 			this.floatCount = floatCount;
 			this.doubleCount = doubleCount;
+			this.character = character;
 			this.text = text;
 		}
 
@@ -703,6 +707,10 @@ public double getDoubleCount() {
 			return doubleCount;
 		}
 
+		public char getCharacter() {
+			return character;
+		}
+
 		public String getText() {
 			return text;
 		}

From 9e986c031b92ea7035e639436c79deb77c33e842 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 20:51:59 +0200
Subject: [PATCH 086/735] Polish ide.gradle

---
 gradle/ide.gradle | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 7db543d3bc4d..6c112fd5b39e 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -1,7 +1,7 @@
 import org.gradle.plugins.ide.eclipse.model.ProjectDependency
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
 
-apply plugin: "eclipse"
+apply plugin: 'eclipse'
 
 eclipse.jdt {
 	sourceCompatibility = 1.8
@@ -30,17 +30,17 @@ eclipse.classpath.file.whenMerged { classpath ->
 }
 
 // Use separate main/test outputs (prevents WTP from packaging test classes)
-eclipse.classpath.defaultOutputDir = file(project.name+"/bin/eclipse")
+eclipse.classpath.defaultOutputDir = file(project.name + '/bin/eclipse')
 eclipse.classpath.file.beforeMerged { classpath ->
 	classpath.entries.findAll{ it instanceof SourceFolder }.each {
-		if (it.output.startsWith("bin/")) {
+		if (it.output.startsWith('bin/')) {
 			it.output = null
 		}
 	}
 }
 eclipse.classpath.file.whenMerged { classpath ->
 	classpath.entries.findAll{ it instanceof SourceFolder }.each {
-		it.output = "bin/" + it.path.split("/")[1]
+		it.output = 'bin/' + it.path.split('/')[1]
 	}
 }
 
@@ -65,46 +65,45 @@ eclipse.classpath.file.whenMerged {
 }
 
 // Allow projects to be used as WTP modules
-eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature"
+eclipse.project.natures 'org.eclipse.wst.common.project.facet.core.nature'
 
 // Include project specific settings
 task eclipseSettings(type: Copy) {
 	from rootProject.files(
-		"src/eclipse/org.eclipse.jdt.ui.prefs",
-		"src/eclipse/org.eclipse.wst.common.project.facet.core.xml")
+		'src/eclipse/org.eclipse.jdt.ui.prefs',
+		'src/eclipse/org.eclipse.wst.common.project.facet.core.xml')
 	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }
 
 task eclipseWstComponent(type: Copy) {
-	from rootProject.files(
-		"src/eclipse/org.eclipse.wst.common.component")
+	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
 	into project.file('.settings/')
 	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
 task eclipseJdtPrepare(type: Copy) {
-	from rootProject.file("src/eclipse/org.eclipse.jdt.core.prefs")
-	into project.file(".settings/")
+	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
+	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }
 
 task cleanEclipseJdtUi(type: Delete) {
-	delete project.file(".settings/org.eclipse.jdt.core.prefs")
-	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
-	delete project.file(".settings/org.eclipse.wst.common.component")
-	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
+	delete project.file('.settings/org.eclipse.jdt.core.prefs')
+	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
+	delete project.file('.settings/org.eclipse.wst.common.component')
+	delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
 }
 
 task eclipseBuildship(type: Copy) {
 	from rootProject.files(
-		"src/eclipse/org.eclipse.jdt.ui.prefs",
-		"src/eclipse/org.eclipse.jdt.core.prefs")
+		'src/eclipse/org.eclipse.jdt.ui.prefs',
+		'src/eclipse/org.eclipse.jdt.core.prefs')
 	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }
 
-tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
-tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
-tasks["eclipse"].dependsOn(eclipseSettings, eclipseWstComponent)
+tasks['eclipseJdt'].dependsOn(eclipseJdtPrepare)
+tasks['cleanEclipse'].dependsOn(cleanEclipseJdtUi)
+tasks['eclipse'].dependsOn(eclipseSettings, eclipseWstComponent)

From 3faf445603e760d0b9223c194861809b410577c9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 21:05:57 +0200
Subject: [PATCH 087/735] Re-enable import into Eclipse IDE

The migration to Gradle 7.2 resulted in a regression for our Eclipse
IDE support: several projects ended up with recursive classpath entries
in their generated .classpath files which prevent those projects from
being built within Eclipse.

This commit addresses this issue with a solution that may well be a
"hack". Nonetheless, a working hack is better than not being able to
import into Eclipse at all.

See gh-26870
---
 gradle/ide.gradle | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 6c112fd5b39e..20bf5f494e73 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -18,10 +18,13 @@ eclipse.classpath.file.whenMerged { classpath ->
 		if (matcher) {
 			def projectName = matcher[0][1]
 			def path = "/${projectName}"
-			if(!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
-				def dependency = new ProjectDependency(path)
-				dependency.exported = true
-				classpath.entries.add(dependency)
+			if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
+				// Avoid recursive dependency on current project.
+				if (!entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')) {
+					def dependency = new ProjectDependency(path)
+					dependency.exported = true
+					classpath.entries.add(dependency)
+				}
 			}
 			classpath.entries.remove(entry)
 		}

From 4322ee194452bc1c2c1fb51932279b038c27205c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 21:42:00 +0200
Subject: [PATCH 088/735] Polish Eclipse IDE support

---
 gradle/ide.gradle                    | 42 +++++++++++++---------------
 src/eclipse/org.eclipse.jdt.ui.prefs |  2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 20bf5f494e73..913628b8e880 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -41,20 +41,20 @@ eclipse.classpath.file.beforeMerged { classpath ->
 		}
 	}
 }
-eclipse.classpath.file.whenMerged { classpath ->
-	classpath.entries.findAll{ it instanceof SourceFolder }.each {
+eclipse.classpath.file.whenMerged {
+	entries.findAll{ it instanceof SourceFolder }.each {
 		it.output = 'bin/' + it.path.split('/')[1]
 	}
 }
 
 // Ensure project dependencies come after 3rd-party libs (SPR-11836)
 // https://jira.spring.io/browse/SPR-11836
-eclipse.classpath.file.whenMerged { classpath ->
-	classpath.entries.findAll { it instanceof ProjectDependency }.each {
+eclipse.classpath.file.whenMerged {
+	entries.findAll { it instanceof ProjectDependency }.each {
 		// delete from original position
-		classpath.entries.remove(it)
+		entries.remove(it)
 		// append to end of classpath
-		classpath.entries.add(it)
+		entries.add(it)
 	}
 }
 
@@ -79,34 +79,30 @@ task eclipseSettings(type: Copy) {
 	outputs.upToDateWhen { false }
 }
 
-task eclipseWstComponent(type: Copy) {
-	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
+task eclipseJdtSettings(type: Copy) {
+	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
 	into project.file('.settings/')
-	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
-task eclipseJdtPrepare(type: Copy) {
-	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
+task eclipseBuildship {
+	dependsOn eclipseSettings, eclipseJdtSettings
+}
+
+task eclipseWstComponentSettings(type: Copy) {
+	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
 	into project.file('.settings/')
+	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
-task cleanEclipseJdtUi(type: Delete) {
+task cleanEclipseSettings(type: Delete) {
 	delete project.file('.settings/org.eclipse.jdt.core.prefs')
 	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
 	delete project.file('.settings/org.eclipse.wst.common.component')
 	delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
 }
 
-task eclipseBuildship(type: Copy) {
-	from rootProject.files(
-		'src/eclipse/org.eclipse.jdt.ui.prefs',
-		'src/eclipse/org.eclipse.jdt.core.prefs')
-	into project.file('.settings/')
-	outputs.upToDateWhen { false }
-}
-
-tasks['eclipseJdt'].dependsOn(eclipseJdtPrepare)
-tasks['cleanEclipse'].dependsOn(cleanEclipseJdtUi)
-tasks['eclipse'].dependsOn(eclipseSettings, eclipseWstComponent)
+tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings)
+tasks['eclipseJdt'].dependsOn(eclipseJdtSettings)
+tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)
diff --git a/src/eclipse/org.eclipse.jdt.ui.prefs b/src/eclipse/org.eclipse.jdt.ui.prefs
index 26c219437105..1685154bbab8 100644
--- a/src/eclipse/org.eclipse.jdt.ui.prefs
+++ b/src/eclipse/org.eclipse.jdt.ui.prefs
@@ -63,4 +63,4 @@ org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=9999
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=9999
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 5.2\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 5.3.11\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

From 3baacedfd9c8d908ac95be00ee745d938033cd67 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Sep 2021 21:49:12 +0200
Subject: [PATCH 089/735] Alignment with other abstract utils classes

---
 .../java/org/springframework/core/CoroutinesUtils.java     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
index e942ff48ee11..50aec2deb3a6 100644
--- a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -45,10 +45,7 @@
  * @author Phillip Webb
  * @since 5.2
  */
-public final class CoroutinesUtils {
-
-	private CoroutinesUtils() {
-	}
+public abstract class CoroutinesUtils {
 
 	/**
 	 * Convert a {@link Deferred} instance to a {@link Mono}.
@@ -78,7 +75,7 @@ public static Publisher<?> invokeSuspendingFunction(Method method, Object target
 					KCallables.callSuspend(function, getSuspendedFunctionArgs(target, args), continuation))
 				.filter(result -> !Objects.equals(result, Unit.INSTANCE))
 				.onErrorMap(InvocationTargetException.class, InvocationTargetException::getTargetException);
-		if (classifier.equals(JvmClassMappingKt.getKotlinClass(Flow.class))) {
+		if (classifier != null && classifier.equals(JvmClassMappingKt.getKotlinClass(Flow.class))) {
 			return mono.flatMapMany(CoroutinesUtils::asFlux);
 		}
 		return mono;

From b8b85a6a59db19ae3283becadf7f60de606d5616 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Sep 2021 21:49:23 +0200
Subject: [PATCH 090/735] Defensive handling of dimensions nullability

---
 .../spel/ast/ConstructorReference.java        | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
index 7ccc4c16d962..d42a375410f6 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
@@ -57,7 +57,7 @@
  */
 public class ConstructorReference extends SpelNodeImpl {
 
-	private boolean isArrayConstructor = false;
+	private final boolean isArrayConstructor;
 
 	@Nullable
 	private SpelNodeImpl[] dimensions;
@@ -234,6 +234,7 @@ private TypedValue createArray(ExpressionState state) throws EvaluationException
 					FormatHelper.formatClassNameForMessage(
 							intendedArrayType != null ? intendedArrayType.getClass() : null));
 		}
+
 		String type = (String) intendedArrayType;
 		Class<?> componentType;
 		TypeCode arrayTypeCode = TypeCode.forName(type);
@@ -243,7 +244,8 @@ private TypedValue createArray(ExpressionState state) throws EvaluationException
 		else {
 			componentType = arrayTypeCode.getType();
 		}
-		Object newArray;
+
+		Object newArray = null;
 		if (!hasInitializer()) {
 			// Confirm all dimensions were specified (for example [3][][5] is missing the 2nd dimension)
 			if (this.dimensions != null) {
@@ -252,23 +254,22 @@ private TypedValue createArray(ExpressionState state) throws EvaluationException
 						throw new SpelEvaluationException(getStartPosition(), SpelMessage.MISSING_ARRAY_DIMENSION);
 					}
 				}
-			}
-			TypeConverter typeConverter = state.getEvaluationContext().getTypeConverter();
-
-			// Shortcut for 1 dimensional
-			if (this.dimensions.length == 1) {
-				TypedValue o = this.dimensions[0].getTypedValue(state);
-				int arraySize = ExpressionUtils.toInt(typeConverter, o);
-				newArray = Array.newInstance(componentType, arraySize);
-			}
-			else {
-				// Multi-dimensional - hold onto your hat!
-				int[] dims = new int[this.dimensions.length];
-				for (int d = 0; d < this.dimensions.length; d++) {
-					TypedValue o = this.dimensions[d].getTypedValue(state);
-					dims[d] = ExpressionUtils.toInt(typeConverter, o);
+				TypeConverter typeConverter = state.getEvaluationContext().getTypeConverter();
+				if (this.dimensions.length == 1) {
+					// Shortcut for 1-dimensional
+					TypedValue o = this.dimensions[0].getTypedValue(state);
+					int arraySize = ExpressionUtils.toInt(typeConverter, o);
+					newArray = Array.newInstance(componentType, arraySize);
+				}
+				else {
+					// Multi-dimensional - hold onto your hat!
+					int[] dims = new int[this.dimensions.length];
+					for (int d = 0; d < this.dimensions.length; d++) {
+						TypedValue o = this.dimensions[d].getTypedValue(state);
+						dims[d] = ExpressionUtils.toInt(typeConverter, o);
+					}
+					newArray = Array.newInstance(componentType, dims);
 				}
-				newArray = Array.newInstance(componentType, dims);
 			}
 		}
 		else {

From 2d65bce18ee22e4eb5afde83b71033097f5bbf26 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 21:58:22 +0200
Subject: [PATCH 091/735] Polish Eclipse IDE support

---
 gradle/ide.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

From 4c720eaa38704cb97705b86761cd505ceb59835e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 15 Sep 2021 08:41:10 +0200
Subject: [PATCH 092/735] Fix GitHub credentials to use token rather than
 password

Closes gh-27402
---
 ci/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index f919a1b681fc..b9fe3db2f917 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -2,7 +2,7 @@ anchors:
   git-repo-resource-source: &git-repo-resource-source
     uri: ((github-repo))
     username: ((github-username))
-    password: ((github-password))
+    password: ((github-ci-release-token))
     branch: ((branch))
   gradle-enterprise-task-params: &gradle-enterprise-task-params
     GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))

From aa14c248990bcfe8345bd1a93ef8f7fa0b415101 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 15 Sep 2021 09:06:44 +0200
Subject: [PATCH 093/735] Migrate to Spring Builds account

---
 ci/scripts/stage-version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From c7cca2e8790509a56eac422fdd7515ea56a4dc5d Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Wed, 15 Sep 2021 07:24:10 +0000
Subject: [PATCH 094/735] Next development version (v5.3.11-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 28b12e96c3a3..237a595d4483 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.10-SNAPSHOT
+version=5.3.11-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From 7907478d363ebf331b9e3c84adf3b3fec91bd594 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 12:17:07 +0200
Subject: [PATCH 095/735] Watch 5.3.x branch in the CI pipeline

Main branch has moved to the 6.0.x line, so this commit updates this CI
pipeline to the new 5.3.x maintenance branch.
---
 ci/parameters.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/parameters.yml b/ci/parameters.yml
index a30e8561a224..28486ecec729 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -5,7 +5,7 @@ github-repo: "https://github.com/spring-projects/spring-framework.git"
 github-repo-name: "spring-projects/spring-framework"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "main"
+branch: "5.3.x"
 milestone: "5.3.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"

From c0e479460e09b7065a21ebfbd95cec7d213ca62e Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 12:37:10 +0200
Subject: [PATCH 096/735] Switch CI pipeline to a JDK17 baseline

This commit introduces a new `spring-framework-6.0.x` CI pipeline with
JDK 17 baseline.

Note that Kotlin still uses a JDK11 baseline for now, this will be
addressed in gh-27413.

Closes gh-27409
---
 .../compile/CompilerConventionsPlugin.java    |  2 -
 .../optional/OptionalDependenciesPlugin.java  |  7 +-
 ci/images/ci-image/Dockerfile                 |  7 +-
 ci/images/get-jdk-url.sh                      | 10 +--
 ci/images/setup.sh                            |  2 +-
 ci/parameters.yml                             |  5 +-
 ci/pipeline.yml                               | 83 +------------------
 ci/scripts/check-project.sh                   |  2 +-
 gradle/toolchains.gradle                      | 20 ++---
 9 files changed, 22 insertions(+), 116 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
index f2424c549e50..0942ffd4fd55 100644
--- a/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
@@ -24,7 +24,6 @@
 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;
 
 /**
@@ -70,7 +69,6 @@ public void apply(Project project) {
 	 * @param project the current project
 	 */
 	private void applyJavaCompileConventions(Project project) {
-		JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class);
 		project.getTasks().withType(JavaCompile.class)
 				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME))
 				.forEach(compileTask -> {
diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index a7e7101daee7..d8c188f4ce26 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -19,12 +19,9 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.attributes.Usage;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSetContainer;
-import org.gradle.plugins.ide.eclipse.EclipsePlugin;
-import org.gradle.plugins.ide.eclipse.model.EclipseModel;
 
 /**
  * A {@code Plugin} that adds support for Maven-style optional dependencies. Creates a new
@@ -47,7 +44,7 @@ public void apply(Project project) {
 		optional.setCanBeConsumed(false);
 		optional.setCanBeResolved(false);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
-			SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
+			SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class)
 					.getSourceSets();
 			sourceSets.all((sourceSet) -> {
 				project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(optional);
diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index df1be9f33457..548a7cd7c233 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -2,10 +2,9 @@ FROM ubuntu:focal-20210827
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java8
+RUN ./setup.sh
 
-ENV JAVA_HOME /opt/openjdk/java8
-ENV JDK11 /opt/openjdk/java11
-ENV JDK16 /opt/openjdk/java16
+ENV JAVA_HOME /opt/openjdk/java17
+ENV JDK17 /opt/openjdk/java17
 
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index e170d55171c3..48072fd2f9e2 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -2,15 +2,9 @@
 set -e
 
 case "$1" in
-	java8)
-		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz"
+	java17)
+		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17-2021-09-15-08-15-beta/OpenJDK17-jdk_x64_linux_hotspot_2021-09-15-08-15.tar.gz"
 	;;
-	java11)
-		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
-	;;
-  java16)
-		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
-  ;;
   *)
 		echo $"Unknown java version"
 		exit 1
diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index ff18f849f40c..43af1979a261 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -22,7 +22,7 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java8 java11 java16
+for jdk in java17
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk
diff --git a/ci/parameters.yml b/ci/parameters.yml
index a30e8561a224..c392edf66e85 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -1,12 +1,9 @@
-email-server: "smtp.svc.pivotal.io"
-email-from: "ci@spring.io"
-email-to: ["spring-framework-dev@pivotal.io"]
 github-repo: "https://github.com/spring-projects/spring-framework.git"
 github-repo-name: "spring-projects/spring-framework"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
 branch: "main"
-milestone: "5.3.x"
+milestone: "6.0.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index b9fe3db2f917..d2b922602225 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -67,13 +67,6 @@ resources:
   icon: github
   source:
     <<: *git-repo-resource-source
-- name: every-morning
-  type: time
-  icon: alarm
-  source:
-    start: 8:00 AM
-    stop: 9:00 AM
-    location: Europe/Vienna
 - name: ci-images-git-repo
   type: git
   icon: github
@@ -86,7 +79,7 @@ resources:
   icon: docker
   source:
     <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-framework-ci
+    repository: ((docker-hub-organization))/spring-framework-ci-jdk17
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -111,22 +104,6 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: build
-- name: repo-status-jdk11-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk11-build
-- name: repo-status-jdk16-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk16-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -216,62 +193,6 @@ jobs:
           "zip.type": "schema"
     get_params:
       threads: 8
-- name: jdk11-build
-  serial: true
-  public: true
-  plan:
-  - get: ci-image
-  - get: git-repo
-  - get: every-morning
-    trigger: true
-  - put: repo-status-jdk11-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: 11
-        <<: *build-project-task-params
-    on_failure:
-      do:
-      - put: repo-status-jdk11-build
-        params: { state: "failure", commit: "git-repo" }
-      - put: slack-alert
-        params:
-          <<: *slack-fail-params
-  - put: repo-status-jdk11-build
-    params: { state: "success", commit: "git-repo" }
-- name: jdk16-build
-  serial: true
-  public: true
-  plan:
-    - get: ci-image
-    - get: git-repo
-    - get: every-morning
-      trigger: true
-    - put: repo-status-jdk16-build
-      params: { state: "pending", commit: "git-repo" }
-    - do:
-      - task: check-project
-        image: ci-image
-        file: git-repo/ci/tasks/check-project.yml
-        privileged: true
-        timeout: ((task-timeout))
-        params:
-          TEST_TOOLCHAIN: 15
-          <<: *build-project-task-params
-      on_failure:
-        do:
-          - put: repo-status-jdk16-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk16-build
-      params: { state: "success", commit: "git-repo" }
 - name: build-pull-requests
   serial: true
   public: true
@@ -453,7 +374,7 @@ jobs:
 
 groups:
 - name: "builds"
-  jobs: ["build", "jdk11-build", "jdk16-build"]
+  jobs: ["build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"
diff --git a/ci/scripts/check-project.sh b/ci/scripts/check-project.sh
index 7f6ca04cea9b..0620dc17164d 100755
--- a/ci/scripts/check-project.sh
+++ b/ci/scripts/check-project.sh
@@ -4,6 +4,6 @@ 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 \
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17 \
   -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
 popd > /dev/null
diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 5573efa1a52d..57ca9e51418d 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -11,7 +11,7 @@
  *     <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.
+ * By default, the build will fall back to using the current JDK and 17 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.
@@ -44,7 +44,7 @@ def mainToolchainLanguageVersion() {
 	if (mainToolchainConfigured()) {
 		return JavaLanguageVersion.of(project.mainToolchain.toString())
 	}
-	return JavaLanguageVersion.of(8)
+	return JavaLanguageVersion.of(17)
 }
 
 def testToolchainLanguageVersion() {
@@ -64,9 +64,9 @@ plugins.withType(JavaPlugin) {
 		}
 	}
 	else {
-		// Fallback to JDK8
+		// Fallback to JDK17
 		java {
-			sourceCompatibility = JavaVersion.VERSION_1_8
+			sourceCompatibility = JavaVersion.VERSION_17
 		}
 	}
 	// Configure a specific Java Toolchain for compiling and running tests if the 'testToolchain' property is defined
@@ -86,10 +86,10 @@ plugins.withType(JavaPlugin) {
 }
 
 plugins.withType(GroovyPlugin) {
-	// Fallback to JDK8
+	// Fallback to JDK17
 	if (!mainToolchainConfigured()) {
 		compileGroovy {
-			sourceCompatibility = JavaVersion.VERSION_1_8
+			sourceCompatibility = JavaVersion.VERSION_17
 		}
 	}
 }
@@ -102,7 +102,7 @@ pluginManager.withPlugin("kotlin") {
 			languageVersion = mainLanguageVersion
 		}
 		// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
-		def javaVersion = mainLanguageVersion.toString() == '8' ? '1.8' : mainLanguageVersion.toString()
+		def javaVersion = mainLanguageVersion.toString()
 		compileKotlin {
 			kotlinOptions {
 				jvmTarget = javaVersion
@@ -118,15 +118,15 @@ pluginManager.withPlugin("kotlin") {
 		}
 	}
 	else {
-		// Fallback to JDK8
+		// Fallback to JDK11
 		compileKotlin {
 			kotlinOptions {
-				jvmTarget = '1.8'
+				jvmTarget = '11'
 			}
 		}
 		compileTestKotlin {
 			kotlinOptions {
-				jvmTarget = '1.8'
+				jvmTarget = '11'
 			}
 		}
 	}

From 09b233365fe027a8295456bafc091ed8faac3dcd Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 14:03:51 +0200
Subject: [PATCH 097/735] Update project version to 6.0.0-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 237a595d4483..886369712793 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-version=5.3.11-SNAPSHOT
+version=6.0.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true
-kotlin.stdlib.default.dependency=false
\ No newline at end of file
+kotlin.stdlib.default.dependency=false

From 350d3e8b225181fa8a9bee6dd8e51f526262c75e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 15 Sep 2021 14:24:14 +0200
Subject: [PATCH 098/735] Update @since tag in code template to 6.0

---
 src/eclipse/org.eclipse.jdt.ui.prefs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eclipse/org.eclipse.jdt.ui.prefs b/src/eclipse/org.eclipse.jdt.ui.prefs
index 1685154bbab8..1961fa953324 100644
--- a/src/eclipse/org.eclipse.jdt.ui.prefs
+++ b/src/eclipse/org.eclipse.jdt.ui.prefs
@@ -63,4 +63,4 @@ org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=9999
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=9999
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 5.3.11\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 6.0\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

From 00eef79e5c29d953eb5c9a225ca31f5680952b00 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 14:40:42 +0200
Subject: [PATCH 099/735] Upgrade to JApicmp Gradle Plugin 0.3.0

Fixes gh-27414
---
 buildSrc/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 03f629496a28..6f5712565d86 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -8,8 +8,7 @@ repositories {
 }
 
 dependencies {
-	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.2.8"
-	implementation "com.google.guava:guava:28.2-jre" // required by japicmp-gradle-plugin
+	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.3.0"
 }
 
 gradlePlugin {

From 0640da74bcbeb9bf539e7574751df6b6d4d072a9 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Sep 2021 15:26:13 +0200
Subject: [PATCH 100/735] Upgrade to Checkstyle 9.0, Groovy 3.0.9, Hibernate
 ORM 5.5.7

Includes downgrade of Kotlin language level to 1.8 (for KotlinScriptTemplateTests)
---
 build.gradle             | 6 +++---
 gradle/toolchains.gradle | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8a3207ccc859..3cb2fa7f94c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,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.9') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
@@ -123,7 +123,7 @@ configure(allprojects) { project ->
 			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.5.7.Final"
 			dependency "org.hibernate:hibernate-validator:6.2.0.Final"
 			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
@@ -339,7 +339,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.45.1"
+		toolVersion = "9.0"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 57ca9e51418d..15ee3bcfc526 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -121,12 +121,12 @@ pluginManager.withPlugin("kotlin") {
 		// Fallback to JDK11
 		compileKotlin {
 			kotlinOptions {
-				jvmTarget = '11'
+				jvmTarget = '1.8'
 			}
 		}
 		compileTestKotlin {
 			kotlinOptions {
-				jvmTarget = '11'
+				jvmTarget = '1.8'
 			}
 		}
 	}

From cf2429b0f0ce2a5278bdc2556663caf6cf0b0cae Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Sep 2021 15:30:25 +0200
Subject: [PATCH 101/735] Remove support for deprecated Java SecurityManager
 (-> JDK 17 build compatibility)

Includes hard JDK 9+ API dependency in CGLIB ReflectUtils (Lookup.defineClass) and removal of OutputStream spy proxy usage (avoiding invalid Mockito proxy on JDK 17)

Closes gh-26901
---
 spring-beans/spring-beans.gradle              |   3 +-
 .../beans/BeanWrapperImpl.java                |  69 +--
 .../config/ConfigurableBeanFactory.java       |  10 +-
 .../AbstractAutowireCapableBeanFactory.java   |  82 +--
 .../factory/support/AbstractBeanFactory.java  |  64 +--
 .../factory/support/ConstructorResolver.java  |  34 +-
 .../support/DefaultListableBeanFactory.java   |  36 +-
 .../support/DisposableBeanAdapter.java        |  53 +-
 .../support/FactoryBeanRegistrySupport.java   |  38 +-
 .../support/SecurityContextProvider.java      |  35 --
 .../support/SimpleInstantiationStrategy.java  |  30 +-
 .../SimpleSecurityContextProvider.java        |  62 ---
 .../DefaultListableBeanFactoryTests.java      |  54 --
 .../security/CallbacksSecurityTests.java      | 479 ------------------
 .../security/support/ConstructorBean.java     |  30 --
 .../security/support/CustomCallbackBean.java  |  30 --
 .../security/support/CustomFactoryBean.java   |  44 --
 .../support/security/support/DestroyBean.java |  29 --
 .../support/security/support/FactoryBean.java |  36 --
 .../support/security/support/InitBean.java    |  29 --
 .../security/support/PropertyBean.java        |  30 --
 .../propertyeditors/CustomEditorTests.java    |   2 +-
 .../ApplicationContextAwareProcessor.java     |  23 +-
 .../support/ResourceBundleMessageSource.java  |  36 +-
 .../ApplicationContextExpressionTests.java    |  39 --
 ...onmentSecurityManagerIntegrationTests.java | 119 -----
 .../jmx/support/JmxUtilsTests.java            |  31 +-
 .../support/MBeanServerFactoryBeanTests.java  |   9 +-
 .../jndi/JndiLocatorDelegateTests.java        |  52 --
 .../springframework/util/MBeanTestUtils.java  |   9 +-
 .../cglib/core/ReflectUtils.java              | 100 +---
 .../core/env/AbstractEnvironment.java         |  48 +-
 .../core/env/ConfigurableEnvironment.java     |  18 +-
 .../core/env/ReadOnlySystemAttributesMap.java | 123 -----
 .../env/SystemEnvironmentPropertySource.java  |  18 +-
 .../AbstractRecursiveAnnotationVisitor.java   |   5 +-
 .../AnnotationAttributesReadingVisitor.java   |   4 +-
 .../springframework/util/ReflectionUtils.java |  18 +-
 .../core/env/StandardEnvironmentTests.java    | 105 +---
 .../SystemEnvironmentPropertySourceTests.java |  31 +-
 .../util/StreamUtilsTests.java                |  22 +-
 .../testfixture/env/EnvironmentTestUtils.java |  92 ----
 .../http/MockHttpOutputMessage.java           |   6 +-
 .../FormHttpMessageConverterTests.java        |   7 +-
 .../StringHttpMessageConverterTests.java      |   4 +-
 ...pingJackson2HttpMessageConverterTests.java |   5 +-
 .../ServletRequestAttributesTests.java        |  22 +-
 47 files changed, 147 insertions(+), 2078 deletions(-)
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
 delete mode 100644 spring-core/src/testFixtures/java/org/springframework/core/testfixture/env/EnvironmentTestUtils.java

diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index e3f6f73b763b..bf5fad779f0f 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -23,7 +23,8 @@ sourceSets {
 }
 
 compileGroovy {
-	options.compilerArgs += "-Werror"
+	// Groovy generates Java code with "new Boolean" usage which is deprecated on JDK 17
+	// options.compilerArgs += "-Werror"
 }
 
 // This module also builds Kotlin code and the compileKotlin task naturally depends on
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
index c2fb1aca6f71..df6ee2cede91 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,6 @@
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.Property;
@@ -69,12 +64,6 @@ public class BeanWrapperImpl extends AbstractNestablePropertyAccessor implements
 	@Nullable
 	private CachedIntrospectionResults cachedIntrospectionResults;
 
-	/**
-	 * The security context used for invoking the property methods.
-	 */
-	@Nullable
-	private AccessControlContext acc;
-
 
 	/**
 	 * Create a new empty BeanWrapperImpl. Wrapped instance needs to be set afterwards.
@@ -131,7 +120,6 @@ public BeanWrapperImpl(Object object, String nestedPath, Object rootObject) {
 	 */
 	private BeanWrapperImpl(Object object, String nestedPath, BeanWrapperImpl parent) {
 		super(object, nestedPath, parent);
-		setSecurityContext(parent.acc);
 	}
 
 
@@ -176,23 +164,6 @@ private CachedIntrospectionResults getCachedIntrospectionResults() {
 		return this.cachedIntrospectionResults;
 	}
 
-	/**
-	 * Set the security context used during the invocation of the wrapped instance methods.
-	 * Can be null.
-	 */
-	public void setSecurityContext(@Nullable AccessControlContext acc) {
-		this.acc = acc;
-	}
-
-	/**
-	 * Return the security context used during the invocation of the wrapped instance methods.
-	 * Can be null.
-	 */
-	@Nullable
-	public AccessControlContext getSecurityContext() {
-		return this.acc;
-	}
-
 
 	/**
 	 * Convert the given value for the specified property to the latter's type.
@@ -290,23 +261,8 @@ public TypeDescriptor nested(int level) {
 		@Nullable
 		public Object getValue() throws Exception {
 			Method readMethod = this.pd.getReadMethod();
-			if (System.getSecurityManager() != null) {
-				AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-					ReflectionUtils.makeAccessible(readMethod);
-					return null;
-				});
-				try {
-					return AccessController.doPrivileged((PrivilegedExceptionAction<Object>)
-							() -> readMethod.invoke(getWrappedInstance(), (Object[]) null), acc);
-				}
-				catch (PrivilegedActionException pae) {
-					throw pae.getException();
-				}
-			}
-			else {
-				ReflectionUtils.makeAccessible(readMethod);
-				return readMethod.invoke(getWrappedInstance(), (Object[]) null);
-			}
+			ReflectionUtils.makeAccessible(readMethod);
+			return readMethod.invoke(getWrappedInstance(), (Object[]) null);
 		}
 
 		@Override
@@ -314,23 +270,8 @@ public void setValue(@Nullable Object value) throws Exception {
 			Method writeMethod = (this.pd instanceof GenericTypeAwarePropertyDescriptor ?
 					((GenericTypeAwarePropertyDescriptor) this.pd).getWriteMethodForActualAccess() :
 					this.pd.getWriteMethod());
-			if (System.getSecurityManager() != null) {
-				AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-					ReflectionUtils.makeAccessible(writeMethod);
-					return null;
-				});
-				try {
-					AccessController.doPrivileged((PrivilegedExceptionAction<Object>)
-							() -> writeMethod.invoke(getWrappedInstance(), value), acc);
-				}
-				catch (PrivilegedActionException ex) {
-					throw ex.getException();
-				}
-			}
-			else {
-				ReflectionUtils.makeAccessible(writeMethod);
-				writeMethod.invoke(getWrappedInstance(), value);
-			}
+			ReflectionUtils.makeAccessible(writeMethod);
+			writeMethod.invoke(getWrappedInstance(), value);
 		}
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
index 81f4d8760154..09460499e2be 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.beans.factory.config;
 
 import java.beans.PropertyEditor;
-import java.security.AccessControlContext;
 
 import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.PropertyEditorRegistry;
@@ -291,13 +290,6 @@ public interface ConfigurableBeanFactory extends HierarchicalBeanFactory, Single
 	 */
 	ApplicationStartup getApplicationStartup();
 
-	/**
-	 * Provides a security access control context relevant to this factory.
-	 * @return the applicable AccessControlContext (never {@code null})
-	 * @since 3.0
-	 */
-	AccessControlContext getAccessControlContext();
-
 	/**
 	 * Copy all relevant configuration from the given other factory.
 	 * <p>Should include all standard configuration settings as well as
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index 02b27fe30443..e1a2dbd1d375 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -21,10 +21,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -387,15 +383,7 @@ public Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyC
 			return autowireConstructor(beanClass.getName(), bd, null, null).getWrappedInstance();
 		}
 		else {
-			Object bean;
-			if (System.getSecurityManager() != null) {
-				bean = AccessController.doPrivileged(
-						(PrivilegedAction<Object>) () -> getInstantiationStrategy().instantiate(bd, null, this),
-						getAccessControlContext());
-			}
-			else {
-				bean = getInstantiationStrategy().instantiate(bd, null, this);
-			}
+			Object bean = getInstantiationStrategy().instantiate(bd, null, this);
 			populateBean(beanClass.getName(), bd, new BeanWrapperImpl(bean));
 			return bean;
 		}
@@ -463,8 +451,7 @@ public Object applyBeanPostProcessorsAfterInitialization(Object existingBean, St
 
 	@Override
 	public void destroyBean(Object existingBean) {
-		new DisposableBeanAdapter(
-				existingBean, getBeanPostProcessorCache().destructionAware, getAccessControlContext()).destroy();
+		new DisposableBeanAdapter(existingBean, getBeanPostProcessorCache().destructionAware).destroy();
 	}
 
 
@@ -1316,15 +1303,7 @@ protected Constructor<?>[] determineConstructorsFromBeanPostProcessors(@Nullable
 	 */
 	protected BeanWrapper instantiateBean(String beanName, RootBeanDefinition mbd) {
 		try {
-			Object beanInstance;
-			if (System.getSecurityManager() != null) {
-				beanInstance = AccessController.doPrivileged(
-						(PrivilegedAction<Object>) () -> getInstantiationStrategy().instantiate(mbd, beanName, this),
-						getAccessControlContext());
-			}
-			else {
-				beanInstance = getInstantiationStrategy().instantiate(mbd, beanName, this);
-			}
+			Object beanInstance = getInstantiationStrategy().instantiate(mbd, beanName, this);
 			BeanWrapper bw = new BeanWrapperImpl(beanInstance);
 			initBeanWrapper(bw);
 			return bw;
@@ -1655,10 +1634,6 @@ protected void applyPropertyValues(String beanName, BeanDefinition mbd, BeanWrap
 			return;
 		}
 
-		if (System.getSecurityManager() != null && bw instanceof BeanWrapperImpl) {
-			((BeanWrapperImpl) bw).setSecurityContext(getAccessControlContext());
-		}
-
 		MutablePropertyValues mpvs = null;
 		List<PropertyValue> original;
 
@@ -1781,15 +1756,7 @@ private Object convertForProperty(
 	 * @see #applyBeanPostProcessorsAfterInitialization
 	 */
 	protected Object initializeBean(String beanName, Object bean, @Nullable RootBeanDefinition mbd) {
-		if (System.getSecurityManager() != null) {
-			AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-				invokeAwareMethods(beanName, bean);
-				return null;
-			}, getAccessControlContext());
-		}
-		else {
-			invokeAwareMethods(beanName, bean);
-		}
+		invokeAwareMethods(beanName, bean);
 
 		Object wrappedBean = bean;
 		if (mbd == null || !mbd.isSynthetic()) {
@@ -1848,20 +1815,7 @@ protected void invokeInitMethods(String beanName, Object bean, @Nullable RootBea
 			if (logger.isTraceEnabled()) {
 				logger.trace("Invoking afterPropertiesSet() on bean with name '" + beanName + "'");
 			}
-			if (System.getSecurityManager() != null) {
-				try {
-					AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> {
-						((InitializingBean) bean).afterPropertiesSet();
-						return null;
-					}, getAccessControlContext());
-				}
-				catch (PrivilegedActionException pae) {
-					throw pae.getException();
-				}
-			}
-			else {
-				((InitializingBean) bean).afterPropertiesSet();
-			}
+			((InitializingBean) bean).afterPropertiesSet();
 		}
 
 		if (mbd != null && bean.getClass() != NullBean.class) {
@@ -1910,28 +1864,12 @@ protected void invokeCustomInitMethod(String beanName, Object bean, RootBeanDefi
 		}
 		Method methodToInvoke = ClassUtils.getInterfaceMethodIfPossible(initMethod);
 
-		if (System.getSecurityManager() != null) {
-			AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-				ReflectionUtils.makeAccessible(methodToInvoke);
-				return null;
-			});
-			try {
-				AccessController.doPrivileged((PrivilegedExceptionAction<Object>)
-						() -> methodToInvoke.invoke(bean), getAccessControlContext());
-			}
-			catch (PrivilegedActionException pae) {
-				InvocationTargetException ex = (InvocationTargetException) pae.getException();
-				throw ex.getTargetException();
-			}
+		try {
+			ReflectionUtils.makeAccessible(methodToInvoke);
+			methodToInvoke.invoke(bean);
 		}
-		else {
-			try {
-				ReflectionUtils.makeAccessible(methodToInvoke);
-				methodToInvoke.invoke(bean);
-			}
-			catch (InvocationTargetException ex) {
-				throw ex.getTargetException();
-			}
+		catch (InvocationTargetException ex) {
+			throw ex.getTargetException();
 		}
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index 562c00fd55f1..91a0f6131ce9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,6 @@
 package org.springframework.beans.factory.support;
 
 import java.beans.PropertyEditor;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -166,10 +161,6 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	/** Map from scope identifier String to corresponding Scope. */
 	private final Map<String, Scope> scopes = new LinkedHashMap<>(8);
 
-	/** Security context used when running with a SecurityManager. */
-	@Nullable
-	private SecurityContextProvider securityContextProvider;
-
 	/** Map from bean name to merged RootBeanDefinition. */
 	private final Map<String, RootBeanDefinition> mergedBeanDefinitions = new ConcurrentHashMap<>(256);
 
@@ -495,17 +486,8 @@ public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		}
 		if (isFactoryBean(beanName, mbd)) {
 			FactoryBean<?> fb = (FactoryBean<?>) getBean(FACTORY_BEAN_PREFIX + beanName);
-			if (System.getSecurityManager() != null) {
-				return AccessController.doPrivileged(
-						(PrivilegedAction<Boolean>) () ->
-								((fb instanceof SmartFactoryBean && ((SmartFactoryBean<?>) fb).isPrototype()) ||
-										!fb.isSingleton()),
-						getAccessControlContext());
-			}
-			else {
-				return ((fb instanceof SmartFactoryBean && ((SmartFactoryBean<?>) fb).isPrototype()) ||
-						!fb.isSingleton());
-			}
+			return ((fb instanceof SmartFactoryBean && ((SmartFactoryBean<?>) fb).isPrototype()) ||
+					!fb.isSingleton());
 		}
 		else {
 			return false;
@@ -1054,15 +1036,6 @@ public Scope getRegisteredScope(String scopeName) {
 		return this.scopes.get(scopeName);
 	}
 
-	/**
-	 * Set the security context provider for this bean factory. If a security manager
-	 * is set, interaction with the user code will be executed using the privileged
-	 * of the provided security context.
-	 */
-	public void setSecurityContextProvider(SecurityContextProvider securityProvider) {
-		this.securityContextProvider = securityProvider;
-	}
-
 	@Override
 	public void setApplicationStartup(ApplicationStartup applicationStartup) {
 		Assert.notNull(applicationStartup, "applicationStartup should not be null");
@@ -1074,17 +1047,6 @@ public ApplicationStartup getApplicationStartup() {
 		return this.applicationStartup;
 	}
 
-	/**
-	 * Delegate the creation of the access control context to the
-	 * {@link #setSecurityContextProvider SecurityContextProvider}.
-	 */
-	@Override
-	public AccessControlContext getAccessControlContext() {
-		return (this.securityContextProvider != null ?
-				this.securityContextProvider.getAccessControlContext() :
-				AccessController.getContext());
-	}
-
 	@Override
 	public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 		Assert.notNull(otherFactory, "BeanFactory must not be null");
@@ -1099,7 +1061,6 @@ public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 			this.typeConverter = otherAbstractFactory.typeConverter;
 			this.beanPostProcessors.addAll(otherAbstractFactory.beanPostProcessors);
 			this.scopes.putAll(otherAbstractFactory.scopes);
-			this.securityContextProvider = otherAbstractFactory.securityContextProvider;
 		}
 		else {
 			setTypeConverter(otherFactory.getTypeConverter());
@@ -1222,7 +1183,7 @@ public void destroyBean(String beanName, Object beanInstance) {
 	 */
 	protected void destroyBean(String beanName, Object bean, RootBeanDefinition mbd) {
 		new DisposableBeanAdapter(
-				bean, beanName, mbd, getBeanPostProcessorCache().destructionAware, getAccessControlContext()).destroy();
+				bean, beanName, mbd, getBeanPostProcessorCache().destructionAware).destroy();
 	}
 
 	@Override
@@ -1526,17 +1487,7 @@ protected Class<?> resolveBeanClass(RootBeanDefinition mbd, String beanName, Cla
 			if (mbd.hasBeanClass()) {
 				return mbd.getBeanClass();
 			}
-			if (System.getSecurityManager() != null) {
-				return AccessController.doPrivileged((PrivilegedExceptionAction<Class<?>>)
-						() -> doResolveBeanClass(mbd, typesToMatch), getAccessControlContext());
-			}
-			else {
-				return doResolveBeanClass(mbd, typesToMatch);
-			}
-		}
-		catch (PrivilegedActionException pae) {
-			ClassNotFoundException ex = (ClassNotFoundException) pae.getException();
-			throw new CannotLoadBeanClassException(mbd.getResourceDescription(), beanName, mbd.getBeanClassName(), ex);
+			return doResolveBeanClass(mbd, typesToMatch);
 		}
 		catch (ClassNotFoundException ex) {
 			throw new CannotLoadBeanClassException(mbd.getResourceDescription(), beanName, mbd.getBeanClassName(), ex);
@@ -1925,14 +1876,13 @@ protected boolean requiresDestruction(Object bean, RootBeanDefinition mbd) {
 	 * @see #registerDependentBean
 	 */
 	protected void registerDisposableBeanIfNecessary(String beanName, Object bean, RootBeanDefinition mbd) {
-		AccessControlContext acc = (System.getSecurityManager() != null ? getAccessControlContext() : null);
 		if (!mbd.isPrototype() && requiresDestruction(bean, mbd)) {
 			if (mbd.isSingleton()) {
 				// Register a DisposableBean implementation that performs all destruction
 				// work for the given bean: DestructionAwareBeanPostProcessors,
 				// DisposableBean interface, custom destroy method.
 				registerDisposableBean(beanName, new DisposableBeanAdapter(
-						bean, beanName, mbd, getBeanPostProcessorCache().destructionAware, acc));
+						bean, beanName, mbd, getBeanPostProcessorCache().destructionAware));
 			}
 			else {
 				// A bean with a custom scope...
@@ -1941,7 +1891,7 @@ protected void registerDisposableBeanIfNecessary(String beanName, Object bean, R
 					throw new IllegalStateException("No Scope registered for scope name '" + mbd.getScope() + "'");
 				}
 				scope.registerDestructionCallback(beanName, new DisposableBeanAdapter(
-						bean, beanName, mbd, getBeanPostProcessorCache().destructionAware, acc));
+						bean, beanName, mbd, getBeanPostProcessorCache().destructionAware));
 			}
 		}
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
index 36190c3b817c..cfbc8a99269f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
@@ -22,8 +22,6 @@
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -302,14 +300,7 @@ private Object instantiate(
 
 		try {
 			InstantiationStrategy strategy = this.beanFactory.getInstantiationStrategy();
-			if (System.getSecurityManager() != null) {
-				return AccessController.doPrivileged((PrivilegedAction<Object>) () ->
-						strategy.instantiate(mbd, beanName, this.beanFactory, constructorToUse, argsToUse),
-						this.beanFactory.getAccessControlContext());
-			}
-			else {
-				return strategy.instantiate(mbd, beanName, this.beanFactory, constructorToUse, argsToUse);
-			}
+			return strategy.instantiate(mbd, beanName, this.beanFactory, constructorToUse, argsToUse);
 		}
 		catch (Throwable ex) {
 			throw new BeanCreationException(mbd.getResourceDescription(), beanName,
@@ -365,15 +356,8 @@ private boolean isParamMismatch(Method uniqueCandidate, Method candidate) {
 	 * Called as the starting point for factory method determination.
 	 */
 	private Method[] getCandidateMethods(Class<?> factoryClass, RootBeanDefinition mbd) {
-		if (System.getSecurityManager() != null) {
-			return AccessController.doPrivileged((PrivilegedAction<Method[]>) () ->
-					(mbd.isNonPublicAccessAllowed() ?
-						ReflectionUtils.getAllDeclaredMethods(factoryClass) : factoryClass.getMethods()));
-		}
-		else {
-			return (mbd.isNonPublicAccessAllowed() ?
-					ReflectionUtils.getAllDeclaredMethods(factoryClass) : factoryClass.getMethods());
-		}
+		return (mbd.isNonPublicAccessAllowed() ?
+				ReflectionUtils.getAllDeclaredMethods(factoryClass) : factoryClass.getMethods());
 	}
 
 	/**
@@ -643,16 +627,8 @@ private Object instantiate(String beanName, RootBeanDefinition mbd,
 			@Nullable Object factoryBean, Method factoryMethod, Object[] args) {
 
 		try {
-			if (System.getSecurityManager() != null) {
-				return AccessController.doPrivileged((PrivilegedAction<Object>) () ->
-						this.beanFactory.getInstantiationStrategy().instantiate(
-								mbd, beanName, this.beanFactory, factoryBean, factoryMethod, args),
-						this.beanFactory.getAccessControlContext());
-			}
-			else {
-				return this.beanFactory.getInstantiationStrategy().instantiate(
-						mbd, beanName, this.beanFactory, factoryBean, factoryMethod, args);
-			}
+			return this.beanFactory.getInstantiationStrategy().instantiate(
+					mbd, beanName, this.beanFactory, factoryBean, factoryMethod, args);
 		}
 		catch (Throwable ex) {
 			throw new BeanCreationException(mbd.getResourceDescription(), beanName,
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index 048612fbed73..a4f29b0ce879 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -296,15 +294,7 @@ public Comparator<Object> getDependencyComparator() {
 	public void setAutowireCandidateResolver(AutowireCandidateResolver autowireCandidateResolver) {
 		Assert.notNull(autowireCandidateResolver, "AutowireCandidateResolver must not be null");
 		if (autowireCandidateResolver instanceof BeanFactoryAware) {
-			if (System.getSecurityManager() != null) {
-				AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-					((BeanFactoryAware) autowireCandidateResolver).setBeanFactory(this);
-					return null;
-				}, getAccessControlContext());
-			}
-			else {
-				((BeanFactoryAware) autowireCandidateResolver).setBeanFactory(this);
-			}
+			((BeanFactoryAware) autowireCandidateResolver).setBeanFactory(this);
 		}
 		this.autowireCandidateResolver = autowireCandidateResolver;
 	}
@@ -925,16 +915,8 @@ public void preInstantiateSingletons() throws BeansException {
 					Object bean = getBean(FACTORY_BEAN_PREFIX + beanName);
 					if (bean instanceof FactoryBean) {
 						FactoryBean<?> factory = (FactoryBean<?>) bean;
-						boolean isEagerInit;
-						if (System.getSecurityManager() != null && factory instanceof SmartFactoryBean) {
-							isEagerInit = AccessController.doPrivileged(
-									(PrivilegedAction<Boolean>) ((SmartFactoryBean<?>) factory)::isEagerInit,
-									getAccessControlContext());
-						}
-						else {
-							isEagerInit = (factory instanceof SmartFactoryBean &&
-									((SmartFactoryBean<?>) factory).isEagerInit());
-						}
+						boolean isEagerInit = (factory instanceof SmartFactoryBean &&
+								((SmartFactoryBean<?>) factory).isEagerInit());
 						if (isEagerInit) {
 							getBean(beanName);
 						}
@@ -953,15 +935,7 @@ public void preInstantiateSingletons() throws BeansException {
 				StartupStep smartInitialize = this.getApplicationStartup().start("spring.beans.smart-initialize")
 						.tag("beanName", beanName);
 				SmartInitializingSingleton smartSingleton = (SmartInitializingSingleton) singletonInstance;
-				if (System.getSecurityManager() != null) {
-					AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-						smartSingleton.afterSingletonsInstantiated();
-						return null;
-					}, getAccessControlContext());
-				}
-				else {
-					smartSingleton.afterSingletonsInstantiated();
-				}
+				smartSingleton.afterSingletonsInstantiated();
 				smartInitialize.end();
 			}
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
index 3e779752a952..3d8327a12f25 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
@@ -19,11 +19,6 @@
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -76,9 +71,6 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
 	private final boolean nonPublicAccessAllowed;
 
-	@Nullable
-	private final AccessControlContext acc;
-
 	@Nullable
 	private String destroyMethodName;
 
@@ -98,7 +90,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 	 * (potentially DestructionAwareBeanPostProcessor), if any
 	 */
 	public DisposableBeanAdapter(Object bean, String beanName, RootBeanDefinition beanDefinition,
-			List<DestructionAwareBeanPostProcessor> postProcessors, @Nullable AccessControlContext acc) {
+			List<DestructionAwareBeanPostProcessor> postProcessors) {
 
 		Assert.notNull(bean, "Disposable bean must not be null");
 		this.bean = bean;
@@ -106,7 +98,6 @@ public DisposableBeanAdapter(Object bean, String beanName, RootBeanDefinition be
 		this.invokeDisposableBean =
 				(this.bean instanceof DisposableBean && !beanDefinition.isExternallyManagedDestroyMethod("destroy"));
 		this.nonPublicAccessAllowed = beanDefinition.isNonPublicAccessAllowed();
-		this.acc = acc;
 		String destroyMethodName = inferDestroyMethodIfNecessary(bean, beanDefinition);
 		if (destroyMethodName != null && !(this.invokeDisposableBean && "destroy".equals(destroyMethodName)) &&
 				!beanDefinition.isExternallyManagedDestroyMethod(destroyMethodName)) {
@@ -143,15 +134,12 @@ else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
 	 * @param postProcessors the List of BeanPostProcessors
 	 * (potentially DestructionAwareBeanPostProcessor), if any
 	 */
-	public DisposableBeanAdapter(
-			Object bean, List<DestructionAwareBeanPostProcessor> postProcessors, AccessControlContext acc) {
-
+	public DisposableBeanAdapter(Object bean, List<DestructionAwareBeanPostProcessor> postProcessors) {
 		Assert.notNull(bean, "Disposable bean must not be null");
 		this.bean = bean;
 		this.beanName = bean.getClass().getName();
 		this.invokeDisposableBean = (this.bean instanceof DisposableBean);
 		this.nonPublicAccessAllowed = true;
-		this.acc = acc;
 		this.beanPostProcessors = filterPostProcessors(postProcessors, bean);
 	}
 
@@ -166,7 +154,6 @@ private DisposableBeanAdapter(Object bean, String beanName, boolean invokeDispos
 		this.beanName = beanName;
 		this.invokeDisposableBean = invokeDisposableBean;
 		this.nonPublicAccessAllowed = nonPublicAccessAllowed;
-		this.acc = null;
 		this.destroyMethodName = destroyMethodName;
 		this.beanPostProcessors = postProcessors;
 	}
@@ -190,15 +177,7 @@ public void destroy() {
 				logger.trace("Invoking destroy() on bean with name '" + this.beanName + "'");
 			}
 			try {
-				if (System.getSecurityManager() != null) {
-					AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> {
-						((DisposableBean) this.bean).destroy();
-						return null;
-					}, this.acc);
-				}
-				else {
-					((DisposableBean) this.bean).destroy();
-				}
+				((DisposableBean) this.bean).destroy();
 			}
 			catch (Throwable ex) {
 				String msg = "Invocation of destroy method failed on bean with name '" + this.beanName + "'";
@@ -226,12 +205,7 @@ else if (this.destroyMethodName != null) {
 	@Nullable
 	private Method determineDestroyMethod(String name) {
 		try {
-			if (System.getSecurityManager() != null) {
-				return AccessController.doPrivileged((PrivilegedAction<Method>) () -> findDestroyMethod(name));
-			}
-			else {
-				return findDestroyMethod(name);
-			}
+			return findDestroyMethod(name);
 		}
 		catch (IllegalArgumentException ex) {
 			throw new BeanDefinitionValidationException("Could not find unique destroy method on bean with name '" +
@@ -263,23 +237,8 @@ private void invokeCustomDestroyMethod(final Method destroyMethod) {
 					"' on bean with name '" + this.beanName + "'");
 		}
 		try {
-			if (System.getSecurityManager() != null) {
-				AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-					ReflectionUtils.makeAccessible(destroyMethod);
-					return null;
-				});
-				try {
-					AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () ->
-						destroyMethod.invoke(this.bean, args), this.acc);
-				}
-				catch (PrivilegedActionException pax) {
-					throw (InvocationTargetException) pax.getException();
-				}
-			}
-			else {
-				ReflectionUtils.makeAccessible(destroyMethod);
-				destroyMethod.invoke(this.bean, args);
-			}
+			ReflectionUtils.makeAccessible(destroyMethod);
+			destroyMethod.invoke(this.bean, args);
 		}
 		catch (InvocationTargetException ex) {
 			String msg = "Destroy method '" + this.destroyMethodName + "' on bean with name '" +
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
index fc689a7aec32..6750414847c7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,6 @@
 
 package org.springframework.beans.factory.support;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -56,13 +51,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 	@Nullable
 	protected Class<?> getTypeForFactoryBean(FactoryBean<?> factoryBean) {
 		try {
-			if (System.getSecurityManager() != null) {
-				return AccessController.doPrivileged(
-						(PrivilegedAction<Class<?>>) factoryBean::getObjectType, getAccessControlContext());
-			}
-			else {
-				return factoryBean.getObjectType();
-			}
+			return factoryBean.getObjectType();
 		}
 		catch (Throwable ex) {
 			// Thrown from the FactoryBean's getObjectType implementation.
@@ -156,18 +145,7 @@ protected Object getObjectFromFactoryBean(FactoryBean<?> factory, String beanNam
 	private Object doGetObjectFromFactoryBean(FactoryBean<?> factory, String beanName) throws BeanCreationException {
 		Object object;
 		try {
-			if (System.getSecurityManager() != null) {
-				AccessControlContext acc = getAccessControlContext();
-				try {
-					object = AccessController.doPrivileged((PrivilegedExceptionAction<Object>) factory::getObject, acc);
-				}
-				catch (PrivilegedActionException pae) {
-					throw pae.getException();
-				}
-			}
-			else {
-				object = factory.getObject();
-			}
+			object = factory.getObject();
 		}
 		catch (FactoryBeanNotInitializedException ex) {
 			throw new BeanCurrentlyInCreationException(beanName, ex.toString());
@@ -239,14 +217,4 @@ protected void clearSingletonCache() {
 		}
 	}
 
-	/**
-	 * Return the security context for this bean factory. If a security manager
-	 * is set, interaction with the user code will be executed using the privileged
-	 * of the security context returned by this method.
-	 * @see AccessController#getContext()
-	 */
-	protected AccessControlContext getAccessControlContext() {
-		return AccessController.getContext();
-	}
-
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
deleted file mode 100644
index d2f70c46ebf9..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support;
-
-import java.security.AccessControlContext;
-
-/**
- * Provider of the security context of the code running inside the bean factory.
- *
- * @author Costin Leau
- * @since 3.0
- */
-public interface SecurityContextProvider {
-
-	/**
-	 * Provides a security access control context relevant to a bean factory.
-	 * @return bean factory security control context
-	 */
-	AccessControlContext getAccessControlContext();
-
-}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
index 0b05cf50cc7e..0ae2e3a688c0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
 
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
@@ -70,13 +67,7 @@ public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, Bean
 						throw new BeanInstantiationException(clazz, "Specified class is an interface");
 					}
 					try {
-						if (System.getSecurityManager() != null) {
-							constructorToUse = AccessController.doPrivileged(
-									(PrivilegedExceptionAction<Constructor<?>>) clazz::getDeclaredConstructor);
-						}
-						else {
-							constructorToUse = clazz.getDeclaredConstructor();
-						}
+						constructorToUse = clazz.getDeclaredConstructor();
 						bd.resolvedConstructorOrFactoryMethod = constructorToUse;
 					}
 					catch (Throwable ex) {
@@ -107,13 +98,6 @@ public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, Bean
 			final Constructor<?> ctor, Object... args) {
 
 		if (!bd.hasMethodOverrides()) {
-			if (System.getSecurityManager() != null) {
-				// use own privileged to change accessibility (when security is on)
-				AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-					ReflectionUtils.makeAccessible(ctor);
-					return null;
-				});
-			}
 			return BeanUtils.instantiateClass(ctor, args);
 		}
 		else {
@@ -138,15 +122,7 @@ public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, Bean
 			@Nullable Object factoryBean, final Method factoryMethod, Object... args) {
 
 		try {
-			if (System.getSecurityManager() != null) {
-				AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-					ReflectionUtils.makeAccessible(factoryMethod);
-					return null;
-				});
-			}
-			else {
-				ReflectionUtils.makeAccessible(factoryMethod);
-			}
+			ReflectionUtils.makeAccessible(factoryMethod);
 
 			Method priorInvokedFactoryMethod = currentlyInvokedFactoryMethod.get();
 			try {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
deleted file mode 100644
index b28fbffa3702..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support;
-
-import java.security.AccessControlContext;
-import java.security.AccessController;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Simple {@link SecurityContextProvider} implementation.
- *
- * @author Costin Leau
- * @since 3.0
- */
-public class SimpleSecurityContextProvider implements SecurityContextProvider {
-
-	@Nullable
-	private final AccessControlContext acc;
-
-
-	/**
-	 * Construct a new {@code SimpleSecurityContextProvider} instance.
-	 * <p>The security context will be retrieved on each call from the current
-	 * thread.
-	 */
-	public SimpleSecurityContextProvider() {
-		this(null);
-	}
-
-	/**
-	 * Construct a new {@code SimpleSecurityContextProvider} instance.
-	 * <p>If the given control context is null, the security context will be
-	 * retrieved on each call from the current thread.
-	 * @param acc access control context (can be {@code null})
-	 * @see AccessController#getContext()
-	 */
-	public SimpleSecurityContextProvider(@Nullable AccessControlContext acc) {
-		this.acc = acc;
-	}
-
-
-	@Override
-	public AccessControlContext getAccessControlContext() {
-		return (this.acc != null ? this.acc : AccessController.getContext());
-	}
-
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 8d6f823a7583..2cb8d8a9cd1a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -20,10 +20,6 @@
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Principal;
-import java.security.PrivilegedAction;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Arrays;
@@ -41,7 +37,6 @@
 import java.util.stream.IntStream;
 
 import javax.annotation.Priority;
-import javax.security.auth.Subject;
 
 import org.junit.jupiter.api.Test;
 
@@ -90,7 +85,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
-import org.springframework.core.testfixture.security.TestPrincipal;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringValueResolver;
 
@@ -2602,22 +2596,6 @@ public boolean postProcessAfterInstantiation(Object bean, String beanName) throw
 		}
 	}
 
-	@Test
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	void initSecurityAwarePrototypeBean() {
-		RootBeanDefinition bd = new RootBeanDefinition(TestSecuredBean.class);
-		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bd.setInitMethodName("init");
-		lbf.registerBeanDefinition("test", bd);
-		final Subject subject = new Subject();
-		subject.getPrincipals().add(new TestPrincipal("user1"));
-
-		TestSecuredBean bean = (TestSecuredBean) Subject.doAsPrivileged(subject,
-				(PrivilegedAction) () -> lbf.getBean("test"), null);
-		assertThat(bean).isNotNull();
-		assertThat(bean.getUserName()).isEqualTo("user1");
-	}
-
 	@Test
 	void containsBeanReturnsTrueEvenForAbstractBeanDefinition() {
 		lbf.registerBeanDefinition("abs", BeanDefinitionBuilder
@@ -3058,37 +3036,6 @@ public Object convertIfNecessary(Object value, @Nullable Class requiredType, @Nu
 	}
 
 
-	@SuppressWarnings("unused")
-	private static class TestSecuredBean {
-
-		private String userName;
-
-		void init() {
-			AccessControlContext acc = AccessController.getContext();
-			Subject subject = Subject.getSubject(acc);
-			if (subject == null) {
-				return;
-			}
-			setNameFromPrincipal(subject.getPrincipals());
-		}
-
-		private void setNameFromPrincipal(Set<Principal> principals) {
-			if (principals == null) {
-				return;
-			}
-			for (Iterator<Principal> it = principals.iterator(); it.hasNext();) {
-				Principal p = it.next();
-				this.userName = p.getName();
-				return;
-			}
-		}
-
-		public String getUserName() {
-			return this.userName;
-		}
-	}
-
-
 	@SuppressWarnings("unused")
 	private static class KnowsIfInstantiated {
 
@@ -3105,7 +3052,6 @@ public static boolean wasInstantiated() {
 		public KnowsIfInstantiated() {
 			instantiated = true;
 		}
-
 	}
 
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
deleted file mode 100644
index 368e0b664725..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support.security;
-
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permissions;
-import java.security.Policy;
-import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-import java.util.PropertyPermission;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import javax.security.auth.AuthPermission;
-import javax.security.auth.Subject;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.SmartFactoryBean;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.SecurityContextProvider;
-import org.springframework.beans.factory.support.security.support.ConstructorBean;
-import org.springframework.beans.factory.support.security.support.CustomCallbackBean;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.core.NestedRuntimeException;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.testfixture.security.TestPrincipal;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * Security test case. Checks whether the container uses its privileges for its
- * internal work but does not leak them when touching/calling user code.
- *
- * <p>The first half of the test case checks that permissions are downgraded when
- * calling user code while the second half that the caller code permission get
- * through and Spring doesn't override the permission stack.
- *
- * @author Costin Leau
- */
-public class CallbacksSecurityTests {
-
-	private DefaultListableBeanFactory beanFactory;
-	private SecurityContextProvider provider;
-
-	@SuppressWarnings("unused")
-	private static class NonPrivilegedBean {
-
-		private String expectedName;
-		public static boolean destroyed = false;
-
-		public NonPrivilegedBean(String expected) {
-			this.expectedName = expected;
-			checkCurrentContext();
-		}
-
-		public void init() {
-			checkCurrentContext();
-		}
-
-		public void destroy() {
-			checkCurrentContext();
-			destroyed = true;
-		}
-
-		public void setProperty(Object value) {
-			checkCurrentContext();
-		}
-
-		public Object getProperty() {
-			checkCurrentContext();
-			return null;
-		}
-
-		public void setListProperty(Object value) {
-			checkCurrentContext();
-		}
-
-		public Object getListProperty() {
-			checkCurrentContext();
-			return null;
-		}
-
-		private void checkCurrentContext() {
-			assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
-		}
-	}
-
-	@SuppressWarnings("unused")
-	private static class NonPrivilegedSpringCallbacksBean implements
-			InitializingBean, DisposableBean, BeanClassLoaderAware,
-			BeanFactoryAware, BeanNameAware {
-
-		private String expectedName;
-		public static boolean destroyed = false;
-
-		public NonPrivilegedSpringCallbacksBean(String expected) {
-			this.expectedName = expected;
-			checkCurrentContext();
-		}
-
-		@Override
-		public void afterPropertiesSet() {
-			checkCurrentContext();
-		}
-
-		@Override
-		public void destroy() {
-			checkCurrentContext();
-			destroyed = true;
-		}
-
-		@Override
-		public void setBeanName(String name) {
-			checkCurrentContext();
-		}
-
-		@Override
-		public void setBeanClassLoader(ClassLoader classLoader) {
-			checkCurrentContext();
-		}
-
-		@Override
-		public void setBeanFactory(BeanFactory beanFactory)
-				throws BeansException {
-			checkCurrentContext();
-		}
-
-		private void checkCurrentContext() {
-			assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
-		}
-	}
-
-	@SuppressWarnings({ "unused", "rawtypes" })
-	private static class NonPrivilegedFactoryBean implements SmartFactoryBean {
-		private String expectedName;
-
-		public NonPrivilegedFactoryBean(String expected) {
-			this.expectedName = expected;
-			checkCurrentContext();
-		}
-
-		@Override
-		public boolean isEagerInit() {
-			checkCurrentContext();
-			return false;
-		}
-
-		@Override
-		public boolean isPrototype() {
-			checkCurrentContext();
-			return true;
-		}
-
-		@Override
-		public Object getObject() throws Exception {
-			checkCurrentContext();
-			return new Object();
-		}
-
-		@Override
-		public Class getObjectType() {
-			checkCurrentContext();
-			return Object.class;
-		}
-
-		@Override
-		public boolean isSingleton() {
-			checkCurrentContext();
-			return false;
-		}
-
-		private void checkCurrentContext() {
-			assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
-		}
-	}
-
-	@SuppressWarnings("unused")
-	private static class NonPrivilegedFactory {
-
-		private final String expectedName;
-
-		public NonPrivilegedFactory(String expected) {
-			this.expectedName = expected;
-			assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
-		}
-
-		public static Object makeStaticInstance(String expectedName) {
-			assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
-			return new Object();
-		}
-
-		public Object makeInstance() {
-			assertThat(getCurrentSubjectName()).isEqualTo(expectedName);
-			return new Object();
-		}
-	}
-
-	private static String getCurrentSubjectName() {
-		final AccessControlContext acc = AccessController.getContext();
-
-		return AccessController.doPrivileged(new PrivilegedAction<String>() {
-
-			@Override
-			public String run() {
-				Subject subject = Subject.getSubject(acc);
-				if (subject == null) {
-					return null;
-				}
-
-				Set<Principal> principals = subject.getPrincipals();
-
-				if (principals == null) {
-					return null;
-				}
-				for (Principal p : principals) {
-					return p.getName();
-				}
-				return null;
-			}
-		});
-	}
-
-	public CallbacksSecurityTests() {
-		// setup security
-		if (System.getSecurityManager() == null) {
-			Policy policy = Policy.getPolicy();
-			URL policyURL = getClass()
-					.getResource(
-							"/org/springframework/beans/factory/support/security/policy.all");
-			System.setProperty("java.security.policy", policyURL.toString());
-			System.setProperty("policy.allowSystemProperty", "true");
-			policy.refresh();
-
-			System.setSecurityManager(new SecurityManager());
-		}
-	}
-
-	@BeforeEach
-	public void setUp() throws Exception {
-
-		final ProtectionDomain empty = new ProtectionDomain(null,
-				new Permissions());
-
-		provider = new SecurityContextProvider() {
-			private final AccessControlContext acc = new AccessControlContext(
-					new ProtectionDomain[] { empty });
-
-			@Override
-			public AccessControlContext getAccessControlContext() {
-				return acc;
-			}
-		};
-
-		DefaultResourceLoader drl = new DefaultResourceLoader();
-		Resource config = drl
-				.getResource("/org/springframework/beans/factory/support/security/callbacks.xml");
-		beanFactory = new DefaultListableBeanFactory();
-		new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(config);
-		beanFactory.setSecurityContextProvider(provider);
-	}
-
-	@Test
-	public void testSecuritySanity() throws Exception {
-		AccessControlContext acc = provider.getAccessControlContext();
-		assertThatExceptionOfType(SecurityException.class).as(
-				"Acc should not have any permissions").isThrownBy(() ->
-				acc.checkPermission(new PropertyPermission("*", "read")));
-
-		CustomCallbackBean bean = new CustomCallbackBean();
-		Method method = bean.getClass().getMethod("destroy");
-		method.setAccessible(true);
-
-		assertThatExceptionOfType(Exception.class).isThrownBy(() ->
-				AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> {
-						method.invoke(bean);
-						return null;
-					}, acc));
-
-		Class<ConstructorBean> cl = ConstructorBean.class;
-		assertThatExceptionOfType(Exception.class).isThrownBy(() ->
-				AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () ->
-						cl.newInstance(), acc));
-	}
-
-	@Test
-	public void testSpringInitBean() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("spring-init"))
-			.withCauseInstanceOf(SecurityException.class);
-	}
-
-	@Test
-	public void testCustomInitBean() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("custom-init"))
-			.withCauseInstanceOf(SecurityException.class);
-	}
-
-	@Test
-	public void testSpringDestroyBean() throws Exception {
-		beanFactory.getBean("spring-destroy");
-		beanFactory.destroySingletons();
-		assertThat(System.getProperty("security.destroy")).isNull();
-	}
-
-	@Test
-	public void testCustomDestroyBean() throws Exception {
-		beanFactory.getBean("custom-destroy");
-		beanFactory.destroySingletons();
-		assertThat(System.getProperty("security.destroy")).isNull();
-	}
-
-	@Test
-	public void testCustomFactoryObject() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("spring-factory"))
-			.withCauseInstanceOf(SecurityException.class);
-	}
-
-	@Test
-	public void testCustomFactoryType() throws Exception {
-		assertThat(beanFactory.getType("spring-factory")).isNull();
-		assertThat(System.getProperty("factory.object.type")).isNull();
-	}
-
-	@Test
-	public void testCustomStaticFactoryMethod() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("custom-static-factory-method"))
-			.satisfies(mostSpecificCauseOf(SecurityException.class));
-	}
-
-	@Test
-	public void testCustomInstanceFactoryMethod() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("custom-factory-method"))
-			.satisfies(mostSpecificCauseOf(SecurityException.class));
-	}
-
-	@Test
-	public void testTrustedFactoryMethod() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("privileged-static-factory-method"))
-			.satisfies(mostSpecificCauseOf(SecurityException.class));
-	}
-
-	@Test
-	public void testConstructor() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("constructor"))
-			.satisfies(mostSpecificCauseOf(SecurityException.class));
-	}
-
-	@Test
-	public void testContainerPrivileges() throws Exception {
-		AccessControlContext acc = provider.getAccessControlContext();
-
-		AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-
-			@Override
-			public Object run() throws Exception {
-				beanFactory.getBean("working-factory-method");
-				beanFactory.getBean("container-execution");
-				return null;
-			}
-		}, acc);
-	}
-
-	@Test
-	public void testPropertyInjection() throws Exception {
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
-				beanFactory.getBean("property-injection"))
-			.withMessageContaining("security");
-		beanFactory.getBean("working-property-injection");
-	}
-
-	@Test
-	public void testInitSecurityAwarePrototypeBean() {
-		final DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-		BeanDefinitionBuilder bdb = BeanDefinitionBuilder
-				.genericBeanDefinition(NonPrivilegedBean.class).setScope(
-						BeanDefinition.SCOPE_PROTOTYPE)
-				.setInitMethodName("init").setDestroyMethodName("destroy")
-				.addConstructorArgValue("user1");
-		lbf.registerBeanDefinition("test", bdb.getBeanDefinition());
-		final Subject subject = new Subject();
-		subject.getPrincipals().add(new TestPrincipal("user1"));
-
-		NonPrivilegedBean bean = Subject.doAsPrivileged(
-				subject, new PrivilegedAction<NonPrivilegedBean>() {
-					@Override
-					public NonPrivilegedBean run() {
-						return lbf.getBean("test", NonPrivilegedBean.class);
-					}
-				}, null);
-		assertThat(bean).isNotNull();
-	}
-
-	@Test
-	public void testTrustedExecution() throws Exception {
-		beanFactory.setSecurityContextProvider(null);
-
-		Permissions perms = new Permissions();
-		perms.add(new AuthPermission("getSubject"));
-		ProtectionDomain pd = new ProtectionDomain(null, perms);
-
-		new AccessControlContext(new ProtectionDomain[] { pd });
-
-		final Subject subject = new Subject();
-		subject.getPrincipals().add(new TestPrincipal("user1"));
-
-		// request the beans from non-privileged code
-		Subject.doAsPrivileged(subject, new PrivilegedAction<Object>() {
-
-			@Override
-			public Object run() {
-				// sanity check
-				assertThat(getCurrentSubjectName()).isEqualTo("user1");
-				assertThat(NonPrivilegedBean.destroyed).isEqualTo(false);
-
-				beanFactory.getBean("trusted-spring-callbacks");
-				beanFactory.getBean("trusted-custom-init-destroy");
-				// the factory is a prototype - ask for multiple instances
-				beanFactory.getBean("trusted-spring-factory");
-				beanFactory.getBean("trusted-spring-factory");
-				beanFactory.getBean("trusted-spring-factory");
-
-				beanFactory.getBean("trusted-factory-bean");
-				beanFactory.getBean("trusted-static-factory-method");
-				beanFactory.getBean("trusted-factory-method");
-				beanFactory.getBean("trusted-property-injection");
-				beanFactory.getBean("trusted-working-property-injection");
-
-				beanFactory.destroySingletons();
-				assertThat(NonPrivilegedBean.destroyed).isEqualTo(true);
-				return null;
-			}
-		}, provider.getAccessControlContext());
-	}
-
-	private <E extends NestedRuntimeException> Consumer<E> mostSpecificCauseOf(Class<? extends Throwable> type) {
-		return ex -> assertThat(ex.getMostSpecificCause()).isInstanceOf(type);
-
-	}
-
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
deleted file mode 100644
index fc60fc3db145..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.beans.factory.support.security.support;
-
-/**
- * @author Costin Leau
- */
-public class ConstructorBean {
-
-	public ConstructorBean() {
-		System.getProperties();
-	}
-
-	public ConstructorBean(Object obj) {
-	}
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
deleted file mode 100644
index 4874306e6e12..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support.security.support;
-
-/**
- * @author Costin Leau
- */
-public class CustomCallbackBean {
-
-	public void init() {
-		System.getProperties();
-	}
-
-	public void destroy() {
-		System.setProperty("security.destroy", "true");
-	}
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
deleted file mode 100644
index 4ec3d7131bf9..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support.security.support;
-
-import java.util.Properties;
-
-import org.springframework.beans.factory.FactoryBean;
-
-/**
- * @author Costin Leau
- */
-public class CustomFactoryBean implements FactoryBean<Properties> {
-
-	@Override
-	public Properties getObject() throws Exception {
-		return System.getProperties();
-	}
-
-	@Override
-	public Class<Properties> getObjectType() {
-		System.setProperty("factory.object.type", "true");
-		return Properties.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
deleted file mode 100644
index 67005abf7836..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support.security.support;
-
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Costin Leau
- */
-public class DestroyBean implements DisposableBean {
-
-	@Override
-	public void destroy() throws Exception {
-		System.setProperty("security.destroy", "true");
-	}
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
deleted file mode 100644
index 4f7fb62e5be2..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support.security.support;
-
-/**
- * @author Costin Leau
- */
-public class FactoryBean {
-
-	public static Object makeStaticInstance() {
-		System.getProperties();
-		return new Object();
-	}
-
-	protected static Object protectedStaticInstance() {
-		return "protectedStaticInstance";
-	}
-
-	public Object makeInstance() {
-		System.getProperties();
-		return new Object();
-	}
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
deleted file mode 100644
index 3693bb9d749e..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support.security.support;
-
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * @author Costin Leau
- */
-public class InitBean implements InitializingBean {
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		System.getProperties();
-	}
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
deleted file mode 100644
index 51933137f0da..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.support.security.support;
-
-/**
- * @author Costin Leau
- */
-public class PropertyBean {
-
-	public void setSecurityProperty(Object property) {
-		System.getProperties();
-	}
-
-	public void setProperty(Object property) {
-
-	}
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
index e3dddf62db2e..8962008451ce 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
@@ -502,7 +502,7 @@ void testCharacterEditor() {
 		CharBean cb = new CharBean();
 		BeanWrapper bw = new BeanWrapperImpl(cb);
 
-		bw.setPropertyValue("myChar", new Character('c'));
+		bw.setPropertyValue("myChar", Character.valueOf('c'));
 		assertThat(cb.getMyChar()).isEqualTo('c');
 
 		bw.setPropertyValue("myChar", "c");
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
index a58bb6303470..60b1c3b58af1 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 package org.springframework.context.support;
 
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.EmbeddedValueResolver;
@@ -86,22 +82,7 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) thro
 			return bean;
 		}
 
-		AccessControlContext acc = null;
-
-		if (System.getSecurityManager() != null) {
-			acc = this.applicationContext.getBeanFactory().getAccessControlContext();
-		}
-
-		if (acc != null) {
-			AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-				invokeAwareInterfaces(bean);
-				return null;
-			}, acc);
-		}
-		else {
-			invokeAwareInterfaces(bean);
-		}
-
+		invokeAwareInterfaces(bean);
 		return bean;
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
index f78120b8fead..012237889a49 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,6 @@
 import java.io.Reader;
 import java.net.URL;
 import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.Map;
@@ -400,28 +397,19 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C
 				final String resourceName = toResourceName(bundleName, "properties");
 				final ClassLoader classLoader = loader;
 				final boolean reloadFlag = reload;
-				InputStream inputStream;
-				try {
-					inputStream = AccessController.doPrivileged((PrivilegedExceptionAction<InputStream>) () -> {
-						InputStream is = null;
-						if (reloadFlag) {
-							URL url = classLoader.getResource(resourceName);
-							if (url != null) {
-								URLConnection connection = url.openConnection();
-								if (connection != null) {
-									connection.setUseCaches(false);
-									is = connection.getInputStream();
-								}
-							}
+				InputStream inputStream = null;
+				if (reloadFlag) {
+					URL url = classLoader.getResource(resourceName);
+					if (url != null) {
+						URLConnection connection = url.openConnection();
+						if (connection != null) {
+							connection.setUseCaches(false);
+							inputStream = connection.getInputStream();
 						}
-						else {
-							is = classLoader.getResourceAsStream(resourceName);
-						}
-						return is;
-					});
+					}
 				}
-				catch (PrivilegedActionException ex) {
-					throw (IOException) ex.getException();
+				else {
+					inputStream = classLoader.getResourceAsStream(resourceName);
 				}
 				if (inputStream != null) {
 					String encoding = getDefaultEncoding();
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index 657597bc23f9..827f5f5b0929 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -23,8 +23,6 @@
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URL;
-import java.security.AccessControlException;
-import java.security.Permission;
 import java.util.Optional;
 import java.util.Properties;
 
@@ -237,43 +235,6 @@ void prototypeCreationReevaluatesExpressions() {
 		}
 	}
 
-	@Test
-	void systemPropertiesSecurityManager() {
-		AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext();
-
-		GenericBeanDefinition bd = new GenericBeanDefinition();
-		bd.setBeanClass(TestBean.class);
-		bd.getPropertyValues().add("country", "#{systemProperties.country}");
-		ac.registerBeanDefinition("tb", bd);
-
-		SecurityManager oldSecurityManager = System.getSecurityManager();
-		try {
-			System.setProperty("country", "NL");
-
-			SecurityManager securityManager = new SecurityManager() {
-				@Override
-				public void checkPropertiesAccess() {
-					throw new AccessControlException("Not Allowed");
-				}
-				@Override
-				public void checkPermission(Permission perm) {
-					// allow everything else
-				}
-			};
-			System.setSecurityManager(securityManager);
-			ac.refresh();
-
-			TestBean tb = ac.getBean("tb", TestBean.class);
-			assertThat(tb.getCountry()).isEqualTo("NL");
-
-		}
-		finally {
-			System.setSecurityManager(oldSecurityManager);
-			System.getProperties().remove("country");
-		}
-		ac.close();
-	}
-
 	@Test
 	void stringConcatenationWithDebugLogging() {
 		AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext();
diff --git a/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java
deleted file mode 100644
index 968aba7f695f..000000000000
--- a/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context.support;
-
-import java.security.AccessControlException;
-import java.security.Permission;
-import java.util.Map;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.env.AbstractEnvironment;
-import org.springframework.core.testfixture.env.EnvironmentTestUtils;
-import org.springframework.stereotype.Component;
-
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests integration between Environment and SecurityManagers. See SPR-9970.
- *
- * @author Chris Beams
- */
-public class EnvironmentSecurityManagerIntegrationTests {
-
-	private SecurityManager originalSecurityManager;
-
-	private Map<String, String> env;
-
-
-	@BeforeEach
-	public void setUp() {
-		originalSecurityManager = System.getSecurityManager();
-		env = EnvironmentTestUtils.getModifiableSystemEnvironment();
-		env.put(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME, "p1");
-	}
-
-	@AfterEach
-	public void tearDown() {
-		env.remove(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME);
-		System.setSecurityManager(originalSecurityManager);
-	}
-
-
-	@Test
-	public void securityManagerDisallowsAccessToSystemEnvironmentButAllowsAccessToIndividualKeys() {
-		SecurityManager securityManager = new SecurityManager() {
-			@Override
-			public void checkPermission(Permission perm) {
-				// Disallowing access to System#getenv means that our
-				// ReadOnlySystemAttributesMap will come into play.
-				if ("getenv.*".equals(perm.getName())) {
-					throw new AccessControlException("Accessing the system environment is disallowed");
-				}
-			}
-		};
-		System.setSecurityManager(securityManager);
-
-		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-		AnnotatedBeanDefinitionReader reader = new AnnotatedBeanDefinitionReader(bf);
-		reader.register(C1.class);
-		assertThat(bf.containsBean("c1")).isTrue();
-	}
-
-	@Test
-	public void securityManagerDisallowsAccessToSystemEnvironmentAndDisallowsAccessToIndividualKey() {
-		SecurityManager securityManager = new SecurityManager() {
-			@Override
-			public void checkPermission(Permission perm) {
-				// Disallowing access to System#getenv means that our
-				// ReadOnlySystemAttributesMap will come into play.
-				if ("getenv.*".equals(perm.getName())) {
-					throw new AccessControlException("Accessing the system environment is disallowed");
-				}
-				// Disallowing access to the spring.profiles.active property means that
-				// the BeanDefinitionReader won't be able to determine which profiles are
-				// active. We should see an INFO-level message in the console about this
-				// and as a result, any components marked with a non-default profile will
-				// be ignored.
-				if (("getenv." + AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME).equals(perm.getName())) {
-					throw new AccessControlException(
-							format("Accessing system environment variable [%s] is disallowed",
-									AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME));
-				}
-			}
-		};
-		System.setSecurityManager(securityManager);
-
-		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-		AnnotatedBeanDefinitionReader reader = new AnnotatedBeanDefinitionReader(bf);
-		reader.register(C1.class);
-		assertThat(bf.containsBean("c1")).isFalse();
-	}
-
-
-	@Component("c1")
-	@Profile("p1")
-	static class C1 {
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
index f8ef4348bc00..eba01bd4fe6b 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@
 import java.beans.PropertyDescriptor;
 
 import javax.management.DynamicMBean;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
 import javax.management.MalformedObjectNameException;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
@@ -57,42 +55,42 @@ void isMBean() {
 	}
 
 	@Test
-	void isMBeanWithDynamicMBean() throws Exception {
+	void isMBeanWithDynamicMBean()  {
 		DynamicMBean mbean = new TestDynamicMBean();
 		assertThat(JmxUtils.isMBean(mbean.getClass())).as("Dynamic MBean not detected correctly").isTrue();
 	}
 
 	@Test
-	void isMBeanWithStandardMBeanWrapper() throws Exception {
+	void isMBeanWithStandardMBeanWrapper() throws NotCompliantMBeanException {
 		StandardMBean mbean = new StandardMBean(new JmxTestBean(), IJmxTestBean.class);
 		assertThat(JmxUtils.isMBean(mbean.getClass())).as("Standard MBean not detected correctly").isTrue();
 	}
 
 	@Test
-	void isMBeanWithStandardMBeanInherited() throws Exception {
+	void isMBeanWithStandardMBeanInherited() throws NotCompliantMBeanException {
 		StandardMBean mbean = new StandardMBeanImpl();
 		assertThat(JmxUtils.isMBean(mbean.getClass())).as("Standard MBean not detected correctly").isTrue();
 	}
 
 	@Test
-	void notAnMBean() throws Exception {
+	void notAnMBean()  {
 		assertThat(JmxUtils.isMBean(Object.class)).as("Object incorrectly identified as an MBean").isFalse();
 	}
 
 	@Test
-	void simpleMBean() throws Exception {
+	void simpleMBean()  {
 		Foo foo = new Foo();
 		assertThat(JmxUtils.isMBean(foo.getClass())).as("Simple MBean not detected correctly").isTrue();
 	}
 
 	@Test
-	void simpleMXBean() throws Exception {
+	void simpleMXBean()  {
 		FooX foo = new FooX();
 		assertThat(JmxUtils.isMBean(foo.getClass())).as("Simple MXBean not detected correctly").isTrue();
 	}
 
 	@Test
-	void simpleMBeanThroughInheritance() throws Exception {
+	void simpleMBeanThroughInheritance()  {
 		Bar bar = new Bar();
 		Abc abc = new Abc();
 		assertThat(JmxUtils.isMBean(bar.getClass())).as("Simple MBean (through inheritance) not detected correctly").isTrue();
@@ -126,19 +124,6 @@ void appendIdentityToObjectName() throws MalformedObjectNameException {
 		assertThat(uniqueName.getKeyProperty(JmxUtils.IDENTITY_OBJECT_NAME_KEY)).as("Identity key is incorrect").isEqualTo(ObjectUtils.getIdentityHexString(managedResource));
 	}
 
-	@Test
-	void locatePlatformMBeanServer() {
-		MBeanServer server = null;
-		try {
-			server = JmxUtils.locateMBeanServer();
-		}
-		finally {
-			if (server != null) {
-				MBeanServerFactory.releaseMBeanServer(server);
-			}
-		}
-	}
-
 
 	public static class AttributeTestBean {
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java
index 02a24b48fdca..a0092708c58e 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ void resetMBeanServers() throws Exception {
 	}
 
 	@Test
-	void defaultValues() throws Exception {
+	void defaultValues() {
 		MBeanServerFactoryBean bean = new MBeanServerFactoryBean();
 		bean.afterPropertiesSet();
 		try {
@@ -60,7 +60,7 @@ void defaultValues() throws Exception {
 	}
 
 	@Test
-	void defaultDomain() throws Exception {
+	void defaultDomain() {
 		MBeanServerFactoryBean bean = new MBeanServerFactoryBean();
 		bean.setDefaultDomain("foo");
 		bean.afterPropertiesSet();
@@ -129,7 +129,8 @@ void newMBeanServer() throws Exception {
 		assertCreation(false, "The server should not be available in the list");
 	}
 
-	private void assertCreation(boolean referenceShouldExist, String failMsg) throws Exception {
+
+	private void assertCreation(boolean referenceShouldExist, String failMsg) {
 		MBeanServerFactoryBean bean = new MBeanServerFactoryBean();
 		bean.setRegisterWithFactory(referenceShouldExist);
 		bean.afterPropertiesSet();
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
deleted file mode 100644
index c3601d3b1a26..000000000000
--- a/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- * 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.jndi;
-
-import java.lang.reflect.Field;
-
-import javax.naming.spi.NamingManager;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-
-
-/**
- * Tests for {@link JndiLocatorDelegate}.
- *
- * @author Phillip Webb
- * @author Juergen Hoeller
- */
-public class JndiLocatorDelegateTests {
-
-	@Test
-	public void isDefaultJndiEnvironmentAvailableFalse() throws Exception {
-		Field builderField = NamingManager.class.getDeclaredField("initctx_factory_builder");
-		builderField.setAccessible(true);
-		Object oldBuilder = builderField.get(null);
-		builderField.set(null, null);
-
-		try {
-			assertThat(JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable()).isEqualTo(false);
-		}
-		finally {
-			builderField.set(null, oldBuilder);
-		}
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/util/MBeanTestUtils.java b/spring-context/src/test/java/org/springframework/util/MBeanTestUtils.java
index b96c56053c49..6b214a7f3360 100644
--- a/spring-context/src/test/java/org/springframework/util/MBeanTestUtils.java
+++ b/spring-context/src/test/java/org/springframework/util/MBeanTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.util;
 
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Field;
-
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 
@@ -45,10 +42,6 @@ public static synchronized void resetMBeanServers() throws Exception {
 				}
 			}
 		}
-
-		Field field = ManagementFactory.class.getDeclaredField("platformMBeanServer");
-		field.setAccessible(true);
-		field.set(null, null);
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
index 4420c50c9ee1..76e3ebf7cba0 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
@@ -26,9 +26,6 @@
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56,11 +53,6 @@ private ReflectUtils() {
 
 	private static final ClassLoader defaultLoader = ReflectUtils.class.getClassLoader();
 
-	// SPRING PATCH BEGIN
-	private static final Method privateLookupInMethod;
-
-	private static final Method lookupDefineClassMethod;
-
 	private static final Method classLoaderDefineClassMethod;
 
 	private static final ProtectionDomain PROTECTION_DOMAIN;
@@ -69,63 +61,28 @@ private ReflectUtils() {
 
 	private static final List<Method> OBJECT_METHODS = new ArrayList<Method>();
 
+	// SPRING PATCH BEGIN
 	static {
-		Method privateLookupIn;
-		Method lookupDefineClass;
 		Method classLoaderDefineClass;
 		ProtectionDomain protectionDomain;
 		Throwable throwable = null;
 		try {
-			privateLookupIn = (Method) AccessController.doPrivileged(new PrivilegedExceptionAction() {
-				public Object run() throws Exception {
-					try {
-						return MethodHandles.class.getMethod("privateLookupIn", Class.class, MethodHandles.Lookup.class);
-					}
-					catch (NoSuchMethodException ex) {
-						return null;
-					}
-				}
-			});
-			lookupDefineClass = (Method) AccessController.doPrivileged(new PrivilegedExceptionAction() {
-				public Object run() throws Exception {
-					try {
-						return MethodHandles.Lookup.class.getMethod("defineClass", byte[].class);
-					}
-					catch (NoSuchMethodException ex) {
-						return null;
-					}
-				}
-			});
-			classLoaderDefineClass = (Method) AccessController.doPrivileged(new PrivilegedExceptionAction() {
-				public Object run() throws Exception {
-					return ClassLoader.class.getDeclaredMethod("defineClass",
+			classLoaderDefineClass = ClassLoader.class.getDeclaredMethod("defineClass",
 							String.class, byte[].class, Integer.TYPE, Integer.TYPE, ProtectionDomain.class);
-				}
-			});
 			protectionDomain = getProtectionDomain(ReflectUtils.class);
-			AccessController.doPrivileged(new PrivilegedExceptionAction() {
-				public Object run() throws Exception {
-					Method[] methods = Object.class.getDeclaredMethods();
-					for (Method method : methods) {
-						if ("finalize".equals(method.getName())
-								|| (method.getModifiers() & (Modifier.FINAL | Modifier.STATIC)) > 0) {
-							continue;
-						}
-						OBJECT_METHODS.add(method);
-					}
-					return null;
+			for (Method method : Object.class.getDeclaredMethods()) {
+				if ("finalize".equals(method.getName())
+						|| (method.getModifiers() & (Modifier.FINAL | Modifier.STATIC)) > 0) {
+					continue;
 				}
-			});
+				OBJECT_METHODS.add(method);
+			}
 		}
 		catch (Throwable t) {
-			privateLookupIn = null;
-			lookupDefineClass = null;
 			classLoaderDefineClass = null;
 			protectionDomain = null;
 			throwable = t;
 		}
-		privateLookupInMethod = privateLookupIn;
-		lookupDefineClassMethod = lookupDefineClass;
 		classLoaderDefineClassMethod = classLoaderDefineClass;
 		PROTECTION_DOMAIN = protectionDomain;
 		THROWABLE = throwable;
@@ -160,11 +117,7 @@ public static ProtectionDomain getProtectionDomain(final Class source) {
 		if (source == null) {
 			return null;
 		}
-		return (ProtectionDomain) AccessController.doPrivileged(new PrivilegedAction() {
-			public Object run() {
-				return source.getProtectionDomain();
-			}
-		});
+		return source.getProtectionDomain();
 	}
 
 	public static Type[] getExceptionTypes(Member member) {
@@ -336,15 +289,7 @@ public static Object newInstance(final Constructor cstruct, final Object[] args)
 	public static Constructor getConstructor(Class type, Class[] parameterTypes) {
 		try {
 			Constructor constructor = type.getDeclaredConstructor(parameterTypes);
-			if (System.getSecurityManager() != null) {
-				AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
-					constructor.setAccessible(true);
-					return null;
-				});
-			}
-			else {
-				constructor.setAccessible(true);
-			}
+			constructor.setAccessible(true);
 			return constructor;
 		}
 		catch (NoSuchMethodException e) {
@@ -501,18 +446,12 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 		Class c = null;
 
 		// Preferred option: JDK 9+ Lookup.defineClass API if ClassLoader matches
-		if (contextClass != null && contextClass.getClassLoader() == loader &&
-				privateLookupInMethod != null && lookupDefineClassMethod != null) {
+		if (contextClass != null && contextClass.getClassLoader() == loader) {
 			try {
-				MethodHandles.Lookup lookup = (MethodHandles.Lookup)
-						privateLookupInMethod.invoke(null, contextClass, MethodHandles.lookup());
-				c = (Class) lookupDefineClassMethod.invoke(lookup, b);
+				MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(contextClass, MethodHandles.lookup());
+				c = lookup.defineClass(b);
 			}
-			catch (InvocationTargetException ex) {
-				Throwable target = ex.getTargetException();
-				if (target.getClass() != LinkageError.class && target.getClass() != IllegalArgumentException.class) {
-					throw new CodeGenerationException(target);
-				}
+			catch (LinkageError | IllegalArgumentException ex) {
 				// in case of plain LinkageError (class already defined)
 				// or IllegalArgumentException (class in different package):
 				// fall through to traditional ClassLoader.defineClass below
@@ -567,15 +506,10 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 		}
 
 		// Fallback option: JDK 9+ Lookup.defineClass API even if ClassLoader does not match
-		if (c == null && contextClass != null && contextClass.getClassLoader() != loader &&
-				privateLookupInMethod != null && lookupDefineClassMethod != null) {
+		if (c == null && contextClass != null && contextClass.getClassLoader() != loader) {
 			try {
-				MethodHandles.Lookup lookup = (MethodHandles.Lookup)
-						privateLookupInMethod.invoke(null, contextClass, MethodHandles.lookup());
-				c = (Class) lookupDefineClassMethod.invoke(lookup, b);
-			}
-			catch (InvocationTargetException ex) {
-				throw new CodeGenerationException(ex.getTargetException());
+				MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(contextClass, MethodHandles.lookup());
+				c = lookup.defineClass(b);
 			}
 			catch (Throwable ex) {
 				throw new CodeGenerationException(ex);
diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index 5fa9aa45d2c8..7f983189d6d1 100644
--- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -16,7 +16,6 @@
 
 package org.springframework.core.env;
 
-import java.security.AccessControlException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -60,8 +59,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 * <p>The default is "false", falling back to system environment variable checks if a
 	 * Spring environment property (e.g. a placeholder in a configuration String) isn't
 	 * resolvable otherwise. Consider switching this flag to "true" if you experience
-	 * log warnings from {@code getenv} calls coming from Spring, e.g. on WebSphere
-	 * with strict SecurityManager settings and AccessControlExceptions warnings.
+	 * log warnings from {@code getenv} calls coming from Spring.
 	 * @see #suppressGetenvAccess()
 	 */
 	public static final String IGNORE_GETENV_PROPERTY_NAME = "spring.getenv.ignore";
@@ -438,27 +436,7 @@ public MutablePropertySources getPropertySources() {
 	@Override
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	public Map<String, Object> getSystemProperties() {
-		try {
-			return (Map) System.getProperties();
-		}
-		catch (AccessControlException ex) {
-			return (Map) new ReadOnlySystemAttributesMap() {
-				@Override
-				@Nullable
-				protected String getSystemAttribute(String attributeName) {
-					try {
-						return System.getProperty(attributeName);
-					}
-					catch (AccessControlException ex) {
-						if (logger.isInfoEnabled()) {
-							logger.info("Caught AccessControlException when accessing system property '" +
-									attributeName + "'; its value will be returned [null]. Reason: " + ex.getMessage());
-						}
-						return null;
-					}
-				}
-			};
-		}
+		return (Map) System.getProperties();
 	}
 
 	@Override
@@ -467,27 +445,7 @@ public Map<String, Object> getSystemEnvironment() {
 		if (suppressGetenvAccess()) {
 			return Collections.emptyMap();
 		}
-		try {
-			return (Map) System.getenv();
-		}
-		catch (AccessControlException ex) {
-			return (Map) new ReadOnlySystemAttributesMap() {
-				@Override
-				@Nullable
-				protected String getSystemAttribute(String attributeName) {
-					try {
-						return System.getenv(attributeName);
-					}
-					catch (AccessControlException ex) {
-						if (logger.isInfoEnabled()) {
-							logger.info("Caught AccessControlException when accessing system environment variable '" +
-									attributeName + "'; its value will be returned [null]. Reason: " + ex.getMessage());
-						}
-						return null;
-					}
-				}
-			};
-		}
+		return (Map) System.getenv();
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
index b174ca00cf87..507fbdb8c483 100644
--- a/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,32 +119,20 @@ public interface ConfigurableEnvironment extends Environment, ConfigurableProper
 	MutablePropertySources getPropertySources();
 
 	/**
-	 * Return the value of {@link System#getProperties()} if allowed by the current
-	 * {@link SecurityManager}, otherwise return a map implementation that will attempt
-	 * to access individual keys using calls to {@link System#getProperty(String)}.
+	 * Return the value of {@link System#getProperties()}.
 	 * <p>Note that most {@code Environment} implementations will include this system
 	 * properties map as a default {@link PropertySource} to be searched. Therefore, it is
 	 * recommended that this method not be used directly unless bypassing other property
 	 * sources is expressly intended.
-	 * <p>Calls to {@link Map#get(Object)} on the Map returned will never throw
-	 * {@link IllegalAccessException}; in cases where the SecurityManager forbids access
-	 * to a property, {@code null} will be returned and an INFO-level log message will be
-	 * issued noting the exception.
 	 */
 	Map<String, Object> getSystemProperties();
 
 	/**
-	 * Return the value of {@link System#getenv()} if allowed by the current
-	 * {@link SecurityManager}, otherwise return a map implementation that will attempt
-	 * to access individual keys using calls to {@link System#getenv(String)}.
+	 * Return the value of {@link System#getenv()}.
 	 * <p>Note that most {@link Environment} implementations will include this system
 	 * environment map as a default {@link PropertySource} to be searched. Therefore, it
 	 * is recommended that this method not be used directly unless bypassing other
 	 * property sources is expressly intended.
-	 * <p>Calls to {@link Map#get(Object)} on the Map returned will never throw
-	 * {@link IllegalAccessException}; in cases where the SecurityManager forbids access
-	 * to a property, {@code null} will be returned and an INFO-level log message will be
-	 * issued noting the exception.
 	 */
 	Map<String, Object> getSystemEnvironment();
 
diff --git a/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java b/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
deleted file mode 100644
index 37867bd1d4bf..000000000000
--- a/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- * 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.core.env;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Read-only {@code Map<String, String>} implementation that is backed by system
- * properties or environment variables.
- *
- * <p>Used by {@link AbstractEnvironment} when a {@link SecurityManager} prohibits
- * access to {@link System#getProperties()} or {@link System#getenv()}. It is for this
- * reason that the implementations of {@link #keySet()}, {@link #entrySet()}, and
- * {@link #values()} always return empty even though {@link #get(Object)} may in fact
- * return non-null if the current security manager allows access to individual keys.
- *
- * @author Arjen Poutsma
- * @author Chris Beams
- * @since 3.0
- */
-abstract class ReadOnlySystemAttributesMap implements Map<String, String> {
-
-	@Override
-	public boolean containsKey(Object key) {
-		return (get(key) != null);
-	}
-
-	/**
-	 * Returns the value to which the specified key is mapped, or {@code null} if this map
- 	 * contains no mapping for the key.
-	 * @param key the name of the system attribute to retrieve
-	 * @throws IllegalArgumentException if given key is non-String
-	 */
-	@Override
-	@Nullable
-	public String get(Object key) {
-		if (!(key instanceof String)) {
-			throw new IllegalArgumentException(
-					"Type of key [" + key.getClass().getName() + "] must be java.lang.String");
-		}
-		return getSystemAttribute((String) key);
-	}
-
-	@Override
-	public boolean isEmpty() {
-		return false;
-	}
-
-	/**
-	 * Template method that returns the underlying system attribute.
-	 * <p>Implementations typically call {@link System#getProperty(String)} or {@link System#getenv(String)} here.
-	 */
-	@Nullable
-	protected abstract String getSystemAttribute(String attributeName);
-
-
-	// Unsupported
-
-	@Override
-	public int size() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String put(String key, String value) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public boolean containsValue(Object value) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String remove(Object key) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public void clear() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public Set<String> keySet() {
-		return Collections.emptySet();
-	}
-
-	@Override
-	public void putAll(Map<? extends String, ? extends String> map) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public Collection<String> values() {
-		return Collections.emptySet();
-	}
-
-	@Override
-	public Set<Entry<String, String>> entrySet() {
-		return Collections.emptySet();
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
index 06dd2b7a63b3..6b5f2fa36ac5 100644
--- a/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,34 +122,26 @@ protected final String resolvePropertyName(String name) {
 	@Nullable
 	private String checkPropertyName(String name) {
 		// Check name as-is
-		if (containsKey(name)) {
+		if (this.source.containsKey(name)) {
 			return name;
 		}
 		// Check name with just dots replaced
 		String noDotName = name.replace('.', '_');
-		if (!name.equals(noDotName) && containsKey(noDotName)) {
+		if (!name.equals(noDotName) && this.source.containsKey(noDotName)) {
 			return noDotName;
 		}
 		// Check name with just hyphens replaced
 		String noHyphenName = name.replace('-', '_');
-		if (!name.equals(noHyphenName) && containsKey(noHyphenName)) {
+		if (!name.equals(noHyphenName) && this.source.containsKey(noHyphenName)) {
 			return noHyphenName;
 		}
 		// Check name with dots and hyphens replaced
 		String noDotNoHyphenName = noDotName.replace('-', '_');
-		if (!noDotName.equals(noDotNoHyphenName) && containsKey(noDotNoHyphenName)) {
+		if (!noDotName.equals(noDotNoHyphenName) && this.source.containsKey(noDotNoHyphenName)) {
 			return noDotNoHyphenName;
 		}
 		// Give up
 		return null;
 	}
 
-	private boolean containsKey(String name) {
-		return (isSecurityManagerPresent() ? this.source.keySet().contains(name) : this.source.containsKey(name));
-	}
-
-	protected boolean isSecurityManagerPresent() {
-		return (System.getSecurityManager() != null);
-	}
-
 }
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java
index fa23cebbc2bc..356ab5b46159 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.core.type.classreading;
 
 import java.lang.reflect.Field;
-import java.security.AccessControlException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -97,7 +96,7 @@ protected Object getEnumValue(String asmTypeDescriptor, String attributeValue) {
 		catch (ClassNotFoundException | NoClassDefFoundError ex) {
 			logger.debug("Failed to classload enum type while reading annotation metadata", ex);
 		}
-		catch (IllegalAccessException | AccessControlException ex) {
+		catch (IllegalAccessException ex) {
 			logger.debug("Could not access enum value while reading annotation metadata", ex);
 		}
 		return valueToUse;
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
index e9f1a15f38d0..ba1bfe06cfee 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
@@ -107,9 +107,7 @@ private void recursivelyCollectMetaAnnotations(Set<Annotation> visited, Annotati
 		String annotationName = annotationType.getName();
 		if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotationName) && visited.add(annotation)) {
 			try {
-				// Only do attribute scanning for public annotations; we'd run into
-				// IllegalAccessExceptions otherwise, and we don't want to mess with
-				// accessibility in a SecurityManager environment.
+				// Only do attribute scanning for public annotations.
 				if (Modifier.isPublic(annotationType.getModifiers())) {
 					this.attributesMap.add(annotationName,
 							AnnotationUtils.getAnnotationAttributes(annotation, false, true));
diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
index 2177481f0d30..aa4e79316288 100644
--- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -190,8 +190,7 @@ public static <T> Constructor<T> accessibleConstructor(Class<T> clazz, Class<?>.
 	/**
 	 * Make the given constructor accessible, explicitly setting it accessible
 	 * if necessary. The {@code setAccessible(true)} method is only called
-	 * when actually necessary, to avoid unnecessary conflicts with a JVM
-	 * SecurityManager (if active).
+	 * when actually necessary, to avoid unnecessary conflicts.
 	 * @param ctor the constructor to make accessible
 	 * @see java.lang.reflect.Constructor#setAccessible
 	 */
@@ -441,10 +440,9 @@ public static Method[] getUniqueDeclaredMethods(Class<?> leafClass, @Nullable Me
 
 	/**
 	 * Variant of {@link Class#getDeclaredMethods()} that uses a local cache in
-	 * order to avoid the JVM's SecurityManager check and new Method instances.
-	 * In addition, it also includes Java 8 default methods from locally
-	 * implemented interfaces, since those are effectively to be treated just
-	 * like declared methods.
+	 * order to avoid new Method instances. In addition, it also includes Java 8
+	 * default methods from locally implemented interfaces, since those are
+	 * effectively to be treated just like declared methods.
 	 * @param clazz the class to introspect
 	 * @return the cached array of methods
 	 * @throws IllegalStateException if introspection fails
@@ -561,8 +559,7 @@ public static boolean isCglibRenamedMethod(Method renamedMethod) {
 	/**
 	 * Make the given method accessible, explicitly setting it accessible if
 	 * necessary. The {@code setAccessible(true)} method is only called
-	 * when actually necessary, to avoid unnecessary conflicts with a JVM
-	 * SecurityManager (if active).
+	 * when actually necessary, to avoid unnecessary conflicts.
 	 * @param method the method to make accessible
 	 * @see java.lang.reflect.Method#setAccessible
 	 */
@@ -720,7 +717,7 @@ public static void doWithFields(Class<?> clazz, FieldCallback fc, @Nullable Fiel
 
 	/**
 	 * This variant retrieves {@link Class#getDeclaredFields()} from a local cache
-	 * in order to avoid the JVM's SecurityManager check and defensive array copying.
+	 * in order to avoid defensive array copying.
 	 * @param clazz the class to introspect
 	 * @return the cached array of fields
 	 * @throws IllegalStateException if introspection fails
@@ -774,8 +771,7 @@ public static boolean isPublicStaticFinal(Field field) {
 	/**
 	 * Make the given field accessible, explicitly setting it accessible if
 	 * necessary. The {@code setAccessible(true)} method is only called
-	 * when actually necessary, to avoid unnecessary conflicts with a JVM
-	 * SecurityManager (if active).
+	 * when actually necessary, to avoid unnecessary conflicts.
 	 * @param field the field to make accessible
 	 * @see java.lang.reflect.Field#setAccessible
 	 */
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
index acd6d84acabb..5716a8065025 100644
--- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,12 @@
 
 package org.springframework.core.env;
 
-import java.security.AccessControlException;
-import java.security.Permission;
 import java.util.Arrays;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.SpringProperties;
-import org.springframework.core.testfixture.env.EnvironmentTestUtils;
 import org.springframework.core.testfixture.env.MockPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -381,72 +378,22 @@ void suppressGetenvAccessThroughSpringFlag() {
 	}
 
 	@Test
-	void getSystemProperties_withAndWithoutSecurityManager() {
+	void getSystemProperties() {
 		System.setProperty(ALLOWED_PROPERTY_NAME, ALLOWED_PROPERTY_VALUE);
 		System.setProperty(DISALLOWED_PROPERTY_NAME, DISALLOWED_PROPERTY_VALUE);
 		System.getProperties().put(STRING_PROPERTY_NAME, NON_STRING_PROPERTY_VALUE);
 		System.getProperties().put(NON_STRING_PROPERTY_NAME, STRING_PROPERTY_VALUE);
 
-		{
+		try {
 			Map<?, ?> systemProperties = environment.getSystemProperties();
 			assertThat(systemProperties).isNotNull();
 			assertThat(System.getProperties()).isSameAs(systemProperties);
 			assertThat(systemProperties.get(ALLOWED_PROPERTY_NAME)).isEqualTo(ALLOWED_PROPERTY_VALUE);
 			assertThat(systemProperties.get(DISALLOWED_PROPERTY_NAME)).isEqualTo(DISALLOWED_PROPERTY_VALUE);
-
-			// non-string keys and values work fine... until the security manager is introduced below
 			assertThat(systemProperties.get(STRING_PROPERTY_NAME)).isEqualTo(NON_STRING_PROPERTY_VALUE);
 			assertThat(systemProperties.get(NON_STRING_PROPERTY_NAME)).isEqualTo(STRING_PROPERTY_VALUE);
 		}
-
-		SecurityManager oldSecurityManager = System.getSecurityManager();
-		SecurityManager securityManager = new SecurityManager() {
-			@Override
-			public void checkPropertiesAccess() {
-				// see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperties()
-				throw new AccessControlException("Accessing the system properties is disallowed");
-			}
-			@Override
-			public void checkPropertyAccess(String key) {
-				// see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperty(java.lang.String)
-				if (DISALLOWED_PROPERTY_NAME.equals(key)) {
-					throw new AccessControlException(
-							String.format("Accessing the system property [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
-				}
-			}
-			@Override
-			public void checkPermission(Permission perm) {
-				// allow everything else
-			}
-		};
-
-		try {
-			System.setSecurityManager(securityManager);
-
-			{
-				Map<?, ?> systemProperties = environment.getSystemProperties();
-				assertThat(systemProperties).isNotNull();
-				assertThat(systemProperties).isInstanceOf(ReadOnlySystemAttributesMap.class);
-				assertThat((String)systemProperties.get(ALLOWED_PROPERTY_NAME)).isEqualTo(ALLOWED_PROPERTY_VALUE);
-				assertThat(systemProperties.get(DISALLOWED_PROPERTY_NAME)).isNull();
-
-				// nothing we can do here in terms of warning the user that there was
-				// actually a (non-string) value available. By this point, we only
-				// have access to calling System.getProperty(), which itself returns null
-				// if the value is non-string.  So we're stuck with returning a potentially
-				// misleading null.
-				assertThat(systemProperties.get(STRING_PROPERTY_NAME)).isNull();
-
-				// in the case of a non-string *key*, however, we can do better.  Alert
-				// the user that under these very special conditions (non-object key +
-				// SecurityManager that disallows access to system properties), they
-				// cannot do what they're attempting.
-				assertThatIllegalArgumentException().as("searching with non-string key against ReadOnlySystemAttributesMap").isThrownBy(() ->
-				systemProperties.get(NON_STRING_PROPERTY_NAME));
-			}
-		}
 		finally {
-			System.setSecurityManager(oldSecurityManager);
 			System.clearProperty(ALLOWED_PROPERTY_NAME);
 			System.clearProperty(DISALLOWED_PROPERTY_NAME);
 			System.getProperties().remove(STRING_PROPERTY_NAME);
@@ -455,48 +402,10 @@ public void checkPermission(Permission perm) {
 	}
 
 	@Test
-	void getSystemEnvironment_withAndWithoutSecurityManager() {
-		EnvironmentTestUtils.getModifiableSystemEnvironment().put(ALLOWED_PROPERTY_NAME, ALLOWED_PROPERTY_VALUE);
-		EnvironmentTestUtils.getModifiableSystemEnvironment().put(DISALLOWED_PROPERTY_NAME, DISALLOWED_PROPERTY_VALUE);
-
-		{
-			Map<String, Object> systemEnvironment = environment.getSystemEnvironment();
-			assertThat(systemEnvironment).isNotNull();
-			assertThat(System.getenv()).isSameAs(systemEnvironment);
-		}
-
-		SecurityManager oldSecurityManager = System.getSecurityManager();
-		SecurityManager securityManager = new SecurityManager() {
-			@Override
-			public void checkPermission(Permission perm) {
-				//see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv()
-				if ("getenv.*".equals(perm.getName())) {
-					throw new AccessControlException("Accessing the system environment is disallowed");
-				}
-				//see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv(java.lang.String)
-				if (("getenv."+DISALLOWED_PROPERTY_NAME).equals(perm.getName())) {
-					throw new AccessControlException(
-						String.format("Accessing the system environment variable [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
-				}
-			}
-		};
-
-		try {
-			System.setSecurityManager(securityManager);
-			{
-				Map<String, Object> systemEnvironment = environment.getSystemEnvironment();
-				assertThat(systemEnvironment).isNotNull();
-				assertThat(systemEnvironment).isInstanceOf(ReadOnlySystemAttributesMap.class);
-				assertThat(systemEnvironment.get(ALLOWED_PROPERTY_NAME)).isEqualTo(ALLOWED_PROPERTY_VALUE);
-				assertThat(systemEnvironment.get(DISALLOWED_PROPERTY_NAME)).isNull();
-			}
-		}
-		finally {
-			System.setSecurityManager(oldSecurityManager);
-		}
-
-		EnvironmentTestUtils.getModifiableSystemEnvironment().remove(ALLOWED_PROPERTY_NAME);
-		EnvironmentTestUtils.getModifiableSystemEnvironment().remove(DISALLOWED_PROPERTY_NAME);
+	void getSystemEnvironment() {
+		Map<String, Object> systemEnvironment = environment.getSystemEnvironment();
+		assertThat(systemEnvironment).isNotNull();
+		assertThat(System.getenv()).isSameAs(systemEnvironment);
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
index daca3a701318..ca52768f9002 100644
--- a/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,13 @@
 package org.springframework.core.env;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 /**
  * Unit tests for {@link SystemEnvironmentPropertySource}.
  *
@@ -148,30 +145,4 @@ void withUppercase() {
 		assertThat(ps.getProperty("A.hyphen-KEY")).isEqualTo("a_hyphen_value");
 	}
 
-	@Test
-	@SuppressWarnings("serial")
-	void withSecurityConstraints() throws Exception {
-		envMap = new HashMap<String, Object>() {
-			@Override
-			public boolean containsKey(Object key) {
-				throw new UnsupportedOperationException();
-			}
-			@Override
-			public Set<String> keySet() {
-				return new HashSet<>(super.keySet());
-			}
-		};
-		envMap.put("A_KEY", "a_value");
-
-		ps = new SystemEnvironmentPropertySource("sysEnv", envMap) {
-			@Override
-			protected boolean isSecurityManagerPresent() {
-				return true;
-			}
-		};
-
-		assertThat(ps.containsProperty("A_KEY")).isEqualTo(true);
-		assertThat(ps.getProperty("A_KEY")).isEqualTo("a_value");
-	}
-
 }
diff --git a/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java
index 21f0829457b3..fad81878e7ed 100644
--- a/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,6 @@
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 
 /**
  * Tests for {@link StreamUtils}.
@@ -57,53 +55,47 @@ void setup() {
 
 	@Test
 	void copyToByteArray() throws Exception {
-		InputStream inputStream = spy(new ByteArrayInputStream(bytes));
+		InputStream inputStream = new ByteArrayInputStream(bytes);
 		byte[] actual = StreamUtils.copyToByteArray(inputStream);
 		assertThat(actual).isEqualTo(bytes);
-		verify(inputStream, never()).close();
 	}
 
 	@Test
 	void copyToString() throws Exception {
 		Charset charset = Charset.defaultCharset();
-		InputStream inputStream = spy(new ByteArrayInputStream(string.getBytes(charset)));
+		InputStream inputStream = new ByteArrayInputStream(string.getBytes(charset));
 		String actual = StreamUtils.copyToString(inputStream, charset);
 		assertThat(actual).isEqualTo(string);
-		verify(inputStream, never()).close();
 	}
 
 	@Test
 	void copyBytes() throws Exception {
-		ByteArrayOutputStream out = spy(new ByteArrayOutputStream());
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		StreamUtils.copy(bytes, out);
 		assertThat(out.toByteArray()).isEqualTo(bytes);
-		verify(out, never()).close();
 	}
 
 	@Test
 	void copyString() throws Exception {
 		Charset charset = Charset.defaultCharset();
-		ByteArrayOutputStream out = spy(new ByteArrayOutputStream());
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		StreamUtils.copy(string, charset, out);
 		assertThat(out.toByteArray()).isEqualTo(string.getBytes(charset));
-		verify(out, never()).close();
 	}
 
 	@Test
 	void copyStream() throws Exception {
-		ByteArrayOutputStream out = spy(new ByteArrayOutputStream());
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		StreamUtils.copy(new ByteArrayInputStream(bytes), out);
 		assertThat(out.toByteArray()).isEqualTo(bytes);
-		verify(out, never()).close();
 	}
 
 	@Test
 	void copyRange() throws Exception {
-		ByteArrayOutputStream out = spy(new ByteArrayOutputStream());
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		StreamUtils.copyRange(new ByteArrayInputStream(bytes), out, 0, 100);
 		byte[] range = Arrays.copyOfRange(bytes, 0, 101);
 		assertThat(out.toByteArray()).isEqualTo(range);
-		verify(out, never()).close();
 	}
 
 	@Test
diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/env/EnvironmentTestUtils.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/env/EnvironmentTestUtils.java
deleted file mode 100644
index 8606c47be386..000000000000
--- a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/env/EnvironmentTestUtils.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- * 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.core.testfixture.env;
-
-import java.lang.reflect.Field;
-import java.util.Collections;
-import java.util.Map;
-
-import org.springframework.core.env.StandardEnvironment;
-
-/**
- * Test utilities for {@link StandardEnvironment}.
- *
- * @author Chris Beams
- * @author Juergen Hoeller
- */
-public class EnvironmentTestUtils {
-
-	@SuppressWarnings("unchecked")
-	public static Map<String, String> getModifiableSystemEnvironment() {
-		// for os x / linux
-		Class<?>[] classes = Collections.class.getDeclaredClasses();
-		Map<String, String> env = System.getenv();
-		for (Class<?> cl : classes) {
-			if ("java.util.Collections$UnmodifiableMap".equals(cl.getName())) {
-				try {
-					Field field = cl.getDeclaredField("m");
-					field.setAccessible(true);
-					Object obj = field.get(env);
-					if (obj != null && obj.getClass().getName().equals("java.lang.ProcessEnvironment$StringEnvironment")) {
-						return (Map<String, String>) obj;
-					}
-				}
-				catch (Exception ex) {
-					throw new RuntimeException(ex);
-				}
-			}
-		}
-
-		// for windows
-		Class<?> processEnvironmentClass;
-		try {
-			processEnvironmentClass = Class.forName("java.lang.ProcessEnvironment");
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException(ex);
-		}
-
-		try {
-			Field theCaseInsensitiveEnvironmentField = processEnvironmentClass.getDeclaredField("theCaseInsensitiveEnvironment");
-			theCaseInsensitiveEnvironmentField.setAccessible(true);
-			Object obj = theCaseInsensitiveEnvironmentField.get(null);
-			return (Map<String, String>) obj;
-		}
-		catch (NoSuchFieldException ex) {
-			// do nothing
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException(ex);
-		}
-
-		try {
-			Field theEnvironmentField = processEnvironmentClass.getDeclaredField("theEnvironment");
-			theEnvironmentField.setAccessible(true);
-			Object obj = theEnvironmentField.get(null);
-			return (Map<String, String>) obj;
-		}
-		catch (NoSuchFieldException ex) {
-			// do nothing
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException(ex);
-		}
-
-		throw new IllegalStateException();
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
index 3d2d5bb2a336..c11c36db71cb 100644
--- a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
+++ b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,6 @@
 import java.io.OutputStream;
 import java.nio.charset.Charset;
 
-import static org.mockito.Mockito.spy;
-
 /**
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
@@ -31,7 +29,7 @@ public class MockHttpOutputMessage implements HttpOutputMessage {
 
 	private final HttpHeaders headers = new HttpHeaders();
 
-	private final ByteArrayOutputStream body = spy(new ByteArrayOutputStream());
+	private final ByteArrayOutputStream body = new ByteArrayOutputStream();
 
 	private boolean headersWritten = false;
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
index 05669acc9962..43bfe0552098 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,6 @@
 import org.springframework.util.MultiValueMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
 import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
 import static org.springframework.http.MediaType.MULTIPART_MIXED;
@@ -226,10 +224,9 @@ public String getFilename() {
 		item = items.get(5);
 		assertThat(item.getFieldName()).isEqualTo("xml");
 		assertThat(item.getContentType()).isEqualTo("text/xml");
-		verify(outputMessage.getBody(), never()).close();
 	}
 
-	@Test // SPR-13309
+	@Test  // SPR-13309
 	public void writeMultipartOrder() throws Exception {
 		MyBean myBean = new MyBean();
 		myBean.setString("foo");
diff --git a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
index 3323dbdb3502..4be55e2b821a 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
@@ -102,7 +102,7 @@ public void writeDefaultCharset() throws IOException {
 		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
 	}
 
-	@Test // gh-24123
+	@Test  // gh-24123
 	public void writeJson() throws IOException {
 		String body = "{\"føø\":\"bår\"}";
 		this.converter.write(body, MediaType.APPLICATION_JSON, this.outputMessage);
@@ -114,7 +114,7 @@ public void writeJson() throws IOException {
 		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
 	}
 
-	@Test // gh-25328
+	@Test  // gh-25328
 	public void writeJsonApi() throws IOException {
 		String body = "{\"føø\":\"bår\"}";
 		MediaType contentType = new MediaType("application", "vnd.api.v1+json");
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
index cea6e8c7cf76..cef67ddb80ce 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,8 +47,6 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.entry;
 import static org.assertj.core.api.Assertions.within;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
 
 /**
  * Jackson 2.x converter tests.
@@ -188,7 +186,6 @@ public void write() throws IOException {
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":\"AQI=\"")).isTrue();
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(MediaType.APPLICATION_JSON);
-		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
index b24979a9548e..d71be10683a0 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,13 +51,13 @@ public class ServletRequestAttributesTests {
 
 
 	@Test
-	public void ctorRejectsNullArg() throws Exception {
+	public void ctorRejectsNullArg() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				new ServletRequestAttributes(null));
 	}
 
 	@Test
-	public void setRequestScopedAttribute() throws Exception {
+	public void setRequestScopedAttribute() {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
 		attrs.setAttribute(KEY, VALUE, RequestAttributes.SCOPE_REQUEST);
@@ -66,7 +66,7 @@ public void setRequestScopedAttribute() throws Exception {
 	}
 
 	@Test
-	public void setRequestScopedAttributeAfterCompletion() throws Exception {
+	public void setRequestScopedAttributeAfterCompletion() {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
 		request.close();
@@ -75,7 +75,7 @@ public void setRequestScopedAttributeAfterCompletion() throws Exception {
 	}
 
 	@Test
-	public void setSessionScopedAttribute() throws Exception {
+	public void setSessionScopedAttribute() {
 		MockHttpSession session = new MockHttpSession();
 		session.setAttribute(KEY, VALUE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
@@ -86,7 +86,7 @@ public void setSessionScopedAttribute() throws Exception {
 	}
 
 	@Test
-	public void setSessionScopedAttributeAfterCompletion() throws Exception {
+	public void setSessionScopedAttributeAfterCompletion() {
 		MockHttpSession session = new MockHttpSession();
 		session.setAttribute(KEY, VALUE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
@@ -100,7 +100,7 @@ public void setSessionScopedAttributeAfterCompletion() throws Exception {
 	}
 
 	@Test
-	public void getSessionScopedAttributeDoesNotForceCreationOfSession() throws Exception {
+	public void getSessionScopedAttributeDoesNotForceCreationOfSession() {
 		HttpServletRequest request = mock(HttpServletRequest.class);
 
 		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
@@ -110,7 +110,7 @@ public void getSessionScopedAttributeDoesNotForceCreationOfSession() throws Exce
 	}
 
 	@Test
-	public void removeSessionScopedAttribute() throws Exception {
+	public void removeSessionScopedAttribute() {
 		MockHttpSession session = new MockHttpSession();
 		session.setAttribute(KEY, VALUE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
@@ -122,7 +122,7 @@ public void removeSessionScopedAttribute() throws Exception {
 	}
 
 	@Test
-	public void removeSessionScopedAttributeDoesNotForceCreationOfSession() throws Exception {
+	public void removeSessionScopedAttributeDoesNotForceCreationOfSession() {
 		HttpServletRequest request = mock(HttpServletRequest.class);
 
 		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
@@ -131,7 +131,7 @@ public void removeSessionScopedAttributeDoesNotForceCreationOfSession() throws E
 	}
 
 	@Test
-	public void updateAccessedAttributes() throws Exception {
+	public void updateAccessedAttributes() {
 		HttpServletRequest request = mock(HttpServletRequest.class);
 		HttpSession session = mock(HttpSession.class);
 		given(request.getSession(anyBoolean())).willReturn(session);
@@ -153,7 +153,7 @@ public void skipImmutableString() {
 
 	@Test
 	public void skipImmutableCharacter() {
-		doSkipImmutableValue(new Character('x'));
+		doSkipImmutableValue(Character.valueOf('x'));
 	}
 
 	@Test

From 4e3d1fa4e9da90b21c2e19c29037f0d687ee4f3e Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 16:20:48 +0200
Subject: [PATCH 102/735] Temporarily downgrade Java compat level for AspectJ
 classes

AspectJ doesn't support JDK17 language level (yet).
For the time being, this commit is downgrading the language level for
the aspectJ generated classes to 1.8.

See gh-27416
---
 build.gradle                         | 2 +-
 spring-aspects/spring-aspects.gradle | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3cb2fa7f94c7..54b192d25bcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id 'de.undercouch.download' version '4.1.2'
-	id "io.freefair.aspectj" version '6.1.0' apply false
+	id "io.freefair.aspectj" version '6.2.0' apply false
 	id "com.github.ben-manes.versions" version '0.39.0'
 	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
 	id "me.champeau.jmh" version "0.6.6" apply false
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 4ee0ef3fda68..85c84bfd4670 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -10,6 +10,15 @@ sourceSets.test.java.srcDirs = files()
 
 aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
 
+compileAspectj {
+	sourceCompatibility "1.8"
+	targetCompatibility "1.8"
+}
+compileTestAspectj {
+	sourceCompatibility "1.8"
+	targetCompatibility "1.8"
+}
+
 dependencies {
 	api("org.aspectj:aspectjweaver")
 	compileOnly("org.aspectj:aspectjrt")

From 33cddef026ad7a8c86eac0195377d67f00b37674 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 15 Sep 2021 18:45:15 +0200
Subject: [PATCH 103/735] Upgrade Javadoc URLs for JDK 17 based build

Prior to this commit, the Javadoc task would fail on
`spring-context-indexer` and `spring-instrumentation`. It seems that
missing remote docs or HTTP redirects were failing the process.

This commit removes the missing published Javadocs and updates the
version for the JDK API.

See gh-17778
---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 54b192d25bcd..255ecde3a6df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -365,11 +365,10 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	ext.javadocLinks = [
-			"https://docs.oracle.com/javase/8/docs/api/",
-			"https://docs.oracle.com/javaee/7/api/",
+			"https://docs.oracle.com/en/java/javase/17/docs/api/",
+			"https://javaee.github.io/javaee-spec/javadocs/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
-			"https://glassfish.java.net/nonav/docs/v3/api/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://tiles.apache.org/tiles-request/apidocs/",

From 008aa48d5c97b5f5969662f9cab5b0b7594cf1b5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 16 Sep 2021 14:10:54 +0200
Subject: [PATCH 104/735] Fix formatting for SQL `IN` clause example in ref
 docs

See gh-27388
---
 src/docs/asciidoc/data-access.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index fa0ccbe73f4a..edf4ccbe5636 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -6027,8 +6027,8 @@ limit is 1000.
 
 In addition to the primitive values in the value list, you can create a `java.util.List`
 of object arrays. This list can support multiple expressions being defined for the `in`
-clause, such as `select * from T_ACTOR where (id, last_name) in ((1, 'Johnson'), (2,
-'Harrop'))`. This, of course, requires that your database supports this syntax.
+clause, such as `+++select * from T_ACTOR where (id, last_name) in ((1, 'Johnson'), (2,
+'Harrop'))+++`. This, of course, requires that your database supports this syntax.
 
 
 [[jdbc-complex-types]]

From b74e93807e0443d30cd1a7c5a8671ceae27e3178 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 17 Sep 2021 08:58:19 +0200
Subject: [PATCH 105/735] Remove JDK 9 workarounds etc

See gh-17778
---
 .../aop/framework/AopProxyUtils.java          |  8 +----
 .../cglib/core/ReflectUtils.java              |  4 +--
 .../cglib/core/package-info.java              |  2 +-
 .../cglib/proxy/package-info.java             |  2 +-
 .../core/ReactiveAdapterRegistry.java         | 32 +++++--------------
 .../convert/support/ByteBufferConverter.java  |  8 ++---
 .../core/io/buffer/DefaultDataBuffer.java     | 18 +++--------
 .../org/springframework/util/ClassUtils.java  |  2 +-
 .../springframework/util/ReflectionUtils.java |  6 ++--
 .../util/ObjectUtilsTests.java                |  2 +-
 .../apache/commons/logging/LogAdapter.java    |  2 +-
 .../messaging/simp/stomp/StompDecoder.java    | 14 +++-----
 .../oxm/support/AbstractMarshaller.java       |  4 +--
 .../http/codec/xml/XmlEventDecoder.java       |  5 ++-
 .../xml/SourceHttpMessageConverter.java       |  4 +--
 15 files changed, 36 insertions(+), 77 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
index 12ce1ce86cdc..47bf3deed53c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
@@ -33,7 +33,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Utility methods for AOP proxy factories.
@@ -48,11 +47,6 @@
  */
 public abstract class AopProxyUtils {
 
-	// JDK 17 Class.isSealed() method available?
-	@Nullable
-	private static final Method isSealedMethod = ClassUtils.getMethodIfAvailable(Class.class, "isSealed");
-
-
 	/**
 	 * Obtain the singleton target object behind the given proxy, if any.
 	 * @param candidate the (potential) proxy to check
@@ -142,7 +136,7 @@ else if (Proxy.isProxyClass(targetClass)) {
 		List<Class<?>> proxiedInterfaces = new ArrayList<>(specifiedInterfaces.length + 3);
 		for (Class<?> ifc : specifiedInterfaces) {
 			// Only non-sealed interfaces are actually eligible for JDK proxying (on JDK 17)
-			if (isSealedMethod == null || Boolean.FALSE.equals(ReflectionUtils.invokeMethod(isSealedMethod, ifc))) {
+			if (!ifc.isSealed()) {
 				proxiedInterfaces.add(ifc);
 			}
 		}
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
index 76e3ebf7cba0..d6c0aa2a391b 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
@@ -260,7 +260,7 @@ public static Object newInstance(Class type, Class[] parameterTypes, Object[] ar
 		return newInstance(getConstructor(type, parameterTypes), args);
 	}
 
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	public static Object newInstance(final Constructor cstruct, final Object[] args) {
 		boolean flag = cstruct.isAccessible();
 		try {
@@ -439,7 +439,7 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 		return defineClass(className, b, loader, protectionDomain, null);
 	}
 
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	public static Class defineClass(String className, byte[] b, ClassLoader loader,
 			ProtectionDomain protectionDomain, Class<?> contextClass) throws Exception {
 
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/package-info.java b/spring-core/src/main/java/org/springframework/cglib/core/package-info.java
index a2ed94ff2ead..6d43d8c8bcc2 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/package-info.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/package-info.java
@@ -5,6 +5,6 @@
  *
  * <p>As this repackaging happens at the class file level, sources
  * and javadocs are not available here... except for a few files
- * that have been patched for Spring's purposes on JDK 9/10/11.
+ * that have been patched for Spring's purposes on JDK 9-17.
  */
 package org.springframework.cglib.core;
diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java b/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java
index 0d651c8f0464..9f8cfe268e57 100644
--- a/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java
+++ b/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java
@@ -5,6 +5,6 @@
  *
  * <p>As this repackaging happens at the class file level, sources
  * and javadocs are not available here... except for a few files
- * that have been patched for Spring's purposes on JDK 9/10/11.
+ * that have been patched for Spring's purposes on JDK 9-17.
  */
 package org.springframework.cglib.proxy;
diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index cfeaffcaf734..5010538b6f67 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -16,17 +16,18 @@
 
 package org.springframework.core;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Flow;
 import java.util.function.Function;
 
 import kotlinx.coroutines.CompletableDeferredKt;
 import kotlinx.coroutines.Deferred;
 import org.reactivestreams.Publisher;
+import reactor.adapter.JdkFlowAdapter;
 import reactor.blockhound.BlockHound;
 import reactor.blockhound.integration.BlockHoundIntegration;
 import reactor.core.publisher.Flux;
@@ -36,7 +37,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * A registry of adapters to adapt Reactive Streams {@link Publisher} to/from
@@ -350,28 +350,12 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 	private static class ReactorJdkFlowAdapterRegistrar {
 
 		void registerAdapter(ReactiveAdapterRegistry registry) {
-			// TODO: remove reflection when build requires JDK 9+
-
-			try {
-				String publisherName = "java.util.concurrent.Flow.Publisher";
-				Class<?> publisherClass = ClassUtils.forName(publisherName, getClass().getClassLoader());
-
-				String adapterName = "reactor.adapter.JdkFlowAdapter";
-				Class<?> flowAdapterClass = ClassUtils.forName(adapterName,  getClass().getClassLoader());
-
-				Method toFluxMethod = flowAdapterClass.getMethod("flowPublisherToFlux", publisherClass);
-				Method toFlowMethod = flowAdapterClass.getMethod("publisherToFlowPublisher", Publisher.class);
-				Object emptyFlow = ReflectionUtils.invokeMethod(toFlowMethod, null, Flux.empty());
-
-				registry.registerReactiveType(
-						ReactiveTypeDescriptor.multiValue(publisherClass, () -> emptyFlow),
-						source -> (Publisher<?>) ReflectionUtils.invokeMethod(toFluxMethod, null, source),
-						publisher -> ReflectionUtils.invokeMethod(toFlowMethod, null, publisher)
-				);
-			}
-			catch (Throwable ex) {
-				// Ignore
-			}
+			Flow.Publisher<?> emptyFlow = JdkFlowAdapter.publisherToFlowPublisher(Flux.empty());
+			registry.registerReactiveType(
+					ReactiveTypeDescriptor.multiValue(Flow.Publisher.class, () -> emptyFlow),
+					source -> JdkFlowAdapter.flowPublisherToFlux((Flow.Publisher<?>) source),
+					JdkFlowAdapter::publisherToFlowPublisher
+			);
 		}
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
index 55a1c077474b..0a230ef076c7 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.core.convert.support;
 
-import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.HashSet;
@@ -122,10 +121,7 @@ private Object convertToByteBuffer(@Nullable Object source, TypeDescriptor sourc
 		ByteBuffer byteBuffer = ByteBuffer.allocate(bytes.length);
 		byteBuffer.put(bytes);
 
-		// Extra cast necessary for compiling on JDK 9 plus running on JDK 8, since
-		// otherwise the overridden ByteBuffer-returning rewind method would be chosen
-		// which isn't available on JDK 8.
-		return ((Buffer) byteBuffer).rewind();
+		return byteBuffer.rewind();
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
index be2155f34332..ab6c80a25f45 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -333,18 +332,14 @@ private void write(ByteBuffer source) {
 	public DefaultDataBuffer slice(int index, int length) {
 		checkIndex(index, length);
 		int oldPosition = this.byteBuffer.position();
-		// Explicit access via Buffer base type for compatibility
-		// with covariant return type on JDK 9's ByteBuffer...
-		Buffer buffer = this.byteBuffer;
 		try {
-			buffer.position(index);
+			this.byteBuffer.position(index);
 			ByteBuffer slice = this.byteBuffer.slice();
-			// Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
 			slice.limit(length);
 			return new SlicedDefaultDataBuffer(slice, this.dataBufferFactory, length);
 		}
 		finally {
-			buffer.position(oldPosition);
+			this.byteBuffer.position(oldPosition);
 		}
 	}
 
@@ -358,11 +353,8 @@ public ByteBuffer asByteBuffer(int index, int length) {
 		checkIndex(index, length);
 
 		ByteBuffer duplicate = this.byteBuffer.duplicate();
-		// Explicit access via Buffer base type for compatibility
-		// with covariant return type on JDK 9's ByteBuffer...
-		Buffer buffer = duplicate;
-		buffer.position(index);
-		buffer.limit(index + length);
+		duplicate.position(index);
+		duplicate.limit(index + length);
 		return duplicate.slice();
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
index c9fa24824afb..5bee704483af 100644
--- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
@@ -778,7 +778,7 @@ public static Set<Class<?>> getAllInterfacesForClassAsSet(Class<?> clazz, @Nulla
 	 * conflicting method signatures (or a similar constraint is violated)
 	 * @see java.lang.reflect.Proxy#getProxyClass
 	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	public static Class<?> createCompositeInterface(Class<?>[] interfaces, @Nullable ClassLoader classLoader) {
 		Assert.notEmpty(interfaces, "Interface array must not be empty");
 		return Proxy.getProxyClass(classLoader, interfaces);
diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
index aa4e79316288..e35836f1f5a8 100644
--- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -194,7 +194,7 @@ public static <T> Constructor<T> accessibleConstructor(Class<T> clazz, Class<?>.
 	 * @param ctor the constructor to make accessible
 	 * @see java.lang.reflect.Constructor#setAccessible
 	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	public static void makeAccessible(Constructor<?> ctor) {
 		if ((!Modifier.isPublic(ctor.getModifiers()) ||
 				!Modifier.isPublic(ctor.getDeclaringClass().getModifiers())) && !ctor.isAccessible()) {
@@ -563,7 +563,7 @@ public static boolean isCglibRenamedMethod(Method renamedMethod) {
 	 * @param method the method to make accessible
 	 * @see java.lang.reflect.Method#setAccessible
 	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	public static void makeAccessible(Method method) {
 		if ((!Modifier.isPublic(method.getModifiers()) ||
 				!Modifier.isPublic(method.getDeclaringClass().getModifiers())) && !method.isAccessible()) {
@@ -775,7 +775,7 @@ public static boolean isPublicStaticFinal(Field field) {
 	 * @param field the field to make accessible
 	 * @see java.lang.reflect.Field#setAccessible
 	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	public static void makeAccessible(Field field) {
 		if ((!Modifier.isPublic(field.getModifiers()) ||
 				!Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
diff --git a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
index b18710a1bfde..c89286af88d0 100644
--- a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
@@ -251,7 +251,7 @@ void hashCodeWithBooleanTrue() {
 	@Deprecated
 	void hashCodeWithDouble() {
 		double dbl = 9830.43;
-		int expected = (new Double(dbl)).hashCode();
+		int expected = Double.valueOf(dbl).hashCode();
 		assertThat(ObjectUtils.hashCode(dbl)).isEqualTo(expected);
 	}
 
diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
index c918ee7c2df0..c308340714d0 100644
--- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
+++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
@@ -681,7 +681,7 @@ else if (found) {
 			setSourceMethodName(sourceMethodName);
 		}
 
-		@SuppressWarnings("deprecation")  // setMillis is deprecated in JDK 9
+		@SuppressWarnings("deprecation")
 		protected Object writeReplace() {
 			LogRecord serialized = new LogRecord(getLevel(), getMessage());
 			serialized.setLoggerName(getLoggerName());
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
index d71f78752ccb..70b2c0b2e545 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.messaging.simp.stomp;
 
 import java.io.ByteArrayOutputStream;
-import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -134,11 +133,7 @@ public List<Message<byte[]>> decode(ByteBuffer byteBuffer,
 	private Message<byte[]> decodeMessage(ByteBuffer byteBuffer, @Nullable MultiValueMap<String, String> headers) {
 		Message<byte[]> decodedMessage = null;
 		skipEol(byteBuffer);
-
-		// Explicit mark/reset access via Buffer base type for compatibility
-		// with covariant return type on JDK 9's ByteBuffer...
-		Buffer buffer = byteBuffer;
-		buffer.mark();
+		byteBuffer.mark();
 
 		String command = readCommand(byteBuffer);
 		if (command.length() > 0) {
@@ -176,7 +171,7 @@ private Message<byte[]> decodeMessage(ByteBuffer byteBuffer, @Nullable MultiValu
 						headers.putAll(map);
 					}
 				}
-				buffer.reset();
+				byteBuffer.reset();
 			}
 		}
 		else {
@@ -357,8 +352,7 @@ else if (b == '\r') {
 					throw new StompConversionException("'\\r' must be followed by '\\n'");
 				}
 			}
-			// Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
-			((Buffer) byteBuffer).position(byteBuffer.position() - 1);
+			byteBuffer.position(byteBuffer.position() - 1);
 		}
 		return false;
 	}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
index f492caf38cab..4803cfada497 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -189,7 +189,7 @@ protected DocumentBuilder createDocumentBuilder(DocumentBuilderFactory factory)
 	 * @return the XMLReader
 	 * @throws SAXException if thrown by JAXP methods
 	 */
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	protected XMLReader createXmlReader() throws SAXException {
 		XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
 		xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
index dac546303944..7ee5253fd8e1 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,6 @@ public int getMaxInMemorySize() {
 
 
 	@Override
-	@SuppressWarnings({"rawtypes", "unchecked", "cast"})  // XMLEventReader is Iterator<Object> on JDK 9
 	public Flux<XMLEvent> decode(Publisher<DataBuffer> input, ResolvableType elementType,
 			@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 
@@ -137,7 +136,7 @@ public Flux<XMLEvent> decode(Publisher<DataBuffer> input, ResolvableType element
 					.flatMapIterable(buffer -> {
 						try {
 							InputStream is = buffer.asInputStream();
-							Iterator eventReader = inputFactory.createXMLEventReader(is);
+							Iterator<Object> eventReader = inputFactory.createXMLEventReader(is);
 							List<XMLEvent> result = new ArrayList<>();
 							eventReader.forEachRemaining(event -> result.add((XMLEvent) event));
 							return result;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
index 63c70e30c643..94d4b0d75117 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -197,7 +197,7 @@ private DOMSource readDOMSource(InputStream body, HttpInputMessage inputMessage)
 		}
 	}
 
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	private SAXSource readSAXSource(InputStream body, HttpInputMessage inputMessage) throws IOException {
 		try {
 			XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();

From b7b078d26e4eea472f753b3027d86ddba183b3b9 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 17 Sep 2021 08:58:40 +0200
Subject: [PATCH 106/735] Remove Joda-Time support

Closes gh-27426
---
 .../format/annotation/DateTimeFormat.java     |   1 -
 .../datetime/DateFormatterRegistrar.java      |   3 +-
 ...eTimeFormatAnnotationFormatterFactory.java |   1 -
 .../joda/DateTimeFormatterFactory.java        | 169 ----
 .../joda/DateTimeFormatterFactoryBean.java    |  67 --
 .../format/datetime/joda/DateTimeParser.java  |  54 --
 .../datetime/joda/DurationFormatter.java      |  46 --
 ...eTimeFormatAnnotationFormatterFactory.java | 133 ---
 .../format/datetime/joda/JodaTimeContext.java | 113 ---
 .../datetime/joda/JodaTimeContextHolder.java  |  91 ---
 .../datetime/joda/JodaTimeConverters.java     | 219 -----
 .../joda/JodaTimeFormatterRegistrar.java      | 236 ------
 .../format/datetime/joda/LocalDateParser.java |  55 --
 .../datetime/joda/LocalDateTimeParser.java    |  55 --
 .../format/datetime/joda/LocalTimeParser.java |  55 --
 .../joda/MillisecondInstantPrinter.java       |  52 --
 .../datetime/joda/MonthDayFormatter.java      |  46 --
 .../format/datetime/joda/PeriodFormatter.java |  46 --
 .../datetime/joda/ReadableInstantPrinter.java |  53 --
 .../datetime/joda/ReadablePartialPrinter.java |  53 --
 .../datetime/joda/YearMonthFormatter.java     |  46 --
 .../format/datetime/joda/package-info.java    |   9 -
 .../standard/DateTimeFormatterRegistrar.java  |   1 -
 .../DefaultFormattingConversionService.java   |  16 +-
 .../format/datetime/DateFormatterTests.java   |  42 +-
 .../DateTimeFormatterFactoryBeanTests.java    |  63 --
 .../joda/DateTimeFormatterFactoryTests.java   | 104 ---
 .../joda/JodaTimeFormattingTests.java         | 770 ------------------
 .../FormattingConversionServiceTests.java     | 193 +----
 .../scheduling/support/CronTriggerTests.java  | 235 +++---
 .../json/Jackson2ObjectMapperBuilder.java     |  15 -
 .../json/Jackson2ObjectMapperFactoryBean.java |   4 +-
 .../Jackson2ObjectMapperBuilderTests.java     |  43 +-
 .../Jackson2ObjectMapperFactoryBeanTests.java |  40 +-
 34 files changed, 126 insertions(+), 3003 deletions(-)
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/DurationFormatter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/MonthDayFormatter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/PeriodFormatter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/YearMonthFormatter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
 delete mode 100644 spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java

diff --git a/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
index 612728c5ad11..435ad2b7ec24 100644
--- a/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
+++ b/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
@@ -66,7 +66,6 @@
  * @author Sam Brannen
  * @since 3.0
  * @see java.time.format.DateTimeFormatter
- * @see org.joda.time.format.DateTimeFormat
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java
index 3e7a01b24018..35f361fe6547 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
  * @author Phillip Webb
  * @since 3.2
  * @see org.springframework.format.datetime.standard.DateTimeFormatterRegistrar
- * @see org.springframework.format.datetime.joda.JodaTimeFormatterRegistrar
  * @see FormatterRegistrar#registerFormatters
  */
 public class DateFormatterRegistrar implements FormatterRegistrar {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
index 4c46cd8d0bd0..f9fa9c3a99d7 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
@@ -38,7 +38,6 @@
  * @author Phillip Webb
  * @author Sam Brannen
  * @since 3.2
- * @see org.springframework.format.datetime.joda.JodaDateTimeFormatAnnotationFormatterFactory
  */
 public class DateTimeFormatAnnotationFormatterFactory  extends EmbeddedValueResolutionSupport
 		implements AnnotationFormatterFactory<DateTimeFormat> {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java
deleted file mode 100644
index e276fd278cb4..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.TimeZone;
-
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-
-import org.springframework.format.annotation.DateTimeFormat.ISO;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
-
-/**
- * Factory that creates a Joda-Time {@link DateTimeFormatter}.
- *
- * <p>Formatters will be created using the defined {@link #setPattern pattern},
- * {@link #setIso ISO}, and {@link #setStyle style} methods (considered in that order).
- *
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 3.2
- * @see #createDateTimeFormatter()
- * @see #createDateTimeFormatter(DateTimeFormatter)
- * @see #setPattern
- * @see #setStyle
- * @see #setIso
- * @see DateTimeFormatterFactoryBean
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public class DateTimeFormatterFactory {
-
-	@Nullable
-	private String pattern;
-
-	@Nullable
-	private ISO iso;
-
-	@Nullable
-	private String style;
-
-	@Nullable
-	private TimeZone timeZone;
-
-
-	/**
-	 * Create a new {@code DateTimeFormatterFactory} instance.
-	 */
-	public DateTimeFormatterFactory() {
-	}
-
-	/**
-	 * Create a new {@code DateTimeFormatterFactory} instance.
-	 * @param pattern the pattern to use to format date values
-	 */
-	public DateTimeFormatterFactory(String pattern) {
-		this.pattern = pattern;
-	}
-
-
-	/**
-	 * Set the pattern to use to format date values.
-	 * @param pattern the format pattern
-	 */
-	public void setPattern(String pattern) {
-		this.pattern = pattern;
-	}
-
-	/**
-	 * Set the ISO format used to format date values.
-	 * @param iso the ISO format
-	 */
-	public void setIso(ISO iso) {
-		this.iso = iso;
-	}
-
-	/**
-	 * Set the two characters to use to format date values, in Joda-Time style.
-	 * <p>The first character is used for the date style; the second is for
-	 * the time style. Supported characters are:
-	 * <ul>
-	 * <li>'S' = Small</li>
-	 * <li>'M' = Medium</li>
-	 * <li>'L' = Long</li>
-	 * <li>'F' = Full</li>
-	 * <li>'-' = Omitted</li>
-	 * </ul>
-	 * @param style two characters from the set {"S", "M", "L", "F", "-"}
-	 */
-	public void setStyle(String style) {
-		this.style = style;
-	}
-
-	/**
-	 * Set the {@code TimeZone} to normalize the date values into, if any.
-	 * @param timeZone the time zone
-	 */
-	public void setTimeZone(TimeZone timeZone) {
-		this.timeZone = timeZone;
-	}
-
-
-	/**
-	 * Create a new {@code DateTimeFormatter} using this factory.
-	 * <p>If no specific pattern or style has been defined,
-	 * {@link DateTimeFormat#mediumDateTime() medium date time format} will be used.
-	 * @return a new date time formatter
-	 * @see #createDateTimeFormatter(DateTimeFormatter)
-	 */
-	public DateTimeFormatter createDateTimeFormatter() {
-		return createDateTimeFormatter(DateTimeFormat.mediumDateTime());
-	}
-
-	/**
-	 * Create a new {@code DateTimeFormatter} using this factory.
-	 * <p>If no specific pattern or style has been defined,
-	 * the supplied {@code fallbackFormatter} will be used.
-	 * @param fallbackFormatter the fall-back formatter to use
-	 * when no specific factory properties have been set
-	 * @return a new date time formatter
-	 */
-	public DateTimeFormatter createDateTimeFormatter(DateTimeFormatter fallbackFormatter) {
-		DateTimeFormatter dateTimeFormatter = null;
-		if (StringUtils.hasLength(this.pattern)) {
-			dateTimeFormatter = DateTimeFormat.forPattern(this.pattern);
-		}
-		else if (this.iso != null && this.iso != ISO.NONE) {
-			switch (this.iso) {
-				case DATE:
-					dateTimeFormatter = ISODateTimeFormat.date();
-					break;
-				case TIME:
-					dateTimeFormatter = ISODateTimeFormat.time();
-					break;
-				case DATE_TIME:
-					dateTimeFormatter = ISODateTimeFormat.dateTime();
-					break;
-				default:
-					throw new IllegalStateException("Unsupported ISO format: " + this.iso);
-			}
-		}
-		else if (StringUtils.hasLength(this.style)) {
-			dateTimeFormatter = DateTimeFormat.forStyle(this.style);
-		}
-
-		if (dateTimeFormatter != null && this.timeZone != null) {
-			dateTimeFormatter = dateTimeFormatter.withZone(DateTimeZone.forTimeZone(this.timeZone));
-		}
-		return (dateTimeFormatter != null ? dateTimeFormatter : fallbackFormatter);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java
deleted file mode 100644
index d7a0aa3a8f47..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link FactoryBean} that creates a Joda-Time {@link DateTimeFormatter}.
- * See the {@link DateTimeFormatterFactory base class} for configuration details.
- *
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 3.2
- * @see #setPattern
- * @see #setIso
- * @see #setStyle
- * @see DateTimeFormatterFactory
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public class DateTimeFormatterFactoryBean extends DateTimeFormatterFactory
-		implements FactoryBean<DateTimeFormatter>, InitializingBean {
-
-	@Nullable
-	private DateTimeFormatter dateTimeFormatter;
-
-
-	@Override
-	public void afterPropertiesSet() {
-		this.dateTimeFormatter = createDateTimeFormatter();
-	}
-
-	@Override
-	@Nullable
-	public DateTimeFormatter getObject() {
-		return this.dateTimeFormatter;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return DateTimeFormatter.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
deleted file mode 100644
index 99cc1e595324..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.Parser;
-
-/**
- * Parses Joda {@link DateTime} instances using a {@link DateTimeFormatter}.
- *
- * @author Keith Donald
- * @since 3.0
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class DateTimeParser implements Parser<DateTime> {
-
-	private final DateTimeFormatter formatter;
-
-
-	/**
-	 * Create a new DateTimeParser.
-	 * @param formatter the Joda DateTimeFormatter instance
-	 */
-	public DateTimeParser(DateTimeFormatter formatter) {
-		this.formatter = formatter;
-	}
-
-
-	@Override
-	public DateTime parse(String text, Locale locale) throws ParseException {
-		return JodaTimeContextHolder.getFormatter(this.formatter, locale).parseDateTime(text);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DurationFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DurationFormatter.java
deleted file mode 100644
index fe30ac4c017a..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DurationFormatter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.Duration;
-
-import org.springframework.format.Formatter;
-
-/**
- * {@link Formatter} implementation for a Joda-Time {@link Duration},
- * following Joda-Time's parsing rules for a Duration.
- *
- * @author Juergen Hoeller
- * @since 4.2.4
- * @see Duration#parse
- */
-class DurationFormatter implements Formatter<Duration> {
-
-	@Override
-	public Duration parse(String text, Locale locale) throws ParseException {
-		return Duration.parse(text);
-	}
-
-	@Override
-	public String print(Duration object, Locale locale) {
-		return object.toString();
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
deleted file mode 100644
index 3d5d541cf50f..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
-import org.joda.time.ReadableInstant;
-import org.joda.time.ReadablePartial;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.context.support.EmbeddedValueResolutionSupport;
-import org.springframework.format.AnnotationFormatterFactory;
-import org.springframework.format.Parser;
-import org.springframework.format.Printer;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.util.StringUtils;
-
-/**
- * Formats fields annotated with the {@link DateTimeFormat} annotation using Joda-Time.
- *
- * <p><b>NOTE:</b> Spring's Joda-Time support requires Joda-Time 2.x, as of Spring 4.0.
- *
- * @author Keith Donald
- * @author Juergen Hoeller
- * @since 3.0
- * @see DateTimeFormat
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public class JodaDateTimeFormatAnnotationFormatterFactory extends EmbeddedValueResolutionSupport
-		implements AnnotationFormatterFactory<DateTimeFormat> {
-
-	private static final Set<Class<?>> FIELD_TYPES;
-
-	static {
-		// Create the set of field types that may be annotated with @DateTimeFormat.
-		// Note: the 3 ReadablePartial concrete types are registered explicitly since
-		// addFormatterForFieldType rules exist for each of these types
-		// (if we did not do this, the default byType rules for LocalDate, LocalTime,
-		// and LocalDateTime would take precedence over the annotation rule, which
-		// is not what we want)
-		Set<Class<?>> fieldTypes = new HashSet<>(8);
-		fieldTypes.add(ReadableInstant.class);
-		fieldTypes.add(LocalDate.class);
-		fieldTypes.add(LocalTime.class);
-		fieldTypes.add(LocalDateTime.class);
-		fieldTypes.add(Date.class);
-		fieldTypes.add(Calendar.class);
-		fieldTypes.add(Long.class);
-		FIELD_TYPES = Collections.unmodifiableSet(fieldTypes);
-	}
-
-
-	@Override
-	public final Set<Class<?>> getFieldTypes() {
-		return FIELD_TYPES;
-	}
-
-	@Override
-	public Printer<?> getPrinter(DateTimeFormat annotation, Class<?> fieldType) {
-		DateTimeFormatter formatter = getFormatter(annotation, fieldType);
-		if (ReadablePartial.class.isAssignableFrom(fieldType)) {
-			return new ReadablePartialPrinter(formatter);
-		}
-		else if (ReadableInstant.class.isAssignableFrom(fieldType) || Calendar.class.isAssignableFrom(fieldType)) {
-			// assumes Calendar->ReadableInstant converter is registered
-			return new ReadableInstantPrinter(formatter);
-		}
-		else {
-			// assumes Date->Long converter is registered
-			return new MillisecondInstantPrinter(formatter);
-		}
-	}
-
-	@Override
-	public Parser<?> getParser(DateTimeFormat annotation, Class<?> fieldType) {
-		if (LocalDate.class == fieldType) {
-			return new LocalDateParser(getFormatter(annotation, fieldType));
-		}
-		else if (LocalTime.class == fieldType) {
-			return new LocalTimeParser(getFormatter(annotation, fieldType));
-		}
-		else if (LocalDateTime.class == fieldType) {
-			return new LocalDateTimeParser(getFormatter(annotation, fieldType));
-		}
-		else {
-			return new DateTimeParser(getFormatter(annotation, fieldType));
-		}
-	}
-
-	/**
-	 * Factory method used to create a {@link DateTimeFormatter}.
-	 * @param annotation the format annotation for the field
-	 * @param fieldType the type of field
-	 * @return a {@link DateTimeFormatter} instance
-	 * @since 3.2
-	 */
-	protected DateTimeFormatter getFormatter(DateTimeFormat annotation, Class<?> fieldType) {
-		DateTimeFormatterFactory factory = new DateTimeFormatterFactory();
-		String style = resolveEmbeddedValue(annotation.style());
-		if (StringUtils.hasLength(style)) {
-			factory.setStyle(style);
-		}
-		factory.setIso(annotation.iso());
-		String pattern = resolveEmbeddedValue(annotation.pattern());
-		if (StringUtils.hasLength(pattern)) {
-			factory.setPattern(pattern);
-		}
-		return factory.createDateTimeFormatter();
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
deleted file mode 100644
index c544497d0fb1..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.TimeZone;
-
-import org.joda.time.Chronology;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.context.i18n.LocaleContext;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.context.i18n.TimeZoneAwareLocaleContext;
-import org.springframework.lang.Nullable;
-
-/**
- * A context that holds user-specific Joda-Time settings such as the user's
- * Chronology (calendar system) and time zone.
- *
- * <p>A {@code null} property value indicate the user has not specified a setting.
- *
- * @author Keith Donald
- * @since 3.0
- * @see JodaTimeContextHolder
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public class JodaTimeContext {
-
-	@Nullable
-	private Chronology chronology;
-
-	@Nullable
-	private DateTimeZone timeZone;
-
-
-	/**
-	 * Set the user's chronology (calendar system).
-	 */
-	public void setChronology(@Nullable Chronology chronology) {
-		this.chronology = chronology;
-	}
-
-	/**
-	 * Return the user's chronology (calendar system), if any.
-	 */
-	@Nullable
-	public Chronology getChronology() {
-		return this.chronology;
-	}
-
-	/**
-	 * Set the user's time zone.
-	 * <p>Alternatively, set a {@link TimeZoneAwareLocaleContext} on
-	 * {@link LocaleContextHolder}. This context class will fall back to
-	 * checking the locale context if no setting has been provided here.
-	 * @see org.springframework.context.i18n.LocaleContextHolder#getTimeZone()
-	 * @see org.springframework.context.i18n.LocaleContextHolder#setLocaleContext
-	 */
-	public void setTimeZone(@Nullable DateTimeZone timeZone) {
-		this.timeZone = timeZone;
-	}
-
-	/**
-	 * Return the user's time zone, if any.
-	 */
-	@Nullable
-	public DateTimeZone getTimeZone() {
-		return this.timeZone;
-	}
-
-
-	/**
-	 * 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
-	 */
-	public DateTimeFormatter getFormatter(DateTimeFormatter formatter) {
-		if (this.chronology != null) {
-			formatter = formatter.withChronology(this.chronology);
-		}
-		if (this.timeZone != null) {
-			formatter = formatter.withZone(this.timeZone);
-		}
-		else {
-			LocaleContext localeContext = LocaleContextHolder.getLocaleContext();
-			if (localeContext instanceof TimeZoneAwareLocaleContext) {
-				TimeZone timeZone = ((TimeZoneAwareLocaleContext) localeContext).getTimeZone();
-				if (timeZone != null) {
-					formatter = formatter.withZone(DateTimeZone.forTimeZone(timeZone));
-				}
-			}
-		}
-		return formatter;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
deleted file mode 100644
index 44cd2e93911c..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.Locale;
-
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.core.NamedThreadLocal;
-import org.springframework.lang.Nullable;
-
-/**
- * A holder for a thread-local {@link JodaTimeContext}
- * with user-specific Joda-Time settings.
- *
- * @author Keith Donald
- * @author Juergen Hoeller
- * @since 3.0
- * @see org.springframework.context.i18n.LocaleContextHolder
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class JodaTimeContextHolder {
-
-	private static final ThreadLocal<JodaTimeContext> jodaTimeContextHolder =
-			new NamedThreadLocal<>("JodaTimeContext");
-
-
-	private JodaTimeContextHolder() {
-	}
-
-
-	/**
-	 * Reset the JodaTimeContext for the current thread.
-	 */
-	public static void resetJodaTimeContext() {
-		jodaTimeContextHolder.remove();
-	}
-
-	/**
-	 * Associate the given JodaTimeContext with the current thread.
-	 * @param jodaTimeContext the current JodaTimeContext,
-	 * or {@code null} to reset the thread-bound context
-	 */
-	public static void setJodaTimeContext(@Nullable JodaTimeContext jodaTimeContext) {
-		if (jodaTimeContext == null) {
-			resetJodaTimeContext();
-		}
-		else {
-			jodaTimeContextHolder.set(jodaTimeContext);
-		}
-	}
-
-	/**
-	 * Return the JodaTimeContext associated with the current thread, if any.
-	 * @return the current JodaTimeContext, or {@code null} if none
-	 */
-	@Nullable
-	public static JodaTimeContext getJodaTimeContext() {
-		return jodaTimeContextHolder.get();
-	}
-
-
-	/**
-	 * 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)
-	 * @return the user-specific DateTimeFormatter
-	 */
-	public static DateTimeFormatter getFormatter(DateTimeFormatter formatter, @Nullable Locale locale) {
-		DateTimeFormatter formatterToUse = (locale != null ? formatter.withLocale(locale) : formatter);
-		JodaTimeContext context = getJodaTimeContext();
-		return (context != null ? context.getFormatter(formatterToUse) : formatterToUse);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
deleted file mode 100644
index 84ba3d035c72..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.joda.time.DateTime;
-import org.joda.time.Instant;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
-import org.joda.time.MutableDateTime;
-import org.joda.time.ReadableInstant;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.convert.converter.ConverterRegistry;
-import org.springframework.format.datetime.DateFormatterRegistrar;
-
-/**
- * Installs lower-level type converters required to integrate
- * Joda-Time support into Spring's field formatting system.
- *
- * <p>Note: {@link JodaTimeFormatterRegistrar} installs these converters
- * and relies on several of them for its formatters. Some additional
- * converters are just being registered for custom conversion scenarios.
- *
- * @author Keith Donald
- * @author Phillip Webb
- * @author Juergen Hoeller
- * @since 3.0
- */
-final class JodaTimeConverters {
-
-	private JodaTimeConverters() {
-	}
-
-
-	/**
-	 * Install the converters into the converter registry.
-	 * @param registry the converter registry
-	 */
-	@SuppressWarnings("deprecation")
-	public static void registerConverters(ConverterRegistry registry) {
-		DateFormatterRegistrar.addDateConverters(registry);
-
-		registry.addConverter(new DateTimeToLocalDateConverter());
-		registry.addConverter(new DateTimeToLocalTimeConverter());
-		registry.addConverter(new DateTimeToLocalDateTimeConverter());
-		registry.addConverter(new DateTimeToDateMidnightConverter());
-		registry.addConverter(new DateTimeToMutableDateTimeConverter());
-		registry.addConverter(new DateTimeToInstantConverter());
-		registry.addConverter(new DateTimeToDateConverter());
-		registry.addConverter(new DateTimeToCalendarConverter());
-		registry.addConverter(new DateTimeToLongConverter());
-		registry.addConverter(new DateToReadableInstantConverter());
-		registry.addConverter(new CalendarToReadableInstantConverter());
-		registry.addConverter(new LongToReadableInstantConverter());
-		registry.addConverter(new LocalDateTimeToLocalDateConverter());
-		registry.addConverter(new LocalDateTimeToLocalTimeConverter());
-	}
-
-
-	private static class DateTimeToLocalDateConverter implements Converter<DateTime, LocalDate> {
-
-		@Override
-		public LocalDate convert(DateTime source) {
-			return source.toLocalDate();
-		}
-	}
-
-
-	private static class DateTimeToLocalTimeConverter implements Converter<DateTime, LocalTime> {
-
-		@Override
-		public LocalTime convert(DateTime source) {
-			return source.toLocalTime();
-		}
-	}
-
-
-	private static class DateTimeToLocalDateTimeConverter implements Converter<DateTime, LocalDateTime> {
-
-		@Override
-		public LocalDateTime convert(DateTime source) {
-			return source.toLocalDateTime();
-		}
-	}
-
-
-	@Deprecated
-	private static class DateTimeToDateMidnightConverter implements Converter<DateTime, org.joda.time.DateMidnight> {
-
-		@Override
-		public org.joda.time.DateMidnight convert(DateTime source) {
-			return source.toDateMidnight();
-		}
-	}
-
-
-	private static class DateTimeToMutableDateTimeConverter implements Converter<DateTime, MutableDateTime> {
-
-		@Override
-		public MutableDateTime convert(DateTime source) {
-			return source.toMutableDateTime();
-		}
-	}
-
-
-	private static class DateTimeToInstantConverter implements Converter<DateTime, Instant> {
-
-		@Override
-		public Instant convert(DateTime source) {
-			return source.toInstant();
-		}
-	}
-
-
-	private static class DateTimeToDateConverter implements Converter<DateTime, Date> {
-
-		@Override
-		public Date convert(DateTime source) {
-			return source.toDate();
-		}
-	}
-
-
-	private static class DateTimeToCalendarConverter implements Converter<DateTime, Calendar> {
-
-		@Override
-		public Calendar convert(DateTime source) {
-			return source.toGregorianCalendar();
-		}
-	}
-
-
-	private static class DateTimeToLongConverter implements Converter<DateTime, Long> {
-
-		@Override
-		public Long convert(DateTime source) {
-			return source.getMillis();
-		}
-	}
-
-
-	/**
-	 * Used when printing a {@code java.util.Date} field with a ReadableInstantPrinter.
-	 * @see MillisecondInstantPrinter
-	 * @see JodaDateTimeFormatAnnotationFormatterFactory
-	 */
-	private static class DateToReadableInstantConverter implements Converter<Date, ReadableInstant> {
-
-		@Override
-		public ReadableInstant convert(Date source) {
-			return new DateTime(source);
-		}
-	}
-
-
-	/**
-	 * Used when printing a {@code java.util.Calendar} field with a ReadableInstantPrinter.
-	 * @see MillisecondInstantPrinter
-	 * @see JodaDateTimeFormatAnnotationFormatterFactory
-	 */
-	private static class CalendarToReadableInstantConverter implements Converter<Calendar, ReadableInstant> {
-
-		@Override
-		public ReadableInstant convert(Calendar source) {
-			return new DateTime(source);
-		}
-	}
-
-
-	/**
-	 * Used when printing a Long field with a ReadableInstantPrinter.
-	 * @see MillisecondInstantPrinter
-	 * @see JodaDateTimeFormatAnnotationFormatterFactory
-	 */
-	private static class LongToReadableInstantConverter implements Converter<Long, ReadableInstant> {
-
-		@Override
-		public ReadableInstant convert(Long source) {
-			return new DateTime(source.longValue());
-		}
-	}
-
-
-	private static class LocalDateTimeToLocalDateConverter implements Converter<LocalDateTime, LocalDate> {
-
-		@Override
-		public LocalDate convert(LocalDateTime source) {
-			return source.toLocalDate();
-		}
-	}
-
-
-	private static class LocalDateTimeToLocalTimeConverter implements Converter<LocalDateTime, LocalTime> {
-
-		@Override
-		public LocalTime convert(LocalDateTime source) {
-			return source.toLocalTime();
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
deleted file mode 100644
index 19835bbc5177..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.Map;
-
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
-import org.joda.time.MonthDay;
-import org.joda.time.Period;
-import org.joda.time.ReadableInstant;
-import org.joda.time.YearMonth;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.FormatterRegistrar;
-import org.springframework.format.FormatterRegistry;
-import org.springframework.format.Parser;
-import org.springframework.format.Printer;
-import org.springframework.format.annotation.DateTimeFormat.ISO;
-
-/**
- * Configures Joda-Time's formatting system for use with Spring.
- *
- * <p><b>NOTE:</b> Spring's Joda-Time support requires Joda-Time 2.x, as of Spring 4.0.
- *
- * @author Keith Donald
- * @author Juergen Hoeller
- * @author Phillip Webb
- * @since 3.1
- * @see #setDateStyle
- * @see #setTimeStyle
- * @see #setDateTimeStyle
- * @see #setUseIsoFormat
- * @see FormatterRegistrar#registerFormatters
- * @see org.springframework.format.datetime.DateFormatterRegistrar
- * @see DateTimeFormatterFactoryBean
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public class JodaTimeFormatterRegistrar implements FormatterRegistrar {
-
-	private enum Type {DATE, TIME, DATE_TIME}
-
-
-	/**
-	 * User defined formatters.
-	 */
-	private final Map<Type, DateTimeFormatter> formatters = new EnumMap<>(Type.class);
-
-	/**
-	 * Factories used when specific formatters have not been specified.
-	 */
-	private final Map<Type, DateTimeFormatterFactory> factories;
-
-
-	public JodaTimeFormatterRegistrar() {
-		this.factories = new EnumMap<>(Type.class);
-		for (Type type : Type.values()) {
-			this.factories.put(type, new DateTimeFormatterFactory());
-		}
-	}
-
-
-	/**
-	 * Set whether standard ISO formatting should be applied to all date/time types.
-	 * Default is "false" (no).
-	 * <p>If set to "true", the "dateStyle", "timeStyle" and "dateTimeStyle"
-	 * properties are effectively ignored.
-	 */
-	public void setUseIsoFormat(boolean useIsoFormat) {
-		this.factories.get(Type.DATE).setIso(useIsoFormat ? ISO.DATE : ISO.NONE);
-		this.factories.get(Type.TIME).setIso(useIsoFormat ? ISO.TIME : ISO.NONE);
-		this.factories.get(Type.DATE_TIME).setIso(useIsoFormat ? ISO.DATE_TIME : ISO.NONE);
-	}
-
-	/**
-	 * Set the default format style of Joda {@link LocalDate} objects.
-	 * Default is {@link DateTimeFormat#shortDate()}.
-	 */
-	public void setDateStyle(String dateStyle) {
-		this.factories.get(Type.DATE).setStyle(dateStyle + "-");
-	}
-
-	/**
-	 * Set the default format style of Joda {@link LocalTime} objects.
-	 * Default is {@link DateTimeFormat#shortTime()}.
-	 */
-	public void setTimeStyle(String timeStyle) {
-		this.factories.get(Type.TIME).setStyle("-" + timeStyle);
-	}
-
-	/**
-	 * Set the default format style of Joda {@link LocalDateTime} and {@link DateTime} objects,
-	 * as well as JDK {@link Date} and {@link Calendar} objects.
-	 * Default is {@link DateTimeFormat#shortDateTime()}.
-	 */
-	public void setDateTimeStyle(String dateTimeStyle) {
-		this.factories.get(Type.DATE_TIME).setStyle(dateTimeStyle);
-	}
-
-	/**
-	 * Set the formatter that will be used for objects representing date values.
-	 * <p>This formatter will be used for the {@link LocalDate} type. When specified
-	 * the {@link #setDateStyle(String) dateStyle} and
-	 * {@link #setUseIsoFormat(boolean) useIsoFormat} properties will be ignored.
-	 * @param formatter the formatter to use
-	 * @since 3.2
-	 * @see #setTimeFormatter
-	 * @see #setDateTimeFormatter
-	 */
-	public void setDateFormatter(DateTimeFormatter formatter) {
-		this.formatters.put(Type.DATE, formatter);
-	}
-
-	/**
-	 * Set the formatter that will be used for objects representing time values.
-	 * <p>This formatter will be used for the {@link LocalTime} type. When specified
-	 * the {@link #setTimeStyle(String) timeStyle} and
-	 * {@link #setUseIsoFormat(boolean) useIsoFormat} properties will be ignored.
-	 * @param formatter the formatter to use
-	 * @since 3.2
-	 * @see #setDateFormatter
-	 * @see #setDateTimeFormatter
-	 */
-	public void setTimeFormatter(DateTimeFormatter formatter) {
-		this.formatters.put(Type.TIME, formatter);
-	}
-
-	/**
-	 * Set the formatter that will be used for objects representing date and time values.
-	 * <p>This formatter will be used for {@link LocalDateTime}, {@link ReadableInstant},
-	 * {@link Date} and {@link Calendar} types. When specified
-	 * the {@link #setDateTimeStyle(String) dateTimeStyle} and
-	 * {@link #setUseIsoFormat(boolean) useIsoFormat} properties will be ignored.
-	 * @param formatter the formatter to use
-	 * @since 3.2
-	 * @see #setDateFormatter
-	 * @see #setTimeFormatter
-	 */
-	public void setDateTimeFormatter(DateTimeFormatter formatter) {
-		this.formatters.put(Type.DATE_TIME, formatter);
-	}
-
-
-	@Override
-	public void registerFormatters(FormatterRegistry registry) {
-		JodaTimeConverters.registerConverters(registry);
-
-		DateTimeFormatter dateFormatter = getFormatter(Type.DATE);
-		DateTimeFormatter timeFormatter = getFormatter(Type.TIME);
-		DateTimeFormatter dateTimeFormatter = getFormatter(Type.DATE_TIME);
-
-		addFormatterForFields(registry,
-				new ReadablePartialPrinter(dateFormatter),
-				new LocalDateParser(dateFormatter),
-				LocalDate.class);
-
-		addFormatterForFields(registry,
-				new ReadablePartialPrinter(timeFormatter),
-				new LocalTimeParser(timeFormatter),
-				LocalTime.class);
-
-		addFormatterForFields(registry,
-				new ReadablePartialPrinter(dateTimeFormatter),
-				new LocalDateTimeParser(dateTimeFormatter),
-				LocalDateTime.class);
-
-		addFormatterForFields(registry,
-				new ReadableInstantPrinter(dateTimeFormatter),
-				new DateTimeParser(dateTimeFormatter),
-				ReadableInstant.class);
-
-		// In order to retain backwards compatibility we only register Date/Calendar
-		// types when a user defined formatter is specified (see SPR-10105)
-		if (this.formatters.containsKey(Type.DATE_TIME)) {
-			addFormatterForFields(registry,
-					new ReadableInstantPrinter(dateTimeFormatter),
-					new DateTimeParser(dateTimeFormatter),
-					Date.class, Calendar.class);
-		}
-
-		registry.addFormatterForFieldType(Period.class, new PeriodFormatter());
-		registry.addFormatterForFieldType(Duration.class, new DurationFormatter());
-		registry.addFormatterForFieldType(YearMonth.class, new YearMonthFormatter());
-		registry.addFormatterForFieldType(MonthDay.class, new MonthDayFormatter());
-
-		registry.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory());
-	}
-
-	private DateTimeFormatter getFormatter(Type type) {
-		DateTimeFormatter formatter = this.formatters.get(type);
-		if (formatter != null) {
-			return formatter;
-		}
-		DateTimeFormatter fallbackFormatter = getFallbackFormatter(type);
-		return this.factories.get(type).createDateTimeFormatter(fallbackFormatter);
-	}
-
-	private DateTimeFormatter getFallbackFormatter(Type type) {
-		switch (type) {
-			case DATE: return DateTimeFormat.shortDate();
-			case TIME: return DateTimeFormat.shortTime();
-			default: return DateTimeFormat.shortDateTime();
-		}
-	}
-
-	private void addFormatterForFields(FormatterRegistry registry, Printer<?> printer,
-			Parser<?> parser, Class<?>... fieldTypes) {
-
-		for (Class<?> fieldType : fieldTypes) {
-			registry.addFormatterForFieldType(fieldType, printer, parser);
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java
deleted file mode 100644
index 189f6ea5f43c..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.LocalDate;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.Parser;
-
-/**
- * Parses Joda {@link org.joda.time.LocalDate} instances using a
- * {@link org.joda.time.format.DateTimeFormatter}.
- *
- * @author Juergen Hoeller
- * @since 4.0
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class LocalDateParser implements Parser<LocalDate> {
-
-	private final DateTimeFormatter formatter;
-
-
-	/**
-	 * Create a new DateTimeParser.
-	 * @param formatter the Joda DateTimeFormatter instance
-	 */
-	public LocalDateParser(DateTimeFormatter formatter) {
-		this.formatter = formatter;
-	}
-
-
-	@Override
-	public LocalDate parse(String text, Locale locale) throws ParseException {
-		return JodaTimeContextHolder.getFormatter(this.formatter, locale).parseLocalDate(text);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java
deleted file mode 100644
index 9a2d6ec86688..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.LocalDateTime;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.Parser;
-
-/**
- * Parses Joda {@link org.joda.time.LocalDateTime} instances using a
- * {@link org.joda.time.format.DateTimeFormatter}.
- *
- * @author Juergen Hoeller
- * @since 4.0
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class LocalDateTimeParser implements Parser<LocalDateTime> {
-
-	private final DateTimeFormatter formatter;
-
-
-	/**
-	 * Create a new DateTimeParser.
-	 * @param formatter the Joda DateTimeFormatter instance
-	 */
-	public LocalDateTimeParser(DateTimeFormatter formatter) {
-		this.formatter = formatter;
-	}
-
-
-	@Override
-	public LocalDateTime parse(String text, Locale locale) throws ParseException {
-		return JodaTimeContextHolder.getFormatter(this.formatter, locale).parseLocalDateTime(text);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java
deleted file mode 100644
index 0d68e82fd2f5..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.LocalTime;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.Parser;
-
-/**
- * Parses Joda {@link org.joda.time.LocalTime} instances using a
- * {@link org.joda.time.format.DateTimeFormatter}.
- *
- * @author Juergen Hoeller
- * @since 4.0
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class LocalTimeParser implements Parser<LocalTime> {
-
-	private final DateTimeFormatter formatter;
-
-
-	/**
-	 * Create a new DateTimeParser.
-	 * @param formatter the Joda DateTimeFormatter instance
-	 */
-	public LocalTimeParser(DateTimeFormatter formatter) {
-		this.formatter = formatter;
-	}
-
-
-	@Override
-	public LocalTime parse(String text, Locale locale) throws ParseException {
-		return JodaTimeContextHolder.getFormatter(this.formatter, locale).parseLocalTime(text);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
deleted file mode 100644
index 75cd6baa68ed..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.util.Locale;
-
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.Printer;
-
-/**
- * Prints Long instances using a Joda {@link DateTimeFormatter}.
- *
- * @author Keith Donald
- * @since 3.0
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class MillisecondInstantPrinter implements Printer<Long> {
-
-	private final DateTimeFormatter formatter;
-
-
-	/**
-	 * Create a new ReadableInstantPrinter.
-	 * @param formatter the Joda DateTimeFormatter instance
-	 */
-	public MillisecondInstantPrinter(DateTimeFormatter formatter) {
-		this.formatter = formatter;
-	}
-
-
-	@Override
-	public String print(Long instant, Locale locale) {
-		return JodaTimeContextHolder.getFormatter(this.formatter, locale).print(instant);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/MonthDayFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/MonthDayFormatter.java
deleted file mode 100644
index 1cb12cef3bd1..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/MonthDayFormatter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.MonthDay;
-
-import org.springframework.format.Formatter;
-
-/**
- * {@link Formatter} implementation for a Joda-Time {@link MonthDay},
- * following Joda-Time's parsing rules for a MonthDay.
- *
- * @author Juergen Hoeller
- * @since 4.2.4
- * @see MonthDay#parse
- */
-class MonthDayFormatter implements Formatter<MonthDay> {
-
-	@Override
-	public MonthDay parse(String text, Locale locale) throws ParseException {
-		return MonthDay.parse(text);
-	}
-
-	@Override
-	public String print(MonthDay object, Locale locale) {
-		return object.toString();
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/PeriodFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/PeriodFormatter.java
deleted file mode 100644
index 28133f72344f..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/PeriodFormatter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.Period;
-
-import org.springframework.format.Formatter;
-
-/**
- * {@link Formatter} implementation for a Joda-Time {@link Period},
- * following Joda-Time's parsing rules for a Period.
- *
- * @author Juergen Hoeller
- * @since 4.2.4
- * @see Period#parse
- */
-class PeriodFormatter implements Formatter<Period> {
-
-	@Override
-	public Period parse(String text, Locale locale) throws ParseException {
-		return Period.parse(text);
-	}
-
-	@Override
-	public String print(Period object, Locale locale) {
-		return object.toString();
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
deleted file mode 100644
index 995075be0ee6..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.util.Locale;
-
-import org.joda.time.ReadableInstant;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.Printer;
-
-/**
- * Prints Joda-Time {@link ReadableInstant} instances using a {@link DateTimeFormatter}.
- *
- * @author Keith Donald
- * @since 3.0
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class ReadableInstantPrinter implements Printer<ReadableInstant> {
-
-	private final DateTimeFormatter formatter;
-
-
-	/**
-	 * Create a new ReadableInstantPrinter.
-	 * @param formatter the Joda DateTimeFormatter instance
-	 */
-	public ReadableInstantPrinter(DateTimeFormatter formatter) {
-		this.formatter = formatter;
-	}
-
-
-	@Override
-	public String print(ReadableInstant instant, Locale locale) {
-		return JodaTimeContextHolder.getFormatter(this.formatter, locale).print(instant);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
deleted file mode 100644
index 85d4e3d556a0..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.util.Locale;
-
-import org.joda.time.ReadablePartial;
-import org.joda.time.format.DateTimeFormatter;
-
-import org.springframework.format.Printer;
-
-/**
- * Prints Joda-Time {@link ReadablePartial} instances using a {@link DateTimeFormatter}.
- *
- * @author Keith Donald
- * @since 3.0
- * @deprecated as of 5.3, in favor of standard JSR-310 support
- */
-@Deprecated
-public final class ReadablePartialPrinter implements Printer<ReadablePartial> {
-
-	private final DateTimeFormatter formatter;
-
-
-	/**
-	 * Create a new ReadableInstantPrinter.
-	 * @param formatter the Joda DateTimeFormatter instance
-	 */
-	public ReadablePartialPrinter(DateTimeFormatter formatter) {
-		this.formatter = formatter;
-	}
-
-
-	@Override
-	public String print(ReadablePartial partial, Locale locale) {
-		return JodaTimeContextHolder.getFormatter(this.formatter, locale).print(partial);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/YearMonthFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/YearMonthFormatter.java
deleted file mode 100644
index 1ac44b4af0c5..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/YearMonthFormatter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.joda;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.joda.time.YearMonth;
-
-import org.springframework.format.Formatter;
-
-/**
- * {@link Formatter} implementation for a Joda-Time {@link YearMonth},
- * following Joda-Time's parsing rules for a YearMonth.
- *
- * @author Juergen Hoeller
- * @since 4.2.4
- * @see YearMonth#parse
- */
-class YearMonthFormatter implements Formatter<YearMonth> {
-
-	@Override
-	public YearMonth parse(String text, Locale locale) throws ParseException {
-		return YearMonth.parse(text);
-	}
-
-	@Override
-	public String print(YearMonth object, Locale locale) {
-		return object.toString();
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
deleted file mode 100644
index a8a190bd3a1d..000000000000
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Integration with Joda-Time for formatting Joda date and time types as well as standard JDK Date types.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.format.datetime.joda;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
index 96b4a793453c..ec4964b0e149 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
@@ -50,7 +50,6 @@
  * @see #setUseIsoFormat
  * @see org.springframework.format.FormatterRegistrar#registerFormatters
  * @see org.springframework.format.datetime.DateFormatterRegistrar
- * @see org.springframework.format.datetime.joda.DateTimeFormatterFactoryBean
  */
 public class DateTimeFormatterRegistrar implements FormatterRegistrar {
 
diff --git a/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
index 805a9828c4c5..190c1f656504 100644
--- a/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
+++ b/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,12 +48,9 @@ public class DefaultFormattingConversionService extends FormattingConversionServ
 
 	private static final boolean jsr354Present;
 
-	private static final boolean jodaTimePresent;
-
 	static {
 		ClassLoader classLoader = DefaultFormattingConversionService.class.getClassLoader();
 		jsr354Present = ClassUtils.isPresent("javax.money.MonetaryAmount", classLoader);
-		jodaTimePresent = ClassUtils.isPresent("org.joda.time.YearMonth", classLoader);
 	}
 
 	/**
@@ -104,7 +101,6 @@ public DefaultFormattingConversionService(
 	 * depending on the presence of the corresponding API on the classpath.
 	 * @param formatterRegistry the service to register default formatters with
 	 */
-	@SuppressWarnings("deprecation")
 	public static void addDefaultFormatters(FormatterRegistry formatterRegistry) {
 		// Default handling of number values
 		formatterRegistry.addFormatterForFieldAnnotation(new NumberFormatAnnotationFormatterFactory());
@@ -121,14 +117,8 @@ public static void addDefaultFormatters(FormatterRegistry formatterRegistry) {
 		// just handling JSR-310 specific date and time types
 		new DateTimeFormatterRegistrar().registerFormatters(formatterRegistry);
 
-		if (jodaTimePresent) {
-			// handles Joda-specific types as well as Date, Calendar, Long
-			new org.springframework.format.datetime.joda.JodaTimeFormatterRegistrar().registerFormatters(formatterRegistry);
-		}
-		else {
-			// regular DateFormat-based Date, Calendar, Long converters
-			new DateFormatterRegistrar().registerFormatters(formatterRegistry);
-		}
+		// regular DateFormat-based Date, Calendar, Long converters
+		new DateFormatterRegistrar().registerFormatters(formatterRegistry);
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java b/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java
index 7737902082a9..d085e4d622fa 100644
--- a/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java
+++ b/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,6 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.format.annotation.DateTimeFormat.ISO;
@@ -33,9 +30,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
-
-
-
 /**
  * Tests for {@link DateFormatter}.
  *
@@ -137,40 +131,6 @@ public void shouldPrintAndParseISODateTime() throws Exception {
 		assertThat(formatter.parse("2009-06-01T14:23:05.003Z", Locale.US)).isEqualTo(date);
 	}
 
-	@Test
-	public void shouldSupportJodaStylePatterns() throws Exception {
-		String[] chars = { "S", "M", "-" };
-		for (String d : chars) {
-			for (String t : chars) {
-				String style = d + t;
-				if (!style.equals("--")) {
-					Date date = getDate(2009, Calendar.JUNE, 10, 14, 23, 0, 0);
-					if (t.equals("-")) {
-						date = getDate(2009, Calendar.JUNE, 10);
-					}
-					else if (d.equals("-")) {
-						date = getDate(1970, Calendar.JANUARY, 1, 14, 23, 0, 0);
-					}
-					testJodaStylePatterns(style, Locale.US, date);
-				}
-			}
-		}
-	}
-
-	private void testJodaStylePatterns(String style, Locale locale, Date date) throws Exception {
-		DateFormatter formatter = new DateFormatter();
-		formatter.setTimeZone(UTC);
-		formatter.setStylePattern(style);
-		DateTimeFormatter jodaFormatter = DateTimeFormat.forStyle(style).withLocale(locale).withZone(DateTimeZone.UTC);
-		String jodaPrinted = jodaFormatter.print(date.getTime());
-		assertThat(formatter.print(date, locale))
-				.as("Unable to print style pattern " + style)
-				.isEqualTo(jodaPrinted);
-		assertThat(formatter.parse(jodaPrinted, locale))
-				.as("Unable to parse style pattern " + style)
-				.isEqualTo(date);
-	}
-
 	@Test
 	public void shouldThrowOnUnsupportedStylePattern() throws Exception {
 		DateFormatter formatter = new DateFormatter();
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java
deleted file mode 100644
index 4472cb321e1e..000000000000
--- a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-
-
-
-
-/**
- * @author Phillip Webb
- * @author Sam Brannen
- */
-public class DateTimeFormatterFactoryBeanTests {
-
-	private final DateTimeFormatterFactoryBean factory = new DateTimeFormatterFactoryBean();
-
-
-	@Test
-	public void isSingleton() {
-		assertThat(factory.isSingleton()).isTrue();
-	}
-
-	@Test
-	public void getObjectType() {
-		assertThat(factory.getObjectType()).isEqualTo(DateTimeFormatter.class);
-	}
-
-	@Test
-	public void getObject() {
-		factory.afterPropertiesSet();
-		assertThat(factory.getObject()).isEqualTo(DateTimeFormat.mediumDateTime());
-	}
-
-	@Test
-	public void getObjectIsAlwaysSingleton() {
-		factory.afterPropertiesSet();
-		DateTimeFormatter formatter = factory.getObject();
-		assertThat(formatter).isEqualTo(DateTimeFormat.mediumDateTime());
-		factory.setStyle("LL");
-		assertThat(factory.getObject()).isSameAs(formatter);
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java
deleted file mode 100644
index d76302fe109f..000000000000
--- a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.format.annotation.DateTimeFormat.ISO;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Phillip Webb
- * @author Sam Brannen
- */
-public class DateTimeFormatterFactoryTests {
-
-	// Potential test timezone, both have daylight savings on October 21st
-	private static final TimeZone ZURICH = TimeZone.getTimeZone("Europe/Zurich");
-	private static final TimeZone NEW_YORK = TimeZone.getTimeZone("America/New_York");
-
-	// Ensure that we are testing against a timezone other than the default.
-	private static final TimeZone TEST_TIMEZONE = ZURICH.equals(TimeZone.getDefault()) ? NEW_YORK : ZURICH;
-
-
-	private DateTimeFormatterFactory factory = new DateTimeFormatterFactory();
-
-	private DateTime dateTime = new DateTime(2009, 10, 21, 12, 10, 00, 00);
-
-
-	@Test
-	public void createDateTimeFormatter() {
-		assertThat(factory.createDateTimeFormatter()).isEqualTo(DateTimeFormat.mediumDateTime());
-	}
-
-	@Test
-	public void createDateTimeFormatterWithPattern() {
-		factory = new DateTimeFormatterFactory("yyyyMMddHHmmss");
-		DateTimeFormatter formatter = factory.createDateTimeFormatter();
-		assertThat(formatter.print(dateTime)).isEqualTo("20091021121000");
-	}
-
-	@Test
-	public void createDateTimeFormatterWithNullFallback() {
-		DateTimeFormatter formatter = factory.createDateTimeFormatter(null);
-		assertThat(formatter).isNull();
-	}
-
-	@Test
-	public void createDateTimeFormatterWithFallback() {
-		DateTimeFormatter fallback = DateTimeFormat.forStyle("LL");
-		DateTimeFormatter formatter = factory.createDateTimeFormatter(fallback);
-		assertThat(formatter).isSameAs(fallback);
-	}
-
-	@Test
-	public void createDateTimeFormatterInOrderOfPropertyPriority() {
-		factory.setStyle("SS");
-		String value = applyLocale(factory.createDateTimeFormatter()).print(dateTime);
-		assertThat(value.startsWith("10/21/09")).isTrue();
-		assertThat(value.endsWith("12:10 PM")).isTrue();
-
-		factory.setIso(ISO.DATE);
-		assertThat(applyLocale(factory.createDateTimeFormatter()).print(dateTime)).isEqualTo("2009-10-21");
-
-		factory.setPattern("yyyyMMddHHmmss");
-		assertThat(factory.createDateTimeFormatter().print(dateTime)).isEqualTo("20091021121000");
-	}
-
-	@Test
-	public void createDateTimeFormatterWithTimeZone() {
-		factory.setPattern("yyyyMMddHHmmss Z");
-		factory.setTimeZone(TEST_TIMEZONE);
-		DateTimeZone dateTimeZone = DateTimeZone.forTimeZone(TEST_TIMEZONE);
-		DateTime dateTime = new DateTime(2009, 10, 21, 12, 10, 00, 00, dateTimeZone);
-		String offset = (TEST_TIMEZONE.equals(NEW_YORK) ? "-0400" : "+0200");
-		assertThat(factory.createDateTimeFormatter().print(dateTime)).isEqualTo("20091021121000 " + offset);
-	}
-
-	private DateTimeFormatter applyLocale(DateTimeFormatter dateTimeFormatter) {
-		return dateTimeFormatter.withLocale(Locale.US);
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
deleted file mode 100644
index 63a241f504d5..000000000000
--- a/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
+++ /dev/null
@@ -1,770 +0,0 @@
-/*
- * 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.
- * 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.joda;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.Duration;
-import org.joda.time.Instant;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
-import org.joda.time.MonthDay;
-import org.joda.time.Period;
-import org.joda.time.YearMonth;
-import org.joda.time.chrono.ISOChronology;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.MutablePropertyValues;
-import org.springframework.context.i18n.LocaleContextHolder;
-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.DataBinder;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Keith Donald
- * @author Juergen Hoeller
- * @author Phillip Webb
- */
-public class JodaTimeFormattingTests {
-
-	private FormattingConversionService conversionService;
-
-	private DataBinder binder;
-
-
-	@BeforeEach
-	public void setup() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		setup(registrar);
-	}
-
-	private void setup(JodaTimeFormatterRegistrar registrar) {
-		conversionService = new FormattingConversionService();
-		DefaultConversionService.addDefaultConverters(conversionService);
-		registrar.registerFormatters(conversionService);
-
-		JodaTimeBean bean = new JodaTimeBean();
-		bean.getChildren().add(new JodaTimeBean());
-		binder = new DataBinder(bean);
-		binder.setConversionService(conversionService);
-
-		LocaleContextHolder.setLocale(Locale.US);
-		JodaTimeContext context = new JodaTimeContext();
-		context.setTimeZone(DateTimeZone.forID("-05:00"));
-		JodaTimeContextHolder.setJodaTimeContext(context);
-	}
-
-	@AfterEach
-	public void cleanup() {
-		LocaleContextHolder.setLocale(null);
-		JodaTimeContextHolder.setJodaTimeContext(null);
-	}
-
-
-	@Test
-	public void testJodaTimePatternsForStyle() {
-		System.out.println(org.joda.time.format.DateTimeFormat.patternForStyle("SS", LocaleContextHolder.getLocale()));
-		System.out.println(org.joda.time.format.DateTimeFormat.patternForStyle("MM", LocaleContextHolder.getLocale()));
-		System.out.println(org.joda.time.format.DateTimeFormat.patternForStyle("LL", LocaleContextHolder.getLocale()));
-		System.out.println(org.joda.time.format.DateTimeFormat.patternForStyle("FF", LocaleContextHolder.getLocale()));
-	}
-
-	@Test
-	public void testBindLocalDate() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDate", "10/31/09");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localDate")).isEqualTo("10/31/09");
-	}
-
-	@Test
-	public void testBindLocalDateWithSpecificStyle() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setDateStyle("L");
-		setup(registrar);
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDate", "October 31, 2009");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localDate")).isEqualTo("October 31, 2009");
-	}
-
-	@Test
-	public void testBindLocalDateWithSpecificFormatter() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setDateFormatter(org.joda.time.format.DateTimeFormat.forPattern("yyyyMMdd"));
-		setup(registrar);
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDate", "20091031");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localDate")).isEqualTo("20091031");
-	}
-
-	@Test
-	public void testBindLocalDateArray() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDate", new String[]{"10/31/09"});
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-	}
-
-	@Test
-	public void testBindLocalDateAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateAnnotated", "Oct 31, 2009");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localDateAnnotated")).isEqualTo("Oct 31, 2009");
-	}
-
-	@Test
-	public void testBindLocalDateAnnotatedWithError() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateAnnotated", "Oct 031, 2009");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getFieldErrorCount("localDateAnnotated")).isEqualTo(1);
-		assertThat(binder.getBindingResult().getFieldValue("localDateAnnotated")).isEqualTo("Oct 031, 2009");
-	}
-
-	@Test
-	public void testBindNestedLocalDateAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("children[0].localDateAnnotated", "Oct 31, 2009");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("children[0].localDateAnnotated")).isEqualTo("Oct 31, 2009");
-	}
-
-	@Test
-	public void testBindLocalDateAnnotatedWithDirectFieldAccess() {
-		binder.initDirectFieldAccess();
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateAnnotated", "Oct 31, 2009");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localDateAnnotated")).isEqualTo("Oct 31, 2009");
-	}
-
-	@Test
-	public void testBindLocalDateAnnotatedWithDirectFieldAccessAndError() {
-		binder.initDirectFieldAccess();
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateAnnotated", "Oct 031, 2009");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getFieldErrorCount("localDateAnnotated")).isEqualTo(1);
-		assertThat(binder.getBindingResult().getFieldValue("localDateAnnotated")).isEqualTo("Oct 031, 2009");
-	}
-
-	@Test
-	public void testBindLocalTime() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localTime", "12:00 PM");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localTime")).isEqualTo("12:00 PM");
-	}
-
-	@Test
-	public void testBindLocalTimeWithSpecificStyle() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setTimeStyle("M");
-		setup(registrar);
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localTime", "12:00:00 PM");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localTime")).isEqualTo("12:00:00 PM");
-	}
-
-	@Test
-	public void testBindLocalTimeWithSpecificFormatter() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setTimeFormatter(org.joda.time.format.DateTimeFormat.forPattern("HHmmss"));
-		setup(registrar);
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localTime", "130000");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localTime")).isEqualTo("130000");
-	}
-
-	@Test
-	public void testBindLocalTimeAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localTimeAnnotated", "12:00:00 PM");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("localTimeAnnotated")).isEqualTo("12:00:00 PM");
-	}
-
-	@Test
-	public void testBindLocalDateTime() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateTime", new LocalDateTime(2009, 10, 31, 12, 0));
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		String value = binder.getBindingResult().getFieldValue("localDateTime").toString();
-		assertThat(value.startsWith("10/31/09")).isTrue();
-		assertThat(value.endsWith("12:00 PM")).isTrue();
-	}
-
-	@Test
-	public void testBindLocalDateTimeAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateTimeAnnotated", new LocalDateTime(2009, 10, 31, 12, 0));
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		String value = binder.getBindingResult().getFieldValue("localDateTimeAnnotated").toString();
-		assertThat(value.startsWith("Oct 31, 2009")).isTrue();
-		assertThat(value.endsWith("12:00 PM")).isTrue();
-	}
-
-	@Test
-	public void testBindDateTime() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateTime", new DateTime(2009, 10, 31, 12, 0, ISOChronology.getInstanceUTC()));
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		String value = binder.getBindingResult().getFieldValue("dateTime").toString();
-		assertThat(value.startsWith("10/31/09")).isTrue();
-	}
-
-	@Test
-	public void testBindDateTimeWithSpecificStyle() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setDateTimeStyle("MM");
-		setup(registrar);
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateTime", new LocalDateTime(2009, 10, 31, 12, 0));
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		String value = binder.getBindingResult().getFieldValue("localDateTime").toString();
-		assertThat(value.startsWith("Oct 31, 2009")).isTrue();
-		assertThat(value.endsWith("12:00:00 PM")).isTrue();
-	}
-
-	@Test
-	public void testBindDateTimeISO() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setUseIsoFormat(true);
-		setup(registrar);
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateTime", "2009-10-31T12:00:00.000Z");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("dateTime")).isEqualTo("2009-10-31T07:00:00.000-05:00");
-	}
-
-	@Test
-	public void testBindDateTimeWithSpecificFormatter() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setDateTimeFormatter(org.joda.time.format.DateTimeFormat.forPattern("yyyyMMddHHmmss"));
-		setup(registrar);
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateTime", "20091031130000");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("dateTime")).isEqualTo("20091031130000");
-	}
-
-	@Test
-	public void testBindDateTimeAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateTimeAnnotated", new DateTime(2009, 10, 31, 12, 0, ISOChronology.getInstanceUTC()));
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		String value = binder.getBindingResult().getFieldValue("dateTimeAnnotated").toString();
-		assertThat(value.startsWith("Oct 31, 2009")).isTrue();
-	}
-
-	@Test
-	public void testBindDateTimeAnnotatedPattern() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateTimeAnnotatedPattern", "10/31/09 12:00 PM");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("dateTimeAnnotatedPattern")).isEqualTo("10/31/09 12:00 PM");
-	}
-
-	@Test
-	public void testBindDateTimeOverflow() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateTimeAnnotatedPattern", "02/29/09 12:00 PM");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(1);
-	}
-
-	@Test
-	public void testBindDateTimeAnnotatedDefault() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateTimeAnnotatedDefault", new DateTime(2009, 10, 31, 12, 0, ISOChronology.getInstanceUTC()));
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		String value = binder.getBindingResult().getFieldValue("dateTimeAnnotatedDefault").toString();
-		assertThat(value.startsWith("10/31/09")).isTrue();
-	}
-
-	@Test
-	public void testBindDateWithErrorAvoidingDateConstructor() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("date", "Sat, 12 Aug 1995 13:30:00 GMT");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(1);
-		assertThat(binder.getBindingResult().getFieldValue("date")).isEqualTo("Sat, 12 Aug 1995 13:30:00 GMT");
-	}
-
-	@Test
-	public void testBindDateWithoutErrorFallingBackToDateConstructor() {
-		DataBinder binder = new DataBinder(new JodaTimeBean());
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("date", "Sat, 12 Aug 1995 13:30:00 GMT");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-	}
-
-	@Test
-	public void testBindDateAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("dateAnnotated", "10/31/09");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("dateAnnotated")).isEqualTo("10/31/09");
-	}
-
-	@Test
-	public void testBindCalendarAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("calendarAnnotated", "10/31/09");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("calendarAnnotated")).isEqualTo("10/31/09");
-	}
-
-	@Test
-	public void testBindLong() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("millis", "1256961600");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("millis")).isEqualTo("1256961600");
-	}
-
-	@Test
-	public void testBindLongAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("millisAnnotated", "10/31/09");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("millisAnnotated")).isEqualTo("10/31/09");
-	}
-
-	@Test
-	public void testBindISODate() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("isoDate", "2009-10-31");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("isoDate")).isEqualTo("2009-10-31");
-	}
-
-	@Test
-	public void testBindISOTime() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("isoTime", "12:00:00.000-05:00");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("isoTime")).isEqualTo("12:00:00.000");
-	}
-
-	@Test
-	public void testBindISODateTime() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("isoDateTime", "2009-10-31T12:00:00.000Z");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("isoDateTime")).isEqualTo("2009-10-31T07:00:00.000-05:00");
-	}
-
-	@Test
-	public void testBindInstantAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("instantAnnotated", "2009-10-31T12:00:00.000Z");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("instantAnnotated")).isEqualTo("2009-10-31T07:00:00.000-05:00");
-	}
-
-	@Test
-	public void testBindMutableDateTimeAnnotated() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("mutableDateTimeAnnotated", "2009-10-31T12:00:00.000Z");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("mutableDateTimeAnnotated")).isEqualTo("2009-10-31T07:00:00.000-05:00");
-	}
-
-	@Test
-	public void dateToStringWithFormat() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		registrar.setDateTimeFormatter(org.joda.time.format.DateTimeFormat.shortDateTime());
-		setup(registrar);
-		Date date = new Date();
-		Object actual = this.conversionService.convert(date, TypeDescriptor.valueOf(Date.class), TypeDescriptor.valueOf(String.class));
-		String expected = JodaTimeContextHolder.getFormatter(org.joda.time.format.DateTimeFormat.shortDateTime(), Locale.US).print(new DateTime(date));
-		assertThat(actual).isEqualTo(expected);
-	}
-
-	@Test  // SPR-10105
-	@SuppressWarnings("deprecation")
-	public void stringToDateWithoutGlobalFormat() {
-		String string = "Sat, 12 Aug 1995 13:30:00 GM";
-		Date date = this.conversionService.convert(string, Date.class);
-		assertThat(date).isEqualTo(new Date(string));
-	}
-
-	@Test  // SPR-10105
-	public void stringToDateWithGlobalFormat() {
-		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
-		DateTimeFormatterFactory factory = new DateTimeFormatterFactory();
-		factory.setIso(ISO.DATE_TIME);
-		registrar.setDateTimeFormatter(factory.createDateTimeFormatter());
-		setup(registrar);
-		// This is a format that cannot be parsed by new Date(String)
-		String string = "2009-10-31T07:00:00.000-05:00";
-		Date date = this.conversionService.convert(string, Date.class);
-		assertThat(date).isNotNull();
-	}
-
-	@Test
-	public void testBindPeriod() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("period", "P6Y3M1D");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("period").toString().equals("P6Y3M1D")).isTrue();
-	}
-
-	@Test
-	public void testBindDuration() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("duration", "PT72.345S");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("duration").toString().equals("PT72.345S")).isTrue();
-	}
-
-	@Test
-	public void testBindYearMonth() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("yearMonth", "2007-12");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("yearMonth").toString().equals("2007-12")).isTrue();
-	}
-
-	@Test
-	public void testBindMonthDay() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("monthDay", "--12-03");
-		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("monthDay").toString().equals("--12-03")).isTrue();
-	}
-
-
-	@SuppressWarnings("unused")
-	private static class JodaTimeBean {
-
-		private LocalDate localDate;
-
-		@DateTimeFormat(style="M-")
-		private LocalDate localDateAnnotated;
-
-		private LocalTime localTime;
-
-		@DateTimeFormat(style="-M")
-		private LocalTime localTimeAnnotated;
-
-		private LocalDateTime localDateTime;
-
-		@DateTimeFormat(style="MS")
-		private LocalDateTime localDateTimeAnnotated;
-
-		private DateTime dateTime;
-
-		@DateTimeFormat(style="MS")
-		private DateTime dateTimeAnnotated;
-
-		@DateTimeFormat
-		private Date date;
-
-		@DateTimeFormat(style="S-")
-		private Date dateAnnotated;
-
-		@DateTimeFormat(style="S-")
-		private Calendar calendarAnnotated;
-
-		private Long millis;
-
-		@DateTimeFormat
-		private DateTime dateTimeAnnotatedDefault;
-
-		private Long millisAnnotated;
-
-		@DateTimeFormat(pattern="M/d/yy h:mm a")
-		private DateTime dateTimeAnnotatedPattern;
-
-		@DateTimeFormat(iso=ISO.DATE)
-		private LocalDate isoDate;
-
-		@DateTimeFormat(iso=ISO.TIME)
-		private LocalTime isoTime;
-
-		@DateTimeFormat(iso=ISO.DATE_TIME)
-		private DateTime isoDateTime;
-
-		@DateTimeFormat(iso=ISO.DATE_TIME)
-		private Instant instantAnnotated;
-
-		@DateTimeFormat(iso=ISO.DATE_TIME)
-		private Instant mutableDateTimeAnnotated;
-
-		private Period period;
-
-		private Duration duration;
-
-		private YearMonth yearMonth;
-
-		private MonthDay monthDay;
-
-		private final List<JodaTimeBean> children = new ArrayList<>();
-
-		public LocalDate getLocalDate() {
-			return localDate;
-		}
-
-		public void setLocalDate(LocalDate localDate) {
-			this.localDate = localDate;
-		}
-
-		public LocalDate getLocalDateAnnotated() {
-			return localDateAnnotated;
-		}
-
-		public void setLocalDateAnnotated(LocalDate localDateAnnotated) {
-			this.localDateAnnotated = localDateAnnotated;
-		}
-
-		public LocalTime getLocalTime() {
-			return localTime;
-		}
-
-		public void setLocalTime(LocalTime localTime) {
-			this.localTime = localTime;
-		}
-
-		public LocalTime getLocalTimeAnnotated() {
-			return localTimeAnnotated;
-		}
-
-		public void setLocalTimeAnnotated(LocalTime localTimeAnnotated) {
-			this.localTimeAnnotated = localTimeAnnotated;
-		}
-
-		public LocalDateTime getLocalDateTime() {
-			return localDateTime;
-		}
-
-		public void setLocalDateTime(LocalDateTime localDateTime) {
-			this.localDateTime = localDateTime;
-		}
-
-		public LocalDateTime getLocalDateTimeAnnotated() {
-			return localDateTimeAnnotated;
-		}
-
-		public void setLocalDateTimeAnnotated(LocalDateTime localDateTimeAnnotated) {
-			this.localDateTimeAnnotated = localDateTimeAnnotated;
-		}
-
-		public DateTime getDateTime() {
-			return dateTime;
-		}
-
-		public void setDateTime(DateTime dateTime) {
-			this.dateTime = dateTime;
-		}
-
-		public DateTime getDateTimeAnnotated() {
-			return dateTimeAnnotated;
-		}
-
-		public void setDateTimeAnnotated(DateTime dateTimeAnnotated) {
-			this.dateTimeAnnotated = dateTimeAnnotated;
-		}
-
-		public DateTime getDateTimeAnnotatedPattern() {
-			return dateTimeAnnotatedPattern;
-		}
-
-		public void setDateTimeAnnotatedPattern(DateTime dateTimeAnnotatedPattern) {
-			this.dateTimeAnnotatedPattern = dateTimeAnnotatedPattern;
-		}
-
-		public DateTime getDateTimeAnnotatedDefault() {
-			return dateTimeAnnotatedDefault;
-		}
-
-		public void setDateTimeAnnotatedDefault(DateTime dateTimeAnnotatedDefault) {
-			this.dateTimeAnnotatedDefault = dateTimeAnnotatedDefault;
-		}
-
-		public Date getDate() {
-			return date;
-		}
-
-		public void setDate(Date date) {
-			this.date = date;
-		}
-
-		public Date getDateAnnotated() {
-			return dateAnnotated;
-		}
-
-		public void setDateAnnotated(Date dateAnnotated) {
-			this.dateAnnotated = dateAnnotated;
-		}
-
-		public Calendar getCalendarAnnotated() {
-			return calendarAnnotated;
-		}
-
-		public void setCalendarAnnotated(Calendar calendarAnnotated) {
-			this.calendarAnnotated = calendarAnnotated;
-		}
-
-		public Long getMillis() {
-			return millis;
-		}
-
-		public void setMillis(Long millis) {
-			this.millis = millis;
-		}
-
-		@DateTimeFormat(style="S-")
-		public Long getMillisAnnotated() {
-			return millisAnnotated;
-		}
-
-		public void setMillisAnnotated(@DateTimeFormat(style="S-") Long millisAnnotated) {
-			this.millisAnnotated = millisAnnotated;
-		}
-
-		public LocalDate getIsoDate() {
-			return isoDate;
-		}
-
-		public void setIsoDate(LocalDate isoDate) {
-			this.isoDate = isoDate;
-		}
-
-		public LocalTime getIsoTime() {
-			return isoTime;
-		}
-
-		public void setIsoTime(LocalTime isoTime) {
-			this.isoTime = isoTime;
-		}
-
-		public DateTime getIsoDateTime() {
-			return isoDateTime;
-		}
-
-		public void setIsoDateTime(DateTime isoDateTime) {
-			this.isoDateTime = isoDateTime;
-		}
-
-		public Instant getInstantAnnotated() {
-			return instantAnnotated;
-		}
-
-		public void setInstantAnnotated(Instant instantAnnotated) {
-			this.instantAnnotated = instantAnnotated;
-		}
-
-		public Instant getMutableDateTimeAnnotated() {
-			return mutableDateTimeAnnotated;
-		}
-
-		public void setMutableDateTimeAnnotated(Instant mutableDateTimeAnnotated) {
-			this.mutableDateTimeAnnotated = mutableDateTimeAnnotated;
-		}
-
-		public Period getPeriod() {
-			return period;
-		}
-
-		public void setPeriod(Period period) {
-			this.period = period;
-		}
-
-		public Duration getDuration() {
-			return duration;
-		}
-
-		public void setDuration(Duration duration) {
-			this.duration = duration;
-		}
-
-		public YearMonth getYearMonth() {
-			return yearMonth;
-		}
-
-		public void setYearMonth(YearMonth yearMonth) {
-			this.yearMonth = yearMonth;
-		}
-
-		public MonthDay getMonthDay() {
-			return monthDay;
-		}
-
-		public void setMonthDay(MonthDay monthDay) {
-			this.monthDay = monthDay;
-		}
-
-		public List<JodaTimeBean> getChildren() {
-			return children;
-		}
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
index eeb6895eddea..494594df8cd6 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,40 +18,24 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Properties;
 
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.format.DateTimeFormat;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.ConfigurablePropertyAccessor;
-import org.springframework.beans.PropertyAccessorFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.format.Formatter;
-import org.springframework.format.Printer;
 import org.springframework.format.annotation.NumberFormat;
-import org.springframework.format.datetime.joda.DateTimeParser;
-import org.springframework.format.datetime.joda.JodaDateTimeFormatAnnotationFormatterFactory;
-import org.springframework.format.datetime.joda.ReadablePartialPrinter;
 import org.springframework.format.number.NumberStyleFormatter;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -90,155 +74,6 @@ public void formatFieldForTypeWithFormatter() {
 		assertThat(i).isEqualTo(3);
 	}
 
-	@Test
-	public void formatFieldForTypeWithPrinterParserWithCoercion() {
-		formattingService.addConverter(new Converter<DateTime, LocalDate>() {
-			@Override
-			public LocalDate convert(DateTime source) {
-				return source.toLocalDate();
-			}
-		});
-		formattingService.addFormatterForFieldType(LocalDate.class, new ReadablePartialPrinter(DateTimeFormat
-				.shortDate()), new DateTimeParser(DateTimeFormat.shortDate()));
-		String formatted = formattingService.convert(new LocalDate(2009, 10, 31), String.class);
-		assertThat(formatted).isEqualTo("10/31/09");
-		LocalDate date = formattingService.convert("10/31/09", LocalDate.class);
-		assertThat(date).isEqualTo(new LocalDate(2009, 10, 31));
-	}
-
-	@Test
-	@SuppressWarnings("resource")
-	public void formatFieldForValueInjection() {
-		AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext();
-		ac.registerBeanDefinition("valueBean", new RootBeanDefinition(ValueBean.class));
-		ac.registerBeanDefinition("conversionService", new RootBeanDefinition(FormattingConversionServiceFactoryBean.class));
-		ac.refresh();
-		ValueBean valueBean = ac.getBean(ValueBean.class);
-		assertThat(new LocalDate(valueBean.date)).isEqualTo(new LocalDate(2009, 10, 31));
-	}
-
-	@Test
-	@SuppressWarnings("resource")
-	public void formatFieldForValueInjectionUsingMetaAnnotations() {
-		AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext();
-		RootBeanDefinition bd = new RootBeanDefinition(MetaValueBean.class);
-		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		ac.registerBeanDefinition("valueBean", bd);
-		ac.registerBeanDefinition("conversionService", new RootBeanDefinition(FormattingConversionServiceFactoryBean.class));
-		ac.registerBeanDefinition("ppc", new RootBeanDefinition(PropertyPlaceholderConfigurer.class));
-		ac.refresh();
-		System.setProperty("myDate", "10-31-09");
-		System.setProperty("myNumber", "99.99%");
-		try {
-			MetaValueBean valueBean = ac.getBean(MetaValueBean.class);
-			assertThat(new LocalDate(valueBean.date)).isEqualTo(new LocalDate(2009, 10, 31));
-			assertThat(valueBean.number).isEqualTo(Double.valueOf(0.9999));
-		}
-		finally {
-			System.clearProperty("myDate");
-			System.clearProperty("myNumber");
-		}
-	}
-
-	@Test
-	public void formatFieldForAnnotation() throws Exception {
-		formattingService.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory());
-		doTestFormatFieldForAnnotation(Model.class, false);
-	}
-
-	@Test
-	public void formatFieldForAnnotationWithDirectFieldAccess() throws Exception {
-		formattingService.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory());
-		doTestFormatFieldForAnnotation(Model.class, true);
-	}
-
-	@Test
-	@SuppressWarnings("resource")
-	public void formatFieldForAnnotationWithPlaceholders() throws Exception {
-		GenericApplicationContext context = new GenericApplicationContext();
-		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
-		Properties props = new Properties();
-		props.setProperty("dateStyle", "S-");
-		props.setProperty("datePattern", "M-d-yy");
-		ppc.setProperties(props);
-		context.getBeanFactory().registerSingleton("ppc", ppc);
-		context.refresh();
-		context.getBeanFactory().initializeBean(formattingService, "formattingService");
-		formattingService.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory());
-		doTestFormatFieldForAnnotation(ModelWithPlaceholders.class, false);
-	}
-
-	@Test
-	@SuppressWarnings("resource")
-	public void formatFieldForAnnotationWithPlaceholdersAndFactoryBean() throws Exception {
-		GenericApplicationContext context = new GenericApplicationContext();
-		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
-		Properties props = new Properties();
-		props.setProperty("dateStyle", "S-");
-		props.setProperty("datePattern", "M-d-yy");
-		ppc.setProperties(props);
-		context.registerBeanDefinition("formattingService", new RootBeanDefinition(FormattingConversionServiceFactoryBean.class));
-		context.getBeanFactory().registerSingleton("ppc", ppc);
-		context.refresh();
-		formattingService = context.getBean("formattingService", FormattingConversionService.class);
-		doTestFormatFieldForAnnotation(ModelWithPlaceholders.class, false);
-	}
-
-	@SuppressWarnings("unchecked")
-	private void doTestFormatFieldForAnnotation(Class<?> modelClass, boolean directFieldAccess) throws Exception {
-		formattingService.addConverter(new Converter<Date, Long>() {
-			@Override
-			public Long convert(Date source) {
-				return source.getTime();
-			}
-		});
-		formattingService.addConverter(new Converter<DateTime, Date>() {
-			@Override
-			public Date convert(DateTime source) {
-				return source.toDate();
-			}
-		});
-
-		String formatted = (String) formattingService.convert(new LocalDate(2009, 10, 31).toDateTimeAtCurrentTime()
-				.toDate(), new TypeDescriptor(modelClass.getField("date")), TypeDescriptor.valueOf(String.class));
-		assertThat(formatted).isEqualTo("10/31/09");
-		LocalDate date = new LocalDate(formattingService.convert("10/31/09", TypeDescriptor.valueOf(String.class),
-				new TypeDescriptor(modelClass.getField("date"))));
-		assertThat(date).isEqualTo(new LocalDate(2009, 10, 31));
-
-		List<Date> dates = new ArrayList<>();
-		dates.add(new LocalDate(2009, 10, 31).toDateTimeAtCurrentTime().toDate());
-		dates.add(new LocalDate(2009, 11, 1).toDateTimeAtCurrentTime().toDate());
-		dates.add(new LocalDate(2009, 11, 2).toDateTimeAtCurrentTime().toDate());
-		formatted = (String) formattingService.convert(dates,
-				new TypeDescriptor(modelClass.getField("dates")), TypeDescriptor.valueOf(String.class));
-		assertThat(formatted).isEqualTo("10-31-09,11-1-09,11-2-09");
-		dates = (List<Date>) formattingService.convert("10-31-09,11-1-09,11-2-09",
-				TypeDescriptor.valueOf(String.class), new TypeDescriptor(modelClass.getField("dates")));
-		assertThat(new LocalDate(dates.get(0))).isEqualTo(new LocalDate(2009, 10, 31));
-		assertThat(new LocalDate(dates.get(1))).isEqualTo(new LocalDate(2009, 11, 1));
-		assertThat(new LocalDate(dates.get(2))).isEqualTo(new LocalDate(2009, 11, 2));
-
-		Object model = modelClass.newInstance();
-		ConfigurablePropertyAccessor accessor = directFieldAccess ? PropertyAccessorFactory.forDirectFieldAccess(model) :
-				PropertyAccessorFactory.forBeanPropertyAccess(model);
-		accessor.setConversionService(formattingService);
-		accessor.setPropertyValue("dates", "10-31-09,11-1-09,11-2-09");
-		dates = (List<Date>) accessor.getPropertyValue("dates");
-		assertThat(new LocalDate(dates.get(0))).isEqualTo(new LocalDate(2009, 10, 31));
-		assertThat(new LocalDate(dates.get(1))).isEqualTo(new LocalDate(2009, 11, 1));
-		assertThat(new LocalDate(dates.get(2))).isEqualTo(new LocalDate(2009, 11, 2));
-		if (!directFieldAccess) {
-			accessor.setPropertyValue("dates[0]", "10-30-09");
-			accessor.setPropertyValue("dates[1]", "10-1-09");
-			accessor.setPropertyValue("dates[2]", "10-2-09");
-			dates = (List<Date>) accessor.getPropertyValue("dates");
-			assertThat(new LocalDate(dates.get(0))).isEqualTo(new LocalDate(2009, 10, 30));
-			assertThat(new LocalDate(dates.get(1))).isEqualTo(new LocalDate(2009, 10, 1));
-			assertThat(new LocalDate(dates.get(2))).isEqualTo(new LocalDate(2009, 10, 2));
-		}
-	}
-
 	@Test
 	public void printNull() {
 		formattingService.addFormatterForFieldType(Number.class, new NumberStyleFormatter());
@@ -295,32 +130,6 @@ public void parseEmptyStringDefault() {
 		assertThat(formattingService.convert("", TypeDescriptor.valueOf(String.class), TypeDescriptor.valueOf(Integer.class))).isNull();
 	}
 
-	@Test
-	public void formatFieldForAnnotationWithSubclassAsFieldType() throws Exception {
-		formattingService.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory() {
-			@Override
-			public Printer<?> getPrinter(org.springframework.format.annotation.DateTimeFormat annotation, Class<?> fieldType) {
-				assertThat(fieldType).isEqualTo(MyDate.class);
-				return super.getPrinter(annotation, fieldType);
-			}
-		});
-		formattingService.addConverter(new Converter<MyDate, Long>() {
-			@Override
-			public Long convert(MyDate source) {
-				return source.getTime();
-			}
-		});
-		formattingService.addConverter(new Converter<MyDate, Date>() {
-			@Override
-			public Date convert(MyDate source) {
-				return source;
-			}
-		});
-
-		formattingService.convert(new MyDate(), new TypeDescriptor(ModelWithSubclassField.class.getField("date")),
-				TypeDescriptor.valueOf(String.class));
-	}
-
 	@Test
 	public void registerDefaultValueViaFormatter() {
 		registerDefaultValue(Date.class, new Date());
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java
index 1fe501b1301d..df7fc852b8b3 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java
@@ -26,7 +26,6 @@
 import java.util.TimeZone;
 import java.util.stream.Stream;
 
-import org.joda.time.LocalDateTime;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -49,25 +48,25 @@ class CronTriggerTests {
 
 	private final Calendar calendar = new GregorianCalendar();
 
-	private void setUp(LocalDateTime localDateTime, TimeZone timeZone) {
+	private void setup(Date localDateTime, TimeZone timeZone) {
+		this.calendar.setTime(localDateTime);
 		this.calendar.setTimeZone(timeZone);
-		this.calendar.setTime(localDateTime.toDate());
 		roundup(this.calendar);
 	}
 
 
 	@ParameterizedCronTriggerTest
-	void matchAll(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void matchAll(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* * * * * *", timeZone);
-		TriggerContext context = getTriggerContext(localDateTime.toDate());
+		TriggerContext context = getTriggerContext(localDateTime);
 		assertThat(trigger.nextExecutionTime(context)).isEqualTo(this.calendar.getTime());
 	}
 
 	@ParameterizedCronTriggerTest
-	void matchLastSecond(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void matchLastSecond(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* * * * * *", timeZone);
 		GregorianCalendar calendar = new GregorianCalendar();
@@ -76,8 +75,8 @@ void matchLastSecond(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void matchSpecificSecond(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void matchSpecificSecond(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("10 * * * * *", timeZone);
 		GregorianCalendar calendar = new GregorianCalendar();
@@ -86,8 +85,8 @@ void matchSpecificSecond(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementSecondByOne(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementSecondByOne(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("11 * * * * *", timeZone);
 		this.calendar.set(Calendar.SECOND, 10);
@@ -98,8 +97,8 @@ void incrementSecondByOne(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementSecondWithPreviousExecutionTooEarly(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementSecondWithPreviousExecutionTooEarly(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("11 * * * * *", timeZone);
 		this.calendar.set(Calendar.SECOND, 11);
@@ -111,8 +110,8 @@ void incrementSecondWithPreviousExecutionTooEarly(LocalDateTime localDateTime, T
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementSecondAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementSecondAndRollover(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("10 * * * * *", timeZone);
 		this.calendar.set(Calendar.SECOND, 11);
@@ -123,8 +122,8 @@ void incrementSecondAndRollover(LocalDateTime localDateTime, TimeZone timeZone)
 	}
 
 	@ParameterizedCronTriggerTest
-	void secondRange(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void secondRange(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("10-15 * * * * *", timeZone);
 		this.calendar.set(Calendar.SECOND, 9);
@@ -134,8 +133,8 @@ void secondRange(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementMinute(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementMinute(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 * * * * *", timeZone);
 		this.calendar.set(Calendar.MINUTE, 10);
@@ -152,8 +151,8 @@ void incrementMinute(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementMinuteByOne(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementMinuteByOne(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 11 * * * *", timeZone);
 		this.calendar.set(Calendar.MINUTE, 10);
@@ -164,8 +163,8 @@ void incrementMinuteByOne(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementMinuteAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementMinuteAndRollover(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 10 * * * *", timeZone);
 		this.calendar.set(Calendar.MINUTE, 11);
@@ -177,8 +176,8 @@ void incrementMinuteAndRollover(LocalDateTime localDateTime, TimeZone timeZone)
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementHour(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementHour(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 * * * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 9);
@@ -198,8 +197,8 @@ void incrementHour(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementHourAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementHourAndRollover(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 * * * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 9);
@@ -220,8 +219,8 @@ void incrementHourAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementDayOfMonth(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementDayOfMonth(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 * * *", timeZone);
 		this.calendar.set(Calendar.DAY_OF_MONTH, 1);
@@ -242,8 +241,8 @@ void incrementDayOfMonth(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementDayOfMonthByOne(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementDayOfMonthByOne(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* * * 10 * *", timeZone);
 		this.calendar.set(Calendar.DAY_OF_MONTH, 9);
@@ -257,8 +256,8 @@ void incrementDayOfMonthByOne(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementDayOfMonthAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementDayOfMonthAndRollover(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* * * 10 * *", timeZone);
 		this.calendar.set(Calendar.DAY_OF_MONTH, 11);
@@ -273,8 +272,8 @@ void incrementDayOfMonthAndRollover(LocalDateTime localDateTime, TimeZone timeZo
 	}
 
 	@ParameterizedCronTriggerTest
-	void dailyTriggerInShortMonth(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dailyTriggerInShortMonth(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 * * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 8); // September: 30 days
@@ -294,8 +293,8 @@ void dailyTriggerInShortMonth(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void dailyTriggerInLongMonth(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dailyTriggerInLongMonth(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 * * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 7); // August: 31 days and not a daylight saving boundary
@@ -315,8 +314,8 @@ void dailyTriggerInLongMonth(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void dailyTriggerOnDaylightSavingBoundary(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dailyTriggerOnDaylightSavingBoundary(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 * * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 9); // October: 31 days and a daylight saving boundary in CET
@@ -336,8 +335,8 @@ void dailyTriggerOnDaylightSavingBoundary(LocalDateTime localDateTime, TimeZone
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementMonth(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementMonth(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 1 * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 9);
@@ -357,8 +356,8 @@ void incrementMonth(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementMonthAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementMonthAndRollover(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 1 * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 11);
@@ -380,8 +379,8 @@ void incrementMonthAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthlyTriggerInLongMonth(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthlyTriggerInLongMonth(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 31 * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 9);
@@ -396,8 +395,8 @@ void monthlyTriggerInLongMonth(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthlyTriggerInShortMonth(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthlyTriggerInShortMonth(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 1 * *", timeZone);
 		this.calendar.set(Calendar.MONTH, 9);
@@ -413,8 +412,8 @@ void monthlyTriggerInShortMonth(LocalDateTime localDateTime, TimeZone timeZone)
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementDayOfWeekByOne(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementDayOfWeekByOne(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* * * * * 2", timeZone);
 		this.calendar.set(Calendar.DAY_OF_WEEK, 2);
@@ -429,8 +428,8 @@ void incrementDayOfWeekByOne(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void incrementDayOfWeekAndRollover(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void incrementDayOfWeekAndRollover(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* * * * * 2", timeZone);
 		this.calendar.set(Calendar.DAY_OF_WEEK, 4);
@@ -445,8 +444,8 @@ void incrementDayOfWeekAndRollover(LocalDateTime localDateTime, TimeZone timeZon
 	}
 
 	@ParameterizedCronTriggerTest
-	void specificMinuteSecond(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void specificMinuteSecond(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("55 5 * * * *", timeZone);
 		this.calendar.set(Calendar.MINUTE, 4);
@@ -464,8 +463,8 @@ void specificMinuteSecond(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void specificHourSecond(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void specificHourSecond(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("55 * 10 * * *", timeZone);
 		this.calendar.set(Calendar.HOUR_OF_DAY, 9);
@@ -484,8 +483,8 @@ void specificHourSecond(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void specificMinuteHour(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void specificMinuteHour(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* 5 10 * * *", timeZone);
 		this.calendar.set(Calendar.MINUTE, 4);
@@ -505,8 +504,8 @@ void specificMinuteHour(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void specificDayOfMonthSecond(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void specificDayOfMonthSecond(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("55 * * 3 * *", timeZone);
 		this.calendar.set(Calendar.DAY_OF_MONTH, 2);
@@ -526,8 +525,8 @@ void specificDayOfMonthSecond(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void specificDate(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void specificDate(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("* * * 3 11 *", timeZone);
 		this.calendar.set(Calendar.DAY_OF_MONTH, 2);
@@ -548,8 +547,8 @@ void specificDate(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void nonExistentSpecificDate(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void nonExistentSpecificDate(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		// TODO: maybe try and detect this as a special case in parser?
 		CronTrigger trigger = new CronTrigger("0 0 0 31 6 *", timeZone);
@@ -561,8 +560,8 @@ void nonExistentSpecificDate(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void leapYearSpecificDate(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void leapYearSpecificDate(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 0 29 2 *", timeZone);
 		this.calendar.set(Calendar.YEAR, 2007);
@@ -584,8 +583,8 @@ void leapYearSpecificDate(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void weekDaySequence(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void weekDaySequence(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 0 7 ? * MON-FRI", timeZone);
 		// This is a Saturday
@@ -612,8 +611,8 @@ void weekDaySequence(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void dayOfWeekIndifferent(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dayOfWeekIndifferent(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("* * * 2 * *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * 2 * ?", timeZone);
@@ -621,8 +620,8 @@ void dayOfWeekIndifferent(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void secondIncrementer(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void secondIncrementer(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("57,59 * * * * *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("57/2 * * * * *", timeZone);
@@ -630,8 +629,8 @@ void secondIncrementer(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void secondIncrementerWithRange(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void secondIncrementerWithRange(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("1,3,5 * * * * *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("1-6/2 * * * * *", timeZone);
@@ -639,8 +638,8 @@ void secondIncrementerWithRange(LocalDateTime localDateTime, TimeZone timeZone)
 	}
 
 	@ParameterizedCronTriggerTest
-	void hourIncrementer(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void hourIncrementer(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("* * 4,8,12,16,20 * * *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * 4/4 * * *", timeZone);
@@ -648,8 +647,8 @@ void hourIncrementer(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void dayNames(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dayNames(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("* * * * * 0-6", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * * TUE,WED,THU,FRI,SAT,SUN,MON", timeZone);
@@ -657,8 +656,8 @@ void dayNames(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void sundayIsZero(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void sundayIsZero(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("* * * * * 0", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * * SUN", timeZone);
@@ -666,8 +665,8 @@ void sundayIsZero(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void sundaySynonym(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void sundaySynonym(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("* * * * * 0", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * * 7", timeZone);
@@ -675,8 +674,8 @@ void sundaySynonym(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthNames(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthNames(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("* * * * 1-12 *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * FEB,JAN,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC *", timeZone);
@@ -684,8 +683,8 @@ void monthNames(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthNamesMixedCase(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthNamesMixedCase(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("* * * * 2 *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * Feb *", timeZone);
@@ -693,92 +692,92 @@ void monthNamesMixedCase(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void secondInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void secondInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("77 * * * * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void secondRangeInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void secondRangeInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("44-77 * * * * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void minuteInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void minuteInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("* 77 * * * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void minuteRangeInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void minuteRangeInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("* 44-77 * * * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void hourInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void hourInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("* * 27 * * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void hourRangeInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void hourRangeInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("* * 23-28 * * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void dayInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dayInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("* * * 45 * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void dayRangeInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dayRangeInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("* * * 28-45 * *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("0 0 0 25 13 ?", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthInvalidTooSmall(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthInvalidTooSmall(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("0 0 0 25 0 ?", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void dayOfMonthInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void dayOfMonthInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("0 0 0 32 12 ?", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthRangeInvalid(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthRangeInvalid(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		assertThatIllegalArgumentException().isThrownBy(() -> new CronTrigger("* * * * 11-13 *", timeZone));
 	}
 
 	@ParameterizedCronTriggerTest
-	void whitespace(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void whitespace(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger1 = new CronTrigger("*  *  * *  1 *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * 1 *", timeZone);
@@ -786,8 +785,8 @@ void whitespace(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void monthSequence(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void monthSequence(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		CronTrigger trigger = new CronTrigger("0 30 23 30 1/3 ?", timeZone);
 		this.calendar.set(2010, 11, 30);
@@ -813,8 +812,8 @@ void monthSequence(LocalDateTime localDateTime, TimeZone timeZone) {
 	}
 
 	@ParameterizedCronTriggerTest
-	void daylightSavingMissingHour(LocalDateTime localDateTime, TimeZone timeZone) {
-		setUp(localDateTime, timeZone);
+	void daylightSavingMissingHour(Date localDateTime, TimeZone timeZone) {
+		setup(localDateTime, timeZone);
 
 		// This trigger has to be somewhere between 2:00 AM and 3:00 AM, so we
 		// use a cron expression for 2:10 AM every day.
@@ -876,8 +875,8 @@ private static TriggerContext getTriggerContext(Date lastCompletionTime) {
 
 	static Stream<Arguments> parameters() {
 		return Stream.of(
-			arguments(LocalDateTime.now(), TimeZone.getTimeZone("PST")),
-			arguments(LocalDateTime.now(), TimeZone.getTimeZone("CET"))
+			arguments(new Date(), TimeZone.getTimeZone("PST")),
+			arguments(new Date(), TimeZone.getTimeZone("CET"))
 		);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
index 415113ff0596..03bc16cc5104 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -84,8 +84,6 @@
  * support for other Java 8 types like {@link java.util.Optional}</li>
  * <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>:
  * support for Java 8 Date & Time API types</li>
- * <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>:
- * support for Joda-Time types</li>
  * <li><a href="https://github.com/FasterXML/jackson-module-kotlin">jackson-module-kotlin</a>:
  * support for Kotlin classes and data classes</li>
  * </ul>
@@ -836,19 +834,6 @@ private void registerWellKnownModulesIfAvailable(MultiValueMap<Object, Module> m
 			// jackson-datatype-jsr310 not available
 		}
 
-		// Joda-Time 2.x present?
-		if (ClassUtils.isPresent("org.joda.time.YearMonth", this.moduleClassLoader)) {
-			try {
-				Class<? extends Module> jodaModuleClass = (Class<? extends Module>)
-						ClassUtils.forName("com.fasterxml.jackson.datatype.joda.JodaModule", this.moduleClassLoader);
-				Module jodaModule = BeanUtils.instantiateClass(jodaModuleClass);
-				modulesToRegister.set(jodaModule.getTypeId(), jodaModule);
-			}
-			catch (ClassNotFoundException ex) {
-				// jackson-datatype-joda not available
-			}
-		}
-
 		// Kotlin present?
 		if (KotlinDetector.isKotlinPresent()) {
 			try {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
index 57d3e63e184f..a2c8e5beebdc 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,8 +120,6 @@
  * support for other Java 8 types like {@link java.util.Optional}</li>
  * <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>:
  * support for Java 8 Date & Time API types</li>
- * <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>:
- * support for Joda-Time types</li>
  * <li><a href="https://github.com/FasterXML/jackson-module-kotlin">jackson-module-kotlin</a>:
  * support for Kotlin classes and data classes</li>
  * </ul>
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
index 32a93851ba46..eb4c321a1edf 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,8 +79,6 @@
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import kotlin.ranges.IntRange;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.FatalBeanException;
@@ -263,10 +261,6 @@ void modulesToInstallByInstance() {
 	void wellKnownModules() throws JsonProcessingException, UnsupportedEncodingException {
 		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().build();
 
-		Long timestamp = 1322903730000L;
-		DateTime dateTime = new DateTime(timestamp, DateTimeZone.UTC);
-		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo(timestamp.toString());
-
 		Path file = Paths.get("foo");
 		assertThat(new String(objectMapper.writeValueAsBytes(file), "UTF-8").endsWith("foo\"")).isTrue();
 
@@ -278,41 +272,6 @@ void wellKnownModules() throws JsonProcessingException, UnsupportedEncodingExcep
 		assertThat(new String(objectMapper.writeValueAsBytes(range), "UTF-8")).isEqualTo("{\"start\":1,\"end\":3}");
 	}
 
-	@Test  // SPR-12634
-	void customizeWellKnownModulesWithModule()
-			throws JsonProcessingException, UnsupportedEncodingException {
-
-		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
-				.modulesToInstall(new CustomIntegerModule())
-				.build();
-		DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC);
-		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo("1322903730000");
-		assertThat(new String(objectMapper.writeValueAsBytes(4), "UTF-8")).contains("customid");
-	}
-
-	@Test  // SPR-12634
-	void customizeWellKnownModulesWithModuleClass()
-			throws JsonProcessingException, UnsupportedEncodingException {
-
-		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
-				.modulesToInstall(CustomIntegerModule.class)
-				.build();
-		DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC);
-		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo("1322903730000");
-		assertThat(new String(objectMapper.writeValueAsBytes(4), "UTF-8")).contains("customid");
-	}
-
-	@Test  // SPR-12634
-	void customizeWellKnownModulesWithSerializer()
-			throws JsonProcessingException, UnsupportedEncodingException {
-
-		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
-				.serializerByType(Integer.class, new CustomIntegerSerializer()).build();
-		DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC);
-		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo("1322903730000");
-		assertThat(new String(objectMapper.writeValueAsBytes(4), "UTF-8")).contains("customid");
-	}
-
 	@Test  // gh-22576
 	void overrideWellKnownModuleWithModule() throws IOException {
 		Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
index 716abf906f06..d7a49c18eeb9 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.http.converter.json;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58,8 +57,6 @@
 import com.fasterxml.jackson.databind.type.SimpleType;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.FatalBeanException;
@@ -202,41 +199,6 @@ public void setModules() {
 		assertThat(serializers.findSerializer(null, SimpleType.construct(Integer.class), null)).isSameAs(serializer);
 	}
 
-	@Test
-	public void defaultModules() throws JsonProcessingException, UnsupportedEncodingException {
-		this.factory.afterPropertiesSet();
-		ObjectMapper objectMapper = this.factory.getObject();
-
-		Long timestamp = 1322903730000L;
-		DateTime dateTime = new DateTime(timestamp, DateTimeZone.UTC);
-		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo(timestamp.toString());
-	}
-
-	@Test  // SPR-12634
-	public void customizeDefaultModulesWithModuleClass() throws JsonProcessingException, UnsupportedEncodingException {
-		this.factory.setModulesToInstall(CustomIntegerModule.class);
-		this.factory.afterPropertiesSet();
-		ObjectMapper objectMapper = this.factory.getObject();
-
-		DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC);
-		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo("1322903730000");
-		assertThat(new String(objectMapper.writeValueAsBytes(4), "UTF-8")).contains("customid");
-	}
-
-	@Test  // SPR-12634
-	public void customizeDefaultModulesWithSerializer() throws JsonProcessingException, UnsupportedEncodingException {
-		Map<Class<?>, JsonSerializer<?>> serializers = new HashMap<>();
-		serializers.put(Integer.class, new CustomIntegerSerializer());
-
-		this.factory.setSerializersByType(serializers);
-		this.factory.afterPropertiesSet();
-		ObjectMapper objectMapper = this.factory.getObject();
-
-		DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC);
-		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo("1322903730000");
-		assertThat(new String(objectMapper.writeValueAsBytes(4), "UTF-8")).contains("customid");
-	}
-
 	@Test
 	public void simpleSetup() {
 		this.factory.afterPropertiesSet();

From 3c8724ba3d0375e4a50354c15383972fee788e9c Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 17 Sep 2021 08:58:52 +0200
Subject: [PATCH 107/735] Remove JiBX support

Closes gh-27425
---
 .../JibxMarshallerBeanDefinitionParser.java   |  38 --
 .../oxm/config/OxmNamespaceHandler.java       |   4 +-
 .../oxm/jibx/JibxMarshaller.java              | 502 ------------------
 .../oxm/jibx/package-info.java                |  10 -
 .../springframework/oxm/jibx/FlightType.java  |  40 --
 .../org/springframework/oxm/jibx/Flights.java |  36 --
 .../oxm/jibx/JibxMarshallerTests.java         | 105 ----
 .../oxm/jibx/JibxUnmarshallerTests.java       |  90 ----
 8 files changed, 1 insertion(+), 824 deletions(-)
 delete mode 100644 spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
 delete mode 100644 spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
 delete mode 100644 spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
 delete mode 100644 spring-oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java
 delete mode 100644 spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
 delete mode 100644 spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
 delete mode 100644 spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
deleted file mode 100644
index c14452eb56fc..000000000000
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- * 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.oxm.config;
-
-import org.w3c.dom.Element;
-
-import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
-
-/**
- * Parser for the {@code <oxm:jibx-marshaller/>} element.
- *
- * @author Arjen Poutsma
- * @since 3.0
- * @deprecated as of Spring Framework 5.1.5, due to the lack of activity on the JiBX project
- */
-@Deprecated
-class JibxMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
-
-	@Override
-	protected String getBeanClassName(Element element) {
-		return "org.springframework.oxm.jibx.JibxMarshaller";
-	}
-
-}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
index ecb7b64012ef..c57540c4edde 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,8 @@
 public class OxmNamespaceHandler extends NamespaceHandlerSupport {
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public void init() {
 		registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());
-		registerBeanDefinitionParser("jibx-marshaller", new JibxMarshallerBeanDefinitionParser());
 	}
 
 }
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
deleted file mode 100644
index 174c973c6377..000000000000
--- a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * 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.
- * 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.oxm.jibx;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.IXMLReader;
-import org.jibx.runtime.IXMLWriter;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.ValidationException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.StAXReaderWrapper;
-import org.jibx.runtime.impl.StAXWriter;
-import org.jibx.runtime.impl.UnmarshallingContext;
-import org.w3c.dom.Node;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.oxm.MarshallingFailureException;
-import org.springframework.oxm.UnmarshallingFailureException;
-import org.springframework.oxm.ValidationFailureException;
-import org.springframework.oxm.XmlMappingException;
-import org.springframework.oxm.support.AbstractMarshaller;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.StaxUtils;
-
-/**
- * Implementation of the {@code Marshaller} and {@code Unmarshaller} interfaces for JiBX.
- *
- * <p>The typical usage will be to set the {@code targetClass} and optionally the
- * {@code bindingName} property on this bean.
- *
- * @author Arjen Poutsma
- * @since 3.0
- * @see org.jibx.runtime.IMarshallingContext
- * @see org.jibx.runtime.IUnmarshallingContext
- * @deprecated as of Spring Framework 5.1.5, due to the lack of activity on the JiBX project
- */
-@Deprecated
-public class JibxMarshaller extends AbstractMarshaller implements InitializingBean {
-
-	private static final String DEFAULT_BINDING_NAME = "binding";
-
-
-	@Nullable
-	private Class<?> targetClass;
-
-	@Nullable
-	private String targetPackage;
-
-	@Nullable
-	private String bindingName;
-
-	private int indent = -1;
-
-	private String encoding = "UTF-8";
-
-	@Nullable
-	private Boolean standalone;
-
-	@Nullable
-	private String docTypeRootElementName;
-
-	@Nullable
-	private String docTypeSystemId;
-
-	@Nullable
-	private String docTypePublicId;
-
-	@Nullable
-	private String docTypeInternalSubset;
-
-	@Nullable
-	private IBindingFactory bindingFactory;
-
-	private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
-
-
-	/**
-	 * Set the target class for this instance. Setting either this property or the
-	 * {@link #setTargetPackage(String) targetPackage} property is required.
-	 * <p>If this property is set, {@link #setTargetPackage(String) targetPackage} is ignored.
-	 */
-	public void setTargetClass(Class<?> targetClass) {
-		this.targetClass = targetClass;
-	}
-
-	/**
-	 * Set the target package for this instance. Setting either this property or the
-	 * {@link #setTargetClass(Class) targetClass} property is required.
-	 * <p>If {@link #setTargetClass(Class) targetClass} is set, this property is ignored.
-	 */
-	public void setTargetPackage(String targetPackage) {
-		this.targetPackage = targetPackage;
-	}
-
-	/**
-	 * Set the optional binding name for this instance.
-	 */
-	public void setBindingName(String bindingName) {
-		this.bindingName = bindingName;
-	}
-
-	/**
-	 * Set the number of nesting indent spaces. Default is {@code -1}, i.e. no indentation.
-	 */
-	public void setIndent(int indent) {
-		this.indent = indent;
-	}
-
-	/**
-	 * Set the document encoding using for marshalling. Default is UTF-8.
-	 */
-	public void setEncoding(String encoding) {
-		this.encoding = encoding;
-	}
-
-	@Override
-	protected String getDefaultEncoding() {
-		return this.encoding;
-	}
-
-	/**
-	 * Set the document standalone flag for marshalling. By default, this flag is not present.
-	 */
-	public void setStandalone(Boolean standalone) {
-		this.standalone = standalone;
-	}
-
-	/**
-	 * Set the root element name for the DTD declaration written when marshalling.
-	 * By default, this is {@code null} (i.e. no DTD declaration is written).
-	 * <p>If set to a value, the system ID or public ID also need to be set.
-	 * @see #setDocTypeSystemId(String)
-	 * @see #setDocTypePublicId(String)
-	 */
-	public void setDocTypeRootElementName(String docTypeRootElementName) {
-		this.docTypeRootElementName = docTypeRootElementName;
-	}
-
-	/**
-	 * Set the system id for the DTD declaration written when marshalling.
-	 * By default, this is {@code null}. Only used when the root element also has been set.
-	 * <p>Set either this property or {@code docTypePublicId}, not both.
-	 * @see #setDocTypeRootElementName(String)
-	 */
-	public void setDocTypeSystemId(String docTypeSystemId) {
-		this.docTypeSystemId = docTypeSystemId;
-	}
-
-	/**
-	 * Set the public id for the DTD declaration written when marshalling.
-	 * By default, this is {@code null}. Only used when the root element also has been set.
-	 * <p>Set either this property or {@code docTypeSystemId}, not both.
-	 * @see #setDocTypeRootElementName(String)
-	 */
-	public void setDocTypePublicId(String docTypePublicId) {
-		this.docTypePublicId = docTypePublicId;
-	}
-
-	/**
-	 * Set the internal subset Id for the DTD declaration written when marshalling.
-	 * By default, this is {@code null}. Only used when the root element also has been set.
-	 * @see #setDocTypeRootElementName(String)
-	 */
-	public void setDocTypeInternalSubset(String docTypeInternalSubset) {
-		this.docTypeInternalSubset = docTypeInternalSubset;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws JiBXException {
-		if (this.targetClass != null) {
-			if (StringUtils.hasLength(this.bindingName)) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Configured for target class [" + this.targetClass +
-							"] using binding [" + this.bindingName + "]");
-				}
-				this.bindingFactory = BindingDirectory.getFactory(this.bindingName, this.targetClass);
-			}
-			else {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Configured for target class [" + this.targetClass + "]");
-				}
-				this.bindingFactory = BindingDirectory.getFactory(this.targetClass);
-			}
-		}
-		else if (this.targetPackage != null) {
-			if (!StringUtils.hasLength(this.bindingName)) {
-				this.bindingName = DEFAULT_BINDING_NAME;
-			}
-			if (logger.isDebugEnabled()) {
-				logger.debug("Configured for target package [" + this.targetPackage +
-						"] using binding [" + this.bindingName + "]");
-			}
-			this.bindingFactory = BindingDirectory.getFactory(this.bindingName, this.targetPackage);
-		}
-		else {
-			throw new IllegalArgumentException("Either 'targetClass' or 'targetPackage' is required");
-		}
-	}
-
-
-	@Override
-	public boolean supports(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		if (this.targetClass != null) {
-			return (this.targetClass == clazz);
-		}
-		Assert.state(this.bindingFactory != null, "JibxMarshaller not initialized");
-		String[] mappedClasses = this.bindingFactory.getMappedClasses();
-		String className = clazz.getName();
-		for (String mappedClass : mappedClasses) {
-			if (className.equals(mappedClass)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	// Supported marshalling
-
-	@Override
-	protected void marshalOutputStream(Object graph, OutputStream outputStream)
-			throws XmlMappingException, IOException {
-		try {
-			IMarshallingContext marshallingContext = createMarshallingContext();
-			marshallingContext.startDocument(this.encoding, this.standalone, outputStream);
-			marshalDocument(marshallingContext, graph);
-		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, true);
-		}
-	}
-
-	@Override
-	protected void marshalWriter(Object graph, Writer writer) throws XmlMappingException, IOException {
-		try {
-			IMarshallingContext marshallingContext = createMarshallingContext();
-			marshallingContext.startDocument(this.encoding, this.standalone, writer);
-			marshalDocument(marshallingContext, graph);
-		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, true);
-		}
-	}
-
-	private void marshalDocument(IMarshallingContext marshallingContext, Object graph) throws IOException, JiBXException {
-		if (StringUtils.hasLength(this.docTypeRootElementName)) {
-			IXMLWriter xmlWriter = marshallingContext.getXmlWriter();
-			xmlWriter.writeDocType(this.docTypeRootElementName, this.docTypeSystemId,
-					this.docTypePublicId, this.docTypeInternalSubset);
-		}
-		marshallingContext.marshalDocument(graph);
-	}
-
-
-	// Unsupported marshalling
-
-	@Override
-	protected void marshalDomNode(Object graph, Node node) throws XmlMappingException {
-		try {
-			// JiBX does not support DOM natively, so we write to a buffer first, and transform that to the Node
-			Result result = new DOMResult(node);
-			transformAndMarshal(graph, result);
-		}
-		catch (IOException ex) {
-			throw new MarshallingFailureException("JiBX marshalling exception", ex);
-		}
-	}
-
-	@Override
-	protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) {
-		XMLStreamWriter streamWriter = StaxUtils.createEventStreamWriter(eventWriter);
-		marshalXmlStreamWriter(graph, streamWriter);
-	}
-
-	@Override
-	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
-		try {
-			MarshallingContext marshallingContext = (MarshallingContext) createMarshallingContext();
-			IXMLWriter xmlWriter = new StAXWriter(marshallingContext.getNamespaces(), streamWriter);
-			marshallingContext.setXmlWriter(xmlWriter);
-			marshallingContext.marshalDocument(graph);
-		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, false);
-		}
-	}
-
-	@Override
-	protected void marshalSaxHandlers(Object graph, ContentHandler contentHandler, @Nullable LexicalHandler lexicalHandler)
-			throws XmlMappingException {
-		try {
-			// JiBX does not support SAX natively, so we write to a buffer first, and transform that to the handlers
-			SAXResult saxResult = new SAXResult(contentHandler);
-			saxResult.setLexicalHandler(lexicalHandler);
-			transformAndMarshal(graph, saxResult);
-		}
-		catch (IOException ex) {
-			throw new MarshallingFailureException("JiBX marshalling exception", ex);
-		}
-	}
-
-	private void transformAndMarshal(Object graph, Result result) throws IOException {
-		try {
-			ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
-			marshalOutputStream(graph, os);
-			ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-			Transformer transformer = this.transformerFactory.newTransformer();
-			transformer.transform(new StreamSource(is), result);
-		}
-		catch (TransformerException ex) {
-			throw new MarshallingFailureException(
-					"Could not transform to [" + ClassUtils.getShortName(result.getClass()) + "]", ex);
-		}
-
-	}
-
-
-	// Unmarshalling
-
-	@Override
-	protected Object unmarshalXmlEventReader(XMLEventReader eventReader) {
-		try {
-			XMLStreamReader streamReader = StaxUtils.createEventStreamReader(eventReader);
-			return unmarshalXmlStreamReader(streamReader);
-		}
-		catch (XMLStreamException ex) {
-			return new UnmarshallingFailureException("JiBX unmarshalling exception", ex);
-		}
-	}
-
-	@Override
-	protected Object unmarshalXmlStreamReader(XMLStreamReader streamReader) {
-		try {
-			UnmarshallingContext unmarshallingContext = (UnmarshallingContext) createUnmarshallingContext();
-			IXMLReader xmlReader = new StAXReaderWrapper(streamReader, null, true);
-			unmarshallingContext.setDocument(xmlReader);
-			return unmarshallingContext.unmarshalElement();
-		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, false);
-		}
-	}
-
-	@Override
-	protected Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException {
-		try {
-			IUnmarshallingContext unmarshallingContext = createUnmarshallingContext();
-			return unmarshallingContext.unmarshalDocument(inputStream, this.encoding);
-		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, false);
-		}
-	}
-
-	@Override
-	protected Object unmarshalReader(Reader reader) throws XmlMappingException, IOException {
-		try {
-			IUnmarshallingContext unmarshallingContext = createUnmarshallingContext();
-			return unmarshallingContext.unmarshalDocument(reader);
-		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, false);
-		}
-	}
-
-
-	// Unsupported Unmarshalling
-
-	@Override
-	protected Object unmarshalDomNode(Node node) throws XmlMappingException {
-		try {
-			return transformAndUnmarshal(new DOMSource(node), null);
-		}
-		catch (IOException ex) {
-			throw new UnmarshallingFailureException("JiBX unmarshalling exception", ex);
-		}
-	}
-
-	@Override
-	protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
-			throws XmlMappingException, IOException {
-
-		return transformAndUnmarshal(new SAXSource(xmlReader, inputSource), inputSource.getEncoding());
-	}
-
-	private Object transformAndUnmarshal(Source source, @Nullable String encoding) throws IOException {
-		try {
-			Transformer transformer = this.transformerFactory.newTransformer();
-			if (encoding != null) {
-				transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
-			}
-			ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
-			transformer.transform(source, new StreamResult(os));
-			ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-			return unmarshalInputStream(is);
-		}
-		catch (TransformerException ex) {
-			throw new MarshallingFailureException(
-					"Could not transform from [" + ClassUtils.getShortName(source.getClass()) + "]", ex);
-		}
-	}
-
-
-	/**
-	 * Create a new {@code IMarshallingContext}, configured with the correct indentation.
-	 * @return the created marshalling context
-	 * @throws JiBXException in case of errors
-	 */
-	protected IMarshallingContext createMarshallingContext() throws JiBXException {
-		Assert.state(this.bindingFactory != null, "JibxMarshaller not initialized");
-		IMarshallingContext marshallingContext = this.bindingFactory.createMarshallingContext();
-		marshallingContext.setIndent(this.indent);
-		return marshallingContext;
-	}
-
-	/**
-	 * Create a new {@code IUnmarshallingContext}.
-	 * @return the created unmarshalling context
-	 * @throws JiBXException in case of errors
-	 */
-	protected IUnmarshallingContext createUnmarshallingContext() throws JiBXException {
-		Assert.state(this.bindingFactory != null, "JibxMarshaller not initialized");
-		return this.bindingFactory.createUnmarshallingContext();
-	}
-
-	/**
-	 * Convert the given {@code JiBXException} to an appropriate exception from the
-	 * {@code org.springframework.oxm} hierarchy.
-	 * <p>A boolean flag is used to indicate whether this exception occurs during marshalling or
-	 * unmarshalling, since JiBX itself does not make this distinction in its exception hierarchy.
-	 * @param ex {@code JiBXException} that occurred
-	 * @param marshalling indicates whether the exception occurs during marshalling ({@code true}),
-	 * or unmarshalling ({@code false})
-	 * @return the corresponding {@code XmlMappingException}
-	 */
-	public XmlMappingException convertJibxException(JiBXException ex, boolean marshalling) {
-		if (ex instanceof ValidationException) {
-			return new ValidationFailureException("JiBX validation exception", ex);
-		}
-		else {
-			if (marshalling) {
-				return new MarshallingFailureException("JiBX marshalling exception", ex);
-			}
-			else {
-				return new UnmarshallingFailureException("JiBX unmarshalling exception", ex);
-			}
-		}
-	}
-
-}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
deleted file mode 100644
index 8f6b47b98ce5..000000000000
--- a/spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Package providing integration of <a href="http://jibx.sourceforge.net/">JiBX</a>
- * with Spring's O/X Mapping support.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.oxm.jibx;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java
deleted file mode 100644
index d47f26ab78cc..000000000000
--- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2006-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.
- * 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.oxm.jibx;
-
-public class FlightType {
-
-	protected String airline;
-
-	protected long number;
-
-	public String getAirline() {
-		return this.airline;
-	}
-
-	public void setAirline(String airline) {
-		this.airline = airline;
-	}
-
-	public long getNumber() {
-		return this.number;
-	}
-
-	public void setNumber(long number) {
-		this.number = number;
-	}
-}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
deleted file mode 100644
index e50359bade48..000000000000
--- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- * 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.oxm.jibx;
-
-import java.util.ArrayList;
-
-public class Flights {
-
-	protected ArrayList<FlightType> flightList = new ArrayList<>();
-
-	public void addFlight(FlightType flight) {
-		flightList.add(flight);
-	}
-
-	public FlightType getFlight(int index) {
-		return flightList.get(index);
-	}
-
-	public int sizeFlightList() {
-		return flightList.size();
-	}
-}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
deleted file mode 100644
index 6ed3d7102d5c..000000000000
--- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.
- * 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.oxm.jibx;
-
-import java.io.StringWriter;
-
-import javax.xml.transform.stream.StreamResult;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledOnJre;
-
-import org.springframework.core.testfixture.xml.XmlContent;
-import org.springframework.oxm.AbstractMarshallerTests;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-
-/**
- * NOTE: These tests fail under Eclipse/IDEA because JiBX binding does not occur by
- * default. The Gradle build should succeed, however.
- *
- * @author Arjen Poutsma
- * @author Sam Brannen
- */
-@Deprecated
-@EnabledOnJre(JAVA_8) // JiBX compiler is currently not compatible with JDK 9
-public class JibxMarshallerTests extends AbstractMarshallerTests<JibxMarshaller> {
-
-	@Override
-	protected JibxMarshaller createMarshaller() throws Exception {
-		JibxMarshaller marshaller = new JibxMarshaller();
-		marshaller.setTargetPackage("org.springframework.oxm.jibx");
-		marshaller.afterPropertiesSet();
-		return marshaller;
-	}
-
-	@Override
-	protected Object createFlights() {
-		Flights flights = new Flights();
-		FlightType flight = new FlightType();
-		flight.setNumber(42L);
-		flights.addFlight(flight);
-		return flights;
-	}
-
-
-	@Test
-	public void afterPropertiesSetNoContextPath() throws Exception {
-		JibxMarshaller marshaller = new JibxMarshaller();
-		assertThatIllegalArgumentException().isThrownBy(
-				marshaller::afterPropertiesSet);
-	}
-
-	@Test
-	public void indentation() throws Exception {
-		marshaller.setIndent(4);
-		StringWriter writer = new StringWriter();
-		marshaller.marshal(flights, new StreamResult(writer));
-		String expected =
-				"<?xml version=\"1.0\"?>\n" + "<flights xmlns=\"http://samples.springframework.org/flight\">\n" +
-						"    <flight>\n" + "        <number>42</number>\n" + "    </flight>\n" + "</flights>";
-		assertThat(XmlContent.from(writer)).isSimilarToIgnoringWhitespace(expected);
-	}
-
-	@Test
-	public void encodingAndStandalone() throws Exception {
-		marshaller.setEncoding("ISO-8859-1");
-		marshaller.setStandalone(Boolean.TRUE);
-		StringWriter writer = new StringWriter();
-		marshaller.marshal(flights, new StreamResult(writer));
-		assertThat(writer.toString().startsWith("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" standalone=\"yes\"?>")).as("Encoding and standalone not set").isTrue();
-	}
-
-	@Test
-	public void dtd() throws Exception {
-		marshaller.setDocTypeRootElementName("flights");
-		marshaller.setDocTypeSystemId("flights.dtd");
-		StringWriter writer = new StringWriter();
-		marshaller.marshal(flights, new StreamResult(writer));
-		assertThat(writer.toString().contains("<!DOCTYPE flights SYSTEM \"flights.dtd\">")).as("doc type not written").isTrue();
-	}
-
-	@Test
-	public void supports() throws Exception {
-		assertThat(marshaller.supports(Flights.class)).as("JibxMarshaller does not support Flights").isTrue();
-		assertThat(marshaller.supports(FlightType.class)).as("JibxMarshaller does not support FlightType").isTrue();
-		assertThat(marshaller.supports(getClass())).as("JibxMarshaller supports illegal type").isFalse();
-	}
-
-}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
deleted file mode 100644
index 0dcf21172551..000000000000
--- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.
- * 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.oxm.jibx;
-
-import java.io.ByteArrayInputStream;
-
-import javax.xml.transform.stream.StreamSource;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledOnJre;
-
-import org.springframework.oxm.AbstractUnmarshallerTests;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-
-/**
- * NOTE: These tests fail under Eclipse/IDEA because JiBX binding does
- * not occur by default. The Gradle build should succeed, however.
- *
- * @author Arjen Poutsma
- * @author Sam Brannen
- */
-@Deprecated
-@EnabledOnJre(JAVA_8) // JiBX compiler is currently not compatible with JDK 9
-public class JibxUnmarshallerTests extends AbstractUnmarshallerTests<JibxMarshaller> {
-
-	protected static final String INPUT_STRING_WITH_SPECIAL_CHARACTERS =
-			"<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
-					"<tns:flight><tns:airline>Air Libert\u00e9</tns:airline><tns:number>42</tns:number></tns:flight></tns:flights>";
-
-
-	@Override
-	protected JibxMarshaller createUnmarshaller() throws Exception {
-		JibxMarshaller unmarshaller = new JibxMarshaller();
-		unmarshaller.setTargetClass(Flights.class);
-		unmarshaller.afterPropertiesSet();
-		return unmarshaller;
-	}
-
-	@Override
-	protected void testFlights(Object o) {
-		Flights flights = (Flights) o;
-		assertThat(flights).as("Flights is null").isNotNull();
-		assertThat(flights.sizeFlightList()).as("Invalid amount of flight elements").isEqualTo(1);
-		testFlight(flights.getFlight(0));
-	}
-
-	@Override
-	protected void testFlight(Object o) {
-		FlightType flight = (FlightType) o;
-		assertThat(flight).as("Flight is null").isNotNull();
-		assertThat(flight.getNumber()).as("Number is invalid").isEqualTo(42L);
-	}
-
-
-	@Test
-	@Override
-	public void unmarshalPartialStaxSourceXmlStreamReader() throws Exception {
-		// JiBX does not support reading XML fragments, hence the override here
-	}
-
-	@Test
-	public void unmarshalStreamSourceInputStreamUsingNonDefaultEncoding() throws Exception {
-		String encoding = "ISO-8859-1";
-		unmarshaller.setEncoding(encoding);
-
-		StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING_WITH_SPECIAL_CHARACTERS.getBytes(encoding)));
-		Object flights = unmarshaller.unmarshal(source);
-		testFlights(flights);
-
-		FlightType flight = ((Flights)flights).getFlight(0);
-		assertThat(flight.getAirline()).as("Airline is invalid").isEqualTo("Air Libert\u00e9");
-	}
-
-}

From 5822f1bf85b94fd15f9829914b065b1c61910c7d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 17 Sep 2021 08:59:58 +0200
Subject: [PATCH 108/735] Drop RPC-style remoting

Closes gh-27422
---
 .../remoting/RemoteAccessException.java       |  73 ---
 .../RemoteConnectFailureException.java        |  38 --
 .../RemoteInvocationFailureException.java     |  40 --
 .../RemoteLookupFailureException.java         |  46 --
 .../remoting/RemoteProxyFailureException.java |  40 --
 .../remoting/RemoteTimeoutException.java      |  45 --
 .../remoting/package-info.java                |  10 -
 .../rmi/CodebaseAwareObjectInputStream.java   | 122 ----
 .../rmi/JndiRmiClientInterceptor.java         | 452 --------------
 .../remoting/rmi/JndiRmiProxyFactoryBean.java | 104 ----
 .../remoting/rmi/JndiRmiServiceExporter.java  | 194 ------
 .../RemoteInvocationSerializingExporter.java  | 183 ------
 .../remoting/rmi/RmiBasedExporter.java        |  78 ---
 .../remoting/rmi/RmiClientInterceptor.java    | 424 -------------
 .../rmi/RmiClientInterceptorUtils.java        | 176 ------
 .../remoting/rmi/RmiInvocationHandler.java    |  64 --
 .../remoting/rmi/RmiInvocationWrapper.java    |  81 ---
 .../remoting/rmi/RmiProxyFactoryBean.java     |  92 ---
 .../remoting/rmi/RmiRegistryFactoryBean.java  | 317 ----------
 .../remoting/rmi/RmiServiceExporter.java      | 464 ---------------
 .../remoting/rmi/package-info.java            |   6 -
 .../remoting/soap/SoapFaultException.java     |  65 --
 .../remoting/soap/package-info.java           |   4 -
 .../DefaultRemoteInvocationExecutor.java      |  42 --
 .../DefaultRemoteInvocationFactory.java       |  35 --
 .../remoting/support/RemoteAccessor.java      |  63 --
 .../remoting/support/RemoteExporter.java      | 186 ------
 .../remoting/support/RemoteInvocation.java    | 225 -------
 .../RemoteInvocationBasedAccessor.java        |  91 ---
 .../RemoteInvocationBasedExporter.java        | 122 ----
 .../support/RemoteInvocationExecutor.java     |  49 --
 .../support/RemoteInvocationFactory.java      |  46 --
 .../support/RemoteInvocationResult.java       | 164 -----
 .../RemoteInvocationTraceInterceptor.java     | 104 ----
 .../support/RemoteInvocationUtils.java        |  60 --
 .../remoting/support/RemotingSupport.java     |  77 ---
 .../support/SimpleHttpServerFactoryBean.java  | 194 ------
 .../support/UrlBasedRemoteAccessor.java       |  56 --
 .../remoting/support/package-info.java        |   5 -
 .../remoting/rmi/RmiSupportTests.java         | 445 --------------
 .../support/RemoteInvocationUtilsTests.java   |  46 --
 .../remoting/JmsInvokerClientInterceptor.java | 437 --------------
 .../remoting/JmsInvokerProxyFactoryBean.java  | 101 ----
 .../remoting/JmsInvokerServiceExporter.java   | 199 -------
 .../jms/remoting/package-info.java            |  13 -
 .../jms/remoting/JmsInvokerTests.java         | 511 ----------------
 .../caucho/HessianClientInterceptor.java      | 302 ----------
 .../remoting/caucho/HessianExporter.java      | 254 --------
 .../caucho/HessianProxyFactoryBean.java       |  75 ---
 .../caucho/HessianServiceExporter.java        |  73 ---
 .../caucho/SimpleHessianServiceExporter.java  |  77 ---
 .../remoting/caucho/package-info.java         |  15 -
 .../AbstractHttpInvokerRequestExecutor.java   | 295 ---------
 ...pComponentsHttpInvokerRequestExecutor.java | 370 ------------
 .../HttpInvokerClientConfiguration.java       |  47 --
 .../HttpInvokerClientInterceptor.java         | 241 --------
 .../HttpInvokerProxyFactoryBean.java          |  90 ---
 .../HttpInvokerRequestExecutor.java           |  62 --
 .../HttpInvokerServiceExporter.java           | 215 -------
 .../SimpleHttpInvokerRequestExecutor.java     | 233 --------
 .../SimpleHttpInvokerServiceExporter.java     | 182 ------
 .../remoting/httpinvoker/package-info.java    |  16 -
 .../jaxws/AbstractJaxWsServiceExporter.java   | 214 -------
 .../jaxws/JaxWsPortClientInterceptor.java     | 561 ------------------
 .../jaxws/JaxWsPortProxyFactoryBean.java      |  74 ---
 .../jaxws/JaxWsSoapFaultException.java        |  71 ---
 .../jaxws/LocalJaxWsServiceFactory.java       | 192 ------
 .../jaxws/LocalJaxWsServiceFactoryBean.java   |  67 ---
 .../SimpleHttpServerJaxWsServiceExporter.java | 228 -------
 .../jaxws/SimpleJaxWsServiceExporter.java     |  89 ---
 .../remoting/jaxws/package-info.java          |  11 -
 .../remoting/caucho/CauchoRemotingTests.java  | 163 -----
 ...onentsHttpInvokerRequestExecutorTests.java | 169 ------
 ...ttpInvokerFactoryBeanIntegrationTests.java | 145 -----
 .../httpinvoker/HttpInvokerTests.java         | 453 --------------
 .../remoting/jaxws/JaxWsSupportTests.java     | 161 -----
 .../jaxws/OrderNotFoundException.java         |  44 --
 .../remoting/jaxws/OrderService.java          |  31 -
 .../remoting/jaxws/OrderServiceImpl.java      |  44 --
 79 files changed, 11653 deletions(-)
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/RemoteAccessException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/RemoteTimeoutException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/package-info.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/rmi/package-info.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/soap/package-info.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/remoting/support/package-info.java
 delete mode 100644 spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
 delete mode 100644 spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
 delete mode 100644 spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
 delete mode 100644 spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
 delete mode 100644 spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerFactoryBeanIntegrationTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
 delete mode 100644 spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java

diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteAccessException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteAccessException.java
deleted file mode 100644
index 0d6cde82e519..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteAccessException.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- * 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.remoting;
-
-import org.springframework.core.NestedRuntimeException;
-
-/**
- * Generic remote access exception. A service proxy for any remoting
- * protocol should throw this exception or subclasses of it, in order
- * to transparently expose a plain Java business interface.
- *
- * <p>When using conforming proxies, switching the actual remoting protocol
- * e.g. from Hessian does not affect client code. Clients work with a plain
- * natural Java business interface that the service exposes. A client object
- * simply receives an implementation for the interface that it needs via a
- * bean reference, like it does for a local bean as well.
- *
- * <p>A client may catch RemoteAccessException if it wants to, but as
- * remote access errors are typically unrecoverable, it will probably let
- * such exceptions propagate to a higher level that handles them generically.
- * In this case, the client code doesn't show any signs of being involved in
- * remote access, as there aren't any remoting-specific dependencies.
- *
- * <p>Even when switching from a remote service proxy to a local implementation
- * of the same interface, this amounts to just a matter of configuration. Obviously,
- * the client code should be somewhat aware that it <i>might be working</i>
- * against a remote service, for example in terms of repeated method calls that
- * cause unnecessary roundtrips etc. However, it doesn't have to be aware whether
- * it is <i>actually working</i> against a remote service or a local implementation,
- * or with which remoting protocol it is working under the hood.
- *
- * @author Juergen Hoeller
- * @since 14.05.2003
- */
-public class RemoteAccessException extends NestedRuntimeException {
-
-	/** Use serialVersionUID from Spring 1.2 for interoperability. */
-	private static final long serialVersionUID = -4906825139312227864L;
-
-
-	/**
-	 * Constructor for RemoteAccessException.
-	 * @param msg the detail message
-	 */
-	public RemoteAccessException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructor for RemoteAccessException.
-	 * @param msg the detail message
-	 * @param cause the root cause (usually from using an underlying
-	 * remoting API such as RMI)
-	 */
-	public RemoteAccessException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
deleted file mode 100644
index 99857c3694ec..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- * 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.remoting;
-
-/**
- * RemoteAccessException subclass to be thrown when no connection
- * could be established with a remote service.
- *
- * @author Juergen Hoeller
- * @since 1.1
- */
-@SuppressWarnings("serial")
-public class RemoteConnectFailureException extends RemoteAccessException {
-
-	/**
-	 * Constructor for RemoteConnectFailureException.
-	 * @param msg the detail message
-	 * @param cause the root cause from the remoting API in use
-	 */
-	public RemoteConnectFailureException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
deleted file mode 100644
index 40e95213991d..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- * 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.remoting;
-
-/**
- * RemoteAccessException subclass to be thrown when the execution
- * of the target method failed on the server side, for example
- * when a method was not found on the target object.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see RemoteProxyFailureException
- */
-@SuppressWarnings("serial")
-public class RemoteInvocationFailureException extends RemoteAccessException {
-
-	/**
-	 * Constructor for RemoteInvocationFailureException.
-	 * @param msg the detail message
-	 * @param cause the root cause from the remoting API in use
-	 */
-	public RemoteInvocationFailureException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
deleted file mode 100644
index ee0e9fa0429b..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- * 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.remoting;
-
-/**
- * RemoteAccessException subclass to be thrown in case of a lookup failure,
- * typically if the lookup happens on demand for each method invocation.
- *
- * @author Juergen Hoeller
- * @since 1.1
- */
-@SuppressWarnings("serial")
-public class RemoteLookupFailureException extends RemoteAccessException {
-
-	/**
-	 * Constructor for RemoteLookupFailureException.
-	 * @param msg the detail message
-	 */
-	public RemoteLookupFailureException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructor for RemoteLookupFailureException.
-	 * @param msg message
-	 * @param cause the root cause from the remoting API in use
-	 */
-	public RemoteLookupFailureException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
deleted file mode 100644
index ce36152f4c04..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- * 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.remoting;
-
-/**
- * RemoteAccessException subclass to be thrown in case of a failure
- * within the client-side proxy for a remote service, for example
- * when a method was not found on the underlying RMI stub.
- *
- * @author Juergen Hoeller
- * @since 1.2.8
- * @see RemoteInvocationFailureException
- */
-@SuppressWarnings("serial")
-public class RemoteProxyFailureException extends RemoteAccessException {
-
-	/**
-	 * Constructor for RemoteProxyFailureException.
-	 * @param msg the detail message
-	 * @param cause the root cause from the remoting API in use
-	 */
-	public RemoteProxyFailureException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteTimeoutException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteTimeoutException.java
deleted file mode 100644
index 8dbff587c6f1..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteTimeoutException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.remoting;
-
-/**
- * RemoteAccessException subclass to be thrown when the execution
- * of the target method did not complete before a configurable
- * timeout, for example when a reply message was not received.
- * @author Stephane Nicoll
- * @since 4.2
- */
-@SuppressWarnings("serial")
-public class RemoteTimeoutException extends RemoteAccessException {
-
-	/**
-	 * Constructor for RemoteTimeoutException.
-	 * @param msg the detail message
-	 */
-	public RemoteTimeoutException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructor for RemoteTimeoutException.
-	 * @param msg the detail message
-	 * @param cause the root cause from the remoting API in use
-	 */
-	public RemoteTimeoutException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/package-info.java b/spring-context/src/main/java/org/springframework/remoting/package-info.java
deleted file mode 100644
index a4b3e95f5dba..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Exception hierarchy for Spring's remoting infrastructure,
- * independent of any specific remote method invocation system.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.remoting;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
deleted file mode 100644
index 9c897b8a7641..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.rmi.server.RMIClassLoader;
-
-import org.springframework.core.ConfigurableObjectInputStream;
-import org.springframework.lang.Nullable;
-
-/**
- * Special ObjectInputStream subclass that falls back to a specified codebase
- * to load classes from if not found locally. In contrast to standard RMI
- * conventions for dynamic class download, it is the client that determines
- * the codebase URL here, rather than the "java.rmi.server.codebase" system
- * property on the server.
- *
- * <p>Uses the JDK's RMIClassLoader to load classes from the specified codebase.
- * The codebase can consist of multiple URLs, separated by spaces.
- * Note that RMIClassLoader requires a SecurityManager to be set, like when
- * using dynamic class download with standard RMI! (See the RMI documentation
- * for details.)
- *
- * <p>Despite residing in the RMI package, this class is <i>not</i> used for
- * RmiClientInterceptor, which uses the standard RMI infrastructure instead
- * and thus is only able to rely on RMI's standard dynamic class download via
- * "java.rmi.server.codebase". CodebaseAwareObjectInputStream is used by
- * HttpInvokerClientInterceptor (see the "codebaseUrl" property there).
- *
- * <p>Thanks to Lionel Mestre for suggesting the option and providing
- * a prototype!
- *
- * @author Juergen Hoeller
- * @since 1.1.3
- * @see java.rmi.server.RMIClassLoader
- * @see RemoteInvocationSerializingExporter#createObjectInputStream
- * @see org.springframework.remoting.httpinvoker.HttpInvokerClientInterceptor#setCodebaseUrl
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class CodebaseAwareObjectInputStream extends ConfigurableObjectInputStream {
-
-	private final String codebaseUrl;
-
-
-	/**
-	 * Create a new CodebaseAwareObjectInputStream for the given InputStream and codebase.
-	 * @param in the InputStream to read from
-	 * @param codebaseUrl the codebase URL to load classes from if not found locally
-	 * (can consist of multiple URLs, separated by spaces)
-	 * @see java.io.ObjectInputStream#ObjectInputStream(java.io.InputStream)
-	 */
-	public CodebaseAwareObjectInputStream(InputStream in, String codebaseUrl) throws IOException {
-		this(in, null, codebaseUrl);
-	}
-
-	/**
-	 * Create a new CodebaseAwareObjectInputStream for the given InputStream and codebase.
-	 * @param in the InputStream to read from
-	 * @param classLoader the ClassLoader to use for loading local classes
-	 * (may be {@code null} to indicate RMI's default ClassLoader)
-	 * @param codebaseUrl the codebase URL to load classes from if not found locally
-	 * (can consist of multiple URLs, separated by spaces)
-	 * @see java.io.ObjectInputStream#ObjectInputStream(java.io.InputStream)
-	 */
-	public CodebaseAwareObjectInputStream(
-			InputStream in, @Nullable ClassLoader classLoader, String codebaseUrl) throws IOException {
-
-		super(in, classLoader);
-		this.codebaseUrl = codebaseUrl;
-	}
-
-	/**
-	 * Create a new CodebaseAwareObjectInputStream for the given InputStream and codebase.
-	 * @param in the InputStream to read from
-	 * @param classLoader the ClassLoader to use for loading local classes
-	 * (may be {@code null} to indicate RMI's default ClassLoader)
-	 * @param acceptProxyClasses whether to accept deserialization of proxy classes
-	 * (may be deactivated as a security measure)
-	 * @see java.io.ObjectInputStream#ObjectInputStream(java.io.InputStream)
-	 */
-	public CodebaseAwareObjectInputStream(
-			InputStream in, @Nullable ClassLoader classLoader, boolean acceptProxyClasses) throws IOException {
-
-		super(in, classLoader, acceptProxyClasses);
-		this.codebaseUrl = null;
-	}
-
-
-	@Override
-	protected Class<?> resolveFallbackIfPossible(String className, ClassNotFoundException ex)
-			throws IOException, ClassNotFoundException {
-
-		// If codebaseUrl is set, try to load the class with the RMIClassLoader.
-		// Else, propagate the ClassNotFoundException.
-		if (this.codebaseUrl == null) {
-			throw ex;
-		}
-		return RMIClassLoader.loadClass(this.codebaseUrl, className);
-	}
-
-	@Override
-	protected ClassLoader getFallbackClassLoader() throws IOException {
-		return RMIClassLoader.getClassLoader(this.codebaseUrl);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
deleted file mode 100644
index d90dd6a1a347..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jndi.JndiObjectLocator;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteInvocationFailureException;
-import org.springframework.remoting.RemoteLookupFailureException;
-import org.springframework.remoting.support.DefaultRemoteInvocationFactory;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationFactory;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.aopalliance.intercept.MethodInterceptor} for accessing RMI services
- * from JNDI. Typically used for RMI-IIOP but can also be used for EJB home objects
- * (for example, a Stateful Session Bean home). In contrast to a plain JNDI lookup,
- * this accessor also performs narrowing through PortableRemoteObject.
- *
- * <p>With conventional RMI services, this invoker is typically used with the RMI
- * service interface. Alternatively, this invoker can also proxy a remote RMI service
- * with a matching non-RMI business interface, i.e. an interface that mirrors the RMI
- * service methods but does not declare RemoteExceptions. In the latter case,
- * RemoteExceptions thrown by the RMI stub will automatically get converted to
- * Spring's unchecked RemoteAccessException.
- *
- * <p>The JNDI environment can be specified as "jndiEnvironment" property,
- * or be configured in a {@code jndi.properties} file or as system properties.
- * For example:
- *
- * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props>
- *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
- *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
- *	 &lt;/props&gt;
- * &lt;/property&gt;</pre>
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see #setJndiTemplate
- * @see #setJndiEnvironment
- * @see #setJndiName
- * @see JndiRmiServiceExporter
- * @see JndiRmiProxyFactoryBean
- * @see org.springframework.remoting.RemoteAccessException
- * @see java.rmi.RemoteException
- * @see java.rmi.Remote
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class JndiRmiClientInterceptor extends JndiObjectLocator implements MethodInterceptor, InitializingBean {
-
-	private Class<?> serviceInterface;
-
-	private RemoteInvocationFactory remoteInvocationFactory = new DefaultRemoteInvocationFactory();
-
-	private boolean lookupStubOnStartup = true;
-
-	private boolean cacheStub = true;
-
-	private boolean refreshStubOnConnectFailure = false;
-
-	private boolean exposeAccessContext = false;
-
-	private Object cachedStub;
-
-	private final Object stubMonitor = new Object();
-
-
-	/**
-	 * Set the interface of the service to access.
-	 * The interface must be suitable for the particular service and remoting tool.
-	 * <p>Typically required to be able to create a suitable service proxy,
-	 * but can also be optional if the lookup returns a typed stub.
-	 */
-	public void setServiceInterface(Class<?> serviceInterface) {
-		Assert.notNull(serviceInterface, "'serviceInterface' must not be null");
-		Assert.isTrue(serviceInterface.isInterface(), "'serviceInterface' must be an interface");
-		this.serviceInterface = serviceInterface;
-	}
-
-	/**
-	 * Return the interface of the service to access.
-	 */
-	public Class<?> getServiceInterface() {
-		return this.serviceInterface;
-	}
-
-	/**
-	 * Set the RemoteInvocationFactory to use for this accessor.
-	 * Default is a {@link DefaultRemoteInvocationFactory}.
-	 * <p>A custom invocation factory can add further context information
-	 * to the invocation, for example user credentials.
-	 */
-	public void setRemoteInvocationFactory(RemoteInvocationFactory remoteInvocationFactory) {
-		this.remoteInvocationFactory = remoteInvocationFactory;
-	}
-
-	/**
-	 * Return the RemoteInvocationFactory used by this accessor.
-	 */
-	public RemoteInvocationFactory getRemoteInvocationFactory() {
-		return this.remoteInvocationFactory;
-	}
-
-	/**
-	 * Set whether to look up the RMI stub on startup. Default is "true".
-	 * <p>Can be turned off to allow for late start of the RMI server.
-	 * In this case, the RMI stub will be fetched on first access.
-	 * @see #setCacheStub
-	 */
-	public void setLookupStubOnStartup(boolean lookupStubOnStartup) {
-		this.lookupStubOnStartup = lookupStubOnStartup;
-	}
-
-	/**
-	 * Set whether to cache the RMI stub once it has been located.
-	 * Default is "true".
-	 * <p>Can be turned off to allow for hot restart of the RMI server.
-	 * In this case, the RMI stub will be fetched for each invocation.
-	 * @see #setLookupStubOnStartup
-	 */
-	public void setCacheStub(boolean cacheStub) {
-		this.cacheStub = cacheStub;
-	}
-
-	/**
-	 * Set whether to refresh the RMI stub on connect failure.
-	 * Default is "false".
-	 * <p>Can be turned on to allow for hot restart of the RMI server.
-	 * If a cached RMI stub throws an RMI exception that indicates a
-	 * remote connect failure, a fresh proxy will be fetched and the
-	 * invocation will be retried.
-	 * @see java.rmi.ConnectException
-	 * @see java.rmi.ConnectIOException
-	 * @see java.rmi.NoSuchObjectException
-	 */
-	public void setRefreshStubOnConnectFailure(boolean refreshStubOnConnectFailure) {
-		this.refreshStubOnConnectFailure = refreshStubOnConnectFailure;
-	}
-
-	/**
-	 * Set whether to expose the JNDI environment context for all access to the target
-	 * RMI stub, i.e. for all method invocations on the exposed object reference.
-	 * <p>Default is "false", i.e. to only expose the JNDI context for object lookup.
-	 * Switch this flag to "true" in order to expose the JNDI environment (including
-	 * the authorization context) for each RMI invocation, as needed by WebLogic
-	 * for RMI stubs with authorization requirements.
-	 */
-	public void setExposeAccessContext(boolean exposeAccessContext) {
-		this.exposeAccessContext = exposeAccessContext;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		super.afterPropertiesSet();
-		prepare();
-	}
-
-	/**
-	 * Fetches the RMI stub on startup, if necessary.
-	 * @throws RemoteLookupFailureException if RMI stub creation failed
-	 * @see #setLookupStubOnStartup
-	 * @see #lookupStub
-	 */
-	public void prepare() throws RemoteLookupFailureException {
-		// Cache RMI stub on initialization?
-		if (this.lookupStubOnStartup) {
-			Object remoteObj = lookupStub();
-			if (logger.isDebugEnabled()) {
-				if (remoteObj instanceof RmiInvocationHandler) {
-					logger.debug("JNDI RMI object [" + getJndiName() + "] is an RMI invoker");
-				}
-				else if (getServiceInterface() != null) {
-					boolean isImpl = getServiceInterface().isInstance(remoteObj);
-					logger.debug("Using service interface [" + getServiceInterface().getName() +
-							"] for JNDI RMI object [" + getJndiName() + "] - " +
-							(!isImpl ? "not " : "") + "directly implemented");
-				}
-			}
-			if (this.cacheStub) {
-				this.cachedStub = remoteObj;
-			}
-		}
-	}
-
-	/**
-	 * Create the RMI stub, typically by looking it up.
-	 * <p>Called on interceptor initialization if "cacheStub" is "true";
-	 * else called for each invocation by {@link #getStub()}.
-	 * <p>The default implementation retrieves the service from the
-	 * JNDI environment. This can be overridden in subclasses.
-	 * @return the RMI stub to store in this interceptor
-	 * @throws RemoteLookupFailureException if RMI stub creation failed
-	 * @see #setCacheStub
-	 * @see #lookup
-	 */
-	protected Object lookupStub() throws RemoteLookupFailureException {
-		try {
-			return lookup();
-		}
-		catch (NamingException ex) {
-			throw new RemoteLookupFailureException("JNDI lookup for RMI service [" + getJndiName() + "] failed", ex);
-		}
-	}
-
-	/**
-	 * Return the RMI stub to use. Called for each invocation.
-	 * <p>The default implementation returns the stub created on initialization,
-	 * if any. Else, it invokes {@link #lookupStub} to get a new stub for
-	 * each invocation. This can be overridden in subclasses, for example in
-	 * order to cache a stub for a given amount of time before recreating it,
-	 * or to test the stub whether it is still alive.
-	 * @return the RMI stub to use for an invocation
-	 * @throws NamingException if stub creation failed
-	 * @throws RemoteLookupFailureException if RMI stub creation failed
-	 */
-	protected Object getStub() throws NamingException, RemoteLookupFailureException {
-		if (!this.cacheStub || (this.lookupStubOnStartup && !this.refreshStubOnConnectFailure)) {
-			return (this.cachedStub != null ? this.cachedStub : lookupStub());
-		}
-		else {
-			synchronized (this.stubMonitor) {
-				if (this.cachedStub == null) {
-					this.cachedStub = lookupStub();
-				}
-				return this.cachedStub;
-			}
-		}
-	}
-
-
-	/**
-	 * Fetches an RMI stub and delegates to {@link #doInvoke}.
-	 * If configured to refresh on connect failure, it will call
-	 * {@link #refreshAndRetry} on corresponding RMI exceptions.
-	 * @see #getStub
-	 * @see #doInvoke
-	 * @see #refreshAndRetry
-	 * @see java.rmi.ConnectException
-	 * @see java.rmi.ConnectIOException
-	 * @see java.rmi.NoSuchObjectException
-	 */
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		Object stub;
-		try {
-			stub = getStub();
-		}
-		catch (NamingException ex) {
-			throw new RemoteLookupFailureException("JNDI lookup for RMI service [" + getJndiName() + "] failed", ex);
-		}
-
-		Context ctx = (this.exposeAccessContext ? getJndiTemplate().getContext() : null);
-		try {
-			return doInvoke(invocation, stub);
-		}
-		catch (RemoteConnectFailureException ex) {
-			return handleRemoteConnectFailure(invocation, ex);
-		}
-		catch (RemoteException ex) {
-			if (isConnectFailure(ex)) {
-				return handleRemoteConnectFailure(invocation, ex);
-			}
-			else {
-				throw ex;
-			}
-		}
-		finally {
-			getJndiTemplate().releaseContext(ctx);
-		}
-	}
-
-	/**
-	 * Determine whether the given RMI exception indicates a connect failure.
-	 * <p>The default implementation delegates to
-	 * {@link RmiClientInterceptorUtils#isConnectFailure}.
-	 * @param ex the RMI exception to check
-	 * @return whether the exception should be treated as connect failure
-	 */
-	protected boolean isConnectFailure(RemoteException ex) {
-		return RmiClientInterceptorUtils.isConnectFailure(ex);
-	}
-
-	/**
-	 * Refresh the stub and retry the remote invocation if necessary.
-	 * <p>If not configured to refresh on connect failure, this method
-	 * simply rethrows the original exception.
-	 * @param invocation the invocation that failed
-	 * @param ex the exception raised on remote invocation
-	 * @return the result value of the new invocation, if succeeded
-	 * @throws Throwable an exception raised by the new invocation, if failed too.
-	 */
-	private Object handleRemoteConnectFailure(MethodInvocation invocation, Exception ex) throws Throwable {
-		if (this.refreshStubOnConnectFailure) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Could not connect to RMI service [" + getJndiName() + "] - retrying", ex);
-			}
-			else if (logger.isInfoEnabled()) {
-				logger.info("Could not connect to RMI service [" + getJndiName() + "] - retrying");
-			}
-			return refreshAndRetry(invocation);
-		}
-		else {
-			throw ex;
-		}
-	}
-
-	/**
-	 * Refresh the RMI stub and retry the given invocation.
-	 * Called by invoke on connect failure.
-	 * @param invocation the AOP method invocation
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 * @see #invoke
-	 */
-	@Nullable
-	protected Object refreshAndRetry(MethodInvocation invocation) throws Throwable {
-		Object freshStub;
-		synchronized (this.stubMonitor) {
-			this.cachedStub = null;
-			freshStub = lookupStub();
-			if (this.cacheStub) {
-				this.cachedStub = freshStub;
-			}
-		}
-		return doInvoke(invocation, freshStub);
-	}
-
-
-	/**
-	 * Perform the given invocation on the given RMI stub.
-	 * @param invocation the AOP method invocation
-	 * @param stub the RMI stub to invoke
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 */
-	@Nullable
-	protected Object doInvoke(MethodInvocation invocation, Object stub) throws Throwable {
-		if (stub instanceof RmiInvocationHandler) {
-			// RMI invoker
-			try {
-				return doInvoke(invocation, (RmiInvocationHandler) stub);
-			}
-			catch (RemoteException ex) {
-				throw convertRmiAccessException(ex, invocation.getMethod());
-			}
-			catch (InvocationTargetException ex) {
-				throw ex.getTargetException();
-			}
-			catch (Throwable ex) {
-				throw new RemoteInvocationFailureException("Invocation of method [" + invocation.getMethod() +
-						"] failed in RMI service [" + getJndiName() + "]", ex);
-			}
-		}
-		else {
-			// traditional RMI stub
-			try {
-				return RmiClientInterceptorUtils.invokeRemoteMethod(invocation, stub);
-			}
-			catch (InvocationTargetException ex) {
-				Throwable targetEx = ex.getTargetException();
-				if (targetEx instanceof RemoteException) {
-					throw convertRmiAccessException((RemoteException) targetEx, invocation.getMethod());
-				}
-				else {
-					throw targetEx;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Apply the given AOP method invocation to the given {@link RmiInvocationHandler}.
-	 * <p>The default implementation delegates to {@link #createRemoteInvocation}.
-	 * @param methodInvocation the current AOP method invocation
-	 * @param invocationHandler the RmiInvocationHandler to apply the invocation to
-	 * @return the invocation result
-	 * @throws RemoteException in case of communication errors
-	 * @throws NoSuchMethodException if the method name could not be resolved
-	 * @throws IllegalAccessException if the method could not be accessed
-	 * @throws InvocationTargetException if the method invocation resulted in an exception
-	 * @see org.springframework.remoting.support.RemoteInvocation
-	 */
-	protected Object doInvoke(MethodInvocation methodInvocation, RmiInvocationHandler invocationHandler)
-			throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-
-		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
-			return "RMI invoker proxy for service URL [" + getJndiName() + "]";
-		}
-
-		return invocationHandler.invoke(createRemoteInvocation(methodInvocation));
-	}
-
-	/**
-	 * Create a new RemoteInvocation object for the given AOP method invocation.
-	 * <p>The default implementation delegates to the configured
-	 * {@link #setRemoteInvocationFactory RemoteInvocationFactory}.
-	 * This can be overridden in subclasses in order to provide custom RemoteInvocation
-	 * subclasses, containing additional invocation parameters (e.g. user credentials).
-	 * <p>Note that it is preferable to build a custom RemoteInvocationFactory
-	 * as a reusable strategy, instead of overriding this method.
-	 * @param methodInvocation the current AOP method invocation
-	 * @return the RemoteInvocation object
-	 * @see RemoteInvocationFactory#createRemoteInvocation
-	 */
-	protected RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
-		return getRemoteInvocationFactory().createRemoteInvocation(methodInvocation);
-	}
-
-	/**
-	 * Convert the given RMI RemoteException that happened during remote access
-	 * to Spring's RemoteAccessException if the method signature does not declare
-	 * RemoteException. Else, return the original RemoteException.
-	 * @param method the invoked method
-	 * @param ex the RemoteException that happened
-	 * @return the exception to be thrown to the caller
-	 */
-	private Exception convertRmiAccessException(RemoteException ex, Method method) {
-		return RmiClientInterceptorUtils.convertRmiAccessException(method, ex, isConnectFailure(ex), getJndiName());
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
deleted file mode 100644
index a9d33d8973b6..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import javax.naming.NamingException;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * {@link FactoryBean} for RMI proxies from JNDI.
- *
- * <p>Typically used for RMI-IIOP (CORBA), but can also be used for EJB home objects
- * (for example, a Stateful Session Bean home). In contrast to a plain JNDI lookup,
- * this accessor also performs narrowing through {@link javax.rmi.PortableRemoteObject}.
- *
- * <p>With conventional RMI services, this invoker is typically used with the RMI
- * service interface. Alternatively, this invoker can also proxy a remote RMI service
- * with a matching non-RMI business interface, i.e. an interface that mirrors the RMI
- * service methods but does not declare RemoteExceptions. In the latter case,
- * RemoteExceptions thrown by the RMI stub will automatically get converted to
- * Spring's unchecked RemoteAccessException.
- *
- * <p>The JNDI environment can be specified as "jndiEnvironment" property,
- * or be configured in a {@code jndi.properties} file or as system properties.
- * For example:
- *
- * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props>
- *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
- *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
- *	 &lt;/props&gt;
- * &lt;/property&gt;</pre>
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see #setServiceInterface
- * @see #setJndiName
- * @see #setJndiTemplate
- * @see #setJndiEnvironment
- * @see #setJndiName
- * @see JndiRmiServiceExporter
- * @see org.springframework.remoting.RemoteAccessException
- * @see java.rmi.RemoteException
- * @see java.rmi.Remote
- * @see javax.rmi.PortableRemoteObject#narrow
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class JndiRmiProxyFactoryBean extends JndiRmiClientInterceptor
-		implements FactoryBean<Object>, BeanClassLoaderAware {
-
-	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
-
-	private Object serviceProxy;
-
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		super.afterPropertiesSet();
-		Class<?> ifc = getServiceInterface();
-		Assert.notNull(ifc, "Property 'serviceInterface' is required");
-		this.serviceProxy = new ProxyFactory(ifc, this).getProxy(this.beanClassLoader);
-	}
-
-
-	@Override
-	public Object getObject() {
-		return this.serviceProxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return getServiceInterface();
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
deleted file mode 100644
index 49b2db295ae8..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.Properties;
-
-import javax.naming.NamingException;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jndi.JndiTemplate;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * Service exporter which binds RMI services to JNDI.
- * Typically used for RMI-IIOP (CORBA).
- *
- * <p>Exports services via the {@link javax.rmi.PortableRemoteObject} class.
- * You need to run "rmic" with the "-iiop" option to generate corresponding
- * stubs and skeletons for each exported service.
- *
- * <p>Also supports exposing any non-RMI service via RMI invokers, to be accessed
- * via {@link JndiRmiClientInterceptor} / {@link JndiRmiProxyFactoryBean}'s
- * automatic detection of such invokers.
- *
- * <p>With an RMI invoker, RMI communication works on the {@link RmiInvocationHandler}
- * level, needing only one stub for any service. Service interfaces do not have to
- * extend {@code java.rmi.Remote} or throw {@code java.rmi.RemoteException}
- * on all methods, but in and out parameters have to be serializable.
- *
- * <p>The JNDI environment can be specified as "jndiEnvironment" bean property,
- * or be configured in a {@code jndi.properties} file or as system properties.
- * For example:
- *
- * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props>
- *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
- *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
- *	 &lt;/props&gt;
- * &lt;/property&gt;</pre>
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see #setService
- * @see #setJndiTemplate
- * @see #setJndiEnvironment
- * @see #setJndiName
- * @see JndiRmiClientInterceptor
- * @see JndiRmiProxyFactoryBean
- * @see javax.rmi.PortableRemoteObject#exportObject
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class JndiRmiServiceExporter extends RmiBasedExporter implements InitializingBean, DisposableBean {
-
-	@Nullable
-	private static Method exportObject;
-
-	@Nullable
-	private static Method unexportObject;
-
-	static {
-		try {
-			Class<?> portableRemoteObject =
-					JndiRmiServiceExporter.class.getClassLoader().loadClass("javax.rmi.PortableRemoteObject");
-			exportObject = portableRemoteObject.getMethod("exportObject", Remote.class);
-			unexportObject = portableRemoteObject.getMethod("unexportObject", Remote.class);
-		}
-		catch (Throwable ex) {
-			// java.corba module not available on JDK 9+
-			exportObject = null;
-			unexportObject = null;
-		}
-	}
-
-
-	private JndiTemplate jndiTemplate = new JndiTemplate();
-
-	private String jndiName;
-
-	private Remote exportedObject;
-
-
-	/**
-	 * Set the JNDI template to use for JNDI lookups.
-	 * You can also specify JNDI environment settings via "jndiEnvironment".
-	 * @see #setJndiEnvironment
-	 */
-	public void setJndiTemplate(JndiTemplate jndiTemplate) {
-		this.jndiTemplate = (jndiTemplate != null ? jndiTemplate : new JndiTemplate());
-	}
-
-	/**
-	 * Set the JNDI environment to use for JNDI lookups.
-	 * Creates a JndiTemplate with the given environment settings.
-	 * @see #setJndiTemplate
-	 */
-	public void setJndiEnvironment(Properties jndiEnvironment) {
-		this.jndiTemplate = new JndiTemplate(jndiEnvironment);
-	}
-
-	/**
-	 * Set the JNDI name of the exported RMI service.
-	 */
-	public void setJndiName(String jndiName) {
-		this.jndiName = jndiName;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws NamingException, RemoteException {
-		prepare();
-	}
-
-	/**
-	 * Initialize this service exporter, binding the specified service to JNDI.
-	 * @throws NamingException if service binding failed
-	 * @throws RemoteException if service export failed
-	 */
-	public void prepare() throws NamingException, RemoteException {
-		if (this.jndiName == null) {
-			throw new IllegalArgumentException("Property 'jndiName' is required");
-		}
-
-		// Initialize and cache exported object.
-		this.exportedObject = getObjectToExport();
-		invokePortableRemoteObject(exportObject);
-
-		rebind();
-	}
-
-	/**
-	 * Rebind the specified service to JNDI, for recovering in case
-	 * of the target registry having been restarted.
-	 * @throws NamingException if service binding failed
-	 */
-	public void rebind() throws NamingException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Binding RMI service to JNDI location [" + this.jndiName + "]");
-		}
-		this.jndiTemplate.rebind(this.jndiName, this.exportedObject);
-	}
-
-	/**
-	 * Unbind the RMI service from JNDI on bean factory shutdown.
-	 */
-	@Override
-	public void destroy() throws NamingException, RemoteException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Unbinding RMI service from JNDI location [" + this.jndiName + "]");
-		}
-		this.jndiTemplate.unbind(this.jndiName);
-		invokePortableRemoteObject(unexportObject);
-	}
-
-
-	private void invokePortableRemoteObject(@Nullable Method method) throws RemoteException {
-		if (method != null) {
-			try {
-				method.invoke(null, this.exportedObject);
-			}
-			catch (InvocationTargetException ex) {
-				Throwable targetEx = ex.getTargetException();
-				if (targetEx instanceof RemoteException) {
-					throw (RemoteException) targetEx;
-				}
-				ReflectionUtils.rethrowRuntimeException(targetEx);
-			}
-			catch (Throwable ex) {
-				throw new IllegalStateException("PortableRemoteObject invocation failed", ex);
-			}
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
deleted file mode 100644
index 99e81a4e27cf..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.rmi.RemoteException;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationBasedExporter;
-import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * Abstract base class for remote service exporters that explicitly deserialize
- * {@link org.springframework.remoting.support.RemoteInvocation} objects and serialize
- * {@link org.springframework.remoting.support.RemoteInvocationResult} objects,
- * for example Spring's HTTP invoker.
- *
- * <p>Provides template methods for {@code ObjectInputStream} and
- * {@code ObjectOutputStream} handling.
- *
- * @author Juergen Hoeller
- * @since 2.5.1
- * @see java.io.ObjectInputStream
- * @see java.io.ObjectOutputStream
- * @see #doReadRemoteInvocation
- * @see #doWriteRemoteInvocationResult
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public abstract class RemoteInvocationSerializingExporter extends RemoteInvocationBasedExporter
-		implements InitializingBean {
-
-	/**
-	 * Default content type: "application/x-java-serialized-object".
-	 */
-	public static final String CONTENT_TYPE_SERIALIZED_OBJECT = "application/x-java-serialized-object";
-
-
-	private String contentType = CONTENT_TYPE_SERIALIZED_OBJECT;
-
-	private boolean acceptProxyClasses = true;
-
-	private Object proxy;
-
-
-	/**
-	 * Specify the content type to use for sending remote invocation responses.
-	 * <p>Default is "application/x-java-serialized-object".
-	 */
-	public void setContentType(String contentType) {
-		Assert.notNull(contentType, "'contentType' must not be null");
-		this.contentType = contentType;
-	}
-
-	/**
-	 * Return the content type to use for sending remote invocation responses.
-	 */
-	public String getContentType() {
-		return this.contentType;
-	}
-
-	/**
-	 * Set whether to accept deserialization of proxy classes.
-	 * <p>Default is "true". May be deactivated as a security measure.
-	 */
-	public void setAcceptProxyClasses(boolean acceptProxyClasses) {
-		this.acceptProxyClasses = acceptProxyClasses;
-	}
-
-	/**
-	 * Return whether to accept deserialization of proxy classes.
-	 */
-	public boolean isAcceptProxyClasses() {
-		return this.acceptProxyClasses;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		prepare();
-	}
-
-	/**
-	 * Initialize this service exporter.
-	 */
-	public void prepare() {
-		this.proxy = getProxyForService();
-	}
-
-	protected final Object getProxy() {
-		if (this.proxy == null) {
-			throw new IllegalStateException(ClassUtils.getShortName(getClass()) + " has not been initialized");
-		}
-		return this.proxy;
-	}
-
-
-	/**
-	 * Create an ObjectInputStream for the given InputStream.
-	 * <p>The default implementation creates a Spring {@link CodebaseAwareObjectInputStream}.
-	 * @param is the InputStream to read from
-	 * @return the new ObjectInputStream instance to use
-	 * @throws java.io.IOException if creation of the ObjectInputStream failed
-	 */
-	protected ObjectInputStream createObjectInputStream(InputStream is) throws IOException {
-		return new CodebaseAwareObjectInputStream(is, getBeanClassLoader(), isAcceptProxyClasses());
-	}
-
-	/**
-	 * Perform the actual reading of an invocation result object from the
-	 * given ObjectInputStream.
-	 * <p>The default implementation simply calls
-	 * {@link java.io.ObjectInputStream#readObject()}.
-	 * Can be overridden for deserialization of a custom wrapper object rather
-	 * than the plain invocation, for example an encryption-aware holder.
-	 * @param ois the ObjectInputStream to read from
-	 * @return the RemoteInvocationResult object
-	 * @throws java.io.IOException in case of I/O failure
-	 * @throws ClassNotFoundException if case of a transferred class not
-	 * being found in the local ClassLoader
-	 */
-	protected RemoteInvocation doReadRemoteInvocation(ObjectInputStream ois)
-			throws IOException, ClassNotFoundException {
-
-		Object obj = ois.readObject();
-		if (!(obj instanceof RemoteInvocation)) {
-			throw new RemoteException("Deserialized object needs to be assignable to type [" +
-					RemoteInvocation.class.getName() + "]: " + ClassUtils.getDescriptiveType(obj));
-		}
-		return (RemoteInvocation) obj;
-	}
-
-	/**
-	 * Create an ObjectOutputStream for the given OutputStream.
-	 * <p>The default implementation creates a plain
-	 * {@link java.io.ObjectOutputStream}.
-	 * @param os the OutputStream to write to
-	 * @return the new ObjectOutputStream instance to use
-	 * @throws java.io.IOException if creation of the ObjectOutputStream failed
-	 */
-	protected ObjectOutputStream createObjectOutputStream(OutputStream os) throws IOException {
-		return new ObjectOutputStream(os);
-	}
-
-	/**
-	 * Perform the actual writing of the given invocation result object
-	 * to the given ObjectOutputStream.
-	 * <p>The default implementation simply calls
-	 * {@link java.io.ObjectOutputStream#writeObject}.
-	 * Can be overridden for serialization of a custom wrapper object rather
-	 * than the plain invocation, for example an encryption-aware holder.
-	 * @param result the RemoteInvocationResult object
-	 * @param oos the ObjectOutputStream to write to
-	 * @throws java.io.IOException if thrown by I/O methods
-	 */
-	protected void doWriteRemoteInvocationResult(RemoteInvocationResult result, ObjectOutputStream oos)
-			throws IOException {
-
-		oos.writeObject(result);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
deleted file mode 100644
index e6ae6529afb6..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.rmi.Remote;
-
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationBasedExporter;
-
-/**
- * Convenient superclass for RMI-based remote exporters. Provides a facility
- * to automatically wrap a given plain Java service object with an
- * RmiInvocationWrapper, exposing the {@link RmiInvocationHandler} remote interface.
- *
- * <p>Using the RMI invoker mechanism, RMI communication operates at the {@link RmiInvocationHandler}
- * level, sharing a common invoker stub for any number of services. Service interfaces are <i>not</i>
- * required to extend {@code java.rmi.Remote} or declare {@code java.rmi.RemoteException}
- * on all service methods. However, in and out parameters still have to be serializable.
- *
- * @author Juergen Hoeller
- * @since 1.2.5
- * @see RmiServiceExporter
- * @see JndiRmiServiceExporter
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public abstract class RmiBasedExporter extends RemoteInvocationBasedExporter {
-
-	/**
-	 * Determine the object to export: either the service object itself
-	 * or a RmiInvocationWrapper in case of a non-RMI service object.
-	 * @return the RMI object to export
-	 * @see #setService
-	 * @see #setServiceInterface
-	 */
-	protected Remote getObjectToExport() {
-		// determine remote object
-		if (getService() instanceof Remote &&
-				(getServiceInterface() == null || Remote.class.isAssignableFrom(getServiceInterface()))) {
-			// conventional RMI service
-			return (Remote) getService();
-		}
-		else {
-			// RMI invoker
-			if (logger.isDebugEnabled()) {
-				logger.debug("RMI service [" + getService() + "] is an RMI invoker");
-			}
-			return new RmiInvocationWrapper(getProxyForService(), this);
-		}
-	}
-
-	/**
-	 * Redefined here to be visible to RmiInvocationWrapper.
-	 * Simply delegates to the corresponding superclass method.
-	 */
-	@Override
-	protected Object invoke(RemoteInvocation invocation, Object targetObject)
-			throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-
-		return super.invoke(invocation, targetObject);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
deleted file mode 100644
index 8d8569a8f1dd..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.rmi.Naming;
-import java.rmi.NotBoundException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.RMIClientSocketFactory;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.aop.support.AopUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteInvocationFailureException;
-import org.springframework.remoting.RemoteLookupFailureException;
-import org.springframework.remoting.support.RemoteInvocationBasedAccessor;
-import org.springframework.remoting.support.RemoteInvocationUtils;
-
-/**
- * {@link org.aopalliance.intercept.MethodInterceptor} for accessing conventional
- * RMI services or RMI invokers. The service URL must be a valid RMI URL
- * (e.g. "rmi://localhost:1099/myservice").
- *
- * <p>RMI invokers work at the RmiInvocationHandler level, needing only one stub for
- * any service. Service interfaces do not have to extend {@code java.rmi.Remote}
- * or throw {@code java.rmi.RemoteException}. Spring's unchecked
- * RemoteAccessException will be thrown on remote invocation failure.
- * Of course, in and out parameters have to be serializable.
- *
- * <p>With conventional RMI services, this invoker is typically used with the RMI
- * service interface. Alternatively, this invoker can also proxy a remote RMI service
- * with a matching non-RMI business interface, i.e. an interface that mirrors the RMI
- * service methods but does not declare RemoteExceptions. In the latter case,
- * RemoteExceptions thrown by the RMI stub will automatically get converted to
- * Spring's unchecked RemoteAccessException.
- *
- * @author Juergen Hoeller
- * @since 29.09.2003
- * @see RmiServiceExporter
- * @see RmiProxyFactoryBean
- * @see RmiInvocationHandler
- * @see org.springframework.remoting.RemoteAccessException
- * @see java.rmi.RemoteException
- * @see java.rmi.Remote
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
-		implements MethodInterceptor {
-
-	private boolean lookupStubOnStartup = true;
-
-	private boolean cacheStub = true;
-
-	private boolean refreshStubOnConnectFailure = false;
-
-	private RMIClientSocketFactory registryClientSocketFactory;
-
-	private Remote cachedStub;
-
-	private final Object stubMonitor = new Object();
-
-
-	/**
-	 * Set whether to look up the RMI stub on startup. Default is "true".
-	 * <p>Can be turned off to allow for late start of the RMI server.
-	 * In this case, the RMI stub will be fetched on first access.
-	 * @see #setCacheStub
-	 */
-	public void setLookupStubOnStartup(boolean lookupStubOnStartup) {
-		this.lookupStubOnStartup = lookupStubOnStartup;
-	}
-
-	/**
-	 * Set whether to cache the RMI stub once it has been located.
-	 * Default is "true".
-	 * <p>Can be turned off to allow for hot restart of the RMI server.
-	 * In this case, the RMI stub will be fetched for each invocation.
-	 * @see #setLookupStubOnStartup
-	 */
-	public void setCacheStub(boolean cacheStub) {
-		this.cacheStub = cacheStub;
-	}
-
-	/**
-	 * Set whether to refresh the RMI stub on connect failure.
-	 * Default is "false".
-	 * <p>Can be turned on to allow for hot restart of the RMI server.
-	 * If a cached RMI stub throws an RMI exception that indicates a
-	 * remote connect failure, a fresh proxy will be fetched and the
-	 * invocation will be retried.
-	 * @see java.rmi.ConnectException
-	 * @see java.rmi.ConnectIOException
-	 * @see java.rmi.NoSuchObjectException
-	 */
-	public void setRefreshStubOnConnectFailure(boolean refreshStubOnConnectFailure) {
-		this.refreshStubOnConnectFailure = refreshStubOnConnectFailure;
-	}
-
-	/**
-	 * Set a custom RMI client socket factory to use for accessing the RMI registry.
-	 * @see java.rmi.server.RMIClientSocketFactory
-	 * @see java.rmi.registry.LocateRegistry#getRegistry(String, int, RMIClientSocketFactory)
-	 */
-	public void setRegistryClientSocketFactory(RMIClientSocketFactory registryClientSocketFactory) {
-		this.registryClientSocketFactory = registryClientSocketFactory;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-		prepare();
-	}
-
-	/**
-	 * Fetches RMI stub on startup, if necessary.
-	 * @throws RemoteLookupFailureException if RMI stub creation failed
-	 * @see #setLookupStubOnStartup
-	 * @see #lookupStub
-	 */
-	public void prepare() throws RemoteLookupFailureException {
-		// Cache RMI stub on initialization?
-		if (this.lookupStubOnStartup) {
-			Remote remoteObj = lookupStub();
-			if (logger.isDebugEnabled()) {
-				if (remoteObj instanceof RmiInvocationHandler) {
-					logger.debug("RMI stub [" + getServiceUrl() + "] is an RMI invoker");
-				}
-				else if (getServiceInterface() != null) {
-					boolean isImpl = getServiceInterface().isInstance(remoteObj);
-					logger.debug("Using service interface [" + getServiceInterface().getName() +
-						"] for RMI stub [" + getServiceUrl() + "] - " +
-						(!isImpl ? "not " : "") + "directly implemented");
-				}
-			}
-			if (this.cacheStub) {
-				this.cachedStub = remoteObj;
-			}
-		}
-	}
-
-	/**
-	 * Create the RMI stub, typically by looking it up.
-	 * <p>Called on interceptor initialization if "cacheStub" is "true";
-	 * else called for each invocation by {@link #getStub()}.
-	 * <p>The default implementation looks up the service URL via
-	 * {@code java.rmi.Naming}. This can be overridden in subclasses.
-	 * @return the RMI stub to store in this interceptor
-	 * @throws RemoteLookupFailureException if RMI stub creation failed
-	 * @see #setCacheStub
-	 * @see java.rmi.Naming#lookup
-	 */
-	protected Remote lookupStub() throws RemoteLookupFailureException {
-		try {
-			Remote stub = null;
-			if (this.registryClientSocketFactory != null) {
-				// RMIClientSocketFactory specified for registry access.
-				// Unfortunately, due to RMI API limitations, this means
-				// that we need to parse the RMI URL ourselves and perform
-				// straight LocateRegistry.getRegistry/Registry.lookup calls.
-				URL url = new URL(null, getServiceUrl(), new DummyURLStreamHandler());
-				String protocol = url.getProtocol();
-				if (protocol != null && !"rmi".equals(protocol)) {
-					throw new MalformedURLException("Invalid URL scheme '" + protocol + "'");
-				}
-				String host = url.getHost();
-				int port = url.getPort();
-				String name = url.getPath();
-				if (name != null && name.startsWith("/")) {
-					name = name.substring(1);
-				}
-				Registry registry = LocateRegistry.getRegistry(host, port, this.registryClientSocketFactory);
-				stub = registry.lookup(name);
-			}
-			else {
-				// Can proceed with standard RMI lookup API...
-				stub = Naming.lookup(getServiceUrl());
-			}
-			if (logger.isDebugEnabled()) {
-				logger.debug("Located RMI stub with URL [" + getServiceUrl() + "]");
-			}
-			return stub;
-		}
-		catch (MalformedURLException ex) {
-			throw new RemoteLookupFailureException("Service URL [" + getServiceUrl() + "] is invalid", ex);
-		}
-		catch (NotBoundException ex) {
-			throw new RemoteLookupFailureException(
-					"Could not find RMI service [" + getServiceUrl() + "] in RMI registry", ex);
-		}
-		catch (RemoteException ex) {
-			throw new RemoteLookupFailureException("Lookup of RMI stub failed", ex);
-		}
-	}
-
-	/**
-	 * Return the RMI stub to use. Called for each invocation.
-	 * <p>The default implementation returns the stub created on initialization,
-	 * if any. Else, it invokes {@link #lookupStub} to get a new stub for
-	 * each invocation. This can be overridden in subclasses, for example in
-	 * order to cache a stub for a given amount of time before recreating it,
-	 * or to test the stub whether it is still alive.
-	 * @return the RMI stub to use for an invocation
-	 * @throws RemoteLookupFailureException if RMI stub creation failed
-	 * @see #lookupStub
-	 */
-	protected Remote getStub() throws RemoteLookupFailureException {
-		if (!this.cacheStub || (this.lookupStubOnStartup && !this.refreshStubOnConnectFailure)) {
-			return (this.cachedStub != null ? this.cachedStub : lookupStub());
-		}
-		else {
-			synchronized (this.stubMonitor) {
-				if (this.cachedStub == null) {
-					this.cachedStub = lookupStub();
-				}
-				return this.cachedStub;
-			}
-		}
-	}
-
-
-	/**
-	 * Fetches an RMI stub and delegates to {@code doInvoke}.
-	 * If configured to refresh on connect failure, it will call
-	 * {@link #refreshAndRetry} on corresponding RMI exceptions.
-	 * @see #getStub
-	 * @see #doInvoke(MethodInvocation, Remote)
-	 * @see #refreshAndRetry
-	 * @see java.rmi.ConnectException
-	 * @see java.rmi.ConnectIOException
-	 * @see java.rmi.NoSuchObjectException
-	 */
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		Remote stub = getStub();
-		try {
-			return doInvoke(invocation, stub);
-		}
-		catch (RemoteConnectFailureException ex) {
-			return handleRemoteConnectFailure(invocation, ex);
-		}
-		catch (RemoteException ex) {
-			if (isConnectFailure(ex)) {
-				return handleRemoteConnectFailure(invocation, ex);
-			}
-			else {
-				throw ex;
-			}
-		}
-	}
-
-	/**
-	 * Determine whether the given RMI exception indicates a connect failure.
-	 * <p>The default implementation delegates to
-	 * {@link RmiClientInterceptorUtils#isConnectFailure}.
-	 * @param ex the RMI exception to check
-	 * @return whether the exception should be treated as connect failure
-	 */
-	protected boolean isConnectFailure(RemoteException ex) {
-		return RmiClientInterceptorUtils.isConnectFailure(ex);
-	}
-
-	/**
-	 * Refresh the stub and retry the remote invocation if necessary.
-	 * <p>If not configured to refresh on connect failure, this method
-	 * simply rethrows the original exception.
-	 * @param invocation the invocation that failed
-	 * @param ex the exception raised on remote invocation
-	 * @return the result value of the new invocation, if succeeded
-	 * @throws Throwable an exception raised by the new invocation,
-	 * if it failed as well
-	 * @see #setRefreshStubOnConnectFailure
-	 * @see #doInvoke
-	 */
-	@Nullable
-	private Object handleRemoteConnectFailure(MethodInvocation invocation, Exception ex) throws Throwable {
-		if (this.refreshStubOnConnectFailure) {
-			String msg = "Could not connect to RMI service [" + getServiceUrl() + "] - retrying";
-			if (logger.isDebugEnabled()) {
-				logger.warn(msg, ex);
-			}
-			else if (logger.isWarnEnabled()) {
-				logger.warn(msg);
-			}
-			return refreshAndRetry(invocation);
-		}
-		else {
-			throw ex;
-		}
-	}
-
-	/**
-	 * Refresh the RMI stub and retry the given invocation.
-	 * Called by invoke on connect failure.
-	 * @param invocation the AOP method invocation
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 * @see #invoke
-	 */
-	@Nullable
-	protected Object refreshAndRetry(MethodInvocation invocation) throws Throwable {
-		Remote freshStub = null;
-		synchronized (this.stubMonitor) {
-			this.cachedStub = null;
-			freshStub = lookupStub();
-			if (this.cacheStub) {
-				this.cachedStub = freshStub;
-			}
-		}
-		return doInvoke(invocation, freshStub);
-	}
-
-	/**
-	 * Perform the given invocation on the given RMI stub.
-	 * @param invocation the AOP method invocation
-	 * @param stub the RMI stub to invoke
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 */
-	@Nullable
-	protected Object doInvoke(MethodInvocation invocation, Remote stub) throws Throwable {
-		if (stub instanceof RmiInvocationHandler) {
-			// RMI invoker
-			try {
-				return doInvoke(invocation, (RmiInvocationHandler) stub);
-			}
-			catch (RemoteException ex) {
-				throw RmiClientInterceptorUtils.convertRmiAccessException(
-					invocation.getMethod(), ex, isConnectFailure(ex), getServiceUrl());
-			}
-			catch (InvocationTargetException ex) {
-				Throwable exToThrow = ex.getTargetException();
-				RemoteInvocationUtils.fillInClientStackTraceIfPossible(exToThrow);
-				throw exToThrow;
-			}
-			catch (Throwable ex) {
-				throw new RemoteInvocationFailureException("Invocation of method [" + invocation.getMethod() +
-						"] failed in RMI service [" + getServiceUrl() + "]", ex);
-			}
-		}
-		else {
-			// traditional RMI stub
-			try {
-				return RmiClientInterceptorUtils.invokeRemoteMethod(invocation, stub);
-			}
-			catch (InvocationTargetException ex) {
-				Throwable targetEx = ex.getTargetException();
-				if (targetEx instanceof RemoteException) {
-					RemoteException rex = (RemoteException) targetEx;
-					throw RmiClientInterceptorUtils.convertRmiAccessException(
-							invocation.getMethod(), rex, isConnectFailure(rex), getServiceUrl());
-				}
-				else {
-					throw targetEx;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Apply the given AOP method invocation to the given {@link RmiInvocationHandler}.
-	 * <p>The default implementation delegates to {@link #createRemoteInvocation}.
-	 * @param methodInvocation the current AOP method invocation
-	 * @param invocationHandler the RmiInvocationHandler to apply the invocation to
-	 * @return the invocation result
-	 * @throws RemoteException in case of communication errors
-	 * @throws NoSuchMethodException if the method name could not be resolved
-	 * @throws IllegalAccessException if the method could not be accessed
-	 * @throws InvocationTargetException if the method invocation resulted in an exception
-	 * @see org.springframework.remoting.support.RemoteInvocation
-	 */
-	@Nullable
-	protected Object doInvoke(MethodInvocation methodInvocation, RmiInvocationHandler invocationHandler)
-		throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-
-		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
-			return "RMI invoker proxy for service URL [" + getServiceUrl() + "]";
-		}
-
-		return invocationHandler.invoke(createRemoteInvocation(methodInvocation));
-	}
-
-
-	/**
-	 * Dummy URLStreamHandler that's just specified to suppress the standard
-	 * {@code java.net.URL} URLStreamHandler lookup, to be able to
-	 * use the standard URL class for parsing "rmi:..." URLs.
-	 */
-	private static class DummyURLStreamHandler extends URLStreamHandler {
-
-		@Override
-		protected URLConnection openConnection(URL url) throws IOException {
-			throw new UnsupportedOperationException();
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
deleted file mode 100644
index 2842e061433a..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.SocketException;
-import java.rmi.ConnectException;
-import java.rmi.ConnectIOException;
-import java.rmi.NoSuchObjectException;
-import java.rmi.RemoteException;
-import java.rmi.StubNotFoundException;
-import java.rmi.UnknownHostException;
-
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteProxyFailureException;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * Factored-out methods for performing invocations within an RMI client.
- * Can handle both RMI and non-RMI service interfaces working on an RMI stub.
- *
- * <p>Note: This is an SPI class, not intended to be used by applications.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public abstract class RmiClientInterceptorUtils {
-
-	private static final Log logger = LogFactory.getLog(RmiClientInterceptorUtils.class);
-
-
-	/**
-	 * Perform a raw method invocation on the given RMI stub,
-	 * letting reflection exceptions through as-is.
-	 * @param invocation the AOP MethodInvocation
-	 * @param stub the RMI stub
-	 * @return the invocation result, if any
-	 * @throws InvocationTargetException if thrown by reflection
-	 */
-	@Nullable
-	public static Object invokeRemoteMethod(MethodInvocation invocation, Object stub)
-			throws InvocationTargetException {
-
-		Method method = invocation.getMethod();
-		try {
-			if (method.getDeclaringClass().isInstance(stub)) {
-				// directly implemented
-				return method.invoke(stub, invocation.getArguments());
-			}
-			else {
-				// not directly implemented
-				Method stubMethod = stub.getClass().getMethod(method.getName(), method.getParameterTypes());
-				return stubMethod.invoke(stub, invocation.getArguments());
-			}
-		}
-		catch (InvocationTargetException ex) {
-			throw ex;
-		}
-		catch (NoSuchMethodException ex) {
-			throw new RemoteProxyFailureException("No matching RMI stub method found for: " + method, ex);
-		}
-		catch (Throwable ex) {
-			throw new RemoteProxyFailureException("Invocation of RMI stub method failed: " + method, ex);
-		}
-	}
-
-	/**
-	 * Wrap the given arbitrary exception that happened during remote access
-	 * in either a RemoteException or a Spring RemoteAccessException (if the
-	 * method signature does not support RemoteException).
-	 * <p>Only call this for remote access exceptions, not for exceptions
-	 * thrown by the target service itself!
-	 * @param method the invoked method
-	 * @param ex the exception that happened, to be used as cause for the
-	 * RemoteAccessException or RemoteException
-	 * @param message the message for the RemoteAccessException respectively
-	 * RemoteException
-	 * @return the exception to be thrown to the caller
-	 */
-	public static Exception convertRmiAccessException(Method method, Throwable ex, String message) {
-		if (logger.isDebugEnabled()) {
-			logger.debug(message, ex);
-		}
-		if (ReflectionUtils.declaresException(method, RemoteException.class)) {
-			return new RemoteException(message, ex);
-		}
-		else {
-			return new RemoteAccessException(message, ex);
-		}
-	}
-
-	/**
-	 * Convert the given RemoteException that happened during remote access
-	 * to Spring's RemoteAccessException if the method signature does not
-	 * support RemoteException. Else, return the original RemoteException.
-	 * @param method the invoked method
-	 * @param ex the RemoteException that happened
-	 * @param serviceName the name of the service (for debugging purposes)
-	 * @return the exception to be thrown to the caller
-	 */
-	public static Exception convertRmiAccessException(Method method, RemoteException ex, String serviceName) {
-		return convertRmiAccessException(method, ex, isConnectFailure(ex), serviceName);
-	}
-
-	/**
-	 * Convert the given RemoteException that happened during remote access
-	 * to Spring's RemoteAccessException if the method signature does not
-	 * support RemoteException. Else, return the original RemoteException.
-	 * @param method the invoked method
-	 * @param ex the RemoteException that happened
-	 * @param isConnectFailure whether the given exception should be considered
-	 * a connect failure
-	 * @param serviceName the name of the service (for debugging purposes)
-	 * @return the exception to be thrown to the caller
-	 */
-	public static Exception convertRmiAccessException(
-			Method method, RemoteException ex, boolean isConnectFailure, String serviceName) {
-
-		if (logger.isDebugEnabled()) {
-			logger.debug("Remote service [" + serviceName + "] threw exception", ex);
-		}
-		if (ReflectionUtils.declaresException(method, ex.getClass())) {
-			return ex;
-		}
-		else {
-			if (isConnectFailure) {
-				return new RemoteConnectFailureException("Could not connect to remote service [" + serviceName + "]", ex);
-			}
-			else {
-				return new RemoteAccessException("Could not access remote service [" + serviceName + "]", ex);
-			}
-		}
-	}
-
-	/**
-	 * Determine whether the given RMI exception indicates a connect failure.
-	 * <p>Treats RMI's ConnectException, ConnectIOException, UnknownHostException,
-	 * NoSuchObjectException and StubNotFoundException as connect failure.
-	 * @param ex the RMI exception to check
-	 * @return whether the exception should be treated as connect failure
-	 * @see java.rmi.ConnectException
-	 * @see java.rmi.ConnectIOException
-	 * @see java.rmi.UnknownHostException
-	 * @see java.rmi.NoSuchObjectException
-	 * @see java.rmi.StubNotFoundException
-	 */
-	public static boolean isConnectFailure(RemoteException ex) {
-		return (ex instanceof ConnectException || ex instanceof ConnectIOException ||
-				ex instanceof UnknownHostException || ex instanceof NoSuchObjectException ||
-				ex instanceof StubNotFoundException || ex.getCause() instanceof SocketException);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
deleted file mode 100644
index fb26b071f51b..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.support.RemoteInvocation;
-
-/**
- * Interface for RMI invocation handlers instances on the server,
- * wrapping exported services. A client uses a stub implementing
- * this interface to access such a service.
- *
- * <p>This is an SPI interface, not to be used directly by applications.
- *
- * @author Juergen Hoeller
- * @since 14.05.2003
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public interface RmiInvocationHandler extends Remote {
-
-	/**
-	 * Return the name of the target interface that this invoker operates on.
-	 * @return the name of the target interface, or {@code null} if none
-	 * @throws RemoteException in case of communication errors
-	 * @see RmiServiceExporter#getServiceInterface()
-	 */
-	@Nullable
-	public String getTargetInterfaceName() throws RemoteException;
-
-	/**
-	 * Apply the given invocation to the target object.
-	 * <p>Called by
-	 * {@link RmiClientInterceptor#doInvoke(org.aopalliance.intercept.MethodInvocation, RmiInvocationHandler)}.
-	 * @param invocation object that encapsulates invocation parameters
-	 * @return the object returned from the invoked method, if any
-	 * @throws RemoteException in case of communication errors
-	 * @throws NoSuchMethodException if the method name could not be resolved
-	 * @throws IllegalAccessException if the method could not be accessed
-	 * @throws InvocationTargetException if the method invocation resulted in an exception
-	 */
-	@Nullable
-	public Object invoke(RemoteInvocation invocation)
-			throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException;
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
deleted file mode 100644
index 1f030b327cf5..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.rmi.RemoteException;
-
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.util.Assert;
-
-/**
- * Server-side implementation of {@link RmiInvocationHandler}. An instance
- * of this class exists for each remote object. Automatically created
- * by {@link RmiServiceExporter} for non-RMI service implementations.
- *
- * <p>This is an SPI class, not to be used directly by applications.
- *
- * @author Juergen Hoeller
- * @since 14.05.2003
- * @see RmiServiceExporter
- */
-@Deprecated
-class RmiInvocationWrapper implements RmiInvocationHandler {
-
-	private final Object wrappedObject;
-
-	private final RmiBasedExporter rmiExporter;
-
-
-	/**
-	 * Create a new RmiInvocationWrapper for the given object.
-	 * @param wrappedObject the object to wrap with an RmiInvocationHandler
-	 * @param rmiExporter the RMI exporter to handle the actual invocation
-	 */
-	public RmiInvocationWrapper(Object wrappedObject, RmiBasedExporter rmiExporter) {
-		Assert.notNull(wrappedObject, "Object to wrap is required");
-		Assert.notNull(rmiExporter, "RMI exporter is required");
-		this.wrappedObject = wrappedObject;
-		this.rmiExporter = rmiExporter;
-	}
-
-
-	/**
-	 * Exposes the exporter's service interface, if any, as target interface.
-	 * @see RmiBasedExporter#getServiceInterface()
-	 */
-	@Override
-	@Nullable
-	public String getTargetInterfaceName() {
-		Class<?> ifc = this.rmiExporter.getServiceInterface();
-		return (ifc != null ? ifc.getName() : null);
-	}
-
-	/**
-	 * Delegates the actual invocation handling to the RMI exporter.
-	 * @see RmiBasedExporter#invoke(org.springframework.remoting.support.RemoteInvocation, Object)
-	 */
-	@Override
-	@Nullable
-	public Object invoke(RemoteInvocation invocation)
-		throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-
-		return this.rmiExporter.invoke(invocation, this.wrappedObject);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
deleted file mode 100644
index 142640926dc5..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.util.Assert;
-
-/**
- * {@link FactoryBean} for RMI proxies, supporting both conventional RMI services
- * and RMI invokers. Exposes the proxied service for use as a bean reference,
- * using the specified service interface. Proxies will throw Spring's unchecked
- * RemoteAccessException on remote invocation failure instead of RMI's RemoteException.
- *
- * <p>The service URL must be a valid RMI URL like "rmi://localhost:1099/myservice".
- * RMI invokers work at the RmiInvocationHandler level, using the same invoker stub
- * for any service. Service interfaces do not have to extend {@code java.rmi.Remote}
- * or throw {@code java.rmi.RemoteException}. Of course, in and out parameters
- * have to be serializable.
- *
- * <p>With conventional RMI services, this proxy factory is typically used with the
- * RMI service interface. Alternatively, this factory can also proxy a remote RMI
- * service with a matching non-RMI business interface, i.e. an interface that mirrors
- * the RMI service methods but does not declare RemoteExceptions. In the latter case,
- * RemoteExceptions thrown by the RMI stub will automatically get converted to
- * Spring's unchecked RemoteAccessException.
- *
- * <p>The major advantage of RMI, compared to Hessian, is serialization.
- * Effectively, any serializable Java object can be transported without hassle.
- * Hessian has its own (de-)serialization mechanisms, but is HTTP-based and thus
- * much easier to setup than RMI. Alternatively, consider Spring's HTTP invoker
- * to combine Java serialization with HTTP-based transport.
- *
- * @author Juergen Hoeller
- * @since 13.05.2003
- * @see #setServiceInterface
- * @see #setServiceUrl
- * @see RmiClientInterceptor
- * @see RmiServiceExporter
- * @see java.rmi.Remote
- * @see java.rmi.RemoteException
- * @see org.springframework.remoting.RemoteAccessException
- * @see org.springframework.remoting.caucho.HessianProxyFactoryBean
- * @see org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class RmiProxyFactoryBean extends RmiClientInterceptor implements FactoryBean<Object>, BeanClassLoaderAware {
-
-	private Object serviceProxy;
-
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-		Class<?> ifc = getServiceInterface();
-		Assert.notNull(ifc, "Property 'serviceInterface' is required");
-		this.serviceProxy = new ProxyFactory(ifc, this).getProxy(getBeanClassLoader());
-	}
-
-
-	@Override
-	public Object getObject() {
-		return this.serviceProxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return getServiceInterface();
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
deleted file mode 100644
index e0b9cf601528..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.RMIClientSocketFactory;
-import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.UnicastRemoteObject;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link FactoryBean} that locates a {@link java.rmi.registry.Registry} and
- * exposes it for bean references. Can also create a local RMI registry
- * on the fly if none exists already.
- *
- * <p>Can be used to set up and pass around the actual Registry object to
- * applications objects that need to work with RMI. One example for such an
- * object that needs to work with RMI is Spring's {@link RmiServiceExporter},
- * which either works with a passed-in Registry reference or falls back to
- * the registry as specified by its local properties and defaults.
- *
- * <p>Also useful to enforce creation of a local RMI registry at a given port,
- * for example for a JMX connector. If used in conjunction with
- * {@link org.springframework.jmx.support.ConnectorServerFactoryBean},
- * it is recommended to mark the connector definition (ConnectorServerFactoryBean)
- * as "depends-on" the registry definition (RmiRegistryFactoryBean),
- * to guarantee starting up the registry first.
- *
- * <p>Note: The implementation of this class mirrors the corresponding logic
- * in {@link RmiServiceExporter}, and also offers the same customization hooks.
- * RmiServiceExporter implements its own registry lookup as a convenience:
- * It is very common to simply rely on the registry defaults.
- *
- * @author Juergen Hoeller
- * @since 1.2.3
- * @see RmiServiceExporter#setRegistry
- * @see org.springframework.jmx.support.ConnectorServerFactoryBean
- * @see java.rmi.registry.Registry
- * @see java.rmi.registry.LocateRegistry
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class RmiRegistryFactoryBean implements FactoryBean<Registry>, InitializingBean, DisposableBean {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private String host;
-
-	private int port = Registry.REGISTRY_PORT;
-
-	private RMIClientSocketFactory clientSocketFactory;
-
-	private RMIServerSocketFactory serverSocketFactory;
-
-	private Registry registry;
-
-	private boolean alwaysCreate = false;
-
-	private boolean created = false;
-
-
-	/**
-	 * Set the host of the registry for the exported RMI service,
-	 * i.e. {@code rmi://HOST:port/name}
-	 * <p>Default is localhost.
-	 */
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	/**
-	 * Return the host of the registry for the exported RMI service.
-	 */
-	public String getHost() {
-		return this.host;
-	}
-
-	/**
-	 * Set the port of the registry for the exported RMI service,
-	 * i.e. {@code rmi://host:PORT/name}
-	 * <p>Default is {@code Registry.REGISTRY_PORT} (1099).
-	 */
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	/**
-	 * Return the port of the registry for the exported RMI service.
-	 */
-	public int getPort() {
-		return this.port;
-	}
-
-	/**
-	 * Set a custom RMI client socket factory to use for the RMI registry.
-	 * <p>If the given object also implements {@code java.rmi.server.RMIServerSocketFactory},
-	 * it will automatically be registered as server socket factory too.
-	 * @see #setServerSocketFactory
-	 * @see java.rmi.server.RMIClientSocketFactory
-	 * @see java.rmi.server.RMIServerSocketFactory
-	 * @see java.rmi.registry.LocateRegistry#getRegistry(String, int, java.rmi.server.RMIClientSocketFactory)
-	 */
-	public void setClientSocketFactory(RMIClientSocketFactory clientSocketFactory) {
-		this.clientSocketFactory = clientSocketFactory;
-	}
-
-	/**
-	 * Set a custom RMI server socket factory to use for the RMI registry.
-	 * <p>Only needs to be specified when the client socket factory does not
-	 * implement {@code java.rmi.server.RMIServerSocketFactory} already.
-	 * @see #setClientSocketFactory
-	 * @see java.rmi.server.RMIClientSocketFactory
-	 * @see java.rmi.server.RMIServerSocketFactory
-	 * @see java.rmi.registry.LocateRegistry#createRegistry(int, RMIClientSocketFactory, java.rmi.server.RMIServerSocketFactory)
-	 */
-	public void setServerSocketFactory(RMIServerSocketFactory serverSocketFactory) {
-		this.serverSocketFactory = serverSocketFactory;
-	}
-
-	/**
-	 * Set whether to always create the registry in-process,
-	 * not attempting to locate an existing registry at the specified port.
-	 * <p>Default is "false". Switch this flag to "true" in order to avoid
-	 * the overhead of locating an existing registry when you always
-	 * intend to create a new registry in any case.
-	 */
-	public void setAlwaysCreate(boolean alwaysCreate) {
-		this.alwaysCreate = alwaysCreate;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		// Check socket factories for registry.
-		if (this.clientSocketFactory instanceof RMIServerSocketFactory) {
-			this.serverSocketFactory = (RMIServerSocketFactory) this.clientSocketFactory;
-		}
-		if ((this.clientSocketFactory != null && this.serverSocketFactory == null) ||
-				(this.clientSocketFactory == null && this.serverSocketFactory != null)) {
-			throw new IllegalArgumentException(
-					"Both RMIClientSocketFactory and RMIServerSocketFactory or none required");
-		}
-
-		// Fetch RMI registry to expose.
-		this.registry = getRegistry(this.host, this.port, this.clientSocketFactory, this.serverSocketFactory);
-	}
-
-
-	/**
-	 * Locate or create the RMI registry.
-	 * @param registryHost the registry host to use (if this is specified,
-	 * no implicit creation of a RMI registry will happen)
-	 * @param registryPort the registry port to use
-	 * @param clientSocketFactory the RMI client socket factory for the registry (if any)
-	 * @param serverSocketFactory the RMI server socket factory for the registry (if any)
-	 * @return the RMI registry
-	 * @throws java.rmi.RemoteException if the registry couldn't be located or created
-	 */
-	protected Registry getRegistry(String registryHost, int registryPort,
-			@Nullable RMIClientSocketFactory clientSocketFactory, @Nullable RMIServerSocketFactory serverSocketFactory)
-			throws RemoteException {
-
-		if (registryHost != null) {
-			// Host explicitly specified: only lookup possible.
-			if (logger.isDebugEnabled()) {
-				logger.debug("Looking for RMI registry at port '" + registryPort + "' of host [" + registryHost + "]");
-			}
-			Registry reg = LocateRegistry.getRegistry(registryHost, registryPort, clientSocketFactory);
-			testRegistry(reg);
-			return reg;
-		}
-
-		else {
-			return getRegistry(registryPort, clientSocketFactory, serverSocketFactory);
-		}
-	}
-
-	/**
-	 * Locate or create the RMI registry.
-	 * @param registryPort the registry port to use
-	 * @param clientSocketFactory the RMI client socket factory for the registry (if any)
-	 * @param serverSocketFactory the RMI server socket factory for the registry (if any)
-	 * @return the RMI registry
-	 * @throws RemoteException if the registry couldn't be located or created
-	 */
-	protected Registry getRegistry(int registryPort,
-			@Nullable RMIClientSocketFactory clientSocketFactory, @Nullable RMIServerSocketFactory serverSocketFactory)
-			throws RemoteException {
-
-		if (clientSocketFactory != null) {
-			if (this.alwaysCreate) {
-				logger.debug("Creating new RMI registry");
-				this.created = true;
-				return LocateRegistry.createRegistry(registryPort, clientSocketFactory, serverSocketFactory);
-			}
-			if (logger.isDebugEnabled()) {
-				logger.debug("Looking for RMI registry at port '" + registryPort + "', using custom socket factory");
-			}
-			synchronized (LocateRegistry.class) {
-				try {
-					// Retrieve existing registry.
-					Registry reg = LocateRegistry.getRegistry(null, registryPort, clientSocketFactory);
-					testRegistry(reg);
-					return reg;
-				}
-				catch (RemoteException ex) {
-					logger.trace("RMI registry access threw exception", ex);
-					logger.debug("Could not detect RMI registry - creating new one");
-					// Assume no registry found -> create new one.
-					this.created = true;
-					return LocateRegistry.createRegistry(registryPort, clientSocketFactory, serverSocketFactory);
-				}
-			}
-		}
-
-		else {
-			return getRegistry(registryPort);
-		}
-	}
-
-	/**
-	 * Locate or create the RMI registry.
-	 * @param registryPort the registry port to use
-	 * @return the RMI registry
-	 * @throws RemoteException if the registry couldn't be located or created
-	 */
-	protected Registry getRegistry(int registryPort) throws RemoteException {
-		if (this.alwaysCreate) {
-			logger.debug("Creating new RMI registry");
-			this.created = true;
-			return LocateRegistry.createRegistry(registryPort);
-		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("Looking for RMI registry at port '" + registryPort + "'");
-		}
-		synchronized (LocateRegistry.class) {
-			try {
-				// Retrieve existing registry.
-				Registry reg = LocateRegistry.getRegistry(registryPort);
-				testRegistry(reg);
-				return reg;
-			}
-			catch (RemoteException ex) {
-				logger.trace("RMI registry access threw exception", ex);
-				logger.debug("Could not detect RMI registry - creating new one");
-				// Assume no registry found -> create new one.
-				this.created = true;
-				return LocateRegistry.createRegistry(registryPort);
-			}
-		}
-	}
-
-	/**
-	 * Test the given RMI registry, calling some operation on it to
-	 * check whether it is still active.
-	 * <p>Default implementation calls {@code Registry.list()}.
-	 * @param registry the RMI registry to test
-	 * @throws RemoteException if thrown by registry methods
-	 * @see java.rmi.registry.Registry#list()
-	 */
-	protected void testRegistry(Registry registry) throws RemoteException {
-		registry.list();
-	}
-
-
-	@Override
-	public Registry getObject() throws Exception {
-		return this.registry;
-	}
-
-	@Override
-	public Class<? extends Registry> getObjectType() {
-		return (this.registry != null ? this.registry.getClass() : Registry.class);
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-
-	/**
-	 * Unexport the RMI registry on bean factory shutdown,
-	 * provided that this bean actually created a registry.
-	 */
-	@Override
-	public void destroy() throws RemoteException {
-		if (this.created) {
-			logger.debug("Unexporting RMI registry");
-			UnicastRemoteObject.unexportObject(this.registry, true);
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
deleted file mode 100644
index 9ee3a6c112bf..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.rmi.AlreadyBoundException;
-import java.rmi.NoSuchObjectException;
-import java.rmi.NotBoundException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.RMIClientSocketFactory;
-import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.UnicastRemoteObject;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-
-/**
- * RMI exporter that exposes the specified service as RMI object with the specified name.
- * Such services can be accessed via plain RMI or via {@link RmiProxyFactoryBean}.
- * Also supports exposing any non-RMI service via RMI invokers, to be accessed via
- * {@link RmiClientInterceptor} / {@link RmiProxyFactoryBean}'s automatic detection
- * of such invokers.
- *
- * <p>With an RMI invoker, RMI communication works on the {@link RmiInvocationHandler}
- * level, needing only one stub for any service. Service interfaces do not have to
- * extend {@code java.rmi.Remote} or throw {@code java.rmi.RemoteException}
- * on all methods, but in and out parameters have to be serializable.
- *
- * <p>The major advantage of RMI, compared to Hessian, is serialization.
- * Effectively, any serializable Java object can be transported without hassle.
- * Hessian has its own (de-)serialization mechanisms, but is HTTP-based and thus
- * much easier to setup than RMI. Alternatively, consider Spring's HTTP invoker
- * to combine Java serialization with HTTP-based transport.
- *
- * <p>Note: RMI makes a best-effort attempt to obtain the fully qualified host name.
- * If one cannot be determined, it will fall back and use the IP address. Depending
- * on your network configuration, in some cases it will resolve the IP to the loopback
- * address. To ensure that RMI will use the host name bound to the correct network
- * interface, you should pass the {@code java.rmi.server.hostname} property to the
- * JVM that will export the registry and/or the service using the "-D" JVM argument.
- * For example: {@code -Djava.rmi.server.hostname=myserver.com}
- *
- * @author Juergen Hoeller
- * @since 13.05.2003
- * @see RmiClientInterceptor
- * @see RmiProxyFactoryBean
- * @see java.rmi.Remote
- * @see java.rmi.RemoteException
- * @see org.springframework.remoting.caucho.HessianServiceExporter
- * @see org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class RmiServiceExporter extends RmiBasedExporter implements InitializingBean, DisposableBean {
-
-	private String serviceName;
-
-	private int servicePort = 0;  // anonymous port
-
-	private RMIClientSocketFactory clientSocketFactory;
-
-	private RMIServerSocketFactory serverSocketFactory;
-
-	private Registry registry;
-
-	private String registryHost;
-
-	private int registryPort = Registry.REGISTRY_PORT;
-
-	private RMIClientSocketFactory registryClientSocketFactory;
-
-	private RMIServerSocketFactory registryServerSocketFactory;
-
-	private boolean alwaysCreateRegistry = false;
-
-	private boolean replaceExistingBinding = true;
-
-	private Remote exportedObject;
-
-	private boolean createdRegistry = false;
-
-
-	/**
-	 * Set the name of the exported RMI service,
-	 * i.e. {@code rmi://host:port/NAME}
-	 */
-	public void setServiceName(String serviceName) {
-		this.serviceName = serviceName;
-	}
-
-	/**
-	 * Set the port that the exported RMI service will use.
-	 * <p>Default is 0 (anonymous port).
-	 */
-	public void setServicePort(int servicePort) {
-		this.servicePort = servicePort;
-	}
-
-	/**
-	 * Set a custom RMI client socket factory to use for exporting the service.
-	 * <p>If the given object also implements {@code java.rmi.server.RMIServerSocketFactory},
-	 * it will automatically be registered as server socket factory too.
-	 * @see #setServerSocketFactory
-	 * @see java.rmi.server.RMIClientSocketFactory
-	 * @see java.rmi.server.RMIServerSocketFactory
-	 * @see UnicastRemoteObject#exportObject(Remote, int, RMIClientSocketFactory, RMIServerSocketFactory)
-	 */
-	public void setClientSocketFactory(RMIClientSocketFactory clientSocketFactory) {
-		this.clientSocketFactory = clientSocketFactory;
-	}
-
-	/**
-	 * Set a custom RMI server socket factory to use for exporting the service.
-	 * <p>Only needs to be specified when the client socket factory does not
-	 * implement {@code java.rmi.server.RMIServerSocketFactory} already.
-	 * @see #setClientSocketFactory
-	 * @see java.rmi.server.RMIClientSocketFactory
-	 * @see java.rmi.server.RMIServerSocketFactory
-	 * @see UnicastRemoteObject#exportObject(Remote, int, RMIClientSocketFactory, RMIServerSocketFactory)
-	 */
-	public void setServerSocketFactory(RMIServerSocketFactory serverSocketFactory) {
-		this.serverSocketFactory = serverSocketFactory;
-	}
-
-	/**
-	 * Specify the RMI registry to register the exported service with.
-	 * Typically used in combination with RmiRegistryFactoryBean.
-	 * <p>Alternatively, you can specify all registry properties locally.
-	 * This exporter will then try to locate the specified registry,
-	 * automatically creating a new local one if appropriate.
-	 * <p>Default is a local registry at the default port (1099),
-	 * created on the fly if necessary.
-	 * @see RmiRegistryFactoryBean
-	 * @see #setRegistryHost
-	 * @see #setRegistryPort
-	 * @see #setRegistryClientSocketFactory
-	 * @see #setRegistryServerSocketFactory
-	 */
-	public void setRegistry(Registry registry) {
-		this.registry = registry;
-	}
-
-	/**
-	 * Set the host of the registry for the exported RMI service,
-	 * i.e. {@code rmi://HOST:port/name}
-	 * <p>Default is localhost.
-	 */
-	public void setRegistryHost(String registryHost) {
-		this.registryHost = registryHost;
-	}
-
-	/**
-	 * Set the port of the registry for the exported RMI service,
-	 * i.e. {@code rmi://host:PORT/name}
-	 * <p>Default is {@code Registry.REGISTRY_PORT} (1099).
-	 * @see java.rmi.registry.Registry#REGISTRY_PORT
-	 */
-	public void setRegistryPort(int registryPort) {
-		this.registryPort = registryPort;
-	}
-
-	/**
-	 * Set a custom RMI client socket factory to use for the RMI registry.
-	 * <p>If the given object also implements {@code java.rmi.server.RMIServerSocketFactory},
-	 * it will automatically be registered as server socket factory too.
-	 * @see #setRegistryServerSocketFactory
-	 * @see java.rmi.server.RMIClientSocketFactory
-	 * @see java.rmi.server.RMIServerSocketFactory
-	 * @see LocateRegistry#getRegistry(String, int, RMIClientSocketFactory)
-	 */
-	public void setRegistryClientSocketFactory(RMIClientSocketFactory registryClientSocketFactory) {
-		this.registryClientSocketFactory = registryClientSocketFactory;
-	}
-
-	/**
-	 * Set a custom RMI server socket factory to use for the RMI registry.
-	 * <p>Only needs to be specified when the client socket factory does not
-	 * implement {@code java.rmi.server.RMIServerSocketFactory} already.
-	 * @see #setRegistryClientSocketFactory
-	 * @see java.rmi.server.RMIClientSocketFactory
-	 * @see java.rmi.server.RMIServerSocketFactory
-	 * @see LocateRegistry#createRegistry(int, RMIClientSocketFactory, RMIServerSocketFactory)
-	 */
-	public void setRegistryServerSocketFactory(RMIServerSocketFactory registryServerSocketFactory) {
-		this.registryServerSocketFactory = registryServerSocketFactory;
-	}
-
-	/**
-	 * Set whether to always create the registry in-process,
-	 * not attempting to locate an existing registry at the specified port.
-	 * <p>Default is "false". Switch this flag to "true" in order to avoid
-	 * the overhead of locating an existing registry when you always
-	 * intend to create a new registry in any case.
-	 */
-	public void setAlwaysCreateRegistry(boolean alwaysCreateRegistry) {
-		this.alwaysCreateRegistry = alwaysCreateRegistry;
-	}
-
-	/**
-	 * Set whether to replace an existing binding in the RMI registry,
-	 * that is, whether to simply override an existing binding with the
-	 * specified service in case of a naming conflict in the registry.
-	 * <p>Default is "true", assuming that an existing binding for this
-	 * exporter's service name is an accidental leftover from a previous
-	 * execution. Switch this to "false" to make the exporter fail in such
-	 * a scenario, indicating that there was already an RMI object bound.
-	 */
-	public void setReplaceExistingBinding(boolean replaceExistingBinding) {
-		this.replaceExistingBinding = replaceExistingBinding;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws RemoteException {
-		prepare();
-	}
-
-	/**
-	 * Initialize this service exporter, registering the service as RMI object.
-	 * <p>Creates an RMI registry on the specified port if none exists.
-	 * @throws RemoteException if service registration failed
-	 */
-	public void prepare() throws RemoteException {
-		checkService();
-
-		if (this.serviceName == null) {
-			throw new IllegalArgumentException("Property 'serviceName' is required");
-		}
-
-		// Check socket factories for exported object.
-		if (this.clientSocketFactory instanceof RMIServerSocketFactory) {
-			this.serverSocketFactory = (RMIServerSocketFactory) this.clientSocketFactory;
-		}
-		if ((this.clientSocketFactory != null && this.serverSocketFactory == null) ||
-				(this.clientSocketFactory == null && this.serverSocketFactory != null)) {
-			throw new IllegalArgumentException(
-					"Both RMIClientSocketFactory and RMIServerSocketFactory or none required");
-		}
-
-		// Check socket factories for RMI registry.
-		if (this.registryClientSocketFactory instanceof RMIServerSocketFactory) {
-			this.registryServerSocketFactory = (RMIServerSocketFactory) this.registryClientSocketFactory;
-		}
-		if (this.registryClientSocketFactory == null && this.registryServerSocketFactory != null) {
-			throw new IllegalArgumentException(
-					"RMIServerSocketFactory without RMIClientSocketFactory for registry not supported");
-		}
-
-		this.createdRegistry = false;
-
-		// Determine RMI registry to use.
-		if (this.registry == null) {
-			this.registry = getRegistry(this.registryHost, this.registryPort,
-				this.registryClientSocketFactory, this.registryServerSocketFactory);
-			this.createdRegistry = true;
-		}
-
-		// Initialize and cache exported object.
-		this.exportedObject = getObjectToExport();
-
-		if (logger.isDebugEnabled()) {
-			logger.debug("Binding service '" + this.serviceName + "' to RMI registry: " + this.registry);
-		}
-
-		// Export RMI object.
-		if (this.clientSocketFactory != null) {
-			UnicastRemoteObject.exportObject(
-					this.exportedObject, this.servicePort, this.clientSocketFactory, this.serverSocketFactory);
-		}
-		else {
-			UnicastRemoteObject.exportObject(this.exportedObject, this.servicePort);
-		}
-
-		// Bind RMI object to registry.
-		try {
-			if (this.replaceExistingBinding) {
-				this.registry.rebind(this.serviceName, this.exportedObject);
-			}
-			else {
-				this.registry.bind(this.serviceName, this.exportedObject);
-			}
-		}
-		catch (AlreadyBoundException ex) {
-			// Already an RMI object bound for the specified service name...
-			unexportObjectSilently();
-			throw new IllegalStateException(
-					"Already an RMI object bound for name '"  + this.serviceName + "': " + ex.toString());
-		}
-		catch (RemoteException ex) {
-			// Registry binding failed: let's unexport the RMI object as well.
-			unexportObjectSilently();
-			throw ex;
-		}
-	}
-
-
-	/**
-	 * Locate or create the RMI registry for this exporter.
-	 * @param registryHost the registry host to use (if this is specified,
-	 * no implicit creation of a RMI registry will happen)
-	 * @param registryPort the registry port to use
-	 * @param clientSocketFactory the RMI client socket factory for the registry (if any)
-	 * @param serverSocketFactory the RMI server socket factory for the registry (if any)
-	 * @return the RMI registry
-	 * @throws RemoteException if the registry couldn't be located or created
-	 */
-	protected Registry getRegistry(String registryHost, int registryPort,
-			@Nullable RMIClientSocketFactory clientSocketFactory, @Nullable RMIServerSocketFactory serverSocketFactory)
-			throws RemoteException {
-
-		if (registryHost != null) {
-			// Host explicitly specified: only lookup possible.
-			if (logger.isDebugEnabled()) {
-				logger.debug("Looking for RMI registry at port '" + registryPort + "' of host [" + registryHost + "]");
-			}
-			Registry reg = LocateRegistry.getRegistry(registryHost, registryPort, clientSocketFactory);
-			testRegistry(reg);
-			return reg;
-		}
-
-		else {
-			return getRegistry(registryPort, clientSocketFactory, serverSocketFactory);
-		}
-	}
-
-	/**
-	 * Locate or create the RMI registry for this exporter.
-	 * @param registryPort the registry port to use
-	 * @param clientSocketFactory the RMI client socket factory for the registry (if any)
-	 * @param serverSocketFactory the RMI server socket factory for the registry (if any)
-	 * @return the RMI registry
-	 * @throws RemoteException if the registry couldn't be located or created
-	 */
-	protected Registry getRegistry(int registryPort,
-			@Nullable RMIClientSocketFactory clientSocketFactory, @Nullable RMIServerSocketFactory serverSocketFactory)
-			throws RemoteException {
-
-		if (clientSocketFactory != null) {
-			if (this.alwaysCreateRegistry) {
-				logger.debug("Creating new RMI registry");
-				return LocateRegistry.createRegistry(registryPort, clientSocketFactory, serverSocketFactory);
-			}
-			if (logger.isDebugEnabled()) {
-				logger.debug("Looking for RMI registry at port '" + registryPort + "', using custom socket factory");
-			}
-			synchronized (LocateRegistry.class) {
-				try {
-					// Retrieve existing registry.
-					Registry reg = LocateRegistry.getRegistry(null, registryPort, clientSocketFactory);
-					testRegistry(reg);
-					return reg;
-				}
-				catch (RemoteException ex) {
-					logger.trace("RMI registry access threw exception", ex);
-					logger.debug("Could not detect RMI registry - creating new one");
-					// Assume no registry found -> create new one.
-					return LocateRegistry.createRegistry(registryPort, clientSocketFactory, serverSocketFactory);
-				}
-			}
-		}
-
-		else {
-			return getRegistry(registryPort);
-		}
-	}
-
-	/**
-	 * Locate or create the RMI registry for this exporter.
-	 * @param registryPort the registry port to use
-	 * @return the RMI registry
-	 * @throws RemoteException if the registry couldn't be located or created
-	 */
-	protected Registry getRegistry(int registryPort) throws RemoteException {
-		if (this.alwaysCreateRegistry) {
-			logger.debug("Creating new RMI registry");
-			return LocateRegistry.createRegistry(registryPort);
-		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("Looking for RMI registry at port '" + registryPort + "'");
-		}
-		synchronized (LocateRegistry.class) {
-			try {
-				// Retrieve existing registry.
-				Registry reg = LocateRegistry.getRegistry(registryPort);
-				testRegistry(reg);
-				return reg;
-			}
-			catch (RemoteException ex) {
-				logger.trace("RMI registry access threw exception", ex);
-				logger.debug("Could not detect RMI registry - creating new one");
-				// Assume no registry found -> create new one.
-				return LocateRegistry.createRegistry(registryPort);
-			}
-		}
-	}
-
-	/**
-	 * Test the given RMI registry, calling some operation on it to
-	 * check whether it is still active.
-	 * <p>Default implementation calls {@code Registry.list()}.
-	 * @param registry the RMI registry to test
-	 * @throws RemoteException if thrown by registry methods
-	 * @see java.rmi.registry.Registry#list()
-	 */
-	protected void testRegistry(Registry registry) throws RemoteException {
-		registry.list();
-	}
-
-
-	/**
-	 * Unbind the RMI service from the registry on bean factory shutdown.
-	 */
-	@Override
-	public void destroy() throws RemoteException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Unbinding RMI service '" + this.serviceName +
-					"' from registry" + (this.createdRegistry ? (" at port '" + this.registryPort + "'") : ""));
-		}
-		try {
-			this.registry.unbind(this.serviceName);
-		}
-		catch (NotBoundException ex) {
-			if (logger.isInfoEnabled()) {
-				logger.info("RMI service '" + this.serviceName + "' is not bound to registry" +
-						(this.createdRegistry ? (" at port '" + this.registryPort + "' anymore") : ""), ex);
-			}
-		}
-		finally {
-			unexportObjectSilently();
-		}
-	}
-
-	/**
-	 * Unexport the registered RMI object, logging any exception that arises.
-	 */
-	private void unexportObjectSilently() {
-		try {
-			UnicastRemoteObject.unexportObject(this.exportedObject, true);
-		}
-		catch (NoSuchObjectException ex) {
-			if (logger.isInfoEnabled()) {
-				logger.info("RMI object for service '" + this.serviceName + "' is not exported anymore", ex);
-			}
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/package-info.java b/spring-context/src/main/java/org/springframework/remoting/rmi/package-info.java
deleted file mode 100644
index 8296464c341f..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Remoting classes for conventional RMI and transparent remoting via
- * RMI invokers. Provides a proxy factory for accessing RMI services,
- * and an exporter for making beans available to RMI clients.
- */
-package org.springframework.remoting.rmi;
diff --git a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
deleted file mode 100644
index 175c351cf34b..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- * 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.remoting.soap;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.remoting.RemoteInvocationFailureException;
-
-/**
- * RemoteInvocationFailureException subclass that provides the details
- * of a SOAP fault.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see javax.xml.rpc.soap.SOAPFaultException
- * @see javax.xml.ws.soap.SOAPFaultException
- */
-@SuppressWarnings("serial")
-public abstract class SoapFaultException extends RemoteInvocationFailureException {
-
-	/**
-	 * Constructor for SoapFaultException.
-	 * @param msg the detail message
-	 * @param cause the root cause from the SOAP API in use
-	 */
-	protected SoapFaultException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-
-	/**
-	 * Return the SOAP fault code.
-	 */
-	public abstract String getFaultCode();
-
-	/**
-	 * Return the SOAP fault code as a {@code QName} object.
-	 */
-	public abstract QName getFaultCodeAsQName();
-
-	/**
-	 * Return the descriptive SOAP fault string.
-	 */
-	public abstract String getFaultString();
-
-	/**
-	 * Return the actor that caused this fault.
-	 */
-	public abstract String getFaultActor();
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/soap/package-info.java b/spring-context/src/main/java/org/springframework/remoting/soap/package-info.java
deleted file mode 100644
index e1e110740973..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/soap/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * SOAP-specific exceptions and support classes for Spring's remoting subsystem.
- */
-package org.springframework.remoting.soap;
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
deleted file mode 100644
index 870fe87ff177..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.springframework.util.Assert;
-
-/**
- * Default implementation of the {@link RemoteInvocationExecutor} interface.
- * Simply delegates to {@link RemoteInvocation}'s invoke method.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see RemoteInvocation#invoke
- */
-public class DefaultRemoteInvocationExecutor implements RemoteInvocationExecutor {
-
-	@Override
-	public Object invoke(RemoteInvocation invocation, Object targetObject)
-			throws NoSuchMethodException, IllegalAccessException, InvocationTargetException{
-
-		Assert.notNull(invocation, "RemoteInvocation must not be null");
-		Assert.notNull(targetObject, "Target object must not be null");
-		return invocation.invoke(targetObject);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
deleted file mode 100644
index 10f3ab184a4f..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import org.aopalliance.intercept.MethodInvocation;
-
-/**
- * Default implementation of the {@link RemoteInvocationFactory} interface.
- * Simply creates a new standard {@link RemoteInvocation} object.
- *
- * @author Juergen Hoeller
- * @since 1.1
- */
-public class DefaultRemoteInvocationFactory implements RemoteInvocationFactory {
-
-	@Override
-	public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
-		return new RemoteInvocation(methodInvocation);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
deleted file mode 100644
index f26ca9a84931..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import org.springframework.util.Assert;
-
-/**
- * Abstract base class for classes that access a remote service.
- * Provides a "serviceInterface" bean property.
- *
- * <p>Note that the service interface being used will show some signs of
- * remotability, like the granularity of method calls that it offers.
- * Furthermore, it has to have serializable arguments etc.
- *
- * <p>Accessors are supposed to throw Spring's generic
- * {@link org.springframework.remoting.RemoteAccessException} in case
- * of remote invocation failure, provided that the service interface
- * does not declare {@code java.rmi.RemoteException}.
- *
- * @author Juergen Hoeller
- * @since 13.05.2003
- * @see org.springframework.remoting.RemoteAccessException
- * @see java.rmi.RemoteException
- */
-public abstract class RemoteAccessor extends RemotingSupport {
-
-	private Class<?> serviceInterface;
-
-
-	/**
-	 * Set the interface of the service to access.
-	 * The interface must be suitable for the particular service and remoting strategy.
-	 * <p>Typically required to be able to create a suitable service proxy,
-	 * but can also be optional if the lookup returns a typed proxy.
-	 */
-	public void setServiceInterface(Class<?> serviceInterface) {
-		Assert.notNull(serviceInterface, "'serviceInterface' must not be null");
-		Assert.isTrue(serviceInterface.isInterface(), "'serviceInterface' must be an interface");
-		this.serviceInterface = serviceInterface;
-	}
-
-	/**
-	 * Return the interface of the service to access.
-	 */
-	public Class<?> getServiceInterface() {
-		return this.serviceInterface;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
deleted file mode 100644
index 2c590ff5480c..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.framework.adapter.AdvisorAdapterRegistry;
-import org.springframework.aop.framework.adapter.GlobalAdvisorAdapterRegistry;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * Abstract base class for classes that export a remote service.
- * Provides "service" and "serviceInterface" bean properties.
- *
- * <p>Note that the service interface being used will show some signs of
- * remotability, like the granularity of method calls that it offers.
- * Furthermore, it has to have serializable arguments etc.
- *
- * @author Juergen Hoeller
- * @since 26.12.2003
- */
-public abstract class RemoteExporter extends RemotingSupport {
-
-	private Object service;
-
-	private Class<?> serviceInterface;
-
-	private Boolean registerTraceInterceptor;
-
-	private Object[] interceptors;
-
-
-	/**
-	 * Set the service to export.
-	 * Typically populated via a bean reference.
-	 */
-	public void setService(Object service) {
-		this.service = service;
-	}
-
-	/**
-	 * Return the service to export.
-	 */
-	public Object getService() {
-		return this.service;
-	}
-
-	/**
-	 * Set the interface of the service to export.
-	 * The interface must be suitable for the particular service and remoting strategy.
-	 */
-	public void setServiceInterface(Class<?> serviceInterface) {
-		Assert.notNull(serviceInterface, "'serviceInterface' must not be null");
-		Assert.isTrue(serviceInterface.isInterface(), "'serviceInterface' must be an interface");
-		this.serviceInterface = serviceInterface;
-	}
-
-	/**
-	 * Return the interface of the service to export.
-	 */
-	public Class<?> getServiceInterface() {
-		return this.serviceInterface;
-	}
-
-	/**
-	 * Set whether to register a RemoteInvocationTraceInterceptor for exported
-	 * services. Only applied when a subclass uses {@code getProxyForService}
-	 * for creating the proxy to expose.
-	 * <p>Default is "true". RemoteInvocationTraceInterceptor's most important value
-	 * is that it logs exception stacktraces on the server, before propagating an
-	 * exception to the client. Note that RemoteInvocationTraceInterceptor will <i>not</i>
-	 * be registered by default if the "interceptors" property has been specified.
-	 * @see #setInterceptors
-	 * @see #getProxyForService
-	 * @see RemoteInvocationTraceInterceptor
-	 */
-	public void setRegisterTraceInterceptor(boolean registerTraceInterceptor) {
-		this.registerTraceInterceptor = registerTraceInterceptor;
-	}
-
-	/**
-	 * Set additional interceptors (or advisors) to be applied before the
-	 * remote endpoint, e.g. a PerformanceMonitorInterceptor.
-	 * <p>You may specify any AOP Alliance MethodInterceptors or other
-	 * Spring AOP Advices, as well as Spring AOP Advisors.
-	 * @see #getProxyForService
-	 * @see org.springframework.aop.interceptor.PerformanceMonitorInterceptor
-	 */
-	public void setInterceptors(Object[] interceptors) {
-		this.interceptors = interceptors;
-	}
-
-
-	/**
-	 * Check whether the service reference has been set.
-	 * @see #setService
-	 */
-	protected void checkService() throws IllegalArgumentException {
-		Assert.notNull(getService(), "Property 'service' is required");
-	}
-
-	/**
-	 * Check whether a service reference has been set,
-	 * and whether it matches the specified service.
-	 * @see #setServiceInterface
-	 * @see #setService
-	 */
-	protected void checkServiceInterface() throws IllegalArgumentException {
-		Class<?> serviceInterface = getServiceInterface();
-		Assert.notNull(serviceInterface, "Property 'serviceInterface' is required");
-
-		Object service = getService();
-		if (service instanceof String) {
-			throw new IllegalArgumentException("Service [" + service + "] is a String " +
-					"rather than an actual service reference: Have you accidentally specified " +
-					"the service bean name as value instead of as reference?");
-		}
-		if (!serviceInterface.isInstance(service)) {
-			throw new IllegalArgumentException("Service interface [" + serviceInterface.getName() +
-					"] needs to be implemented by service [" + service + "] of class [" +
-					service.getClass().getName() + "]");
-		}
-	}
-
-	/**
-	 * Get a proxy for the given service object, implementing the specified
-	 * service interface.
-	 * <p>Used to export a proxy that does not expose any internals but just
-	 * a specific interface intended for remote access. Furthermore, a
-	 * {@link RemoteInvocationTraceInterceptor} will be registered (by default).
-	 * @return the proxy
-	 * @see #setServiceInterface
-	 * @see #setRegisterTraceInterceptor
-	 * @see RemoteInvocationTraceInterceptor
-	 */
-	protected Object getProxyForService() {
-		checkService();
-		checkServiceInterface();
-
-		ProxyFactory proxyFactory = new ProxyFactory();
-		proxyFactory.addInterface(getServiceInterface());
-
-		if (this.registerTraceInterceptor != null ? this.registerTraceInterceptor : this.interceptors == null) {
-			proxyFactory.addAdvice(new RemoteInvocationTraceInterceptor(getExporterName()));
-		}
-		if (this.interceptors != null) {
-			AdvisorAdapterRegistry adapterRegistry = GlobalAdvisorAdapterRegistry.getInstance();
-			for (Object interceptor : this.interceptors) {
-				proxyFactory.addAdvisor(adapterRegistry.wrap(interceptor));
-			}
-		}
-
-		proxyFactory.setTarget(getService());
-		proxyFactory.setOpaque(true);
-
-		return proxyFactory.getProxy(getBeanClassLoader());
-	}
-
-	/**
-	 * Return a short name for this exporter.
-	 * Used for tracing of remote invocations.
-	 * <p>Default is the unqualified class name (without package).
-	 * Can be overridden in subclasses.
-	 * @see #getProxyForService
-	 * @see RemoteInvocationTraceInterceptor
-	 * @see org.springframework.util.ClassUtils#getShortName
-	 */
-	protected String getExporterName() {
-		return ClassUtils.getShortName(getClass());
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
deleted file mode 100644
index fec43c6bb209..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-/**
- * Encapsulates a remote invocation, providing core method invocation properties
- * in a serializable fashion. Used for RMI and HTTP-based serialization invokers.
- *
- * <p>This is an SPI class, typically not used directly by applications.
- * Can be subclassed for additional invocation parameters.
- *
- * <p>Both {@link RemoteInvocation} and {@link RemoteInvocationResult} are designed
- * for use with standard Java serialization as well as JavaBean-style serialization.
- *
- * @author Juergen Hoeller
- * @since 25.02.2004
- * @see RemoteInvocationResult
- * @see RemoteInvocationFactory
- * @see RemoteInvocationExecutor
- * @see org.springframework.remoting.rmi.RmiProxyFactoryBean
- * @see org.springframework.remoting.rmi.RmiServiceExporter
- * @see org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean
- * @see org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter
- */
-public class RemoteInvocation implements Serializable {
-
-	/** use serialVersionUID from Spring 1.1 for interoperability. */
-	private static final long serialVersionUID = 6876024250231820554L;
-
-
-	private String methodName;
-
-	private Class<?>[] parameterTypes;
-
-	private Object[] arguments;
-
-	private Map<String, Serializable> attributes;
-
-
-	/**
-	 * Create a new RemoteInvocation for the given AOP method invocation.
-	 * @param methodInvocation the AOP invocation to convert
-	 */
-	public RemoteInvocation(MethodInvocation methodInvocation) {
-		this.methodName = methodInvocation.getMethod().getName();
-		this.parameterTypes = methodInvocation.getMethod().getParameterTypes();
-		this.arguments = methodInvocation.getArguments();
-	}
-
-	/**
-	 * Create a new RemoteInvocation for the given parameters.
-	 * @param methodName the name of the method to invoke
-	 * @param parameterTypes the parameter types of the method
-	 * @param arguments the arguments for the invocation
-	 */
-	public RemoteInvocation(String methodName, Class<?>[] parameterTypes, Object[] arguments) {
-		this.methodName = methodName;
-		this.parameterTypes = parameterTypes;
-		this.arguments = arguments;
-	}
-
-	/**
-	 * Create a new RemoteInvocation for JavaBean-style deserialization
-	 * (e.g. with Jackson).
-	 */
-	public RemoteInvocation() {
-	}
-
-
-	/**
-	 * Set the name of the target method.
-	 * <p>This setter is intended for JavaBean-style deserialization.
-	 */
-	public void setMethodName(String methodName) {
-		this.methodName = methodName;
-	}
-
-	/**
-	 * Return the name of the target method.
-	 */
-	public String getMethodName() {
-		return this.methodName;
-	}
-
-	/**
-	 * Set the parameter types of the target method.
-	 * <p>This setter is intended for JavaBean-style deserialization.
-	 */
-	public void setParameterTypes(Class<?>[] parameterTypes) {
-		this.parameterTypes = parameterTypes;
-	}
-
-	/**
-	 * Return the parameter types of the target method.
-	 */
-	public Class<?>[] getParameterTypes() {
-		return this.parameterTypes;
-	}
-
-	/**
-	 * Set the arguments for the target method call.
-	 * <p>This setter is intended for JavaBean-style deserialization.
-	 */
-	public void setArguments(Object[] arguments) {
-		this.arguments = arguments;
-	}
-
-	/**
-	 * Return the arguments for the target method call.
-	 */
-	public Object[] getArguments() {
-		return this.arguments;
-	}
-
-
-	/**
-	 * Add an additional invocation attribute. Useful to add additional
-	 * invocation context without having to subclass RemoteInvocation.
-	 * <p>Attribute keys have to be unique, and no overriding of existing
-	 * attributes is allowed.
-	 * <p>The implementation avoids to unnecessarily create the attributes
-	 * Map, to minimize serialization size.
-	 * @param key the attribute key
-	 * @param value the attribute value
-	 * @throws IllegalStateException if the key is already bound
-	 */
-	public void addAttribute(String key, Serializable value) throws IllegalStateException {
-		if (this.attributes == null) {
-			this.attributes = new HashMap<>();
-		}
-		if (this.attributes.containsKey(key)) {
-			throw new IllegalStateException("There is already an attribute with key '" + key + "' bound");
-		}
-		this.attributes.put(key, value);
-	}
-
-	/**
-	 * Retrieve the attribute for the given key, if any.
-	 * <p>The implementation avoids to unnecessarily create the attributes
-	 * Map, to minimize serialization size.
-	 * @param key the attribute key
-	 * @return the attribute value, or {@code null} if not defined
-	 */
-	@Nullable
-	public Serializable getAttribute(String key) {
-		if (this.attributes == null) {
-			return null;
-		}
-		return this.attributes.get(key);
-	}
-
-	/**
-	 * Set the attributes Map. Only here for special purposes:
-	 * Preferably, use {@link #addAttribute} and {@link #getAttribute}.
-	 * @param attributes the attributes Map
-	 * @see #addAttribute
-	 * @see #getAttribute
-	 */
-	public void setAttributes(@Nullable Map<String, Serializable> attributes) {
-		this.attributes = attributes;
-	}
-
-	/**
-	 * Return the attributes Map. Mainly here for debugging purposes:
-	 * Preferably, use {@link #addAttribute} and {@link #getAttribute}.
-	 * @return the attributes Map, or {@code null} if none created
-	 * @see #addAttribute
-	 * @see #getAttribute
-	 */
-	@Nullable
-	public Map<String, Serializable> getAttributes() {
-		return this.attributes;
-	}
-
-
-	/**
-	 * Perform this invocation on the given target object.
-	 * Typically called when a RemoteInvocation is received on the server.
-	 * @param targetObject the target object to apply the invocation to
-	 * @return the invocation result
-	 * @throws NoSuchMethodException if the method name could not be resolved
-	 * @throws IllegalAccessException if the method could not be accessed
-	 * @throws InvocationTargetException if the method invocation resulted in an exception
-	 * @see java.lang.reflect.Method#invoke
-	 */
-	public Object invoke(Object targetObject)
-			throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-
-		Method method = targetObject.getClass().getMethod(this.methodName, this.parameterTypes);
-		return method.invoke(targetObject, this.arguments);
-	}
-
-
-	@Override
-	public String toString() {
-		return "RemoteInvocation: method name '" + this.methodName + "'; parameter types " +
-				ClassUtils.classNamesToString(this.parameterTypes);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
deleted file mode 100644
index c7f58152c0c2..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Abstract base class for remote service accessors that are based
- * on serialization of {@link RemoteInvocation} objects.
- *
- * Provides a "remoteInvocationFactory" property, with a
- * {@link DefaultRemoteInvocationFactory} as default strategy.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see #setRemoteInvocationFactory
- * @see RemoteInvocation
- * @see RemoteInvocationFactory
- * @see DefaultRemoteInvocationFactory
- */
-public abstract class RemoteInvocationBasedAccessor extends UrlBasedRemoteAccessor {
-
-	private RemoteInvocationFactory remoteInvocationFactory = new DefaultRemoteInvocationFactory();
-
-
-	/**
-	 * Set the RemoteInvocationFactory to use for this accessor.
-	 * Default is a {@link DefaultRemoteInvocationFactory}.
-	 * <p>A custom invocation factory can add further context information
-	 * to the invocation, for example user credentials.
-	 */
-	public void setRemoteInvocationFactory(RemoteInvocationFactory remoteInvocationFactory) {
-		this.remoteInvocationFactory =
-				(remoteInvocationFactory != null ? remoteInvocationFactory : new DefaultRemoteInvocationFactory());
-	}
-
-	/**
-	 * Return the RemoteInvocationFactory used by this accessor.
-	 */
-	public RemoteInvocationFactory getRemoteInvocationFactory() {
-		return this.remoteInvocationFactory;
-	}
-
-	/**
-	 * Create a new RemoteInvocation object for the given AOP method invocation.
-	 * <p>The default implementation delegates to the configured
-	 * {@link #setRemoteInvocationFactory RemoteInvocationFactory}.
-	 * This can be overridden in subclasses in order to provide custom RemoteInvocation
-	 * subclasses, containing additional invocation parameters (e.g. user credentials).
-	 * <p>Note that it is preferable to build a custom RemoteInvocationFactory
-	 * as a reusable strategy, instead of overriding this method.
-	 * @param methodInvocation the current AOP method invocation
-	 * @return the RemoteInvocation object
-	 * @see RemoteInvocationFactory#createRemoteInvocation
-	 */
-	protected RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
-		return getRemoteInvocationFactory().createRemoteInvocation(methodInvocation);
-	}
-
-	/**
-	 * Recreate the invocation result contained in the given RemoteInvocationResult object.
-	 * <p>The default implementation calls the default {@code recreate()} method.
-	 * This can be overridden in subclass to provide custom recreation, potentially
-	 * processing the returned result object.
-	 * @param result the RemoteInvocationResult to recreate
-	 * @return a return value if the invocation result is a successful return
-	 * @throws Throwable if the invocation result is an exception
-	 * @see RemoteInvocationResult#recreate()
-	 */
-	@Nullable
-	protected Object recreateRemoteInvocationResult(RemoteInvocationResult result) throws Throwable {
-		return result.recreate();
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java
deleted file mode 100644
index a25aae4a7480..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedExporter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Abstract base class for remote service exporters that are based
- * on deserialization of {@link RemoteInvocation} objects.
- *
- * <p>Provides a "remoteInvocationExecutor" property, with a
- * {@link DefaultRemoteInvocationExecutor} as default strategy.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see RemoteInvocationExecutor
- * @see DefaultRemoteInvocationExecutor
- */
-public abstract class RemoteInvocationBasedExporter extends RemoteExporter {
-
-	private RemoteInvocationExecutor remoteInvocationExecutor = new DefaultRemoteInvocationExecutor();
-
-
-	/**
-	 * Set the RemoteInvocationExecutor to use for this exporter.
-	 * Default is a DefaultRemoteInvocationExecutor.
-	 * <p>A custom invocation executor can extract further context information
-	 * from the invocation, for example user credentials.
-	 */
-	public void setRemoteInvocationExecutor(RemoteInvocationExecutor remoteInvocationExecutor) {
-		this.remoteInvocationExecutor = remoteInvocationExecutor;
-	}
-
-	/**
-	 * Return the RemoteInvocationExecutor used by this exporter.
-	 */
-	public RemoteInvocationExecutor getRemoteInvocationExecutor() {
-		return this.remoteInvocationExecutor;
-	}
-
-
-	/**
-	 * Apply the given remote invocation to the given target object.
-	 * The default implementation delegates to the RemoteInvocationExecutor.
-	 * <p>Can be overridden in subclasses for custom invocation behavior,
-	 * possibly for applying additional invocation parameters from a
-	 * custom RemoteInvocation subclass. Note that it is preferable to use
-	 * a custom RemoteInvocationExecutor which is a reusable strategy.
-	 * @param invocation the remote invocation
-	 * @param targetObject the target object to apply the invocation to
-	 * @return the invocation result
-	 * @throws NoSuchMethodException if the method name could not be resolved
-	 * @throws IllegalAccessException if the method could not be accessed
-	 * @throws InvocationTargetException if the method invocation resulted in an exception
-	 * @see RemoteInvocationExecutor#invoke
-	 */
-	protected Object invoke(RemoteInvocation invocation, Object targetObject)
-			throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-
-		if (logger.isTraceEnabled()) {
-			logger.trace("Executing " + invocation);
-		}
-		try {
-			return getRemoteInvocationExecutor().invoke(invocation, targetObject);
-		}
-		catch (NoSuchMethodException ex) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Could not find target method for " + invocation, ex);
-			}
-			throw ex;
-		}
-		catch (IllegalAccessException ex) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Could not access target method for " + invocation, ex);
-			}
-			throw ex;
-		}
-		catch (InvocationTargetException ex) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Target method failed for " + invocation, ex.getTargetException());
-			}
-			throw ex;
-		}
-	}
-
-	/**
-	 * Apply the given remote invocation to the given target object, wrapping
-	 * the invocation result in a serializable RemoteInvocationResult object.
-	 * The default implementation creates a plain RemoteInvocationResult.
-	 * <p>Can be overridden in subclasses for custom invocation behavior,
-	 * for example to return additional context information. Note that this
-	 * is not covered by the RemoteInvocationExecutor strategy!
-	 * @param invocation the remote invocation
-	 * @param targetObject the target object to apply the invocation to
-	 * @return the invocation result
-	 * @see #invoke
-	 */
-	protected RemoteInvocationResult invokeAndCreateResult(RemoteInvocation invocation, Object targetObject) {
-		try {
-			Object value = invoke(invocation, targetObject);
-			return new RemoteInvocationResult(value);
-		}
-		catch (Throwable ex) {
-			return new RemoteInvocationResult(ex);
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java
deleted file mode 100644
index 02d456b3a4be..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationExecutor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2002-2007 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.remoting.support;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Strategy interface for executing a {@link RemoteInvocation} on a target object.
- *
- * <p>Used by {@link org.springframework.remoting.rmi.RmiServiceExporter} (for RMI invokers)
- * and by {@link org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter}.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see DefaultRemoteInvocationFactory
- * @see org.springframework.remoting.rmi.RmiServiceExporter#setRemoteInvocationExecutor
- * @see org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter#setRemoteInvocationExecutor
- */
-public interface RemoteInvocationExecutor {
-
-	/**
-	 * Perform this invocation on the given target object.
-	 * Typically called when a RemoteInvocation is received on the server.
-	 * @param invocation the RemoteInvocation
-	 * @param targetObject the target object to apply the invocation to
-	 * @return the invocation result
-	 * @throws NoSuchMethodException if the method name could not be resolved
-	 * @throws IllegalAccessException if the method could not be accessed
-	 * @throws InvocationTargetException if the method invocation resulted in an exception
-	 * @see java.lang.reflect.Method#invoke
-	 */
-	Object invoke(RemoteInvocation invocation, Object targetObject)
-			throws NoSuchMethodException, IllegalAccessException, InvocationTargetException;
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java
deleted file mode 100644
index 5fba21f81b6d..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2007 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.remoting.support;
-
-import org.aopalliance.intercept.MethodInvocation;
-
-/**
- * Strategy interface for creating a {@link RemoteInvocation} from an AOP Alliance
- * {@link org.aopalliance.intercept.MethodInvocation}.
- *
- * <p>Used by {@link org.springframework.remoting.rmi.RmiClientInterceptor} (for RMI invokers)
- * and by {@link org.springframework.remoting.httpinvoker.HttpInvokerClientInterceptor}.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see DefaultRemoteInvocationFactory
- * @see org.springframework.remoting.rmi.RmiClientInterceptor#setRemoteInvocationFactory
- * @see org.springframework.remoting.httpinvoker.HttpInvokerClientInterceptor#setRemoteInvocationFactory
- */
-public interface RemoteInvocationFactory {
-
-	/**
-	 * Create a serializable RemoteInvocation object from the given AOP
-	 * MethodInvocation.
-	 * <p>Can be implemented to add custom context information to the
-	 * remote invocation, for example user credentials.
-	 * @param methodInvocation the original AOP MethodInvocation object
-	 * @return the RemoteInvocation object
-	 */
-	RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation);
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
deleted file mode 100644
index 76de6b8b4a05..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Encapsulates a remote invocation result, holding a result value or an exception.
- * Used for HTTP-based serialization invokers.
- *
- * <p>This is an SPI class, typically not used directly by applications.
- * Can be subclassed for additional invocation parameters.
- *
- * <p>Both {@link RemoteInvocation} and {@link RemoteInvocationResult} are designed
- * for use with standard Java serialization as well as JavaBean-style serialization.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see RemoteInvocation
- */
-public class RemoteInvocationResult implements Serializable {
-
-	/** Use serialVersionUID from Spring 1.1 for interoperability. */
-	private static final long serialVersionUID = 2138555143707773549L;
-
-
-	@Nullable
-	private Object value;
-
-	@Nullable
-	private Throwable exception;
-
-
-	/**
-	 * Create a new RemoteInvocationResult for the given result value.
-	 * @param value the result value returned by a successful invocation
-	 * of the target method
-	 */
-	public RemoteInvocationResult(@Nullable Object value) {
-		this.value = value;
-	}
-
-	/**
-	 * Create a new RemoteInvocationResult for the given exception.
-	 * @param exception the exception thrown by an unsuccessful invocation
-	 * of the target method
-	 */
-	public RemoteInvocationResult(@Nullable Throwable exception) {
-		this.exception = exception;
-	}
-
-	/**
-	 * Create a new RemoteInvocationResult for JavaBean-style deserialization
-	 * (e.g. with Jackson).
-	 * @see #setValue
-	 * @see #setException
-	 */
-	public RemoteInvocationResult() {
-	}
-
-
-	/**
-	 * Set the result value returned by a successful invocation of the
-	 * target method, if any.
-	 * <p>This setter is intended for JavaBean-style deserialization.
-	 * Use {@link #RemoteInvocationResult(Object)} otherwise.
-	 * @see #RemoteInvocationResult()
-	 */
-	public void setValue(@Nullable Object value) {
-		this.value = value;
-	}
-
-	/**
-	 * Return the result value returned by a successful invocation
-	 * of the target method, if any.
-	 * @see #hasException
-	 */
-	@Nullable
-	public Object getValue() {
-		return this.value;
-	}
-
-	/**
-	 * Set the exception thrown by an unsuccessful invocation of the
-	 * target method, if any.
-	 * <p>This setter is intended for JavaBean-style deserialization.
-	 * Use {@link #RemoteInvocationResult(Throwable)} otherwise.
-	 * @see #RemoteInvocationResult()
-	 */
-	public void setException(@Nullable Throwable exception) {
-		this.exception = exception;
-	}
-
-	/**
-	 * Return the exception thrown by an unsuccessful invocation
-	 * of the target method, if any.
-	 * @see #hasException
-	 */
-	@Nullable
-	public Throwable getException() {
-		return this.exception;
-	}
-
-	/**
-	 * Return whether this invocation result holds an exception.
-	 * If this returns {@code false}, the result value applies
-	 * (even if it is {@code null}).
-	 * @see #getValue
-	 * @see #getException
-	 */
-	public boolean hasException() {
-		return (this.exception != null);
-	}
-
-	/**
-	 * Return whether this invocation result holds an InvocationTargetException,
-	 * thrown by an invocation of the target method itself.
-	 * @see #hasException()
-	 */
-	public boolean hasInvocationTargetException() {
-		return (this.exception instanceof InvocationTargetException);
-	}
-
-
-	/**
-	 * Recreate the invocation result, either returning the result value
-	 * in case of a successful invocation of the target method, or
-	 * rethrowing the exception thrown by the target method.
-	 * @return the result value, if any
-	 * @throws Throwable the exception, if any
-	 */
-	@Nullable
-	public Object recreate() throws Throwable {
-		if (this.exception != null) {
-			Throwable exToThrow = this.exception;
-			if (this.exception instanceof InvocationTargetException) {
-				exToThrow = ((InvocationTargetException) this.exception).getTargetException();
-			}
-			RemoteInvocationUtils.fillInClientStackTraceIfPossible(exToThrow);
-			throw exToThrow;
-		}
-		else {
-			return this.value;
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
deleted file mode 100644
index 2d5dc8e39202..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import java.lang.reflect.Method;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-/**
- * AOP Alliance MethodInterceptor for tracing remote invocations.
- * Automatically applied by RemoteExporter and its subclasses.
- *
- * <p>Logs an incoming remote call as well as the finished processing of a remote call
- * at DEBUG level. If the processing of a remote call results in a checked exception,
- * the exception will get logged at INFO level; if it results in an unchecked
- * exception (or error), the exception will get logged at WARN level.
- *
- * <p>The logging of exceptions is particularly useful to save the stacktrace
- * information on the server-side rather than just propagating the exception
- * to the client (who might or might not log it properly).
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see RemoteExporter#setRegisterTraceInterceptor
- * @see RemoteExporter#getProxyForService
- */
-public class RemoteInvocationTraceInterceptor implements MethodInterceptor {
-
-	protected static final Log logger = LogFactory.getLog(RemoteInvocationTraceInterceptor.class);
-
-	private final String exporterNameClause;
-
-
-	/**
-	 * Create a new RemoteInvocationTraceInterceptor.
-	 */
-	public RemoteInvocationTraceInterceptor() {
-		this.exporterNameClause = "";
-	}
-
-	/**
-	 * Create a new RemoteInvocationTraceInterceptor.
-	 * @param exporterName the name of the remote exporter
-	 * (to be used as context information in log messages)
-	 */
-	public RemoteInvocationTraceInterceptor(String exporterName) {
-		this.exporterNameClause = exporterName + " ";
-	}
-
-
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		Method method = invocation.getMethod();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Incoming " + this.exporterNameClause + "remote call: " +
-					ClassUtils.getQualifiedMethodName(method));
-		}
-		try {
-			Object retVal = invocation.proceed();
-			if (logger.isDebugEnabled()) {
-				logger.debug("Finished processing of " + this.exporterNameClause + "remote call: " +
-						ClassUtils.getQualifiedMethodName(method));
-			}
-			return retVal;
-		}
-		catch (Throwable ex) {
-			if (ex instanceof RuntimeException || ex instanceof Error) {
-				if (logger.isWarnEnabled()) {
-					logger.warn("Processing of " + this.exporterNameClause + "remote call resulted in fatal exception: " +
-							ClassUtils.getQualifiedMethodName(method), ex);
-				}
-			}
-			else {
-				if (logger.isInfoEnabled()) {
-					logger.info("Processing of " + this.exporterNameClause + "remote call resulted in exception: " +
-							ClassUtils.getQualifiedMethodName(method), ex);
-				}
-			}
-			throw ex;
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
deleted file mode 100644
index 612b73c2e966..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * General utilities for handling remote invocations.
- *
- * <p>Mainly intended for use within the remoting framework.
- *
- * @author Juergen Hoeller
- * @since 2.0
- */
-public abstract class RemoteInvocationUtils {
-
-	/**
-	 * Fill the current client-side stack trace into the given exception.
-	 * <p>The given exception is typically thrown on the server and serialized
-	 * as-is, with the client wanting it to contain the client-side portion
-	 * of the stack trace as well. What we can do here is to update the
-	 * {@code StackTraceElement} array with the current client-side stack
-	 * trace, provided that we run on JDK 1.4+.
-	 * @param ex the exception to update
-	 * @see Throwable#getStackTrace()
-	 * @see Throwable#setStackTrace(StackTraceElement[])
-	 */
-	public static void fillInClientStackTraceIfPossible(Throwable ex) {
-		if (ex != null) {
-			StackTraceElement[] clientStack = new Throwable().getStackTrace();
-			Set<Throwable> visitedExceptions = new HashSet<>();
-			Throwable exToUpdate = ex;
-			while (exToUpdate != null && !visitedExceptions.contains(exToUpdate)) {
-				StackTraceElement[] serverStack = exToUpdate.getStackTrace();
-				StackTraceElement[] combinedStack = new StackTraceElement[serverStack.length + clientStack.length];
-				System.arraycopy(serverStack, 0, combinedStack, 0, serverStack.length);
-				System.arraycopy(clientStack, 0, combinedStack, serverStack.length, clientStack.length);
-				exToUpdate.setStackTrace(combinedStack);
-				visitedExceptions.add(exToUpdate);
-				exToUpdate = exToUpdate.getCause();
-			}
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
deleted file mode 100644
index 51acfdf4f4d7..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-/**
- * Generic support base class for remote accessor and exporters,
- * providing common bean ClassLoader handling.
- *
- * @author Juergen Hoeller
- * @since 2.5.2
- */
-public abstract class RemotingSupport implements BeanClassLoaderAware {
-
-	/** Logger available to subclasses. */
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
-
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
-	}
-
-	/**
-	 * Return the ClassLoader that this accessor operates in,
-	 * to be used for deserializing and for generating proxies.
-	 */
-	protected ClassLoader getBeanClassLoader() {
-		return this.beanClassLoader;
-	}
-
-
-	/**
-	 * Override the thread context ClassLoader with the environment's bean ClassLoader
-	 * if necessary, i.e. if the bean ClassLoader is not equivalent to the thread
-	 * context ClassLoader already.
-	 * @return the original thread context ClassLoader, or {@code null} if not overridden
-	 */
-	@Nullable
-	protected ClassLoader overrideThreadContextClassLoader() {
-		return ClassUtils.overrideThreadContextClassLoader(getBeanClassLoader());
-	}
-
-	/**
-	 * Reset the original thread context ClassLoader if necessary.
-	 * @param original the original thread context ClassLoader,
-	 * or {@code null} if not overridden (and hence nothing to reset)
-	 */
-	protected void resetThreadContextClassLoader(@Nullable ClassLoader original) {
-		if (original != null) {
-			Thread.currentThread().setContextClassLoader(original);
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
deleted file mode 100644
index f72fb9fdba8e..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executor;
-
-import com.sun.net.httpserver.Authenticator;
-import com.sun.net.httpserver.Filter;
-import com.sun.net.httpserver.HttpContext;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * {@link org.springframework.beans.factory.FactoryBean} that creates a simple
- * HTTP server, based on the HTTP server that is included in Sun's JRE 1.6.
- * Starts the HTTP server on initialization and stops it on destruction.
- * Exposes the resulting {@link com.sun.net.httpserver.HttpServer} object.
- *
- * <p>Allows for registering {@link com.sun.net.httpserver.HttpHandler HttpHandlers}
- * for specific {@link #setContexts context paths}. Alternatively,
- * register such context-specific handlers programmatically on the
- * {@link com.sun.net.httpserver.HttpServer} itself.
- *
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @since 2.5.1
- * @see #setPort
- * @see #setContexts
- * @deprecated as of Spring Framework 5.1, in favor of embedded Tomcat/Jetty/Undertow
- */
-@Deprecated
-@org.springframework.lang.UsesSunHttpServer
-public class SimpleHttpServerFactoryBean implements FactoryBean<HttpServer>, InitializingBean, DisposableBean {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private int port = 8080;
-
-	private String hostname;
-
-	private int backlog = -1;
-
-	private int shutdownDelay = 0;
-
-	private Executor executor;
-
-	private Map<String, HttpHandler> contexts;
-
-	private List<Filter> filters;
-
-	private Authenticator authenticator;
-
-	private HttpServer server;
-
-
-	/**
-	 * Specify the HTTP server's port. Default is 8080.
-	 */
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	/**
-	 * Specify the HTTP server's hostname to bind to. Default is localhost;
-	 * can be overridden with a specific network address to bind to.
-	 */
-	public void setHostname(String hostname) {
-		this.hostname = hostname;
-	}
-
-	/**
-	 * Specify the HTTP server's TCP backlog. Default is -1,
-	 * indicating the system's default value.
-	 */
-	public void setBacklog(int backlog) {
-		this.backlog = backlog;
-	}
-
-	/**
-	 * Specify the number of seconds to wait until HTTP exchanges have
-	 * completed when shutting down the HTTP server. Default is 0.
-	 */
-	public void setShutdownDelay(int shutdownDelay) {
-		this.shutdownDelay = shutdownDelay;
-	}
-
-	/**
-	 * Set the JDK concurrent executor to use for dispatching incoming requests.
-	 * @see com.sun.net.httpserver.HttpServer#setExecutor
-	 */
-	public void setExecutor(Executor executor) {
-		this.executor = executor;
-	}
-
-	/**
-	 * Register {@link com.sun.net.httpserver.HttpHandler HttpHandlers}
-	 * for specific context paths.
-	 * @param contexts a Map with context paths as keys and HttpHandler
-	 * objects as values
-	 * @see org.springframework.remoting.httpinvoker.SimpleHttpInvokerServiceExporter
-	 * @see org.springframework.remoting.caucho.SimpleHessianServiceExporter
-	 */
-	public void setContexts(Map<String, HttpHandler> contexts) {
-		this.contexts = contexts;
-	}
-
-	/**
-	 * Register common {@link com.sun.net.httpserver.Filter Filters} to be
-	 * applied to all locally registered {@link #setContexts contexts}.
-	 */
-	public void setFilters(List<Filter> filters) {
-		this.filters = filters;
-	}
-
-	/**
-	 * Register a common {@link com.sun.net.httpserver.Authenticator} to be
-	 * applied to all locally registered {@link #setContexts contexts}.
-	 */
-	public void setAuthenticator(Authenticator authenticator) {
-		this.authenticator = authenticator;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws IOException {
-		InetSocketAddress address = (this.hostname != null ?
-				new InetSocketAddress(this.hostname, this.port) : new InetSocketAddress(this.port));
-		this.server = HttpServer.create(address, this.backlog);
-		if (this.executor != null) {
-			this.server.setExecutor(this.executor);
-		}
-		if (this.contexts != null) {
-			this.contexts.forEach((key, context) -> {
-				HttpContext httpContext = this.server.createContext(key, context);
-				if (this.filters != null) {
-					httpContext.getFilters().addAll(this.filters);
-				}
-				if (this.authenticator != null) {
-					httpContext.setAuthenticator(this.authenticator);
-				}
-			});
-		}
-		if (logger.isInfoEnabled()) {
-			logger.info("Starting HttpServer at address " + address);
-		}
-		this.server.start();
-	}
-
-	@Override
-	public HttpServer getObject() {
-		return this.server;
-	}
-
-	@Override
-	public Class<? extends HttpServer> getObjectType() {
-		return (this.server != null ? this.server.getClass() : HttpServer.class);
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-	@Override
-	public void destroy() {
-		logger.info("Stopping HttpServer");
-		this.server.stop(this.shutdownDelay);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
deleted file mode 100644
index 93c65ac220e6..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * Abstract base class for classes that access remote services via URLs.
- * Provides a "serviceUrl" bean property, which is considered as required.
- *
- * @author Juergen Hoeller
- * @since 15.12.2003
- */
-public abstract class UrlBasedRemoteAccessor extends RemoteAccessor implements InitializingBean {
-
-	private String serviceUrl;
-
-
-	/**
-	 * Set the URL of this remote accessor's target service.
-	 * The URL must be compatible with the rules of the particular remoting provider.
-	 */
-	public void setServiceUrl(String serviceUrl) {
-		this.serviceUrl = serviceUrl;
-	}
-
-	/**
-	 * Return the URL of this remote accessor's target service.
-	 */
-	public String getServiceUrl() {
-		return this.serviceUrl;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		if (getServiceUrl() == null) {
-			throw new IllegalArgumentException("Property 'serviceUrl' is required");
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/package-info.java b/spring-context/src/main/java/org/springframework/remoting/support/package-info.java
deleted file mode 100644
index 316306149a2b..000000000000
--- a/spring-context/src/main/java/org/springframework/remoting/support/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Generic support classes for remoting implementations.
- * Provides abstract base classes for remote proxy factories.
- */
-package org.springframework.remoting.support;
diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
deleted file mode 100644
index 82780251a59d..000000000000
--- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * 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.
- * 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.remoting.rmi;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.rmi.ConnectException;
-import java.rmi.ConnectIOException;
-import java.rmi.MarshalException;
-import java.rmi.NoSuchObjectException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.StubNotFoundException;
-import java.rmi.UnknownHostException;
-import java.rmi.UnmarshalException;
-
-import org.aopalliance.intercept.MethodInvocation;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteProxyFailureException;
-import org.springframework.remoting.support.RemoteInvocation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-
-/**
- * @author Juergen Hoeller
- * @since 16.05.2003
- */
-public class RmiSupportTests {
-
-	@Test
-	public void rmiProxyFactoryBean() throws Exception {
-		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
-		factory.setServiceInterface(IRemoteBean.class);
-		factory.setServiceUrl("rmi://localhost:1090/test");
-		factory.afterPropertiesSet();
-		assertThat(factory.isSingleton()).as("Correct singleton value").isTrue();
-		boolean condition = factory.getObject() instanceof IRemoteBean;
-		assertThat(condition).isTrue();
-		IRemoteBean proxy = (IRemoteBean) factory.getObject();
-		proxy.setName("myName");
-		assertThat(RemoteBean.name).isEqualTo("myName");
-		assertThat(factory.counter).isEqualTo(1);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithRemoteException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(RemoteException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithConnectException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(ConnectException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithConnectIOException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(ConnectIOException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithUnknownHostException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(UnknownHostException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithNoSuchObjectException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(NoSuchObjectException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithStubNotFoundException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(StubNotFoundException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithMarshalException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(MarshalException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithUnmarshalException() throws Exception {
-		doTestRmiProxyFactoryBeanWithException(UnmarshalException.class);
-	}
-
-	private void doTestRmiProxyFactoryBeanWithException(Class<? extends Throwable> exceptionClass) throws Exception {
-		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
-		factory.setServiceInterface(IRemoteBean.class);
-		factory.setServiceUrl("rmi://localhost:1090/test");
-		factory.afterPropertiesSet();
-		boolean condition = factory.getObject() instanceof IRemoteBean;
-		assertThat(condition).isTrue();
-		IRemoteBean proxy = (IRemoteBean) factory.getObject();
-		assertThatExceptionOfType(exceptionClass).isThrownBy(() ->
-				proxy.setName(exceptionClass.getName()));
-		assertThat(factory.counter).isEqualTo(1);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithConnectExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithExceptionAndRefresh(ConnectException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithConnectIOExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithExceptionAndRefresh(ConnectIOException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithUnknownHostExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithExceptionAndRefresh(UnknownHostException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithNoSuchObjectExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithExceptionAndRefresh(NoSuchObjectException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithStubNotFoundExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithExceptionAndRefresh(StubNotFoundException.class);
-	}
-
-	private void doTestRmiProxyFactoryBeanWithExceptionAndRefresh(Class<? extends Throwable> exceptionClass) throws Exception {
-		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
-		factory.setServiceInterface(IRemoteBean.class);
-		factory.setServiceUrl("rmi://localhost:1090/test");
-		factory.setRefreshStubOnConnectFailure(true);
-		factory.afterPropertiesSet();
-		boolean condition = factory.getObject() instanceof IRemoteBean;
-		assertThat(condition).isTrue();
-		IRemoteBean proxy = (IRemoteBean) factory.getObject();
-		assertThatExceptionOfType(exceptionClass).isThrownBy(() ->
-				proxy.setName(exceptionClass.getName()));
-		assertThat(factory.counter).isEqualTo(2);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterface() throws Exception {
-		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
-		factory.setServiceInterface(IBusinessBean.class);
-		factory.setServiceUrl("rmi://localhost:1090/test");
-		factory.afterPropertiesSet();
-		boolean condition = factory.getObject() instanceof IBusinessBean;
-		assertThat(condition).isTrue();
-		IBusinessBean proxy = (IBusinessBean) factory.getObject();
-		boolean condition1 = proxy instanceof IRemoteBean;
-		assertThat(condition1).isFalse();
-		proxy.setName("myName");
-		assertThat(RemoteBean.name).isEqualTo("myName");
-		assertThat(factory.counter).isEqualTo(1);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithWrongBusinessInterface() throws Exception {
-		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
-		factory.setServiceInterface(IWrongBusinessBean.class);
-		factory.setServiceUrl("rmi://localhost:1090/test");
-		factory.afterPropertiesSet();
-		boolean condition = factory.getObject() instanceof IWrongBusinessBean;
-		assertThat(condition).isTrue();
-		IWrongBusinessBean proxy = (IWrongBusinessBean) factory.getObject();
-		boolean condition1 = proxy instanceof IRemoteBean;
-		assertThat(condition1).isFalse();
-		assertThatExceptionOfType(RemoteProxyFailureException.class).isThrownBy(() ->
-				proxy.setOtherName("name"))
-			.withCauseInstanceOf(NoSuchMethodException.class)
-			.withMessageContaining("setOtherName")
-			.withMessageContaining("IWrongBusinessBean");
-		assertThat(factory.counter).isEqualTo(1);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndRemoteException() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-				RemoteException.class, RemoteAccessException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndConnectException() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-				ConnectException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndConnectIOException() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-				ConnectIOException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndUnknownHostException() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-				UnknownHostException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndNoSuchObjectExceptionException() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-				NoSuchObjectException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndStubNotFoundException() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-				StubNotFoundException.class, RemoteConnectFailureException.class);
-	}
-
-	private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-			Class<?> rmiExceptionClass, Class<? extends Throwable> springExceptionClass) throws Exception {
-
-		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
-		factory.setServiceInterface(IBusinessBean.class);
-		factory.setServiceUrl("rmi://localhost:1090/test");
-		factory.afterPropertiesSet();
-		boolean condition = factory.getObject() instanceof IBusinessBean;
-		assertThat(condition).isTrue();
-		IBusinessBean proxy = (IBusinessBean) factory.getObject();
-		boolean condition1 = proxy instanceof IRemoteBean;
-		assertThat(condition1).isFalse();
-		assertThatExceptionOfType(springExceptionClass).isThrownBy(() ->
-				proxy.setName(rmiExceptionClass.getName()));
-		assertThat(factory.counter).isEqualTo(1);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndRemoteExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-				RemoteException.class, RemoteAccessException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndConnectExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-				ConnectException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndConnectIOExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-				ConnectIOException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndUnknownHostExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-				UnknownHostException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndNoSuchObjectExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-				NoSuchObjectException.class, RemoteConnectFailureException.class);
-	}
-
-	@Test
-	public void rmiProxyFactoryBeanWithBusinessInterfaceAndStubNotFoundExceptionAndRefresh() throws Exception {
-		doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-				StubNotFoundException.class, RemoteConnectFailureException.class);
-	}
-
-	private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-			Class<?> rmiExceptionClass, Class<? extends Throwable> springExceptionClass) throws Exception {
-
-		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
-		factory.setServiceInterface(IBusinessBean.class);
-		factory.setServiceUrl("rmi://localhost:1090/test");
-		factory.setRefreshStubOnConnectFailure(true);
-		factory.afterPropertiesSet();
-		boolean condition = factory.getObject() instanceof IBusinessBean;
-		assertThat(condition).isTrue();
-		IBusinessBean proxy = (IBusinessBean) factory.getObject();
-		boolean condition1 = proxy instanceof IRemoteBean;
-		assertThat(condition1).isFalse();
-		assertThatExceptionOfType(springExceptionClass).isThrownBy(() ->
-				proxy.setName(rmiExceptionClass.getName()));
-		boolean isRemoteConnectFailure = RemoteConnectFailureException.class.isAssignableFrom(springExceptionClass);
-		assertThat(factory.counter).isEqualTo(isRemoteConnectFailure ? 2 : 1);
-	}
-
-	@Test
-	public void rmiClientInterceptorRequiresUrl() throws Exception{
-		RmiClientInterceptor client = new RmiClientInterceptor();
-		client.setServiceInterface(IRemoteBean.class);
-		assertThatIllegalArgumentException().isThrownBy(client::afterPropertiesSet);
-	}
-
-	@Test
-	public void remoteInvocation() throws NoSuchMethodException {
-		// let's see if the remote invocation object works
-
-		final RemoteBean rb = new RemoteBean();
-		final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", String.class);
-
-		MethodInvocation mi = new MethodInvocation() {
-			@Override
-			public Method getMethod() {
-				return setNameMethod;
-			}
-			@Override
-			public Object[] getArguments() {
-				return new Object[] {"bla"};
-			}
-			@Override
-			public Object proceed() throws Throwable {
-				throw new UnsupportedOperationException();
-			}
-			@Override
-			public Object getThis() {
-				return rb;
-			}
-			@Override
-			public AccessibleObject getStaticPart() {
-				return setNameMethod;
-			}
-		};
-
-		RemoteInvocation inv = new RemoteInvocation(mi);
-
-		assertThat(inv.getMethodName()).isEqualTo("setName");
-		assertThat(inv.getArguments()[0]).isEqualTo("bla");
-		assertThat(inv.getParameterTypes()[0]).isEqualTo(String.class);
-
-		// this is a bit BS, but we need to test it
-		inv = new RemoteInvocation();
-		inv.setArguments(new Object[] { "bla" });
-		assertThat(inv.getArguments()[0]).isEqualTo("bla");
-		inv.setMethodName("setName");
-		assertThat(inv.getMethodName()).isEqualTo("setName");
-		inv.setParameterTypes(new Class<?>[] {String.class});
-		assertThat(inv.getParameterTypes()[0]).isEqualTo(String.class);
-
-		inv = new RemoteInvocation("setName", new Class<?>[] {String.class}, new Object[] {"bla"});
-		assertThat(inv.getArguments()[0]).isEqualTo("bla");
-		assertThat(inv.getMethodName()).isEqualTo("setName");
-		assertThat(inv.getParameterTypes()[0]).isEqualTo(String.class);
-	}
-
-	@Test
-	public void rmiInvokerWithSpecialLocalMethods() throws Exception {
-		String serviceUrl = "rmi://localhost:1090/test";
-		RmiProxyFactoryBean factory = new RmiProxyFactoryBean() {
-			@Override
-			protected Remote lookupStub() {
-				return new RmiInvocationHandler() {
-					@Override
-					public String getTargetInterfaceName() {
-						return null;
-					}
-					@Override
-					public Object invoke(RemoteInvocation invocation) throws RemoteException {
-						throw new RemoteException();
-					}
-				};
-			}
-		};
-		factory.setServiceInterface(IBusinessBean.class);
-		factory.setServiceUrl(serviceUrl);
-		factory.afterPropertiesSet();
-		IBusinessBean proxy = (IBusinessBean) factory.getObject();
-
-		// shouldn't go through to remote service
-		assertThat(proxy.toString().contains("RMI invoker")).isTrue();
-		assertThat(proxy.toString().contains(serviceUrl)).isTrue();
-		assertThat(proxy.hashCode()).isEqualTo(proxy.hashCode());
-		assertThat(proxy.equals(proxy)).isTrue();
-
-		// should go through
-		assertThatExceptionOfType(RemoteAccessException.class).isThrownBy(() ->
-				proxy.setName("test"));
-	}
-
-
-	private static class CountingRmiProxyFactoryBean extends RmiProxyFactoryBean {
-
-		private int counter = 0;
-
-		@Override
-		protected Remote lookupStub() {
-			counter++;
-			return new RemoteBean();
-		}
-	}
-
-
-	public interface IBusinessBean {
-
-		void setName(String name);
-	}
-
-
-	public interface IWrongBusinessBean {
-
-		void setOtherName(String name);
-	}
-
-
-	public interface IRemoteBean extends Remote {
-
-		void setName(String name) throws RemoteException;
-	}
-
-
-	public static class RemoteBean implements IRemoteBean {
-
-		private static String name;
-
-		@Override
-		public void setName(String nam) throws RemoteException {
-			if (nam != null && nam.endsWith("Exception")) {
-				RemoteException rex;
-				try {
-					Class<?> exClass = Class.forName(nam);
-					Constructor<?> ctor = exClass.getConstructor(String.class);
-					rex = (RemoteException) ctor.newInstance("myMessage");
-				}
-				catch (Exception ex) {
-					throw new RemoteException("Illegal exception class name: " + nam, ex);
-				}
-				throw rex;
-			}
-			name = nam;
-		}
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java b/spring-context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
deleted file mode 100644
index dbaa7a429447..000000000000
--- a/spring-context/src/test/java/org/springframework/remoting/support/RemoteInvocationUtilsTests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- * 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.remoting.support;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Rick Evans
- */
-public class RemoteInvocationUtilsTests {
-
-	@Test
-	public void fillInClientStackTraceIfPossibleSunnyDay() throws Exception {
-		try {
-			throw new IllegalStateException("Mmm");
-		}
-		catch (Exception ex) {
-			int originalStackTraceLngth = ex.getStackTrace().length;
-			RemoteInvocationUtils.fillInClientStackTraceIfPossible(ex);
-			assertThat(ex.getStackTrace().length > originalStackTraceLngth).as("Stack trace not being filled in").isTrue();
-		}
-	}
-
-	@Test
-	public void fillInClientStackTraceIfPossibleWithNullThrowable() throws Exception {
-		// just want to ensure that it doesn't bomb
-		RemoteInvocationUtils.fillInClientStackTraceIfPossible(null);
-	}
-
-}
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
deleted file mode 100644
index 04566b4109e8..000000000000
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * 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.
- * 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.jms.remoting;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageFormatException;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jms.connection.ConnectionFactoryUtils;
-import org.springframework.jms.support.JmsUtils;
-import org.springframework.jms.support.converter.MessageConverter;
-import org.springframework.jms.support.converter.SimpleMessageConverter;
-import org.springframework.jms.support.destination.DestinationResolver;
-import org.springframework.jms.support.destination.DynamicDestinationResolver;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.remoting.RemoteInvocationFailureException;
-import org.springframework.remoting.RemoteTimeoutException;
-import org.springframework.remoting.support.DefaultRemoteInvocationFactory;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationFactory;
-import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.aopalliance.intercept.MethodInterceptor} for accessing a
- * JMS-based remote service.
- *
- * <p>Serializes remote invocation objects and deserializes remote invocation
- * result objects. Uses Java serialization just like RMI, but with the JMS
- * provider as communication infrastructure.
- *
- * <p>To be configured with a {@link javax.jms.QueueConnectionFactory} and a
- * target queue (either as {@link javax.jms.Queue} reference or as queue name).
- *
- * <p>Thanks to James Strachan for the original prototype that this
- * JMS invoker mechanism was inspired by!
- *
- * @author Juergen Hoeller
- * @author James Strachan
- * @author Stephane Nicoll
- * @since 2.0
- * @see #setConnectionFactory
- * @see #setQueue
- * @see #setQueueName
- * @see org.springframework.jms.remoting.JmsInvokerServiceExporter
- * @see org.springframework.jms.remoting.JmsInvokerProxyFactoryBean
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class JmsInvokerClientInterceptor implements MethodInterceptor, InitializingBean {
-
-	@Nullable
-	private ConnectionFactory connectionFactory;
-
-	@Nullable
-	private Object queue;
-
-	private DestinationResolver destinationResolver = new DynamicDestinationResolver();
-
-	private RemoteInvocationFactory remoteInvocationFactory = new DefaultRemoteInvocationFactory();
-
-	private MessageConverter messageConverter = new SimpleMessageConverter();
-
-	private long receiveTimeout = 0;
-
-
-	/**
-	 * Set the QueueConnectionFactory to use for obtaining JMS QueueConnections.
-	 */
-	public void setConnectionFactory(@Nullable ConnectionFactory connectionFactory) {
-		this.connectionFactory = connectionFactory;
-	}
-
-	/**
-	 * Return the QueueConnectionFactory to use for obtaining JMS QueueConnections.
-	 */
-	@Nullable
-	protected ConnectionFactory getConnectionFactory() {
-		return this.connectionFactory;
-	}
-
-	/**
-	 * Set the target Queue to send invoker requests to.
-	 */
-	public void setQueue(Queue queue) {
-		this.queue = queue;
-	}
-
-	/**
-	 * Set the name of target queue to send invoker requests to.
-	 * <p>The specified name will be dynamically resolved via the
-	 * {@link #setDestinationResolver DestinationResolver}.
-	 */
-	public void setQueueName(String queueName) {
-		this.queue = queueName;
-	}
-
-	/**
-	 * Set the DestinationResolver that is to be used to resolve Queue
-	 * references for this accessor.
-	 * <p>The default resolver is a {@code DynamicDestinationResolver}. Specify a
-	 * {@code JndiDestinationResolver} for resolving destination names as JNDI locations.
-	 * @see org.springframework.jms.support.destination.DynamicDestinationResolver
-	 * @see org.springframework.jms.support.destination.JndiDestinationResolver
-	 */
-	public void setDestinationResolver(@Nullable DestinationResolver destinationResolver) {
-		this.destinationResolver =
-				(destinationResolver != null ? destinationResolver : new DynamicDestinationResolver());
-	}
-
-	/**
-	 * Set the {@link RemoteInvocationFactory} to use for this accessor.
-	 * <p>Default is a {@link DefaultRemoteInvocationFactory}.
-	 * <p>A custom invocation factory can add further context information
-	 * to the invocation, for example user credentials.
-	 */
-	public void setRemoteInvocationFactory(@Nullable RemoteInvocationFactory remoteInvocationFactory) {
-		this.remoteInvocationFactory =
-				(remoteInvocationFactory != null ? remoteInvocationFactory : new DefaultRemoteInvocationFactory());
-	}
-
-	/**
-	 * Specify the {@link MessageConverter} to use for turning
-	 * {@link org.springframework.remoting.support.RemoteInvocation}
-	 * objects into request messages, as well as response messages into
-	 * {@link org.springframework.remoting.support.RemoteInvocationResult} objects.
-	 * <p>Default is a {@link SimpleMessageConverter}, using a standard JMS
-	 * {@link javax.jms.ObjectMessage} for each invocation / invocation result
-	 * object.
-	 * <p>Custom implementations may generally adapt {@link java.io.Serializable}
-	 * objects into special kinds of messages, or might be specifically tailored for
-	 * translating {@code RemoteInvocation(Result)s} into specific kinds of messages.
-	 */
-	public void setMessageConverter(@Nullable MessageConverter messageConverter) {
-		this.messageConverter = (messageConverter != null ? messageConverter : new SimpleMessageConverter());
-	}
-
-	/**
-	 * Set the timeout to use for receiving the response message for a request
-	 * (in milliseconds).
-	 * <p>The default is 0, which indicates a blocking receive without timeout.
-	 * @see javax.jms.MessageConsumer#receive(long)
-	 * @see javax.jms.MessageConsumer#receive()
-	 */
-	public void setReceiveTimeout(long receiveTimeout) {
-		this.receiveTimeout = receiveTimeout;
-	}
-
-	/**
-	 * Return the timeout to use for receiving the response message for a request
-	 * (in milliseconds).
-	 */
-	protected long getReceiveTimeout() {
-		return this.receiveTimeout;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		if (getConnectionFactory() == null) {
-			throw new IllegalArgumentException("Property 'connectionFactory' is required");
-		}
-		if (this.queue == null) {
-			throw new IllegalArgumentException("'queue' or 'queueName' is required");
-		}
-	}
-
-
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
-			return "JMS invoker proxy for queue [" + this.queue + "]";
-		}
-
-		RemoteInvocation invocation = createRemoteInvocation(methodInvocation);
-		RemoteInvocationResult result;
-		try {
-			result = executeRequest(invocation);
-		}
-		catch (JMSException ex) {
-			throw convertJmsInvokerAccessException(ex);
-		}
-		try {
-			return recreateRemoteInvocationResult(result);
-		}
-		catch (Throwable ex) {
-			if (result.hasInvocationTargetException()) {
-				throw ex;
-			}
-			else {
-				throw new RemoteInvocationFailureException("Invocation of method [" + methodInvocation.getMethod() +
-						"] failed in JMS invoker remote service at queue [" + this.queue + "]", ex);
-			}
-		}
-	}
-
-	/**
-	 * Create a new {@code RemoteInvocation} object for the given AOP method invocation.
-	 * <p>The default implementation delegates to the {@link RemoteInvocationFactory}.
-	 * <p>Can be overridden in subclasses to provide custom {@code RemoteInvocation}
-	 * subclasses, containing additional invocation parameters like user credentials.
-	 * Note that it is preferable to use a custom {@code RemoteInvocationFactory} which
-	 * is a reusable strategy.
-	 * @param methodInvocation the current AOP method invocation
-	 * @return the RemoteInvocation object
-	 * @see RemoteInvocationFactory#createRemoteInvocation
-	 */
-	protected RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
-		return this.remoteInvocationFactory.createRemoteInvocation(methodInvocation);
-	}
-
-	/**
-	 * Execute the given remote invocation, sending an invoker request message
-	 * to this accessor's target queue and waiting for a corresponding response.
-	 * @param invocation the RemoteInvocation to execute
-	 * @return the RemoteInvocationResult object
-	 * @throws JMSException in case of JMS failure
-	 * @see #doExecuteRequest
-	 */
-	protected RemoteInvocationResult executeRequest(RemoteInvocation invocation) throws JMSException {
-		Connection con = createConnection();
-		Session session = null;
-		try {
-			session = createSession(con);
-			Queue queueToUse = resolveQueue(session);
-			Message requestMessage = createRequestMessage(session, invocation);
-			con.start();
-			Message responseMessage = doExecuteRequest(session, queueToUse, requestMessage);
-			if (responseMessage != null) {
-				return extractInvocationResult(responseMessage);
-			}
-			else {
-				return onReceiveTimeout(invocation);
-			}
-		}
-		finally {
-			JmsUtils.closeSession(session);
-			ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory(), true);
-		}
-	}
-
-	/**
-	 * Create a new JMS Connection for this JMS invoker.
-	 */
-	protected Connection createConnection() throws JMSException {
-		ConnectionFactory connectionFactory = getConnectionFactory();
-		Assert.state(connectionFactory != null, "No ConnectionFactory set");
-		return connectionFactory.createConnection();
-	}
-
-	/**
-	 * Create a new JMS Session for this JMS invoker.
-	 */
-	protected Session createSession(Connection con) throws JMSException {
-		return con.createSession(false, Session.AUTO_ACKNOWLEDGE);
-	}
-
-	/**
-	 * Resolve this accessor's target queue.
-	 * @param session the current JMS Session
-	 * @return the resolved target Queue
-	 * @throws JMSException if resolution failed
-	 */
-	protected Queue resolveQueue(Session session) throws JMSException {
-		if (this.queue instanceof Queue) {
-			return (Queue) this.queue;
-		}
-		else if (this.queue instanceof String) {
-			return resolveQueueName(session, (String) this.queue);
-		}
-		else {
-			throw new javax.jms.IllegalStateException(
-					"Queue object [" + this.queue + "] is neither a [javax.jms.Queue] nor a queue name String");
-		}
-	}
-
-	/**
-	 * Resolve the given queue name into a JMS {@link javax.jms.Queue},
-	 * via this accessor's {@link DestinationResolver}.
-	 * @param session the current JMS Session
-	 * @param queueName the name of the queue
-	 * @return the located Queue
-	 * @throws JMSException if resolution failed
-	 * @see #setDestinationResolver
-	 */
-	protected Queue resolveQueueName(Session session, String queueName) throws JMSException {
-		return (Queue) this.destinationResolver.resolveDestinationName(session, queueName, false);
-	}
-
-	/**
-	 * Create the invoker request message.
-	 * <p>The default implementation creates a JMS {@link javax.jms.ObjectMessage}
-	 * for the given RemoteInvocation object.
-	 * @param session the current JMS Session
-	 * @param invocation the remote invocation to send
-	 * @return the JMS Message to send
-	 * @throws JMSException if the message could not be created
-	 */
-	protected Message createRequestMessage(Session session, RemoteInvocation invocation) throws JMSException {
-		return this.messageConverter.toMessage(invocation, session);
-	}
-
-	/**
-	 * Actually execute the given request, sending the invoker request message
-	 * to the specified target queue and waiting for a corresponding response.
-	 * <p>The default implementation is based on standard JMS send/receive,
-	 * using a {@link javax.jms.TemporaryQueue} for receiving the response.
-	 * @param session the JMS Session to use
-	 * @param queue the resolved target Queue to send to
-	 * @param requestMessage the JMS Message to send
-	 * @return the RemoteInvocationResult object
-	 * @throws JMSException in case of JMS failure
-	 */
-	@Nullable
-	protected Message doExecuteRequest(Session session, Queue queue, Message requestMessage) throws JMSException {
-		TemporaryQueue responseQueue = null;
-		MessageProducer producer = null;
-		MessageConsumer consumer = null;
-		try {
-			responseQueue = session.createTemporaryQueue();
-			producer = session.createProducer(queue);
-			consumer = session.createConsumer(responseQueue);
-			requestMessage.setJMSReplyTo(responseQueue);
-			producer.send(requestMessage);
-			long timeout = getReceiveTimeout();
-			return (timeout > 0 ? consumer.receive(timeout) : consumer.receive());
-		}
-		finally {
-			JmsUtils.closeMessageConsumer(consumer);
-			JmsUtils.closeMessageProducer(producer);
-			if (responseQueue != null) {
-				responseQueue.delete();
-			}
-		}
-	}
-
-	/**
-	 * Extract the invocation result from the response message.
-	 * <p>The default implementation expects a JMS {@link javax.jms.ObjectMessage}
-	 * carrying a {@link RemoteInvocationResult} object. If an invalid response
-	 * message is encountered, the {@code onInvalidResponse} callback gets invoked.
-	 * @param responseMessage the response message
-	 * @return the invocation result
-	 * @throws JMSException is thrown if a JMS exception occurs
-	 * @see #onInvalidResponse
-	 */
-	protected RemoteInvocationResult extractInvocationResult(Message responseMessage) throws JMSException {
-		Object content = this.messageConverter.fromMessage(responseMessage);
-		if (content instanceof RemoteInvocationResult) {
-			return (RemoteInvocationResult) content;
-		}
-		return onInvalidResponse(responseMessage);
-	}
-
-	/**
-	 * Callback that is invoked by {@link #executeRequest} when the receive
-	 * timeout has expired for the specified {@link RemoteInvocation}.
-	 * <p>By default, an {@link RemoteTimeoutException} is thrown. Sub-classes
-	 * can choose to either throw a more dedicated exception or even return
-	 * a default {@link RemoteInvocationResult} as a fallback.
-	 * @param invocation the invocation
-	 * @return a default result when the receive timeout has expired
-	 */
-	protected RemoteInvocationResult onReceiveTimeout(RemoteInvocation invocation) {
-		throw new RemoteTimeoutException("Receive timeout after " + this.receiveTimeout + " ms for " + invocation);
-	}
-
-	/**
-	 * Callback that is invoked by {@link #extractInvocationResult} when
-	 * it encounters an invalid response message.
-	 * <p>The default implementation throws a {@link MessageFormatException}.
-	 * @param responseMessage the invalid response message
-	 * @return an alternative invocation result that should be returned to
-	 * the caller (if desired)
-	 * @throws JMSException if the invalid response should lead to an
-	 * infrastructure exception propagated to the caller
-	 * @see #extractInvocationResult
-	 */
-	protected RemoteInvocationResult onInvalidResponse(Message responseMessage) throws JMSException {
-		throw new MessageFormatException("Invalid response message: " + responseMessage);
-	}
-
-	/**
-	 * Recreate the invocation result contained in the given {@link RemoteInvocationResult}
-	 * object.
-	 * <p>The default implementation calls the default {@code recreate()} method.
-	 * <p>Can be overridden in subclasses to provide custom recreation, potentially
-	 * processing the returned result object.
-	 * @param result the RemoteInvocationResult to recreate
-	 * @return a return value if the invocation result is a successful return
-	 * @throws Throwable if the invocation result is an exception
-	 * @see org.springframework.remoting.support.RemoteInvocationResult#recreate()
-	 */
-	@Nullable
-	protected Object recreateRemoteInvocationResult(RemoteInvocationResult result) throws Throwable {
-		return result.recreate();
-	}
-
-	/**
-	 * Convert the given JMS invoker access exception to an appropriate
-	 * Spring {@link RemoteAccessException}.
-	 * @param ex the exception to convert
-	 * @return the RemoteAccessException to throw
-	 */
-	protected RemoteAccessException convertJmsInvokerAccessException(JMSException ex) {
-		return new RemoteAccessException("Could not access JMS invoker queue [" + this.queue + "]", ex);
-	}
-
-}
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
deleted file mode 100644
index 4562b602a51e..000000000000
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.
- * 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.jms.remoting;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * FactoryBean for JMS invoker proxies. Exposes the proxied service for use
- * as a bean reference, using the specified service interface.
- *
- * <p>Serializes remote invocation objects and deserializes remote invocation
- * result objects. Uses Java serialization just like RMI, but with the JMS
- * provider as communication infrastructure.
- *
- * <p>To be configured with a {@link javax.jms.QueueConnectionFactory} and a
- * target queue (either as {@link javax.jms.Queue} reference or as queue name).
- *
- * @author Juergen Hoeller
- * @since 2.0
- * @see #setConnectionFactory
- * @see #setQueueName
- * @see #setServiceInterface
- * @see org.springframework.jms.remoting.JmsInvokerClientInterceptor
- * @see org.springframework.jms.remoting.JmsInvokerServiceExporter
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class JmsInvokerProxyFactoryBean extends JmsInvokerClientInterceptor
-		implements FactoryBean<Object>, BeanClassLoaderAware {
-
-	@Nullable
-	private Class<?> serviceInterface;
-
-	@Nullable
-	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
-
-	@Nullable
-	private Object serviceProxy;
-
-
-	/**
-	 * Set the interface that the proxy must implement.
-	 * @param serviceInterface the interface that the proxy must implement
-	 * @throws IllegalArgumentException if the supplied {@code serviceInterface}
-	 * is not an interface type
-	 */
-	public void setServiceInterface(Class<?> serviceInterface) {
-		Assert.notNull(serviceInterface, "'serviceInterface' must not be null");
-		Assert.isTrue(serviceInterface.isInterface(), "'serviceInterface' must be an interface");
-		this.serviceInterface = serviceInterface;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-		Assert.notNull(this.serviceInterface, "Property 'serviceInterface' is required");
-		this.serviceProxy = new ProxyFactory(this.serviceInterface, this).getProxy(this.beanClassLoader);
-	}
-
-
-	@Override
-	@Nullable
-	public Object getObject() {
-		return this.serviceProxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return this.serviceInterface;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
deleted file mode 100644
index 80e5f51b4788..000000000000
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * 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.
- * 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.jms.remoting;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jms.listener.SessionAwareMessageListener;
-import org.springframework.jms.support.JmsUtils;
-import org.springframework.jms.support.converter.MessageConverter;
-import org.springframework.jms.support.converter.SimpleMessageConverter;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationBasedExporter;
-import org.springframework.remoting.support.RemoteInvocationResult;
-
-/**
- * JMS message listener that exports the specified service bean as a
- * JMS service endpoint, accessible via a JMS invoker proxy.
- *
- * <p>Note that this class implements Spring's
- * {@link org.springframework.jms.listener.SessionAwareMessageListener}
- * interface, since it requires access to the active JMS Session.
- * Hence, this class can only be used with message listener containers
- * which support the SessionAwareMessageListener interface (e.g. Spring's
- * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}).
- *
- * <p>Thanks to James Strachan for the original prototype that this
- * JMS invoker mechanism was inspired by!
- *
- * @author Juergen Hoeller
- * @author James Strachan
- * @since 2.0
- * @see JmsInvokerClientInterceptor
- * @see JmsInvokerProxyFactoryBean
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class JmsInvokerServiceExporter extends RemoteInvocationBasedExporter
-		implements SessionAwareMessageListener<Message>, InitializingBean {
-
-	private MessageConverter messageConverter = new SimpleMessageConverter();
-
-	private boolean ignoreInvalidRequests = true;
-
-	@Nullable
-	private Object proxy;
-
-
-	/**
-	 * Specify the MessageConverter to use for turning request messages into
-	 * {@link org.springframework.remoting.support.RemoteInvocation} objects,
-	 * as well as {@link org.springframework.remoting.support.RemoteInvocationResult}
-	 * objects into response messages.
-	 * <p>Default is a {@link org.springframework.jms.support.converter.SimpleMessageConverter},
-	 * using a standard JMS {@link javax.jms.ObjectMessage} for each invocation /
-	 * invocation result object.
-	 * <p>Custom implementations may generally adapt Serializables into
-	 * special kinds of messages, or might be specifically tailored for
-	 * translating RemoteInvocation(Result)s into specific kinds of messages.
-	 */
-	public void setMessageConverter(@Nullable MessageConverter messageConverter) {
-		this.messageConverter = (messageConverter != null ? messageConverter : new SimpleMessageConverter());
-	}
-
-	/**
-	 * Set whether invalidly formatted messages should be discarded.
-	 * Default is "true".
-	 * <p>Switch this flag to "false" to throw an exception back to the
-	 * listener container. This will typically lead to redelivery of
-	 * the message, which is usually undesirable - since the message
-	 * content will be the same (that is, still invalid).
-	 */
-	public void setIgnoreInvalidRequests(boolean ignoreInvalidRequests) {
-		this.ignoreInvalidRequests = ignoreInvalidRequests;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		this.proxy = getProxyForService();
-	}
-
-
-	@Override
-	public void onMessage(Message requestMessage, Session session) throws JMSException {
-		RemoteInvocation invocation = readRemoteInvocation(requestMessage);
-		if (invocation != null) {
-			RemoteInvocationResult result = invokeAndCreateResult(invocation, this.proxy);
-			writeRemoteInvocationResult(requestMessage, session, result);
-		}
-	}
-
-	/**
-	 * Read a RemoteInvocation from the given JMS message.
-	 * @param requestMessage current request message
-	 * @return the RemoteInvocation object (or {@code null}
-	 * in case of an invalid message that will simply be ignored)
-	 * @throws javax.jms.JMSException in case of message access failure
-	 */
-	@Nullable
-	protected RemoteInvocation readRemoteInvocation(Message requestMessage) throws JMSException {
-		Object content = this.messageConverter.fromMessage(requestMessage);
-		if (content instanceof RemoteInvocation) {
-			return (RemoteInvocation) content;
-		}
-		return onInvalidRequest(requestMessage);
-	}
-
-
-	/**
-	 * Send the given RemoteInvocationResult as a JMS message to the originator.
-	 * @param requestMessage current request message
-	 * @param session the JMS Session to use
-	 * @param result the RemoteInvocationResult object
-	 * @throws javax.jms.JMSException if thrown by trying to send the message
-	 */
-	protected void writeRemoteInvocationResult(
-			Message requestMessage, Session session, RemoteInvocationResult result) throws JMSException {
-
-		Message response = createResponseMessage(requestMessage, session, result);
-		MessageProducer producer = session.createProducer(requestMessage.getJMSReplyTo());
-		try {
-			producer.send(response);
-		}
-		finally {
-			JmsUtils.closeMessageProducer(producer);
-		}
-	}
-
-	/**
-	 * Create the invocation result response message.
-	 * <p>The default implementation creates a JMS ObjectMessage for the given
-	 * RemoteInvocationResult object. It sets the response's correlation id
-	 * to the request message's correlation id, if any; otherwise to the
-	 * request message id.
-	 * @param request the original request message
-	 * @param session the JMS session to use
-	 * @param result the invocation result
-	 * @return the message response to send
-	 * @throws javax.jms.JMSException if creating the message failed
-	 */
-	protected Message createResponseMessage(Message request, Session session, RemoteInvocationResult result)
-			throws JMSException {
-
-		Message response = this.messageConverter.toMessage(result, session);
-		String correlation = request.getJMSCorrelationID();
-		if (correlation == null) {
-			correlation = request.getJMSMessageID();
-		}
-		response.setJMSCorrelationID(correlation);
-		return response;
-	}
-
-	/**
-	 * Callback that is invoked by {@link #readRemoteInvocation}
-	 * when it encounters an invalid request message.
-	 * <p>The default implementation either discards the invalid message or
-	 * throws a MessageFormatException - according to the "ignoreInvalidRequests"
-	 * flag, which is set to "true" (that is, discard invalid messages) by default.
-	 * @param requestMessage the invalid request message
-	 * @return the RemoteInvocation to expose for the invalid request (typically
-	 * {@code null} in case of an invalid message that will simply be ignored)
-	 * @throws javax.jms.JMSException in case of the invalid request supposed
-	 * to lead to an exception (instead of ignoring it)
-	 * @see #readRemoteInvocation
-	 * @see #setIgnoreInvalidRequests
-	 */
-	@Nullable
-	protected RemoteInvocation onInvalidRequest(Message requestMessage) throws JMSException {
-		if (this.ignoreInvalidRequests) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Invalid request message will be discarded: " + requestMessage);
-			}
-			return null;
-		}
-		else {
-			throw new MessageFormatException("Invalid request message: " + requestMessage);
-		}
-	}
-
-}
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java b/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
deleted file mode 100644
index 20e030430ca8..000000000000
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Remoting classes for transparent Java-to-Java remoting via a JMS provider.
- *
- * <p>Allows the target service to be load-balanced across a number of queue
- * receivers, and provides a level of indirection between the client and the
- * service: They only need to agree on a queue name and a service interface.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jms.remoting;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
deleted file mode 100644
index 299ee9321fe2..000000000000
--- a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * 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.
- * 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.jms.remoting;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Enumeration;
-
-import javax.jms.CompletionListener;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.testfixture.beans.ITestBean;
-import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.jms.support.converter.MessageConversionException;
-import org.springframework.jms.support.converter.SimpleMessageConverter;
-import org.springframework.remoting.RemoteTimeoutException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Juergen Hoeller
- * @author Stephane Nicoll
- */
-class JmsInvokerTests {
-
-	private QueueConnectionFactory mockConnectionFactory = mock(QueueConnectionFactory.class);
-
-	private QueueConnection mockConnection = mock(QueueConnection.class);
-
-	private QueueSession mockSession = mock(QueueSession.class);
-
-	private Queue mockQueue = mock(Queue.class);
-
-
-	@BeforeEach
-	void setUpMocks() throws Exception {
-		given(mockConnectionFactory.createConnection()).willReturn(mockConnection);
-		given(mockConnection.createSession(false, Session.AUTO_ACKNOWLEDGE)).willReturn(mockSession);
-	}
-
-
-	@Test
-	void jmsInvokerProxyFactoryBeanAndServiceExporter() throws Throwable {
-		doTestJmsInvokerProxyFactoryBeanAndServiceExporter(false);
-	}
-
-	@Test
-	void jmsInvokerProxyFactoryBeanAndServiceExporterWithDynamicQueue() throws Throwable {
-		given(mockSession.createQueue("myQueue")).willReturn(mockQueue);
-		doTestJmsInvokerProxyFactoryBeanAndServiceExporter(true);
-	}
-
-	@Test
-	@SuppressWarnings("deprecation")
-	void receiveTimeoutExpired() {
-		JmsInvokerProxyFactoryBean pfb = new JmsInvokerProxyFactoryBean() {
-			@Override
-			protected Message doExecuteRequest(Session session, Queue queue, Message requestMessage) throws JMSException {
-				return null; // faking no message received
-			}
-		};
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setConnectionFactory(this.mockConnectionFactory);
-		pfb.setQueue(this.mockQueue);
-		pfb.setReceiveTimeout(1500);
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-
-		assertThatExceptionOfType(RemoteTimeoutException.class).isThrownBy(() ->
-				proxy.getAge())
-			.withMessageContaining("1500 ms")
-			.withMessageContaining("getAge");
-	}
-
-	@SuppressWarnings("deprecation")
-	private void doTestJmsInvokerProxyFactoryBeanAndServiceExporter(boolean dynamicQueue) throws Throwable {
-		TestBean target = new TestBean("myname", 99);
-
-		final JmsInvokerServiceExporter exporter = new JmsInvokerServiceExporter();
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setService(target);
-		exporter.setMessageConverter(new MockSimpleMessageConverter());
-		exporter.afterPropertiesSet();
-
-		JmsInvokerProxyFactoryBean pfb = new JmsInvokerProxyFactoryBean() {
-			@Override
-			protected Message doExecuteRequest(Session session, Queue queue, Message requestMessage) throws JMSException {
-				Session mockExporterSession = mock(Session.class);
-				ResponseStoringProducer mockProducer = new ResponseStoringProducer();
-				given(mockExporterSession.createProducer(requestMessage.getJMSReplyTo())).willReturn(mockProducer);
-				exporter.onMessage(requestMessage, mockExporterSession);
-				assertThat(mockProducer.closed).isTrue();
-				return mockProducer.response;
-			}
-		};
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setConnectionFactory(this.mockConnectionFactory);
-		if (dynamicQueue) {
-			pfb.setQueueName("myQueue");
-		}
-		else {
-			pfb.setQueue(this.mockQueue);
-		}
-		pfb.setMessageConverter(new MockSimpleMessageConverter());
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-
-		assertThat(proxy.getName()).isEqualTo("myname");
-		assertThat(proxy.getAge()).isEqualTo(99);
-		proxy.setAge(50);
-		assertThat(proxy.getAge()).isEqualTo(50);
-		proxy.setStringArray(new String[] {"str1", "str2"});
-		assertThat(Arrays.equals(new String[] {"str1", "str2"}, proxy.getStringArray())).isTrue();
-		assertThatIllegalStateException().isThrownBy(() ->
-			proxy.exceptional(new IllegalStateException()));
-		assertThatExceptionOfType(IllegalAccessException.class).isThrownBy(() ->
-				proxy.exceptional(new IllegalAccessException()));
-	}
-
-
-	private static class ResponseStoringProducer implements MessageProducer {
-
-		Message response;
-
-		boolean closed = false;
-
-		@Override
-		public void setDisableMessageID(boolean b) throws JMSException {
-		}
-
-		@Override
-		public boolean getDisableMessageID() throws JMSException {
-			return false;
-		}
-
-		@Override
-		public void setDisableMessageTimestamp(boolean b) throws JMSException {
-		}
-
-		@Override
-		public boolean getDisableMessageTimestamp() throws JMSException {
-			return false;
-		}
-
-		@Override
-		public void setDeliveryMode(int i) throws JMSException {
-		}
-
-		@Override
-		public int getDeliveryMode() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setPriority(int i) throws JMSException {
-		}
-
-		@Override
-		public int getPriority() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setTimeToLive(long l) throws JMSException {
-		}
-
-		@Override
-		public long getTimeToLive() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setDeliveryDelay(long deliveryDelay) throws JMSException {
-		}
-
-		@Override
-		public long getDeliveryDelay() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public Destination getDestination() throws JMSException {
-			return null;
-		}
-
-		@Override
-		public void close() throws JMSException {
-			this.closed = true;
-		}
-
-		@Override
-		public void send(Message message) throws JMSException {
-			this.response = message;
-		}
-
-		@Override
-		public void send(Message message, int i, int i1, long l) throws JMSException {
-		}
-
-		@Override
-		public void send(Destination destination, Message message) throws JMSException {
-		}
-
-		@Override
-		public void send(Destination destination, Message message, int i, int i1, long l) throws JMSException {
-		}
-
-		@Override
-		public void send(Message message, CompletionListener completionListener) throws JMSException {
-		}
-
-		@Override
-		public void send(Message message, int deliveryMode, int priority, long timeToLive, CompletionListener completionListener) throws JMSException {
-		}
-
-		@Override
-		public void send(Destination destination, Message message, CompletionListener completionListener) throws JMSException {
-		}
-
-		@Override
-		public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive, CompletionListener completionListener) throws JMSException {
-		}
-	}
-
-
-	private static class MockObjectMessage implements ObjectMessage {
-
-		private Serializable serializable;
-
-		private Destination replyTo;
-
-		public MockObjectMessage(Serializable serializable) {
-			this.serializable = serializable;
-		}
-
-		@Override
-		public void setObject(Serializable serializable) throws JMSException {
-			this.serializable = serializable;
-		}
-
-		@Override
-		public Serializable getObject() throws JMSException {
-			return serializable;
-		}
-
-		@Override
-		public String getJMSMessageID() throws JMSException {
-			return null;
-		}
-
-		@Override
-		public void setJMSMessageID(String string) throws JMSException {
-		}
-
-		@Override
-		public long getJMSTimestamp() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setJMSTimestamp(long l) throws JMSException {
-		}
-
-		@Override
-		public byte[] getJMSCorrelationIDAsBytes() throws JMSException {
-			return new byte[0];
-		}
-
-		@Override
-		public void setJMSCorrelationIDAsBytes(byte[] bytes) throws JMSException {
-		}
-
-		@Override
-		public void setJMSCorrelationID(String string) throws JMSException {
-		}
-
-		@Override
-		public String getJMSCorrelationID() throws JMSException {
-			return null;
-		}
-
-		@Override
-		public Destination getJMSReplyTo() throws JMSException {
-			return replyTo;
-		}
-
-		@Override
-		public void setJMSReplyTo(Destination destination) throws JMSException {
-			this.replyTo = destination;
-		}
-
-		@Override
-		public Destination getJMSDestination() throws JMSException {
-			return null;
-		}
-
-		@Override
-		public void setJMSDestination(Destination destination) throws JMSException {
-		}
-
-		@Override
-		public int getJMSDeliveryMode() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setJMSDeliveryMode(int i) throws JMSException {
-		}
-
-		@Override
-		public boolean getJMSRedelivered() throws JMSException {
-			return false;
-		}
-
-		@Override
-		public void setJMSRedelivered(boolean b) throws JMSException {
-		}
-
-		@Override
-		public String getJMSType() throws JMSException {
-			return null;
-		}
-
-		@Override
-		public void setJMSType(String string) throws JMSException {
-		}
-
-		@Override
-		public long getJMSExpiration() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setJMSExpiration(long l) throws JMSException {
-		}
-
-		@Override
-		public int getJMSPriority() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setJMSPriority(int i) throws JMSException {
-		}
-
-		@Override
-		public long getJMSDeliveryTime() throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public void setJMSDeliveryTime(long deliveryTime) throws JMSException {
-		}
-
-		@Override
-		public <T> T getBody(Class<T> c) throws JMSException {
-			return null;
-		}
-
-		@Override
-		@SuppressWarnings("rawtypes")
-		public boolean isBodyAssignableTo(Class c) throws JMSException {
-			return false;
-		}
-
-		@Override
-		public void clearProperties() throws JMSException {
-		}
-
-		@Override
-		public boolean propertyExists(String string) throws JMSException {
-			return false;
-		}
-
-		@Override
-		public boolean getBooleanProperty(String string) throws JMSException {
-			return false;
-		}
-
-		@Override
-		public byte getByteProperty(String string) throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public short getShortProperty(String string) throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public int getIntProperty(String string) throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public long getLongProperty(String string) throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public float getFloatProperty(String string) throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public double getDoubleProperty(String string) throws JMSException {
-			return 0;
-		}
-
-		@Override
-		public String getStringProperty(String string) throws JMSException {
-			return null;
-		}
-
-		@Override
-		public Object getObjectProperty(String string) throws JMSException {
-			return null;
-		}
-
-		@Override
-		@SuppressWarnings("rawtypes")
-		public Enumeration getPropertyNames() throws JMSException {
-			return null;
-		}
-
-		@Override
-		public void setBooleanProperty(String string, boolean b) throws JMSException {
-		}
-
-		@Override
-		public void setByteProperty(String string, byte b) throws JMSException {
-		}
-
-		@Override
-		public void setShortProperty(String string, short i) throws JMSException {
-		}
-
-		@Override
-		public void setIntProperty(String string, int i) throws JMSException {
-		}
-
-		@Override
-		public void setLongProperty(String string, long l) throws JMSException {
-		}
-
-		@Override
-		public void setFloatProperty(String string, float v) throws JMSException {
-		}
-
-		@Override
-		public void setDoubleProperty(String string, double v) throws JMSException {
-		}
-
-		@Override
-		public void setStringProperty(String string, String string1) throws JMSException {
-		}
-
-		@Override
-		public void setObjectProperty(String string, Object object) throws JMSException {
-		}
-
-		@Override
-		public void acknowledge() throws JMSException {
-		}
-
-		@Override
-		public void clearBody() throws JMSException {
-		}
-	}
-
-
-	private static class MockSimpleMessageConverter extends SimpleMessageConverter {
-
-		@Override
-		public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
-			return new MockObjectMessage((Serializable) object);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
deleted file mode 100644
index 241a8580e192..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * 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.
- * 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.remoting.caucho;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-
-import com.caucho.hessian.HessianException;
-import com.caucho.hessian.client.HessianConnectionException;
-import com.caucho.hessian.client.HessianConnectionFactory;
-import com.caucho.hessian.client.HessianProxyFactory;
-import com.caucho.hessian.client.HessianRuntimeException;
-import com.caucho.hessian.io.SerializerFactory;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteLookupFailureException;
-import org.springframework.remoting.RemoteProxyFailureException;
-import org.springframework.remoting.support.UrlBasedRemoteAccessor;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.aopalliance.intercept.MethodInterceptor} for accessing a Hessian service.
- * Supports authentication via username and password.
- * The service URL must be an HTTP URL exposing a Hessian service.
- *
- * <p>Hessian is a slim, binary RPC protocol.
- * For information on Hessian, see the
- * <a href="http://hessian.caucho.com">Hessian website</a>
- * <b>Note: As of Spring 4.0, this client requires Hessian 4.0 or above.</b>
- *
- * <p>Note: There is no requirement for services accessed with this proxy factory
- * to have been exported using Spring's {@link HessianServiceExporter}, as there is
- * no special handling involved. As a consequence, you can also access services that
- * have been exported using Caucho's {@link com.caucho.hessian.server.HessianServlet}.
- *
- * @author Juergen Hoeller
- * @since 29.09.2003
- * @see #setServiceInterface
- * @see #setServiceUrl
- * @see #setUsername
- * @see #setPassword
- * @see HessianServiceExporter
- * @see HessianProxyFactoryBean
- * @see com.caucho.hessian.client.HessianProxyFactory
- * @see com.caucho.hessian.server.HessianServlet
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HessianClientInterceptor extends UrlBasedRemoteAccessor implements MethodInterceptor {
-
-	private HessianProxyFactory proxyFactory = new HessianProxyFactory();
-
-	@Nullable
-	private Object hessianProxy;
-
-
-	/**
-	 * Set the HessianProxyFactory instance to use.
-	 * If not specified, a default HessianProxyFactory will be created.
-	 * <p>Allows to use an externally configured factory instance,
-	 * in particular a custom HessianProxyFactory subclass.
-	 */
-	public void setProxyFactory(@Nullable HessianProxyFactory proxyFactory) {
-		this.proxyFactory = (proxyFactory != null ? proxyFactory : new HessianProxyFactory());
-	}
-
-	/**
-	 * Specify the Hessian SerializerFactory to use.
-	 * <p>This will typically be passed in as an inner bean definition
-	 * of type {@code com.caucho.hessian.io.SerializerFactory},
-	 * with custom bean property values applied.
-	 */
-	public void setSerializerFactory(SerializerFactory serializerFactory) {
-		this.proxyFactory.setSerializerFactory(serializerFactory);
-	}
-
-	/**
-	 * Set whether to send the Java collection type for each serialized
-	 * collection. Default is "true".
-	 */
-	public void setSendCollectionType(boolean sendCollectionType) {
-		this.proxyFactory.getSerializerFactory().setSendCollectionType(sendCollectionType);
-	}
-
-	/**
-	 * Set whether to allow non-serializable types as Hessian arguments
-	 * and return values. Default is "true".
-	 */
-	public void setAllowNonSerializable(boolean allowNonSerializable) {
-		this.proxyFactory.getSerializerFactory().setAllowNonSerializable(allowNonSerializable);
-	}
-
-	/**
-	 * Set whether overloaded methods should be enabled for remote invocations.
-	 * Default is "false".
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setOverloadEnabled
-	 */
-	public void setOverloadEnabled(boolean overloadEnabled) {
-		this.proxyFactory.setOverloadEnabled(overloadEnabled);
-	}
-
-	/**
-	 * Set the username that this factory should use to access the remote service.
-	 * Default is none.
-	 * <p>The username will be sent by Hessian via HTTP Basic Authentication.
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setUser
-	 */
-	public void setUsername(String username) {
-		this.proxyFactory.setUser(username);
-	}
-
-	/**
-	 * Set the password that this factory should use to access the remote service.
-	 * Default is none.
-	 * <p>The password will be sent by Hessian via HTTP Basic Authentication.
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setPassword
-	 */
-	public void setPassword(String password) {
-		this.proxyFactory.setPassword(password);
-	}
-
-	/**
-	 * Set whether Hessian's debug mode should be enabled.
-	 * Default is "false".
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setDebug
-	 */
-	public void setDebug(boolean debug) {
-		this.proxyFactory.setDebug(debug);
-	}
-
-	/**
-	 * Set whether to use a chunked post for sending a Hessian request.
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setChunkedPost
-	 */
-	public void setChunkedPost(boolean chunkedPost) {
-		this.proxyFactory.setChunkedPost(chunkedPost);
-	}
-
-	/**
-	 * Specify a custom HessianConnectionFactory to use for the Hessian client.
-	 */
-	public void setConnectionFactory(HessianConnectionFactory connectionFactory) {
-		this.proxyFactory.setConnectionFactory(connectionFactory);
-	}
-
-	/**
-	 * Set the socket connect timeout to use for the Hessian client.
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setConnectTimeout
-	 */
-	public void setConnectTimeout(long timeout) {
-		this.proxyFactory.setConnectTimeout(timeout);
-	}
-
-	/**
-	 * Set the timeout to use when waiting for a reply from the Hessian service.
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setReadTimeout
-	 */
-	public void setReadTimeout(long timeout) {
-		this.proxyFactory.setReadTimeout(timeout);
-	}
-
-	/**
-	 * Set whether version 2 of the Hessian protocol should be used for
-	 * parsing requests and replies. Default is "false".
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setHessian2Request
-	 */
-	public void setHessian2(boolean hessian2) {
-		this.proxyFactory.setHessian2Request(hessian2);
-		this.proxyFactory.setHessian2Reply(hessian2);
-	}
-
-	/**
-	 * Set whether version 2 of the Hessian protocol should be used for
-	 * parsing requests. Default is "false".
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setHessian2Request
-	 */
-	public void setHessian2Request(boolean hessian2) {
-		this.proxyFactory.setHessian2Request(hessian2);
-	}
-
-	/**
-	 * Set whether version 2 of the Hessian protocol should be used for
-	 * parsing replies. Default is "false".
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setHessian2Reply
-	 */
-	public void setHessian2Reply(boolean hessian2) {
-		this.proxyFactory.setHessian2Reply(hessian2);
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-		prepare();
-	}
-
-	/**
-	 * Initialize the Hessian proxy for this interceptor.
-	 * @throws RemoteLookupFailureException if the service URL is invalid
-	 */
-	public void prepare() throws RemoteLookupFailureException {
-		try {
-			this.hessianProxy = createHessianProxy(this.proxyFactory);
-		}
-		catch (MalformedURLException ex) {
-			throw new RemoteLookupFailureException("Service URL [" + getServiceUrl() + "] is invalid", ex);
-		}
-	}
-
-	/**
-	 * Create the Hessian proxy that is wrapped by this interceptor.
-	 * @param proxyFactory the proxy factory to use
-	 * @return the Hessian proxy
-	 * @throws MalformedURLException if thrown by the proxy factory
-	 * @see com.caucho.hessian.client.HessianProxyFactory#create
-	 */
-	protected Object createHessianProxy(HessianProxyFactory proxyFactory) throws MalformedURLException {
-		Assert.notNull(getServiceInterface(), "'serviceInterface' is required");
-		return proxyFactory.create(getServiceInterface(), getServiceUrl(), getBeanClassLoader());
-	}
-
-
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		if (this.hessianProxy == null) {
-			throw new IllegalStateException("HessianClientInterceptor is not properly initialized - " +
-					"invoke 'prepare' before attempting any operations");
-		}
-
-		ClassLoader originalClassLoader = overrideThreadContextClassLoader();
-		try {
-			return invocation.getMethod().invoke(this.hessianProxy, invocation.getArguments());
-		}
-		catch (InvocationTargetException ex) {
-			Throwable targetEx = ex.getTargetException();
-			// Hessian 4.0 check: another layer of InvocationTargetException.
-			if (targetEx instanceof InvocationTargetException) {
-				targetEx = ((InvocationTargetException) targetEx).getTargetException();
-			}
-			if (targetEx instanceof HessianConnectionException) {
-				throw convertHessianAccessException(targetEx);
-			}
-			else if (targetEx instanceof HessianException || targetEx instanceof HessianRuntimeException) {
-				Throwable cause = targetEx.getCause();
-				throw convertHessianAccessException(cause != null ? cause : targetEx);
-			}
-			else if (targetEx instanceof UndeclaredThrowableException) {
-				UndeclaredThrowableException utex = (UndeclaredThrowableException) targetEx;
-				throw convertHessianAccessException(utex.getUndeclaredThrowable());
-			}
-			else {
-				throw targetEx;
-			}
-		}
-		catch (Throwable ex) {
-			throw new RemoteProxyFailureException(
-					"Failed to invoke Hessian proxy for remote service [" + getServiceUrl() + "]", ex);
-		}
-		finally {
-			resetThreadContextClassLoader(originalClassLoader);
-		}
-	}
-
-	/**
-	 * Convert the given Hessian access exception to an appropriate
-	 * Spring RemoteAccessException.
-	 * @param ex the exception to convert
-	 * @return the RemoteAccessException to throw
-	 */
-	protected RemoteAccessException convertHessianAccessException(Throwable ex) {
-		if (ex instanceof HessianConnectionException || ex instanceof ConnectException) {
-			return new RemoteConnectFailureException(
-					"Cannot connect to Hessian remote service at [" + getServiceUrl() + "]", ex);
-		}
-		else {
-			return new RemoteAccessException(
-				"Cannot access Hessian remote service at [" + getServiceUrl() + "]", ex);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
deleted file mode 100644
index b6c70e5fd722..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * 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.
- * 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.remoting.caucho;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-import com.caucho.hessian.io.AbstractHessianInput;
-import com.caucho.hessian.io.AbstractHessianOutput;
-import com.caucho.hessian.io.Hessian2Input;
-import com.caucho.hessian.io.Hessian2Output;
-import com.caucho.hessian.io.HessianDebugInputStream;
-import com.caucho.hessian.io.HessianDebugOutputStream;
-import com.caucho.hessian.io.HessianInput;
-import com.caucho.hessian.io.HessianOutput;
-import com.caucho.hessian.io.HessianRemoteResolver;
-import com.caucho.hessian.io.SerializerFactory;
-import com.caucho.hessian.server.HessianSkeleton;
-import org.apache.commons.logging.Log;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.support.RemoteExporter;
-import org.springframework.util.Assert;
-import org.springframework.util.CommonsLogWriter;
-
-/**
- * General stream-based protocol exporter for a Hessian endpoint.
- *
- * <p>Hessian is a slim, binary RPC protocol.
- * For information on Hessian, see the
- * <a href="http://hessian.caucho.com">Hessian website</a>.
- * <b>Note: As of Spring 4.0, this exporter requires Hessian 4.0 or above.</b>
- *
- * @author Juergen Hoeller
- * @since 2.5.1
- * @see #invoke(java.io.InputStream, java.io.OutputStream)
- * @see HessianServiceExporter
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HessianExporter extends RemoteExporter implements InitializingBean {
-
-	/**
-	 * The content type for hessian ({@code application/x-hessian}).
-	 */
-	public static final String CONTENT_TYPE_HESSIAN = "application/x-hessian";
-
-
-	private SerializerFactory serializerFactory = new SerializerFactory();
-
-	@Nullable
-	private HessianRemoteResolver remoteResolver;
-
-	@Nullable
-	private Log debugLogger;
-
-	@Nullable
-	private HessianSkeleton skeleton;
-
-
-	/**
-	 * Specify the Hessian SerializerFactory to use.
-	 * <p>This will typically be passed in as an inner bean definition
-	 * of type {@code com.caucho.hessian.io.SerializerFactory},
-	 * with custom bean property values applied.
-	 */
-	public void setSerializerFactory(@Nullable SerializerFactory serializerFactory) {
-		this.serializerFactory = (serializerFactory != null ? serializerFactory : new SerializerFactory());
-	}
-
-	/**
-	 * Set whether to send the Java collection type for each serialized
-	 * collection. Default is "true".
-	 */
-	public void setSendCollectionType(boolean sendCollectionType) {
-		this.serializerFactory.setSendCollectionType(sendCollectionType);
-	}
-
-	/**
-	 * Set whether to allow non-serializable types as Hessian arguments
-	 * and return values. Default is "true".
-	 */
-	public void setAllowNonSerializable(boolean allowNonSerializable) {
-		this.serializerFactory.setAllowNonSerializable(allowNonSerializable);
-	}
-
-	/**
-	 * Specify a custom HessianRemoteResolver to use for resolving remote
-	 * object references.
-	 */
-	public void setRemoteResolver(HessianRemoteResolver remoteResolver) {
-		this.remoteResolver = remoteResolver;
-	}
-
-	/**
-	 * Set whether Hessian's debug mode should be enabled, logging to
-	 * this exporter's Commons Logging log. Default is "false".
-	 * @see com.caucho.hessian.client.HessianProxyFactory#setDebug
-	 */
-	public void setDebug(boolean debug) {
-		this.debugLogger = (debug ? logger : null);
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		prepare();
-	}
-
-	/**
-	 * Initialize this exporter.
-	 */
-	public void prepare() {
-		checkService();
-		checkServiceInterface();
-		this.skeleton = new HessianSkeleton(getProxyForService(), getServiceInterface());
-	}
-
-
-	/**
-	 * Perform an invocation on the exported object.
-	 * @param inputStream the request stream
-	 * @param outputStream the response stream
-	 * @throws Throwable if invocation failed
-	 */
-	public void invoke(InputStream inputStream, OutputStream outputStream) throws Throwable {
-		Assert.notNull(this.skeleton, "Hessian exporter has not been initialized");
-		doInvoke(this.skeleton, inputStream, outputStream);
-	}
-
-	/**
-	 * Actually invoke the skeleton with the given streams.
-	 * @param skeleton the skeleton to invoke
-	 * @param inputStream the request stream
-	 * @param outputStream the response stream
-	 * @throws Throwable if invocation failed
-	 */
-	protected void doInvoke(HessianSkeleton skeleton, InputStream inputStream, OutputStream outputStream)
-			throws Throwable {
-
-		ClassLoader originalClassLoader = overrideThreadContextClassLoader();
-		try {
-			InputStream isToUse = inputStream;
-			OutputStream osToUse = outputStream;
-
-			if (this.debugLogger != null && this.debugLogger.isDebugEnabled()) {
-				try (PrintWriter debugWriter = new PrintWriter(new CommonsLogWriter(this.debugLogger))){
-					@SuppressWarnings("resource")
-					HessianDebugInputStream dis = new HessianDebugInputStream(inputStream, debugWriter);
-					@SuppressWarnings("resource")
-					HessianDebugOutputStream dos = new HessianDebugOutputStream(outputStream, debugWriter);
-					dis.startTop2();
-					dos.startTop2();
-					isToUse = dis;
-					osToUse = dos;
-				}
-			}
-
-			if (!isToUse.markSupported()) {
-				isToUse = new BufferedInputStream(isToUse);
-				isToUse.mark(1);
-			}
-
-			int code = isToUse.read();
-			int major;
-			int minor;
-
-			AbstractHessianInput in;
-			AbstractHessianOutput out;
-
-			if (code == 'H') {
-				// Hessian 2.0 stream
-				major = isToUse.read();
-				minor = isToUse.read();
-				if (major != 0x02) {
-					throw new IOException("Version " + major + '.' + minor + " is not understood");
-				}
-				in = new Hessian2Input(isToUse);
-				out = new Hessian2Output(osToUse);
-				in.readCall();
-			}
-			else if (code == 'C') {
-				// Hessian 2.0 call... for some reason not handled in HessianServlet!
-				isToUse.reset();
-				in = new Hessian2Input(isToUse);
-				out = new Hessian2Output(osToUse);
-				in.readCall();
-			}
-			else if (code == 'c') {
-				// Hessian 1.0 call
-				major = isToUse.read();
-				minor = isToUse.read();
-				in = new HessianInput(isToUse);
-				if (major >= 2) {
-					out = new Hessian2Output(osToUse);
-				}
-				else {
-					out = new HessianOutput(osToUse);
-				}
-			}
-			else {
-				throw new IOException("Expected 'H'/'C' (Hessian 2.0) or 'c' (Hessian 1.0) in hessian input at " + code);
-			}
-
-			in.setSerializerFactory(this.serializerFactory);
-			out.setSerializerFactory(this.serializerFactory);
-			if (this.remoteResolver != null) {
-				in.setRemoteResolver(this.remoteResolver);
-			}
-
-			try {
-				skeleton.invoke(in, out);
-			}
-			finally {
-				try {
-					in.close();
-					isToUse.close();
-				}
-				catch (IOException ex) {
-					// ignore
-				}
-				try {
-					out.close();
-					osToUse.close();
-				}
-				catch (IOException ex) {
-					// ignore
-				}
-			}
-		}
-		finally {
-			resetThreadContextClassLoader(originalClassLoader);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
deleted file mode 100644
index 45a66eacf538..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- * 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.remoting.caucho;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link FactoryBean} for Hessian proxies. Exposes the proxied service
- * for use as a bean reference, using the specified service interface.
- *
- * <p>Hessian is a slim, binary RPC protocol.
- * For information on Hessian, see the
- * <a href="http://hessian.caucho.com">Hessian website</a>
- * <b>Note: As of Spring 4.0, this proxy factory requires Hessian 4.0 or above.</b>
- *
- * <p>The service URL must be an HTTP URL exposing a Hessian service.
- * For details, see the {@link HessianClientInterceptor} javadoc.
- *
- * @author Juergen Hoeller
- * @since 13.05.2003
- * @see #setServiceInterface
- * @see #setServiceUrl
- * @see HessianClientInterceptor
- * @see HessianServiceExporter
- * @see org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean
- * @see org.springframework.remoting.rmi.RmiProxyFactoryBean
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HessianProxyFactoryBean extends HessianClientInterceptor implements FactoryBean<Object> {
-
-	@Nullable
-	private Object serviceProxy;
-
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-		this.serviceProxy = new ProxyFactory(getServiceInterface(), this).getProxy(getBeanClassLoader());
-	}
-
-
-	@Override
-	@Nullable
-	public Object getObject() {
-		return this.serviceProxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return getServiceInterface();
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
deleted file mode 100644
index f25139ccf263..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- * 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.remoting.caucho;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.HttpRequestHandler;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.util.NestedServletException;
-
-/**
- * Servlet-API-based HTTP request handler that exports the specified service bean
- * as Hessian service endpoint, accessible via a Hessian proxy.
- *
- * <p>Hessian is a slim, binary RPC protocol.
- * For information on Hessian, see the
- * <a href="http://hessian.caucho.com">Hessian website</a>.
- * <b>Note: As of Spring 4.0, this exporter requires Hessian 4.0 or above.</b>
- *
- * <p>Hessian services exported with this class can be accessed by
- * any Hessian client, as there isn't any special handling involved.
- *
- * @author Juergen Hoeller
- * @since 13.05.2003
- * @see HessianClientInterceptor
- * @see HessianProxyFactoryBean
- * @see org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter
- * @see org.springframework.remoting.rmi.RmiServiceExporter
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HessianServiceExporter extends HessianExporter implements HttpRequestHandler {
-
-	/**
-	 * Processes the incoming Hessian request and creates a Hessian response.
-	 */
-	@Override
-	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-
-		if (!"POST".equals(request.getMethod())) {
-			throw new HttpRequestMethodNotSupportedException(request.getMethod(),
-					new String[] {"POST"}, "HessianServiceExporter only supports POST requests");
-		}
-
-		response.setContentType(CONTENT_TYPE_HESSIAN);
-		try {
-			invoke(request.getInputStream(), response.getOutputStream());
-		}
-		catch (Throwable ex) {
-			throw new NestedServletException("Hessian skeleton invocation failed", ex);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
deleted file mode 100644
index cc96b28bfa0c..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.
- * 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.remoting.caucho;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-
-import org.springframework.util.FileCopyUtils;
-
-/**
- * HTTP request handler that exports the specified service bean as
- * Hessian service endpoint, accessible via a Hessian proxy.
- * Designed for Sun's JRE 1.6 HTTP server, implementing the
- * {@link com.sun.net.httpserver.HttpHandler} interface.
- *
- * <p>Hessian is a slim, binary RPC protocol.
- * For information on Hessian, see the
- * <a href="http://hessian.caucho.com">Hessian website</a>.
- * <b>Note: As of Spring 4.0, this exporter requires Hessian 4.0 or above.</b>
- *
- * <p>Hessian services exported with this class can be accessed by
- * any Hessian client, as there isn't any special handling involved.
- *
- * @author Juergen Hoeller
- * @since 2.5.1
- * @see org.springframework.remoting.caucho.HessianClientInterceptor
- * @see org.springframework.remoting.caucho.HessianProxyFactoryBean
- * @deprecated as of Spring Framework 5.1, in favor of {@link HessianServiceExporter}
- */
-@Deprecated
-@org.springframework.lang.UsesSunHttpServer
-public class SimpleHessianServiceExporter extends HessianExporter implements HttpHandler {
-
-	/**
-	 * Processes the incoming Hessian request and creates a Hessian response.
-	 */
-	@Override
-	public void handle(HttpExchange exchange) throws IOException {
-		if (!"POST".equals(exchange.getRequestMethod())) {
-			exchange.getResponseHeaders().set("Allow", "POST");
-			exchange.sendResponseHeaders(405, -1);
-			return;
-		}
-
-		ByteArrayOutputStream output = new ByteArrayOutputStream(1024);
-		try {
-			invoke(exchange.getRequestBody(), output);
-		}
-		catch (Throwable ex) {
-			exchange.sendResponseHeaders(500, -1);
-			logger.error("Hessian skeleton invocation failed", ex);
-			return;
-		}
-
-		exchange.getResponseHeaders().set("Content-Type", CONTENT_TYPE_HESSIAN);
-		exchange.sendResponseHeaders(200, output.size());
-		FileCopyUtils.copy(output.toByteArray(), exchange.getResponseBody());
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
deleted file mode 100644
index 30d03c51762f..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * This package provides remoting classes for Caucho's Hessian protocol:
- * a proxy factory for accessing Hessian services, and an exporter for
- * making beans available to Hessian clients.
- *
- * <p>Hessian is a slim, binary RPC protocol over HTTP.
- * For information on Hessian, see the
- * <a href="http://hessian.caucho.com">Hessian website</a>
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.remoting.caucho;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
deleted file mode 100644
index b1a34258ad02..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.rmi.RemoteException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * Abstract base implementation of the HttpInvokerRequestExecutor interface.
- *
- * <p>Pre-implements serialization of RemoteInvocation objects and
- * deserialization of RemoteInvocationResults objects.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see #doExecuteRequest
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public abstract class AbstractHttpInvokerRequestExecutor implements HttpInvokerRequestExecutor, BeanClassLoaderAware {
-
-	/**
-	 * Default content type: "application/x-java-serialized-object".
-	 */
-	public static final String CONTENT_TYPE_SERIALIZED_OBJECT = "application/x-java-serialized-object";
-
-	private static final int SERIALIZED_INVOCATION_BYTE_ARRAY_INITIAL_SIZE = 1024;
-
-
-	protected static final String HTTP_METHOD_POST = "POST";
-
-	protected static final String HTTP_HEADER_ACCEPT_LANGUAGE = "Accept-Language";
-
-	protected static final String HTTP_HEADER_ACCEPT_ENCODING = "Accept-Encoding";
-
-	protected static final String HTTP_HEADER_CONTENT_ENCODING = "Content-Encoding";
-
-	protected static final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
-
-	protected static final String HTTP_HEADER_CONTENT_LENGTH = "Content-Length";
-
-	protected static final String ENCODING_GZIP = "gzip";
-
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private String contentType = CONTENT_TYPE_SERIALIZED_OBJECT;
-
-	private boolean acceptGzipEncoding = true;
-
-	@Nullable
-	private ClassLoader beanClassLoader;
-
-
-	/**
-	 * Specify the content type to use for sending HTTP invoker requests.
-	 * <p>Default is "application/x-java-serialized-object".
-	 */
-	public void setContentType(String contentType) {
-		Assert.notNull(contentType, "'contentType' must not be null");
-		this.contentType = contentType;
-	}
-
-	/**
-	 * Return the content type to use for sending HTTP invoker requests.
-	 */
-	public String getContentType() {
-		return this.contentType;
-	}
-
-	/**
-	 * Set whether to accept GZIP encoding, that is, whether to
-	 * send the HTTP "Accept-Encoding" header with "gzip" as value.
-	 * <p>Default is "true". Turn this flag off if you do not want
-	 * GZIP response compression even if enabled on the HTTP server.
-	 */
-	public void setAcceptGzipEncoding(boolean acceptGzipEncoding) {
-		this.acceptGzipEncoding = acceptGzipEncoding;
-	}
-
-	/**
-	 * Return whether to accept GZIP encoding, that is, whether to
-	 * send the HTTP "Accept-Encoding" header with "gzip" as value.
-	 */
-	public boolean isAcceptGzipEncoding() {
-		return this.acceptGzipEncoding;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
-	}
-
-	/**
-	 * Return the bean ClassLoader that this executor is supposed to use.
-	 */
-	@Nullable
-	protected ClassLoader getBeanClassLoader() {
-		return this.beanClassLoader;
-	}
-
-
-	@Override
-	public final RemoteInvocationResult executeRequest(
-			HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws Exception {
-
-		ByteArrayOutputStream baos = getByteArrayOutputStream(invocation);
-		if (logger.isDebugEnabled()) {
-			logger.debug("Sending HTTP invoker request for service at [" + config.getServiceUrl() +
-					"], with size " + baos.size());
-		}
-		return doExecuteRequest(config, baos);
-	}
-
-	/**
-	 * Serialize the given RemoteInvocation into a ByteArrayOutputStream.
-	 * @param invocation the RemoteInvocation object
-	 * @return a ByteArrayOutputStream with the serialized RemoteInvocation
-	 * @throws IOException if thrown by I/O methods
-	 */
-	protected ByteArrayOutputStream getByteArrayOutputStream(RemoteInvocation invocation) throws IOException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(SERIALIZED_INVOCATION_BYTE_ARRAY_INITIAL_SIZE);
-		writeRemoteInvocation(invocation, baos);
-		return baos;
-	}
-
-	/**
-	 * Serialize the given RemoteInvocation to the given OutputStream.
-	 * <p>The default implementation gives {@code decorateOutputStream} a chance
-	 * to decorate the stream first (for example, for custom encryption or compression).
-	 * Creates an {@code ObjectOutputStream} for the final stream and calls
-	 * {@code doWriteRemoteInvocation} to actually write the object.
-	 * <p>Can be overridden for custom serialization of the invocation.
-	 * @param invocation the RemoteInvocation object
-	 * @param os the OutputStream to write to
-	 * @throws IOException if thrown by I/O methods
-	 * @see #decorateOutputStream
-	 * @see #doWriteRemoteInvocation
-	 */
-	protected void writeRemoteInvocation(RemoteInvocation invocation, OutputStream os) throws IOException {
-		try (ObjectOutputStream oos = new ObjectOutputStream(decorateOutputStream(os))) {
-			doWriteRemoteInvocation(invocation, oos);
-		}
-	}
-
-	/**
-	 * Return the OutputStream to use for writing remote invocations,
-	 * potentially decorating the given original OutputStream.
-	 * <p>The default implementation returns the given stream as-is.
-	 * Can be overridden, for example, for custom encryption or compression.
-	 * @param os the original OutputStream
-	 * @return the potentially decorated OutputStream
-	 */
-	protected OutputStream decorateOutputStream(OutputStream os) throws IOException {
-		return os;
-	}
-
-	/**
-	 * Perform the actual writing of the given invocation object to the
-	 * given ObjectOutputStream.
-	 * <p>The default implementation simply calls {@code writeObject}.
-	 * Can be overridden for serialization of a custom wrapper object rather
-	 * than the plain invocation, for example an encryption-aware holder.
-	 * @param invocation the RemoteInvocation object
-	 * @param oos the ObjectOutputStream to write to
-	 * @throws IOException if thrown by I/O methods
-	 * @see java.io.ObjectOutputStream#writeObject
-	 */
-	protected void doWriteRemoteInvocation(RemoteInvocation invocation, ObjectOutputStream oos) throws IOException {
-		oos.writeObject(invocation);
-	}
-
-
-	/**
-	 * Execute a request to send the given serialized remote invocation.
-	 * <p>Implementations will usually call {@code readRemoteInvocationResult}
-	 * to deserialize a returned RemoteInvocationResult object.
-	 * @param config the HTTP invoker configuration that specifies the
-	 * target service
-	 * @param baos the ByteArrayOutputStream that contains the serialized
-	 * RemoteInvocation object
-	 * @return the RemoteInvocationResult object
-	 * @throws IOException if thrown by I/O operations
-	 * @throws ClassNotFoundException if thrown during deserialization
-	 * @throws Exception in case of general errors
-	 * @see #readRemoteInvocationResult(java.io.InputStream, String)
-	 */
-	protected abstract RemoteInvocationResult doExecuteRequest(
-			HttpInvokerClientConfiguration config, ByteArrayOutputStream baos)
-			throws Exception;
-
-	/**
-	 * Deserialize a RemoteInvocationResult object from the given InputStream.
-	 * <p>Gives {@code decorateInputStream} a chance to decorate the stream
-	 * first (for example, for custom encryption or compression). Creates an
-	 * {@code ObjectInputStream} via {@code createObjectInputStream} and
-	 * calls {@code doReadRemoteInvocationResult} to actually read the object.
-	 * <p>Can be overridden for custom serialization of the invocation.
-	 * @param is the InputStream to read from
-	 * @param codebaseUrl the codebase URL to load classes from if not found locally
-	 * @return the RemoteInvocationResult object
-	 * @throws IOException if thrown by I/O methods
-	 * @throws ClassNotFoundException if thrown during deserialization
-	 * @see #decorateInputStream
-	 * @see #createObjectInputStream
-	 * @see #doReadRemoteInvocationResult
-	 */
-	protected RemoteInvocationResult readRemoteInvocationResult(InputStream is, @Nullable String codebaseUrl)
-			throws IOException, ClassNotFoundException {
-
-		try (ObjectInputStream ois = createObjectInputStream(decorateInputStream(is), codebaseUrl)) {
-			return doReadRemoteInvocationResult(ois);
-		}
-	}
-
-	/**
-	 * Return the InputStream to use for reading remote invocation results,
-	 * potentially decorating the given original InputStream.
-	 * <p>The default implementation returns the given stream as-is.
-	 * Can be overridden, for example, for custom encryption or compression.
-	 * @param is the original InputStream
-	 * @return the potentially decorated InputStream
-	 */
-	protected InputStream decorateInputStream(InputStream is) throws IOException {
-		return is;
-	}
-
-	/**
-	 * Create an ObjectInputStream for the given InputStream and codebase.
-	 * The default implementation creates a CodebaseAwareObjectInputStream.
-	 * @param is the InputStream to read from
-	 * @param codebaseUrl the codebase URL to load classes from if not found locally
-	 * (can be {@code null})
-	 * @return the new ObjectInputStream instance to use
-	 * @throws IOException if creation of the ObjectInputStream failed
-	 * @see org.springframework.remoting.rmi.CodebaseAwareObjectInputStream
-	 */
-	protected ObjectInputStream createObjectInputStream(InputStream is, @Nullable String codebaseUrl) throws IOException {
-		return new org.springframework.remoting.rmi.CodebaseAwareObjectInputStream(is, getBeanClassLoader(), codebaseUrl);
-	}
-
-	/**
-	 * Perform the actual reading of an invocation object from the
-	 * given ObjectInputStream.
-	 * <p>The default implementation simply calls {@code readObject}.
-	 * Can be overridden for deserialization of a custom wrapper object rather
-	 * than the plain invocation, for example an encryption-aware holder.
-	 * @param ois the ObjectInputStream to read from
-	 * @return the RemoteInvocationResult object
-	 * @throws IOException if thrown by I/O methods
-	 * @throws ClassNotFoundException if the class name of a serialized object
-	 * couldn't get resolved
-	 * @see java.io.ObjectOutputStream#writeObject
-	 */
-	protected RemoteInvocationResult doReadRemoteInvocationResult(ObjectInputStream ois)
-			throws IOException, ClassNotFoundException {
-
-		Object obj = ois.readObject();
-		if (!(obj instanceof RemoteInvocationResult)) {
-			throw new RemoteException("Deserialized object needs to be assignable to type [" +
-					RemoteInvocationResult.class.getName() + "]: " + ClassUtils.getDescriptiveType(obj));
-		}
-		return (RemoteInvocationResult) obj;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
deleted file mode 100644
index c8a278fec427..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-import java.util.zip.GZIPInputStream;
-
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.Configurable;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-
-import org.springframework.context.i18n.LocaleContext;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.remoting.httpinvoker.HttpInvokerRequestExecutor} implementation that uses
- * <a href="https://hc.apache.org/httpcomponents-client-ga/httpclient/">Apache HttpComponents HttpClient</a>
- * to execute POST requests.
- *
- * <p>Allows to use a pre-configured {@link org.apache.http.client.HttpClient}
- * instance, potentially with authentication, HTTP connection pooling, etc.
- * Also designed for easy subclassing, providing specific template methods.
- *
- * <p>As of Spring 4.1, this request executor requires Apache HttpComponents 4.3 or higher.
- *
- * @author Juergen Hoeller
- * @author Stephane Nicoll
- * @since 3.1
- * @see org.springframework.remoting.httpinvoker.SimpleHttpInvokerRequestExecutor
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HttpComponentsHttpInvokerRequestExecutor extends AbstractHttpInvokerRequestExecutor {
-
-	private static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 100;
-
-	private static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 5;
-
-	private static final int DEFAULT_READ_TIMEOUT_MILLISECONDS = (60 * 1000);
-
-
-	private HttpClient httpClient;
-
-	@Nullable
-	private RequestConfig requestConfig;
-
-
-	/**
-	 * Create a new instance of the HttpComponentsHttpInvokerRequestExecutor with a default
-	 * {@link HttpClient} that uses a default {@code org.apache.http.impl.conn.PoolingClientConnectionManager}.
-	 */
-	public HttpComponentsHttpInvokerRequestExecutor() {
-		this(createDefaultHttpClient(), RequestConfig.custom()
-				.setSocketTimeout(DEFAULT_READ_TIMEOUT_MILLISECONDS).build());
-	}
-
-	/**
-	 * Create a new instance of the HttpComponentsClientHttpRequestFactory
-	 * with the given {@link HttpClient} instance.
-	 * @param httpClient the HttpClient instance to use for this request executor
-	 */
-	public HttpComponentsHttpInvokerRequestExecutor(HttpClient httpClient) {
-		this(httpClient, null);
-	}
-
-	private HttpComponentsHttpInvokerRequestExecutor(HttpClient httpClient, @Nullable RequestConfig requestConfig) {
-		this.httpClient = httpClient;
-		this.requestConfig = requestConfig;
-	}
-
-
-	private static HttpClient createDefaultHttpClient() {
-		Registry<ConnectionSocketFactory> schemeRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
-				.register("http", PlainConnectionSocketFactory.getSocketFactory())
-				.register("https", SSLConnectionSocketFactory.getSocketFactory())
-				.build();
-
-		PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(schemeRegistry);
-		connectionManager.setMaxTotal(DEFAULT_MAX_TOTAL_CONNECTIONS);
-		connectionManager.setDefaultMaxPerRoute(DEFAULT_MAX_CONNECTIONS_PER_ROUTE);
-
-		return HttpClientBuilder.create().setConnectionManager(connectionManager).build();
-	}
-
-
-	/**
-	 * Set the {@link HttpClient} instance to use for this request executor.
-	 */
-	public void setHttpClient(HttpClient httpClient) {
-		this.httpClient = httpClient;
-	}
-
-	/**
-	 * Return the {@link HttpClient} instance that this request executor uses.
-	 */
-	public HttpClient getHttpClient() {
-		return this.httpClient;
-	}
-
-	/**
-	 * Set the connection timeout for the underlying HttpClient.
-	 * A timeout value of 0 specifies an infinite timeout.
-	 * <p>Additional properties can be configured by specifying a
-	 * {@link RequestConfig} instance on a custom {@link HttpClient}.
-	 * @param timeout the timeout value in milliseconds
-	 * @see RequestConfig#getConnectTimeout()
-	 */
-	public void setConnectTimeout(int timeout) {
-		Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
-		this.requestConfig = cloneRequestConfig().setConnectTimeout(timeout).build();
-	}
-
-	/**
-	 * Set the timeout in milliseconds used when requesting a connection from the connection
-	 * manager using the underlying HttpClient.
-	 * A timeout value of 0 specifies an infinite timeout.
-	 * <p>Additional properties can be configured by specifying a
-	 * {@link RequestConfig} instance on a custom {@link HttpClient}.
-	 * @param connectionRequestTimeout the timeout value to request a connection in milliseconds
-	 * @see RequestConfig#getConnectionRequestTimeout()
-	 */
-	public void setConnectionRequestTimeout(int connectionRequestTimeout) {
-		this.requestConfig = cloneRequestConfig().setConnectionRequestTimeout(connectionRequestTimeout).build();
-	}
-
-	/**
-	 * Set the socket read timeout for the underlying HttpClient.
-	 * A timeout value of 0 specifies an infinite timeout.
-	 * <p>Additional properties can be configured by specifying a
-	 * {@link RequestConfig} instance on a custom {@link HttpClient}.
-	 * @param timeout the timeout value in milliseconds
-	 * @see #DEFAULT_READ_TIMEOUT_MILLISECONDS
-	 * @see RequestConfig#getSocketTimeout()
-	 */
-	public void setReadTimeout(int timeout) {
-		Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value");
-		this.requestConfig = cloneRequestConfig().setSocketTimeout(timeout).build();
-	}
-
-	private RequestConfig.Builder cloneRequestConfig() {
-		return (this.requestConfig != null ? RequestConfig.copy(this.requestConfig) : RequestConfig.custom());
-	}
-
-
-	/**
-	 * Execute the given request through the HttpClient.
-	 * <p>This method implements the basic processing workflow:
-	 * The actual work happens in this class's template methods.
-	 * @see #createHttpPost
-	 * @see #setRequestBody
-	 * @see #executeHttpPost
-	 * @see #validateResponse
-	 * @see #getResponseBody
-	 */
-	@Override
-	protected RemoteInvocationResult doExecuteRequest(
-			HttpInvokerClientConfiguration config, ByteArrayOutputStream baos)
-			throws IOException, ClassNotFoundException {
-
-		HttpPost postMethod = createHttpPost(config);
-		setRequestBody(config, postMethod, baos);
-		try {
-			HttpResponse response = executeHttpPost(config, getHttpClient(), postMethod);
-			validateResponse(config, response);
-			InputStream responseBody = getResponseBody(config, response);
-			return readRemoteInvocationResult(responseBody, config.getCodebaseUrl());
-		}
-		finally {
-			postMethod.releaseConnection();
-		}
-	}
-
-	/**
-	 * Create an HttpPost for the given configuration.
-	 * <p>The default implementation creates a standard HttpPost with
-	 * "application/x-java-serialized-object" as "Content-Type" header.
-	 * @param config the HTTP invoker configuration that specifies the
-	 * target service
-	 * @return the HttpPost instance
-	 * @throws java.io.IOException if thrown by I/O methods
-	 */
-	protected HttpPost createHttpPost(HttpInvokerClientConfiguration config) throws IOException {
-		HttpPost httpPost = new HttpPost(config.getServiceUrl());
-
-		RequestConfig requestConfig = createRequestConfig(config);
-		if (requestConfig != null) {
-			httpPost.setConfig(requestConfig);
-		}
-
-		LocaleContext localeContext = LocaleContextHolder.getLocaleContext();
-		if (localeContext != null) {
-			Locale locale = localeContext.getLocale();
-			if (locale != null) {
-				httpPost.addHeader(HTTP_HEADER_ACCEPT_LANGUAGE, locale.toLanguageTag());
-			}
-		}
-
-		if (isAcceptGzipEncoding()) {
-			httpPost.addHeader(HTTP_HEADER_ACCEPT_ENCODING, ENCODING_GZIP);
-		}
-
-		return httpPost;
-	}
-
-	/**
-	 * Create a {@link RequestConfig} for the given configuration. Can return {@code null}
-	 * to indicate that no custom request config should be set and the defaults of the
-	 * {@link HttpClient} should be used.
-	 * <p>The default implementation tries to merge the defaults of the client with the
-	 * local customizations of the instance, if any.
-	 * @param config the HTTP invoker configuration that specifies the
-	 * target service
-	 * @return the RequestConfig to use
-	 */
-	@Nullable
-	protected RequestConfig createRequestConfig(HttpInvokerClientConfiguration config) {
-		HttpClient client = getHttpClient();
-		if (client instanceof Configurable) {
-			RequestConfig clientRequestConfig = ((Configurable) client).getConfig();
-			return mergeRequestConfig(clientRequestConfig);
-		}
-		return this.requestConfig;
-	}
-
-	private RequestConfig mergeRequestConfig(RequestConfig defaultRequestConfig) {
-		if (this.requestConfig == null) {  // nothing to merge
-			return defaultRequestConfig;
-		}
-
-		RequestConfig.Builder builder = RequestConfig.copy(defaultRequestConfig);
-		int connectTimeout = this.requestConfig.getConnectTimeout();
-		if (connectTimeout >= 0) {
-			builder.setConnectTimeout(connectTimeout);
-		}
-		int connectionRequestTimeout = this.requestConfig.getConnectionRequestTimeout();
-		if (connectionRequestTimeout >= 0) {
-			builder.setConnectionRequestTimeout(connectionRequestTimeout);
-		}
-		int socketTimeout = this.requestConfig.getSocketTimeout();
-		if (socketTimeout >= 0) {
-			builder.setSocketTimeout(socketTimeout);
-		}
-		return builder.build();
-	}
-
-	/**
-	 * Set the given serialized remote invocation as request body.
-	 * <p>The default implementation simply sets the serialized invocation as the
-	 * HttpPost's request body. This can be overridden, for example, to write a
-	 * specific encoding and to potentially set appropriate HTTP request headers.
-	 * @param config the HTTP invoker configuration that specifies the target service
-	 * @param httpPost the HttpPost to set the request body on
-	 * @param baos the ByteArrayOutputStream that contains the serialized
-	 * RemoteInvocation object
-	 * @throws java.io.IOException if thrown by I/O methods
-	 */
-	protected void setRequestBody(
-			HttpInvokerClientConfiguration config, HttpPost httpPost, ByteArrayOutputStream baos)
-			throws IOException {
-
-		ByteArrayEntity entity = new ByteArrayEntity(baos.toByteArray());
-		entity.setContentType(getContentType());
-		httpPost.setEntity(entity);
-	}
-
-	/**
-	 * Execute the given HttpPost instance.
-	 * @param config the HTTP invoker configuration that specifies the target service
-	 * @param httpClient the HttpClient to execute on
-	 * @param httpPost the HttpPost to execute
-	 * @return the resulting HttpResponse
-	 * @throws java.io.IOException if thrown by I/O methods
-	 */
-	protected HttpResponse executeHttpPost(
-			HttpInvokerClientConfiguration config, HttpClient httpClient, HttpPost httpPost)
-			throws IOException {
-
-		return httpClient.execute(httpPost);
-	}
-
-	/**
-	 * Validate the given response as contained in the HttpPost object,
-	 * throwing an exception if it does not correspond to a successful HTTP response.
-	 * <p>Default implementation rejects any HTTP status code beyond 2xx, to avoid
-	 * parsing the response body and trying to deserialize from a corrupted stream.
-	 * @param config the HTTP invoker configuration that specifies the target service
-	 * @param response the resulting HttpResponse to validate
-	 * @throws java.io.IOException if validation failed
-	 */
-	protected void validateResponse(HttpInvokerClientConfiguration config, HttpResponse response)
-			throws IOException {
-
-		StatusLine status = response.getStatusLine();
-		if (status.getStatusCode() >= 300) {
-			throw new NoHttpResponseException(
-					"Did not receive successful HTTP response: status code = " + status.getStatusCode() +
-					", status message = [" + status.getReasonPhrase() + "]");
-		}
-	}
-
-	/**
-	 * Extract the response body from the given executed remote invocation request.
-	 * <p>The default implementation simply fetches the HttpPost's response body stream.
-	 * If the response is recognized as GZIP response, the InputStream will get wrapped
-	 * in a GZIPInputStream.
-	 * @param config the HTTP invoker configuration that specifies the target service
-	 * @param httpResponse the resulting HttpResponse to read the response body from
-	 * @return an InputStream for the response body
-	 * @throws java.io.IOException if thrown by I/O methods
-	 * @see #isGzipResponse
-	 * @see java.util.zip.GZIPInputStream
-	 */
-	protected InputStream getResponseBody(HttpInvokerClientConfiguration config, HttpResponse httpResponse)
-			throws IOException {
-
-		if (isGzipResponse(httpResponse)) {
-			return new GZIPInputStream(httpResponse.getEntity().getContent());
-		}
-		else {
-			return httpResponse.getEntity().getContent();
-		}
-	}
-
-	/**
-	 * Determine whether the given response indicates a GZIP response.
-	 * <p>The default implementation checks whether the HTTP "Content-Encoding"
-	 * header contains "gzip" (in any casing).
-	 * @param httpResponse the resulting HttpResponse to check
-	 * @return whether the given response indicates a GZIP response
-	 */
-	protected boolean isGzipResponse(HttpResponse httpResponse) {
-		Header encodingHeader = httpResponse.getFirstHeader(HTTP_HEADER_CONTENT_ENCODING);
-		return (encodingHeader != null && encodingHeader.getValue() != null &&
-				encodingHeader.getValue().toLowerCase().contains(ENCODING_GZIP));
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
deleted file mode 100644
index 9e81e1d289ec..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Configuration interface for executing HTTP invoker requests.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see HttpInvokerRequestExecutor
- * @see HttpInvokerClientInterceptor
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public interface HttpInvokerClientConfiguration {
-
-	/**
-	 * Return the HTTP URL of the target service.
-	 */
-	String getServiceUrl();
-
-	/**
-	 * Return the codebase URL to download classes from if not found locally.
-	 * Can consist of multiple URLs, separated by spaces.
-	 * @return the codebase URL, or {@code null} if none
-	 * @see java.rmi.server.RMIClassLoader
-	 */
-	@Nullable
-	String getCodebaseUrl();
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
deleted file mode 100644
index 361101475e34..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.IOException;
-import java.io.InvalidClassException;
-import java.net.ConnectException;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.aop.support.AopUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteInvocationFailureException;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationBasedAccessor;
-import org.springframework.remoting.support.RemoteInvocationResult;
-
-/**
- * {@link org.aopalliance.intercept.MethodInterceptor} for accessing an
- * HTTP invoker service. The service URL must be an HTTP URL exposing
- * an HTTP invoker service.
- *
- * <p>Serializes remote invocation objects and deserializes remote invocation
- * result objects. Uses Java serialization just like RMI, but provides the
- * same ease of setup as Caucho's HTTP-based Hessian protocol.
- *
- * <P>HTTP invoker is a very extensible and customizable protocol.
- * It supports the RemoteInvocationFactory mechanism, like RMI invoker,
- * allowing to include additional invocation attributes (for example,
- * a security context). Furthermore, it allows to customize request
- * execution via the {@link HttpInvokerRequestExecutor} strategy.
- *
- * <p>Can use the JDK's {@link java.rmi.server.RMIClassLoader} to load classes
- * from a given {@link #setCodebaseUrl codebase}, performing on-demand dynamic
- * code download from a remote location. The codebase can consist of multiple
- * URLs, separated by spaces. Note that RMIClassLoader requires a SecurityManager
- * to be set, analogous to when using dynamic class download with standard RMI!
- * (See the RMI documentation for details.)
- *
- * <p><b>WARNING: Be aware of vulnerabilities due to unsafe Java deserialization:
- * Manipulated input streams could lead to unwanted code execution on the server
- * during the deserialization step. As a consequence, do not expose HTTP invoker
- * endpoints to untrusted clients but rather just between your own services.</b>
- * In general, we strongly recommend any other message format (e.g. JSON) instead.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see #setServiceUrl
- * @see #setCodebaseUrl
- * @see #setRemoteInvocationFactory
- * @see #setHttpInvokerRequestExecutor
- * @see HttpInvokerServiceExporter
- * @see HttpInvokerProxyFactoryBean
- * @see java.rmi.server.RMIClassLoader
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
-		implements MethodInterceptor, HttpInvokerClientConfiguration {
-
-	@Nullable
-	private String codebaseUrl;
-
-	@Nullable
-	private HttpInvokerRequestExecutor httpInvokerRequestExecutor;
-
-
-	/**
-	 * Set the codebase URL to download classes from if not found locally.
-	 * Can consists of multiple URLs, separated by spaces.
-	 * <p>Follows RMI's codebase conventions for dynamic class download.
-	 * In contrast to RMI, where the server determines the URL for class download
-	 * (via the "java.rmi.server.codebase" system property), it's the client
-	 * that determines the codebase URL here. The server will usually be the
-	 * same as for the service URL, just pointing to a different path there.
-	 * @see #setServiceUrl
-	 * @see org.springframework.remoting.rmi.CodebaseAwareObjectInputStream
-	 * @see java.rmi.server.RMIClassLoader
-	 */
-	public void setCodebaseUrl(@Nullable String codebaseUrl) {
-		this.codebaseUrl = codebaseUrl;
-	}
-
-	/**
-	 * Return the codebase URL to download classes from if not found locally.
-	 */
-	@Override
-	@Nullable
-	public String getCodebaseUrl() {
-		return this.codebaseUrl;
-	}
-
-	/**
-	 * Set the HttpInvokerRequestExecutor implementation to use for executing
-	 * remote invocations.
-	 * <p>Default is {@link SimpleHttpInvokerRequestExecutor}. Alternatively,
-	 * consider using {@link HttpComponentsHttpInvokerRequestExecutor} for more
-	 * sophisticated needs.
-	 * @see SimpleHttpInvokerRequestExecutor
-	 * @see HttpComponentsHttpInvokerRequestExecutor
-	 */
-	public void setHttpInvokerRequestExecutor(HttpInvokerRequestExecutor httpInvokerRequestExecutor) {
-		this.httpInvokerRequestExecutor = httpInvokerRequestExecutor;
-	}
-
-	/**
-	 * Return the HttpInvokerRequestExecutor used by this remote accessor.
-	 * <p>Creates a default SimpleHttpInvokerRequestExecutor if no executor
-	 * has been initialized already.
-	 */
-	public HttpInvokerRequestExecutor getHttpInvokerRequestExecutor() {
-		if (this.httpInvokerRequestExecutor == null) {
-			SimpleHttpInvokerRequestExecutor executor = new SimpleHttpInvokerRequestExecutor();
-			executor.setBeanClassLoader(getBeanClassLoader());
-			this.httpInvokerRequestExecutor = executor;
-		}
-		return this.httpInvokerRequestExecutor;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-
-		// Eagerly initialize the default HttpInvokerRequestExecutor, if needed.
-		getHttpInvokerRequestExecutor();
-	}
-
-
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
-			return "HTTP invoker proxy for service URL [" + getServiceUrl() + "]";
-		}
-
-		RemoteInvocation invocation = createRemoteInvocation(methodInvocation);
-		RemoteInvocationResult result;
-
-		try {
-			result = executeRequest(invocation, methodInvocation);
-		}
-		catch (Throwable ex) {
-			RemoteAccessException rae = convertHttpInvokerAccessException(ex);
-			throw (rae != null ? rae : ex);
-		}
-
-		try {
-			return recreateRemoteInvocationResult(result);
-		}
-		catch (Throwable ex) {
-			if (result.hasInvocationTargetException()) {
-				throw ex;
-			}
-			else {
-				throw new RemoteInvocationFailureException("Invocation of method [" + methodInvocation.getMethod() +
-						"] failed in HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
-			}
-		}
-	}
-
-	/**
-	 * Execute the given remote invocation via the {@link HttpInvokerRequestExecutor}.
-	 * <p>This implementation delegates to {@link #executeRequest(RemoteInvocation)}.
-	 * Can be overridden to react to the specific original MethodInvocation.
-	 * @param invocation the RemoteInvocation to execute
-	 * @param originalInvocation the original MethodInvocation (can e.g. be cast
-	 * to the ProxyMethodInvocation interface for accessing user attributes)
-	 * @return the RemoteInvocationResult object
-	 * @throws Exception in case of errors
-	 */
-	protected RemoteInvocationResult executeRequest(
-			RemoteInvocation invocation, MethodInvocation originalInvocation) throws Exception {
-
-		return executeRequest(invocation);
-	}
-
-	/**
-	 * Execute the given remote invocation via the {@link HttpInvokerRequestExecutor}.
-	 * <p>Can be overridden in subclasses to pass a different configuration object
-	 * to the executor. Alternatively, add further configuration properties in a
-	 * subclass of this accessor: By default, the accessor passed itself as
-	 * configuration object to the executor.
-	 * @param invocation the RemoteInvocation to execute
-	 * @return the RemoteInvocationResult object
-	 * @throws IOException if thrown by I/O operations
-	 * @throws ClassNotFoundException if thrown during deserialization
-	 * @throws Exception in case of general errors
-	 * @see #getHttpInvokerRequestExecutor
-	 * @see HttpInvokerClientConfiguration
-	 */
-	protected RemoteInvocationResult executeRequest(RemoteInvocation invocation) throws Exception {
-		return getHttpInvokerRequestExecutor().executeRequest(this, invocation);
-	}
-
-	/**
-	 * Convert the given HTTP invoker access exception to an appropriate
-	 * Spring {@link RemoteAccessException}.
-	 * @param ex the exception to convert
-	 * @return the RemoteAccessException to throw, or {@code null} to have the
-	 * original exception propagated to the caller
-	 */
-	@Nullable
-	protected RemoteAccessException convertHttpInvokerAccessException(Throwable ex) {
-		if (ex instanceof ConnectException) {
-			return new RemoteConnectFailureException(
-					"Could not connect to HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
-		}
-
-		if (ex instanceof ClassNotFoundException || ex instanceof NoClassDefFoundError ||
-				ex instanceof InvalidClassException) {
-			return new RemoteAccessException(
-					"Could not deserialize result from HTTP invoker remote service [" + getServiceUrl() + "]", ex);
-		}
-
-		if (ex instanceof Exception) {
-			return new RemoteAccessException(
-					"Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
-		}
-
-		// For any other Throwable, e.g. OutOfMemoryError: let it get propagated as-is.
-		return null;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
deleted file mode 100644
index ae483e45ff80..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * {@link FactoryBean} for HTTP invoker proxies. Exposes the proxied service
- * for use as a bean reference, using the specified service interface.
- *
- * <p>The service URL must be an HTTP URL exposing an HTTP invoker service.
- * Optionally, a codebase URL can be specified for on-demand dynamic code download
- * from a remote location. For details, see HttpInvokerClientInterceptor docs.
- *
- * <p>Serializes remote invocation objects and deserializes remote invocation
- * result objects. Uses Java serialization just like RMI, but provides the
- * same ease of setup as Caucho's HTTP-based Hessian protocol.
- *
- * <p><b>HTTP invoker is the recommended protocol for Java-to-Java remoting.</b>
- * It is more powerful and more extensible than Hessian, at the expense of
- * being tied to Java. Nevertheless, it is as easy to set up as Hessian,
- * which is its main advantage compared to RMI.
- *
- * <p><b>WARNING: Be aware of vulnerabilities due to unsafe Java deserialization:
- * Manipulated input streams could lead to unwanted code execution on the server
- * during the deserialization step. As a consequence, do not expose HTTP invoker
- * endpoints to untrusted clients but rather just between your own services.</b>
- * In general, we strongly recommend any other message format (e.g. JSON) instead.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see #setServiceInterface
- * @see #setServiceUrl
- * @see #setCodebaseUrl
- * @see HttpInvokerClientInterceptor
- * @see HttpInvokerServiceExporter
- * @see org.springframework.remoting.rmi.RmiProxyFactoryBean
- * @see org.springframework.remoting.caucho.HessianProxyFactoryBean
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HttpInvokerProxyFactoryBean extends HttpInvokerClientInterceptor implements FactoryBean<Object> {
-
-	@Nullable
-	private Object serviceProxy;
-
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-		Class<?> ifc = getServiceInterface();
-		Assert.notNull(ifc, "Property 'serviceInterface' is required");
-		this.serviceProxy = new ProxyFactory(ifc, this).getProxy(getBeanClassLoader());
-	}
-
-
-	@Override
-	@Nullable
-	public Object getObject() {
-		return this.serviceProxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return getServiceInterface();
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java
deleted file mode 100644
index d5236e517996..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerRequestExecutor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.IOException;
-
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationResult;
-
-/**
- * Strategy interface for actual execution of an HTTP invoker request.
- * Used by HttpInvokerClientInterceptor and its subclass
- * HttpInvokerProxyFactoryBean.
- *
- * <p>Two implementations are provided out of the box:
- * <ul>
- * <li><b>{@code SimpleHttpInvokerRequestExecutor}:</b>
- * Uses JDK facilities to execute POST requests, without support
- * for HTTP authentication or advanced configuration options.
- * <li><b>{@code HttpComponentsHttpInvokerRequestExecutor}:</b>
- * Uses Apache's Commons HttpClient to execute POST requests,
- * allowing to use a preconfigured HttpClient instance
- * (potentially with authentication, HTTP connection pooling, etc).
- * </ul>
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see HttpInvokerClientInterceptor#setHttpInvokerRequestExecutor
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-@FunctionalInterface
-public interface HttpInvokerRequestExecutor {
-
-	/**
-	 * Execute a request to send the given remote invocation.
-	 * @param config the HTTP invoker configuration that specifies the
-	 * target service
-	 * @param invocation the RemoteInvocation to execute
-	 * @return the RemoteInvocationResult object
-	 * @throws IOException if thrown by I/O operations
-	 * @throws ClassNotFoundException if thrown during deserialization
-	 * @throws Exception in case of general errors
-	 */
-	RemoteInvocationResult executeRequest(HttpInvokerClientConfiguration config, RemoteInvocation invocation)
-			throws Exception;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
deleted file mode 100644
index dc1a0ac746bf..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.web.HttpRequestHandler;
-import org.springframework.web.util.NestedServletException;
-
-/**
- * Servlet-API-based HTTP request handler that exports the specified service bean
- * as HTTP invoker service endpoint, accessible via an HTTP invoker proxy.
- *
- * <p>Deserializes remote invocation objects and serializes remote invocation
- * result objects. Uses Java serialization just like RMI, but provides the
- * same ease of setup as Caucho's HTTP-based Hessian protocol.
- *
- * <p><b>HTTP invoker is the recommended protocol for Java-to-Java remoting.</b>
- * It is more powerful and more extensible than Hessian, at the expense of
- * being tied to Java. Nevertheless, it is as easy to set up as Hessian,
- * which is its main advantage compared to RMI.
- *
- * <p><b>WARNING: Be aware of vulnerabilities due to unsafe Java deserialization:
- * Manipulated input streams could lead to unwanted code execution on the server
- * during the deserialization step. As a consequence, do not expose HTTP invoker
- * endpoints to untrusted clients but rather just between your own services.</b>
- * In general, we strongly recommend any other message format (e.g. JSON) instead.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see HttpInvokerClientInterceptor
- * @see HttpInvokerProxyFactoryBean
- * @see org.springframework.remoting.rmi.RmiServiceExporter
- * @see org.springframework.remoting.caucho.HessianServiceExporter
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class HttpInvokerServiceExporter extends org.springframework.remoting.rmi.RemoteInvocationSerializingExporter implements HttpRequestHandler {
-
-	/**
-	 * Reads a remote invocation from the request, executes it,
-	 * and writes the remote invocation result to the response.
-	 * @see #readRemoteInvocation(HttpServletRequest)
-	 * @see #invokeAndCreateResult(org.springframework.remoting.support.RemoteInvocation, Object)
-	 * @see #writeRemoteInvocationResult(HttpServletRequest, HttpServletResponse, RemoteInvocationResult)
-	 */
-	@Override
-	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-
-		try {
-			RemoteInvocation invocation = readRemoteInvocation(request);
-			RemoteInvocationResult result = invokeAndCreateResult(invocation, getProxy());
-			writeRemoteInvocationResult(request, response, result);
-		}
-		catch (ClassNotFoundException ex) {
-			throw new NestedServletException("Class not found during deserialization", ex);
-		}
-	}
-
-	/**
-	 * Read a RemoteInvocation from the given HTTP request.
-	 * <p>Delegates to {@link #readRemoteInvocation(HttpServletRequest, InputStream)} with
-	 * the {@link HttpServletRequest#getInputStream() servlet request's input stream}.
-	 * @param request current HTTP request
-	 * @return the RemoteInvocation object
-	 * @throws IOException in case of I/O failure
-	 * @throws ClassNotFoundException if thrown by deserialization
-	 */
-	protected RemoteInvocation readRemoteInvocation(HttpServletRequest request)
-			throws IOException, ClassNotFoundException {
-
-		return readRemoteInvocation(request, request.getInputStream());
-	}
-
-	/**
-	 * Deserialize a RemoteInvocation object from the given InputStream.
-	 * <p>Gives {@link #decorateInputStream} a chance to decorate the stream
-	 * first (for example, for custom encryption or compression). Creates a
-	 * {@link org.springframework.remoting.rmi.CodebaseAwareObjectInputStream}
-	 * and calls {@link #doReadRemoteInvocation} to actually read the object.
-	 * <p>Can be overridden for custom serialization of the invocation.
-	 * @param request current HTTP request
-	 * @param is the InputStream to read from
-	 * @return the RemoteInvocation object
-	 * @throws IOException in case of I/O failure
-	 * @throws ClassNotFoundException if thrown during deserialization
-	 */
-	protected RemoteInvocation readRemoteInvocation(HttpServletRequest request, InputStream is)
-			throws IOException, ClassNotFoundException {
-
-		try (ObjectInputStream ois = createObjectInputStream(decorateInputStream(request, is))) {
-			return doReadRemoteInvocation(ois);
-		}
-	}
-
-	/**
-	 * Return the InputStream to use for reading remote invocations,
-	 * potentially decorating the given original InputStream.
-	 * <p>The default implementation returns the given stream as-is.
-	 * Can be overridden, for example, for custom encryption or compression.
-	 * @param request current HTTP request
-	 * @param is the original InputStream
-	 * @return the potentially decorated InputStream
-	 * @throws IOException in case of I/O failure
-	 */
-	protected InputStream decorateInputStream(HttpServletRequest request, InputStream is) throws IOException {
-		return is;
-	}
-
-	/**
-	 * Write the given RemoteInvocationResult to the given HTTP response.
-	 * @param request current HTTP request
-	 * @param response current HTTP response
-	 * @param result the RemoteInvocationResult object
-	 * @throws IOException in case of I/O failure
-	 */
-	protected void writeRemoteInvocationResult(
-			HttpServletRequest request, HttpServletResponse response, RemoteInvocationResult result)
-			throws IOException {
-
-		response.setContentType(getContentType());
-		writeRemoteInvocationResult(request, response, result, response.getOutputStream());
-	}
-
-	/**
-	 * Serialize the given RemoteInvocation to the given OutputStream.
-	 * <p>The default implementation gives {@link #decorateOutputStream} a chance
-	 * to decorate the stream first (for example, for custom encryption or compression).
-	 * Creates an {@link java.io.ObjectOutputStream} for the final stream and calls
-	 * {@link #doWriteRemoteInvocationResult} to actually write the object.
-	 * <p>Can be overridden for custom serialization of the invocation.
-	 * @param request current HTTP request
-	 * @param response current HTTP response
-	 * @param result the RemoteInvocationResult object
-	 * @param os the OutputStream to write to
-	 * @throws IOException in case of I/O failure
-	 * @see #decorateOutputStream
-	 * @see #doWriteRemoteInvocationResult
-	 */
-	protected void writeRemoteInvocationResult(
-			HttpServletRequest request, HttpServletResponse response, RemoteInvocationResult result, OutputStream os)
-			throws IOException {
-
-		try (ObjectOutputStream oos =
-					createObjectOutputStream(new FlushGuardedOutputStream(decorateOutputStream(request, response, os)))) {
-			doWriteRemoteInvocationResult(result, oos);
-		}
-	}
-
-	/**
-	 * Return the OutputStream to use for writing remote invocation results,
-	 * potentially decorating the given original OutputStream.
-	 * <p>The default implementation returns the given stream as-is.
-	 * Can be overridden, for example, for custom encryption or compression.
-	 * @param request current HTTP request
-	 * @param response current HTTP response
-	 * @param os the original OutputStream
-	 * @return the potentially decorated OutputStream
-	 * @throws IOException in case of I/O failure
-	 */
-	protected OutputStream decorateOutputStream(
-			HttpServletRequest request, HttpServletResponse response, OutputStream os) throws IOException {
-
-		return os;
-	}
-
-
-	/**
-	 * Decorate an {@code OutputStream} to guard against {@code flush()} calls,
-	 * which are turned into no-ops.
-	 * <p>Because {@link ObjectOutputStream#close()} will in fact flush/drain
-	 * the underlying stream twice, this {@link FilterOutputStream} will
-	 * guard against individual flush calls. Multiple flush calls can lead
-	 * to performance issues, since writes aren't gathered as they should be.
-	 * @see <a href="https://jira.spring.io/browse/SPR-14040">SPR-14040</a>
-	 */
-	private static class FlushGuardedOutputStream extends FilterOutputStream {
-
-		public FlushGuardedOutputStream(OutputStream out) {
-			super(out);
-		}
-
-		@Override
-		public void flush() throws IOException {
-			// Do nothing on flush
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java
deleted file mode 100644
index b4c8f31c364b..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerRequestExecutor.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Locale;
-import java.util.zip.GZIPInputStream;
-
-import org.springframework.context.i18n.LocaleContext;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.remoting.support.RemoteInvocationResult;
-
-/**
- * {@link org.springframework.remoting.httpinvoker.HttpInvokerRequestExecutor} implementation
- * that uses standard Java facilities to execute POST requests, without support for HTTP
- * authentication or advanced configuration options.
- *
- * <p>Designed for easy subclassing, customizing specific template methods. However,
- * consider {@code HttpComponentsHttpInvokerRequestExecutor} for more sophisticated needs:
- * The standard {@link HttpURLConnection} class is rather limited in its capabilities.
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see java.net.HttpURLConnection
- * @deprecated as of 5.3 (phasing out serialization-based remoting)
- */
-@Deprecated
-public class SimpleHttpInvokerRequestExecutor extends AbstractHttpInvokerRequestExecutor {
-
-	private int connectTimeout = -1;
-
-	private int readTimeout = -1;
-
-
-	/**
-	 * Set the underlying URLConnection's connect timeout (in milliseconds).
-	 * A timeout value of 0 specifies an infinite timeout.
-	 * <p>Default is the system's default timeout.
-	 * @see URLConnection#setConnectTimeout(int)
-	 */
-	public void setConnectTimeout(int connectTimeout) {
-		this.connectTimeout = connectTimeout;
-	}
-
-	/**
-	 * Set the underlying URLConnection's read timeout (in milliseconds).
-	 * A timeout value of 0 specifies an infinite timeout.
-	 * <p>Default is the system's default timeout.
-	 * @see URLConnection#setReadTimeout(int)
-	 */
-	public void setReadTimeout(int readTimeout) {
-		this.readTimeout = readTimeout;
-	}
-
-
-	/**
-	 * Execute the given request through a standard {@link HttpURLConnection}.
-	 * <p>This method implements the basic processing workflow:
-	 * The actual work happens in this class's template methods.
-	 * @see #openConnection
-	 * @see #prepareConnection
-	 * @see #writeRequestBody
-	 * @see #validateResponse
-	 * @see #readResponseBody
-	 */
-	@Override
-	protected RemoteInvocationResult doExecuteRequest(
-			HttpInvokerClientConfiguration config, ByteArrayOutputStream baos)
-			throws IOException, ClassNotFoundException {
-
-		HttpURLConnection con = openConnection(config);
-		prepareConnection(con, baos.size());
-		writeRequestBody(config, con, baos);
-		validateResponse(config, con);
-		InputStream responseBody = readResponseBody(config, con);
-
-		return readRemoteInvocationResult(responseBody, config.getCodebaseUrl());
-	}
-
-	/**
-	 * Open an {@link HttpURLConnection} for the given remote invocation request.
-	 * @param config the HTTP invoker configuration that specifies the
-	 * target service
-	 * @return the HttpURLConnection for the given request
-	 * @throws IOException if thrown by I/O methods
-	 * @see java.net.URL#openConnection()
-	 */
-	protected HttpURLConnection openConnection(HttpInvokerClientConfiguration config) throws IOException {
-		URLConnection con = new URL(config.getServiceUrl()).openConnection();
-		if (!(con instanceof HttpURLConnection)) {
-			throw new IOException(
-					"Service URL [" + config.getServiceUrl() + "] does not resolve to an HTTP connection");
-		}
-		return (HttpURLConnection) con;
-	}
-
-	/**
-	 * Prepare the given HTTP connection.
-	 * <p>The default implementation specifies POST as method,
-	 * "application/x-java-serialized-object" as "Content-Type" header,
-	 * and the given content length as "Content-Length" header.
-	 * @param connection the HTTP connection to prepare
-	 * @param contentLength the length of the content to send
-	 * @throws IOException if thrown by HttpURLConnection methods
-	 * @see java.net.HttpURLConnection#setRequestMethod
-	 * @see java.net.HttpURLConnection#setRequestProperty
-	 */
-	protected void prepareConnection(HttpURLConnection connection, int contentLength) throws IOException {
-		if (this.connectTimeout >= 0) {
-			connection.setConnectTimeout(this.connectTimeout);
-		}
-		if (this.readTimeout >= 0) {
-			connection.setReadTimeout(this.readTimeout);
-		}
-
-		connection.setDoOutput(true);
-		connection.setRequestMethod(HTTP_METHOD_POST);
-		connection.setRequestProperty(HTTP_HEADER_CONTENT_TYPE, getContentType());
-		connection.setRequestProperty(HTTP_HEADER_CONTENT_LENGTH, Integer.toString(contentLength));
-
-		LocaleContext localeContext = LocaleContextHolder.getLocaleContext();
-		if (localeContext != null) {
-			Locale locale = localeContext.getLocale();
-			if (locale != null) {
-				connection.setRequestProperty(HTTP_HEADER_ACCEPT_LANGUAGE, locale.toLanguageTag());
-			}
-		}
-
-		if (isAcceptGzipEncoding()) {
-			connection.setRequestProperty(HTTP_HEADER_ACCEPT_ENCODING, ENCODING_GZIP);
-		}
-	}
-
-	/**
-	 * Set the given serialized remote invocation as request body.
-	 * <p>The default implementation simply write the serialized invocation to the
-	 * HttpURLConnection's OutputStream. This can be overridden, for example, to write
-	 * a specific encoding and potentially set appropriate HTTP request headers.
-	 * @param config the HTTP invoker configuration that specifies the target service
-	 * @param con the HttpURLConnection to write the request body to
-	 * @param baos the ByteArrayOutputStream that contains the serialized
-	 * RemoteInvocation object
-	 * @throws IOException if thrown by I/O methods
-	 * @see java.net.HttpURLConnection#getOutputStream()
-	 * @see java.net.HttpURLConnection#setRequestProperty
-	 */
-	protected void writeRequestBody(
-			HttpInvokerClientConfiguration config, HttpURLConnection con, ByteArrayOutputStream baos)
-			throws IOException {
-
-		baos.writeTo(con.getOutputStream());
-	}
-
-	/**
-	 * Validate the given response as contained in the {@link HttpURLConnection} object,
-	 * throwing an exception if it does not correspond to a successful HTTP response.
-	 * <p>Default implementation rejects any HTTP status code beyond 2xx, to avoid
-	 * parsing the response body and trying to deserialize from a corrupted stream.
-	 * @param config the HTTP invoker configuration that specifies the target service
-	 * @param con the HttpURLConnection to validate
-	 * @throws IOException if validation failed
-	 * @see java.net.HttpURLConnection#getResponseCode()
-	 */
-	protected void validateResponse(HttpInvokerClientConfiguration config, HttpURLConnection con)
-			throws IOException {
-
-		if (con.getResponseCode() >= 300) {
-			throw new IOException(
-					"Did not receive successful HTTP response: status code = " + con.getResponseCode() +
-					", status message = [" + con.getResponseMessage() + "]");
-		}
-	}
-
-	/**
-	 * Extract the response body from the given executed remote invocation
-	 * request.
-	 * <p>The default implementation simply reads the serialized invocation
-	 * from the HttpURLConnection's InputStream. If the response is recognized
-	 * as GZIP response, the InputStream will get wrapped in a GZIPInputStream.
-	 * @param config the HTTP invoker configuration that specifies the target service
-	 * @param con the HttpURLConnection to read the response body from
-	 * @return an InputStream for the response body
-	 * @throws IOException if thrown by I/O methods
-	 * @see #isGzipResponse
-	 * @see java.util.zip.GZIPInputStream
-	 * @see java.net.HttpURLConnection#getInputStream()
-	 * @see java.net.HttpURLConnection#getHeaderField(int)
-	 * @see java.net.HttpURLConnection#getHeaderFieldKey(int)
-	 */
-	protected InputStream readResponseBody(HttpInvokerClientConfiguration config, HttpURLConnection con)
-			throws IOException {
-
-		if (isGzipResponse(con)) {
-			// GZIP response found - need to unzip.
-			return new GZIPInputStream(con.getInputStream());
-		}
-		else {
-			// Plain response found.
-			return con.getInputStream();
-		}
-	}
-
-	/**
-	 * Determine whether the given response is a GZIP response.
-	 * <p>Default implementation checks whether the HTTP "Content-Encoding"
-	 * header contains "gzip" (in any casing).
-	 * @param con the HttpURLConnection to check
-	 */
-	protected boolean isGzipResponse(HttpURLConnection con) {
-		String encodingHeader = con.getHeaderField(HTTP_HEADER_CONTENT_ENCODING);
-		return (encodingHeader != null && encodingHeader.toLowerCase().contains(ENCODING_GZIP));
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
deleted file mode 100644
index 5c8e431fbaf2..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationResult;
-
-/**
- * HTTP request handler that exports the specified service bean as
- * HTTP invoker service endpoint, accessible via an HTTP invoker proxy.
- * Designed for Sun's JRE 1.6 HTTP server, implementing the
- * {@link com.sun.net.httpserver.HttpHandler} interface.
- *
- * <p>Deserializes remote invocation objects and serializes remote invocation
- * result objects. Uses Java serialization just like RMI, but provides the
- * same ease of setup as Caucho's HTTP-based Hessian protocol.
- *
- * <p><b>HTTP invoker is the recommended protocol for Java-to-Java remoting.</b>
- * It is more powerful and more extensible than Hessian, at the expense of
- * being tied to Java. Nevertheless, it is as easy to set up as Hessian,
- * which is its main advantage compared to RMI.
- *
- * <p><b>WARNING: Be aware of vulnerabilities due to unsafe Java deserialization:
- * Manipulated input streams could lead to unwanted code execution on the server
- * during the deserialization step. As a consequence, do not expose HTTP invoker
- * endpoints to untrusted clients but rather just between your own services.</b>
- * In general, we strongly recommend any other message format (e.g. JSON) instead.
- *
- * @author Juergen Hoeller
- * @since 2.5.1
- * @see org.springframework.remoting.httpinvoker.HttpInvokerClientInterceptor
- * @see org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean
- * @deprecated as of Spring Framework 5.1, in favor of {@link HttpInvokerServiceExporter}
- */
-@Deprecated
-@org.springframework.lang.UsesSunHttpServer
-public class SimpleHttpInvokerServiceExporter extends org.springframework.remoting.rmi.RemoteInvocationSerializingExporter implements HttpHandler {
-
-	/**
-	 * Reads a remote invocation from the request, executes it,
-	 * and writes the remote invocation result to the response.
-	 * @see #readRemoteInvocation(HttpExchange)
-	 * @see #invokeAndCreateResult(RemoteInvocation, Object)
-	 * @see #writeRemoteInvocationResult(HttpExchange, RemoteInvocationResult)
-	 */
-	@Override
-	public void handle(HttpExchange exchange) throws IOException {
-		try {
-			RemoteInvocation invocation = readRemoteInvocation(exchange);
-			RemoteInvocationResult result = invokeAndCreateResult(invocation, getProxy());
-			writeRemoteInvocationResult(exchange, result);
-			exchange.close();
-		}
-		catch (ClassNotFoundException ex) {
-			exchange.sendResponseHeaders(500, -1);
-			logger.error("Class not found during deserialization", ex);
-		}
-	}
-
-	/**
-	 * Read a RemoteInvocation from the given HTTP request.
-	 * <p>Delegates to {@link #readRemoteInvocation(HttpExchange, InputStream)}
-	 * with the {@link HttpExchange#getRequestBody()} request's input stream}.
-	 * @param exchange current HTTP request/response
-	 * @return the RemoteInvocation object
-	 * @throws java.io.IOException in case of I/O failure
-	 * @throws ClassNotFoundException if thrown by deserialization
-	 */
-	protected RemoteInvocation readRemoteInvocation(HttpExchange exchange)
-			throws IOException, ClassNotFoundException {
-
-		return readRemoteInvocation(exchange, exchange.getRequestBody());
-	}
-
-	/**
-	 * Deserialize a RemoteInvocation object from the given InputStream.
-	 * <p>Gives {@link #decorateInputStream} a chance to decorate the stream
-	 * first (for example, for custom encryption or compression). Creates a
-	 * {@link org.springframework.remoting.rmi.CodebaseAwareObjectInputStream}
-	 * and calls {@link #doReadRemoteInvocation} to actually read the object.
-	 * <p>Can be overridden for custom serialization of the invocation.
-	 * @param exchange current HTTP request/response
-	 * @param is the InputStream to read from
-	 * @return the RemoteInvocation object
-	 * @throws java.io.IOException in case of I/O failure
-	 * @throws ClassNotFoundException if thrown during deserialization
-	 */
-	protected RemoteInvocation readRemoteInvocation(HttpExchange exchange, InputStream is)
-			throws IOException, ClassNotFoundException {
-
-		ObjectInputStream ois = createObjectInputStream(decorateInputStream(exchange, is));
-		return doReadRemoteInvocation(ois);
-	}
-
-	/**
-	 * Return the InputStream to use for reading remote invocations,
-	 * potentially decorating the given original InputStream.
-	 * <p>The default implementation returns the given stream as-is.
-	 * Can be overridden, for example, for custom encryption or compression.
-	 * @param exchange current HTTP request/response
-	 * @param is the original InputStream
-	 * @return the potentially decorated InputStream
-	 * @throws java.io.IOException in case of I/O failure
-	 */
-	protected InputStream decorateInputStream(HttpExchange exchange, InputStream is) throws IOException {
-		return is;
-	}
-
-	/**
-	 * Write the given RemoteInvocationResult to the given HTTP response.
-	 * @param exchange current HTTP request/response
-	 * @param result the RemoteInvocationResult object
-	 * @throws java.io.IOException in case of I/O failure
-	 */
-	protected void writeRemoteInvocationResult(HttpExchange exchange, RemoteInvocationResult result)
-			throws IOException {
-
-		exchange.getResponseHeaders().set("Content-Type", getContentType());
-		exchange.sendResponseHeaders(200, 0);
-		writeRemoteInvocationResult(exchange, result, exchange.getResponseBody());
-	}
-
-	/**
-	 * Serialize the given RemoteInvocation to the given OutputStream.
-	 * <p>The default implementation gives {@link #decorateOutputStream} a chance
-	 * to decorate the stream first (for example, for custom encryption or compression).
-	 * Creates an {@link java.io.ObjectOutputStream} for the final stream and calls
-	 * {@link #doWriteRemoteInvocationResult} to actually write the object.
-	 * <p>Can be overridden for custom serialization of the invocation.
-	 * @param exchange current HTTP request/response
-	 * @param result the RemoteInvocationResult object
-	 * @param os the OutputStream to write to
-	 * @throws java.io.IOException in case of I/O failure
-	 * @see #decorateOutputStream
-	 * @see #doWriteRemoteInvocationResult
-	 */
-	protected void writeRemoteInvocationResult(
-			HttpExchange exchange, RemoteInvocationResult result, OutputStream os) throws IOException {
-
-		ObjectOutputStream oos = createObjectOutputStream(decorateOutputStream(exchange, os));
-		doWriteRemoteInvocationResult(result, oos);
-		oos.flush();
-	}
-
-	/**
-	 * Return the OutputStream to use for writing remote invocation results,
-	 * potentially decorating the given original OutputStream.
-	 * <p>The default implementation returns the given stream as-is.
-	 * Can be overridden, for example, for custom encryption or compression.
-	 * @param exchange current HTTP request/response
-	 * @param os the original OutputStream
-	 * @return the potentially decorated OutputStream
-	 * @throws java.io.IOException in case of I/O failure
-	 */
-	protected OutputStream decorateOutputStream(HttpExchange exchange, OutputStream os) throws IOException {
-		return os;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
deleted file mode 100644
index e0dfd03aa651..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Remoting classes for transparent Java-to-Java remoting via HTTP invokers.
- * Uses Java serialization just like RMI, but provides the same ease of setup
- * as Caucho's HTTP-based Hessian protocol.
- *
- * <p><b>HTTP invoker is the recommended protocol for Java-to-Java remoting.</b>
- * It is more powerful and more extensible than Hessian, at the expense of
- * being tied to Java. Nevertheless, it is as easy to set up as Hessian,
- * which is its main advantage compared to RMI.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.remoting.httpinvoker;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
deleted file mode 100644
index 610651bef206..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Executor;
-
-import javax.jws.WebService;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.WebServiceProvider;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.CannotLoadBeanClassException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Abstract exporter for JAX-WS services, autodetecting annotated service beans
- * (through the JAX-WS {@link javax.jws.WebService} annotation).
- *
- * <p>Subclasses need to implement the {@link #publishEndpoint} template methods
- * for actual endpoint exposure.
- *
- * @author Juergen Hoeller
- * @since 2.5.5
- * @see javax.jws.WebService
- * @see javax.xml.ws.Endpoint
- * @see SimpleJaxWsServiceExporter
- */
-public abstract class AbstractJaxWsServiceExporter implements BeanFactoryAware, InitializingBean, DisposableBean {
-
-	@Nullable
-	private Map<String, Object> endpointProperties;
-
-	@Nullable
-	private Executor executor;
-
-	@Nullable
-	private String bindingType;
-
-	@Nullable
-	private WebServiceFeature[] endpointFeatures;
-
-	@Nullable
-	private ListableBeanFactory beanFactory;
-
-	private final Set<Endpoint> publishedEndpoints = new LinkedHashSet<>();
-
-
-	/**
-	 * Set the property bag for the endpoint, including properties such as
-	 * "javax.xml.ws.wsdl.service" or "javax.xml.ws.wsdl.port".
-	 * @see javax.xml.ws.Endpoint#setProperties
-	 * @see javax.xml.ws.Endpoint#WSDL_SERVICE
-	 * @see javax.xml.ws.Endpoint#WSDL_PORT
-	 */
-	public void setEndpointProperties(Map<String, Object> endpointProperties) {
-		this.endpointProperties = endpointProperties;
-	}
-
-	/**
-	 * Set the JDK concurrent executor to use for dispatching incoming requests
-	 * to exported service instances.
-	 * @see javax.xml.ws.Endpoint#setExecutor
-	 */
-	public void setExecutor(Executor executor) {
-		this.executor = executor;
-	}
-
-	/**
-	 * Specify the binding type to use, overriding the value of
-	 * the JAX-WS {@link javax.xml.ws.BindingType} annotation.
-	 */
-	public void setBindingType(String bindingType) {
-		this.bindingType = bindingType;
-	}
-
-	/**
-	 * Specify WebServiceFeature objects (e.g. as inner bean definitions)
-	 * to apply to JAX-WS endpoint creation.
-	 * @since 4.0
-	 */
-	public void setEndpointFeatures(WebServiceFeature... endpointFeatures) {
-		this.endpointFeatures = endpointFeatures;
-	}
-
-	/**
-	 * Obtains all web service beans and publishes them as JAX-WS endpoints.
-	 */
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		if (!(beanFactory instanceof ListableBeanFactory)) {
-			throw new IllegalStateException(getClass().getSimpleName() + " requires a ListableBeanFactory");
-		}
-		this.beanFactory = (ListableBeanFactory) beanFactory;
-	}
-
-
-	/**
-	 * Immediately publish all endpoints when fully configured.
-	 * @see #publishEndpoints()
-	 */
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		publishEndpoints();
-	}
-
-	/**
-	 * Publish all {@link javax.jws.WebService} annotated beans in the
-	 * containing BeanFactory.
-	 * @see #publishEndpoint
-	 */
-	public void publishEndpoints() {
-		Assert.state(this.beanFactory != null, "No BeanFactory set");
-
-		Set<String> beanNames = new LinkedHashSet<>(this.beanFactory.getBeanDefinitionCount());
-		Collections.addAll(beanNames, this.beanFactory.getBeanDefinitionNames());
-		if (this.beanFactory instanceof ConfigurableBeanFactory) {
-			Collections.addAll(beanNames, ((ConfigurableBeanFactory) this.beanFactory).getSingletonNames());
-		}
-
-		for (String beanName : beanNames) {
-			try {
-				Class<?> type = this.beanFactory.getType(beanName);
-				if (type != null && !type.isInterface()) {
-					WebService wsAnnotation = type.getAnnotation(WebService.class);
-					WebServiceProvider wsProviderAnnotation = type.getAnnotation(WebServiceProvider.class);
-					if (wsAnnotation != null || wsProviderAnnotation != null) {
-						Endpoint endpoint = createEndpoint(this.beanFactory.getBean(beanName));
-						if (this.endpointProperties != null) {
-							endpoint.setProperties(this.endpointProperties);
-						}
-						if (this.executor != null) {
-							endpoint.setExecutor(this.executor);
-						}
-						if (wsAnnotation != null) {
-							publishEndpoint(endpoint, wsAnnotation);
-						}
-						else {
-							publishEndpoint(endpoint, wsProviderAnnotation);
-						}
-						this.publishedEndpoints.add(endpoint);
-					}
-				}
-			}
-			catch (CannotLoadBeanClassException ex) {
-				// ignore beans where the class is not resolvable
-			}
-		}
-	}
-
-	/**
-	 * Create the actual Endpoint instance.
-	 * @param bean the service object to wrap
-	 * @return the Endpoint instance
-	 * @see Endpoint#create(Object)
-	 * @see Endpoint#create(String, Object)
-	 */
-	protected Endpoint createEndpoint(Object bean) {
-		return (this.endpointFeatures != null ?
-				Endpoint.create(this.bindingType, bean, this.endpointFeatures) :
-				Endpoint.create(this.bindingType, bean));
-	}
-
-
-	/**
-	 * Actually publish the given endpoint. To be implemented by subclasses.
-	 * @param endpoint the JAX-WS Endpoint object
-	 * @param annotation the service bean's WebService annotation
-	 */
-	protected abstract void publishEndpoint(Endpoint endpoint, WebService annotation);
-
-	/**
-	 * Actually publish the given provider endpoint. To be implemented by subclasses.
-	 * @param endpoint the JAX-WS Provider Endpoint object
-	 * @param annotation the service bean's WebServiceProvider annotation
-	 */
-	protected abstract void publishEndpoint(Endpoint endpoint, WebServiceProvider annotation);
-
-
-	/**
-	 * Stops all published endpoints, taking the web services offline.
-	 */
-	@Override
-	public void destroy() {
-		for (Endpoint endpoint : this.publishedEndpoints) {
-			endpoint.stop();
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
deleted file mode 100644
index e8ff14889aae..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.jws.WebService;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.soap.SOAPFaultException;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteLookupFailureException;
-import org.springframework.remoting.RemoteProxyFailureException;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * {@link org.aopalliance.intercept.MethodInterceptor} for accessing a
- * specific port of a JAX-WS service.
- *
- * <p>Uses either {@link LocalJaxWsServiceFactory}'s facilities underneath,
- * or takes an explicit reference to an existing JAX-WS Service instance
- * (e.g. obtained via {@link org.springframework.jndi.JndiObjectFactoryBean}).
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see #setPortName
- * @see #setServiceInterface
- * @see javax.xml.ws.Service#getPort
- * @see org.springframework.remoting.RemoteAccessException
- * @see org.springframework.jndi.JndiObjectFactoryBean
- */
-public class JaxWsPortClientInterceptor extends LocalJaxWsServiceFactory
-		implements MethodInterceptor, BeanClassLoaderAware, InitializingBean {
-
-	@Nullable
-	private Service jaxWsService;
-
-	@Nullable
-	private String portName;
-
-	@Nullable
-	private String username;
-
-	@Nullable
-	private String password;
-
-	@Nullable
-	private String endpointAddress;
-
-	private boolean maintainSession;
-
-	private boolean useSoapAction;
-
-	@Nullable
-	private String soapActionUri;
-
-	@Nullable
-	private Map<String, Object> customProperties;
-
-	@Nullable
-	private WebServiceFeature[] portFeatures;
-
-	@Nullable
-	private Class<?> serviceInterface;
-
-	private boolean lookupServiceOnStartup = true;
-
-	@Nullable
-	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
-
-	@Nullable
-	private QName portQName;
-
-	@Nullable
-	private Object portStub;
-
-	private final Object preparationMonitor = new Object();
-
-
-	/**
-	 * Set a reference to an existing JAX-WS Service instance,
-	 * for example obtained via {@link org.springframework.jndi.JndiObjectFactoryBean}.
-	 * If not set, {@link LocalJaxWsServiceFactory}'s properties have to be specified.
-	 * @see #setWsdlDocumentUrl
-	 * @see #setNamespaceUri
-	 * @see #setServiceName
-	 * @see org.springframework.jndi.JndiObjectFactoryBean
-	 */
-	public void setJaxWsService(@Nullable Service jaxWsService) {
-		this.jaxWsService = jaxWsService;
-	}
-
-	/**
-	 * Return a reference to an existing JAX-WS Service instance, if any.
-	 */
-	@Nullable
-	public Service getJaxWsService() {
-		return this.jaxWsService;
-	}
-
-	/**
-	 * Set the name of the port.
-	 * Corresponds to the "wsdl:port" name.
-	 */
-	public void setPortName(@Nullable String portName) {
-		this.portName = portName;
-	}
-
-	/**
-	 * Return the name of the port.
-	 */
-	@Nullable
-	public String getPortName() {
-		return this.portName;
-	}
-
-	/**
-	 * Set the username to specify on the stub.
-	 * @see javax.xml.ws.BindingProvider#USERNAME_PROPERTY
-	 */
-	public void setUsername(@Nullable String username) {
-		this.username = username;
-	}
-
-	/**
-	 * Return the username to specify on the stub.
-	 */
-	@Nullable
-	public String getUsername() {
-		return this.username;
-	}
-
-	/**
-	 * Set the password to specify on the stub.
-	 * @see javax.xml.ws.BindingProvider#PASSWORD_PROPERTY
-	 */
-	public void setPassword(@Nullable String password) {
-		this.password = password;
-	}
-
-	/**
-	 * Return the password to specify on the stub.
-	 */
-	@Nullable
-	public String getPassword() {
-		return this.password;
-	}
-
-	/**
-	 * Set the endpoint address to specify on the stub.
-	 * @see javax.xml.ws.BindingProvider#ENDPOINT_ADDRESS_PROPERTY
-	 */
-	public void setEndpointAddress(@Nullable String endpointAddress) {
-		this.endpointAddress = endpointAddress;
-	}
-
-	/**
-	 * Return the endpoint address to specify on the stub.
-	 */
-	@Nullable
-	public String getEndpointAddress() {
-		return this.endpointAddress;
-	}
-
-	/**
-	 * Set the "session.maintain" flag to specify on the stub.
-	 * @see javax.xml.ws.BindingProvider#SESSION_MAINTAIN_PROPERTY
-	 */
-	public void setMaintainSession(boolean maintainSession) {
-		this.maintainSession = maintainSession;
-	}
-
-	/**
-	 * Return the "session.maintain" flag to specify on the stub.
-	 */
-	public boolean isMaintainSession() {
-		return this.maintainSession;
-	}
-
-	/**
-	 * Set the "soapaction.use" flag to specify on the stub.
-	 * @see javax.xml.ws.BindingProvider#SOAPACTION_USE_PROPERTY
-	 */
-	public void setUseSoapAction(boolean useSoapAction) {
-		this.useSoapAction = useSoapAction;
-	}
-
-	/**
-	 * Return the "soapaction.use" flag to specify on the stub.
-	 */
-	public boolean isUseSoapAction() {
-		return this.useSoapAction;
-	}
-
-	/**
-	 * Set the SOAP action URI to specify on the stub.
-	 * @see javax.xml.ws.BindingProvider#SOAPACTION_URI_PROPERTY
-	 */
-	public void setSoapActionUri(@Nullable String soapActionUri) {
-		this.soapActionUri = soapActionUri;
-	}
-
-	/**
-	 * Return the SOAP action URI to specify on the stub.
-	 */
-	@Nullable
-	public String getSoapActionUri() {
-		return this.soapActionUri;
-	}
-
-	/**
-	 * Set custom properties to be set on the stub.
-	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor)
-	 * or a "props" element in XML bean definitions.
-	 * @see javax.xml.ws.BindingProvider#getRequestContext()
-	 */
-	public void setCustomProperties(Map<String, Object> customProperties) {
-		this.customProperties = customProperties;
-	}
-
-	/**
-	 * Allow Map access to the custom properties to be set on the stub,
-	 * with the option to add or override specific entries.
-	 * <p>Useful for specifying entries directly, for example via
-	 * "customProperties[myKey]". This is particularly useful for
-	 * adding or overriding entries in child bean definitions.
-	 */
-	public Map<String, Object> getCustomProperties() {
-		if (this.customProperties == null) {
-			this.customProperties = new HashMap<>();
-		}
-		return this.customProperties;
-	}
-
-	/**
-	 * Add a custom property to this JAX-WS BindingProvider.
-	 * @param name the name of the attribute to expose
-	 * @param value the attribute value to expose
-	 * @see javax.xml.ws.BindingProvider#getRequestContext()
-	 */
-	public void addCustomProperty(String name, Object value) {
-		getCustomProperties().put(name, value);
-	}
-
-	/**
-	 * Specify WebServiceFeature objects (e.g. as inner bean definitions)
-	 * to apply to JAX-WS port stub creation.
-	 * @since 4.0
-	 * @see Service#getPort(Class, javax.xml.ws.WebServiceFeature...)
-	 * @see #setServiceFeatures
-	 */
-	public void setPortFeatures(WebServiceFeature... features) {
-		this.portFeatures = features;
-	}
-
-	/**
-	 * Set the interface of the service that this factory should create a proxy for.
-	 */
-	public void setServiceInterface(@Nullable Class<?> serviceInterface) {
-		if (serviceInterface != null) {
-			Assert.isTrue(serviceInterface.isInterface(), "'serviceInterface' must be an interface");
-		}
-		this.serviceInterface = serviceInterface;
-	}
-
-	/**
-	 * Return the interface of the service that this factory should create a proxy for.
-	 */
-	@Nullable
-	public Class<?> getServiceInterface() {
-		return this.serviceInterface;
-	}
-
-	/**
-	 * Set whether to look up the JAX-WS service on startup.
-	 * <p>Default is "true". Turn this flag off to allow for late start
-	 * of the target server. In this case, the JAX-WS service will be
-	 * lazily fetched on first access.
-	 */
-	public void setLookupServiceOnStartup(boolean lookupServiceOnStartup) {
-		this.lookupServiceOnStartup = lookupServiceOnStartup;
-	}
-
-	/**
-	 * Set the bean ClassLoader to use for this interceptor: primarily for
-	 * building a client proxy in the {@link JaxWsPortProxyFactoryBean} subclass.
-	 */
-	@Override
-	public void setBeanClassLoader(@Nullable ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
-	}
-
-	/**
-	 * Return the bean ClassLoader to use for this interceptor.
-	 */
-	@Nullable
-	protected ClassLoader getBeanClassLoader() {
-		return this.beanClassLoader;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		if (this.lookupServiceOnStartup) {
-			prepare();
-		}
-	}
-
-	/**
-	 * Initialize the JAX-WS port for this interceptor.
-	 */
-	public void prepare() {
-		Class<?> ifc = getServiceInterface();
-		Assert.notNull(ifc, "Property 'serviceInterface' is required");
-
-		WebService ann = ifc.getAnnotation(WebService.class);
-		if (ann != null) {
-			applyDefaultsFromAnnotation(ann);
-		}
-
-		Service serviceToUse = getJaxWsService();
-		if (serviceToUse == null) {
-			serviceToUse = createJaxWsService();
-		}
-
-		this.portQName = getQName(getPortName() != null ? getPortName() : ifc.getName());
-		Object stub = getPortStub(serviceToUse, (getPortName() != null ? this.portQName : null));
-		preparePortStub(stub);
-		this.portStub = stub;
-	}
-
-	/**
-	 * Initialize this client interceptor's properties from the given WebService annotation,
-	 * if necessary and possible (i.e. if "wsdlDocumentUrl", "namespaceUri", "serviceName"
-	 * and "portName" haven't been set but corresponding values are declared at the
-	 * annotation level of the specified service interface).
-	 * @param ann the WebService annotation found on the specified service interface
-	 */
-	protected void applyDefaultsFromAnnotation(WebService ann) {
-		if (getWsdlDocumentUrl() == null) {
-			String wsdl = ann.wsdlLocation();
-			if (StringUtils.hasText(wsdl)) {
-				try {
-					setWsdlDocumentUrl(new URL(wsdl));
-				}
-				catch (MalformedURLException ex) {
-					throw new IllegalStateException(
-							"Encountered invalid @Service wsdlLocation value [" + wsdl + "]", ex);
-				}
-			}
-		}
-		if (getNamespaceUri() == null) {
-			String ns = ann.targetNamespace();
-			if (StringUtils.hasText(ns)) {
-				setNamespaceUri(ns);
-			}
-		}
-		if (getServiceName() == null) {
-			String sn = ann.serviceName();
-			if (StringUtils.hasText(sn)) {
-				setServiceName(sn);
-			}
-		}
-		if (getPortName() == null) {
-			String pn = ann.portName();
-			if (StringUtils.hasText(pn)) {
-				setPortName(pn);
-			}
-		}
-	}
-
-	/**
-	 * Return whether this client interceptor has already been prepared,
-	 * i.e. has already looked up the JAX-WS service and port.
-	 */
-	protected boolean isPrepared() {
-		synchronized (this.preparationMonitor) {
-			return (this.portStub != null);
-		}
-	}
-
-	/**
-	 * Return the prepared QName for the port.
-	 * @see #setPortName
-	 * @see #getQName
-	 */
-	@Nullable
-	protected final QName getPortQName() {
-		return this.portQName;
-	}
-
-	/**
-	 * Obtain the port stub from the given JAX-WS Service.
-	 * @param service the Service object to obtain the port from
-	 * @param portQName the name of the desired port, if specified
-	 * @return the corresponding port object as returned from
-	 * {@code Service.getPort(...)}
-	 */
-	protected Object getPortStub(Service service, @Nullable QName portQName) {
-		if (this.portFeatures != null) {
-			return (portQName != null ? service.getPort(portQName, getServiceInterface(), this.portFeatures) :
-					service.getPort(getServiceInterface(), this.portFeatures));
-		}
-		else {
-			return (portQName != null ? service.getPort(portQName, getServiceInterface()) :
-					service.getPort(getServiceInterface()));
-		}
-	}
-
-	/**
-	 * Prepare the given JAX-WS port stub, applying properties to it.
-	 * Called by {@link #prepare}.
-	 * @param stub the current JAX-WS port stub
-	 * @see #setUsername
-	 * @see #setPassword
-	 * @see #setEndpointAddress
-	 * @see #setMaintainSession
-	 * @see #setCustomProperties
-	 */
-	protected void preparePortStub(Object stub) {
-		Map<String, Object> stubProperties = new HashMap<>();
-		String username = getUsername();
-		if (username != null) {
-			stubProperties.put(BindingProvider.USERNAME_PROPERTY, username);
-		}
-		String password = getPassword();
-		if (password != null) {
-			stubProperties.put(BindingProvider.PASSWORD_PROPERTY, password);
-		}
-		String endpointAddress = getEndpointAddress();
-		if (endpointAddress != null) {
-			stubProperties.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress);
-		}
-		if (isMaintainSession()) {
-			stubProperties.put(BindingProvider.SESSION_MAINTAIN_PROPERTY, Boolean.TRUE);
-		}
-		if (isUseSoapAction()) {
-			stubProperties.put(BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
-		}
-		String soapActionUri = getSoapActionUri();
-		if (soapActionUri != null) {
-			stubProperties.put(BindingProvider.SOAPACTION_URI_PROPERTY, soapActionUri);
-		}
-		stubProperties.putAll(getCustomProperties());
-		if (!stubProperties.isEmpty()) {
-			if (!(stub instanceof BindingProvider)) {
-				throw new RemoteLookupFailureException("Port stub of class [" + stub.getClass().getName() +
-						"] is not a customizable JAX-WS stub: it does not implement interface [javax.xml.ws.BindingProvider]");
-			}
-			((BindingProvider) stub).getRequestContext().putAll(stubProperties);
-		}
-	}
-
-	/**
-	 * Return the underlying JAX-WS port stub that this interceptor delegates to
-	 * for each method invocation on the proxy.
-	 */
-	@Nullable
-	protected Object getPortStub() {
-		return this.portStub;
-	}
-
-
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		if (AopUtils.isToStringMethod(invocation.getMethod())) {
-			return "JAX-WS proxy for port [" + getPortName() + "] of service [" + getServiceName() + "]";
-		}
-		// Lazily prepare service and stub if necessary.
-		synchronized (this.preparationMonitor) {
-			if (!isPrepared()) {
-				prepare();
-			}
-		}
-		return doInvoke(invocation);
-	}
-
-	/**
-	 * Perform a JAX-WS service invocation based on the given method invocation.
-	 * @param invocation the AOP method invocation
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 * @see #getPortStub()
-	 * @see #doInvoke(org.aopalliance.intercept.MethodInvocation, Object)
-	 */
-	@Nullable
-	protected Object doInvoke(MethodInvocation invocation) throws Throwable {
-		try {
-			return doInvoke(invocation, getPortStub());
-		}
-		catch (SOAPFaultException ex) {
-			throw new JaxWsSoapFaultException(ex);
-		}
-		catch (ProtocolException ex) {
-			throw new RemoteConnectFailureException(
-					"Could not connect to remote service [" + getEndpointAddress() + "]", ex);
-		}
-		catch (WebServiceException ex) {
-			throw new RemoteAccessException(
-					"Could not access remote service at [" + getEndpointAddress() + "]", ex);
-		}
-	}
-
-	/**
-	 * Perform a JAX-WS service invocation on the given port stub.
-	 * @param invocation the AOP method invocation
-	 * @param portStub the RMI port stub to invoke
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 * @see #getPortStub()
-	 */
-	@Nullable
-	protected Object doInvoke(MethodInvocation invocation, @Nullable Object portStub) throws Throwable {
-		Method method = invocation.getMethod();
-		try {
-			return method.invoke(portStub, invocation.getArguments());
-		}
-		catch (InvocationTargetException ex) {
-			throw ex.getTargetException();
-		}
-		catch (Throwable ex) {
-			throw new RemoteProxyFailureException("Invocation of stub method failed: " + method, ex);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
deleted file mode 100644
index 3788d0e0e7a0..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import javax.xml.ws.BindingProvider;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.beans.factory.FactoryBean} for a specific port of a
- * JAX-WS service. Exposes a proxy for the port, to be used for bean references.
- * Inherits configuration properties from {@link JaxWsPortClientInterceptor}.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see #setServiceInterface
- * @see LocalJaxWsServiceFactoryBean
- */
-public class JaxWsPortProxyFactoryBean extends JaxWsPortClientInterceptor implements FactoryBean<Object> {
-
-	@Nullable
-	private Object serviceProxy;
-
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-
-		Class<?> ifc = getServiceInterface();
-		Assert.notNull(ifc, "Property 'serviceInterface' is required");
-
-		// Build a proxy that also exposes the JAX-WS BindingProvider interface.
-		ProxyFactory pf = new ProxyFactory();
-		pf.addInterface(ifc);
-		pf.addInterface(BindingProvider.class);
-		pf.addAdvice(this);
-		this.serviceProxy = pf.getProxy(getBeanClassLoader());
-	}
-
-
-	@Override
-	@Nullable
-	public Object getObject() {
-		return this.serviceProxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return getServiceInterface();
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
deleted file mode 100644
index 0205f56e68e3..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.soap.SOAPFaultException;
-
-import org.springframework.remoting.soap.SoapFaultException;
-
-/**
- * Spring SoapFaultException adapter for the JAX-WS
- * {@link javax.xml.ws.soap.SOAPFaultException} class.
- *
- * @author Juergen Hoeller
- * @since 2.5
- */
-@SuppressWarnings("serial")
-public class JaxWsSoapFaultException extends SoapFaultException {
-
-	/**
-	 * Constructor for JaxWsSoapFaultException.
-	 * @param original the original JAX-WS SOAPFaultException to wrap
-	 */
-	public JaxWsSoapFaultException(SOAPFaultException original) {
-		super(original.getMessage(), original);
-	}
-
-	/**
-	 * Return the wrapped JAX-WS SOAPFault.
-	 */
-	public final SOAPFault getFault() {
-		return ((SOAPFaultException) getCause()).getFault();
-	}
-
-
-	@Override
-	public String getFaultCode() {
-		return getFault().getFaultCode();
-	}
-
-	@Override
-	public QName getFaultCodeAsQName() {
-		return getFault().getFaultCodeAsQName();
-	}
-
-	@Override
-	public String getFaultString() {
-		return getFault().getFaultString();
-	}
-
-	@Override
-	public String getFaultActor() {
-		return getFault().getFaultActor();
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java
deleted file mode 100644
index 8abc4f1b0298..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactory.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.concurrent.Executor;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.handler.HandlerResolver;
-
-import org.springframework.core.io.Resource;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Factory for locally defined JAX-WS {@link javax.xml.ws.Service} references.
- * Uses the JAX-WS {@link javax.xml.ws.Service#create} factory API underneath.
- *
- * <p>Serves as base class for {@link LocalJaxWsServiceFactoryBean} as well as
- * {@link JaxWsPortClientInterceptor} and {@link JaxWsPortProxyFactoryBean}.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see javax.xml.ws.Service
- * @see LocalJaxWsServiceFactoryBean
- * @see JaxWsPortClientInterceptor
- * @see JaxWsPortProxyFactoryBean
- */
-public class LocalJaxWsServiceFactory {
-
-	@Nullable
-	private URL wsdlDocumentUrl;
-
-	@Nullable
-	private String namespaceUri;
-
-	@Nullable
-	private String serviceName;
-
-	@Nullable
-	private WebServiceFeature[] serviceFeatures;
-
-	@Nullable
-	private Executor executor;
-
-	@Nullable
-	private HandlerResolver handlerResolver;
-
-
-	/**
-	 * Set the URL of the WSDL document that describes the service.
-	 * @see #setWsdlDocumentResource(Resource)
-	 */
-	public void setWsdlDocumentUrl(@Nullable URL wsdlDocumentUrl) {
-		this.wsdlDocumentUrl = wsdlDocumentUrl;
-	}
-
-	/**
-	 * Set the WSDL document URL as a {@link Resource}.
-	 * @since 3.2
-	 */
-	public void setWsdlDocumentResource(Resource wsdlDocumentResource) throws IOException {
-		Assert.notNull(wsdlDocumentResource, "WSDL Resource must not be null");
-		this.wsdlDocumentUrl = wsdlDocumentResource.getURL();
-	}
-
-	/**
-	 * Return the URL of the WSDL document that describes the service.
-	 */
-	@Nullable
-	public URL getWsdlDocumentUrl() {
-		return this.wsdlDocumentUrl;
-	}
-
-	/**
-	 * Set the namespace URI of the service.
-	 * Corresponds to the WSDL "targetNamespace".
-	 */
-	public void setNamespaceUri(@Nullable String namespaceUri) {
-		this.namespaceUri = (namespaceUri != null ? namespaceUri.trim() : null);
-	}
-
-	/**
-	 * Return the namespace URI of the service.
-	 */
-	@Nullable
-	public String getNamespaceUri() {
-		return this.namespaceUri;
-	}
-
-	/**
-	 * Set the name of the service to look up.
-	 * Corresponds to the "wsdl:service" name.
-	 */
-	public void setServiceName(@Nullable String serviceName) {
-		this.serviceName = serviceName;
-	}
-
-	/**
-	 * Return the name of the service.
-	 */
-	@Nullable
-	public String getServiceName() {
-		return this.serviceName;
-	}
-
-	/**
-	 * Specify WebServiceFeature objects (e.g. as inner bean definitions)
-	 * to apply to JAX-WS service creation.
-	 * @since 4.0
-	 * @see Service#create(QName, WebServiceFeature...)
-	 */
-	public void setServiceFeatures(WebServiceFeature... serviceFeatures) {
-		this.serviceFeatures = serviceFeatures;
-	}
-
-	/**
-	 * Set the JDK concurrent executor to use for asynchronous executions
-	 * that require callbacks.
-	 * @see javax.xml.ws.Service#setExecutor
-	 */
-	public void setExecutor(Executor executor) {
-		this.executor = executor;
-	}
-
-	/**
-	 * Set the JAX-WS HandlerResolver to use for all proxies and dispatchers
-	 * created through this factory.
-	 * @see javax.xml.ws.Service#setHandlerResolver
-	 */
-	public void setHandlerResolver(HandlerResolver handlerResolver) {
-		this.handlerResolver = handlerResolver;
-	}
-
-
-	/**
-	 * Create a JAX-WS Service according to the parameters of this factory.
-	 * @see #setServiceName
-	 * @see #setWsdlDocumentUrl
-	 */
-	public Service createJaxWsService() {
-		Assert.notNull(this.serviceName, "No service name specified");
-		Service service;
-
-		if (this.serviceFeatures != null) {
-			service = (this.wsdlDocumentUrl != null ?
-				Service.create(this.wsdlDocumentUrl, getQName(this.serviceName), this.serviceFeatures) :
-				Service.create(getQName(this.serviceName), this.serviceFeatures));
-		}
-		else {
-			service = (this.wsdlDocumentUrl != null ?
-					Service.create(this.wsdlDocumentUrl, getQName(this.serviceName)) :
-					Service.create(getQName(this.serviceName)));
-		}
-
-		if (this.executor != null) {
-			service.setExecutor(this.executor);
-		}
-		if (this.handlerResolver != null) {
-			service.setHandlerResolver(this.handlerResolver);
-		}
-
-		return service;
-	}
-
-	/**
-	 * Return a QName for the given name, relative to the namespace URI
-	 * of this factory, if given.
-	 * @see #setNamespaceUri
-	 */
-	protected QName getQName(String name) {
-		return (getNamespaceUri() != null ? new QName(getNamespaceUri(), name) : new QName(name));
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
deleted file mode 100644
index d512f7de6f51..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import javax.xml.ws.Service;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link org.springframework.beans.factory.FactoryBean} for locally
- * defined JAX-WS Service references.
- * Uses {@link LocalJaxWsServiceFactory}'s facilities underneath.
- *
- * <p>Alternatively, JAX-WS Service references can be looked up
- * in the JNDI environment of the Java EE container.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see javax.xml.ws.Service
- * @see org.springframework.jndi.JndiObjectFactoryBean
- * @see JaxWsPortProxyFactoryBean
- */
-public class LocalJaxWsServiceFactoryBean extends LocalJaxWsServiceFactory
-		implements FactoryBean<Service>, InitializingBean {
-
-	@Nullable
-	private Service service;
-
-
-	@Override
-	public void afterPropertiesSet() {
-		this.service = createJaxWsService();
-	}
-
-	@Override
-	@Nullable
-	public Service getObject() {
-		return this.service;
-	}
-
-	@Override
-	public Class<? extends Service> getObjectType() {
-		return (this.service != null ? this.service.getClass() : Service.class);
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
deleted file mode 100644
index 54382b30d6e7..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import java.net.InetSocketAddress;
-import java.util.List;
-
-import javax.jws.WebService;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.WebServiceProvider;
-
-import com.sun.net.httpserver.Authenticator;
-import com.sun.net.httpserver.Filter;
-import com.sun.net.httpserver.HttpContext;
-import com.sun.net.httpserver.HttpServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Simple exporter for JAX-WS services, autodetecting annotated service beans
- * (through the JAX-WS {@link javax.jws.WebService} annotation) and exporting
- * them through the HTTP server included in Sun's JDK 1.6. The full address
- * for each service will consist of the server's base address with the
- * service name appended (e.g. "http://localhost:8080/OrderService").
- *
- * <p>Note that this exporter will only work on Sun's JDK 1.6 or higher, as well
- * as on JDKs that ship Sun's entire class library as included in the Sun JDK.
- * For a portable JAX-WS exporter, have a look at {@link SimpleJaxWsServiceExporter}.
- *
- * @author Juergen Hoeller
- * @since 2.5.5
- * @see javax.jws.WebService
- * @see javax.xml.ws.Endpoint#publish(Object)
- * @see SimpleJaxWsServiceExporter
- * @deprecated as of Spring Framework 5.1, in favor of {@link SimpleJaxWsServiceExporter}
- */
-@Deprecated
-@org.springframework.lang.UsesSunHttpServer
-public class SimpleHttpServerJaxWsServiceExporter extends AbstractJaxWsServiceExporter {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	@Nullable
-	private HttpServer server;
-
-	private int port = 8080;
-
-	@Nullable
-	private String hostname;
-
-	private int backlog = -1;
-
-	private int shutdownDelay = 0;
-
-	private String basePath = "/";
-
-	@Nullable
-	private List<Filter> filters;
-
-	@Nullable
-	private Authenticator authenticator;
-
-	private boolean localServer = false;
-
-
-	/**
-	 * Specify an existing HTTP server to register the web service contexts
-	 * with. This will typically be a server managed by the general Spring
-	 * {@link org.springframework.remoting.support.SimpleHttpServerFactoryBean}.
-	 * <p>Alternatively, configure a local HTTP server through the
-	 * {@link #setPort "port"}, {@link #setHostname "hostname"} and
-	 * {@link #setBacklog "backlog"} properties (or rely on the defaults there).
-	 */
-	public void setServer(HttpServer server) {
-		this.server = server;
-	}
-
-	/**
-	 * Specify the HTTP server's port. Default is 8080.
-	 * <p>Only applicable for a locally configured HTTP server.
-	 * Ignored when the {@link #setServer "server"} property has been specified.
-	 */
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	/**
-	 * Specify the HTTP server's hostname to bind to. Default is localhost;
-	 * can be overridden with a specific network address to bind to.
-	 * <p>Only applicable for a locally configured HTTP server.
-	 * Ignored when the {@link #setServer "server"} property has been specified.
-	 */
-	public void setHostname(String hostname) {
-		this.hostname = hostname;
-	}
-
-	/**
-	 * Specify the HTTP server's TCP backlog. Default is -1,
-	 * indicating the system's default value.
-	 * <p>Only applicable for a locally configured HTTP server.
-	 * Ignored when the {@link #setServer "server"} property has been specified.
-	 */
-	public void setBacklog(int backlog) {
-		this.backlog = backlog;
-	}
-
-	/**
-	 * Specify the number of seconds to wait until HTTP exchanges have
-	 * completed when shutting down the HTTP server. Default is 0.
-	 * <p>Only applicable for a locally configured HTTP server.
-	 * Ignored when the {@link #setServer "server"} property has been specified.
-	 */
-	public void setShutdownDelay(int shutdownDelay) {
-		this.shutdownDelay = shutdownDelay;
-	}
-
-	/**
-	 * Set the base path for context publication. Default is "/".
-	 * <p>For each context publication path, the service name will be
-	 * appended to this base address. E.g. service name "OrderService"
-	 * -> "/OrderService".
-	 * @see javax.xml.ws.Endpoint#publish(Object)
-	 * @see javax.jws.WebService#serviceName()
-	 */
-	public void setBasePath(String basePath) {
-		this.basePath = basePath;
-	}
-
-	/**
-	 * Register common {@link com.sun.net.httpserver.Filter Filters} to be
-	 * applied to all detected {@link javax.jws.WebService} annotated beans.
-	 */
-	public void setFilters(List<Filter> filters) {
-		this.filters = filters;
-	}
-
-	/**
-	 * Register a common {@link com.sun.net.httpserver.Authenticator} to be
-	 * applied to all detected {@link javax.jws.WebService} annotated beans.
-	 */
-	public void setAuthenticator(Authenticator authenticator) {
-		this.authenticator = authenticator;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		if (this.server == null) {
-			InetSocketAddress address = (this.hostname != null ?
-					new InetSocketAddress(this.hostname, this.port) : new InetSocketAddress(this.port));
-			HttpServer server = HttpServer.create(address, this.backlog);
-			if (logger.isInfoEnabled()) {
-				logger.info("Starting HttpServer at address " + address);
-			}
-			server.start();
-			this.server = server;
-			this.localServer = true;
-		}
-		super.afterPropertiesSet();
-	}
-
-	@Override
-	protected void publishEndpoint(Endpoint endpoint, WebService annotation) {
-		endpoint.publish(buildHttpContext(endpoint, annotation.serviceName()));
-	}
-
-	@Override
-	protected void publishEndpoint(Endpoint endpoint, WebServiceProvider annotation) {
-		endpoint.publish(buildHttpContext(endpoint, annotation.serviceName()));
-	}
-
-	/**
-	 * Build the HttpContext for the given endpoint.
-	 * @param endpoint the JAX-WS Provider Endpoint object
-	 * @param serviceName the given service name
-	 * @return the fully populated HttpContext
-	 */
-	protected HttpContext buildHttpContext(Endpoint endpoint, String serviceName) {
-		Assert.state(this.server != null, "No HttpServer available");
-		String fullPath = calculateEndpointPath(endpoint, serviceName);
-		HttpContext httpContext = this.server.createContext(fullPath);
-		if (this.filters != null) {
-			httpContext.getFilters().addAll(this.filters);
-		}
-		if (this.authenticator != null) {
-			httpContext.setAuthenticator(this.authenticator);
-		}
-		return httpContext;
-	}
-
-	/**
-	 * Calculate the full endpoint path for the given endpoint.
-	 * @param endpoint the JAX-WS Provider Endpoint object
-	 * @param serviceName the given service name
-	 * @return the full endpoint path
-	 */
-	protected String calculateEndpointPath(Endpoint endpoint, String serviceName) {
-		return this.basePath + serviceName;
-	}
-
-
-	@Override
-	public void destroy() {
-		super.destroy();
-		if (this.server != null && this.localServer) {
-			logger.info("Stopping HttpServer");
-			this.server.stop(this.shutdownDelay);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
deleted file mode 100644
index 06786578f9c0..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import javax.jws.WebService;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.WebServiceProvider;
-
-/**
- * Simple exporter for JAX-WS services, autodetecting annotated service beans
- * (through the JAX-WS {@link javax.jws.WebService} annotation) and exporting
- * them with a configured base address (by default "http://localhost:8080/")
- * using the JAX-WS provider's built-in publication support. The full address
- * for each service will consist of the base address with the service name
- * appended (e.g. "http://localhost:8080/OrderService").
- *
- * <p>Note that this exporter will only work if the JAX-WS runtime actually
- * supports publishing with an address argument, i.e. if the JAX-WS runtime
- * ships an internal HTTP server.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see javax.jws.WebService
- * @see javax.xml.ws.Endpoint#publish(String)
- */
-public class SimpleJaxWsServiceExporter extends AbstractJaxWsServiceExporter {
-
-	/**
-	 * The default base address.
-	 */
-	public static final String DEFAULT_BASE_ADDRESS = "http://localhost:8080/";
-
-	private String baseAddress = DEFAULT_BASE_ADDRESS;
-
-
-	/**
-	 * Set the base address for exported services.
-	 * Default is "http://localhost:8080/".
-	 * <p>For each actual publication address, the service name will be
-	 * appended to this base address. E.g. service name "OrderService"
-	 * -> "http://localhost:8080/OrderService".
-	 * @see javax.xml.ws.Endpoint#publish(String)
-	 * @see javax.jws.WebService#serviceName()
-	 */
-	public void setBaseAddress(String baseAddress) {
-		this.baseAddress = baseAddress;
-	}
-
-
-	@Override
-	protected void publishEndpoint(Endpoint endpoint, WebService annotation) {
-		endpoint.publish(calculateEndpointAddress(endpoint, annotation.serviceName()));
-	}
-
-	@Override
-	protected void publishEndpoint(Endpoint endpoint, WebServiceProvider annotation) {
-		endpoint.publish(calculateEndpointAddress(endpoint, annotation.serviceName()));
-	}
-
-	/**
-	 * Calculate the full endpoint address for the given endpoint.
-	 * @param endpoint the JAX-WS Provider Endpoint object
-	 * @param serviceName the given service name
-	 * @return the full endpoint address
-	 */
-	protected String calculateEndpointAddress(Endpoint endpoint, String serviceName) {
-		String fullAddress = this.baseAddress + serviceName;
-		if (endpoint.getClass().getName().startsWith("weblogic.")) {
-			// Workaround for WebLogic 10.3
-			fullAddress = fullAddress + "/";
-		}
-		return fullAddress;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
deleted file mode 100644
index 6dc1423ab67d..000000000000
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Remoting classes for Web Services via JAX-WS (the successor of JAX-RPC),
- * as included in Java 6 and Java EE 5. This package provides proxy
- * factories for accessing JAX-WS services and ports.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.remoting.jaxws;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
deleted file mode 100644
index 58d1846bcf4a..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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.
- * 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.remoting.caucho;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-
-import com.caucho.hessian.client.HessianProxyFactory;
-import com.sun.net.httpserver.HttpServer;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.testfixture.beans.ITestBean;
-import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.util.SocketUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-
-/**
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @since 16.05.2003
- */
-public class CauchoRemotingTests {
-
-	@Test
-	public void hessianProxyFactoryBeanWithClassInsteadOfInterface() throws Exception {
-		HessianProxyFactoryBean factory = new HessianProxyFactoryBean();
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				factory.setServiceInterface(TestBean.class));
-	}
-
-	@Test
-	public void hessianProxyFactoryBeanWithAccessError() throws Exception {
-		HessianProxyFactoryBean factory = new HessianProxyFactoryBean();
-		factory.setServiceInterface(ITestBean.class);
-		factory.setServiceUrl("http://localhosta/testbean");
-		factory.afterPropertiesSet();
-
-		assertThat(factory.isSingleton()).as("Correct singleton value").isTrue();
-		boolean condition = factory.getObject() instanceof ITestBean;
-		assertThat(condition).isTrue();
-		ITestBean bean = (ITestBean) factory.getObject();
-
-		assertThatExceptionOfType(RemoteAccessException.class).isThrownBy(() ->
-				bean.setName("test"));
-	}
-
-	@Test
-	public void hessianProxyFactoryBeanWithAuthenticationAndAccessError() throws Exception {
-		HessianProxyFactoryBean factory = new HessianProxyFactoryBean();
-		factory.setServiceInterface(ITestBean.class);
-		factory.setServiceUrl("http://localhosta/testbean");
-		factory.setUsername("test");
-		factory.setPassword("bean");
-		factory.setOverloadEnabled(true);
-		factory.afterPropertiesSet();
-
-		assertThat(factory.isSingleton()).as("Correct singleton value").isTrue();
-		boolean condition = factory.getObject() instanceof ITestBean;
-		assertThat(condition).isTrue();
-		ITestBean bean = (ITestBean) factory.getObject();
-
-		assertThatExceptionOfType(RemoteAccessException.class).isThrownBy(() ->
-				bean.setName("test"));
-	}
-
-	@Test
-	public void hessianProxyFactoryBeanWithCustomProxyFactory() throws Exception {
-		TestHessianProxyFactory proxyFactory = new TestHessianProxyFactory();
-		HessianProxyFactoryBean factory = new HessianProxyFactoryBean();
-		factory.setServiceInterface(ITestBean.class);
-		factory.setServiceUrl("http://localhosta/testbean");
-		factory.setProxyFactory(proxyFactory);
-		factory.setUsername("test");
-		factory.setPassword("bean");
-		factory.setOverloadEnabled(true);
-		factory.afterPropertiesSet();
-		assertThat(factory.isSingleton()).as("Correct singleton value").isTrue();
-		boolean condition = factory.getObject() instanceof ITestBean;
-		assertThat(condition).isTrue();
-		ITestBean bean = (ITestBean) factory.getObject();
-
-		assertThat(proxyFactory.user).isEqualTo("test");
-		assertThat(proxyFactory.password).isEqualTo("bean");
-		assertThat(proxyFactory.overloadEnabled).isTrue();
-
-		assertThatExceptionOfType(RemoteAccessException.class).isThrownBy(() ->
-				bean.setName("test"));
-	}
-
-	@Test
-	@SuppressWarnings("deprecation")
-	public void simpleHessianServiceExporter() throws IOException {
-		final int port = SocketUtils.findAvailableTcpPort();
-
-		TestBean tb = new TestBean("tb");
-		SimpleHessianServiceExporter exporter = new SimpleHessianServiceExporter();
-		exporter.setService(tb);
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setDebug(true);
-		exporter.prepare();
-
-		HttpServer server = HttpServer.create(new InetSocketAddress(port), -1);
-		server.createContext("/hessian", exporter);
-		server.start();
-		try {
-			HessianClientInterceptor client = new HessianClientInterceptor();
-			client.setServiceUrl("http://localhost:" + port + "/hessian");
-			client.setServiceInterface(ITestBean.class);
-			//client.setHessian2(true);
-			client.prepare();
-			ITestBean proxy = ProxyFactory.getProxy(ITestBean.class, client);
-			assertThat(proxy.getName()).isEqualTo("tb");
-			proxy.setName("test");
-			assertThat(proxy.getName()).isEqualTo("test");
-		}
-		finally {
-			server.stop(Integer.MAX_VALUE);
-		}
-	}
-
-
-	private static class TestHessianProxyFactory extends HessianProxyFactory {
-
-		private String user;
-		private String password;
-		private boolean overloadEnabled;
-
-		@Override
-		public void setUser(String user) {
-			this.user = user;
-		}
-
-		@Override
-		public void setPassword(String password) {
-			this.password = password;
-		}
-
-		@Override
-		public void setOverloadEnabled(boolean overloadEnabled) {
-			this.overloadEnabled = overloadEnabled;
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java
deleted file mode 100644
index c5d486f05e62..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutorTests.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import java.io.IOException;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.Configurable;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.withSettings;
-
-/**
- * @author Stephane Nicoll
- */
-public class HttpComponentsHttpInvokerRequestExecutorTests {
-
-	@Test
-	public void customizeConnectionTimeout() throws IOException {
-		HttpComponentsHttpInvokerRequestExecutor executor = new HttpComponentsHttpInvokerRequestExecutor();
-		executor.setConnectTimeout(5000);
-
-		HttpInvokerClientConfiguration config = mockHttpInvokerClientConfiguration("https://fake-service");
-		HttpPost httpPost = executor.createHttpPost(config);
-		assertThat(httpPost.getConfig().getConnectTimeout()).isEqualTo(5000);
-	}
-
-	@Test
-	public void customizeConnectionRequestTimeout() throws IOException {
-		HttpComponentsHttpInvokerRequestExecutor executor = new HttpComponentsHttpInvokerRequestExecutor();
-		executor.setConnectionRequestTimeout(7000);
-
-		HttpInvokerClientConfiguration config = mockHttpInvokerClientConfiguration("https://fake-service");
-		HttpPost httpPost = executor.createHttpPost(config);
-		assertThat(httpPost.getConfig().getConnectionRequestTimeout()).isEqualTo(7000);
-	}
-
-	@Test
-	public void customizeReadTimeout() throws IOException {
-		HttpComponentsHttpInvokerRequestExecutor executor = new HttpComponentsHttpInvokerRequestExecutor();
-		executor.setReadTimeout(10000);
-
-		HttpInvokerClientConfiguration config = mockHttpInvokerClientConfiguration("https://fake-service");
-		HttpPost httpPost = executor.createHttpPost(config);
-		assertThat(httpPost.getConfig().getSocketTimeout()).isEqualTo(10000);
-	}
-
-	@Test
-	public void defaultSettingsOfHttpClientMergedOnExecutorCustomization() throws IOException {
-		RequestConfig defaultConfig = RequestConfig.custom().setConnectTimeout(1234).build();
-		CloseableHttpClient client = mock(CloseableHttpClient.class,
-				withSettings().extraInterfaces(Configurable.class));
-		Configurable configurable = (Configurable) client;
-		given(configurable.getConfig()).willReturn(defaultConfig);
-
-		HttpComponentsHttpInvokerRequestExecutor executor =
-				new HttpComponentsHttpInvokerRequestExecutor(client);
-		HttpInvokerClientConfiguration config = mockHttpInvokerClientConfiguration("https://fake-service");
-		HttpPost httpPost = executor.createHttpPost(config);
-		assertThat(httpPost.getConfig()).as("Default client configuration is expected").isSameAs(defaultConfig);
-
-		executor.setConnectionRequestTimeout(4567);
-		HttpPost httpPost2 = executor.createHttpPost(config);
-		assertThat(httpPost2.getConfig()).isNotNull();
-		assertThat(httpPost2.getConfig().getConnectionRequestTimeout()).isEqualTo(4567);
-		// Default connection timeout merged
-		assertThat(httpPost2.getConfig().getConnectTimeout()).isEqualTo(1234);
-	}
-
-	@Test
-	public void localSettingsOverrideClientDefaultSettings() throws Exception {
-		RequestConfig defaultConfig = RequestConfig.custom()
-				.setConnectTimeout(1234).setConnectionRequestTimeout(6789).build();
-		CloseableHttpClient client = mock(CloseableHttpClient.class,
-				withSettings().extraInterfaces(Configurable.class));
-		Configurable configurable = (Configurable) client;
-		given(configurable.getConfig()).willReturn(defaultConfig);
-
-		HttpComponentsHttpInvokerRequestExecutor executor =
-				new HttpComponentsHttpInvokerRequestExecutor(client);
-		executor.setConnectTimeout(5000);
-
-		HttpInvokerClientConfiguration config = mockHttpInvokerClientConfiguration("https://fake-service");
-		HttpPost httpPost = executor.createHttpPost(config);
-		RequestConfig requestConfig = httpPost.getConfig();
-		assertThat(requestConfig.getConnectTimeout()).isEqualTo(5000);
-		assertThat(requestConfig.getConnectionRequestTimeout()).isEqualTo(6789);
-		assertThat(requestConfig.getSocketTimeout()).isEqualTo(-1);
-	}
-
-	@Test
-	public void mergeBasedOnCurrentHttpClient() throws Exception {
-		RequestConfig defaultConfig = RequestConfig.custom()
-				.setSocketTimeout(1234).build();
-		final CloseableHttpClient client = mock(CloseableHttpClient.class,
-				withSettings().extraInterfaces(Configurable.class));
-		Configurable configurable = (Configurable) client;
-		given(configurable.getConfig()).willReturn(defaultConfig);
-
-		HttpComponentsHttpInvokerRequestExecutor executor =
-				new HttpComponentsHttpInvokerRequestExecutor() {
-					@Override
-					public HttpClient getHttpClient() {
-						return client;
-					}
-				};
-		executor.setReadTimeout(5000);
-		HttpInvokerClientConfiguration config = mockHttpInvokerClientConfiguration("https://fake-service");
-		HttpPost httpPost = executor.createHttpPost(config);
-		RequestConfig requestConfig = httpPost.getConfig();
-		assertThat(requestConfig.getConnectTimeout()).isEqualTo(-1);
-		assertThat(requestConfig.getConnectionRequestTimeout()).isEqualTo(-1);
-		assertThat(requestConfig.getSocketTimeout()).isEqualTo(5000);
-
-		// Update the Http client so that it returns an updated  config
-		RequestConfig updatedDefaultConfig = RequestConfig.custom()
-				.setConnectTimeout(1234).build();
-		given(configurable.getConfig()).willReturn(updatedDefaultConfig);
-		executor.setReadTimeout(7000);
-		HttpPost httpPost2 = executor.createHttpPost(config);
-		RequestConfig requestConfig2 = httpPost2.getConfig();
-		assertThat(requestConfig2.getConnectTimeout()).isEqualTo(1234);
-		assertThat(requestConfig2.getConnectionRequestTimeout()).isEqualTo(-1);
-		assertThat(requestConfig2.getSocketTimeout()).isEqualTo(7000);
-	}
-
-	@Test
-	public void ignoreFactorySettings() throws IOException {
-		CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-		HttpComponentsHttpInvokerRequestExecutor executor = new HttpComponentsHttpInvokerRequestExecutor(httpClient) {
-			@Override
-			protected RequestConfig createRequestConfig(HttpInvokerClientConfiguration config) {
-				return null;
-			}
-		};
-
-		HttpInvokerClientConfiguration config = mockHttpInvokerClientConfiguration("https://fake-service");
-		HttpPost httpPost = executor.createHttpPost(config);
-		assertThat(httpPost.getConfig()).as("custom request config should not be set").isNull();
-	}
-
-	private HttpInvokerClientConfiguration mockHttpInvokerClientConfiguration(String serviceUrl) {
-		HttpInvokerClientConfiguration config = mock(HttpInvokerClientConfiguration.class);
-		given(config.getServiceUrl()).willReturn(serviceUrl);
-		return config;
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerFactoryBeanIntegrationTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerFactoryBeanIntegrationTests.java
deleted file mode 100644
index a53d1e2e387d..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerFactoryBeanIntegrationTests.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.
- * 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.remoting.httpinvoker;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.env.Environment;
-import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor;
-import org.springframework.stereotype.Component;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Stephane Nicoll
- */
-class HttpInvokerFactoryBeanIntegrationTests {
-
-	@Test
-	@SuppressWarnings("resource")
-	void testLoadedConfigClass() {
-		ApplicationContext context = new AnnotationConfigApplicationContext(InvokerAutowiringConfig.class);
-		MyBean myBean = context.getBean("myBean", MyBean.class);
-		assertThat(myBean.myService).isSameAs(context.getBean("myService"));
-		myBean.myService.handle();
-		myBean.myService.handleAsync();
-	}
-
-	@Test
-	@SuppressWarnings("resource")
-	void testNonLoadedConfigClass() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.registerBeanDefinition("config", new RootBeanDefinition(InvokerAutowiringConfig.class.getName()));
-		context.refresh();
-		MyBean myBean = context.getBean("myBean", MyBean.class);
-		assertThat(myBean.myService).isSameAs(context.getBean("myService"));
-		myBean.myService.handle();
-		myBean.myService.handleAsync();
-	}
-
-	@Test
-	@SuppressWarnings("resource")
-	void withConfigurationClassWithPlainFactoryBean() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(ConfigWithPlainFactoryBean.class);
-		context.refresh();
-		MyBean myBean = context.getBean("myBean", MyBean.class);
-		assertThat(myBean.myService).isSameAs(context.getBean("myService"));
-		myBean.myService.handle();
-		myBean.myService.handleAsync();
-	}
-
-
-	interface MyService {
-
-		void handle();
-
-		@Async
-		public void handleAsync();
-	}
-
-
-	@Component("myBean")
-	static class MyBean {
-
-		@Autowired
-		MyService myService;
-	}
-
-
-	@Configuration
-	@ComponentScan
-	@Lazy
-	static class InvokerAutowiringConfig {
-
-		@Bean
-		AsyncAnnotationBeanPostProcessor aabpp() {
-			return new AsyncAnnotationBeanPostProcessor();
-		}
-
-		@Bean
-		@SuppressWarnings("deprecation")
-		HttpInvokerProxyFactoryBean myService() {
-			HttpInvokerProxyFactoryBean factory = new HttpInvokerProxyFactoryBean();
-			factory.setServiceUrl("/svc/dummy");
-			factory.setServiceInterface(MyService.class);
-			factory.setHttpInvokerRequestExecutor((config, invocation) -> new RemoteInvocationResult());
-			return factory;
-		}
-
-		@Bean
-		FactoryBean<String> myOtherService() {
-			throw new IllegalStateException("Don't ever call me");
-		}
-	}
-
-
-	@Configuration
-	static class ConfigWithPlainFactoryBean {
-
-		@Autowired
-		Environment env;
-
-		@Bean
-		MyBean myBean() {
-			return new MyBean();
-		}
-
-		@Bean
-		@SuppressWarnings("deprecation")
-		HttpInvokerProxyFactoryBean myService() {
-			String name = env.getProperty("testbean.name");
-			HttpInvokerProxyFactoryBean factory = new HttpInvokerProxyFactoryBean();
-			factory.setServiceUrl("/svc/" + name);
-			factory.setServiceInterface(MyService.class);
-			factory.setHttpInvokerRequestExecutor((config, invocation) -> new RemoteInvocationResult());
-			return factory;
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
deleted file mode 100644
index 8a2c697b69d8..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
+++ /dev/null
@@ -1,453 +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.remoting.httpinvoker;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.aopalliance.intercept.MethodInvocation;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.testfixture.beans.ITestBean;
-import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.remoting.RemoteAccessException;
-import org.springframework.remoting.support.DefaultRemoteInvocationExecutor;
-import org.springframework.remoting.support.RemoteInvocation;
-import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
-import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-
-/**
- * @author Juergen Hoeller
- * @since 09.08.2004
- */
-@SuppressWarnings("deprecation")
-class HttpInvokerTests {
-
-	@Test
-	void httpInvokerProxyFactoryBeanAndServiceExporter() {
-		doTestHttpInvokerProxyFactoryBeanAndServiceExporter(false);
-	}
-
-	@Test
-	void httpInvokerProxyFactoryBeanAndServiceExporterWithExplicitClassLoader() {
-		doTestHttpInvokerProxyFactoryBeanAndServiceExporter(true);
-	}
-
-	private void doTestHttpInvokerProxyFactoryBeanAndServiceExporter(boolean explicitClassLoader) {
-		TestBean target = new TestBean("myname", 99);
-
-		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter();
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setService(target);
-		exporter.afterPropertiesSet();
-
-		HttpInvokerProxyFactoryBean pfb = new HttpInvokerProxyFactoryBean();
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setServiceUrl("https://myurl");
-
-		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
-			@Override
-			protected RemoteInvocationResult doExecuteRequest(
-					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
-				assertThat(config.getServiceUrl()).isEqualTo("https://myurl");
-				MockHttpServletRequest request = new MockHttpServletRequest();
-				MockHttpServletResponse response = new MockHttpServletResponse();
-				request.setContent(baos.toByteArray());
-				exporter.handleRequest(request, response);
-				return readRemoteInvocationResult(
-						new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl());
-			}
-		});
-		if (explicitClassLoader) {
-			((BeanClassLoaderAware) pfb.getHttpInvokerRequestExecutor()).setBeanClassLoader(getClass().getClassLoader());
-		}
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-		assertThat(proxy.getName()).isEqualTo("myname");
-		assertThat(proxy.getAge()).isEqualTo(99);
-		proxy.setAge(50);
-		assertThat(proxy.getAge()).isEqualTo(50);
-		proxy.setStringArray(new String[] {"str1", "str2"});
-		assertThat(Arrays.equals(new String[] {"str1", "str2"}, proxy.getStringArray())).isTrue();
-		proxy.setSomeIntegerArray(new Integer[] {1, 2, 3});
-		assertThat(Arrays.equals(new Integer[] {1, 2, 3}, proxy.getSomeIntegerArray())).isTrue();
-		proxy.setNestedIntegerArray(new Integer[][] {{1, 2, 3}, {4, 5, 6}});
-		Integer[][] integerArray = proxy.getNestedIntegerArray();
-		assertThat(Arrays.equals(new Integer[] {1, 2, 3}, integerArray[0])).isTrue();
-		assertThat(Arrays.equals(new Integer[] {4, 5, 6}, integerArray[1])).isTrue();
-		proxy.setSomeIntArray(new int[] {1, 2, 3});
-		assertThat(Arrays.equals(new int[] {1, 2, 3}, proxy.getSomeIntArray())).isTrue();
-		proxy.setNestedIntArray(new int[][] {{1, 2, 3}, {4, 5, 6}});
-		int[][] intArray = proxy.getNestedIntArray();
-		assertThat(Arrays.equals(new int[] {1, 2, 3}, intArray[0])).isTrue();
-		assertThat(Arrays.equals(new int[] {4, 5, 6}, intArray[1])).isTrue();
-
-		assertThatIllegalStateException().isThrownBy(() ->
-				proxy.exceptional(new IllegalStateException()));
-		assertThatExceptionOfType(IllegalAccessException.class).isThrownBy(() ->
-				proxy.exceptional(new IllegalAccessException()));
-	}
-
-	@Test
-	void httpInvokerProxyFactoryBeanAndServiceExporterWithIOException() throws Exception {
-		TestBean target = new TestBean("myname", 99);
-
-		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter();
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setService(target);
-		exporter.afterPropertiesSet();
-
-		HttpInvokerProxyFactoryBean pfb = new HttpInvokerProxyFactoryBean();
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setServiceUrl("https://myurl");
-
-		pfb.setHttpInvokerRequestExecutor((config, invocation) -> { throw new IOException("argh"); });
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-		assertThatExceptionOfType(RemoteAccessException.class)
-			.isThrownBy(() -> proxy.setAge(50))
-			.withCauseInstanceOf(IOException.class);
-	}
-
-	@Test
-	void httpInvokerProxyFactoryBeanAndServiceExporterWithGzipCompression() {
-		TestBean target = new TestBean("myname", 99);
-
-		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() {
-			@Override
-			protected InputStream decorateInputStream(HttpServletRequest request, InputStream is) throws IOException {
-				if ("gzip".equals(request.getHeader("Compression"))) {
-					return new GZIPInputStream(is);
-				}
-				else {
-					return is;
-				}
-			}
-			@Override
-			protected OutputStream decorateOutputStream(
-					HttpServletRequest request, HttpServletResponse response, OutputStream os) throws IOException {
-				if ("gzip".equals(request.getHeader("Compression"))) {
-					return new GZIPOutputStream(os);
-				}
-				else {
-					return os;
-				}
-			}
-		};
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setService(target);
-		exporter.afterPropertiesSet();
-
-		HttpInvokerProxyFactoryBean pfb = new HttpInvokerProxyFactoryBean();
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setServiceUrl("https://myurl");
-
-		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
-			@Override
-			protected RemoteInvocationResult doExecuteRequest(
-					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos)
-					throws IOException, ClassNotFoundException {
-				assertThat(config.getServiceUrl()).isEqualTo("https://myurl");
-				MockHttpServletRequest request = new MockHttpServletRequest();
-				request.addHeader("Compression", "gzip");
-				MockHttpServletResponse response = new MockHttpServletResponse();
-				request.setContent(baos.toByteArray());
-				try {
-					exporter.handleRequest(request, response);
-				}
-				catch (ServletException ex) {
-					throw new IOException(ex.toString());
-				}
-				return readRemoteInvocationResult(
-						new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl());
-			}
-			@Override
-			protected OutputStream decorateOutputStream(OutputStream os) throws IOException {
-				return new GZIPOutputStream(os);
-			}
-			@Override
-			protected InputStream decorateInputStream(InputStream is) throws IOException {
-				return new GZIPInputStream(is);
-			}
-		});
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-		assertThat(proxy.getName()).isEqualTo("myname");
-		assertThat(proxy.getAge()).isEqualTo(99);
-		proxy.setAge(50);
-		assertThat(proxy.getAge()).isEqualTo(50);
-
-		assertThatIllegalStateException().isThrownBy(() ->
-				proxy.exceptional(new IllegalStateException()));
-		assertThatExceptionOfType(IllegalAccessException.class).isThrownBy(() ->
-				proxy.exceptional(new IllegalAccessException()));
-	}
-
-	@Test
-	void httpInvokerProxyFactoryBeanAndServiceExporterWithWrappedInvocations() {
-		TestBean target = new TestBean("myname", 99);
-
-		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() {
-			@Override
-			protected RemoteInvocation doReadRemoteInvocation(ObjectInputStream ois)
-					throws IOException, ClassNotFoundException {
-				Object obj = ois.readObject();
-				if (!(obj instanceof TestRemoteInvocationWrapper)) {
-					throw new IOException("Deserialized object needs to be assignable to type [" +
-							TestRemoteInvocationWrapper.class.getName() + "]: " + obj);
-				}
-				return ((TestRemoteInvocationWrapper) obj).remoteInvocation;
-			}
-			@Override
-			protected void doWriteRemoteInvocationResult(RemoteInvocationResult result, ObjectOutputStream oos)
-					throws IOException {
-				oos.writeObject(new TestRemoteInvocationResultWrapper(result));
-			}
-		};
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setService(target);
-		exporter.afterPropertiesSet();
-
-		HttpInvokerProxyFactoryBean pfb = new HttpInvokerProxyFactoryBean();
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setServiceUrl("https://myurl");
-
-		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
-			@Override
-			protected RemoteInvocationResult doExecuteRequest(
-					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
-				assertThat(config.getServiceUrl()).isEqualTo("https://myurl");
-				MockHttpServletRequest request = new MockHttpServletRequest();
-				MockHttpServletResponse response = new MockHttpServletResponse();
-				request.setContent(baos.toByteArray());
-				exporter.handleRequest(request, response);
-				return readRemoteInvocationResult(
-						new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl());
-			}
-			@Override
-			protected void doWriteRemoteInvocation(RemoteInvocation invocation, ObjectOutputStream oos) throws IOException {
-				oos.writeObject(new TestRemoteInvocationWrapper(invocation));
-			}
-			@Override
-			protected RemoteInvocationResult doReadRemoteInvocationResult(ObjectInputStream ois)
-					throws IOException, ClassNotFoundException {
-				Object obj = ois.readObject();
-				if (!(obj instanceof TestRemoteInvocationResultWrapper)) {
-					throw new IOException("Deserialized object needs to be assignable to type ["
-							+ TestRemoteInvocationResultWrapper.class.getName() + "]: " + obj);
-				}
-				return ((TestRemoteInvocationResultWrapper) obj).remoteInvocationResult;
-			}
-		});
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-		assertThat(proxy.getName()).isEqualTo("myname");
-		assertThat(proxy.getAge()).isEqualTo(99);
-		proxy.setAge(50);
-		assertThat(proxy.getAge()).isEqualTo(50);
-
-		assertThatIllegalStateException().isThrownBy(() ->
-				proxy.exceptional(new IllegalStateException()));
-		assertThatExceptionOfType(IllegalAccessException.class).isThrownBy(() ->
-				proxy.exceptional(new IllegalAccessException()));
-	}
-
-	@Test
-	void httpInvokerProxyFactoryBeanAndServiceExporterWithInvocationAttributes() {
-		TestBean target = new TestBean("myname", 99);
-
-		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter();
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setService(target);
-		exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() {
-			@Override
-			public Object invoke(RemoteInvocation invocation, Object targetObject)
-					throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-				assertThat(invocation.getAttributes()).isNotNull();
-				assertThat(invocation.getAttributes().size()).isEqualTo(1);
-				assertThat(invocation.getAttributes().get("myKey")).isEqualTo("myValue");
-				assertThat(invocation.getAttribute("myKey")).isEqualTo("myValue");
-				return super.invoke(invocation, targetObject);
-			}
-		});
-		exporter.afterPropertiesSet();
-
-		HttpInvokerProxyFactoryBean pfb = new HttpInvokerProxyFactoryBean();
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setServiceUrl("https://myurl");
-		pfb.setRemoteInvocationFactory(methodInvocation -> {
-				RemoteInvocation invocation = new RemoteInvocation(methodInvocation);
-				invocation.addAttribute("myKey", "myValue");
-				assertThatIllegalStateException().isThrownBy(() ->
-						invocation.addAttribute("myKey", "myValue"));
-				assertThat(invocation.getAttributes()).isNotNull();
-				assertThat(invocation.getAttributes().size()).isEqualTo(1);
-				assertThat(invocation.getAttributes().get("myKey")).isEqualTo("myValue");
-				assertThat(invocation.getAttribute("myKey")).isEqualTo("myValue");
-				return invocation;
-		});
-
-		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
-			@Override
-			protected RemoteInvocationResult doExecuteRequest(
-					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
-				assertThat(config.getServiceUrl()).isEqualTo("https://myurl");
-				MockHttpServletRequest request = new MockHttpServletRequest();
-				MockHttpServletResponse response = new MockHttpServletResponse();
-				request.setContent(baos.toByteArray());
-				exporter.handleRequest(request, response);
-				return readRemoteInvocationResult(
-						new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl());
-			}
-		});
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-		assertThat(proxy.getName()).isEqualTo("myname");
-		assertThat(proxy.getAge()).isEqualTo(99);
-	}
-
-	@Test
-	void httpInvokerProxyFactoryBeanAndServiceExporterWithCustomInvocationObject() {
-		TestBean target = new TestBean("myname", 99);
-
-		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter();
-		exporter.setServiceInterface(ITestBean.class);
-		exporter.setService(target);
-		exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() {
-			@Override
-			public Object invoke(RemoteInvocation invocation, Object targetObject)
-					throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-				boolean condition = invocation instanceof TestRemoteInvocation;
-				assertThat(condition).isTrue();
-				assertThat(invocation.getAttributes()).isNull();
-				assertThat(invocation.getAttribute("myKey")).isNull();
-				return super.invoke(invocation, targetObject);
-			}
-		});
-		exporter.afterPropertiesSet();
-
-		HttpInvokerProxyFactoryBean pfb = new HttpInvokerProxyFactoryBean();
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setServiceUrl("https://myurl");
-		pfb.setRemoteInvocationFactory(methodInvocation -> {
-				RemoteInvocation invocation = new TestRemoteInvocation(methodInvocation);
-				assertThat(invocation.getAttributes()).isNull();
-				assertThat(invocation.getAttribute("myKey")).isNull();
-				return invocation;
-		});
-
-		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
-			@Override
-			protected RemoteInvocationResult doExecuteRequest(
-					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
-				assertThat(config.getServiceUrl()).isEqualTo("https://myurl");
-				MockHttpServletRequest request = new MockHttpServletRequest();
-				MockHttpServletResponse response = new MockHttpServletResponse();
-				request.setContent(baos.toByteArray());
-				exporter.handleRequest(request, response);
-				return readRemoteInvocationResult(
-						new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl());
-			}
-		});
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-		assertThat(proxy.getName()).isEqualTo("myname");
-		assertThat(proxy.getAge()).isEqualTo(99);
-	}
-
-	@Test
-	void httpInvokerWithSpecialLocalMethods() {
-		String serviceUrl = "https://myurl";
-		HttpInvokerProxyFactoryBean pfb = new HttpInvokerProxyFactoryBean();
-		pfb.setServiceInterface(ITestBean.class);
-		pfb.setServiceUrl(serviceUrl);
-
-		pfb.setHttpInvokerRequestExecutor((config, invocation) -> { throw new IOException("argh"); });
-
-		pfb.afterPropertiesSet();
-		ITestBean proxy = (ITestBean) pfb.getObject();
-
-		// shouldn't go through to remote service
-		assertThat(proxy.toString().contains("HTTP invoker")).isTrue();
-		assertThat(proxy.toString().contains(serviceUrl)).isTrue();
-		assertThat(proxy.hashCode()).isEqualTo(proxy.hashCode());
-		assertThat(proxy.equals(proxy)).isTrue();
-
-		// should go through
-		assertThatExceptionOfType(RemoteAccessException.class)
-			.isThrownBy(() -> proxy.setAge(50))
-			.withCauseInstanceOf(IOException.class);
-	}
-
-
-	@SuppressWarnings("serial")
-	private static class TestRemoteInvocation extends RemoteInvocation {
-
-		TestRemoteInvocation(MethodInvocation methodInvocation) {
-			super(methodInvocation);
-		}
-	}
-
-
-	@SuppressWarnings("serial")
-	private static class TestRemoteInvocationWrapper implements Serializable {
-
-		private final RemoteInvocation remoteInvocation;
-
-		TestRemoteInvocationWrapper(RemoteInvocation remoteInvocation) {
-			this.remoteInvocation = remoteInvocation;
-		}
-	}
-
-
-	@SuppressWarnings("serial")
-	private static class TestRemoteInvocationResultWrapper implements Serializable {
-
-		private final RemoteInvocationResult remoteInvocationResult;
-
-		TestRemoteInvocationResultWrapper(RemoteInvocationResult remoteInvocationResult) {
-			this.remoteInvocationResult = remoteInvocationResult;
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
deleted file mode 100644
index 1a2d4f06a5e1..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.soap.AddressingFeature;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.GenericBeanDefinition;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.context.annotation.AnnotationConfigUtils;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.remoting.RemoteAccessException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * @author Juergen Hoeller
- * @since 2.5
- */
-public class JaxWsSupportTests {
-
-	@Test
-	public void testJaxWsPortAccess() throws Exception {
-		doTestJaxWsPortAccess((WebServiceFeature[]) null);
-	}
-
-	@Test
-	public void testJaxWsPortAccessWithFeature() throws Exception {
-		doTestJaxWsPortAccess(new AddressingFeature());
-	}
-
-	private void doTestJaxWsPortAccess(WebServiceFeature... features) throws Exception {
-		GenericApplicationContext ac = new GenericApplicationContext();
-
-		GenericBeanDefinition serviceDef = new GenericBeanDefinition();
-		serviceDef.setBeanClass(OrderServiceImpl.class);
-		ac.registerBeanDefinition("service", serviceDef);
-
-		GenericBeanDefinition exporterDef = new GenericBeanDefinition();
-		exporterDef.setBeanClass(SimpleJaxWsServiceExporter.class);
-		exporterDef.getPropertyValues().add("baseAddress", "http://localhost:9999/");
-		ac.registerBeanDefinition("exporter", exporterDef);
-
-		GenericBeanDefinition clientDef = new GenericBeanDefinition();
-		clientDef.setBeanClass(JaxWsPortProxyFactoryBean.class);
-		clientDef.getPropertyValues().add("wsdlDocumentUrl", "http://localhost:9999/OrderService?wsdl");
-		clientDef.getPropertyValues().add("namespaceUri", "http://jaxws.remoting.springframework.org/");
-		clientDef.getPropertyValues().add("username", "juergen");
-		clientDef.getPropertyValues().add("password", "hoeller");
-		clientDef.getPropertyValues().add("serviceName", "OrderService");
-		clientDef.getPropertyValues().add("serviceInterface", OrderService.class);
-		clientDef.getPropertyValues().add("lookupServiceOnStartup", Boolean.FALSE);
-		if (features != null) {
-			clientDef.getPropertyValues().add("portFeatures", features);
-		}
-		ac.registerBeanDefinition("client", clientDef);
-
-		GenericBeanDefinition serviceFactoryDef = new GenericBeanDefinition();
-		serviceFactoryDef.setBeanClass(LocalJaxWsServiceFactoryBean.class);
-		serviceFactoryDef.getPropertyValues().add("wsdlDocumentUrl", "http://localhost:9999/OrderService?wsdl");
-		serviceFactoryDef.getPropertyValues().add("namespaceUri", "http://jaxws.remoting.springframework.org/");
-		serviceFactoryDef.getPropertyValues().add("serviceName", "OrderService");
-		ac.registerBeanDefinition("orderService", serviceFactoryDef);
-
-		ac.registerBeanDefinition("accessor", new RootBeanDefinition(ServiceAccessor.class));
-		AnnotationConfigUtils.registerAnnotationConfigProcessors(ac);
-
-		try {
-			ac.refresh();
-
-			OrderService orderService = ac.getBean("client", OrderService.class);
-			boolean condition = orderService instanceof BindingProvider;
-			assertThat(condition).isTrue();
-			((BindingProvider) orderService).getRequestContext();
-
-			String order = orderService.getOrder(1000);
-			assertThat(order).isEqualTo("order 1000");
-			assertThatExceptionOfType(Exception.class).isThrownBy(() ->
-					orderService.getOrder(0))
-				.matches(ex -> ex instanceof OrderNotFoundException ||
-						ex instanceof RemoteAccessException);
-			// ignore RemoteAccessException as probably setup issue with JAX-WS provider vs JAXB
-
-			ServiceAccessor serviceAccessor = ac.getBean("accessor", ServiceAccessor.class);
-			order = serviceAccessor.orderService.getOrder(1000);
-			assertThat(order).isEqualTo("order 1000");
-			assertThatExceptionOfType(Exception.class).isThrownBy(() ->
-					serviceAccessor.orderService.getOrder(0))
-				.matches(ex -> ex instanceof OrderNotFoundException ||
-							ex instanceof WebServiceException);
-			// ignore WebServiceException as probably setup issue with JAX-WS provider vs JAXB
-		}
-		catch (BeanCreationException ex) {
-			if ("exporter".equals(ex.getBeanName()) && ex.getRootCause() instanceof ClassNotFoundException) {
-				// ignore - probably running on JDK without the JAX-WS impl present
-			}
-			else {
-				throw ex;
-			}
-		}
-		finally {
-			ac.close();
-		}
-	}
-
-
-	public static class ServiceAccessor {
-
-		@WebServiceRef
-		public OrderService orderService;
-
-		public OrderService myService;
-
-		@WebServiceRef(value = OrderServiceService.class, wsdlLocation = "http://localhost:9999/OrderService?wsdl")
-		public void setMyService(OrderService myService) {
-			this.myService = myService;
-		}
-	}
-
-
-	@WebServiceClient(targetNamespace = "http://jaxws.remoting.springframework.org/", name="OrderService")
-	public static class OrderServiceService extends Service {
-
-		public OrderServiceService() throws MalformedURLException {
-			super(new URL("http://localhost:9999/OrderService?wsdl"),
-					new QName("http://jaxws.remoting.springframework.org/", "OrderService"));
-		}
-
-		public OrderServiceService(URL wsdlDocumentLocation, QName serviceName) {
-			super(wsdlDocumentLocation, serviceName);
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
deleted file mode 100644
index 58cc650d1039..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import javax.xml.ws.WebFault;
-
-/**
- * @author Juergen Hoeller
- */
-@WebFault
-@SuppressWarnings("serial")
-public class OrderNotFoundException extends Exception {
-
-	private final String faultInfo;
-
-	public OrderNotFoundException(String message) {
-		super(message);
-		this.faultInfo = null;
-	}
-
-	public OrderNotFoundException(String message, String faultInfo) {
-		super(message);
-		this.faultInfo = faultInfo;
-	}
-
-	public String getFaultInfo() {
-		return this.faultInfo;
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderService.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
deleted file mode 100644
index 2b29d13cb3aa..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2002-2007 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.remoting.jaxws;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- * @author Juergen Hoeller
- */
-@WebService
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface OrderService {
-
-	String getOrder(int id) throws OrderNotFoundException;
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
deleted file mode 100644
index 3f9c9781b386..000000000000
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- * 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.remoting.jaxws;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-import org.springframework.util.Assert;
-
-/**
- * @author Juergen Hoeller
- */
-@WebService(serviceName="OrderService", portName="OrderService",
-		endpointInterface = "org.springframework.remoting.jaxws.OrderService")
-public class OrderServiceImpl implements OrderService {
-
-	@Resource
-	private WebServiceContext webServiceContext;
-
-	@Override
-	public String getOrder(int id) throws OrderNotFoundException {
-		Assert.notNull(this.webServiceContext, "WebServiceContext has not been injected");
-		if (id == 0) {
-			throw new OrderNotFoundException("Order 0 not found");
-		}
-		return "order " + id;
-	}
-
-}

From d84ca2ba90d27a7c63d7b35a6259b5b9cf341118 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 17 Sep 2021 09:14:07 +0200
Subject: [PATCH 109/735] Jakarta EE 9 migration

Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles).

Closes gh-22093
Closes gh-25354
Closes gh-26185
Closes gh-27423
See gh-27424
---
 build.gradle                                  | 120 ++--
 integration-tests/integration-tests.gradle    |   8 +-
 ...visorAutoProxyCreatorIntegrationTests.java |   3 +-
 ...ionScannerJsr330ScopeIntegrationTests.java |  15 +-
 .../EnvironmentSystemIntegrationTests.java    |  19 -
 ...toProxyCreatorIntegrationTests-context.xml |   2 +-
 .../AsyncExecutionInterceptor.java            |   4 +-
 spring-aspects/spring-aspects.gradle          |   4 +-
 ...JtaTransactionManagementConfiguration.java |   2 +-
 .../aspectj/JtaAnnotationTransactionAspect.aj |   8 +-
 .../aspectj/JtaTransactionAspectsTests.java   |   3 +-
 spring-beans/spring-beans.gradle              |   4 +-
 .../beans/factory/annotation/Autowired.java   |   2 +-
 .../AutowiredAnnotationBeanPostProcessor.java |  14 +-
 ...nitDestroyAnnotationBeanPostProcessor.java |   8 +-
 ...erAnnotationAutowireCandidateResolver.java |   6 +-
 .../factory/config/DependencyDescriptor.java  |   2 +-
 .../config/ProviderCreatingFactoryBean.java   |   8 +-
 .../beans/factory/config/Scope.java           |   2 +-
 .../support/DefaultListableBeanFactory.java   |  12 +-
 .../DefaultListableBeanFactoryTests.java      |   3 +-
 ...njectAnnotationBeanPostProcessorTests.java |   9 +-
 ...ObjectFactoryCreatingFactoryBeanTests.java |   3 +-
 .../spring-context-indexer.gradle             |   8 +-
 .../StandardStereotypesProvider.java          |   2 +-
 .../CandidateComponentsIndexerTests.java      |  15 +-
 .../index/sample/cdi/SampleManagedBean.java   |   2 +-
 .../context/index/sample/cdi/SampleNamed.java |   2 +-
 .../index/sample/cdi/SampleTransactional.java |   2 +-
 .../index/sample/jpa/SampleConverter.java     |   2 +-
 .../index/sample/jpa/SampleEmbeddable.java    |   2 +-
 .../index/sample/jpa/SampleEntity.java        |   2 +-
 .../sample/jpa/SampleMappedSuperClass.java    |   2 +-
 .../spring-context-support.gradle             |  13 +-
 .../cache/ehcache/EhCacheCache.java           | 171 -----
 .../cache/ehcache/EhCacheCacheManager.java    | 117 ----
 .../cache/ehcache/EhCacheFactoryBean.java     | 329 ---------
 .../ehcache/EhCacheManagerFactoryBean.java    | 199 ------
 .../cache/ehcache/EhCacheManagerUtils.java    | 125 ----
 .../cache/ehcache/package-info.java           |  17 -
 .../mail/MailSendException.java               |   2 +-
 .../javamail/ConfigurableMimeFileTypeMap.java |  10 +-
 .../mail/javamail/InternetAddressEditor.java  |   6 +-
 .../mail/javamail/JavaMailSender.java         |   8 +-
 .../mail/javamail/JavaMailSenderImpl.java     |  24 +-
 .../mail/javamail/MimeMailMessage.java        |   6 +-
 .../mail/javamail/MimeMessageHelper.java      |  76 +-
 .../mail/javamail/MimeMessagePreparator.java  |   4 +-
 .../mail/javamail/SmartMimeMessage.java       |  10 +-
 .../commonj/DelegatingTimerListener.java      |  58 --
 .../scheduling/commonj/DelegatingWork.java    |  85 ---
 .../commonj/ScheduledTimerListener.java       | 229 ------
 .../commonj/TimerManagerAccessor.java         | 192 -----
 .../commonj/TimerManagerFactoryBean.java      | 165 -----
 .../commonj/TimerManagerTaskScheduler.java    | 201 ------
 .../commonj/WorkManagerTaskExecutor.java      | 234 -------
 .../scheduling/commonj/package-info.java      |  10 -
 .../ehcache/EhCacheCacheManagerTests.java     |  85 ---
 .../cache/ehcache/EhCacheCacheTests.java      |  91 ---
 .../cache/ehcache/EhCacheSupportTests.java    | 287 --------
 .../jcache/JCacheEhCache3AnnotationTests.java |  35 -
 .../cache/jcache/JCacheEhCache3ApiTests.java  |  35 -
 .../jcache/JCacheEhCacheAnnotationTests.java  |   2 +-
 .../cache/jcache/JCacheEhCacheApiTests.java   |   2 +-
 .../mail/javamail/JavaMailSenderTests.java    |  23 +-
 .../BeanValidationPostProcessorTests.java     | 155 -----
 .../MethodValidationTests.java                | 218 ------
 .../SpringValidatorAdapterTests.java          | 563 ---------------
 .../ValidatorFactoryTests.java                | 505 --------------
 spring-context/spring-context.gradle          |  24 +-
 .../AnnotationProcessorBenchmark.java         |   3 +-
 .../AnnotationBeanNameGenerator.java          |  10 +-
 .../AnnotationConfigApplicationContext.java   |   2 +-
 .../annotation/AnnotationConfigUtils.java     |   4 +-
 .../context/annotation/Bean.java              |   2 +-
 .../ClassPathBeanDefinitionScanner.java       |   4 +-
 ...athScanningCandidateComponentProvider.java |  14 +-
 .../CommonAnnotationBeanPostProcessor.java    |  51 +-
 .../context/annotation/Configuration.java     |   2 +-
 .../Jsr330ScopeMetadataResolver.java          |   6 +-
 .../context/annotation/Lazy.java              |   4 +-
 .../annotation/MBeanExportConfiguration.java  |  70 +-
 .../MBeanExportBeanDefinitionParser.java      |   8 +-
 .../MBeanServerBeanDefinitionParser.java      |  37 +-
 .../weaving/DefaultContextLoadTimeWeaver.java |  17 +-
 .../AbstractRemoteSlsbInvokerInterceptor.java | 213 ------
 .../AbstractSlsbInvokerInterceptor.java       | 238 -------
 .../ejb/access/EjbAccessException.java        |  47 --
 .../access/LocalSlsbInvokerInterceptor.java   | 179 -----
 ...LocalStatelessSessionProxyFactoryBean.java | 116 ----
 .../SimpleRemoteSlsbInvokerInterceptor.java   | 188 -----
 ...emoteStatelessSessionProxyFactoryBean.java | 130 ----
 .../ejb/access/package-info.java              |  27 -
 ...lStatelessSessionBeanDefinitionParser.java |  10 +-
 ...eStatelessSessionBeanDefinitionParser.java |  10 +-
 .../ejb/config/package-info.java              |   2 +-
 .../weblogic/WebLogicClassLoaderAdapter.java  | 117 ----
 .../WebLogicClassPreProcessorAdapter.java     |  97 ---
 .../weblogic/WebLogicLoadTimeWeaver.java      |  78 ---
 .../classloading/weblogic/package-info.java   |   9 -
 .../WebSphereClassLoaderAdapter.java          | 120 ----
 .../WebSphereClassPreDefinePlugin.java        |  95 ---
 .../websphere/WebSphereLoadTimeWeaver.java    |  75 --
 .../classloading/websphere/package-info.java  |   9 -
 .../WebSphereMBeanServerFactoryBean.java      | 105 ---
 .../jndi/JndiLocatorDelegate.java             |   2 +-
 .../jndi/JndiLocatorSupport.java              |   8 +-
 .../jndi/JndiObjectLocator.java               |   2 +-
 .../jndi/JndiObjectTargetSource.java          |   2 +-
 .../jndi/support/SimpleJndiBeanFactory.java   |   2 +-
 .../scheduling/TaskScheduler.java             |   2 +-
 .../scheduling/annotation/Async.java          |   2 +-
 .../annotation/AsyncAnnotationAdvisor.java    |   6 +-
 .../AsyncAnnotationBeanPostProcessor.java     |   4 +-
 .../scheduling/annotation/EnableAsync.java    |   4 +-
 .../concurrent/ConcurrentTaskExecutor.java    |  20 +-
 .../concurrent/ConcurrentTaskScheduler.java   |  18 +-
 .../DefaultManagedAwareThreadFactory.java     |   6 +-
 .../DefaultManagedTaskExecutor.java           |   8 +-
 .../DefaultManagedTaskScheduler.java          |   8 +-
 .../ExecutorConfigurationSupport.java         |   4 +-
 .../scheduling/concurrent/package-info.java   |   2 +-
 .../stereotype/Repository.java                |   2 +-
 .../validation/ObjectError.java               |   6 +-
 .../validation/SmartValidator.java            |   4 +-
 .../validation/annotation/Validated.java      |   4 +-
 .../annotation/ValidationAnnotationUtils.java |   4 +-
 .../BeanValidationPostProcessor.java          |  12 +-
 .../beanvalidation/CustomValidatorBean.java   |  14 +-
 .../LocalValidatorFactoryBean.java            |  70 +-
 .../LocaleContextMessageInterpolator.java     |   2 +-
 .../MethodValidationInterceptor.java          |  15 +-
 .../MethodValidationPostProcessor.java        |   9 +-
 .../OptionalValidatorFactoryBean.java         |   5 +-
 .../SpringConstraintValidatorFactory.java     |   4 +-
 .../SpringValidatorAdapter.java               |  30 +-
 .../springframework/ejb/config/spring-jee.xsd |  86 +--
 .../AutowiredQualifierFooService.java         |   2 +-
 .../example/scannable/FooServiceImpl.java     |   2 +-
 .../BridgeMethodAutowiringTests.java          |   5 +-
 .../InjectAnnotationAutowireContextTests.java |   9 +-
 .../annotation/AutoProxyLazyInitTests.java    |   3 +-
 ...ommonAnnotationBeanPostProcessorTests.java |   9 +-
 ...nClassPostConstructAndAutowiringTests.java |   3 +-
 .../ConfigurationClassPostProcessorTests.java |   3 +-
 ...PrimitiveBeanLookupAndAutowiringTests.java |   3 +-
 .../PropertySourceAnnotationTests.java        |   3 +-
 .../Spr3775InitDestroyLifecycleTests.java     |   9 +-
 .../AutowiredConfigurationTests.java          |   3 +-
 .../ConfigurationClassProcessingTests.java    |   5 +-
 .../configuration/Spr12526Tests.java          |   3 +-
 .../annotation6/Jsr330NamedForScanning.java   |   2 +-
 .../AnnotationDrivenEventListenerTests.java   |   5 +-
 .../LocalSlsbInvokerInterceptorTests.java     | 207 ------
 ...StatelessSessionProxyFactoryBeanTests.java | 197 ------
 ...mpleRemoteSlsbInvokerInterceptorTests.java | 349 ----------
 ...StatelessSessionProxyFactoryBeanTests.java | 288 --------
 .../config/JeeNamespaceHandlerEventTests.java |  11 +-
 .../ejb/config/JeeNamespaceHandlerTests.java  |  37 +-
 .../BeanValidationPostProcessorTests.java     |   9 +-
 .../beanvalidation/MethodValidationTests.java |  22 +-
 .../SpringValidatorAdapterTests.java          |  97 ++-
 .../beanvalidation/ValidatorFactoryTests.java |  19 +-
 .../ejb/config/jeeNamespaceHandlerTests.xml   |  35 +-
 .../jndi/SimpleNamingContextBuilder.java      |   2 +-
 spring-core/spring-core.gradle                |   4 +-
 .../springframework/core/MethodParameter.java |   2 +-
 .../AnnotationAwareOrderComparator.java       |   8 +-
 .../core/annotation/Order.java                |   4 +-
 .../core/annotation/OrderUtils.java           |  18 +-
 .../core/io/ContextResource.java              |   2 +-
 .../core/task/SimpleAsyncTaskExecutor.java    |   2 +-
 .../task/support/ExecutorServiceAdapter.java  |   4 +-
 .../AnnotatedElementUtilsTests.java           |   2 +-
 .../AnnotationAwareOrderComparatorTests.java  |   3 +-
 .../annotation/MergedAnnotationsTests.java    |   7 +-
 .../core/annotation/OrderUtilsTests.java      |   3 +-
 .../util/Base64UtilsTests.java                |   3 +-
 spring-jdbc/spring-jdbc.gradle                |   2 +-
 .../DataSourceTransactionManager.java         |   4 +-
 .../datasource/DriverManagerDataSource.java   |   4 +-
 .../LazyConnectionDataSourceProxy.java        |   2 +-
 .../datasource/SimpleDriverDataSource.java    |   2 +-
 .../TransactionAwareDataSourceProxy.java      |   4 +-
 .../WebSphereDataSourceAdapter.java           | 204 ------
 .../DataSourceJtaTransactionTests.java        |  12 +-
 spring-jms/spring-jms.gradle                  |   9 +-
 .../jms/IllegalStateException.java            |   4 +-
 .../jms/InvalidClientIDException.java         |   4 +-
 .../jms/InvalidDestinationException.java      |   4 +-
 .../jms/InvalidSelectorException.java         |   4 +-
 .../org/springframework/jms/JmsException.java |  10 +-
 .../jms/JmsSecurityException.java             |   4 +-
 .../jms/MessageEOFException.java              |   4 +-
 .../jms/MessageFormatException.java           |   4 +-
 .../jms/MessageNotReadableException.java      |   4 +-
 .../jms/MessageNotWriteableException.java     |   4 +-
 .../jms/ResourceAllocationException.java      |   4 +-
 .../jms/TransactionInProgressException.java   |   4 +-
 .../jms/TransactionRolledBackException.java   |   4 +-
 .../jms/UncategorizedJmsException.java        |   4 +-
 .../jms/annotation/EnableJms.java             |   4 +-
 .../jms/annotation/JmsListener.java           |   4 +-
 .../AbstractJmsListenerContainerFactory.java  |   5 +-
 .../config/AbstractJmsListenerEndpoint.java   |   2 +-
 .../AbstractListenerContainerParser.java      |   3 +-
 .../DefaultJcaListenerContainerFactory.java   |   2 +-
 .../config/JmsListenerContainerParser.java    |   3 +-
 .../jms/config/SimpleJmsListenerEndpoint.java |   2 +-
 .../jms/connection/CachedMessageConsumer.java |  16 +-
 .../jms/connection/CachedMessageProducer.java |  18 +-
 .../connection/CachingConnectionFactory.java  |  28 +-
 .../connection/ChainedExceptionListener.java  |   4 +-
 .../connection/ConnectionFactoryUtils.java    |  25 +-
 .../DelegatingConnectionFactory.java          |  28 +-
 .../jms/connection/JmsResourceHolder.java     |  13 +-
 .../jms/connection/JmsTransactionManager.java |  20 +-
 .../jms/connection/SessionProxy.java          |   6 +-
 .../connection/SingleConnectionFactory.java   |  49 +-
 .../connection/SmartConnectionFactory.java    |   8 +-
 ...ynchedLocalTransactionFailedException.java |   2 +-
 ...ransactionAwareConnectionFactoryProxy.java |  36 +-
 ...erCredentialsConnectionFactoryAdapter.java |  34 +-
 .../jms/core/BrowserCallback.java             |  12 +-
 .../jms/core/JmsMessageOperations.java        |   4 +-
 .../jms/core/JmsMessagingTemplate.java        |  24 +-
 .../jms/core/JmsOperations.java               |  14 +-
 .../springframework/jms/core/JmsTemplate.java |  66 +-
 .../jms/core/MessageCreator.java              |  10 +-
 .../jms/core/MessagePostProcessor.java        |   8 +-
 .../jms/core/ProducerCallback.java            |  10 +-
 .../jms/core/SessionCallback.java             |   6 +-
 .../jms/core/support/JmsGatewaySupport.java   |   7 +-
 .../AbstractJmsListeningContainer.java        |  16 +-
 .../AbstractMessageListenerContainer.java     |  52 +-
 ...stractPollingMessageListenerContainer.java |  28 +-
 .../DefaultMessageListenerContainer.java      |  24 +-
 .../LocallyExposedJmsResourceHolder.java      |   2 +-
 .../listener/MessageListenerContainer.java    |  10 +-
 .../listener/SessionAwareMessageListener.java |  10 +-
 .../SimpleMessageListenerContainer.java       |  20 +-
 .../listener/SubscriptionNameProvider.java    |   2 +-
 .../AbstractAdaptableMessageListener.java     |  53 +-
 .../jms/listener/adapter/JmsResponse.java     |   6 +-
 .../adapter/MessageListenerAdapter.java       |  16 +-
 .../MessagingMessageListenerAdapter.java      |  18 +-
 .../DefaultJmsActivationSpecFactory.java      |   5 +-
 .../endpoint/JmsActivationSpecConfig.java     |  22 +-
 .../endpoint/JmsActivationSpecFactory.java    |   6 +-
 .../endpoint/JmsMessageEndpointFactory.java   |  14 +-
 .../endpoint/JmsMessageEndpointManager.java   |  12 +-
 .../StandardJmsActivationSpecFactory.java     |  22 +-
 .../jms/support/JmsAccessor.java              |  43 +-
 .../jms/support/JmsHeaderMapper.java          |   4 +-
 .../jms/support/JmsHeaders.java               |  28 +-
 .../jms/support/JmsMessageHeaderAccessor.java |   2 +-
 .../springframework/jms/support/JmsUtils.java |  73 +-
 .../jms/support/QosSettings.java              |  18 +-
 .../jms/support/SimpleJmsHeaderMapper.java    |  10 +-
 .../MappingJackson2MessageConverter.java      |  17 +-
 .../MarshallingMessageConverter.java          |  15 +-
 .../converter/MessageConversionException.java |   2 +-
 .../support/converter/MessageConverter.java   |  10 +-
 .../jms/support/converter/MessageType.java    |  12 +-
 .../converter/MessagingMessageConverter.java  |  20 +-
 .../converter/SimpleMessageConverter.java     |  28 +-
 .../converter/SmartMessageConverter.java      |   8 +-
 .../BeanFactoryDestinationResolver.java       |  10 +-
 .../destination/DestinationResolver.java      |   8 +-
 .../DynamicDestinationResolver.java           |  24 +-
 .../destination/JmsDestinationAccessor.java   |  22 +-
 .../destination/JndiDestinationResolver.java  |  11 +-
 .../springframework/jms/config/spring-jms.xsd |  12 +-
 .../jca/StubActivationSpec.java               |   8 +-
 .../jca/StubResourceAdapter.java              |  13 +-
 .../jms/StubConnectionFactory.java            |   8 +-
 .../org/springframework/jms/StubQueue.java    |   4 +-
 .../springframework/jms/StubTextMessage.java  |   6 +-
 .../org/springframework/jms/StubTopic.java    |   2 +-
 .../AbstractJmsAnnotationDrivenTests.java     |   5 +-
 .../AnnotationDrivenNamespaceTests.java       |   5 +-
 .../jms/annotation/EnableJmsTests.java        |   5 +-
 ...tenerContainerFactoryIntegrationTests.java |  11 +-
 .../JmsListenerContainerFactoryTests.java     |   9 +-
 .../jms/config/JmsListenerEndpointTests.java  |   3 +-
 .../jms/config/JmsNamespaceHandlerTests.java  |   9 +-
 .../MethodJmsListenerEndpointTests.java       |  19 +-
 .../SimpleJmsListenerEndpointTests.java       |   3 +-
 .../JmsTransactionManagerTests.java           |  15 +-
 .../SingleConnectionFactoryTests.java         |  23 +-
 .../jms/connection/TestConnection.java        |  18 +-
 .../jms/connection/TestExceptionListener.java |   4 +-
 .../jms/core/JmsMessagingTemplateTests.java   |  59 +-
 .../jms/core/JmsTemplateTests.java            |  50 +-
 .../jms/core/JmsTemplateTransactedTests.java  |   3 +-
 .../core/support/JmsGatewaySupportTests.java  |   3 +-
 .../DefaultMessageListenerContainerTests.java |   9 +-
 ...sageListenerContainerIntegrationTests.java | 119 ----
 .../SimpleMessageListenerContainerTests.java  |  17 +-
 .../listener/adapter/JmsResponseTests.java    |  11 +-
 .../jms/listener/adapter/MessageDelegate.java |   8 +-
 .../adapter/MessageListenerAdapterTests.java  |  23 +-
 .../MessagingMessageListenerAdapterTests.java |  51 +-
 ...msTextMessageReturningMessageDelegate.java |   2 +-
 .../adapter/ResponsiveMessageDelegate.java    |   8 +-
 .../DefaultJmsActivationSpecFactoryTests.java |   5 +-
 .../endpoint/StubJmsActivationSpec.java       |   2 +-
 .../StubJmsActivationSpecFactory.java         |   4 +-
 .../jms/support/JmsAccessorTests.java         |   3 +-
 .../JmsMessageHeaderAccessorTests.java        |   5 +-
 .../support/SimpleJmsHeaderMapperTests.java   |  95 ++-
 .../support/SimpleMessageConverterTests.java  |  15 +-
 .../MappingJackson2MessageConverterTests.java |   9 +-
 .../MarshallingMessageConverterTests.java     |   6 +-
 .../MessagingMessageConverterTests.java       |  11 +-
 .../DynamicDestinationResolverTests.java      |  15 +-
 .../JmsDestinationAccessorTests.java          |   3 +-
 .../JndiDestinationResolverTests.java         |   4 +-
 spring-messaging/spring-messaging.gradle      |  16 +-
 .../converter/JsonbMessageConverter.java      |  10 +-
 .../PayloadMethodArgumentResolver.java        |   4 +-
 .../PayloadMethodArgumentResolver.java        |   2 +-
 .../AbstractMessageBrokerConfiguration.java   |   4 +-
 .../converter/JsonbMessageConverterTests.java |  11 +-
 .../MarshallingMessageConverterTests.java     |   3 +-
 spring-orm/spring-orm.gradle                  |   6 +-
 .../hibernate5/ConfigurableJtaPlatform.java   |  15 +-
 .../HibernateExceptionTranslator.java         |   3 +-
 .../orm/hibernate5/HibernateTemplate.java     |   3 +-
 .../HibernateTransactionManager.java          |   2 +-
 .../hibernate5/LocalSessionFactoryBean.java   |   6 +-
 .../LocalSessionFactoryBuilder.java           |  16 +-
 .../orm/hibernate5/SessionFactoryUtils.java   |   2 +-
 .../orm/hibernate5/SpringSessionContext.java  |   7 +-
 .../support/OpenSessionInViewFilter.java      |   9 +-
 .../jpa/AbstractEntityManagerFactoryBean.java |  40 +-
 .../orm/jpa/DefaultJpaDialect.java            |   6 +-
 .../orm/jpa/EntityManagerFactoryAccessor.java |  21 +-
 .../orm/jpa/EntityManagerFactoryInfo.java     |  13 +-
 .../orm/jpa/EntityManagerFactoryUtils.java    |  43 +-
 .../orm/jpa/EntityManagerHolder.java          |   4 +-
 .../orm/jpa/EntityManagerProxy.java           |   6 +-
 .../orm/jpa/ExtendedEntityManagerCreator.java |  31 +-
 .../springframework/orm/jpa/JpaDialect.java   |  14 +-
 .../JpaObjectRetrievalFailureException.java   |   2 +-
 .../JpaOptimisticLockingFailureException.java |   2 +-
 .../orm/jpa/JpaTransactionManager.java        |  19 +-
 .../orm/jpa/JpaVendorAdapter.java             |  20 +-
 ...ocalContainerEntityManagerFactoryBean.java |  31 +-
 .../jpa/LocalEntityManagerFactoryBean.java    |  18 +-
 .../orm/jpa/SharedEntityManagerCreator.java   |  25 +-
 .../ClassFileTransformerAdapter.java          |   5 +-
 .../DefaultPersistenceUnitManager.java        |  24 +-
 .../MutablePersistenceUnitInfo.java           |  13 +-
 .../PersistenceUnitManager.java               |   6 +-
 .../PersistenceUnitReader.java                |   6 +-
 .../SmartPersistenceUnitInfo.java             |   4 +-
 .../SpringPersistenceUnitInfo.java            |   2 +-
 .../jpa/support/AsyncRequestInterceptor.java  |   3 +-
 .../OpenEntityManagerInViewFilter.java        |  16 +-
 .../OpenEntityManagerInViewInterceptor.java   |   6 +-
 ...ersistenceAnnotationBeanPostProcessor.java |  58 +-
 .../jpa/support/SharedEntityManagerBean.java  |  12 +-
 .../jpa/vendor/AbstractJpaVendorAdapter.java  |   8 +-
 .../orm/jpa/vendor/EclipseLinkJpaDialect.java |   5 +-
 .../vendor/EclipseLinkJpaVendorAdapter.java   |   5 +-
 .../orm/jpa/vendor/HibernateJpaDialect.java   |   5 +-
 .../HibernateJpaSessionFactoryBean.java       |   3 +-
 .../jpa/vendor/HibernateJpaVendorAdapter.java |  11 +-
 ...SpringHibernateJpaPersistenceProvider.java |   5 +-
 ...rEntityManagerFactoryIntegrationTests.java |   9 +-
 ...AbstractEntityManagerFactoryBeanTests.java |   7 +-
 ...tEntityManagerFactoryIntegrationTests.java |   6 +-
 ...nManagedEntityManagerIntegrationTests.java |   7 +-
 ...rManagedEntityManagerIntegrationTests.java |   9 +-
 .../orm/jpa/DefaultJpaDialectTests.java       |   7 +-
 .../jpa/EntityManagerFactoryUtilsTests.java   |  19 +-
 .../orm/jpa/JpaTransactionManagerTests.java   |   9 +-
 ...ontainerEntityManagerFactoryBeanTests.java |  19 +-
 .../LocalEntityManagerFactoryBeanTests.java   |   9 +-
 .../jpa/SharedEntityManagerCreatorTests.java  |  13 +-
 .../orm/jpa/domain/DriversLicense.java        |   6 +-
 .../orm/jpa/domain/Person.java                |  20 +-
 .../orm/jpa/domain/PersonListener.java        |   2 +-
 ...eEntityManagerFactoryIntegrationTests.java |   3 +-
 ...iEntityManagerFactoryIntegrationTests.java |   5 +-
 ...rySpringBeanContainerIntegrationTests.java |   3 +-
 .../PersistenceXmlParsingTests.java           |   4 +-
 .../support/OpenEntityManagerInViewTests.java |  11 +-
 .../PersistenceContextTransactionTests.java   |  13 +-
 .../support/PersistenceInjectionTests.java    |  13 +-
 .../SharedEntityManagerFactoryTests.java      |   5 +-
 .../orm/jpa/domain/spring.components          |   4 +-
 .../hibernate/hibernate-manager-native.xml    |   2 +-
 spring-oxm/spring-oxm.gradle                  |  38 +-
 .../oxm/jaxb/ClassPathJaxb2TypeScanner.java   |  10 +-
 .../oxm/jaxb/Jaxb2Marshaller.java             |  50 +-
 .../oxm/mime/MimeContainer.java               |   2 +-
 .../springframework/oxm/jaxb/Airplane.java    |   2 +-
 .../oxm/jaxb/BinaryObject.java                |   8 +-
 .../oxm/jaxb/Jaxb2MarshallerTests.java        |  20 +-
 .../oxm/jaxb/Jaxb2UnmarshallerTests.java      |   6 +-
 .../springframework/oxm/jaxb/Primitives.java  |   3 +-
 .../oxm/jaxb/StandardClasses.java             |  11 +-
 .../oxm/jaxb/XmlRegObjectFactory.java         |   7 +-
 spring-test/spring-test.gradle                |  36 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |   2 +-
 .../mock/jndi/package-info.java               |   2 +-
 .../web/DelegatingServletInputStream.java     |   6 +-
 .../web/DelegatingServletOutputStream.java    |   6 +-
 .../mock/web/MockAsyncContext.java            |  18 +-
 .../mock/web/MockBodyContent.java             |   8 +-
 .../springframework/mock/web/MockCookie.java  |   2 +-
 .../mock/web/MockExpressionEvaluator.java     |  84 ---
 .../mock/web/MockFilterChain.java             |  16 +-
 .../mock/web/MockFilterConfig.java            |   8 +-
 .../mock/web/MockHttpServletMapping.java      |   4 +-
 .../mock/web/MockHttpServletRequest.java      |  36 +-
 .../mock/web/MockHttpServletResponse.java     |  10 +-
 .../mock/web/MockHttpSession.java             |  12 +-
 .../mock/web/MockJspWriter.java               |   6 +-
 .../web/MockMultipartHttpServletRequest.java  |   6 +-
 .../mock/web/MockPageContext.java             |  35 +-
 .../springframework/mock/web/MockPart.java    |   4 +-
 .../mock/web/MockRequestDispatcher.java       |  11 +-
 .../mock/web/MockServletConfig.java           |   6 +-
 .../mock/web/MockServletContext.java          |  31 +-
 .../mock/web/MockSessionCookieConfig.java     |   6 +-
 .../mock/web/PassThroughFilterChain.java      |  18 +-
 .../test/context/ContextConfiguration.java    |   2 +-
 .../test/context/ContextLoader.java           |   4 +-
 .../test/context/SmartContextLoader.java      |   4 +-
 .../web/AbstractGenericWebContextLoader.java  |   3 +-
 .../web/ServletTestExecutionListener.java     |   3 +-
 .../web/socket/MockServerContainer.java       |  16 +-
 .../MockServerContainerContextCustomizer.java |   6 +-
 ...rverContainerContextCustomizerFactory.java |   2 +-
 .../test/util/ReflectionTestUtils.java        |   8 +-
 .../client/match/ContentRequestMatchers.java  |  72 +-
 .../test/web/servlet/MockMvc.java             |  14 +-
 .../web/servlet/MockMvcBuilderSupport.java    |   4 +-
 .../test/web/servlet/RequestBuilder.java      |   2 +-
 .../web/servlet/TestDispatcherServlet.java    |   8 +-
 .../client/AbstractMockMvcServerSpec.java     |   2 +-
 .../servlet/client/MockMvcHttpConnector.java  |   5 +-
 .../servlet/client/MockMvcWebTestClient.java  |   2 +-
 .../htmlunit/HtmlUnitRequestBuilder.java      |   9 +-
 .../htmlunit/MockMvcWebConnection.java        |  10 +-
 .../MockHttpServletRequestBuilder.java        |  14 +-
 ...ockMultipartHttpServletRequestBuilder.java |   4 +-
 .../request/MockMvcRequestBuilders.java       |   2 +-
 .../servlet/result/ContentResultMatchers.java |   2 +-
 .../servlet/result/CookieResultMatchers.java  |   3 +-
 .../servlet/result/PrintingResultHandler.java |   6 +-
 .../servlet/result/RequestResultMatchers.java |   5 +-
 .../servlet/setup/AbstractMockMvcBuilder.java |   4 +-
 .../setup/ConfigurableMockMvcBuilder.java     |   2 +-
 .../servlet/setup/DefaultMockMvcBuilder.java  |   2 +-
 .../web/servlet/setup/MockMvcBuilders.java    |   2 +-
 .../setup/PatternMappingFilterProxy.java      |  14 +-
 .../setup/SharedHttpSessionConfigurer.java    |   2 +-
 .../setup/StandaloneMockMvcBuilder.java       |   2 +-
 .../setup/StubWebApplicationContext.java      |   2 +-
 .../web/servlet/MockHttpServletRequestDsl.kt  |   2 +-
 .../MockMultipartHttpServletRequestDsl.kt     |   2 +-
 .../mock/web/MockFilterChainTests.java        |  15 +-
 .../mock/web/MockHttpServletRequestTests.java |   3 +-
 .../web/MockHttpServletResponseTests.java     |   5 +-
 .../mock/web/MockHttpSessionTests.java        |   5 +-
 .../mock/web/MockPageContextTests.java        |   3 +-
 .../mock/web/MockServletContextTests.java     |   7 +-
 .../groovy/GroovySpringContextTests.java      |   3 +-
 .../web/ControllerIntegrationTests.java       |   3 +-
 .../web/DispatcherWacRootWacEarTests.java     |   3 +-
 ...TransactionalJUnit4SpringContextTests.java |   3 +-
 .../SpringJUnit4ClassRunnerAppCtxTests.java   |   7 +-
 .../orm/HibernateSessionFlushingTests.java    |   3 +-
 .../junit4/spr4868/Jsr250LifecycleTests.java  |   5 +-
 .../context/junit4/spr4868/LifecycleBean.java |   5 +-
 .../context/junit4/spr8849/TestClass1.java    |   2 +-
 .../context/junit4/spr8849/TestClass2.java    |   2 +-
 .../context/junit4/spr8849/TestClass3.java    |   2 +-
 .../context/junit4/spr8849/TestClass4.java    |   2 +-
 .../context/junit4/spr9051/LifecycleBean.java |   2 +-
 ...TransactionalTestNGSpringContextTests.java |   3 +-
 .../ejb/AbstractEjbTxDaoTestNGTests.java      |   7 +-
 .../web/TestNGSpringContextWebTests.java      |   3 +-
 .../ejb/AbstractEjbTxDaoTests.java            |   7 +-
 .../ejb/dao/AbstractEjbTxTestEntityDao.java   |   6 +-
 .../ejb/dao/RequiredEjbTxTestEntityDao.java   |   8 +-
 .../dao/RequiresNewEjbTxTestEntityDao.java    |   8 +-
 .../transaction/ejb/model/TestEntity.java     |   8 +-
 .../context/web/AbstractBasicWacTests.java    |   3 +-
 .../web/JUnit4SpringContextWebTests.java      |   3 +-
 .../context/web/ServletContextAwareBean.java  |   2 +-
 ...ervletServerContainerFactoryBeanTests.java |   3 +-
 .../test/util/subpackage/Component.java       |   4 +-
 .../org/springframework/test/web/Person.java  |   4 +-
 .../match/ContentRequestMatchersTests.java    |  11 +-
 .../match/MultipartRequestMatchersTests.java  |   4 +-
 ...ontentRequestMatchersIntegrationTests.java |  11 +-
 .../XpathRequestMatchersIntegrationTests.java |  11 +-
 .../web/reactive/server/samples/Person.java   |   3 +-
 .../server/samples/XmlContentTests.java       |   9 +-
 .../web/servlet/htmlunit/HelloController.java |   2 +-
 .../htmlunit/HtmlUnitRequestBuilderTests.java |   9 +-
 .../MockMvcConnectionBuilderSupportTests.java |   3 +-
 .../MockMvcWebClientBuilderTests.java         |   9 +-
 .../htmlunit/MockWebResponseBuilderTests.java |   3 +-
 .../MockMvcHtmlUnitDriverBuilderTests.java    |   3 +-
 .../MockHttpServletRequestBuilderTests.java   |   5 +-
 ...ltipartHttpServletRequestBuilderTests.java |   3 +-
 .../result/PrintingResultHandlerTests.java    |   5 +-
 .../client/context/JavaConfigTests.java       |  24 +-
 .../client/context/WebAppResourceTests.java   |  12 +-
 .../client/context/XmlConfigTests.java        |  10 +-
 .../client/standalone/FilterTests.java        |  25 +-
 .../standalone/MultipartControllerTests.java  |  13 +-
 .../client/standalone/RedirectTests.java      |   3 +-
 .../client/standalone/ResponseBodyTests.java  |   3 +-
 .../PrintingResultHandlerSmokeTests.java      |   5 +-
 .../resultmatches/ModelAssertionTests.java    |   3 +-
 .../XmlContentAssertionTests.java             |  11 +-
 .../resultmatches/XpathAssertionTests.java    |  11 +-
 .../samples/context/JavaConfigTests.java      |  25 +-
 .../samples/context/WebAppResourceTests.java  |  10 +-
 .../samples/context/XmlConfigTests.java       |  10 +-
 ...stAttributesRequestContextHolderTests.java |   7 +-
 .../spr/RequestContextHolderTests.java        |   9 +-
 .../samples/standalone/FilterTests.java       |  27 +-
 .../standalone/MultipartControllerTests.java  |  15 +-
 .../samples/standalone/RedirectTests.java     |   3 +-
 ...PrintingResultHandlerIntegrationTests.java |   5 +-
 .../PrintingResultHandlerSmokeTests.java      |   5 +-
 .../resultmatchers/ModelAssertionTests.java   |   3 +-
 .../XmlContentAssertionTests.java             |  11 +-
 .../resultmatchers/XpathAssertionTests.java   |  11 +-
 ...ConditionalDelegatingFilterProxyTests.java |  13 +-
 .../servlet/setup/SharedHttpSessionTests.java |   3 +-
 .../setup/StandaloneMockMvcBuilderTests.java  |  11 +-
 .../samples/context/servlet-context.xml       |  23 +-
 spring-tx/spring-tx.gradle                    |  11 +-
 .../jca/cci/CannotCreateRecordException.java  |  45 --
 .../cci/CannotGetCciConnectionException.java  |  45 --
 .../CciOperationNotSupportedException.java    |  44 --
 .../cci/InvalidResultSetAccessException.java  |  49 --
 .../cci/RecordTypeNotSupportedException.java  |  45 --
 .../CciLocalTransactionManager.java           | 297 --------
 .../connection/ConnectionFactoryUtils.java    | 220 ------
 .../jca/cci/connection/ConnectionHolder.java  |  53 --
 ...onnectionSpecConnectionFactoryAdapter.java | 144 ----
 .../DelegatingConnectionFactory.java          | 118 ----
 .../connection/NotSupportedRecordFactory.java |  57 --
 .../connection/SingleConnectionFactory.java   | 264 -------
 ...ransactionAwareConnectionFactoryProxy.java | 171 -----
 .../jca/cci/connection/package-info.java      |  11 -
 .../jca/cci/core/CciOperations.java           | 130 ----
 .../jca/cci/core/CciTemplate.java             | 461 ------------
 .../jca/cci/core/ConnectionCallback.java      |  83 ---
 .../jca/cci/core/InteractionCallback.java     |  84 ---
 .../jca/cci/core/RecordCreator.java           |  68 --
 .../jca/cci/core/RecordExtractor.java         |  70 --
 .../jca/cci/core/package-info.java            |  10 -
 .../jca/cci/core/support/CciDaoSupport.java   | 147 ----
 .../jca/cci/core/support/CommAreaRecord.java  | 107 ---
 .../jca/cci/core/support/package-info.java    |  10 -
 .../jca/cci/object/EisOperation.java          |  99 ---
 .../cci/object/MappingCommAreaOperation.java  | 100 ---
 .../cci/object/MappingRecordOperation.java    | 157 -----
 .../jca/cci/object/SimpleRecordOperation.java |  87 ---
 .../jca/cci/object/package-info.java          |  13 -
 .../springframework/jca/cci/package-info.java |  12 -
 .../jca/context/BootstrapContextAware.java    |  47 --
 .../BootstrapContextAwareProcessor.java       |  64 --
 .../ResourceAdapterApplicationContext.java    |  66 --
 .../context/SpringContextResourceAdapter.java | 260 -------
 .../jca/context/package-info.java             |  10 -
 .../AbstractMessageEndpointFactory.java       |  20 +-
 .../GenericMessageEndpointFactory.java        |  18 +-
 .../GenericMessageEndpointManager.java        |  28 +-
 .../support/LocalConnectionFactoryBean.java   |  24 +-
 .../support/ResourceAdapterFactoryBean.java   |  22 +-
 .../jca/support/SimpleBootstrapContext.java   |  16 +-
 .../jca/work/DelegatingWork.java              |  69 --
 .../jca/work/SimpleTaskWorkManager.java       | 257 -------
 .../jca/work/WorkManagerTaskExecutor.java     | 337 ---------
 .../jca/work/package-info.java                |  10 -
 .../transaction/TransactionDefinition.java    |   8 +-
 .../AnnotationTransactionAttributeSource.java |  12 +-
 .../Ejb3TransactionAnnotationParser.java      |  12 +-
 .../JtaTransactionAnnotationParser.java       |   8 +-
 .../transaction/annotation/Propagation.java   |   8 +-
 .../TransactionAnnotationParser.java          |   4 +-
 ...actionManagementConfigurationSelector.java |   2 +-
 .../transaction/annotation/Transactional.java |   2 +-
 .../AnnotationDrivenBeanDefinitionParser.java |   2 +-
 ...ransactionManagerBeanDefinitionParser.java |  13 +-
 .../JtaTransactionManagerFactoryBean.java     |  62 +-
 .../interceptor/RollbackRuleAttribute.java    |   2 +-
 .../JtaAfterCompletionSynchronization.java    |   4 +-
 .../jta/JtaTransactionManager.java            |  91 ++-
 .../transaction/jta/JtaTransactionObject.java |  10 +-
 .../jta/ManagedTransactionAdapter.java        |  19 +-
 .../jta/SimpleTransactionFactory.java         |  16 +-
 .../jta/SpringJtaSynchronizationAdapter.java  |  23 +-
 .../transaction/jta/TransactionFactory.java   |  16 +-
 .../jta/UserTransactionAdapter.java           |  18 +-
 .../jta/WebLogicJtaTransactionManager.java    | 366 ----------
 .../jta/WebSphereUowTransactionManager.java   | 423 -----------
 .../AbstractPlatformTransactionManager.java   |   4 +-
 .../support/SmartTransactionObject.java       |   4 +-
 ...tenceExceptionTranslationAdvisorTests.java |   3 +-
 ...xceptionTranslationPostProcessorTests.java |   3 +-
 .../jca/cci/CciLocalTransactionTests.java     | 132 ----
 .../jca/cci/CciTemplateTests.java             | 545 ---------------
 .../jca/cci/EisOperationTests.java            | 217 ------
 .../LocalConnectionFactoryBeanTests.java      |   5 +-
 .../JndiJtaTransactionManagerTests.java       |   9 +-
 .../JtaTransactionManagerTests.java           |  21 +-
 .../transaction/MockJtaTransaction.java       |   7 +-
 ...tationTransactionAttributeSourceTests.java |  27 +-
 .../transaction/jta/MockUOWManager.java       | 132 ----
 .../WebSphereUowTransactionManagerTests.java  | 656 ------------------
 ...aTransactionManagerSerializationTests.java |   5 +-
 spring-web/spring-web.gradle                  |  36 +-
 .../reactive/JettyClientHttpRequest.java      |  11 +-
 .../reactive/JettyClientHttpResponse.java     |  60 +-
 .../client/reactive/JettyHeadersAdapter.java  |  40 +-
 .../http/codec/ServerCodecConfigurer.java     |   9 +-
 .../SynchronossPartHttpMessageReader.java     | 597 ----------------
 .../http/codec/support/BaseDefaultCodecs.java |  13 +-
 .../http/codec/xml/Jaxb2XmlDecoder.java       |  20 +-
 .../http/codec/xml/Jaxb2XmlEncoder.java       |  15 +-
 .../http/codec/xml/JaxbContextContainer.java  |   8 +-
 .../converter/FormHttpMessageConverter.java   |   4 +-
 .../json/JsonbHttpMessageConverter.java       |  10 +-
 ...lEncompassingFormHttpMessageConverter.java |   4 +-
 .../AbstractJaxb2HttpMessageConverter.java    |   8 +-
 .../Jaxb2CollectionHttpMessageConverter.java  |  11 +-
 .../Jaxb2RootElementHttpMessageConverter.java |  22 +-
 .../ServletServerHttpAsyncRequestControl.java |  10 +-
 .../http/server/ServletServerHttpRequest.java |   4 +-
 .../server/ServletServerHttpResponse.java     |   2 +-
 .../server/reactive/JettyHeadersAdapter.java  |  40 +-
 .../reactive/JettyHttpHandlerAdapter.java     |  74 +-
 .../reactive/ServletHttpHandlerAdapter.java   |  27 +-
 .../reactive/ServletServerHttpRequest.java    |  19 +-
 .../reactive/ServletServerHttpResponse.java   |  13 +-
 .../reactive/TomcatHttpHandlerAdapter.java    |  17 +-
 .../web/HttpMediaTypeException.java           |   2 +-
 .../web/HttpRequestHandler.java               |  10 +-
 ...ttpRequestMethodNotSupportedException.java |   2 +-
 .../web/HttpSessionRequiredException.java     |   2 +-
 .../SpringServletContainerInitializer.java    |  10 +-
 .../web/WebApplicationInitializer.java        |   4 +-
 ...ractMappingContentNegotiationStrategy.java |   2 +-
 .../ContentNegotiationManagerFactoryBean.java |   2 +-
 ...thExtensionContentNegotiationStrategy.java |   2 +-
 ...thExtensionContentNegotiationStrategy.java |   2 +-
 .../web/bind/ServletRequestDataBinder.java    |   6 +-
 ...ServletRequestParameterPropertyValues.java |   2 +-
 .../web/bind/ServletRequestUtils.java         |   2 +-
 ...sfiedServletRequestParameterException.java |   2 +-
 .../web/bind/annotation/ControllerAdvice.java |   2 +-
 .../web/bind/annotation/CookieValue.java      |   4 +-
 .../web/bind/annotation/ExceptionHandler.java |   6 +-
 .../web/bind/annotation/RequestMapping.java   |   2 +-
 .../web/bind/annotation/RequestPart.java      |   2 +-
 .../web/bind/annotation/ResponseStatus.java   |   8 +-
 .../web/bind/annotation/SessionAttribute.java |   2 +-
 .../SpringWebConstraintValidatorFactory.java  |   4 +-
 .../bind/support/WebRequestDataBinder.java    |   4 +-
 .../web/client/RestTemplate.java              |   4 +-
 .../AbstractContextLoaderInitializer.java     |   5 +-
 .../ConfigurableWebApplicationContext.java    |   6 +-
 .../context/ConfigurableWebEnvironment.java   |   4 +-
 .../web/context/ContextCleanupListener.java   |   7 +-
 .../web/context/ContextLoader.java            |   3 +-
 .../web/context/ContextLoaderListener.java    |   6 +-
 .../web/context/ServletConfigAware.java       |   2 +-
 .../web/context/ServletContextAware.java      |   2 +-
 .../web/context/WebApplicationContext.java    |  16 +-
 .../DestructionCallbackBindingListener.java   |   4 +-
 .../request/FacesRequestAttributes.java       |  17 +-
 .../web/context/request/FacesWebRequest.java  |   8 +-
 .../web/context/request/NativeWebRequest.java |   8 +-
 .../context/request/RequestContextHolder.java |  18 +-
 .../request/RequestContextListener.java       |   8 +-
 .../request/ServletRequestAttributes.java     |  10 +-
 .../context/request/ServletWebRequest.java    |   8 +-
 .../web/context/request/WebRequest.java       |  26 +-
 .../async/StandardServletAsyncWebRequest.java |  10 +-
 .../request/async/WebAsyncManager.java        |   5 +-
 .../context/request/async/WebAsyncUtils.java  |   6 +-
 ...tractRefreshableWebApplicationContext.java |   4 +-
 ...AnnotationConfigWebApplicationContext.java |   2 +-
 .../ContextExposingHttpServletRequest.java    |   4 +-
 .../support/GenericWebApplicationContext.java |   4 +-
 .../support/HttpRequestHandlerServlet.java    |   8 +-
 .../context/support/LiveBeansViewServlet.java |   8 +-
 .../context/support/RequestHandledEvent.java  |   2 +-
 .../support/ServletConfigPropertySource.java  |   2 +-
 .../ServletContextAttributeExporter.java      |   5 +-
 .../ServletContextAttributeFactoryBean.java   |   2 +-
 .../support/ServletContextAwareProcessor.java |   4 +-
 .../support/ServletContextLiveBeansView.java  |   2 +-
 .../ServletContextParameterFactoryBean.java   |   2 +-
 .../support/ServletContextPropertySource.java |   2 +-
 .../support/ServletContextResource.java       |  22 +-
 .../support/ServletContextResourceLoader.java |   2 +-
 ...ServletContextResourcePatternResolver.java |   9 +-
 .../context/support/ServletContextScope.java  |   2 +-
 .../support/SpringBeanAutowiringSupport.java  |   5 +-
 .../support/StandardServletEnvironment.java   |   4 +-
 .../support/StaticWebApplicationContext.java  |   4 +-
 .../support/WebApplicationContextUtils.java   |  16 +-
 .../support/WebApplicationObjectSupport.java  |   8 +-
 .../web/cors/CorsConfigurationSource.java     |   2 +-
 .../web/cors/CorsProcessor.java               |   4 +-
 .../springframework/web/cors/CorsUtils.java   |   2 +-
 .../web/cors/DefaultCorsProcessor.java        |   5 +-
 .../cors/UrlBasedCorsConfigurationSource.java |   2 +-
 .../filter/AbstractRequestLoggingFilter.java  |  10 +-
 .../web/filter/CharacterEncodingFilter.java   |  18 +-
 .../filter/CommonsRequestLoggingFilter.java   |   2 +-
 .../web/filter/CompositeFilter.java           |  12 +-
 .../web/filter/CorsFilter.java                |  12 +-
 .../web/filter/DelegatingFilterProxy.java     |  24 +-
 .../web/filter/FormContentFilter.java         |  10 +-
 .../web/filter/ForwardedHeaderFilter.java     |  12 +-
 .../web/filter/GenericFilterBean.java         |  25 +-
 .../web/filter/HiddenHttpMethodFilter.java    |  12 +-
 .../web/filter/HttpPutFormContentFilter.java  |  12 +-
 .../web/filter/OncePerRequestFilter.java      |  24 +-
 .../web/filter/RelativeRedirectFilter.java    |   8 +-
 .../RelativeRedirectResponseWrapper.java      |   4 +-
 .../web/filter/RequestContextFilter.java      |   8 +-
 .../ServletContextRequestLoggingFilter.java   |   4 +-
 .../web/filter/ServletRequestPathFilter.java  |  12 +-
 .../web/filter/ShallowEtagHeaderFilter.java   |  14 +-
 .../web/jsf/DecoratingNavigationHandler.java  |   8 +-
 .../jsf/DelegatingNavigationHandlerProxy.java |   4 +-
 .../DelegatingPhaseListenerMulticaster.java   |   8 +-
 .../web/jsf/FacesContextUtils.java            |   4 +-
 .../web/jsf/el/SpringBeanFacesELResolver.java |  10 +-
 .../WebApplicationContextFacesELResolver.java |   9 +-
 ...tractNamedValueMethodArgumentResolver.java |   2 +-
 ...ExpressionValueMethodArgumentResolver.java |   2 +-
 .../ModelAttributeMethodProcessor.java        |  11 +-
 ...RequestParamMapMethodArgumentResolver.java |   4 +-
 .../RequestParamMethodArgumentResolver.java   |   6 +-
 .../web/multipart/MultipartFile.java          |   2 +-
 .../MultipartHttpServletRequest.java          |  10 +-
 .../web/multipart/MultipartResolver.java      |  10 +-
 .../commons/CommonsFileUploadSupport.java     | 374 ----------
 .../commons/CommonsMultipartFile.java         | 242 -------
 .../commons/CommonsMultipartResolver.java     | 237 -------
 .../web/multipart/commons/package-info.java   |  10 -
 .../AbstractMultipartHttpServletRequest.java  |   4 +-
 .../DefaultMultipartHttpServletRequest.java   |   2 +-
 .../MissingServletRequestPartException.java   |   2 +-
 .../multipart/support/MultipartFilter.java    |   8 +-
 .../support/MultipartResolutionDelegate.java  |   4 +-
 .../RequestPartServletServerHttpRequest.java  |   4 +-
 .../StandardMultipartHttpServletRequest.java  |   6 +-
 .../StandardServletMultipartResolver.java     |  11 +-
 .../support/StandardServletPartUtils.java     |   4 +-
 .../AbstractReactiveWebInitializer.java       |  10 +-
 .../util/ContentCachingRequestWrapper.java    |  10 +-
 .../util/ContentCachingResponseWrapper.java   |  10 +-
 .../web/util/CookieGenerator.java             |  17 +-
 .../web/util/HttpSessionMutexListener.java    |   6 +-
 .../web/util/IntrospectorCleanupListener.java |   4 +-
 .../web/util/NestedServletException.java      |   2 +-
 .../web/util/ServletContextPropertyUtils.java |   2 +-
 .../web/util/ServletRequestPathUtils.java     |  10 +-
 .../springframework/web/util/TagUtils.java    |  14 +-
 .../web/util/UrlPathHelper.java               |  25 +-
 .../web/util/WebAppRootListener.java          |   4 +-
 .../springframework/web/util/WebUtils.java    |  92 +--
 .../MultipartHttpMessageWriterTests.java      |   9 +-
 ...SynchronossPartHttpMessageReaderTests.java | 237 -------
 .../http/codec/xml/Jaxb2XmlDecoderTests.java  |   2 +-
 .../http/codec/xml/Jaxb2XmlEncoderTests.java  |   7 +-
 .../http/codec/xml/jaxb/XmlRootElement.java   |   2 +-
 .../xml/jaxb/XmlRootElementWithName.java      |   2 +-
 .../XmlRootElementWithNameAndNamespace.java   |   2 +-
 .../http/codec/xml/jaxb/XmlType.java          |   2 +-
 .../http/codec/xml/jaxb/XmlTypeWithName.java  |   2 +-
 .../xml/jaxb/XmlTypeWithNameAndNamespace.java |   2 +-
 .../http/codec/xml/jaxb/package-info.java     |   2 +-
 .../FormHttpMessageConverterTests.java        |  26 +-
 .../json/JsonbHttpMessageConverterTests.java  |   6 +-
 ...b2CollectionHttpMessageConverterTests.java |   8 +-
 ...2RootElementHttpMessageConverterTests.java |  17 +-
 .../ErrorHandlerIntegrationTests.java         |   4 +-
 .../server/reactive/HeadersAdaptersTests.java |   2 +-
 .../reactive/ServerHttpRequestTests.java      |   9 +-
 .../WebRequestDataBinderIntegrationTests.java |  11 +-
 .../ContextLoaderInitializerTests.java        |   5 +-
 .../RequestAndSessionScopedBeanTests.java     |   9 +-
 .../request/RequestContextListenerTests.java  |   3 +-
 .../ServletRequestAttributesTests.java        |   5 +-
 .../request/ServletWebRequestTests.java       |  13 +-
 .../WebApplicationContextScopeTests.java      |   3 +-
 .../StandardServletAsyncWebRequestTests.java  |   3 +-
 .../async/WebAsyncManagerErrorTests.java      |   3 +-
 .../request/async/WebAsyncManagerTests.java   |   3 +-
 .../async/WebAsyncManagerTimeoutTests.java    |   3 +-
 .../web/context/support/Spr8510Tests.java     |   3 +-
 .../web/cors/DefaultCorsProcessorTests.java   |   3 +-
 .../web/cors/reactive/CorsWebFilterTests.java |   3 +-
 .../filter/CharacterEncodingFilterTests.java  |   9 +-
 .../web/filter/CompositeFilterTests.java      |  15 +-
 .../ContentCachingResponseWrapperTests.java   |   3 +-
 .../web/filter/CorsFilterTests.java           |   5 +-
 .../filter/DelegatingFilterProxyTests.java    |  15 +-
 .../filter/ForwardedHeaderFilterTests.java    |  15 +-
 .../filter/HiddenHttpMethodFilterTests.java   |  11 +-
 .../web/filter/OncePerRequestFilterTests.java |  13 +-
 .../filter/RelativeRedirectFilterTests.java   |   5 +-
 .../web/filter/RequestContextFilterTests.java |   9 +-
 .../web/filter/RequestLoggingFilterTests.java |   7 +-
 .../filter/ShallowEtagHeaderFilterTests.java  |   5 +-
 .../jsf/DelegatingNavigationHandlerTests.java |   5 +-
 .../web/jsf/DelegatingPhaseListenerTests.java |   9 +-
 .../web/jsf/MockFacesContext.java             |  20 +-
 .../web/jsf/MockLifecycle.java                |   8 +-
 .../web/method/ControllerAdviceBeanTests.java |   3 +-
 ...ookieValueMethodArgumentResolverTests.java |   3 +-
 .../ExceptionHandlerMethodResolverTests.java  |   5 +-
 ...stParamMapMethodArgumentResolverTests.java |   3 +-
 ...questParamMethodArgumentResolverTests.java |   3 +-
 .../CommonsMultipartResolverTests.java        | 618 -----------------
 ...uestPartServletServerHttpRequestTests.java |   5 +-
 .../util/ServletRequestPathUtilsTests.java    |   3 +-
 .../web/util/TagUtilsTests.java               |   7 +-
 .../web/util/WebUtilsTests.java               |   3 +-
 .../servlet/DelegatingServletInputStream.java |   6 +-
 .../DelegatingServletOutputStream.java        |   6 +-
 .../testfixture/servlet/MockAsyncContext.java |  18 +-
 .../testfixture/servlet/MockBodyContent.java  |   8 +-
 .../web/testfixture/servlet/MockCookie.java   |   2 +-
 .../servlet/MockExpressionEvaluator.java      |  84 ---
 .../testfixture/servlet/MockFilterChain.java  |  16 +-
 .../testfixture/servlet/MockFilterConfig.java |   8 +-
 .../servlet/MockHttpServletMapping.java       |   4 +-
 .../servlet/MockHttpServletRequest.java       |  38 +-
 .../servlet/MockHttpServletResponse.java      |  10 +-
 .../testfixture/servlet/MockHttpSession.java  |  12 +-
 .../testfixture/servlet/MockJspWriter.java    |   6 +-
 .../MockMultipartHttpServletRequest.java      |   6 +-
 .../testfixture/servlet/MockPageContext.java  |  35 +-
 .../web/testfixture/servlet/MockPart.java     |   4 +-
 .../servlet/MockRequestDispatcher.java        |  11 +-
 .../servlet/MockServletConfig.java            |   6 +-
 .../servlet/MockServletContext.java           |  31 +-
 .../servlet/MockSessionCookieConfig.java      |   6 +-
 .../servlet/PassThroughFilterChain.java       |  18 +-
 .../web/testfixture/xml/Pojo.java             |   2 +-
 spring-webflux/spring-webflux.gradle          |  20 +-
 .../config/WebFluxConfigurationSupport.java   |   2 +-
 .../ModelAttributeMethodArgumentResolver.java |   2 +-
 .../RequestBodyMethodArgumentResolver.java    |   2 +-
 .../reactive/result/view/RedirectView.java    |   2 +-
 .../Jetty10WebSocketHandlerAdapter.java       | 146 ----
 .../adapter/JettyWebSocketHandlerAdapter.java |   6 +-
 .../StandardWebSocketHandlerAdapter.java      |  10 +-
 .../adapter/StandardWebSocketSession.java     |  13 +-
 .../adapter/TomcatWebSocketSession.java       |   5 +-
 .../socket/client/JettyWebSocketClient.java   | 113 +--
 .../client/StandardWebSocketClient.java       |  15 +-
 .../socket/client/TomcatWebSocketClient.java  |   5 +-
 .../support/HandshakeWebSocketService.java    |   8 +-
 .../upgrade/DefaultServerEndpointConfig.java  |  14 +-
 .../Jetty10RequestUpgradeStrategy.java        | 158 -----
 .../upgrade/JettyRequestUpgradeStrategy.java  | 178 ++---
 .../upgrade/TomcatRequestUpgradeStrategy.java |  21 +-
 .../WebFluxConfigurationSupportTests.java     |   3 +-
 .../function/BodyExtractorsTests.java         |   6 +-
 .../MessageReaderArgumentResolverTests.java   |   3 +-
 ...lAttributeMethodArgumentResolverTests.java |   3 +-
 ...pingMessageConversionIntegrationTests.java |   5 +-
 spring-webmvc/spring-webmvc.gradle            |  30 +-
 .../web/servlet/AsyncHandlerInterceptor.java  |   6 +-
 .../web/servlet/DispatcherServlet.java        |  13 +-
 .../web/servlet/FlashMapManager.java          |   4 +-
 .../web/servlet/FrameworkServlet.java         |  22 +-
 .../web/servlet/HandlerAdapter.java           |   4 +-
 .../web/servlet/HandlerExceptionResolver.java |   4 +-
 .../web/servlet/HandlerExecutionChain.java    |   5 +-
 .../web/servlet/HandlerInterceptor.java       |   6 +-
 .../web/servlet/HandlerMapping.java           |   4 +-
 .../web/servlet/HttpServletBean.java          |   9 +-
 .../web/servlet/LocaleContextResolver.java    |   4 +-
 .../web/servlet/LocaleResolver.java           |   4 +-
 .../ModelAndViewDefiningException.java        |   2 +-
 .../web/servlet/NoHandlerFoundException.java  |   6 +-
 .../servlet/RequestToViewNameTranslator.java  |   4 +-
 .../web/servlet/ThemeResolver.java            |   4 +-
 .../org/springframework/web/servlet/View.java |   4 +-
 .../AnnotationDrivenBeanDefinitionParser.java |   4 +-
 .../servlet/config/MvcNamespaceHandler.java   |   3 +-
 .../TilesConfigurerBeanDefinitionParser.java  |  81 ---
 .../ViewResolversBeanDefinitionParser.java    |   7 +-
 .../ContentNegotiationConfigurer.java         |   4 +-
 .../DefaultServletHandlerConfigurer.java      |   2 +-
 .../annotation/ResourceHandlerRegistry.java   |   2 +-
 .../annotation/ViewResolverRegistry.java      |  25 -
 .../WebMvcConfigurationSupport.java           |  12 +-
 .../function/AbstractServerResponse.java      |   8 +-
 .../function/DefaultAsyncServerResponse.java  |   9 +-
 .../DefaultEntityResponseBuilder.java         |  11 +-
 .../DefaultRenderingResponseBuilder.java      |   6 +-
 .../function/DefaultServerRequest.java        |  14 +-
 .../function/DefaultServerRequestBuilder.java |  14 +-
 .../DefaultServerResponseBuilder.java         |   6 +-
 .../web/servlet/function/EntityResponse.java  |   2 +-
 .../function/ErrorHandlingServerResponse.java |   7 +-
 .../servlet/function/RenderingResponse.java   |   2 +-
 .../servlet/function/RequestPredicates.java   |  11 +-
 .../web/servlet/function/ServerRequest.java   |  10 +-
 .../web/servlet/function/ServerResponse.java  |   9 +-
 .../servlet/function/SseServerResponse.java   |   8 +-
 .../support/HandlerFunctionAdapter.java       |   7 +-
 .../support/RouterFunctionMapping.java        |   2 +-
 .../AbstractHandlerExceptionResolver.java     |   5 +-
 .../handler/AbstractHandlerMapping.java       |   7 +-
 ...bstractHandlerMethodExceptionResolver.java |   4 +-
 .../handler/AbstractHandlerMethodMapping.java |   4 +-
 .../handler/AbstractUrlHandlerMapping.java    |   4 +-
 .../ConversionServiceExposingInterceptor.java |   6 +-
 .../handler/DispatcherServletWebRequest.java  |   4 +-
 .../HandlerExceptionResolverComposite.java    |   4 +-
 .../handler/HandlerMappingIntrospector.java   |   4 +-
 .../servlet/handler/MappedInterceptor.java    |   4 +-
 .../handler/MatchableHandlerMapping.java      |   2 +-
 .../PathPatternMatchableHandlerMapping.java   |   2 +-
 .../SimpleMappingExceptionResolver.java       |   6 +-
 .../handler/SimpleServletHandlerAdapter.java  |  10 +-
 .../handler/SimpleServletPostProcessor.java   |  14 +-
 .../UserRoleAuthorizationInterceptor.java     |  10 +-
 .../WebRequestHandlerInterceptorAdapter.java  |   4 +-
 .../i18n/AbstractLocaleContextResolver.java   |   4 +-
 .../i18n/AcceptHeaderLocaleResolver.java      |   6 +-
 .../servlet/i18n/CookieLocaleResolver.java    |   8 +-
 .../web/servlet/i18n/FixedLocaleResolver.java |   4 +-
 .../servlet/i18n/LocaleChangeInterceptor.java |   7 +-
 .../servlet/i18n/SessionLocaleResolver.java   |   6 +-
 .../web/servlet/mvc/AbstractController.java   |   8 +-
 .../mvc/AbstractUrlViewController.java        |   4 +-
 .../web/servlet/mvc/Controller.java           |   4 +-
 .../mvc/HttpRequestHandlerAdapter.java        |   4 +-
 .../web/servlet/mvc/LastModified.java         |   6 +-
 .../mvc/ParameterizableViewController.java    |   4 +-
 .../mvc/ServletForwardingController.java      |  16 +-
 .../mvc/ServletWrappingController.java        |  20 +-
 .../mvc/SimpleControllerHandlerAdapter.java   |   4 +-
 .../mvc/UrlFilenameViewController.java        |   2 +-
 .../servlet/mvc/WebContentInterceptor.java    |   8 +-
 .../ResponseStatusExceptionResolver.java      |   4 +-
 .../AbstractNameValueExpression.java          |   2 +-
 .../condition/CompositeRequestCondition.java  |   2 +-
 .../condition/ConsumesRequestCondition.java   |   2 +-
 .../condition/HeadersRequestCondition.java    |   2 +-
 .../mvc/condition/ParamsRequestCondition.java |   2 +-
 .../PathPatternsRequestCondition.java         |   2 +-
 .../condition/PatternsRequestCondition.java   |   2 +-
 .../condition/ProducesRequestCondition.java   |   2 +-
 .../mvc/condition/RequestCondition.java       |   2 +-
 .../mvc/condition/RequestConditionHolder.java |   2 +-
 .../RequestMethodsRequestCondition.java       |   4 +-
 .../method/AbstractHandlerMethodAdapter.java  |   6 +-
 .../mvc/method/RequestMappingInfo.java        |   4 +-
 .../RequestMappingInfoHandlerMapping.java     |   4 +-
 ...essageConverterMethodArgumentResolver.java |   5 +-
 ...stractMessageConverterMethodProcessor.java |   6 +-
 .../ExceptionHandlerExceptionResolver.java    |   4 +-
 .../ExtendedServletRequestDataBinder.java     |   2 +-
 .../annotation/HttpEntityMethodProcessor.java |   4 +-
 .../HttpHeadersReturnValueHandler.java        |   2 +-
 .../annotation/MvcUriComponentsBuilder.java   |   3 +-
 .../PrincipalMethodArgumentResolver.java      |   2 +-
 ...equestAttributeMethodArgumentResolver.java |   2 +-
 .../RequestMappingHandlerAdapter.java         |   8 +-
 .../RequestMappingHandlerMapping.java         |   2 +-
 .../RequestPartMethodArgumentResolver.java    |   6 +-
 .../RequestResponseBodyMethodProcessor.java   |   2 +-
 ...ResponseBodyEmitterReturnValueHandler.java |   4 +-
 .../ResponseEntityExceptionHandler.java       |   3 +-
 ...vletCookieValueMethodArgumentResolver.java |   4 +-
 .../ServletInvocableHandlerMethod.java        |   4 +-
 .../ServletModelAttributeMethodProcessor.java |   2 +-
 .../ServletRequestMethodArgumentResolver.java |  10 +-
 ...ServletResponseMethodArgumentResolver.java |   2 +-
 ...essionAttributeMethodArgumentResolver.java |   2 +-
 ...reamingResponseBodyReturnValueHandler.java |   4 +-
 ...mponentsBuilderMethodArgumentResolver.java |   2 +-
 .../DefaultHandlerExceptionResolver.java      |  11 +-
 .../resource/AbstractResourceResolver.java    |   3 +-
 .../resource/AppCacheManifestTransformer.java |   3 +-
 .../resource/CachingResourceResolver.java     |   2 +-
 .../resource/CachingResourceTransformer.java  |   3 +-
 .../resource/CssLinkResourceTransformer.java  |   3 +-
 .../DefaultResourceResolverChain.java         |   2 +-
 .../DefaultResourceTransformerChain.java      |   2 +-
 .../DefaultServletHttpRequestHandler.java     |  10 +-
 .../resource/EncodedResourceResolver.java     |   2 +-
 .../resource/GzipResourceResolver.java        |   2 +-
 .../resource/PathResourceResolver.java        |   2 +-
 .../resource/ResourceHttpRequestHandler.java  |  11 +-
 .../servlet/resource/ResourceResolver.java    |   2 +-
 .../resource/ResourceResolverChain.java       |   2 +-
 .../servlet/resource/ResourceTransformer.java |   2 +-
 .../resource/ResourceTransformerChain.java    |   2 +-
 .../resource/ResourceTransformerSupport.java  |   2 +-
 .../resource/ResourceUrlEncodingFilter.java   |  17 +-
 .../servlet/resource/ResourceUrlProvider.java |   5 +-
 ...esourceUrlProviderExposingInterceptor.java |   4 +-
 .../resource/VersionResourceResolver.java     |   2 +-
 .../resource/WebJarsResourceResolver.java     |   3 +-
 .../AbstractDispatcherServletInitializer.java |  14 +-
 .../support/AbstractFlashMapManager.java      |   5 +-
 .../support/JspAwareRequestContext.java       |  10 +-
 .../web/servlet/support/JstlUtils.java        |  12 +-
 .../web/servlet/support/RequestContext.java   |  22 +-
 .../servlet/support/RequestContextUtils.java  |  10 +-
 .../support/RequestDataValueProcessor.java    |   2 +-
 .../support/ServletUriComponentsBuilder.java  |   2 +-
 .../support/SessionFlashMapManager.java       |   6 +-
 .../servlet/support/WebContentGenerator.java  |   6 +-
 .../web/servlet/tags/ArgumentAware.java       |   2 +-
 .../web/servlet/tags/ArgumentTag.java         |   4 +-
 .../web/servlet/tags/BindErrorsTag.java       |   6 +-
 .../web/servlet/tags/BindTag.java             |   4 +-
 .../web/servlet/tags/EditorAwareTag.java      |   2 +-
 .../web/servlet/tags/EscapeBodyTag.java       |   6 +-
 .../web/servlet/tags/EvalTag.java             |   8 +-
 .../web/servlet/tags/HtmlEscapeTag.java       |   2 +-
 .../servlet/tags/HtmlEscapingAwareTag.java    |   2 +-
 .../web/servlet/tags/MessageTag.java          |   8 +-
 .../web/servlet/tags/NestedPathTag.java       |   8 +-
 .../web/servlet/tags/ParamTag.java            |   4 +-
 .../servlet/tags/RequestContextAwareTag.java  |  13 +-
 .../web/servlet/tags/TransformTag.java        |   8 +-
 .../web/servlet/tags/UrlTag.java              |  10 +-
 .../tags/form/AbstractCheckedElementTag.java  |   2 +-
 .../form/AbstractDataBoundFormElementTag.java |   8 +-
 .../servlet/tags/form/AbstractFormTag.java    |  12 +-
 .../tags/form/AbstractHtmlElementBodyTag.java |  14 +-
 .../tags/form/AbstractHtmlElementTag.java     |   4 +-
 .../form/AbstractHtmlInputElementTag.java     |   2 +-
 .../form/AbstractMultiCheckedElementTag.java  |   2 +-
 .../form/AbstractSingleCheckedElementTag.java |   2 +-
 .../web/servlet/tags/form/ButtonTag.java      |   2 +-
 .../web/servlet/tags/form/CheckboxTag.java    |   2 +-
 .../web/servlet/tags/form/CheckboxesTag.java  |   2 +-
 .../web/servlet/tags/form/ErrorsTag.java      |   6 +-
 .../web/servlet/tags/form/FormTag.java        |  20 +-
 .../web/servlet/tags/form/HiddenInputTag.java |   2 +-
 .../web/servlet/tags/form/InputTag.java       |   2 +-
 .../web/servlet/tags/form/LabelTag.java       |   4 +-
 .../web/servlet/tags/form/OptionTag.java      |   6 +-
 .../web/servlet/tags/form/OptionWriter.java   |   2 +-
 .../web/servlet/tags/form/OptionsTag.java     |   2 +-
 .../servlet/tags/form/PasswordInputTag.java   |   2 +-
 .../web/servlet/tags/form/RadioButtonTag.java |   2 +-
 .../web/servlet/tags/form/SelectTag.java      |   4 +-
 .../web/servlet/tags/form/TagIdGenerator.java |   2 +-
 .../web/servlet/tags/form/TagWriter.java      |   4 +-
 .../web/servlet/tags/form/TextareaTag.java    |   2 +-
 .../servlet/theme/CookieThemeResolver.java    |   6 +-
 .../web/servlet/theme/FixedThemeResolver.java |   4 +-
 .../servlet/theme/SessionThemeResolver.java   |   4 +-
 .../servlet/theme/ThemeChangeInterceptor.java |   6 +-
 .../view/AbstractCachingViewResolver.java     |   4 +-
 .../servlet/view/AbstractTemplateView.java    |   8 +-
 .../web/servlet/view/AbstractView.java        |  10 +-
 .../view/ContentNegotiatingViewResolver.java  |   6 +-
 .../DefaultRequestToViewNameTranslator.java   |   4 +-
 .../servlet/view/InternalResourceView.java    |  28 +-
 .../view/InternalResourceViewResolver.java    |   2 +-
 .../web/servlet/view/JstlView.java            |   8 +-
 .../web/servlet/view/RedirectView.java        |  10 +-
 .../servlet/view/UrlBasedViewResolver.java    |   2 +-
 .../servlet/view/ViewResolverComposite.java   |   2 +-
 .../view/document/AbstractPdfStamperView.java |   5 +-
 .../view/document/AbstractPdfView.java        |   5 +-
 .../view/document/AbstractXlsView.java        |   7 +-
 .../document/AbstractXlsxStreamingView.java   |   5 +-
 .../view/document/AbstractXlsxView.java       |   3 +-
 .../view/feed/AbstractAtomFeedView.java       |   5 +-
 .../servlet/view/feed/AbstractFeedView.java   |   7 +-
 .../view/feed/AbstractRssFeedView.java        |   5 +-
 .../view/freemarker/FreeMarkerConfig.java     |   9 +-
 .../view/freemarker/FreeMarkerConfigurer.java |  28 +-
 .../view/freemarker/FreeMarkerView.java       | 121 +---
 .../servlet/view/groovy/GroovyMarkupView.java |   5 +-
 .../view/json/AbstractJackson2View.java       |   5 +-
 .../view/script/ScriptTemplateView.java       |   7 +-
 .../tiles3/AbstractSpringPreparerFactory.java |  64 --
 .../tiles3/SimpleSpringPreparerFactory.java   |  72 --
 .../tiles3/SpringBeanPreparerFactory.java     |  42 --
 .../view/tiles3/SpringLocaleResolver.java     |  57 --
 ...ildcardServletTilesApplicationContext.java | 106 ---
 .../servlet/view/tiles3/TilesConfigurer.java  | 442 ------------
 .../web/servlet/view/tiles3/TilesView.java    | 166 -----
 .../view/tiles3/TilesViewResolver.java        |  95 ---
 .../web/servlet/view/tiles3/package-info.java |  12 -
 .../web/servlet/view/xml/MarshallingView.java |   7 +-
 .../web/servlet/view/xslt/XsltView.java       |   4 +-
 .../web/servlet/config/spring-mvc.xsd         |  67 +-
 .../web/context/ContextLoaderTests.java       |   7 +-
 .../web/context/ServletConfigAwareBean.java   |   2 +-
 .../web/context/ServletContextAwareBean.java  |   2 +-
 .../ServletContextAwareProcessorTests.java    |   5 +-
 .../XmlWebApplicationContextTests.java        |   3 +-
 .../support/HttpRequestHandlerTests.java      |   9 +-
 .../servlet/ComplexWebApplicationContext.java |  14 +-
 .../web/servlet/DispatcherServletTests.java   |  17 +-
 .../servlet/SimpleWebApplicationContext.java  |   6 +-
 .../web/servlet/config/MvcNamespaceTests.java |  40 +-
 .../DefaultServletHandlerConfigurerTests.java |   3 +-
 .../ViewResolutionIntegrationTests.java       |  44 +-
 .../annotation/ViewResolverRegistryTests.java |  11 +-
 .../WebMvcConfigurationSupportTests.java      |   9 +-
 .../DefaultEntityResponseBuilderTests.java    |   5 +-
 .../DefaultRenderingResponseTests.java        |   3 +-
 .../DefaultServerRequestBuilderTests.java     |   5 +-
 .../function/DefaultServerRequestTests.java   |   5 +-
 .../DefaultServerResponseBuilderTests.java    |   3 +-
 .../ResourceHandlerFunctionTests.java         |   3 +-
 .../BeanNameUrlHandlerMappingTests.java       |   3 +-
 .../CorsAbstractHandlerMappingTests.java      |   4 +-
 .../HandlerMappingIntrospectorTests.java      |   3 +-
 .../servlet/handler/HandlerMappingTests.java  |   3 +-
 .../handler/HandlerMethodMappingTests.java    |   3 +-
 .../handler/MappedInterceptorTests.java       |   5 +-
 .../SimpleMappingExceptionResolverTests.java  |   3 +-
 .../i18n/AcceptHeaderLocaleResolverTests.java |   3 +-
 .../i18n/CookieLocaleResolverTests.java       |   5 +-
 .../i18n/SessionLocaleResolverTests.java      |   3 +-
 .../web/servlet/mvc/ControllerTests.java      |  17 +-
 .../annotation/CglibProxyControllerTests.java |   3 +-
 .../annotation/JdkProxyControllerTests.java   |   3 +-
 .../CompositeRequestConditionTests.java       |   3 +-
 .../PathPatternsRequestConditionTests.java    |   3 +-
 .../PatternsRequestConditionTests.java        |   3 +-
 .../ProducesRequestConditionTests.java        |   3 +-
 .../RequestConditionHolderTests.java          |   3 +-
 .../RequestMethodsRequestConditionTests.java  |   5 +-
 ...RequestMappingInfoHandlerMappingTests.java |   3 +-
 .../mvc/method/RequestMappingInfoTests.java   |   3 +-
 ...equestAttributesArgumentResolverTests.java |   5 +-
 .../AbstractServletHandlerMethodTests.java    |   3 +-
 .../method/annotation/CrossOriginTests.java   |   3 +-
 .../HttpEntityMethodProcessorMockTests.java   |   3 +-
 .../HttpEntityMethodProcessorTests.java       |   7 +-
 .../MvcUriComponentsBuilderTests.java         |  15 +-
 .../PrincipalMethodArgumentResolverTests.java |   3 +-
 ...MappingHandlerAdapterIntegrationTests.java |   9 +-
 .../RequestPartIntegrationTests.java          |  33 +-
 ...equestPartMethodArgumentResolverTests.java |   7 +-
 ...tResponseBodyMethodProcessorMockTests.java |   5 +-
 .../ResponseEntityExceptionHandlerTests.java  |   5 +-
 ...nnotationControllerHandlerMethodTests.java |  23 +-
 ...ookieValueMethodArgumentResolverTests.java |   3 +-
 .../ServletInvocableHandlerMethodTests.java   |   5 +-
 ...letRequestMethodArgumentResolverTests.java |   7 +-
 ...etResponseMethodArgumentResolverTests.java |   3 +-
 ...nnotationControllerHandlerMethodTests.java |   4 +-
 .../DefaultHandlerExceptionResolverTests.java |   2 +-
 .../AppCacheManifestTransformerTests.java     |   3 +-
 ...rceHttpRequestHandlerIntegrationTests.java |   3 +-
 .../ResourceHttpRequestHandlerTests.java      |   3 +-
 .../ResourceTransformerSupportTests.java      |   3 +-
 .../ResourceUrlEncodingFilterTests.java       |   9 +-
 .../ResourceUrlProviderJavaConfigTests.java   |   7 +-
 .../WebJarsResourceResolverTests.java         |   3 +-
 ...nfigDispatcherServletInitializerTests.java |  17 +-
 .../DispatcherServletInitializerTests.java    |   7 +-
 .../servlet/support/FlashMapManagerTests.java |   5 +-
 .../support/MockFilterRegistration.java       |   4 +-
 .../support/MockServletRegistration.java      |   6 +-
 .../RequestDataValueProcessorWrapper.java     |   2 +-
 .../ServletUriComponentsBuilderTests.java     |   3 +-
 .../web/servlet/tags/ArgumentTagTests.java    |   9 +-
 .../web/servlet/tags/BindTagTests.java        |   7 +-
 .../web/servlet/tags/EvalTagTests.java        |   3 +-
 .../web/servlet/tags/HtmlEscapeTagTests.java  |   9 +-
 .../web/servlet/tags/MessageTagTests.java     |  11 +-
 .../web/servlet/tags/ParamTagTests.java       |   9 +-
 .../web/servlet/tags/ThemeTagTests.java       |  11 +-
 .../web/servlet/tags/UrlTagTests.java         |   7 +-
 .../tags/form/AbstractFormTagTests.java       |   2 +-
 .../form/AbstractHtmlElementTagTests.java     |   5 +-
 .../web/servlet/tags/form/ButtonTagTests.java |   3 +-
 .../servlet/tags/form/CheckboxTagTests.java   |   5 +-
 .../servlet/tags/form/CheckboxesTagTests.java |   5 +-
 .../web/servlet/tags/form/ErrorsTagTests.java |  11 +-
 .../web/servlet/tags/form/FormTagTests.java   |   5 +-
 .../tags/form/HiddenInputTagTests.java        |   5 +-
 .../web/servlet/tags/form/InputTagTests.java  |   5 +-
 .../web/servlet/tags/form/LabelTagTests.java  |   5 +-
 .../servlet/tags/form/OptionTagEnumTests.java |   5 +-
 .../web/servlet/tags/form/OptionTagTests.java |   5 +-
 .../servlet/tags/form/OptionsTagTests.java    |   7 +-
 .../tags/form/PasswordInputTagTests.java      |   5 +-
 .../tags/form/RadioButtonTagTests.java        |   5 +-
 .../tags/form/RadioButtonsTagTests.java       |   5 +-
 .../web/servlet/tags/form/SelectTagTests.java |   5 +-
 .../tags/form/TagIdGeneratorTests.java        |   3 +-
 .../servlet/tags/form/TextareaTagTests.java   |   3 +-
 .../web/servlet/view/BaseViewTests.java       |   7 +-
 .../view/DummyMacroRequestContext.java        |   2 +-
 .../view/InternalResourceViewTests.java       |   3 +-
 .../view/ResourceBundleViewResolverTests.java |   5 +-
 .../web/servlet/view/ViewResolverTests.java   |  15 +-
 .../servlet/view/document/XlsViewTests.java   |   5 +-
 .../servlet/view/feed/AtomFeedViewTests.java  |   5 +-
 .../servlet/view/feed/RssFeedViewTests.java   |   5 +-
 .../view/freemarker/FreeMarkerMacroTests.java |  12 +-
 .../view/freemarker/FreeMarkerViewTests.java  |  15 +-
 .../view/groovy/GroovyMarkupViewTests.java    |   3 +-
 .../view/script/JRubyScriptTemplateTests.java |   3 +-
 .../script/JythonScriptTemplateTests.java     |   3 +-
 .../script/KotlinScriptTemplateTests.java     |   3 +-
 .../script/NashornScriptTemplateTests.java    |   3 +-
 .../view/tiles3/TilesConfigurerTests.java     |  66 --
 .../view/tiles3/TilesViewResolverTests.java   |  72 --
 .../servlet/view/tiles3/TilesViewTests.java   | 101 ---
 .../view/xml/MarshallingViewTests.java        |   2 +-
 .../web/context/WEB-INF/empty-servlet.xml     |   2 +-
 ...ig-view-resolution-content-negotiation.xml |   5 -
 .../config/mvc-config-view-resolution.xml     |   8 -
 spring-websocket/spring-websocket.gradle      |  16 +-
 .../jetty/Jetty10WebSocketHandlerAdapter.java | 137 ----
 .../jetty/JettyWebSocketHandlerAdapter.java   |   6 +-
 .../adapter/jetty/JettyWebSocketSession.java  | 160 +----
 ...ebSocketToJettyExtensionConfigAdapter.java |   7 +-
 .../ConvertingEncoderDecoderSupport.java      |  44 +-
 .../StandardToWebSocketExtensionAdapter.java  |   4 +-
 .../StandardWebSocketHandlerAdapter.java      |  25 +-
 .../standard/StandardWebSocketSession.java    |   8 +-
 .../WebSocketToStandardExtensionAdapter.java  |   4 +-
 .../client/jetty/JettyWebSocketClient.java    |  89 +--
 .../AnnotatedEndpointConnectionManager.java   |   8 +-
 .../standard/EndpointConnectionManager.java   |  18 +-
 .../standard/StandardWebSocketClient.java     |  14 +-
 .../WebSocketContainerFactoryBean.java        |   6 +-
 .../MessageBrokerBeanDefinitionParser.java    |   4 +-
 .../jetty/Jetty10RequestUpgradeStrategy.java  | 167 -----
 .../jetty/JettyRequestUpgradeStrategy.java    | 257 ++-----
 .../AbstractStandardUpgradeStrategy.java      |  19 +-
 .../AbstractTyrusRequestUpgradeStrategy.java  |  17 +-
 .../GlassFishRequestUpgradeStrategy.java      |   7 +-
 .../standard/ServerEndpointExporter.java      |  16 +-
 .../standard/ServerEndpointRegistration.java  |  24 +-
 .../ServletServerContainerFactoryBean.java    |  16 +-
 .../server/standard/SpringConfigurator.java   |   7 +-
 .../TomcatRequestUpgradeStrategy.java         |  15 +-
 .../UndertowRequestUpgradeStrategy.java       |  11 +-
 .../WebLogicRequestUpgradeStrategy.java       |  15 +-
 .../WebSphereRequestUpgradeStrategy.java      |  12 +-
 .../support/AbstractHandshakeHandler.java     |  10 +-
 .../support/DefaultHandshakeHandler.java      |   2 +-
 .../HttpSessionHandshakeInterceptor.java      |   4 +-
 .../support/WebSocketHandlerMapping.java      |   4 +-
 .../support/WebSocketHttpRequestHandler.java  |   9 +-
 .../sockjs/client/JettyXhrTransport.java      |  16 +-
 .../sockjs/support/AbstractSockJsService.java |   3 +-
 .../support/SockJsHttpRequestHandler.java     |   8 +-
 .../handler/DefaultSockJsService.java         |   3 +-
 .../handler/WebSocketTransportHandler.java    |   2 +-
 .../session/AbstractHttpSockJsSession.java    |   2 +-
 .../AbstractWebSocketIntegrationTests.java    |   2 +-
 .../web/socket/JettyWebSocketTestServer.java  |   7 +-
 .../web/socket/TomcatWebSocketTestServer.java |   5 +-
 .../web/socket/UndertowTestServer.java        |  11 +-
 .../web/socket/WebSocketTestServer.java       |   4 +-
 .../ConvertingEncoderDecoderSupportTests.java |   9 +-
 .../StandardWebSocketHandlerAdapterTests.java |   9 +-
 .../StandardWebSocketSessionTests.java        |   3 +-
 .../jetty/JettyWebSocketClientTests.java      |  35 +-
 .../StandardWebSocketClientTests.java         |   7 +-
 .../standard/ServerEndpointExporterTests.java |  17 +-
 .../ServerEndpointRegistrationTests.java      |   7 +-
 .../standard/SpringConfiguratorTests.java     |   3 +-
 .../WebSocketHttpRequestHandlerTests.java     |   3 +-
 .../AbstractSockJsIntegrationTests.java       |  17 +-
 .../sockjs/support/SockJsServiceTests.java    |   5 +-
 1291 files changed, 4988 insertions(+), 25318 deletions(-)
 delete mode 100644 spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerUtils.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
 delete mode 100644 spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheManagerTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/BeanValidationPostProcessorTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/MethodValidationTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
 delete mode 100644 spring-context/src/main/java/org/springframework/ejb/access/package-info.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
 delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
 delete mode 100644 spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
 delete mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerIntegrationTests.java
 delete mode 100644 spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/CciOperations.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/context/package-info.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/jca/work/package-info.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
 delete mode 100644 spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
 delete mode 100644 spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockExpressionEvaluator.java
 delete mode 100644 spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/Jetty10WebSocketHandlerAdapter.java
 delete mode 100644 spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringBeanPreparerFactory.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringLocaleResolver.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesView.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java
 delete mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/Jetty10WebSocketHandlerAdapter.java
 delete mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java

diff --git a/build.gradle b/build.gradle
index 255ecde3a6df..c6cdde1364e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ configure(allprojects) { project ->
 			mavenBom "io.projectreactor:reactor-bom:2020.0.11"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
+			mavenBom "org.eclipse.jetty:jetty-bom:11.0.6"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
@@ -83,14 +83,10 @@ configure(allprojects) { project ->
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.10"
+			dependency "org.eclipse:yasson:2.0.2"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependencySet(group: 'org.jibx', version: '1.3.3') {
-				entry 'jibx-bind'
-				entry 'jibx-run'
-			}
 			dependency "org.ogce:xpp3:1.1.6"
 			dependency "org.yaml:snakeyaml:1.29"
 
@@ -108,7 +104,6 @@ configure(allprojects) { project ->
 				}
 				entry 'activemq-stomp'
 			}
-			dependency "org.apache.bcel:bcel:6.0"
 			dependency "org.apache.commons:commons-pool2:2.9.0"
 			dependencySet(group: 'org.apache.derby', version: '10.14.2.0') {
 				entry 'derby'
@@ -119,35 +114,28 @@ configure(allprojects) { project ->
 			dependency "org.freemarker:freemarker:2.3.31"
 			dependency "org.hsqldb:hsqldb:2.5.2"
 			dependency "org.quartz-scheduler:quartz:2.3.2"
-			dependency "org.codehaus.fabric3.api:commonj:1.1.0"
-			dependency "net.sf.ehcache:ehcache:2.10.6"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core:5.5.7.Final"
-			dependency "org.hibernate:hibernate-validator:6.2.0.Final"
+			dependency "org.hibernate:hibernate-core-jakarta:5.5.7.Final"
+			dependency "org.hibernate:hibernate-validator:7.0.1.Final"
 			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.52') {
+			dependencySet(group: 'org.apache.tomcat', version: '10.0.11') {
 				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.52') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '10.0.11') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
 			dependencySet(group: 'io.undertow', version: '2.2.10.Final') {
 				entry 'undertow-core'
-				entry('undertow-websockets-jsr') {
-					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
-				}
-				entry('undertow-servlet') {
-					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec"
-					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec"
-				}
+				entry('undertow-servlet-jakartaee9')
+				entry('undertow-websockets-jsr-jakartaee9')
 			}
 
 			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
@@ -162,15 +150,12 @@ configure(allprojects) { project ->
 			}
 			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1'
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9"
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4"
 
 			dependency "org.jruby:jruby:9.2.19.0"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"
 
-			dependency "commons-fileupload:commons-fileupload:1.4"
-			dependency "org.synchronoss.cloud:nio-multipart-parser:1.1.0"
-
 			dependency("org.dom4j:dom4j:2.1.3") {
 				exclude group: "jaxen", name: "jaxen"
 				exclude group: "net.java.dev.msv", name: "xsdlib"
@@ -218,69 +203,50 @@ configure(allprojects) { project ->
 			dependency "org.skyscreamer:jsonassert:1.5.0"
 			dependency "com.jayway.jsonpath:json-path:2.6.0"
 			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
-
-			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
-				entry 'tiles-api'
-				entry('tiles-core', withoutJclOverSlf4j)
-				entry('tiles-servlet', withoutJclOverSlf4j)
-				entry('tiles-jsp', withoutJclOverSlf4j)
-				entry('tiles-el', withoutJclOverSlf4j)
-				entry('tiles-extras') {
-					exclude group: "org.springframework", name: "spring-web"
-					exclude group: "org.slf4j", name: "jcl-over-slf4j"
-				}
-			}
-			dependency("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
-				exclude group: "org.apache.taglibs", name: "taglibs-standard-spec"
-			}
-
-			dependency "com.ibm.websphere:uow:6.0.2.17"
 			dependency "com.jamonapi:jamon:2.82"
-			dependency "joda-time:joda-time:2.10.10"
-			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.9"
-			dependency "org.javamoney:moneta:1.3"
 
-			dependency "com.sun.activation:javax.activation:1.2.0"
-			dependency "com.sun.mail:javax.mail:1.6.2"
-			dependencySet(group: 'com.sun.xml.bind', version: '2.3.0.1') {
+			dependency "javax.cache:cache-api:1.1.1"
+			dependency "javax.money:money-api:1.1"
+			dependency "org.javamoney:moneta:1.4.2"
+
+			dependency "jakarta.activation:jakarta.activation-api:2.0.1"
+			dependency "jakarta.annotation:jakarta.annotation-api:2.0.0"
+			dependency "jakarta.ejb:jakarta.ejb-api:4.0.0"
+			dependency "jakarta.el:jakarta.el-api:4.0.0"
+			dependency "jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0"
+			dependency "jakarta.faces:jakarta.faces-api:3.0.0"
+			dependency "jakarta.inject:jakarta.inject-api:2.0.0"
+			dependency "jakarta.inject:jakarta.inject-tck:2.0.1"
+			dependency "jakarta.interceptor:jakarta.interceptor-api:2.0.0"
+			dependency "jakarta.jms:jakarta.jms-api:3.0.0"
+			dependency "jakarta.json:jakarta.json-api:2.0.1"
+			dependency "jakarta.json.bind:jakarta.json.bind-api:2.0.0"
+			dependency "jakarta.mail:jakarta.mail-api:2.0.1"
+			dependency "jakarta.persistence:jakarta.persistence-api:3.0.0"
+			dependency "jakarta.resource:jakarta.resource-api:2.0.0"
+			dependency "jakarta.servlet:jakarta.servlet-api:5.0.0"
+			dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0"
+			dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0"
+			dependency "jakarta.transaction:jakarta.transaction-api:2.0.0"
+			dependency "jakarta.validation:jakarta.validation-api:3.0.0"
+			dependency "jakarta.websocket:jakarta.websocket-api:2.0.0"
+			dependency "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
+			dependency "jakarta.xml.ws:jakarta.xml.ws-api:3.0.1"
+
+			dependency "com.sun.activation:jakarta.activation:2.0.1"
+			dependency "com.sun.mail:jakarta.mail:2.0.1"
+			dependencySet(group: 'com.sun.xml.bind', version: '3.0.2') {
 				entry 'jaxb-core'
 				entry 'jaxb-impl'
 				entry 'jaxb-xjc'
 			}
 
-			dependency "javax.activation:javax.activation-api:1.2.0"
-			dependency "javax.annotation:javax.annotation-api:1.3.2"
-			dependency "javax.cache:cache-api:1.1.0"
-			dependency "javax.ejb:javax.ejb-api:3.2"
-			dependency "javax.el:javax.el-api:3.0.1-b04"
-			dependency "javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0"
-			dependency "javax.faces:javax.faces-api:2.2"
-			dependency "javax.inject:javax.inject:1"
-			dependency "javax.inject:javax.inject-tck:1"
-			dependency "javax.interceptor:javax.interceptor-api:1.2.2"
-			dependency "javax.jms:javax.jms-api:2.0.1"
-			dependency "javax.json:javax.json-api:1.1.4"
-			dependency "javax.json.bind:javax.json.bind-api:1.0"
-			dependency "javax.mail:javax.mail-api:1.6.2"
-			dependency "javax.money:money-api:1.0.3"
-			dependency "javax.resource:javax.resource-api:1.7.1"
-			dependency "javax.servlet:javax.servlet-api:4.0.1"
-			dependency "javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02"
-			dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1"
-			dependency "javax.transaction:javax.transaction-api:1.3"
-			dependency "javax.validation:validation-api:2.0.1.Final"
-			dependency "javax.websocket:javax.websocket-api:1.1"
-			dependency "javax.xml.bind:jaxb-api:2.3.1"
-			dependency "javax.xml.ws:jaxws-api:2.3.1"
-
-			dependency "org.eclipse.persistence:javax.persistence:2.2.0"
-
 			// Substitute for "javax.management:jmxremote_optional:1.0.1_04" which
 			// is not available on Maven Central
 			dependency "org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea"
-			dependency "org.glassfish:javax.el:3.0.1-b08"
-			dependency "org.glassfish.main:javax.jws:4.0-b33"
-			dependency "org.glassfish.tyrus:tyrus-container-servlet:1.13.1"
+			dependency "org.glassfish:jakarta.el:4.0.2"
+			dependency "org.glassfish.tyrus:tyrus-container-servlet:2.0.1"
+			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.2"
 		}
 		generatedPomCustomization {
 			enabled = false
diff --git a/integration-tests/integration-tests.gradle b/integration-tests/integration-tests.gradle
index f7408e5c6ec4..5d864c7ba05b 100644
--- a/integration-tests/integration-tests.gradle
+++ b/integration-tests/integration-tests.gradle
@@ -15,12 +15,12 @@ dependencies {
 	testImplementation(project(":spring-test"))
 	testImplementation(project(":spring-tx"))
 	testImplementation(project(":spring-web"))
-	testImplementation("javax.inject:javax.inject")
-	testImplementation("javax.resource:javax.resource-api")
-	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("jakarta.inject:jakarta.inject-api")
+	testImplementation("jakarta.resource:jakarta.resource-api")
+	testImplementation("jakarta.servlet:jakarta.servlet-api")
 	testImplementation("org.aspectj:aspectjweaver")
 	testImplementation("org.hsqldb:hsqldb")
-	testImplementation("org.hibernate:hibernate-core")
+	testImplementation("org.hibernate:hibernate-core-jakarta")
 }
 
 normalization {
diff --git a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
index cf067e01415c..48142f4c9374 100644
--- a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
+++ b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
@@ -20,8 +20,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;
diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
index bd86cc9041d1..f2bcce460c47 100644
--- a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
+++ b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
@@ -21,9 +21,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -314,16 +313,16 @@ public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 				if (definition instanceof AnnotatedBeanDefinition) {
 					AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
 					for (String type : annDef.getMetadata().getAnnotationTypes()) {
-						if (type.equals(javax.inject.Singleton.class.getName())) {
+						if (type.equals(jakarta.inject.Singleton.class.getName())) {
 							metadata.setScopeName(BeanDefinition.SCOPE_SINGLETON);
 							break;
 						}
-						else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(javax.inject.Scope.class.getName())) {
+						else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(jakarta.inject.Scope.class.getName())) {
 							metadata.setScopeName(type.substring(type.length() - 13, type.length() - 6).toLowerCase());
 							metadata.setScopedProxyMode(scopedProxyMode);
 							break;
 						}
-						else if (type.startsWith("javax.inject")) {
+						else if (type.startsWith("jakarta.inject")) {
 							metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
 						}
 					}
@@ -391,14 +390,14 @@ public static class SessionScopedTestBean extends ScopedTestBean implements Anot
 
 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
-	@javax.inject.Scope
+	@jakarta.inject.Scope
 	public @interface RequestScoped {
 	}
 
 
 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
-	@javax.inject.Scope
+	@jakarta.inject.Scope
 	public @interface SessionScoped {
 	}
 
diff --git a/integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java b/integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java
index 20e23ecca310..2bbc001f28eb 100644
--- a/integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java
+++ b/integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java
@@ -41,9 +41,6 @@
 import org.springframework.context.support.GenericXmlApplicationContext;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.jca.context.ResourceAdapterApplicationContext;
-import org.springframework.jca.support.SimpleBootstrapContext;
-import org.springframework.jca.work.SimpleTaskWorkManager;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.mock.env.MockPropertySource;
 import org.springframework.mock.web.MockServletConfig;
@@ -535,22 +532,6 @@ void registerServletParamPropertySources_StaticWebApplicationContext() {
 		assertThat(environment.getProperty("pSysProps1")).isEqualTo("pSysProps1Value");
 	}
 
-	@Test
-	void resourceAdapterApplicationContext() {
-		ResourceAdapterApplicationContext ctx = new ResourceAdapterApplicationContext(new SimpleBootstrapContext(new SimpleTaskWorkManager()));
-
-		assertHasStandardEnvironment(ctx);
-
-		registerEnvironmentBeanDefinition(ctx);
-
-		ctx.setEnvironment(prodEnv);
-		ctx.refresh();
-
-		assertHasEnvironment(ctx, prodEnv);
-		assertEnvironmentBeanRegistered(ctx);
-		assertEnvironmentAwareInvoked(ctx, prodEnv);
-	}
-
 	@Test
 	void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {
 		{
diff --git a/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
index 90ea7dc1f663..92abf56386a1 100644
--- a/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
+++ b/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
@@ -41,7 +41,7 @@
 			<props>
 				<prop key="setA*">PROPAGATION_REQUIRED</prop>
 				<prop key="rollbackOnly">PROPAGATION_REQUIRED</prop>
-				<prop key="echoException">PROPAGATION_REQUIRED,+javax.servlet.ServletException,-java.lang.Exception</prop>
+				<prop key="echoException">PROPAGATION_REQUIRED,+jakarta.servlet.ServletException,-java.lang.Exception</prop>
 			</props>
 		</property>
 	</bean>
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
index 8d97ad311c70..a466164bcc7b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
  * target method needs to implement the same signature, it will have to return
  * a temporary Future handle that just passes the return value through
  * (like Spring's {@link org.springframework.scheduling.annotation.AsyncResult}
- * or EJB 3.1's {@code javax.ejb.AsyncResult}).
+ * or EJB's {@code jakarta.ejb.AsyncResult}).
  *
  * <p>When the return type is {@code java.util.concurrent.Future}, any exception thrown
  * during the execution can be accessed and managed by the caller. With {@code void}
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 85c84bfd4670..ec29638bf5ec 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -29,14 +29,14 @@ dependencies {
 	optional(project(":spring-orm"))  // for JPA exception translation support
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
 	optional("javax.cache:cache-api")  // for JCache aspect
-	optional("javax.transaction:javax.transaction-api")  // for @javax.transaction.Transactional support
+	optional("jakarta.transaction:jakarta.transaction-api")  // for @javax.transaction.Transactional support
 	testImplementation(project(":spring-core"))  // for CodeStyleAspect
 	testImplementation(project(":spring-test"))
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation(testFixtures(project(":spring-context-support")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-tx")))
-	testImplementation("javax.mail:javax.mail-api")
+	testImplementation("jakarta.mail:jakarta.mail-api")
 	testCompileOnly("org.aspectj:aspectjrt")
 }
 
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJJtaTransactionManagementConfiguration.java b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJJtaTransactionManagementConfiguration.java
index ec733d3cf2b9..0ed7ffb69eb8 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJJtaTransactionManagementConfiguration.java
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJJtaTransactionManagementConfiguration.java
@@ -27,7 +27,7 @@
 /**
  * {@code @Configuration} class that registers the Spring infrastructure beans necessary
  * to enable AspectJ-based annotation-driven transaction management for the JTA 1.2
- * {@link javax.transaction.Transactional} annotation in addition to Spring's own
+ * {@link jakarta.transaction.Transactional} annotation in addition to Spring's own
  * {@link org.springframework.transaction.annotation.Transactional} annotation.
  *
  * @author Juergen Hoeller
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/JtaAnnotationTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/JtaAnnotationTransactionAspect.aj
index 1644ce50651f..8b374ea0d86e 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/JtaAnnotationTransactionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/JtaAnnotationTransactionAspect.aj
@@ -16,7 +16,7 @@
 
 package org.springframework.transaction.aspectj;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.aspectj.lang.annotation.RequiredTypes;
 
@@ -24,7 +24,7 @@ import org.springframework.transaction.annotation.AnnotationTransactionAttribute
 
 /**
  * Concrete AspectJ transaction aspect using the JTA 1.2
- * {@link javax.transaction.Transactional} annotation.
+ * {@link jakarta.transaction.Transactional} annotation.
  *
  * <p>When using this aspect, you <i>must</i> annotate the implementation class
  * (and/or methods within that class), <i>not</i> the interface (if any) that
@@ -42,10 +42,10 @@ import org.springframework.transaction.annotation.AnnotationTransactionAttribute
  *
  * @author Stephane Nicoll
  * @since 4.2
- * @see javax.transaction.Transactional
+ * @see jakarta.transaction.Transactional
  * @see AnnotationTransactionAspect
  */
-@RequiredTypes("javax.transaction.Transactional")
+@RequiredTypes("jakarta.transaction.Transactional")
 public aspect JtaAnnotationTransactionAspect extends AbstractTransactionAspect {
 
 	public JtaAnnotationTransactionAspect() {
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java
index e0bd918a72ea..b6ef121a7962 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/JtaTransactionAspectsTests.java
@@ -18,8 +18,7 @@
 
 import java.io.IOException;
 
-import javax.transaction.Transactional;
-
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index bf5fad779f0f..9c4d0af79e1a 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -5,13 +5,13 @@ apply plugin: "kotlin"
 
 dependencies {
 	api(project(":spring-core"))
-	optional("javax.inject:javax.inject")
+	optional("jakarta.inject:jakarta.inject-api")
 	optional("org.yaml:snakeyaml")
 	optional("org.codehaus.groovy:groovy-xml")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("jakarta.annotation:jakarta.annotation-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
index 242fddbad8e1..fad36ac5bf08 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
@@ -25,7 +25,7 @@
 /**
  * Marks a constructor, field, setter method, or config method as to be autowired by
  * Spring's dependency injection facilities. This is an alternative to the JSR-330
- * {@link javax.inject.Inject} annotation, adding required-vs-optional semantics.
+ * {@link jakarta.inject.Inject} annotation, adding required-vs-optional semantics.
  *
  * <h3>Autowired Constructors</h3>
  * <p>Only one constructor of any given bean class may declare this annotation with the
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 2065f6b6e9b0..fdbf93539128 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -75,7 +75,7 @@
  * by default, Spring's {@link Autowired @Autowired} and {@link Value @Value}
  * annotations.
  *
- * <p>Also supports JSR-330's {@link javax.inject.Inject @Inject} annotation,
+ * <p>Also supports JSR-330's {@link jakarta.inject.Inject @Inject} annotation,
  * if available, as a direct alternative to Spring's own {@code @Autowired}.
  *
  * <h3>Autowired Constructors</h3>
@@ -154,7 +154,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 	/**
 	 * Create a new {@code AutowiredAnnotationBeanPostProcessor} for Spring's
 	 * standard {@link Autowired @Autowired} and {@link Value @Value} annotations.
-	 * <p>Also supports JSR-330's {@link javax.inject.Inject @Inject} annotation,
+	 * <p>Also supports JSR-330's {@link jakarta.inject.Inject @Inject} annotation,
 	 * if available.
 	 */
 	@SuppressWarnings("unchecked")
@@ -163,8 +163,8 @@ public AutowiredAnnotationBeanPostProcessor() {
 		this.autowiredAnnotationTypes.add(Value.class);
 		try {
 			this.autowiredAnnotationTypes.add((Class<? extends Annotation>)
-					ClassUtils.forName("javax.inject.Inject", AutowiredAnnotationBeanPostProcessor.class.getClassLoader()));
-			logger.trace("JSR-330 'javax.inject.Inject' annotation found and supported for autowiring");
+					ClassUtils.forName("jakarta.inject.Inject", AutowiredAnnotationBeanPostProcessor.class.getClassLoader()));
+			logger.trace("JSR-330 'jakarta.inject.Inject' annotation found and supported for autowiring");
 		}
 		catch (ClassNotFoundException ex) {
 			// JSR-330 API not available - simply skip.
@@ -177,7 +177,7 @@ public AutowiredAnnotationBeanPostProcessor() {
 	 * setter methods, and arbitrary config methods.
 	 * <p>The default autowired annotation types are the Spring-provided
 	 * {@link Autowired @Autowired} and {@link Value @Value} annotations as well
-	 * as JSR-330's {@link javax.inject.Inject @Inject} annotation, if available.
+	 * as JSR-330's {@link jakarta.inject.Inject @Inject} annotation, if available.
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation type to indicate that a member is supposed
 	 * to be autowired.
@@ -193,7 +193,7 @@ public void setAutowiredAnnotationType(Class<? extends Annotation> autowiredAnno
 	 * setter methods, and arbitrary config methods.
 	 * <p>The default autowired annotation types are the Spring-provided
 	 * {@link Autowired @Autowired} and {@link Value @Value} annotations as well
-	 * as JSR-330's {@link javax.inject.Inject @Inject} annotation, if available.
+	 * as JSR-330's {@link jakarta.inject.Inject @Inject} annotation, if available.
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation types to indicate that a member is supposed
 	 * to be autowired.
@@ -537,9 +537,7 @@ private MergedAnnotation<?> findAutowiredAnnotation(AccessibleObject ao) {
 	 * @param ann the Autowired annotation
 	 * @return whether the annotation indicates that a dependency is required
 	 */
-	@SuppressWarnings({"deprecation", "cast"})
 	protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
-		// The following (AnnotationAttributes) cast is required on JDK 9+.
 		return determineRequiredStatus((AnnotationAttributes)
 				ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
index f76a03b8dc9d..6316848a5a77 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
@@ -66,9 +66,9 @@
  * init method and destroy method, respectively.
  *
  * <p>Spring's {@link org.springframework.context.annotation.CommonAnnotationBeanPostProcessor}
- * supports the JSR-250 {@link javax.annotation.PostConstruct} and {@link javax.annotation.PreDestroy}
+ * supports the JSR-250 {@link jakarta.annotation.PostConstruct} and {@link jakarta.annotation.PreDestroy}
  * annotations out of the box, as init annotation and destroy annotation, respectively.
- * Furthermore, it also supports the {@link javax.annotation.Resource} annotation
+ * Furthermore, it also supports the {@link jakarta.annotation.Resource} annotation
  * for annotation-driven injection of named beans.
  *
  * @author Juergen Hoeller
@@ -117,7 +117,7 @@ public boolean hasDestroyMethods() {
 	 * methods to call after configuration of a bean.
 	 * <p>Any custom annotation can be used, since there are no required
 	 * annotation attributes. There is no default, although a typical choice
-	 * is the JSR-250 {@link javax.annotation.PostConstruct} annotation.
+	 * is the JSR-250 {@link jakarta.annotation.PostConstruct} annotation.
 	 */
 	public void setInitAnnotationType(Class<? extends Annotation> initAnnotationType) {
 		this.initAnnotationType = initAnnotationType;
@@ -128,7 +128,7 @@ public void setInitAnnotationType(Class<? extends Annotation> initAnnotationType
 	 * methods to call when the context is shutting down.
 	 * <p>Any custom annotation can be used, since there are no required
 	 * annotation attributes. There is no default, although a typical choice
-	 * is the JSR-250 {@link javax.annotation.PreDestroy} annotation.
+	 * is the JSR-250 {@link jakarta.annotation.PreDestroy} annotation.
 	 */
 	public void setDestroyAnnotationType(Class<? extends Annotation> destroyAnnotationType) {
 		this.destroyAnnotationType = destroyAnnotationType;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
index e4e104b4c8e4..e38c67338641 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
@@ -46,7 +46,7 @@
  * against {@link Qualifier qualifier annotations} on the field or parameter to be autowired.
  * Also supports suggested expression values through a {@link Value value} annotation.
  *
- * <p>Also supports JSR-330's {@link javax.inject.Qualifier} annotation, if available.
+ * <p>Also supports JSR-330's {@link jakarta.inject.Qualifier} annotation, if available.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -66,13 +66,13 @@ public class QualifierAnnotationAutowireCandidateResolver extends GenericTypeAwa
 	/**
 	 * Create a new QualifierAnnotationAutowireCandidateResolver
 	 * for Spring's standard {@link Qualifier} annotation.
-	 * <p>Also supports JSR-330's {@link javax.inject.Qualifier} annotation, if available.
+	 * <p>Also supports JSR-330's {@link jakarta.inject.Qualifier} annotation, if available.
 	 */
 	@SuppressWarnings("unchecked")
 	public QualifierAnnotationAutowireCandidateResolver() {
 		this.qualifierTypes.add(Qualifier.class);
 		try {
-			this.qualifierTypes.add((Class<? extends Annotation>) ClassUtils.forName("javax.inject.Qualifier",
+			this.qualifierTypes.add((Class<? extends Annotation>) ClassUtils.forName("jakarta.inject.Qualifier",
 							QualifierAnnotationAutowireCandidateResolver.class.getClassLoader()));
 		}
 		catch (ClassNotFoundException ex) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
index d5fd082162b6..c16db6ca73ae 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -182,7 +182,7 @@ public boolean isRequired() {
 
 	/**
 	 * Check whether the underlying field is annotated with any variant of a
-	 * {@code Nullable} annotation, e.g. {@code javax.annotation.Nullable} or
+	 * {@code Nullable} annotation, e.g. {@code jakarta.annotation.Nullable} or
 	 * {@code edu.umd.cs.findbugs.annotations.Nullable}.
 	 */
 	private boolean hasNullableAnnotation() {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
index 11933292d418..96d7bf3a6035 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -27,18 +27,18 @@
 
 /**
  * A {@link org.springframework.beans.factory.FactoryBean} implementation that
- * returns a value which is a JSR-330 {@link javax.inject.Provider} that in turn
+ * returns a value which is a JSR-330 {@link jakarta.inject.Provider} that in turn
  * returns a bean sourced from a {@link org.springframework.beans.factory.BeanFactory}.
  *
  * <p>This is basically a JSR-330 compliant variant of Spring's good old
  * {@link ObjectFactoryCreatingFactoryBean}. It can be used for traditional
  * external dependency injection configuration that targets a property or
- * constructor argument of type {@code javax.inject.Provider}, as an
+ * constructor argument of type {@code jakarta.inject.Provider}, as an
  * alternative to JSR-330's {@code @Inject} annotation-driven approach.
  *
  * @author Juergen Hoeller
  * @since 3.0.2
- * @see javax.inject.Provider
+ * @see jakarta.inject.Provider
  * @see ObjectFactoryCreatingFactoryBean
  */
 public class ProviderCreatingFactoryBean extends AbstractFactoryBean<Provider<Object>> {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
index d2054ae059a2..9606eb87264b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
@@ -138,7 +138,7 @@ public interface Scope {
 	 * <p>The exact meaning of the conversation ID depends on the underlying
 	 * storage mechanism. In the case of session-scoped objects, the
 	 * conversation ID would typically be equal to (or derived from) the
-	 * {@link javax.servlet.http.HttpSession#getId() session ID}; in the
+	 * {@link jakarta.servlet.http.HttpSession#getId() session ID}; in the
 	 * case of a custom conversation that sits within the overall session,
 	 * the specific ID for the current conversation would be appropriate.
 	 * <p><b>Note: This is an optional operation.</b> It is perfectly valid to
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index a4f29b0ce879..7c16748e1414 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -41,7 +41,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.TypeConverter;
@@ -125,7 +125,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	static {
 		try {
 			javaxInjectProviderClass =
-					ClassUtils.forName("javax.inject.Provider", DefaultListableBeanFactory.class.getClassLoader());
+					ClassUtils.forName("jakarta.inject.Provider", DefaultListableBeanFactory.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
 			// JSR-330 API not available - Provider interface simply not supported then.
@@ -1651,7 +1651,7 @@ else if (candidateLocal) {
 
 	/**
 	 * Determine the candidate with the highest priority in the given set of beans.
-	 * <p>Based on {@code @javax.annotation.Priority}. As defined by the related
+	 * <p>Based on {@code @jakarta.annotation.Priority}. As defined by the related
 	 * {@link org.springframework.core.Ordered} interface, the lowest value has
 	 * the highest priority.
 	 * @param candidates a Map of candidate names and candidate instances
@@ -1711,7 +1711,7 @@ protected boolean isPrimary(String beanName, Object beanInstance) {
 
 	/**
 	 * Return the priority assigned for the given bean instance by
-	 * the {@code javax.annotation.Priority} annotation.
+	 * the {@code jakarta.annotation.Priority} annotation.
 	 * <p>The default implementation delegates to the specified
 	 * {@link #setDependencyComparator dependency comparator}, checking its
 	 * {@link OrderComparator#getPriority method} if it is an extension of
@@ -2086,8 +2086,8 @@ private Stream<Object> resolveStream(boolean ordered) {
 
 
 	/**
-	 * Separate inner class for avoiding a hard dependency on the {@code javax.inject} API.
-	 * Actual {@code javax.inject.Provider} implementation is nested here in order to make it
+	 * Separate inner class for avoiding a hard dependency on the {@code jakarta.inject} API.
+	 * Actual {@code jakarta.inject.Provider} implementation is nested here in order to make it
 	 * invisible for Graal's introspection of DefaultListableBeanFactory's nested classes.
 	 */
 	private class Jsr330Factory implements Serializable {
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 2cb8d8a9cd1a..fce8a043b1b0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -36,8 +36,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import javax.annotation.Priority;
-
+import jakarta.annotation.Priority;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeansException;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index aa4c1cb20bff..d4b97bdb19c2 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -23,10 +23,9 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -51,7 +50,7 @@
 
 /**
  * Unit tests for {@link org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor}
- * processing the JSR-330 {@link javax.inject.Inject} annotation.
+ * processing the JSR-330 {@link jakarta.inject.Inject} annotation.
  *
  * @author Juergen Hoeller
  * @since 3.0
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
index 7357ba9069dd..d55d48bb64a7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
@@ -18,8 +18,7 @@
 
 import java.util.Date;
 
-import javax.inject.Provider;
-
+import jakarta.inject.Provider;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-context-indexer/spring-context-indexer.gradle b/spring-context-indexer/spring-context-indexer.gradle
index 2c1df2e91dc3..40d69a22670d 100644
--- a/spring-context-indexer/spring-context-indexer.gradle
+++ b/spring-context-indexer/spring-context-indexer.gradle
@@ -2,8 +2,8 @@ description = "Spring Context Indexer"
 
 dependencies {
 	testImplementation(project(":spring-context"))
-	testImplementation("javax.inject:javax.inject")
-	testImplementation("javax.annotation:javax.annotation-api")
-	testImplementation("javax.transaction:javax.transaction-api")
-	testImplementation("org.eclipse.persistence:javax.persistence")
+	testImplementation("jakarta.inject:jakarta.inject-api")
+	testImplementation("jakarta.annotation:jakarta.annotation-api")
+	testImplementation("jakarta.persistence:jakarta.persistence-api")
+	testImplementation("jakarta.transaction:jakarta.transaction-api")
 }
diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java
index 3a7eb01dbbc0..082c25849622 100644
--- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java
+++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java
@@ -49,7 +49,7 @@ public Set<String> getStereotypes(Element element) {
 		}
 		for (AnnotationMirror annotation : this.typeHelper.getAllAnnotationMirrors(element)) {
 			String type = this.typeHelper.getType(annotation);
-			if (type.startsWith("javax.")) {
+			if (type.startsWith("jakarta.")) {
 				stereotypes.add(type);
 			}
 		}
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java
index aa1a21d7367c..be3d30dc4207 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/processor/CandidateComponentsIndexerTests.java
@@ -21,14 +21,13 @@
 import java.io.IOException;
 import java.nio.file.Path;
 
-import javax.annotation.ManagedBean;
-import javax.inject.Named;
-import javax.persistence.Converter;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.transaction.Transactional;
-
+import jakarta.annotation.ManagedBean;
+import jakarta.inject.Named;
+import jakarta.persistence.Converter;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleManagedBean.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleManagedBean.java
index d3bf3dd8b785..fb34361664d6 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleManagedBean.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleManagedBean.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.index.sample.cdi;
 
-import javax.annotation.ManagedBean;
+import jakarta.annotation.ManagedBean;
 
 /**
  * Test candidate for a CDI {@link ManagedBean}.
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleNamed.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleNamed.java
index 20ca0342e68f..d975af6b1f30 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleNamed.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleNamed.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.index.sample.cdi;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 /**
  * Test candidate for a CDI {@link Named} bean.
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleTransactional.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleTransactional.java
index f104d5604e88..273aabcb14f3 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleTransactional.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/cdi/SampleTransactional.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.index.sample.cdi;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 /**
  * Test candidate for {@link Transactional}. This verifies that the annotation processor
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleConverter.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleConverter.java
index 129f090f5779..474dd5c1a298 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleConverter.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleConverter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.index.sample.jpa;
 
-import javax.persistence.Converter;
+import jakarta.persistence.Converter;
 
 /**
  * Test candidate for {@link Converter}.
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEmbeddable.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEmbeddable.java
index 79269507395a..15f3356ce70c 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEmbeddable.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEmbeddable.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.index.sample.jpa;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 /**
  * Test candidate for {@link Embeddable}.
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEntity.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEntity.java
index 101c3891d902..ae6e87559d29 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEntity.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleEntity.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.index.sample.jpa;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  * Test candidate for {@link Entity}.
diff --git a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleMappedSuperClass.java b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleMappedSuperClass.java
index 73737f4e98be..fbca3e43613b 100644
--- a/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleMappedSuperClass.java
+++ b/spring-context-indexer/src/test/java/org/springframework/context/index/sample/jpa/SampleMappedSuperClass.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.index.sample.jpa;
 
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * Test candidate for {@link MappedSuperclass}.
diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle
index 843d1920ebe4..160f8028985c 100644
--- a/spring-context-support/spring-context-support.gradle
+++ b/spring-context-support/spring-context-support.gradle
@@ -6,13 +6,11 @@ dependencies {
 	api(project(":spring-core"))
 	optional(project(":spring-jdbc"))  // for Quartz support
 	optional(project(":spring-tx"))  // for Quartz support
-	optional("javax.activation:javax.activation-api")
-	optional("javax.mail:javax.mail-api")
+	optional("jakarta.activation:jakarta.activation-api")
+	optional("jakarta.mail:jakarta.mail-api")
 	optional("javax.cache:cache-api")
 	optional("com.github.ben-manes.caffeine:caffeine")
-	optional("net.sf.ehcache:ehcache")
 	optional("org.quartz-scheduler:quartz")
-	optional("org.codehaus.fabric3.api:commonj")
 	optional("org.freemarker:freemarker")
 	testImplementation(project(":spring-context"))
 	testImplementation(testFixtures(project(":spring-beans")))
@@ -20,12 +18,11 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-tx")))
 	testImplementation("org.hsqldb:hsqldb")
-	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("jakarta.annotation:jakarta.annotation-api")
 	testRuntimeOnly("org.ehcache:jcache")
 	testRuntimeOnly("org.ehcache:ehcache")
-	testRuntimeOnly("org.glassfish:javax.el")
-	testRuntimeOnly("com.sun.mail:javax.mail")
+	testRuntimeOnly("org.glassfish:jakarta.el")
+	testRuntimeOnly("com.sun.mail:jakarta.mail")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.mockito:mockito-core")
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
deleted file mode 100644
index 4309fa73a2cb..000000000000
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * 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.
- * 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.cache.ehcache;
-
-import java.util.concurrent.Callable;
-
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.Status;
-
-import org.springframework.cache.Cache;
-import org.springframework.cache.support.SimpleValueWrapper;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * {@link Cache} implementation on top of an {@link Ehcache} instance.
- *
- * @author Costin Leau
- * @author Juergen Hoeller
- * @author Stephane Nicoll
- * @since 3.1
- * @see EhCacheCacheManager
- */
-public class EhCacheCache implements Cache {
-
-	private final Ehcache cache;
-
-
-	/**
-	 * Create an {@link EhCacheCache} instance.
-	 * @param ehcache the backing Ehcache instance
-	 */
-	public EhCacheCache(Ehcache ehcache) {
-		Assert.notNull(ehcache, "Ehcache must not be null");
-		Status status = ehcache.getStatus();
-		if (!Status.STATUS_ALIVE.equals(status)) {
-			throw new IllegalArgumentException(
-					"An 'alive' Ehcache is required - current cache is " + status.toString());
-		}
-		this.cache = ehcache;
-	}
-
-
-	@Override
-	public final String getName() {
-		return this.cache.getName();
-	}
-
-	@Override
-	public final Ehcache getNativeCache() {
-		return this.cache;
-	}
-
-	@Override
-	@Nullable
-	public ValueWrapper get(Object key) {
-		Element element = lookup(key);
-		return toValueWrapper(element);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	@Nullable
-	public <T> T get(Object key, @Nullable Class<T> type) {
-		Element element = this.cache.get(key);
-		Object value = (element != null ? element.getObjectValue() : null);
-		if (value != null && type != null && !type.isInstance(value)) {
-			throw new IllegalStateException(
-					"Cached value is not of required type [" + type.getName() + "]: " + value);
-		}
-		return (T) value;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	@Nullable
-	public <T> T get(Object key, Callable<T> valueLoader) {
-		Element element = lookup(key);
-		if (element != null) {
-			return (T) element.getObjectValue();
-		}
-		else {
-			this.cache.acquireWriteLockOnKey(key);
-			try {
-				element = lookup(key);  // one more attempt with the write lock
-				if (element != null) {
-					return (T) element.getObjectValue();
-				}
-				else {
-					return loadValue(key, valueLoader);
-				}
-			}
-			finally {
-				this.cache.releaseWriteLockOnKey(key);
-			}
-		}
-	}
-
-	private <T> T loadValue(Object key, Callable<T> valueLoader) {
-		T value;
-		try {
-			value = valueLoader.call();
-		}
-		catch (Throwable ex) {
-			throw new ValueRetrievalException(key, valueLoader, ex);
-		}
-		put(key, value);
-		return value;
-	}
-
-	@Override
-	public void put(Object key, @Nullable Object value) {
-		this.cache.put(new Element(key, value));
-	}
-
-	@Override
-	@Nullable
-	public ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
-		Element existingElement = this.cache.putIfAbsent(new Element(key, value));
-		return toValueWrapper(existingElement);
-	}
-
-	@Override
-	public void evict(Object key) {
-		this.cache.remove(key);
-	}
-
-	@Override
-	public boolean evictIfPresent(Object key) {
-		return this.cache.remove(key);
-	}
-
-	@Override
-	public void clear() {
-		this.cache.removeAll();
-	}
-
-	@Override
-	public boolean invalidate() {
-		boolean notEmpty = (this.cache.getSize() > 0);
-		this.cache.removeAll();
-		return notEmpty;
-	}
-
-
-	@Nullable
-	private Element lookup(Object key) {
-		return this.cache.get(key);
-	}
-
-	@Nullable
-	private ValueWrapper toValueWrapper(@Nullable Element element) {
-		return (element != null ? new SimpleValueWrapper(element.getObjectValue()) : null);
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
deleted file mode 100644
index f3e58a55b288..000000000000
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- * 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.cache.ehcache;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Status;
-
-import org.springframework.cache.Cache;
-import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManager;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * CacheManager backed by an EhCache {@link net.sf.ehcache.CacheManager}.
- *
- * @author Costin Leau
- * @author Juergen Hoeller
- * @author Stephane Nicoll
- * @since 3.1
- * @see EhCacheCache
- */
-public class EhCacheCacheManager extends AbstractTransactionSupportingCacheManager {
-
-	@Nullable
-	private net.sf.ehcache.CacheManager cacheManager;
-
-
-	/**
-	 * Create a new EhCacheCacheManager, setting the target EhCache CacheManager
-	 * through the {@link #setCacheManager} bean property.
-	 */
-	public EhCacheCacheManager() {
-	}
-
-	/**
-	 * Create a new EhCacheCacheManager for the given backing EhCache CacheManager.
-	 * @param cacheManager the backing EhCache {@link net.sf.ehcache.CacheManager}
-	 */
-	public EhCacheCacheManager(net.sf.ehcache.CacheManager cacheManager) {
-		this.cacheManager = cacheManager;
-	}
-
-
-	/**
-	 * Set the backing EhCache {@link net.sf.ehcache.CacheManager}.
-	 */
-	public void setCacheManager(@Nullable net.sf.ehcache.CacheManager cacheManager) {
-		this.cacheManager = cacheManager;
-	}
-
-	/**
-	 * Return the backing EhCache {@link net.sf.ehcache.CacheManager}.
-	 */
-	@Nullable
-	public net.sf.ehcache.CacheManager getCacheManager() {
-		return this.cacheManager;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (getCacheManager() == null) {
-			setCacheManager(EhCacheManagerUtils.buildCacheManager());
-		}
-		super.afterPropertiesSet();
-	}
-
-
-	@Override
-	protected Collection<Cache> loadCaches() {
-		net.sf.ehcache.CacheManager cacheManager = getCacheManager();
-		Assert.state(cacheManager != null, "No CacheManager set");
-
-		Status status = cacheManager.getStatus();
-		if (!Status.STATUS_ALIVE.equals(status)) {
-			throw new IllegalStateException(
-					"An 'alive' EhCache CacheManager is required - current cache is " + status.toString());
-		}
-
-		String[] names = getCacheManager().getCacheNames();
-		Collection<Cache> caches = new LinkedHashSet<>(names.length);
-		for (String name : names) {
-			caches.add(new EhCacheCache(getCacheManager().getEhcache(name)));
-		}
-		return caches;
-	}
-
-	@Override
-	protected Cache getMissingCache(String name) {
-		net.sf.ehcache.CacheManager cacheManager = getCacheManager();
-		Assert.state(cacheManager != null, "No CacheManager set");
-
-		// Check the EhCache cache again (in case the cache was added at runtime)
-		Ehcache ehcache = cacheManager.getEhcache(name);
-		if (ehcache != null) {
-			return new EhCacheCache(ehcache);
-		}
-		return null;
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
deleted file mode 100644
index 3d4f839a3b93..000000000000
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * 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.
- * 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.cache.ehcache;
-
-import java.util.Set;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.bootstrap.BootstrapCacheLoader;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.constructs.blocking.BlockingCache;
-import net.sf.ehcache.constructs.blocking.CacheEntryFactory;
-import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
-import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory;
-import net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache;
-import net.sf.ehcache.event.CacheEventListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link FactoryBean} that creates a named EhCache {@link net.sf.ehcache.Cache} instance
- * (or a decorator that implements the {@link net.sf.ehcache.Ehcache} interface),
- * representing a cache region within an EhCache {@link net.sf.ehcache.CacheManager}.
- *
- * <p>If the specified named cache is not configured in the cache configuration descriptor,
- * this FactoryBean will construct an instance of a Cache with the provided name and the
- * specified cache properties and add it to the CacheManager for later retrieval. If some
- * or all properties are not set at configuration time, this FactoryBean will use defaults.
- *
- * <p>Note: If the named Cache instance is found, the properties will be ignored and the
- * Cache instance will be retrieved from the CacheManager.
- *
- * <p>Note: As of Spring 5.0, Spring's EhCache support requires EhCache 2.10 or higher.
- *
- * @author Juergen Hoeller
- * @author Dmitriy Kopylenko
- * @since 1.1.1
- * @see #setCacheManager
- * @see EhCacheManagerFactoryBean
- * @see net.sf.ehcache.Cache
- */
-public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBean<Ehcache>, BeanNameAware, InitializingBean {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	@Nullable
-	private CacheManager cacheManager;
-
-	private boolean blocking = false;
-
-	@Nullable
-	private CacheEntryFactory cacheEntryFactory;
-
-	@Nullable
-	private BootstrapCacheLoader bootstrapCacheLoader;
-
-	@Nullable
-	private Set<CacheEventListener> cacheEventListeners;
-
-	private boolean disabled = false;
-
-	@Nullable
-	private String beanName;
-
-	@Nullable
-	private Ehcache cache;
-
-
-	public EhCacheFactoryBean() {
-		setMaxEntriesLocalHeap(10000);
-		setMaxEntriesLocalDisk(10000000);
-		setTimeToLiveSeconds(120);
-		setTimeToIdleSeconds(120);
-	}
-
-
-	/**
-	 * Set a CacheManager from which to retrieve a named Cache instance.
-	 * By default, {@code CacheManager.getInstance()} will be called.
-	 * <p>Note that in particular for persistent caches, it is advisable to
-	 * properly handle the shutdown of the CacheManager: Set up a separate
-	 * EhCacheManagerFactoryBean and pass a reference to this bean property.
-	 * <p>A separate EhCacheManagerFactoryBean is also necessary for loading
-	 * EhCache configuration from a non-default config location.
-	 * @see EhCacheManagerFactoryBean
-	 * @see net.sf.ehcache.CacheManager#getInstance
-	 */
-	public void setCacheManager(CacheManager cacheManager) {
-		this.cacheManager = cacheManager;
-	}
-
-	/**
-	 * Set a name for which to retrieve or create a cache instance.
-	 * Default is the bean name of this EhCacheFactoryBean.
-	 */
-	public void setCacheName(String cacheName) {
-		setName(cacheName);
-	}
-
-	/**
-	 * Set the time to live.
-	 * @see #setTimeToLiveSeconds(long)
-	 */
-	public void setTimeToLive(int timeToLive) {
-		setTimeToLiveSeconds(timeToLive);
-	}
-
-	/**
-	 * Set the time to idle.
-	 * @see #setTimeToIdleSeconds(long)
-	 */
-	public void setTimeToIdle(int timeToIdle) {
-		setTimeToIdleSeconds(timeToIdle);
-	}
-
-	/**
-	 * Set the disk spool buffer size (in MB).
-	 * @see #setDiskSpoolBufferSizeMB(int)
-	 */
-	public void setDiskSpoolBufferSize(int diskSpoolBufferSize) {
-		setDiskSpoolBufferSizeMB(diskSpoolBufferSize);
-	}
-
-	/**
-	 * Set whether to use a blocking cache that lets read attempts block
-	 * until the requested element is created.
-	 * <p>If you intend to build a self-populating blocking cache,
-	 * consider specifying a {@link #setCacheEntryFactory CacheEntryFactory}.
-	 * @see net.sf.ehcache.constructs.blocking.BlockingCache
-	 * @see #setCacheEntryFactory
-	 */
-	public void setBlocking(boolean blocking) {
-		this.blocking = blocking;
-	}
-
-	/**
-	 * Set an EhCache {@link net.sf.ehcache.constructs.blocking.CacheEntryFactory}
-	 * to use for a self-populating cache. If such a factory is specified,
-	 * the cache will be decorated with EhCache's
-	 * {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}.
-	 * <p>The specified factory can be of type
-	 * {@link net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory},
-	 * which will lead to the use of an
-	 * {@link net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache}.
-	 * <p>Note: Any such self-populating cache is automatically a blocking cache.
-	 * @see net.sf.ehcache.constructs.blocking.SelfPopulatingCache
-	 * @see net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache
-	 * @see net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory
-	 */
-	public void setCacheEntryFactory(CacheEntryFactory cacheEntryFactory) {
-		this.cacheEntryFactory = cacheEntryFactory;
-	}
-
-	/**
-	 * Set an EhCache {@link net.sf.ehcache.bootstrap.BootstrapCacheLoader}
-	 * for this cache, if any.
-	 */
-	public void setBootstrapCacheLoader(BootstrapCacheLoader bootstrapCacheLoader) {
-		this.bootstrapCacheLoader = bootstrapCacheLoader;
-	}
-
-	/**
-	 * Specify EhCache {@link net.sf.ehcache.event.CacheEventListener cache event listeners}
-	 * to registered with this cache.
-	 */
-	public void setCacheEventListeners(Set<CacheEventListener> cacheEventListeners) {
-		this.cacheEventListeners = cacheEventListeners;
-	}
-
-	/**
-	 * Set whether this cache should be marked as disabled.
-	 * @see net.sf.ehcache.Cache#setDisabled
-	 */
-	public void setDisabled(boolean disabled) {
-		this.disabled = disabled;
-	}
-
-	@Override
-	public void setBeanName(String name) {
-		this.beanName = name;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws CacheException {
-		// If no cache name given, use bean name as cache name.
-		String cacheName = getName();
-		if (cacheName == null) {
-			cacheName = this.beanName;
-			if (cacheName != null) {
-				setName(cacheName);
-			}
-		}
-
-		// If no CacheManager given, fetch the default.
-		if (this.cacheManager == null) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Using default EhCache CacheManager for cache region '" + cacheName + "'");
-			}
-			this.cacheManager = CacheManager.getInstance();
-		}
-
-		synchronized (this.cacheManager) {
-			// Fetch cache region: If none with the given name exists, create one on the fly.
-			Ehcache rawCache;
-			boolean cacheExists = this.cacheManager.cacheExists(cacheName);
-
-			if (cacheExists) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Using existing EhCache cache region '" + cacheName + "'");
-				}
-				rawCache = this.cacheManager.getEhcache(cacheName);
-			}
-			else {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Creating new EhCache cache region '" + cacheName + "'");
-				}
-				rawCache = createCache();
-				rawCache.setBootstrapCacheLoader(this.bootstrapCacheLoader);
-			}
-
-			if (this.cacheEventListeners != null) {
-				for (CacheEventListener listener : this.cacheEventListeners) {
-					rawCache.getCacheEventNotificationService().registerListener(listener);
-				}
-			}
-
-			// Needs to happen after listener registration but before setStatisticsEnabled
-			if (!cacheExists) {
-				this.cacheManager.addCache(rawCache);
-			}
-
-			if (this.disabled) {
-				rawCache.setDisabled(true);
-			}
-
-			Ehcache decoratedCache = decorateCache(rawCache);
-			if (decoratedCache != rawCache) {
-				this.cacheManager.replaceCacheWithDecoratedCache(rawCache, decoratedCache);
-			}
-			this.cache = decoratedCache;
-		}
-	}
-
-	/**
-	 * Create a raw Cache object based on the configuration of this FactoryBean.
-	 */
-	protected Cache createCache() {
-		return new Cache(this);
-	}
-
-	/**
-	 * Decorate the given Cache, if necessary.
-	 * @param cache the raw Cache object, based on the configuration of this FactoryBean
-	 * @return the (potentially decorated) cache object to be registered with the CacheManager
-	 */
-	protected Ehcache decorateCache(Ehcache cache) {
-		if (this.cacheEntryFactory != null) {
-			if (this.cacheEntryFactory instanceof UpdatingCacheEntryFactory) {
-				return new UpdatingSelfPopulatingCache(cache, (UpdatingCacheEntryFactory) this.cacheEntryFactory);
-			}
-			else {
-				return new SelfPopulatingCache(cache, this.cacheEntryFactory);
-			}
-		}
-		if (this.blocking) {
-			return new BlockingCache(cache);
-		}
-		return cache;
-	}
-
-
-	@Override
-	@Nullable
-	public Ehcache getObject() {
-		return this.cache;
-	}
-
-	/**
-	 * Predict the particular {@code Ehcache} implementation that will be returned from
-	 * {@link #getObject()} based on logic in {@link #createCache()} and
-	 * {@link #decorateCache(Ehcache)} as orchestrated by {@link #afterPropertiesSet()}.
-	 */
-	@Override
-	public Class<? extends Ehcache> getObjectType() {
-		if (this.cache != null) {
-			return this.cache.getClass();
-		}
-		if (this.cacheEntryFactory != null) {
-			if (this.cacheEntryFactory instanceof UpdatingCacheEntryFactory) {
-				return UpdatingSelfPopulatingCache.class;
-			}
-			else {
-				return SelfPopulatingCache.class;
-			}
-		}
-		if (this.blocking) {
-			return BlockingCache.class;
-		}
-		return Cache.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
deleted file mode 100644
index 8a7137819d31..000000000000
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
+++ /dev/null
@@ -1,199 +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.cache.ehcache;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.config.ConfigurationFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.io.Resource;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link FactoryBean} that exposes an EhCache {@link net.sf.ehcache.CacheManager}
- * instance (independent or shared), configured from a specified config location.
- *
- * <p>If no config location is specified, a CacheManager will be configured from
- * "ehcache.xml" in the root of the class path (that is, default EhCache initialization
- * - as defined in the EhCache docs - will apply).
- *
- * <p>Setting up a separate EhCacheManagerFactoryBean is also advisable when using
- * EhCacheFactoryBean, as it provides a (by default) independent CacheManager instance
- * and cares for proper shutdown of the CacheManager. EhCacheManagerFactoryBean is
- * also necessary for loading EhCache configuration from a non-default config location.
- *
- * <p>Note: As of Spring 5.0, Spring's EhCache support requires EhCache 2.10 or higher.
- *
- * @author Juergen Hoeller
- * @author Dmitriy Kopylenko
- * @since 1.1.1
- * @see #setConfigLocation
- * @see #setShared
- * @see EhCacheFactoryBean
- * @see net.sf.ehcache.CacheManager
- */
-public class EhCacheManagerFactoryBean implements FactoryBean<CacheManager>, InitializingBean, DisposableBean {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	@Nullable
-	private Resource configLocation;
-
-	@Nullable
-	private String cacheManagerName;
-
-	private boolean acceptExisting = false;
-
-	private boolean shared = false;
-
-	@Nullable
-	private CacheManager cacheManager;
-
-	private boolean locallyManaged = true;
-
-
-	/**
-	 * Set the location of the EhCache config file. A typical value is "/WEB-INF/ehcache.xml".
-	 * <p>Default is "ehcache.xml" in the root of the class path, or if not found,
-	 * "ehcache-failsafe.xml" in the EhCache jar (default EhCache initialization).
-	 * @see net.sf.ehcache.CacheManager#create(java.io.InputStream)
-	 * @see net.sf.ehcache.CacheManager#CacheManager(java.io.InputStream)
-	 */
-	public void setConfigLocation(Resource configLocation) {
-		this.configLocation = configLocation;
-	}
-
-	/**
-	 * Set the name of the EhCache CacheManager (if a specific name is desired).
-	 * @see net.sf.ehcache.config.Configuration#setName(String)
-	 */
-	public void setCacheManagerName(String cacheManagerName) {
-		this.cacheManagerName = cacheManagerName;
-	}
-
-	/**
-	 * Set whether an existing EhCache CacheManager of the same name will be accepted
-	 * for this EhCacheManagerFactoryBean setup. Default is "false".
-	 * <p>Typically used in combination with {@link #setCacheManagerName "cacheManagerName"}
-	 * but will simply work with the default CacheManager name if none specified.
-	 * All references to the same CacheManager name (or the same default) in the
-	 * same ClassLoader space will share the specified CacheManager then.
-	 * @see #setCacheManagerName
-	 * #see #setShared
-	 * @see net.sf.ehcache.CacheManager#getCacheManager(String)
-	 * @see net.sf.ehcache.CacheManager#CacheManager()
-	 */
-	public void setAcceptExisting(boolean acceptExisting) {
-		this.acceptExisting = acceptExisting;
-	}
-
-	/**
-	 * Set whether the EhCache CacheManager should be shared (as a singleton at the
-	 * ClassLoader level) or independent (typically local within the application).
-	 * Default is "false", creating an independent local instance.
-	 * <p><b>NOTE:</b> This feature allows for sharing this EhCacheManagerFactoryBean's
-	 * CacheManager with any code calling <code>CacheManager.create()</code> in the same
-	 * ClassLoader space, with no need to agree on a specific CacheManager name.
-	 * However, it only supports a single EhCacheManagerFactoryBean involved which will
-	 * control the lifecycle of the underlying CacheManager (in particular, its shutdown).
-	 * <p>This flag overrides {@link #setAcceptExisting "acceptExisting"} if both are set,
-	 * since it indicates the 'stronger' mode of sharing.
-	 * @see #setCacheManagerName
-	 * @see #setAcceptExisting
-	 * @see net.sf.ehcache.CacheManager#create()
-	 * @see net.sf.ehcache.CacheManager#CacheManager()
-	 */
-	public void setShared(boolean shared) {
-		this.shared = shared;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws CacheException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Initializing EhCache CacheManager" +
-					(this.cacheManagerName != null ? " '" + this.cacheManagerName + "'" : ""));
-		}
-
-		Configuration configuration = (this.configLocation != null ?
-				EhCacheManagerUtils.parseConfiguration(this.configLocation) : ConfigurationFactory.parseConfiguration());
-		if (this.cacheManagerName != null) {
-			configuration.setName(this.cacheManagerName);
-		}
-
-		if (this.shared) {
-			// Old-school EhCache singleton sharing...
-			// No way to find out whether we actually created a new CacheManager
-			// or just received an existing singleton reference.
-			this.cacheManager = CacheManager.create(configuration);
-		}
-		else if (this.acceptExisting) {
-			// EhCache 2.5+: Reusing an existing CacheManager of the same name.
-			// Basically the same code as in CacheManager.getInstance(String),
-			// just storing whether we're dealing with an existing instance.
-			synchronized (CacheManager.class) {
-				this.cacheManager = CacheManager.getCacheManager(this.cacheManagerName);
-				if (this.cacheManager == null) {
-					this.cacheManager = new CacheManager(configuration);
-				}
-				else {
-					this.locallyManaged = false;
-				}
-			}
-		}
-		else {
-			// Throwing an exception if a CacheManager of the same name exists already...
-			this.cacheManager = new CacheManager(configuration);
-		}
-	}
-
-
-	@Override
-	@Nullable
-	public CacheManager getObject() {
-		return this.cacheManager;
-	}
-
-	@Override
-	public Class<? extends CacheManager> getObjectType() {
-		return (this.cacheManager != null ? this.cacheManager.getClass() : CacheManager.class);
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-
-	@Override
-	public void destroy() {
-		if (this.cacheManager != null && this.locallyManaged) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Shutting down EhCache CacheManager" +
-						(this.cacheManagerName != null ? " '" + this.cacheManagerName + "'" : ""));
-			}
-			this.cacheManager.shutdown();
-		}
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerUtils.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerUtils.java
deleted file mode 100644
index 7d6654a86acd..000000000000
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerUtils.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2002-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.cache.ehcache;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.config.ConfigurationFactory;
-
-import org.springframework.core.io.Resource;
-
-/**
- * Convenient builder methods for EhCache 2.5+ {@link CacheManager} setup,
- * providing easy programmatic bootstrapping from a Spring-provided resource.
- * This is primarily intended for use within {@code @Bean} methods in a
- * Spring configuration class.
- *
- * <p>These methods are a simple alternative to custom {@link CacheManager} setup
- * code. For any advanced purposes, consider using {@link #parseConfiguration},
- * customizing the configuration object, and then calling the
- * {@link CacheManager#CacheManager(Configuration)} constructor.
- *
- * @author Juergen Hoeller
- * @since 4.1
- */
-public abstract class EhCacheManagerUtils {
-
-	/**
-	 * Build an EhCache {@link CacheManager} from the default configuration.
-	 * <p>The CacheManager will be configured from "ehcache.xml" in the root of the class path
-	 * (that is, default EhCache initialization - as defined in the EhCache docs - will apply).
-	 * If no configuration file can be found, a fail-safe fallback configuration will be used.
-	 * @return the new EhCache CacheManager
-	 * @throws CacheException in case of configuration parsing failure
-	 */
-	public static CacheManager buildCacheManager() throws CacheException {
-		return new CacheManager(ConfigurationFactory.parseConfiguration());
-	}
-
-	/**
-	 * Build an EhCache {@link CacheManager} from the default configuration.
-	 * <p>The CacheManager will be configured from "ehcache.xml" in the root of the class path
-	 * (that is, default EhCache initialization - as defined in the EhCache docs - will apply).
-	 * If no configuration file can be found, a fail-safe fallback configuration will be used.
-	 * @param name the desired name of the cache manager
-	 * @return the new EhCache CacheManager
-	 * @throws CacheException in case of configuration parsing failure
-	 */
-	public static CacheManager buildCacheManager(String name) throws CacheException {
-		Configuration configuration = ConfigurationFactory.parseConfiguration();
-		configuration.setName(name);
-		return new CacheManager(configuration);
-	}
-
-	/**
-	 * Build an EhCache {@link CacheManager} from the given configuration resource.
-	 * @param configLocation the location of the configuration file (as a Spring resource)
-	 * @return the new EhCache CacheManager
-	 * @throws CacheException in case of configuration parsing failure
-	 */
-	public static CacheManager buildCacheManager(Resource configLocation) throws CacheException {
-		return new CacheManager(parseConfiguration(configLocation));
-	}
-
-	/**
-	 * Build an EhCache {@link CacheManager} from the given configuration resource.
-	 * @param name the desired name of the cache manager
-	 * @param configLocation the location of the configuration file (as a Spring resource)
-	 * @return the new EhCache CacheManager
-	 * @throws CacheException in case of configuration parsing failure
-	 */
-	public static CacheManager buildCacheManager(String name, Resource configLocation) throws CacheException {
-		Configuration configuration = parseConfiguration(configLocation);
-		configuration.setName(name);
-		return new CacheManager(configuration);
-	}
-
-	/**
-	 * Parse EhCache configuration from the given resource, for further use with
-	 * custom {@link CacheManager} creation.
-	 * @param configLocation the location of the configuration file (as a Spring resource)
-	 * @return the EhCache Configuration handle
-	 * @throws CacheException in case of configuration parsing failure
-	 * @see CacheManager#CacheManager(Configuration)
-	 * @see CacheManager#create(Configuration)
-	 */
-	public static Configuration parseConfiguration(Resource configLocation) throws CacheException {
-		InputStream is = null;
-		try {
-			is = configLocation.getInputStream();
-			return ConfigurationFactory.parseConfiguration(is);
-		}
-		catch (IOException ex) {
-			throw new CacheException("Failed to parse EhCache configuration resource", ex);
-		}
-		finally {
-			if (is != null) {
-				try {
-					is.close();
-				}
-				catch (IOException ex) {
-					// ignore
-				}
-			}
-		}
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
deleted file mode 100644
index d786a802512f..000000000000
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Support classes for the open source cache
- * <a href="https://www.ehcache.org/">EhCache 2.x</a>,
- * allowing to set up an EhCache CacheManager and Caches
- * as beans in a Spring context.
- *
- * <p>Note: EhCache 3.x lives in a different package namespace
- * and is not covered by the traditional support classes here.
- * Instead, consider using it through JCache (JSR-107), with
- * Spring's support in {@code org.springframework.cache.jcache}.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.cache.ehcache;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
index 693082c840c2..af7f0417f29b 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
@@ -104,7 +104,7 @@ public MailSendException(Map<Object, Exception> failedMessages) {
 	 * be available after serialization as well.
 	 * @return the Map of failed messages as keys and thrown exceptions as values
 	 * @see SimpleMailMessage
-	 * @see javax.mail.internet.MimeMessage
+	 * @see jakarta.mail.internet.MimeMessage
 	 */
 	public final Map<Object, Exception> getFailedMessages() {
 		return this.failedMessages;
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
index ff6921b37183..7fe0a9aca896 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
@@ -20,8 +20,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.activation.FileTypeMap;
-import javax.activation.MimetypesFileTypeMap;
+import jakarta.activation.FileTypeMap;
+import jakarta.activation.MimetypesFileTypeMap;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.ClassPathResource;
@@ -58,7 +58,7 @@
  * @since 1.2
  * @see #setMappingLocation
  * @see #setMappings
- * @see javax.activation.MimetypesFileTypeMap
+ * @see jakarta.activation.MimetypesFileTypeMap
  */
 public class ConfigurableMimeFileTypeMap extends FileTypeMap implements InitializingBean {
 
@@ -140,8 +140,8 @@ protected final FileTypeMap getFileTypeMap() {
 	 * @param mappings an array of MIME type mapping lines (can be {@code null})
 	 * @return the compiled FileTypeMap
 	 * @throws IOException if resource access failed
-	 * @see javax.activation.MimetypesFileTypeMap#MimetypesFileTypeMap(java.io.InputStream)
-	 * @see javax.activation.MimetypesFileTypeMap#addMimeTypes(String)
+	 * @see jakarta.activation.MimetypesFileTypeMap#MimetypesFileTypeMap(java.io.InputStream)
+	 * @see jakarta.activation.MimetypesFileTypeMap#addMimeTypes(String)
 	 */
 	protected FileTypeMap createFileTypeMap(@Nullable Resource mappingLocation, @Nullable String[] mappings) throws IOException {
 		MimetypesFileTypeMap fileTypeMap = null;
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
index 7738328c563f..c4981581ebd3 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
@@ -18,8 +18,8 @@
 
 import java.beans.PropertyEditorSupport;
 
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
 
 import org.springframework.util.StringUtils;
 
@@ -32,7 +32,7 @@
  *
  * @author Juergen Hoeller
  * @since 1.2.3
- * @see javax.mail.internet.InternetAddress
+ * @see jakarta.mail.internet.InternetAddress
  */
 public class InternetAddressEditor extends PropertyEditorSupport {
 
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
index f810be606dd8..61f4ecb01d77 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
@@ -18,7 +18,7 @@
 
 import java.io.InputStream;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 import org.springframework.mail.MailException;
 import org.springframework.mail.MailSender;
@@ -40,7 +40,7 @@
  * mechanism, possibly using a {@link MimeMessageHelper} for populating the message.
  * See {@link MimeMessageHelper MimeMessageHelper's javadoc} for an example.
  *
- * <p>The entire JavaMail {@link javax.mail.Session} management is abstracted
+ * <p>The entire JavaMail {@link jakarta.mail.Session} management is abstracted
  * by the JavaMailSender. Client code should not deal with a Session in any way,
  * rather leave the entire JavaMail configuration and resource handling to the
  * JavaMailSender implementation. This also increases testability.
@@ -54,8 +54,8 @@
  *
  * @author Juergen Hoeller
  * @since 07.10.2003
- * @see javax.mail.internet.MimeMessage
- * @see javax.mail.Session
+ * @see jakarta.mail.internet.MimeMessage
+ * @see jakarta.mail.Session
  * @see JavaMailSenderImpl
  * @see MimeMessagePreparator
  * @see MimeMessageHelper
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
index 9286d0ef665a..e13f61dcf438 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
@@ -24,14 +24,14 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.activation.FileTypeMap;
-import javax.mail.Address;
-import javax.mail.AuthenticationFailedException;
-import javax.mail.MessagingException;
-import javax.mail.NoSuchProviderException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.MimeMessage;
+import jakarta.activation.FileTypeMap;
+import jakarta.mail.Address;
+import jakarta.mail.AuthenticationFailedException;
+import jakarta.mail.MessagingException;
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.MimeMessage;
 
 import org.springframework.lang.Nullable;
 import org.springframework.mail.MailAuthenticationException;
@@ -49,7 +49,7 @@
  * plain {@link org.springframework.mail.MailSender} implementation.
  *
  * <p>Allows for defining all settings locally as bean properties.
- * Alternatively, a pre-configured JavaMail {@link javax.mail.Session} can be
+ * Alternatively, a pre-configured JavaMail {@link jakarta.mail.Session} can be
  * specified, possibly pulled from an application server's JNDI environment.
  *
  * <p>Non-default properties in this object will always override the settings
@@ -59,8 +59,8 @@
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
  * @since 10.09.2003
- * @see javax.mail.internet.MimeMessage
- * @see javax.mail.Session
+ * @see jakarta.mail.internet.MimeMessage
+ * @see jakarta.mail.Session
  * @see #setSession
  * @see #setJavaMailProperties
  * @see #setHost
@@ -523,7 +523,7 @@ protected Transport connectTransport() throws MessagingException {
 	 * Obtain a Transport object from the given JavaMail Session,
 	 * using the configured protocol.
 	 * <p>Can be overridden in subclasses, e.g. to return a mock Transport object.
-	 * @see javax.mail.Session#getTransport(String)
+	 * @see jakarta.mail.Session#getTransport(String)
 	 * @see #getSession()
 	 * @see #getProtocol()
 	 */
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
index e62690a6d763..9161ea69d7ae 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
@@ -18,8 +18,8 @@
 
 import java.util.Date;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 
 import org.springframework.mail.MailMessage;
 import org.springframework.mail.MailParseException;
@@ -35,7 +35,7 @@
  * @author Juergen Hoeller
  * @since 1.1.5
  * @see MimeMessageHelper
- * @see javax.mail.internet.MimeMessage
+ * @see jakarta.mail.internet.MimeMessage
  */
 public class MimeMailMessage implements MailMessage {
 
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index f795390fa24d..0bf5c1bba6ca 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -23,20 +23,20 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.activation.FileTypeMap;
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimePart;
-import javax.mail.internet.MimeUtility;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
+import jakarta.activation.FileTypeMap;
+import jakarta.mail.BodyPart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
+import jakarta.mail.internet.MimePart;
+import jakarta.mail.internet.MimeUtility;
 
 import org.springframework.core.io.InputStreamSource;
 import org.springframework.core.io.Resource;
@@ -44,7 +44,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Helper class for populating a {@link javax.mail.internet.MimeMessage}.
+ * Helper class for populating a {@link jakarta.mail.internet.MimeMessage}.
  *
  * <p>Mirrors the simple setters of {@link org.springframework.mail.SimpleMailMessage},
  * directly applying the values to the underlying MimeMessage. Allows for defining
@@ -186,8 +186,8 @@ public class MimeMessageHelper {
 	 * the passed-in MimeMessage object, if carried there. Else,
 	 * JavaMail's default encoding will be used.
 	 * @param mimeMessage the mime message to work on
-	 * @see #MimeMessageHelper(javax.mail.internet.MimeMessage, boolean)
-	 * @see #getDefaultEncoding(javax.mail.internet.MimeMessage)
+	 * @see #MimeMessageHelper(jakarta.mail.internet.MimeMessage, boolean)
+	 * @see #getDefaultEncoding(jakarta.mail.internet.MimeMessage)
 	 * @see JavaMailSenderImpl#setDefaultEncoding
 	 */
 	public MimeMessageHelper(MimeMessage mimeMessage) {
@@ -200,7 +200,7 @@ public MimeMessageHelper(MimeMessage mimeMessage) {
 	 * i.e. no alternative texts and no inline elements or attachments).
 	 * @param mimeMessage the mime message to work on
 	 * @param encoding the character encoding to use for the message
-	 * @see #MimeMessageHelper(javax.mail.internet.MimeMessage, boolean)
+	 * @see #MimeMessageHelper(jakarta.mail.internet.MimeMessage, boolean)
 	 */
 	public MimeMessageHelper(MimeMessage mimeMessage, @Nullable String encoding) {
 		this.mimeMessage = mimeMessage;
@@ -223,8 +223,8 @@ public MimeMessageHelper(MimeMessage mimeMessage, @Nullable String encoding) {
 	 * supports alternative texts, inline elements and attachments
 	 * (corresponds to MULTIPART_MODE_MIXED_RELATED)
 	 * @throws MessagingException if multipart creation failed
-	 * @see #MimeMessageHelper(javax.mail.internet.MimeMessage, int)
-	 * @see #getDefaultEncoding(javax.mail.internet.MimeMessage)
+	 * @see #MimeMessageHelper(jakarta.mail.internet.MimeMessage, int)
+	 * @see #getDefaultEncoding(jakarta.mail.internet.MimeMessage)
 	 * @see JavaMailSenderImpl#setDefaultEncoding
 	 */
 	public MimeMessageHelper(MimeMessage mimeMessage, boolean multipart) throws MessagingException {
@@ -244,7 +244,7 @@ public MimeMessageHelper(MimeMessage mimeMessage, boolean multipart) throws Mess
 	 * (corresponds to MULTIPART_MODE_MIXED_RELATED)
 	 * @param encoding the character encoding to use for the message
 	 * @throws MessagingException if multipart creation failed
-	 * @see #MimeMessageHelper(javax.mail.internet.MimeMessage, int, String)
+	 * @see #MimeMessageHelper(jakarta.mail.internet.MimeMessage, int, String)
 	 */
 	public MimeMessageHelper(MimeMessage mimeMessage, boolean multipart, @Nullable String encoding)
 			throws MessagingException {
@@ -267,7 +267,7 @@ public MimeMessageHelper(MimeMessage mimeMessage, boolean multipart, @Nullable S
 	 * @see #MULTIPART_MODE_MIXED
 	 * @see #MULTIPART_MODE_RELATED
 	 * @see #MULTIPART_MODE_MIXED_RELATED
-	 * @see #getDefaultEncoding(javax.mail.internet.MimeMessage)
+	 * @see #getDefaultEncoding(jakarta.mail.internet.MimeMessage)
 	 * @see JavaMailSenderImpl#setDefaultEncoding
 	 */
 	public MimeMessageHelper(MimeMessage mimeMessage, int multipartMode) throws MessagingException {
@@ -388,7 +388,7 @@ public final boolean isMultipart() {
 	 * @throws IllegalStateException if this helper is not in multipart mode
 	 * @see #isMultipart
 	 * @see #getMimeMessage
-	 * @see javax.mail.internet.MimeMultipart#addBodyPart
+	 * @see jakarta.mail.internet.MimeMultipart#addBodyPart
 	 */
 	public final MimeMultipart getRootMimeMultipart() throws IllegalStateException {
 		if (this.rootMimeMultipart == null) {
@@ -407,7 +407,7 @@ public final MimeMultipart getRootMimeMultipart() throws IllegalStateException {
 	 * @throws IllegalStateException if this helper is not in multipart mode
 	 * @see #isMultipart
 	 * @see #getRootMimeMultipart
-	 * @see javax.mail.internet.MimeMultipart#addBodyPart
+	 * @see jakarta.mail.internet.MimeMultipart#addBodyPart
 	 */
 	public final MimeMultipart getMimeMultipart() throws IllegalStateException {
 		if (this.mimeMultipart == null) {
@@ -469,9 +469,9 @@ protected FileTypeMap getDefaultFileTypeMap(MimeMessage mimeMessage) {
 	 * {@code FileTypeMap} instance else.
 	 * @see #addInline
 	 * @see #addAttachment
-	 * @see #getDefaultFileTypeMap(javax.mail.internet.MimeMessage)
+	 * @see #getDefaultFileTypeMap(jakarta.mail.internet.MimeMessage)
 	 * @see JavaMailSenderImpl#setDefaultFileTypeMap
-	 * @see javax.activation.FileTypeMap#getDefaultFileTypeMap
+	 * @see jakarta.activation.FileTypeMap#getDefaultFileTypeMap
 	 * @see ConfigurableMimeFileTypeMap
 	 */
 	public void setFileTypeMap(@Nullable FileTypeMap fileTypeMap) {
@@ -538,7 +538,7 @@ public boolean isValidateAddresses() {
 	 * @param address the address to validate
 	 * @throws AddressException if validation failed
 	 * @see #isValidateAddresses()
-	 * @see javax.mail.internet.InternetAddress#validate()
+	 * @see jakarta.mail.internet.InternetAddress#validate()
 	 */
 	protected void validateAddress(InternetAddress address) throws AddressException {
 		if (isValidateAddresses()) {
@@ -889,7 +889,7 @@ private void setHtmlTextToMimePart(MimePart mimePart, String text) throws Messag
 
 	/**
 	 * Add an inline element to the MimeMessage, taking the content from a
-	 * {@code javax.activation.DataSource}.
+	 * {@code jakarta.activation.DataSource}.
 	 * <p>Note that the InputStream returned by the DataSource implementation
 	 * needs to be a <i>fresh one on each call</i>, as JavaMail will invoke
 	 * {@code getInputStream()} multiple times.
@@ -898,7 +898,7 @@ private void setHtmlTextToMimePart(MimePart mimePart, String text) throws Messag
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
 	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
-	 * @param dataSource the {@code javax.activation.DataSource} to take
+	 * @param dataSource the {@code jakarta.activation.DataSource} to take
 	 * the content from, determining the InputStream and the content type
 	 * @throws MessagingException in case of errors
 	 * @see #addInline(String, java.io.File)
@@ -929,7 +929,7 @@ public void addInline(String contentId, DataSource dataSource) throws MessagingE
 	 * @throws MessagingException in case of errors
 	 * @see #setText
 	 * @see #addInline(String, org.springframework.core.io.Resource)
-	 * @see #addInline(String, javax.activation.DataSource)
+	 * @see #addInline(String, jakarta.activation.DataSource)
 	 */
 	public void addInline(String contentId, File file) throws MessagingException {
 		Assert.notNull(file, "File must not be null");
@@ -956,7 +956,7 @@ public void addInline(String contentId, File file) throws MessagingException {
 	 * @throws MessagingException in case of errors
 	 * @see #setText
 	 * @see #addInline(String, java.io.File)
-	 * @see #addInline(String, javax.activation.DataSource)
+	 * @see #addInline(String, jakarta.activation.DataSource)
 	 */
 	public void addInline(String contentId, Resource resource) throws MessagingException {
 		Assert.notNull(resource, "Resource must not be null");
@@ -984,7 +984,7 @@ public void addInline(String contentId, Resource resource) throws MessagingExcep
 	 * @see #setText
 	 * @see #getFileTypeMap
 	 * @see #addInline(String, org.springframework.core.io.Resource)
-	 * @see #addInline(String, javax.activation.DataSource)
+	 * @see #addInline(String, jakarta.activation.DataSource)
 	 */
 	public void addInline(String contentId, InputStreamSource inputStreamSource, String contentType)
 			throws MessagingException {
@@ -1001,13 +1001,13 @@ public void addInline(String contentId, InputStreamSource inputStreamSource, Str
 
 	/**
 	 * Add an attachment to the MimeMessage, taking the content from a
-	 * {@code javax.activation.DataSource}.
+	 * {@code jakarta.activation.DataSource}.
 	 * <p>Note that the InputStream returned by the DataSource implementation
 	 * needs to be a <i>fresh one on each call</i>, as JavaMail will invoke
 	 * {@code getInputStream()} multiple times.
 	 * @param attachmentFilename the name of the attachment as it will
 	 * appear in the mail (the content type will be determined by this)
-	 * @param dataSource the {@code javax.activation.DataSource} to take
+	 * @param dataSource the {@code jakarta.activation.DataSource} to take
 	 * the content from, determining the InputStream and the content type
 	 * @throws MessagingException in case of errors
 	 * @see #addAttachment(String, org.springframework.core.io.InputStreamSource)
@@ -1040,7 +1040,7 @@ public void addAttachment(String attachmentFilename, DataSource dataSource) thro
 	 * @param file the File resource to take the content from
 	 * @throws MessagingException in case of errors
 	 * @see #addAttachment(String, org.springframework.core.io.InputStreamSource)
-	 * @see #addAttachment(String, javax.activation.DataSource)
+	 * @see #addAttachment(String, jakarta.activation.DataSource)
 	 */
 	public void addAttachment(String attachmentFilename, File file) throws MessagingException {
 		Assert.notNull(file, "File must not be null");
@@ -1064,7 +1064,7 @@ public void addAttachment(String attachmentFilename, File file) throws Messaging
 	 * (all of Spring's Resource implementations can be passed in here)
 	 * @throws MessagingException in case of errors
 	 * @see #addAttachment(String, java.io.File)
-	 * @see #addAttachment(String, javax.activation.DataSource)
+	 * @see #addAttachment(String, jakarta.activation.DataSource)
 	 * @see org.springframework.core.io.Resource
 	 */
 	public void addAttachment(String attachmentFilename, InputStreamSource inputStreamSource)
@@ -1087,7 +1087,7 @@ public void addAttachment(String attachmentFilename, InputStreamSource inputStre
 	 * @param contentType the content type to use for the element
 	 * @throws MessagingException in case of errors
 	 * @see #addAttachment(String, java.io.File)
-	 * @see #addAttachment(String, javax.activation.DataSource)
+	 * @see #addAttachment(String, jakarta.activation.DataSource)
 	 * @see org.springframework.core.io.Resource
 	 */
 	public void addAttachment(
@@ -1121,7 +1121,7 @@ public InputStream getInputStream() throws IOException {
 			}
 			@Override
 			public OutputStream getOutputStream() {
-				throw new UnsupportedOperationException("Read-only javax.activation.DataSource");
+				throw new UnsupportedOperationException("Read-only jakarta.activation.DataSource");
 			}
 			@Override
 			public String getContentType() {
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
index 5973d17104b6..04e6cc34cd29 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
@@ -16,7 +16,7 @@
 
 package org.springframework.mail.javamail;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 /**
  * Callback interface for the preparation of JavaMail MIME messages.
@@ -42,7 +42,7 @@ public interface MimeMessagePreparator {
 	/**
 	 * Prepare the given new MimeMessage instance.
 	 * @param mimeMessage the message to prepare
-	 * @throws javax.mail.MessagingException passing any exceptions thrown by MimeMessage
+	 * @throws jakarta.mail.MessagingException passing any exceptions thrown by MimeMessage
 	 * methods through for automatic conversion to the MailException hierarchy
 	 * @throws java.io.IOException passing any exceptions thrown by MimeMessage methods
 	 * through for automatic conversion to the MailException hierarchy
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
index 2fa44c910af9..e41d4a226558 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
@@ -16,9 +16,9 @@
 
 package org.springframework.mail.javamail;
 
-import javax.activation.FileTypeMap;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.activation.FileTypeMap;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 
 import org.springframework.lang.Nullable;
 
@@ -34,8 +34,8 @@
  * @author Juergen Hoeller
  * @since 1.2
  * @see JavaMailSenderImpl#createMimeMessage()
- * @see MimeMessageHelper#getDefaultEncoding(javax.mail.internet.MimeMessage)
- * @see MimeMessageHelper#getDefaultFileTypeMap(javax.mail.internet.MimeMessage)
+ * @see MimeMessageHelper#getDefaultEncoding(jakarta.mail.internet.MimeMessage)
+ * @see MimeMessageHelper#getDefaultFileTypeMap(jakarta.mail.internet.MimeMessage)
  */
 class SmartMimeMessage extends MimeMessage {
 
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
deleted file mode 100644
index d6d493e1cac1..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- * 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.scheduling.commonj;
-
-import commonj.timers.Timer;
-import commonj.timers.TimerListener;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple TimerListener adapter that delegates to a given Runnable.
- *
- * @author Juergen Hoeller
- * @since 2.0
- * @see commonj.timers.TimerListener
- * @see java.lang.Runnable
- * @deprecated as of 5.1, in favor of EE 7's
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler}
- */
-@Deprecated
-public class DelegatingTimerListener implements TimerListener {
-
-	private final Runnable runnable;
-
-
-	/**
-	 * Create a new DelegatingTimerListener.
-	 * @param runnable the Runnable implementation to delegate to
-	 */
-	public DelegatingTimerListener(Runnable runnable) {
-		Assert.notNull(runnable, "Runnable is required");
-		this.runnable = runnable;
-	}
-
-
-	/**
-	 * Delegates execution to the underlying Runnable.
-	 */
-	@Override
-	public void timerExpired(Timer timer) {
-		this.runnable.run();
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
deleted file mode 100644
index 9f7eb9110ae8..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- * 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.scheduling.commonj;
-
-import commonj.work.Work;
-
-import org.springframework.scheduling.SchedulingAwareRunnable;
-import org.springframework.util.Assert;
-
-/**
- * Simple Work adapter that delegates to a given Runnable.
- *
- * @author Juergen Hoeller
- * @since 2.0
- * @deprecated as of 5.1, in favor of EE 7's
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskExecutor}
- */
-@Deprecated
-public class DelegatingWork implements Work {
-
-	private final Runnable delegate;
-
-
-	/**
-	 * Create a new DelegatingWork.
-	 * @param delegate the Runnable implementation to delegate to
-	 * (may be a SchedulingAwareRunnable for extended support)
-	 * @see org.springframework.scheduling.SchedulingAwareRunnable
-	 * @see #isDaemon()
-	 */
-	public DelegatingWork(Runnable delegate) {
-		Assert.notNull(delegate, "Delegate must not be null");
-		this.delegate = delegate;
-	}
-
-	/**
-	 * Return the wrapped Runnable implementation.
-	 */
-	public final Runnable getDelegate() {
-		return this.delegate;
-	}
-
-
-	/**
-	 * Delegates execution to the underlying Runnable.
-	 */
-	@Override
-	public void run() {
-		this.delegate.run();
-	}
-
-	/**
-	 * This implementation delegates to
-	 * {@link org.springframework.scheduling.SchedulingAwareRunnable#isLongLived()},
-	 * if available.
-	 */
-	@Override
-	public boolean isDaemon() {
-		return (this.delegate instanceof SchedulingAwareRunnable &&
-				((SchedulingAwareRunnable) this.delegate).isLongLived());
-	}
-
-	/**
-	 * This implementation is empty, since we expect the Runnable
-	 * to terminate based on some specific shutdown signal.
-	 */
-	@Override
-	public void release() {
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
deleted file mode 100644
index 52ca0afe1265..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * 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.
- * 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.scheduling.commonj;
-
-import commonj.timers.TimerListener;
-
-import org.springframework.lang.Nullable;
-
-/**
- * JavaBean that describes a scheduled TimerListener, consisting of
- * the TimerListener itself (or a Runnable to create a TimerListener for)
- * and a delay plus period. Period needs to be specified;
- * there is no point in a default for it.
- *
- * <p>The CommonJ TimerManager does not offer more sophisticated scheduling
- * options such as cron expressions. Consider using Quartz for such
- * advanced needs.
- *
- * <p>Note that the TimerManager uses a TimerListener instance that is
- * shared between repeated executions, in contrast to Quartz which
- * instantiates a new Job for each execution.
- *
- * @author Juergen Hoeller
- * @since 2.0
- * @deprecated as of 5.1, in favor of EE 7's
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler}
- */
-@Deprecated
-public class ScheduledTimerListener {
-
-	@Nullable
-	private TimerListener timerListener;
-
-	private long delay = 0;
-
-	private long period = -1;
-
-	private boolean fixedRate = false;
-
-
-	/**
-	 * Create a new ScheduledTimerListener,
-	 * to be populated via bean properties.
-	 * @see #setTimerListener
-	 * @see #setDelay
-	 * @see #setPeriod
-	 * @see #setFixedRate
-	 */
-	public ScheduledTimerListener() {
-	}
-
-	/**
-	 * Create a new ScheduledTimerListener, with default
-	 * one-time execution without delay.
-	 * @param timerListener the TimerListener to schedule
-	 */
-	public ScheduledTimerListener(TimerListener timerListener) {
-		this.timerListener = timerListener;
-	}
-
-	/**
-	 * Create a new ScheduledTimerListener, with default
-	 * one-time execution with the given delay.
-	 * @param timerListener the TimerListener to schedule
-	 * @param delay the delay before starting the task for the first time (ms)
-	 */
-	public ScheduledTimerListener(TimerListener timerListener, long delay) {
-		this.timerListener = timerListener;
-		this.delay = delay;
-	}
-
-	/**
-	 * Create a new ScheduledTimerListener.
-	 * @param timerListener the TimerListener to schedule
-	 * @param delay the delay before starting the task for the first time (ms)
-	 * @param period the period between repeated task executions (ms)
-	 * @param fixedRate whether to schedule as fixed-rate execution
-	 */
-	public ScheduledTimerListener(TimerListener timerListener, long delay, long period, boolean fixedRate) {
-		this.timerListener = timerListener;
-		this.delay = delay;
-		this.period = period;
-		this.fixedRate = fixedRate;
-	}
-
-	/**
-	 * Create a new ScheduledTimerListener, with default
-	 * one-time execution without delay.
-	 * @param timerTask the Runnable to schedule as TimerListener
-	 */
-	public ScheduledTimerListener(Runnable timerTask) {
-		setRunnable(timerTask);
-	}
-
-	/**
-	 * Create a new ScheduledTimerListener, with default
-	 * one-time execution with the given delay.
-	 * @param timerTask the Runnable to schedule as TimerListener
-	 * @param delay the delay before starting the task for the first time (ms)
-	 */
-	public ScheduledTimerListener(Runnable timerTask, long delay) {
-		setRunnable(timerTask);
-		this.delay = delay;
-	}
-
-	/**
-	 * Create a new ScheduledTimerListener.
-	 * @param timerTask the Runnable to schedule as TimerListener
-	 * @param delay the delay before starting the task for the first time (ms)
-	 * @param period the period between repeated task executions (ms)
-	 * @param fixedRate whether to schedule as fixed-rate execution
-	 */
-	public ScheduledTimerListener(Runnable timerTask, long delay, long period, boolean fixedRate) {
-		setRunnable(timerTask);
-		this.delay = delay;
-		this.period = period;
-		this.fixedRate = fixedRate;
-	}
-
-
-	/**
-	 * Set the Runnable to schedule as TimerListener.
-	 * @see DelegatingTimerListener
-	 */
-	public void setRunnable(Runnable timerTask) {
-		this.timerListener = new DelegatingTimerListener(timerTask);
-	}
-
-	/**
-	 * Set the TimerListener to schedule.
-	 */
-	public void setTimerListener(@Nullable TimerListener timerListener) {
-		this.timerListener = timerListener;
-	}
-
-	/**
-	 * Return the TimerListener to schedule.
-	 */
-	@Nullable
-	public TimerListener getTimerListener() {
-		return this.timerListener;
-	}
-
-	/**
-	 * Set the delay before starting the task for the first time,
-	 * in milliseconds. Default is 0, immediately starting the
-	 * task after successful scheduling.
-	 * <p>If the "firstTime" property is specified, this property will be ignored.
-	 * Specify one or the other, not both.
-	 */
-	public void setDelay(long delay) {
-		this.delay = delay;
-	}
-
-	/**
-	 * Return the delay before starting the job for the first time.
-	 */
-	public long getDelay() {
-		return this.delay;
-	}
-
-	/**
-	 * Set the period between repeated task executions, in milliseconds.
-	 * <p>Default is -1, leading to one-time execution. In case of zero or a
-	 * positive value, the task will be executed repeatedly, with the given
-	 * interval in-between executions.
-	 * <p>Note that the semantics of the period value vary between fixed-rate
-	 * and fixed-delay execution.
-	 * <p><b>Note:</b> A period of 0 (for example as fixed delay) <i>is</i>
-	 * supported, because the CommonJ specification defines this as a legal value.
-	 * Hence a value of 0 will result in immediate re-execution after a job has
-	 * finished (not in one-time execution like with {@code java.util.Timer}).
-	 * @see #setFixedRate
-	 * @see #isOneTimeTask()
-	 * @see commonj.timers.TimerManager#schedule(commonj.timers.TimerListener, long, long)
-	 */
-	public void setPeriod(long period) {
-		this.period = period;
-	}
-
-	/**
-	 * Return the period between repeated task executions.
-	 */
-	public long getPeriod() {
-		return this.period;
-	}
-
-	/**
-	 * Is this task only ever going to execute once?
-	 * @return {@code true} if this task is only ever going to execute once
-	 * @see #getPeriod()
-	 */
-	public boolean isOneTimeTask() {
-		return (this.period < 0);
-	}
-
-	/**
-	 * Set whether to schedule as fixed-rate execution, rather than
-	 * fixed-delay execution. Default is "false", i.e. fixed delay.
-	 * <p>See TimerManager javadoc for details on those execution modes.
-	 * @see commonj.timers.TimerManager#schedule(commonj.timers.TimerListener, long, long)
-	 * @see commonj.timers.TimerManager#scheduleAtFixedRate(commonj.timers.TimerListener, long, long)
-	 */
-	public void setFixedRate(boolean fixedRate) {
-		this.fixedRate = fixedRate;
-	}
-
-	/**
-	 * Return whether to schedule as fixed-rate execution.
-	 */
-	public boolean isFixedRate() {
-		return this.fixedRate;
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
deleted file mode 100644
index b5c0e15a068c..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * 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.
- * 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.scheduling.commonj;
-
-import javax.naming.NamingException;
-
-import commonj.timers.TimerManager;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.Lifecycle;
-import org.springframework.jndi.JndiLocatorSupport;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Base class for classes that are accessing a CommonJ {@link commonj.timers.TimerManager}
- * Defines common configuration settings and common lifecycle handling.
- *
- * @author Juergen Hoeller
- * @since 3.0
- * @see commonj.timers.TimerManager
- * @deprecated as of 5.1, in favor of EE 7's
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler}
- */
-@Deprecated
-public abstract class TimerManagerAccessor extends JndiLocatorSupport
-		implements InitializingBean, DisposableBean, Lifecycle {
-
-	@Nullable
-	private TimerManager timerManager;
-
-	@Nullable
-	private String timerManagerName;
-
-	private boolean shared = false;
-
-
-	/**
-	 * Specify the CommonJ TimerManager to delegate to.
-	 * <p>Note that the given TimerManager's lifecycle will be managed
-	 * by this FactoryBean.
-	 * <p>Alternatively (and typically), you can specify the JNDI name
-	 * of the target TimerManager.
-	 * @see #setTimerManagerName
-	 */
-	public void setTimerManager(TimerManager timerManager) {
-		this.timerManager = timerManager;
-	}
-
-	/**
-	 * Set the JNDI name of the CommonJ TimerManager.
-	 * <p>This can either be a fully qualified JNDI name, or the JNDI name relative
-	 * to the current environment naming context if "resourceRef" is set to "true".
-	 * @see #setTimerManager
-	 * @see #setResourceRef
-	 */
-	public void setTimerManagerName(String timerManagerName) {
-		this.timerManagerName = timerManagerName;
-	}
-
-	/**
-	 * Specify whether the TimerManager obtained by this FactoryBean
-	 * is a shared instance ("true") or an independent instance ("false").
-	 * The lifecycle of the former is supposed to be managed by the application
-	 * server, while the lifecycle of the latter is up to the application.
-	 * <p>Default is "false", i.e. managing an independent TimerManager instance.
-	 * This is what the CommonJ specification suggests that application servers
-	 * are supposed to offer via JNDI lookups, typically declared as a
-	 * {@code resource-ref} of type {@code commonj.timers.TimerManager}
-	 * in {@code web.xml}, with {@code res-sharing-scope} set to 'Unshareable'.
-	 * <p>Switch this flag to "true" if you are obtaining a shared TimerManager,
-	 * typically through specifying the JNDI location of a TimerManager that
-	 * has been explicitly declared as 'Shareable'. Note that WebLogic's
-	 * cluster-aware Job Scheduler is a shared TimerManager too.
-	 * <p>The sole difference between this FactoryBean being in shared or
-	 * non-shared mode is that it will only attempt to suspend / resume / stop
-	 * the underlying TimerManager in case of an independent (non-shared) instance.
-	 * This only affects the {@link org.springframework.context.Lifecycle} support
-	 * as well as application context shutdown.
-	 * @see #stop()
-	 * @see #start()
-	 * @see #destroy()
-	 * @see commonj.timers.TimerManager
-	 */
-	public void setShared(boolean shared) {
-		this.shared = shared;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		if (this.timerManager == null) {
-			if (this.timerManagerName == null) {
-				throw new IllegalArgumentException("Either 'timerManager' or 'timerManagerName' must be specified");
-			}
-			this.timerManager = lookup(this.timerManagerName, TimerManager.class);
-		}
-	}
-
-	/**
-	 * Return the configured TimerManager, if any.
-	 * @return the TimerManager, or {@code null} if not available
-	 */
-	@Nullable
-	protected final TimerManager getTimerManager() {
-		return this.timerManager;
-	}
-
-	/**
-	 * Obtain the TimerManager for actual use.
-	 * @return the TimerManager (never {@code null})
-	 * @throws IllegalStateException in case of no TimerManager set
-	 * @since 5.0
-	 */
-	protected TimerManager obtainTimerManager() {
-		Assert.notNull(this.timerManager, "No TimerManager set");
-		return this.timerManager;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Implementation of Lifecycle interface
-	//---------------------------------------------------------------------
-
-	/**
-	 * Resumes the underlying TimerManager (if not shared).
-	 * @see commonj.timers.TimerManager#resume()
-	 */
-	@Override
-	public void start() {
-		if (!this.shared) {
-			obtainTimerManager().resume();
-		}
-	}
-
-	/**
-	 * Suspends the underlying TimerManager (if not shared).
-	 * @see commonj.timers.TimerManager#suspend()
-	 */
-	@Override
-	public void stop() {
-		if (!this.shared) {
-			obtainTimerManager().suspend();
-		}
-	}
-
-	/**
-	 * Considers the underlying TimerManager as running if it is
-	 * neither suspending nor stopping.
-	 * @see commonj.timers.TimerManager#isSuspending()
-	 * @see commonj.timers.TimerManager#isStopping()
-	 */
-	@Override
-	public boolean isRunning() {
-		TimerManager tm = obtainTimerManager();
-		return (!tm.isSuspending() && !tm.isStopping());
-	}
-
-
-	//---------------------------------------------------------------------
-	// Implementation of DisposableBean interface
-	//---------------------------------------------------------------------
-
-	/**
-	 * Stops the underlying TimerManager (if not shared).
-	 * @see commonj.timers.TimerManager#stop()
-	 */
-	@Override
-	public void destroy() {
-		// Stop the entire TimerManager, if necessary.
-		if (this.timerManager != null && !this.shared) {
-			// May return early, but at least we already cancelled all known Timers.
-			this.timerManager.stop();
-		}
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
deleted file mode 100644
index 1d6db6c820fb..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.
- * 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.scheduling.commonj;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.naming.NamingException;
-
-import commonj.timers.Timer;
-import commonj.timers.TimerManager;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.Lifecycle;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link org.springframework.beans.factory.FactoryBean} that retrieves a
- * CommonJ {@link commonj.timers.TimerManager} and exposes it for bean references.
- *
- * <p><b>This is the central convenience class for setting up a
- * CommonJ TimerManager in a Spring context.</b>
- *
- * <p>Allows for registration of ScheduledTimerListeners. This is the main
- * purpose of this class; the TimerManager itself could also be fetched
- * from JNDI via {@link org.springframework.jndi.JndiObjectFactoryBean}.
- * In scenarios that just require static registration of tasks at startup,
- * there is no need to access the TimerManager itself in application code.
- *
- * <p>Note that the TimerManager uses a TimerListener instance that is
- * shared between repeated executions, in contrast to Quartz which
- * instantiates a new Job for each execution.
- *
- * @author Juergen Hoeller
- * @since 2.0
- * @see ScheduledTimerListener
- * @see commonj.timers.TimerManager
- * @see commonj.timers.TimerListener
- * @deprecated as of 5.1, in favor of EE 7's
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler}
- */
-@Deprecated
-public class TimerManagerFactoryBean extends TimerManagerAccessor
-		implements FactoryBean<TimerManager>, InitializingBean, DisposableBean, Lifecycle {
-
-	@Nullable
-	private ScheduledTimerListener[] scheduledTimerListeners;
-
-	@Nullable
-	private List<Timer> timers;
-
-
-	/**
-	 * Register a list of ScheduledTimerListener objects with the TimerManager
-	 * that this FactoryBean creates. Depending on each ScheduledTimerListener's settings,
-	 * it will be registered via one of TimerManager's schedule methods.
-	 * @see commonj.timers.TimerManager#schedule(commonj.timers.TimerListener, long)
-	 * @see commonj.timers.TimerManager#schedule(commonj.timers.TimerListener, long, long)
-	 * @see commonj.timers.TimerManager#scheduleAtFixedRate(commonj.timers.TimerListener, long, long)
-	 */
-	public void setScheduledTimerListeners(ScheduledTimerListener[] scheduledTimerListeners) {
-		this.scheduledTimerListeners = scheduledTimerListeners;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Implementation of InitializingBean interface
-	//---------------------------------------------------------------------
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		super.afterPropertiesSet();
-
-		if (this.scheduledTimerListeners != null) {
-			this.timers = new ArrayList<>(this.scheduledTimerListeners.length);
-			TimerManager timerManager = obtainTimerManager();
-			for (ScheduledTimerListener scheduledTask : this.scheduledTimerListeners) {
-				Timer timer;
-				if (scheduledTask.isOneTimeTask()) {
-					timer = timerManager.schedule(scheduledTask.getTimerListener(), scheduledTask.getDelay());
-				}
-				else {
-					if (scheduledTask.isFixedRate()) {
-						timer = timerManager.scheduleAtFixedRate(
-								scheduledTask.getTimerListener(), scheduledTask.getDelay(), scheduledTask.getPeriod());
-					}
-					else {
-						timer = timerManager.schedule(
-								scheduledTask.getTimerListener(), scheduledTask.getDelay(), scheduledTask.getPeriod());
-					}
-				}
-				this.timers.add(timer);
-			}
-		}
-	}
-
-
-	//---------------------------------------------------------------------
-	// Implementation of FactoryBean interface
-	//---------------------------------------------------------------------
-
-	@Override
-	@Nullable
-	public TimerManager getObject() {
-		return getTimerManager();
-	}
-
-	@Override
-	public Class<? extends TimerManager> getObjectType() {
-		TimerManager timerManager = getTimerManager();
-		return (timerManager != null ? timerManager.getClass() : TimerManager.class);
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Implementation of DisposableBean interface
-	//---------------------------------------------------------------------
-
-	/**
-	 * Cancels all statically registered Timers on shutdown,
-	 * and stops the underlying TimerManager (if not shared).
-	 * @see commonj.timers.Timer#cancel()
-	 * @see commonj.timers.TimerManager#stop()
-	 */
-	@Override
-	public void destroy() {
-		// Cancel all registered timers.
-		if (this.timers != null) {
-			for (Timer timer : this.timers) {
-				try {
-					timer.cancel();
-				}
-				catch (Throwable ex) {
-					logger.debug("Could not cancel CommonJ Timer", ex);
-				}
-			}
-			this.timers.clear();
-		}
-
-		// Stop the TimerManager itself.
-		super.destroy();
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
deleted file mode 100644
index 97ea5b86a81d..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * 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.
- * 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.scheduling.commonj;
-
-import java.util.Date;
-import java.util.concurrent.Delayed;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import commonj.timers.Timer;
-import commonj.timers.TimerListener;
-
-import org.springframework.lang.Nullable;
-import org.springframework.scheduling.TaskScheduler;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.support.SimpleTriggerContext;
-import org.springframework.scheduling.support.TaskUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.ErrorHandler;
-
-/**
- * Implementation of Spring's {@link TaskScheduler} interface, wrapping
- * a CommonJ {@link commonj.timers.TimerManager}.
- *
- * @author Juergen Hoeller
- * @author Mark Fisher
- * @since 3.0
- * @deprecated as of 5.1, in favor of EE 7's
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler}
- */
-@Deprecated
-public class TimerManagerTaskScheduler extends TimerManagerAccessor implements TaskScheduler {
-
-	@Nullable
-	private volatile ErrorHandler errorHandler;
-
-
-	/**
-	 * Provide an {@link ErrorHandler} strategy.
-	 */
-	public void setErrorHandler(ErrorHandler errorHandler) {
-		this.errorHandler = errorHandler;
-	}
-
-
-	@Override
-	@Nullable
-	public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {
-		return new ReschedulingTimerListener(errorHandlingTask(task, true), trigger).schedule();
-	}
-
-	@Override
-	public ScheduledFuture<?> schedule(Runnable task, Date startTime) {
-		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, false));
-		Timer timer = obtainTimerManager().schedule(futureTask, startTime);
-		futureTask.setTimer(timer);
-		return futureTask;
-	}
-
-	@Override
-	public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, Date startTime, long period) {
-		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
-		Timer timer = obtainTimerManager().scheduleAtFixedRate(futureTask, startTime, period);
-		futureTask.setTimer(timer);
-		return futureTask;
-	}
-
-	@Override
-	public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long period) {
-		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
-		Timer timer = obtainTimerManager().scheduleAtFixedRate(futureTask, 0, period);
-		futureTask.setTimer(timer);
-		return futureTask;
-	}
-
-	@Override
-	public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, Date startTime, long delay) {
-		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
-		Timer timer = obtainTimerManager().schedule(futureTask, startTime, delay);
-		futureTask.setTimer(timer);
-		return futureTask;
-	}
-
-	@Override
-	public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long delay) {
-		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
-		Timer timer = obtainTimerManager().schedule(futureTask, 0, delay);
-		futureTask.setTimer(timer);
-		return futureTask;
-	}
-
-	private Runnable errorHandlingTask(Runnable delegate, boolean isRepeatingTask) {
-		return TaskUtils.decorateTaskWithErrorHandler(delegate, this.errorHandler, isRepeatingTask);
-	}
-
-
-	/**
-	 * ScheduledFuture adapter that wraps a CommonJ Timer.
-	 */
-	private static class TimerScheduledFuture extends FutureTask<Object> implements TimerListener, ScheduledFuture<Object> {
-
-		@Nullable
-		protected transient Timer timer;
-
-		protected transient boolean cancelled = false;
-
-		public TimerScheduledFuture(Runnable runnable) {
-			super(runnable, null);
-		}
-
-		public void setTimer(Timer timer) {
-			this.timer = timer;
-		}
-
-		@Override
-		public void timerExpired(Timer timer) {
-			runAndReset();
-		}
-
-		@Override
-		public boolean cancel(boolean mayInterruptIfRunning) {
-			boolean result = super.cancel(mayInterruptIfRunning);
-			if (this.timer != null) {
-				this.timer.cancel();
-			}
-			this.cancelled = true;
-			return result;
-		}
-
-		@Override
-		public long getDelay(TimeUnit unit) {
-			Assert.state(this.timer != null, "No Timer available");
-			return unit.convert(this.timer.getScheduledExecutionTime() - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
-		}
-
-		@Override
-		public int compareTo(Delayed other) {
-			if (this == other) {
-				return 0;
-			}
-			long diff = getDelay(TimeUnit.MILLISECONDS) - other.getDelay(TimeUnit.MILLISECONDS);
-			return (diff == 0 ? 0 : ((diff < 0) ? -1 : 1));
-		}
-	}
-
-
-	/**
-	 * ScheduledFuture adapter for trigger-based rescheduling.
-	 */
-	private class ReschedulingTimerListener extends TimerScheduledFuture {
-
-		private final Trigger trigger;
-
-		private final SimpleTriggerContext triggerContext = new SimpleTriggerContext();
-
-		private volatile Date scheduledExecutionTime = new Date();
-
-		public ReschedulingTimerListener(Runnable runnable, Trigger trigger) {
-			super(runnable);
-			this.trigger = trigger;
-		}
-
-		@Nullable
-		public ScheduledFuture<?> schedule() {
-			Date nextExecutionTime = this.trigger.nextExecutionTime(this.triggerContext);
-			if (nextExecutionTime == null) {
-				return null;
-			}
-			this.scheduledExecutionTime = nextExecutionTime;
-			setTimer(obtainTimerManager().schedule(this, this.scheduledExecutionTime));
-			return this;
-		}
-
-		@Override
-		public void timerExpired(Timer timer) {
-			Date actualExecutionTime = new Date();
-			super.timerExpired(timer);
-			Date completionTime = new Date();
-			this.triggerContext.update(this.scheduledExecutionTime, actualExecutionTime, completionTime);
-			if (!this.cancelled) {
-				schedule();
-			}
-		}
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
deleted file mode 100644
index a9adcc823d5a..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * 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.
- * 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.scheduling.commonj;
-
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-
-import javax.naming.NamingException;
-
-import commonj.work.Work;
-import commonj.work.WorkException;
-import commonj.work.WorkItem;
-import commonj.work.WorkListener;
-import commonj.work.WorkManager;
-import commonj.work.WorkRejectedException;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.core.task.TaskDecorator;
-import org.springframework.core.task.TaskRejectedException;
-import org.springframework.jndi.JndiLocatorSupport;
-import org.springframework.lang.Nullable;
-import org.springframework.scheduling.SchedulingException;
-import org.springframework.scheduling.SchedulingTaskExecutor;
-import org.springframework.util.Assert;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureTask;
-
-/**
- * TaskExecutor implementation that delegates to a CommonJ WorkManager,
- * implementing the {@link commonj.work.WorkManager} interface,
- * which either needs to be specified as reference or through the JNDI name.
- *
- * <p><b>This is the central convenience class for setting up a
- * CommonJ WorkManager in a Spring context.</b>
- *
- * <p>Also implements the CommonJ WorkManager interface itself, delegating all
- * calls to the target WorkManager. Hence, a caller can choose whether it wants
- * to talk to this executor through the Spring TaskExecutor interface or the
- * CommonJ WorkManager interface.
- *
- * <p>The CommonJ WorkManager will usually be retrieved from the application
- * server's JNDI environment, as defined in the server's management console.
- *
- * <p>Note: On EE 7/8 compliant versions of WebLogic and WebSphere, a
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskExecutor}
- * should be preferred, following JSR-236 support in Java EE 7/8.
- *
- * @author Juergen Hoeller
- * @since 2.0
- * @deprecated as of 5.1, in favor of the EE 7/8 based
- * {@link org.springframework.scheduling.concurrent.DefaultManagedTaskExecutor}
- */
-@Deprecated
-public class WorkManagerTaskExecutor extends JndiLocatorSupport
-		implements AsyncListenableTaskExecutor, SchedulingTaskExecutor, WorkManager, InitializingBean {
-
-	@Nullable
-	private WorkManager workManager;
-
-	@Nullable
-	private String workManagerName;
-
-	@Nullable
-	private WorkListener workListener;
-
-	@Nullable
-	private TaskDecorator taskDecorator;
-
-
-	/**
-	 * Specify the CommonJ WorkManager to delegate to.
-	 * <p>Alternatively, you can also specify the JNDI name of the target WorkManager.
-	 * @see #setWorkManagerName
-	 */
-	public void setWorkManager(WorkManager workManager) {
-		this.workManager = workManager;
-	}
-
-	/**
-	 * Set the JNDI name of the CommonJ WorkManager.
-	 * <p>This can either be a fully qualified JNDI name, or the JNDI name relative
-	 * to the current environment naming context if "resourceRef" is set to "true".
-	 * @see #setWorkManager
-	 * @see #setResourceRef
-	 */
-	public void setWorkManagerName(String workManagerName) {
-		this.workManagerName = workManagerName;
-	}
-
-	/**
-	 * Specify a CommonJ WorkListener to apply, if any.
-	 * <p>This shared WorkListener instance will be passed on to the
-	 * WorkManager by all {@link #execute} calls on this TaskExecutor.
-	 */
-	public void setWorkListener(WorkListener workListener) {
-		this.workListener = workListener;
-	}
-
-	/**
-	 * Specify a custom {@link TaskDecorator} to be applied to any {@link Runnable}
-	 * about to be executed.
-	 * <p>Note that such a decorator is not necessarily being applied to the
-	 * user-supplied {@code Runnable}/{@code Callable} but rather to the actual
-	 * execution callback (which may be a wrapper around the user-supplied task).
-	 * <p>The primary use case is to set some execution context around the task's
-	 * invocation, or to provide some monitoring/statistics for task execution.
-	 * <p><b>NOTE:</b> Exception handling in {@code TaskDecorator} implementations
-	 * is limited to plain {@code Runnable} execution via {@code execute} calls.
-	 * In case of {@code #submit} calls, the exposed {@code Runnable} will be a
-	 * {@code FutureTask} which does not propagate any exceptions; you might
-	 * have to cast it and call {@code Future#get} to evaluate exceptions.
-	 * @since 4.3
-	 */
-	public void setTaskDecorator(TaskDecorator taskDecorator) {
-		this.taskDecorator = taskDecorator;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		if (this.workManager == null) {
-			if (this.workManagerName == null) {
-				throw new IllegalArgumentException("Either 'workManager' or 'workManagerName' must be specified");
-			}
-			this.workManager = lookup(this.workManagerName, WorkManager.class);
-		}
-	}
-
-	private WorkManager obtainWorkManager() {
-		Assert.state(this.workManager != null, "No WorkManager specified");
-		return this.workManager;
-	}
-
-
-	//-------------------------------------------------------------------------
-	// Implementation of the Spring SchedulingTaskExecutor interface
-	//-------------------------------------------------------------------------
-
-	@Override
-	public void execute(Runnable task) {
-		Work work = new DelegatingWork(this.taskDecorator != null ? this.taskDecorator.decorate(task) : task);
-		try {
-			if (this.workListener != null) {
-				obtainWorkManager().schedule(work, this.workListener);
-			}
-			else {
-				obtainWorkManager().schedule(work);
-			}
-		}
-		catch (WorkRejectedException ex) {
-			throw new TaskRejectedException("CommonJ WorkManager did not accept task: " + task, ex);
-		}
-		catch (WorkException ex) {
-			throw new SchedulingException("Could not schedule task on CommonJ WorkManager", ex);
-		}
-	}
-
-	@Override
-	public void execute(Runnable task, long startTimeout) {
-		execute(task);
-	}
-
-	@Override
-	public Future<?> submit(Runnable task) {
-		FutureTask<Object> future = new FutureTask<>(task, null);
-		execute(future);
-		return future;
-	}
-
-	@Override
-	public <T> Future<T> submit(Callable<T> task) {
-		FutureTask<T> future = new FutureTask<>(task);
-		execute(future);
-		return future;
-	}
-
-	@Override
-	public ListenableFuture<?> submitListenable(Runnable task) {
-		ListenableFutureTask<Object> future = new ListenableFutureTask<>(task, null);
-		execute(future);
-		return future;
-	}
-
-	@Override
-	public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
-		ListenableFutureTask<T> future = new ListenableFutureTask<>(task);
-		execute(future);
-		return future;
-	}
-
-
-	//-------------------------------------------------------------------------
-	// Implementation of the CommonJ WorkManager interface
-	//-------------------------------------------------------------------------
-
-	@Override
-	public WorkItem schedule(Work work) throws WorkException, IllegalArgumentException {
-		return obtainWorkManager().schedule(work);
-	}
-
-	@Override
-	public WorkItem schedule(Work work, WorkListener workListener) throws WorkException {
-		return obtainWorkManager().schedule(work, workListener);
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public boolean waitForAll(Collection workItems, long timeout) throws InterruptedException {
-		return obtainWorkManager().waitForAll(workItems, timeout);
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Collection waitForAny(Collection workItems, long timeout) throws InterruptedException {
-		return obtainWorkManager().waitForAny(workItems, timeout);
-	}
-
-}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
deleted file mode 100644
index ca0fbead6816..000000000000
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Convenience classes for scheduling based on the CommonJ WorkManager/TimerManager
- * facility, as supported by IBM WebSphere 6.0+ and BEA WebLogic 9.0+.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.scheduling.commonj;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheManagerTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheManagerTests.java
deleted file mode 100644
index fd33777c4bbf..000000000000
--- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheManagerTests.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- * 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.cache.ehcache;
-
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.Configuration;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-
-import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManagerTests;
-
-/**
- * @author Stephane Nicoll
- */
-public class EhCacheCacheManagerTests extends AbstractTransactionSupportingCacheManagerTests<EhCacheCacheManager> {
-
-	private CacheManager nativeCacheManager;
-
-	private EhCacheCacheManager cacheManager;
-
-	private EhCacheCacheManager transactionalCacheManager;
-
-
-	@BeforeEach
-	public void setup() {
-		nativeCacheManager = new CacheManager(new Configuration().name("EhCacheCacheManagerTests")
-				.defaultCache(new CacheConfiguration("default", 100)));
-		addNativeCache(CACHE_NAME);
-
-		cacheManager = new EhCacheCacheManager(nativeCacheManager);
-		cacheManager.setTransactionAware(false);
-		cacheManager.afterPropertiesSet();
-
-		transactionalCacheManager = new EhCacheCacheManager(nativeCacheManager);
-		transactionalCacheManager.setTransactionAware(true);
-		transactionalCacheManager.afterPropertiesSet();
-	}
-
-	@AfterEach
-	public void shutdown() {
-		nativeCacheManager.shutdown();
-	}
-
-
-	@Override
-	protected EhCacheCacheManager getCacheManager(boolean transactionAware) {
-		if (transactionAware) {
-			return transactionalCacheManager;
-		}
-		else {
-			return cacheManager;
-		}
-	}
-
-	@Override
-	protected Class<? extends org.springframework.cache.Cache> getCacheType() {
-		return EhCacheCache.class;
-	}
-
-	@Override
-	protected void addNativeCache(String cacheName) {
-		nativeCacheManager.addCache(cacheName);
-	}
-
-	@Override
-	protected void removeNativeCache(String cacheName) {
-		nativeCacheManager.removeCache(cacheName);
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
deleted file mode 100644
index b9bb1cc8542a..000000000000
--- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.
- * 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.cache.ehcache;
-
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.config.Configuration;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.context.testfixture.cache.AbstractCacheTests;
-import org.springframework.core.testfixture.EnabledForTestGroups;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING;
-
-/**
- * @author Costin Leau
- * @author Stephane Nicoll
- * @author Juergen Hoeller
- */
-public class EhCacheCacheTests extends AbstractCacheTests<EhCacheCache> {
-
-	private CacheManager cacheManager;
-
-	private Ehcache nativeCache;
-
-	private EhCacheCache cache;
-
-
-	@BeforeEach
-	public void setup() {
-		cacheManager = new CacheManager(new Configuration().name("EhCacheCacheTests")
-				.defaultCache(new CacheConfiguration("default", 100)));
-		nativeCache = new net.sf.ehcache.Cache(new CacheConfiguration(CACHE_NAME, 100));
-		cacheManager.addCache(nativeCache);
-
-		cache = new EhCacheCache(nativeCache);
-	}
-
-	@AfterEach
-	public void shutdown() {
-		cacheManager.shutdown();
-	}
-
-
-	@Override
-	protected EhCacheCache getCache() {
-		return cache;
-	}
-
-	@Override
-	protected Ehcache getNativeCache() {
-		return nativeCache;
-	}
-
-
-	@Test
-	@EnabledForTestGroups(LONG_RUNNING)
-	public void testExpiredElements() throws Exception {
-		String key = "brancusi";
-		String value = "constantin";
-		Element brancusi = new Element(key, value);
-		// ttl = 10s
-		brancusi.setTimeToLive(3);
-		nativeCache.put(brancusi);
-
-		assertThat(cache.get(key).get()).isEqualTo(value);
-		// wait for the entry to expire
-		Thread.sleep(5 * 1000);
-		assertThat(cache.get(key)).isNull();
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
deleted file mode 100644
index c663b0fba335..000000000000
--- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * 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.
- * 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.cache.ehcache;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.config.CacheConfiguration;
-import net.sf.ehcache.constructs.blocking.BlockingCache;
-import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
-import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory;
-import net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.io.ClassPathResource;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * @author Juergen Hoeller
- * @author Dmitriy Kopylenko
- * @since 27.09.2004
- */
-public class EhCacheSupportTests {
-
-	@Test
-	public void testBlankCacheManager() {
-		EhCacheManagerFactoryBean cacheManagerFb = new EhCacheManagerFactoryBean();
-		cacheManagerFb.setCacheManagerName("myCacheManager");
-		assertThat(cacheManagerFb.getObjectType()).isEqualTo(CacheManager.class);
-		assertThat(cacheManagerFb.isSingleton()).as("Singleton property").isTrue();
-		cacheManagerFb.afterPropertiesSet();
-		try {
-			CacheManager cm = cacheManagerFb.getObject();
-			assertThat(cm.getCacheNames().length == 0).as("Loaded CacheManager with no caches").isTrue();
-			Cache myCache1 = cm.getCache("myCache1");
-			assertThat(myCache1 == null).as("No myCache1 defined").isTrue();
-		}
-		finally {
-			cacheManagerFb.destroy();
-		}
-	}
-
-	@Test
-	public void testCacheManagerConflict() {
-		EhCacheManagerFactoryBean cacheManagerFb = new EhCacheManagerFactoryBean();
-		try {
-			cacheManagerFb.setCacheManagerName("myCacheManager");
-			assertThat(cacheManagerFb.getObjectType()).isEqualTo(CacheManager.class);
-			assertThat(cacheManagerFb.isSingleton()).as("Singleton property").isTrue();
-			cacheManagerFb.afterPropertiesSet();
-			CacheManager cm = cacheManagerFb.getObject();
-			assertThat(cm.getCacheNames().length == 0).as("Loaded CacheManager with no caches").isTrue();
-			Cache myCache1 = cm.getCache("myCache1");
-			assertThat(myCache1 == null).as("No myCache1 defined").isTrue();
-
-			EhCacheManagerFactoryBean cacheManagerFb2 = new EhCacheManagerFactoryBean();
-			cacheManagerFb2.setCacheManagerName("myCacheManager");
-			assertThatExceptionOfType(CacheException.class).as("because of naming conflict").isThrownBy(
-					cacheManagerFb2::afterPropertiesSet);
-		}
-		finally {
-			cacheManagerFb.destroy();
-		}
-	}
-
-	@Test
-	public void testAcceptExistingCacheManager() {
-		EhCacheManagerFactoryBean cacheManagerFb = new EhCacheManagerFactoryBean();
-		cacheManagerFb.setCacheManagerName("myCacheManager");
-		assertThat(cacheManagerFb.getObjectType()).isEqualTo(CacheManager.class);
-		assertThat(cacheManagerFb.isSingleton()).as("Singleton property").isTrue();
-		cacheManagerFb.afterPropertiesSet();
-		try {
-			CacheManager cm = cacheManagerFb.getObject();
-			assertThat(cm.getCacheNames().length == 0).as("Loaded CacheManager with no caches").isTrue();
-			Cache myCache1 = cm.getCache("myCache1");
-			assertThat(myCache1 == null).as("No myCache1 defined").isTrue();
-
-			EhCacheManagerFactoryBean cacheManagerFb2 = new EhCacheManagerFactoryBean();
-			cacheManagerFb2.setCacheManagerName("myCacheManager");
-			cacheManagerFb2.setAcceptExisting(true);
-			cacheManagerFb2.afterPropertiesSet();
-			CacheManager cm2 = cacheManagerFb2.getObject();
-			assertThat(cm2).isSameAs(cm);
-			cacheManagerFb2.destroy();
-		}
-		finally {
-			cacheManagerFb.destroy();
-		}
-	}
-
-	public void testCacheManagerFromConfigFile() {
-		EhCacheManagerFactoryBean cacheManagerFb = new EhCacheManagerFactoryBean();
-		cacheManagerFb.setConfigLocation(new ClassPathResource("testEhcache.xml", getClass()));
-		cacheManagerFb.setCacheManagerName("myCacheManager");
-		cacheManagerFb.afterPropertiesSet();
-		try {
-			CacheManager cm = cacheManagerFb.getObject();
-			assertThat(cm.getCacheNames().length == 1).as("Correct number of caches loaded").isTrue();
-			Cache myCache1 = cm.getCache("myCache1");
-			assertThat(myCache1.getCacheConfiguration().isEternal()).as("myCache1 is not eternal").isFalse();
-			assertThat(myCache1.getCacheConfiguration().getMaxEntriesLocalHeap() == 300).as("myCache1.maxElements == 300").isTrue();
-		}
-		finally {
-			cacheManagerFb.destroy();
-		}
-	}
-
-	@Test
-	public void testEhCacheFactoryBeanWithDefaultCacheManager() {
-		doTestEhCacheFactoryBean(false);
-	}
-
-	@Test
-	public void testEhCacheFactoryBeanWithExplicitCacheManager() {
-		doTestEhCacheFactoryBean(true);
-	}
-
-	private void doTestEhCacheFactoryBean(boolean useCacheManagerFb) {
-		Cache cache;
-		EhCacheManagerFactoryBean cacheManagerFb = null;
-		boolean cacheManagerFbInitialized = false;
-		try {
-			EhCacheFactoryBean cacheFb = new EhCacheFactoryBean();
-			Class<? extends Ehcache> objectType = cacheFb.getObjectType();
-			assertThat(Ehcache.class.isAssignableFrom(objectType)).isTrue();
-			assertThat(cacheFb.isSingleton()).as("Singleton property").isTrue();
-			if (useCacheManagerFb) {
-				cacheManagerFb = new EhCacheManagerFactoryBean();
-				cacheManagerFb.setConfigLocation(new ClassPathResource("testEhcache.xml", getClass()));
-				cacheManagerFb.setCacheManagerName("cache");
-				cacheManagerFb.afterPropertiesSet();
-				cacheManagerFbInitialized = true;
-				cacheFb.setCacheManager(cacheManagerFb.getObject());
-			}
-
-			cacheFb.setCacheName("myCache1");
-			cacheFb.afterPropertiesSet();
-			cache = (Cache) cacheFb.getObject();
-			Class<? extends Ehcache> objectType2 = cacheFb.getObjectType();
-			assertThat(objectType2).isSameAs(objectType);
-			CacheConfiguration config = cache.getCacheConfiguration();
-			assertThat(cache.getName()).isEqualTo("myCache1");
-			if (useCacheManagerFb){
-				assertThat(config.getMaxEntriesLocalHeap()).as("myCache1.maxElements").isEqualTo(300);
-			}
-			else {
-				assertThat(config.getMaxEntriesLocalHeap()).as("myCache1.maxElements").isEqualTo(10000);
-			}
-
-			// Cache region is not defined. Should create one with default properties.
-			cacheFb = new EhCacheFactoryBean();
-			if (useCacheManagerFb) {
-				cacheFb.setCacheManager(cacheManagerFb.getObject());
-			}
-			cacheFb.setCacheName("undefinedCache");
-			cacheFb.afterPropertiesSet();
-			cache = (Cache) cacheFb.getObject();
-			config = cache.getCacheConfiguration();
-			assertThat(cache.getName()).isEqualTo("undefinedCache");
-			assertThat(config.getMaxEntriesLocalHeap() == 10000).as("default maxElements is correct").isTrue();
-			assertThat(config.isEternal()).as("default eternal is correct").isFalse();
-			assertThat(config.getTimeToLiveSeconds() == 120).as("default timeToLive is correct").isTrue();
-			assertThat(config.getTimeToIdleSeconds() == 120).as("default timeToIdle is correct").isTrue();
-			assertThat(config.getDiskExpiryThreadIntervalSeconds() == 120).as("default diskExpiryThreadIntervalSeconds is correct").isTrue();
-
-			// overriding the default properties
-			cacheFb = new EhCacheFactoryBean();
-			if (useCacheManagerFb) {
-				cacheFb.setCacheManager(cacheManagerFb.getObject());
-			}
-			cacheFb.setBeanName("undefinedCache2");
-			cacheFb.setMaxEntriesLocalHeap(5);
-			cacheFb.setTimeToLive(8);
-			cacheFb.setTimeToIdle(7);
-			cacheFb.setDiskExpiryThreadIntervalSeconds(10);
-			cacheFb.afterPropertiesSet();
-			cache = (Cache) cacheFb.getObject();
-			config = cache.getCacheConfiguration();
-
-			assertThat(cache.getName()).isEqualTo("undefinedCache2");
-			assertThat(config.getMaxEntriesLocalHeap() == 5).as("overridden maxElements is correct").isTrue();
-			assertThat(config.getTimeToLiveSeconds() == 8).as("default timeToLive is correct").isTrue();
-			assertThat(config.getTimeToIdleSeconds() == 7).as("default timeToIdle is correct").isTrue();
-			assertThat(config.getDiskExpiryThreadIntervalSeconds() == 10).as("overridden diskExpiryThreadIntervalSeconds is correct").isTrue();
-		}
-		finally {
-			if (cacheManagerFbInitialized) {
-				cacheManagerFb.destroy();
-			}
-			else {
-				CacheManager.getInstance().shutdown();
-			}
-		}
-	}
-
-	@Test
-	public void testEhCacheFactoryBeanWithBlockingCache() {
-		EhCacheManagerFactoryBean cacheManagerFb = new EhCacheManagerFactoryBean();
-		cacheManagerFb.afterPropertiesSet();
-		try {
-			CacheManager cm = cacheManagerFb.getObject();
-			EhCacheFactoryBean cacheFb = new EhCacheFactoryBean();
-			cacheFb.setCacheManager(cm);
-			cacheFb.setCacheName("myCache1");
-			cacheFb.setBlocking(true);
-			assertThat(BlockingCache.class).isEqualTo(cacheFb.getObjectType());
-			cacheFb.afterPropertiesSet();
-			Ehcache myCache1 = cm.getEhcache("myCache1");
-			boolean condition = myCache1 instanceof BlockingCache;
-			assertThat(condition).isTrue();
-		}
-		finally {
-			cacheManagerFb.destroy();
-		}
-	}
-
-	@Test
-	public void testEhCacheFactoryBeanWithSelfPopulatingCache() {
-		EhCacheManagerFactoryBean cacheManagerFb = new EhCacheManagerFactoryBean();
-		cacheManagerFb.afterPropertiesSet();
-		try {
-			CacheManager cm = cacheManagerFb.getObject();
-			EhCacheFactoryBean cacheFb = new EhCacheFactoryBean();
-			cacheFb.setCacheManager(cm);
-			cacheFb.setCacheName("myCache1");
-			cacheFb.setCacheEntryFactory(key -> key);
-			assertThat(SelfPopulatingCache.class).isEqualTo(cacheFb.getObjectType());
-			cacheFb.afterPropertiesSet();
-			Ehcache myCache1 = cm.getEhcache("myCache1");
-			boolean condition = myCache1 instanceof SelfPopulatingCache;
-			assertThat(condition).isTrue();
-			assertThat(myCache1.get("myKey1").getObjectValue()).isEqualTo("myKey1");
-		}
-		finally {
-			cacheManagerFb.destroy();
-		}
-	}
-
-	@Test
-	public void testEhCacheFactoryBeanWithUpdatingSelfPopulatingCache() {
-		EhCacheManagerFactoryBean cacheManagerFb = new EhCacheManagerFactoryBean();
-		cacheManagerFb.afterPropertiesSet();
-		try {
-			CacheManager cm = cacheManagerFb.getObject();
-			EhCacheFactoryBean cacheFb = new EhCacheFactoryBean();
-			cacheFb.setCacheManager(cm);
-			cacheFb.setCacheName("myCache1");
-			cacheFb.setCacheEntryFactory(new UpdatingCacheEntryFactory() {
-				@Override
-				public Object createEntry(Object key) {
-					return key;
-				}
-				@Override
-				public void updateEntryValue(Object key, Object value) {
-				}
-			});
-			assertThat(UpdatingSelfPopulatingCache.class).isEqualTo(cacheFb.getObjectType());
-			cacheFb.afterPropertiesSet();
-			Ehcache myCache1 = cm.getEhcache("myCache1");
-			boolean condition = myCache1 instanceof UpdatingSelfPopulatingCache;
-			assertThat(condition).isTrue();
-			assertThat(myCache1.get("myKey1").getObjectValue()).isEqualTo("myKey1");
-		}
-		finally {
-			cacheManagerFb.destroy();
-		}
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java
deleted file mode 100644
index 105e4e620995..000000000000
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- * 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.cache.jcache;
-
-import javax.cache.Caching;
-import javax.cache.spi.CachingProvider;
-
-/**
- * Just here to be run against EHCache 3, whereas the original JCacheEhCacheAnnotationTests
- * runs against EhCache 2.x with the EhCache-JCache add-on.
- *
- * @author Juergen Hoeller
- */
-public class JCacheEhCache3AnnotationTests extends JCacheEhCacheAnnotationTests {
-
-	@Override
-	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider("org.ehcache.jsr107.EhcacheCachingProvider");
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java
deleted file mode 100644
index 32a2585c9f85..000000000000
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCache3ApiTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- * 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.cache.jcache;
-
-import javax.cache.Caching;
-import javax.cache.spi.CachingProvider;
-
-/**
- * Just here to be run against EHCache 3, whereas the original JCacheEhCacheAnnotationTests
- * runs against EhCache 2.x with the EhCache-JCache add-on.
- *
- * @author Stephane Nicoll
- */
-public class JCacheEhCache3ApiTests extends JCacheEhCacheApiTests {
-
-	@Override
-	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider("org.ehcache.jsr107.EhcacheCachingProvider");
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
index 188cc293c974..88a6ba2cf481 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
@@ -64,7 +64,7 @@ protected ConfigurableApplicationContext getApplicationContext() {
 	}
 
 	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");
+		return Caching.getCachingProvider("org.ehcache.jsr107.EhcacheCachingProvider");
 	}
 
 	@AfterEach
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
index b826e2a3fb37..3f56f2e06c5a 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
@@ -54,7 +54,7 @@ public void setup() {
 	}
 
 	protected CachingProvider getCachingProvider() {
-		return Caching.getCachingProvider("org.ehcache.jcache.JCacheCachingProvider");
+		return Caching.getCachingProvider("org.ehcache.jsr107.EhcacheCachingProvider");
 	}
 
 	@AfterEach
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
index 3bd467b9106e..d400341aae43 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
+++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
@@ -24,18 +24,17 @@
 import java.util.List;
 import java.util.Properties;
 
-import javax.activation.FileTypeMap;
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.NoSuchProviderException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.URLName;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
+import jakarta.activation.FileTypeMap;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.URLName;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.mail.MailParseException;
diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/BeanValidationPostProcessorTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/BeanValidationPostProcessorTests.java
deleted file mode 100644
index c5da1e4b1521..000000000000
--- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/BeanValidationPostProcessorTests.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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.
- * 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.beanvalidation2;
-
-import javax.annotation.PostConstruct;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.validation.beanvalidation.BeanValidationPostProcessor;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * @author Juergen Hoeller
- */
-public class BeanValidationPostProcessorTests {
-
-	@Test
-	public void testNotNullConstraint() {
-		GenericApplicationContext ac = new GenericApplicationContext();
-		ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class));
-		ac.registerBeanDefinition("capp", new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class));
-		ac.registerBeanDefinition("bean", new RootBeanDefinition(NotNullConstrainedBean.class));
-		assertThatExceptionOfType(BeanCreationException.class)
-			.isThrownBy(ac::refresh)
-			.havingRootCause()
-			.withMessageContainingAll("testBean", "invalid");
-		ac.close();
-	}
-
-	@Test
-	public void testNotNullConstraintSatisfied() {
-		GenericApplicationContext ac = new GenericApplicationContext();
-		ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class));
-		ac.registerBeanDefinition("capp", new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class));
-		RootBeanDefinition bd = new RootBeanDefinition(NotNullConstrainedBean.class);
-		bd.getPropertyValues().add("testBean", new TestBean());
-		ac.registerBeanDefinition("bean", bd);
-		ac.refresh();
-		ac.close();
-	}
-
-	@Test
-	public void testNotNullConstraintAfterInitialization() {
-		GenericApplicationContext ac = new GenericApplicationContext();
-		RootBeanDefinition bvpp = new RootBeanDefinition(BeanValidationPostProcessor.class);
-		bvpp.getPropertyValues().add("afterInitialization", true);
-		ac.registerBeanDefinition("bvpp", bvpp);
-		ac.registerBeanDefinition("capp", new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class));
-		ac.registerBeanDefinition("bean", new RootBeanDefinition(AfterInitConstraintBean.class));
-		ac.refresh();
-		ac.close();
-	}
-
-	@Test
-	public void testSizeConstraint() {
-		GenericApplicationContext ac = new GenericApplicationContext();
-		ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class));
-		RootBeanDefinition bd = new RootBeanDefinition(NotNullConstrainedBean.class);
-		bd.getPropertyValues().add("testBean", new TestBean());
-		bd.getPropertyValues().add("stringValue", "s");
-		ac.registerBeanDefinition("bean", bd);
-		assertThatExceptionOfType(BeanCreationException.class)
-			.isThrownBy(ac::refresh)
-			.havingRootCause()
-			.withMessageContainingAll("stringValue", "invalid");
-		ac.close();
-	}
-
-	@Test
-	public void testSizeConstraintSatisfied() {
-		GenericApplicationContext ac = new GenericApplicationContext();
-		ac.registerBeanDefinition("bvpp", new RootBeanDefinition(BeanValidationPostProcessor.class));
-		RootBeanDefinition bd = new RootBeanDefinition(NotNullConstrainedBean.class);
-		bd.getPropertyValues().add("testBean", new TestBean());
-		bd.getPropertyValues().add("stringValue", "ss");
-		ac.registerBeanDefinition("bean", bd);
-		ac.refresh();
-		ac.close();
-	}
-
-
-	public static class NotNullConstrainedBean {
-
-		@NotNull
-		private TestBean testBean;
-
-		@Size(min = 2)
-		private String stringValue;
-
-		public TestBean getTestBean() {
-			return testBean;
-		}
-
-		public void setTestBean(TestBean testBean) {
-			this.testBean = testBean;
-		}
-
-		public String getStringValue() {
-			return stringValue;
-		}
-
-		public void setStringValue(String stringValue) {
-			this.stringValue = stringValue;
-		}
-
-		@PostConstruct
-		public void init() {
-			assertThat(this.testBean).as("Shouldn't be here after constraint checking").isNotNull();
-		}
-	}
-
-
-	public static class AfterInitConstraintBean {
-
-		@NotNull
-		private TestBean testBean;
-
-		public TestBean getTestBean() {
-			return testBean;
-		}
-
-		public void setTestBean(TestBean testBean) {
-			this.testBean = testBean;
-		}
-
-		@PostConstruct
-		public void init() {
-			this.testBean = new TestBean();
-		}
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/MethodValidationTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/MethodValidationTests.java
deleted file mode 100644
index 763bc156f684..000000000000
--- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/MethodValidationTests.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * 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.
- * 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.beanvalidation2;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.groups.Default;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.AsyncAnnotationAdvisor;
-import org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.validation.beanvalidation.CustomValidatorBean;
-import org.springframework.validation.beanvalidation.MethodValidationInterceptor;
-import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * @author Juergen Hoeller
- */
-public class MethodValidationTests {
-
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testMethodValidationInterceptor() {
-		MyValidBean bean = new MyValidBean();
-		ProxyFactory proxyFactory = new ProxyFactory(bean);
-		proxyFactory.addAdvice(new MethodValidationInterceptor());
-		proxyFactory.addAdvisor(new AsyncAnnotationAdvisor());
-		doTestProxyValidation((MyValidInterface<String>) proxyFactory.getProxy());
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testMethodValidationPostProcessor() {
-		StaticApplicationContext ac = new StaticApplicationContext();
-		ac.registerSingleton("mvpp", MethodValidationPostProcessor.class);
-		MutablePropertyValues pvs = new MutablePropertyValues();
-		pvs.add("beforeExistingAdvisors", false);
-		ac.registerSingleton("aapp", AsyncAnnotationBeanPostProcessor.class, pvs);
-		ac.registerSingleton("bean", MyValidBean.class);
-		ac.refresh();
-		doTestProxyValidation(ac.getBean("bean", MyValidInterface.class));
-		ac.close();
-	}
-
-	private void doTestProxyValidation(MyValidInterface<String> proxy) {
-		assertThat(proxy.myValidMethod("value", 5)).isNotNull();
-		assertThatExceptionOfType(ValidationException.class).isThrownBy(() ->
-				proxy.myValidMethod("value", 15));
-		assertThatExceptionOfType(ValidationException.class).isThrownBy(() ->
-				proxy.myValidMethod(null, 5));
-		assertThatExceptionOfType(ValidationException.class).isThrownBy(() ->
-				proxy.myValidMethod("value", 0));
-		proxy.myValidAsyncMethod("value", 5);
-		assertThatExceptionOfType(ValidationException.class).isThrownBy(() ->
-				proxy.myValidAsyncMethod("value", 15));
-		assertThatExceptionOfType(ValidationException.class).isThrownBy(() ->
-				proxy.myValidAsyncMethod(null, 5));
-		assertThat(proxy.myGenericMethod("myValue")).isEqualTo("myValue");
-		assertThatExceptionOfType(ValidationException.class).isThrownBy(() ->
-				proxy.myGenericMethod(null));
-	}
-
-	@Test
-	public void testLazyValidatorForMethodValidation() {
-		@SuppressWarnings("resource")
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(
-				LazyMethodValidationConfig.class, CustomValidatorBean.class,
-				MyValidBean.class, MyValidFactoryBean.class);
-		ctx.getBeansOfType(MyValidInterface.class).values().forEach(bean -> bean.myValidMethod("value", 5));
-	}
-
-	@Test
-	public void testLazyValidatorForMethodValidationWithProxyTargetClass() {
-		@SuppressWarnings("resource")
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(
-				LazyMethodValidationConfigWithProxyTargetClass.class, CustomValidatorBean.class,
-				MyValidBean.class, MyValidFactoryBean.class);
-		ctx.getBeansOfType(MyValidInterface.class).values().forEach(bean -> bean.myValidMethod("value", 5));
-	}
-
-
-	@MyStereotype
-	public static class MyValidBean implements MyValidInterface<String> {
-
-		@Override
-		public Object myValidMethod(String arg1, int arg2) {
-			return (arg2 == 0 ? null : "value");
-		}
-
-		@Override
-		public void myValidAsyncMethod(String arg1, int arg2) {
-		}
-
-		@Override
-		public String myGenericMethod(String value) {
-			return value;
-		}
-	}
-
-
-	@MyStereotype
-	public static class MyValidFactoryBean implements FactoryBean<String>, MyValidInterface<String> {
-
-		@Override
-		public String getObject() {
-			return null;
-		}
-
-		@Override
-		public Class<?> getObjectType() {
-			return String.class;
-		}
-
-		@Override
-		public Object myValidMethod(String arg1, int arg2) {
-			return (arg2 == 0 ? null : "value");
-		}
-
-		@Override
-		public void myValidAsyncMethod(String arg1, int arg2) {
-		}
-
-		@Override
-		public String myGenericMethod(String value) {
-			return value;
-		}
-	}
-
-
-	public interface MyValidInterface<T> {
-
-		@NotNull Object myValidMethod(@NotNull(groups = MyGroup.class) String arg1, @Max(10) int arg2);
-
-		@MyValid
-		@Async void myValidAsyncMethod(@NotNull(groups = OtherGroup.class) String arg1, @Max(10) int arg2);
-
-		T myGenericMethod(@NotNull T value);
-	}
-
-
-	public interface MyGroup {
-	}
-
-
-	public interface OtherGroup {
-	}
-
-
-	@Validated({MyGroup.class, Default.class})
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface MyStereotype {
-	}
-
-
-	@Validated({OtherGroup.class, Default.class})
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface MyValid {
-	}
-
-
-	@Configuration
-	public static class LazyMethodValidationConfig {
-
-		@Bean
-		public static MethodValidationPostProcessor methodValidationPostProcessor(@Lazy Validator validator) {
-			MethodValidationPostProcessor postProcessor = new MethodValidationPostProcessor();
-			postProcessor.setValidator(validator);
-			return postProcessor;
-		}
-	}
-
-
-	@Configuration
-	public static class LazyMethodValidationConfigWithProxyTargetClass {
-
-		@Bean
-		public static MethodValidationPostProcessor methodValidationPostProcessor(@Lazy Validator validator) {
-			MethodValidationPostProcessor postProcessor = new MethodValidationPostProcessor();
-			postProcessor.setValidator(validator);
-			postProcessor.setProxyTargetClass(true);
-			return postProcessor;
-		}
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java
deleted file mode 100644
index 813111adb05c..000000000000
--- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- * 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.
- * 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.beanvalidation2;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.Payload;
-import javax.validation.Valid;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
-import org.springframework.context.support.StaticMessageSource;
-import org.springframework.core.testfixture.io.SerializationTestUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.validation.BeanPropertyBindingResult;
-import org.springframework.validation.FieldError;
-import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Kazuki Shimizu
- * @author Juergen Hoeller
- */
-public class SpringValidatorAdapterTests {
-
-	private final Validator nativeValidator = Validation.buildDefaultValidatorFactory().getValidator();
-
-	private final SpringValidatorAdapter validatorAdapter = new SpringValidatorAdapter(nativeValidator);
-
-	private final StaticMessageSource messageSource = new StaticMessageSource();
-
-
-	@BeforeEach
-	public void setupSpringValidatorAdapter() {
-		messageSource.addMessage("Size", Locale.ENGLISH, "Size of {0} must be between {2} and {1}");
-		messageSource.addMessage("Same", Locale.ENGLISH, "{2} must be same value as {1}");
-		messageSource.addMessage("password", Locale.ENGLISH, "Password");
-		messageSource.addMessage("confirmPassword", Locale.ENGLISH, "Password(Confirm)");
-	}
-
-
-	@Test
-	public void testUnwrap() {
-		Validator nativeValidator = validatorAdapter.unwrap(Validator.class);
-		assertThat(nativeValidator).isSameAs(this.nativeValidator);
-	}
-
-	@Test  // SPR-13406
-	public void testNoStringArgumentValue() throws Exception {
-		TestBean testBean = new TestBean();
-		testBean.setPassword("pass");
-		testBean.setConfirmPassword("pass");
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(testBean, "testBean");
-		validatorAdapter.validate(testBean, errors);
-
-		assertThat(errors.getFieldErrorCount("password")).isEqualTo(1);
-		assertThat(errors.getFieldValue("password")).isEqualTo("pass");
-		FieldError error = errors.getFieldError("password");
-		assertThat(error).isNotNull();
-		assertThat(messageSource.getMessage(error, Locale.ENGLISH)).isEqualTo("Size of Password must be between 8 and 128");
-		assertThat(error.contains(ConstraintViolation.class)).isTrue();
-		assertThat(error.unwrap(ConstraintViolation.class).getPropertyPath().toString()).isEqualTo("password");
-		assertThat(SerializationTestUtils.serializeAndDeserialize(error.toString())).isEqualTo(error.toString());
-	}
-
-	@Test  // SPR-13406
-	public void testApplyMessageSourceResolvableToStringArgumentValueWithResolvedLogicalFieldName() throws Exception {
-		TestBean testBean = new TestBean();
-		testBean.setPassword("password");
-		testBean.setConfirmPassword("PASSWORD");
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(testBean, "testBean");
-		validatorAdapter.validate(testBean, errors);
-
-		assertThat(errors.getFieldErrorCount("password")).isEqualTo(1);
-		assertThat(errors.getFieldValue("password")).isEqualTo("password");
-		FieldError error = errors.getFieldError("password");
-		assertThat(error).isNotNull();
-		assertThat(messageSource.getMessage(error, Locale.ENGLISH)).isEqualTo("Password must be same value as Password(Confirm)");
-		assertThat(error.contains(ConstraintViolation.class)).isTrue();
-		assertThat(error.unwrap(ConstraintViolation.class).getPropertyPath().toString()).isEqualTo("password");
-		assertThat(SerializationTestUtils.serializeAndDeserialize(error.toString())).isEqualTo(error.toString());
-	}
-
-	@Test  // SPR-13406
-	public void testApplyMessageSourceResolvableToStringArgumentValueWithUnresolvedLogicalFieldName() {
-		TestBean testBean = new TestBean();
-		testBean.setEmail("test@example.com");
-		testBean.setConfirmEmail("TEST@EXAMPLE.IO");
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(testBean, "testBean");
-		validatorAdapter.validate(testBean, errors);
-
-		assertThat(errors.getFieldErrorCount("email")).isEqualTo(1);
-		assertThat(errors.getFieldValue("email")).isEqualTo("test@example.com");
-		assertThat(errors.getFieldErrorCount("confirmEmail")).isEqualTo(1);
-		FieldError error1 = errors.getFieldError("email");
-		FieldError error2 = errors.getFieldError("confirmEmail");
-		assertThat(error1).isNotNull();
-		assertThat(error2).isNotNull();
-		assertThat(messageSource.getMessage(error1, Locale.ENGLISH)).isEqualTo("email must be same value as confirmEmail");
-		assertThat(messageSource.getMessage(error2, Locale.ENGLISH)).isEqualTo("Email required");
-		assertThat(error1.contains(ConstraintViolation.class)).isTrue();
-		assertThat(error1.unwrap(ConstraintViolation.class).getPropertyPath().toString()).isEqualTo("email");
-		assertThat(error2.contains(ConstraintViolation.class)).isTrue();
-		assertThat(error2.unwrap(ConstraintViolation.class).getPropertyPath().toString()).isEqualTo("confirmEmail");
-	}
-
-	@Test  // SPR-15123
-	public void testApplyMessageSourceResolvableToStringArgumentValueWithAlwaysUseMessageFormat() {
-		messageSource.setAlwaysUseMessageFormat(true);
-
-		TestBean testBean = new TestBean();
-		testBean.setEmail("test@example.com");
-		testBean.setConfirmEmail("TEST@EXAMPLE.IO");
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(testBean, "testBean");
-		validatorAdapter.validate(testBean, errors);
-
-		assertThat(errors.getFieldErrorCount("email")).isEqualTo(1);
-		assertThat(errors.getFieldValue("email")).isEqualTo("test@example.com");
-		assertThat(errors.getFieldErrorCount("confirmEmail")).isEqualTo(1);
-		FieldError error1 = errors.getFieldError("email");
-		FieldError error2 = errors.getFieldError("confirmEmail");
-		assertThat(error1).isNotNull();
-		assertThat(error2).isNotNull();
-		assertThat(messageSource.getMessage(error1, Locale.ENGLISH)).isEqualTo("email must be same value as confirmEmail");
-		assertThat(messageSource.getMessage(error2, Locale.ENGLISH)).isEqualTo("Email required");
-		assertThat(error1.contains(ConstraintViolation.class)).isTrue();
-		assertThat(error1.unwrap(ConstraintViolation.class).getPropertyPath().toString()).isEqualTo("email");
-		assertThat(error2.contains(ConstraintViolation.class)).isTrue();
-		assertThat(error2.unwrap(ConstraintViolation.class).getPropertyPath().toString()).isEqualTo("confirmEmail");
-	}
-
-	@Test
-	public void testPatternMessage() {
-		TestBean testBean = new TestBean();
-		testBean.setEmail("X");
-		testBean.setConfirmEmail("X");
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(testBean, "testBean");
-		validatorAdapter.validate(testBean, errors);
-
-		assertThat(errors.getFieldErrorCount("email")).isEqualTo(1);
-		assertThat(errors.getFieldValue("email")).isEqualTo("X");
-		FieldError error = errors.getFieldError("email");
-		assertThat(error).isNotNull();
-		assertThat(messageSource.getMessage(error, Locale.ENGLISH)).contains("[\\w.'-]{1,}@[\\w.'-]{1,}");
-		assertThat(error.contains(ConstraintViolation.class)).isTrue();
-		assertThat(error.unwrap(ConstraintViolation.class).getPropertyPath().toString()).isEqualTo("email");
-	}
-
-	@Test  // SPR-16177
-	public void testWithList() {
-		Parent parent = new Parent();
-		parent.setName("Parent whit list");
-		parent.getChildList().addAll(createChildren(parent));
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(parent, "parent");
-		validatorAdapter.validate(parent, errors);
-
-		assertThat(errors.getErrorCount() > 0).isTrue();
-	}
-
-	@Test  // SPR-16177
-	public void testWithSet() {
-		Parent parent = new Parent();
-		parent.setName("Parent with set");
-		parent.getChildSet().addAll(createChildren(parent));
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(parent, "parent");
-		validatorAdapter.validate(parent, errors);
-
-		assertThat(errors.getErrorCount() > 0).isTrue();
-	}
-
-	private List<Child> createChildren(Parent parent) {
-		Child child1 = new Child();
-		child1.setName("Child1");
-		child1.setAge(null);
-		child1.setParent(parent);
-
-		Child child2 = new Child();
-		child2.setName(null);
-		child2.setAge(17);
-		child2.setParent(parent);
-
-		return Arrays.asList(child1, child2);
-	}
-
-	@Test  // SPR-15839
-	public void testListElementConstraint() {
-		BeanWithListElementConstraint bean = new BeanWithListElementConstraint();
-		bean.setProperty(Arrays.asList("no", "element", "can", "be", null));
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bean, "bean");
-		validatorAdapter.validate(bean, errors);
-
-		assertThat(errors.getFieldErrorCount("property[4]")).isEqualTo(1);
-		assertThat(errors.getFieldValue("property[4]")).isNull();
-	}
-
-	@Test  // SPR-15839
-	public void testMapValueConstraint() {
-		Map<String, String> property = new HashMap<>();
-		property.put("no value can be", null);
-
-		BeanWithMapEntryConstraint bean = new BeanWithMapEntryConstraint();
-		bean.setProperty(property);
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bean, "bean");
-		validatorAdapter.validate(bean, errors);
-
-		assertThat(errors.getFieldErrorCount("property[no value can be]")).isEqualTo(1);
-		assertThat(errors.getFieldValue("property[no value can be]")).isNull();
-	}
-
-	@Test  // SPR-15839
-	public void testMapEntryConstraint() {
-		Map<String, String> property = new HashMap<>();
-		property.put(null, null);
-
-		BeanWithMapEntryConstraint bean = new BeanWithMapEntryConstraint();
-		bean.setProperty(property);
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bean, "bean");
-		validatorAdapter.validate(bean, errors);
-
-		assertThat(errors.hasFieldErrors("property[]")).isTrue();
-		assertThat(errors.getFieldValue("property[]")).isNull();
-	}
-
-
-	@Same(field = "password", comparingField = "confirmPassword")
-	@Same(field = "email", comparingField = "confirmEmail")
-	static class TestBean {
-
-		@Size(min = 8, max = 128)
-		private String password;
-
-		private String confirmPassword;
-
-		@Pattern(regexp = "[\\w.'-]{1,}@[\\w.'-]{1,}")
-		private String email;
-
-		@Pattern(regexp = "[\\p{L} -]*", message = "Email required")
-		private String confirmEmail;
-
-		public String getPassword() {
-			return password;
-		}
-
-		public void setPassword(String password) {
-			this.password = password;
-		}
-
-		public String getConfirmPassword() {
-			return confirmPassword;
-		}
-
-		public void setConfirmPassword(String confirmPassword) {
-			this.confirmPassword = confirmPassword;
-		}
-
-		public String getEmail() {
-			return email;
-		}
-
-		public void setEmail(String email) {
-			this.email = email;
-		}
-
-		public String getConfirmEmail() {
-			return confirmEmail;
-		}
-
-		public void setConfirmEmail(String confirmEmail) {
-			this.confirmEmail = confirmEmail;
-		}
-	}
-
-
-	@Documented
-	@Constraint(validatedBy = {SameValidator.class})
-	@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-	@Retention(RetentionPolicy.RUNTIME)
-	@Repeatable(SameGroup.class)
-	@interface Same {
-
-		String message() default "{org.springframework.validation.beanvalidation.Same.message}";
-
-		Class<?>[] groups() default {};
-
-		Class<? extends Payload>[] payload() default {};
-
-		String field();
-
-		String comparingField();
-
-		@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-		@Retention(RetentionPolicy.RUNTIME)
-		@Documented
-		@interface List {
-			Same[] value();
-		}
-	}
-
-
-	@Documented
-	@Inherited
-	@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-	@Retention(RetentionPolicy.RUNTIME)
-	@interface SameGroup {
-
-		Same[] value();
-	}
-
-
-	public static class SameValidator implements ConstraintValidator<Same, Object> {
-
-		private String field;
-
-		private String comparingField;
-
-		private String message;
-
-		@Override
-		public void initialize(Same constraintAnnotation) {
-			field = constraintAnnotation.field();
-			comparingField = constraintAnnotation.comparingField();
-			message = constraintAnnotation.message();
-		}
-
-		@Override
-		public boolean isValid(Object value, ConstraintValidatorContext context) {
-			BeanWrapper beanWrapper = new BeanWrapperImpl(value);
-			Object fieldValue = beanWrapper.getPropertyValue(field);
-			Object comparingFieldValue = beanWrapper.getPropertyValue(comparingField);
-			boolean matched = ObjectUtils.nullSafeEquals(fieldValue, comparingFieldValue);
-			if (matched) {
-				return true;
-			}
-			else {
-				context.disableDefaultConstraintViolation();
-				context.buildConstraintViolationWithTemplate(message)
-						.addPropertyNode(field)
-						.addConstraintViolation();
-				return false;
-			}
-		}
-	}
-
-
-	public static class Parent {
-
-		private Integer id;
-
-		@NotNull
-		private String name;
-
-		@Valid
-		private Set<Child> childSet = new LinkedHashSet<>();
-
-		@Valid
-		private List<Child> childList = new ArrayList<>();
-
-		public Integer getId() {
-			return id;
-		}
-
-		public void setId(Integer id) {
-			this.id = id;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public Set<Child> getChildSet() {
-			return childSet;
-		}
-
-		public void setChildSet(Set<Child> childSet) {
-			this.childSet = childSet;
-		}
-
-		public List<Child> getChildList() {
-			return childList;
-		}
-
-		public void setChildList(List<Child> childList) {
-			this.childList = childList;
-		}
-	}
-
-
-	@AnythingValid
-	public static class Child {
-
-		private Integer id;
-
-		@NotNull
-		private String name;
-
-		@NotNull
-		private Integer age;
-
-		@NotNull
-		private Parent parent;
-
-		public Integer getId() {
-			return id;
-		}
-
-		public void setId(Integer id) {
-			this.id = id;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public Integer getAge() {
-			return age;
-		}
-
-		public void setAge(Integer age) {
-			this.age = age;
-		}
-
-		public Parent getParent() {
-			return parent;
-		}
-
-		public void setParent(Parent parent) {
-			this.parent = parent;
-		}
-	}
-
-
-	@Constraint(validatedBy = AnythingValidator.class)
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface AnythingValid {
-
-		String message() default "{AnythingValid.message}";
-
-		Class<?>[] groups() default {};
-
-		Class<? extends Payload>[] payload() default {};
-	}
-
-
-	public static class AnythingValidator implements ConstraintValidator<AnythingValid, Object> {
-
-		private static final String ID = "id";
-
-		@Override
-		public void initialize(AnythingValid constraintAnnotation) {
-		}
-
-		@Override
-		public boolean isValid(Object value, ConstraintValidatorContext context) {
-			List<Field> fieldsErrors = new ArrayList<>();
-			Arrays.asList(value.getClass().getDeclaredFields()).forEach(field -> {
-				field.setAccessible(true);
-				try {
-					if (!field.getName().equals(ID) && field.get(value) == null) {
-						fieldsErrors.add(field);
-						context.buildConstraintViolationWithTemplate(context.getDefaultConstraintMessageTemplate())
-								.addPropertyNode(field.getName())
-								.addConstraintViolation();
-					}
-				}
-				catch (IllegalAccessException ex) {
-					throw new IllegalStateException(ex);
-				}
-			});
-			return fieldsErrors.isEmpty();
-		}
-	}
-
-
-	public class BeanWithListElementConstraint {
-
-		@Valid
-		private List<@NotNull String> property;
-
-		public List<String> getProperty() {
-			return property;
-		}
-
-		public void setProperty(List<String> property) {
-			this.property = property;
-		}
-	}
-
-
-	public class BeanWithMapEntryConstraint {
-
-		@Valid
-		private Map<@NotNull String, @NotNull String> property;
-
-		public Map<String, String> getProperty() {
-			return property;
-		}
-
-		public void setProperty(Map<String, String> property) {
-			this.property = property;
-		}
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java
deleted file mode 100644
index a383ae5f8bf7..000000000000
--- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * 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.
- * 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.beanvalidation2;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.Payload;
-import javax.validation.Valid;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.HibernateValidator;
-import org.hibernate.validator.HibernateValidatorFactory;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.core.env.Environment;
-import org.springframework.validation.BeanPropertyBindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.validation.FieldError;
-import org.springframework.validation.ObjectError;
-import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Juergen Hoeller
- */
-@SuppressWarnings("resource")
-public class ValidatorFactoryTests {
-
-	@Test
-	@SuppressWarnings("cast")
-	public void testSimpleValidation() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		Set<ConstraintViolation<ValidPerson>> result = validator.validate(person);
-		assertThat(result.size()).isEqualTo(2);
-		for (ConstraintViolation<ValidPerson> cv : result) {
-			String path = cv.getPropertyPath().toString();
-			assertThat(path).matches(actual -> "name".equals(actual) || "address.street".equals(actual));
-			assertThat(cv.getConstraintDescriptor().getAnnotation()).isInstanceOf(NotNull.class);
-		}
-
-		Validator nativeValidator = validator.unwrap(Validator.class);
-		assertThat(nativeValidator.getClass().getName().startsWith("org.hibernate")).isTrue();
-		assertThat(validator.unwrap(ValidatorFactory.class) instanceof HibernateValidatorFactory).isTrue();
-		assertThat(validator.unwrap(HibernateValidatorFactory.class) instanceof HibernateValidatorFactory).isTrue();
-
-		validator.destroy();
-	}
-
-	@Test
-	@SuppressWarnings("cast")
-	public void testSimpleValidationWithCustomProvider() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.setProviderClass(HibernateValidator.class);
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		Set<ConstraintViolation<ValidPerson>> result = validator.validate(person);
-		assertThat(result.size()).isEqualTo(2);
-		for (ConstraintViolation<ValidPerson> cv : result) {
-			String path = cv.getPropertyPath().toString();
-			assertThat(path).matches(actual -> "name".equals(actual) || "address.street".equals(actual));
-			assertThat(cv.getConstraintDescriptor().getAnnotation()).isInstanceOf(NotNull.class);
-		}
-
-		Validator nativeValidator = validator.unwrap(Validator.class);
-		assertThat(nativeValidator.getClass().getName().startsWith("org.hibernate")).isTrue();
-		assertThat(validator.unwrap(ValidatorFactory.class) instanceof HibernateValidatorFactory).isTrue();
-		assertThat(validator.unwrap(HibernateValidatorFactory.class) instanceof HibernateValidatorFactory).isTrue();
-
-		validator.destroy();
-	}
-
-	@Test
-	public void testSimpleValidationWithClassLevel() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		person.setName("Juergen");
-		person.getAddress().setStreet("Juergen's Street");
-		Set<ConstraintViolation<ValidPerson>> result = validator.validate(person);
-		assertThat(result.size()).isEqualTo(1);
-		Iterator<ConstraintViolation<ValidPerson>> iterator = result.iterator();
-		ConstraintViolation<?> cv = iterator.next();
-		assertThat(cv.getPropertyPath().toString()).isEqualTo("");
-		assertThat(cv.getConstraintDescriptor().getAnnotation() instanceof NameAddressValid).isTrue();
-	}
-
-	@Test
-	public void testSpringValidationFieldType() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		person.setName("Phil");
-		person.getAddress().setStreet("Phil's Street");
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(person, "person");
-		validator.validate(person, errors);
-		assertThat(errors.getErrorCount()).isEqualTo(1);
-		assertThat(errors.getFieldError("address").getRejectedValue()).isInstanceOf(ValidAddress.class);
-	}
-
-	@Test
-	public void testSpringValidation() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		BeanPropertyBindingResult result = new BeanPropertyBindingResult(person, "person");
-		validator.validate(person, result);
-		assertThat(result.getErrorCount()).isEqualTo(2);
-		FieldError fieldError = result.getFieldError("name");
-		assertThat(fieldError.getField()).isEqualTo("name");
-		List<String> errorCodes = Arrays.asList(fieldError.getCodes());
-		assertThat(errorCodes.size()).isEqualTo(4);
-		assertThat(errorCodes.contains("NotNull.person.name")).isTrue();
-		assertThat(errorCodes.contains("NotNull.name")).isTrue();
-		assertThat(errorCodes.contains("NotNull.java.lang.String")).isTrue();
-		assertThat(errorCodes.contains("NotNull")).isTrue();
-		fieldError = result.getFieldError("address.street");
-		assertThat(fieldError.getField()).isEqualTo("address.street");
-		errorCodes = Arrays.asList(fieldError.getCodes());
-		assertThat(errorCodes.size()).isEqualTo(5);
-		assertThat(errorCodes.contains("NotNull.person.address.street")).isTrue();
-		assertThat(errorCodes.contains("NotNull.address.street")).isTrue();
-		assertThat(errorCodes.contains("NotNull.street")).isTrue();
-		assertThat(errorCodes.contains("NotNull.java.lang.String")).isTrue();
-		assertThat(errorCodes.contains("NotNull")).isTrue();
-	}
-
-	@Test
-	public void testSpringValidationWithClassLevel() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		person.setName("Juergen");
-		person.getAddress().setStreet("Juergen's Street");
-		BeanPropertyBindingResult result = new BeanPropertyBindingResult(person, "person");
-		validator.validate(person, result);
-		assertThat(result.getErrorCount()).isEqualTo(1);
-		ObjectError globalError = result.getGlobalError();
-		List<String> errorCodes = Arrays.asList(globalError.getCodes());
-		assertThat(errorCodes.size()).isEqualTo(2);
-		assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
-		assertThat(errorCodes.contains("NameAddressValid")).isTrue();
-	}
-
-	@Test
-	public void testSpringValidationWithAutowiredValidator() {
-		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(
-				LocalValidatorFactoryBean.class);
-		LocalValidatorFactoryBean validator = ctx.getBean(LocalValidatorFactoryBean.class);
-
-		ValidPerson person = new ValidPerson();
-		person.expectsAutowiredValidator = true;
-		person.setName("Juergen");
-		person.getAddress().setStreet("Juergen's Street");
-		BeanPropertyBindingResult result = new BeanPropertyBindingResult(person, "person");
-		validator.validate(person, result);
-		assertThat(result.getErrorCount()).isEqualTo(1);
-		ObjectError globalError = result.getGlobalError();
-		List<String> errorCodes = Arrays.asList(globalError.getCodes());
-		assertThat(errorCodes.size()).isEqualTo(2);
-		assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
-		assertThat(errorCodes.contains("NameAddressValid")).isTrue();
-		ctx.close();
-	}
-
-	@Test
-	public void testSpringValidationWithErrorInListElement() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		person.getAddressList().add(new ValidAddress());
-		BeanPropertyBindingResult result = new BeanPropertyBindingResult(person, "person");
-		validator.validate(person, result);
-		assertThat(result.getErrorCount()).isEqualTo(3);
-		FieldError fieldError = result.getFieldError("name");
-		assertThat(fieldError.getField()).isEqualTo("name");
-		fieldError = result.getFieldError("address.street");
-		assertThat(fieldError.getField()).isEqualTo("address.street");
-		fieldError = result.getFieldError("addressList[0].street");
-		assertThat(fieldError.getField()).isEqualTo("addressList[0].street");
-	}
-
-	@Test
-	public void testSpringValidationWithErrorInSetElement() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ValidPerson person = new ValidPerson();
-		person.getAddressSet().add(new ValidAddress());
-		BeanPropertyBindingResult result = new BeanPropertyBindingResult(person, "person");
-		validator.validate(person, result);
-		assertThat(result.getErrorCount()).isEqualTo(3);
-		FieldError fieldError = result.getFieldError("name");
-		assertThat(fieldError.getField()).isEqualTo("name");
-		fieldError = result.getFieldError("address.street");
-		assertThat(fieldError.getField()).isEqualTo("address.street");
-		fieldError = result.getFieldError("addressSet[].street");
-		assertThat(fieldError.getField()).isEqualTo("addressSet[].street");
-	}
-
-	@Test
-	public void testInnerBeanValidation() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		MainBean mainBean = new MainBean();
-		Errors errors = new BeanPropertyBindingResult(mainBean, "mainBean");
-		validator.validate(mainBean, errors);
-		Object rejected = errors.getFieldValue("inner.value");
-		assertThat(rejected).isNull();
-	}
-
-	@Test
-	public void testValidationWithOptionalField() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		MainBeanWithOptional mainBean = new MainBeanWithOptional();
-		Errors errors = new BeanPropertyBindingResult(mainBean, "mainBean");
-		validator.validate(mainBean, errors);
-		Object rejected = errors.getFieldValue("inner.value");
-		assertThat(rejected).isNull();
-	}
-
-	@Test
-	public void testListValidation() {
-		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
-		validator.afterPropertiesSet();
-
-		ListContainer listContainer = new ListContainer();
-		listContainer.addString("A");
-		listContainer.addString("X");
-
-		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(listContainer, "listContainer");
-		errors.initConversion(new DefaultConversionService());
-		validator.validate(listContainer, errors);
-
-		FieldError fieldError = errors.getFieldError("list[1]");
-		assertThat(fieldError).isNotNull();
-		assertThat(fieldError.getRejectedValue()).isEqualTo("X");
-		assertThat(errors.getFieldValue("list[1]")).isEqualTo("X");
-	}
-
-
-	@NameAddressValid
-	public static class ValidPerson {
-
-		@NotNull
-		private String name;
-
-		@Valid
-		private ValidAddress address = new ValidAddress();
-
-		@Valid
-		private List<ValidAddress> addressList = new ArrayList<>();
-
-		@Valid
-		private Set<ValidAddress> addressSet = new LinkedHashSet<>();
-
-		public boolean expectsAutowiredValidator = false;
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public ValidAddress getAddress() {
-			return address;
-		}
-
-		public void setAddress(ValidAddress address) {
-			this.address = address;
-		}
-
-		public List<ValidAddress> getAddressList() {
-			return addressList;
-		}
-
-		public void setAddressList(List<ValidAddress> addressList) {
-			this.addressList = addressList;
-		}
-
-		public Set<ValidAddress> getAddressSet() {
-			return addressSet;
-		}
-
-		public void setAddressSet(Set<ValidAddress> addressSet) {
-			this.addressSet = addressSet;
-		}
-	}
-
-
-	public static class ValidAddress {
-
-		@NotNull
-		private String street;
-
-		public String getStreet() {
-			return street;
-		}
-
-		public void setStreet(String street) {
-			this.street = street;
-		}
-	}
-
-
-	@Target(ElementType.TYPE)
-	@Retention(RetentionPolicy.RUNTIME)
-	@Constraint(validatedBy = NameAddressValidator.class)
-	public @interface NameAddressValid {
-
-		String message() default "Street must not contain name";
-
-		Class<?>[] groups() default {};
-
-		Class<?>[] payload() default {};
-	}
-
-
-	public static class NameAddressValidator implements ConstraintValidator<NameAddressValid, ValidPerson> {
-
-		@Autowired
-		private Environment environment;
-
-		@Override
-		public void initialize(NameAddressValid constraintAnnotation) {
-		}
-
-		@Override
-		public boolean isValid(ValidPerson value, ConstraintValidatorContext context) {
-			if (value.expectsAutowiredValidator) {
-				assertThat(this.environment).isNotNull();
-			}
-			boolean valid = (value.name == null || !value.address.street.contains(value.name));
-			if (!valid && "Phil".equals(value.name)) {
-				context.buildConstraintViolationWithTemplate(
-						context.getDefaultConstraintMessageTemplate()).addPropertyNode("address").addConstraintViolation().disableDefaultConstraintViolation();
-			}
-			return valid;
-		}
-	}
-
-
-	public static class MainBean {
-
-		@InnerValid
-		private InnerBean inner = new InnerBean();
-
-		public InnerBean getInner() {
-			return inner;
-		}
-	}
-
-
-	public static class MainBeanWithOptional {
-
-		@InnerValid
-		private InnerBean inner = new InnerBean();
-
-		public Optional<InnerBean> getInner() {
-			return Optional.ofNullable(inner);
-		}
-	}
-
-
-	public static class InnerBean {
-
-		private String value;
-
-		public String getValue() {
-			return value;
-		}
-		public void setValue(String value) {
-			this.value = value;
-		}
-	}
-
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.FIELD)
-	@Constraint(validatedBy=InnerValidator.class)
-	public static @interface InnerValid {
-
-		String message() default "NOT VALID";
-
-		Class<?>[] groups() default { };
-
-		Class<? extends Payload>[] payload() default {};
-	}
-
-
-	public static class InnerValidator implements ConstraintValidator<InnerValid, InnerBean> {
-
-		@Override
-		public void initialize(InnerValid constraintAnnotation) {
-		}
-
-		@Override
-		public boolean isValid(InnerBean bean, ConstraintValidatorContext context) {
-			context.disableDefaultConstraintViolation();
-			if (bean.getValue() == null) {
-				context.buildConstraintViolationWithTemplate("NULL").addPropertyNode("value").addConstraintViolation();
-				return false;
-			}
-			return true;
-		}
-	}
-
-
-	public static class ListContainer {
-
-		@NotXList
-		private List<String> list = new ArrayList<>();
-
-		public void addString(String value) {
-			list.add(value);
-		}
-
-		public List<String> getList() {
-			return list;
-		}
-	}
-
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.FIELD)
-	@Constraint(validatedBy = NotXListValidator.class)
-	public @interface NotXList {
-
-		String message() default "Should not be X";
-
-		Class<?>[] groups() default {};
-
-		Class<? extends Payload>[] payload() default {};
-	}
-
-
-	public static class NotXListValidator implements ConstraintValidator<NotXList, List<String>> {
-
-		@Override
-		public void initialize(NotXList constraintAnnotation) {
-		}
-
-		@Override
-		public boolean isValid(List<String> list, ConstraintValidatorContext context) {
-			context.disableDefaultConstraintViolation();
-			boolean valid = true;
-			for (int i = 0; i < list.size(); i++) {
-				if ("X".equals(list.get(i))) {
-					context.buildConstraintViolationWithTemplate(context.getDefaultConstraintMessageTemplate()).addBeanNode().inIterable().atIndex(i).addConstraintViolation();
-					valid = false;
-				}
-			}
-			return valid;
-		}
-	}
-
-}
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 221e0f12fe1a..9e4cf72ca954 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -9,20 +9,18 @@ dependencies {
 	api(project(":spring-core"))
 	api(project(":spring-expression"))
 	optional(project(":spring-instrument"))
-	optional("javax.annotation:javax.annotation-api")
-	optional("javax.ejb:javax.ejb-api")
-	optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api")
-	optional("javax.inject:javax.inject")
-	optional("javax.interceptor:javax.interceptor-api")
+	optional("jakarta.annotation:jakarta.annotation-api")
+	optional("jakarta.ejb:jakarta.ejb-api")
+	optional("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api")
+	optional("jakarta.inject:jakarta.inject-api")
+	optional("jakarta.interceptor:jakarta.interceptor-api")
 	optional("javax.money:money-api")
-	// Overriding 2.0.1.Final due to Bean Validation 1.1 compatibility in LocalValidatorFactoryBean
-	optional("javax.validation:validation-api:1.1.0.Final")
-	optional("javax.xml.ws:jaxws-api")
+	optional("jakarta.validation:jakarta.validation-api")
+	optional("jakarta.xml.ws:jakarta.xml.ws-api")
 	optional("org.aspectj:aspectjweaver")
 	optional("org.codehaus.groovy:groovy")
 	optional("org.apache-extras.beanshell:bsh")
-	optional("joda-time:joda-time")
-	optional("org.hibernate:hibernate-validator:5.4.3.Final")
+	optional("org.hibernate:hibernate-validator")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
@@ -34,10 +32,10 @@ dependencies {
 	testImplementation("org.codehaus.groovy:groovy-test")
 	testImplementation("org.codehaus.groovy:groovy-xml")
 	testImplementation("org.apache.commons:commons-pool2")
-	testImplementation("javax.inject:javax.inject-tck")
+	testImplementation("jakarta.inject:jakarta.inject-tck")
 	testImplementation("org.awaitility:awaitility")
-	testRuntimeOnly("javax.xml.bind:jaxb-api")
-	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
+	testRuntimeOnly("org.glassfish:jakarta.el")
 	// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
 	testRuntimeOnly("org.glassfish.external:opendmk_jmxremote_optional_jar")
 	testRuntimeOnly("org.javamoney:moneta")
diff --git a/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java b/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java
index c00cf0ddfaec..3e19ca7e9781 100644
--- a/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java
+++ b/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java
@@ -16,8 +16,7 @@
 
 package org.springframework.context.annotation;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index a589a92335ac..c12647a3ca6c 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -41,8 +41,8 @@
  * {@link org.springframework.stereotype.Repository @Repository}) are
  * themselves annotated with {@code @Component}.
  *
- * <p>Also supports Java EE 6's {@link javax.annotation.ManagedBean} and
- * JSR-330's {@link javax.inject.Named} annotations, if available. Note that
+ * <p>Also supports Jakarta EE's {@link jakarta.annotation.ManagedBean} and
+ * JSR-330's {@link jakarta.inject.Named} annotations, if available. Note that
  * Spring component annotations always override such standard annotations.
  *
  * <p>If the annotation's value doesn't indicate a bean name, an appropriate
@@ -58,7 +58,7 @@
  * @see org.springframework.stereotype.Repository#value()
  * @see org.springframework.stereotype.Service#value()
  * @see org.springframework.stereotype.Controller#value()
- * @see javax.inject.Named#value()
+ * @see jakarta.inject.Named#value()
  * @see FullyQualifiedAnnotationBeanNameGenerator
  */
 public class AnnotationBeanNameGenerator implements BeanNameGenerator {
@@ -136,8 +136,8 @@ protected boolean isStereotypeWithNameValue(String annotationType,
 
 		boolean isStereotype = annotationType.equals(COMPONENT_ANNOTATION_CLASSNAME) ||
 				metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME) ||
-				annotationType.equals("javax.annotation.ManagedBean") ||
-				annotationType.equals("javax.inject.Named");
+				annotationType.equals("jakarta.annotation.ManagedBean") ||
+				annotationType.equals("jakarta.inject.Named");
 
 		return (isStereotype && attributes != null && attributes.containsKey("value"));
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
index 86ea5feb7335..b2d29bca5592 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
@@ -32,7 +32,7 @@
  * Standalone application context, accepting <em>component classes</em> as input &mdash;
  * in particular {@link Configuration @Configuration}-annotated classes, but also plain
  * {@link org.springframework.stereotype.Component @Component} types and JSR-330 compliant
- * classes using {@code javax.inject} annotations.
+ * classes using {@code jakarta.inject} annotations.
  *
  * <p>Allows for registering classes one by one using {@link #register(Class...)}
  * as well as for classpath scanning using {@link #scan(String...)}.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
index 91b1719b7083..9c253124eea9 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
@@ -123,8 +123,8 @@ public abstract class AnnotationConfigUtils {
 
 	static {
 		ClassLoader classLoader = AnnotationConfigUtils.class.getClassLoader();
-		jsr250Present = ClassUtils.isPresent("javax.annotation.Resource", classLoader);
-		jpaPresent = ClassUtils.isPresent("javax.persistence.EntityManagerFactory", classLoader) &&
+		jsr250Present = ClassUtils.isPresent("jakarta.annotation.Resource", classLoader);
+		jpaPresent = ClassUtils.isPresent("jakarta.persistence.EntityManagerFactory", classLoader) &&
 				ClassUtils.isPresent(PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME, classLoader);
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
index a723b02c3508..2f254d5a7117 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
@@ -99,7 +99,7 @@
  * <p><b>NOTE:</b> {@code @Order} values may influence priorities at injection points,
  * but please be aware that they do not influence singleton startup order which is an
  * orthogonal concern determined by dependency relationships and {@code @DependsOn}
- * declarations as mentioned above. Also, {@link javax.annotation.Priority} is not
+ * declarations as mentioned above. Also, {@link jakarta.annotation.Priority} is not
  * available at this level since it cannot be declared on methods; its semantics can
  * be modeled through {@code @Order} values in combination with {@code @Primary} on
  * a single bean per type.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
index 65cbb9bdb9f2..bafdd032f009 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
@@ -47,8 +47,8 @@
  * {@link org.springframework.stereotype.Service @Service}, or
  * {@link org.springframework.stereotype.Controller @Controller} stereotype.
  *
- * <p>Also supports Java EE 6's {@link javax.annotation.ManagedBean} and
- * JSR-330's {@link javax.inject.Named} annotations, if available.
+ * <p>Also supports Jakarta EE's {@link jakarta.annotation.ManagedBean} and
+ * JSR-330's {@link jakarta.inject.Named} annotations, if available.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
index 05ea7a5159a5..5be6cb914b44 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
@@ -197,8 +197,8 @@ public void resetFilters(boolean useDefaultFilters) {
 	 * {@link Component @Component} meta-annotation including the
 	 * {@link Repository @Repository}, {@link Service @Service}, and
 	 * {@link Controller @Controller} stereotype annotations.
-	 * <p>Also supports Java EE 6's {@link javax.annotation.ManagedBean} and
-	 * JSR-330's {@link javax.inject.Named} annotations, if available.
+	 * <p>Also supports Jakarta EE's {@link jakarta.annotation.ManagedBean} and
+	 * JSR-330's {@link jakarta.inject.Named} annotations, if available.
 	 *
 	 */
 	@SuppressWarnings("unchecked")
@@ -207,16 +207,16 @@ protected void registerDefaultFilters() {
 		ClassLoader cl = ClassPathScanningCandidateComponentProvider.class.getClassLoader();
 		try {
 			this.includeFilters.add(new AnnotationTypeFilter(
-					((Class<? extends Annotation>) ClassUtils.forName("javax.annotation.ManagedBean", cl)), false));
-			logger.trace("JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning");
+					((Class<? extends Annotation>) ClassUtils.forName("jakarta.annotation.ManagedBean", cl)), false));
+			logger.trace("JSR-250 'jakarta.annotation.ManagedBean' found and supported for component scanning");
 		}
 		catch (ClassNotFoundException ex) {
-			// JSR-250 1.1 API (as included in Java EE 6) not available - simply skip.
+			// JSR-250 1.1 API (as included in Jakarta EE) not available - simply skip.
 		}
 		try {
 			this.includeFilters.add(new AnnotationTypeFilter(
-					((Class<? extends Annotation>) ClassUtils.forName("javax.inject.Named", cl)), false));
-			logger.trace("JSR-330 'javax.inject.Named' annotation found and supported for component scanning");
+					((Class<? extends Annotation>) ClassUtils.forName("jakarta.inject.Named", cl)), false));
+			logger.trace("JSR-330 'jakarta.inject.Named' annotation found and supported for component scanning");
 		}
 		catch (ClassNotFoundException ex) {
 			// JSR-330 API not available - simply skip.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index d9acb722b08d..75b7d08afec6 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -37,14 +37,15 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceRef;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceRef;
 
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.ProxyFactory;
@@ -77,36 +78,32 @@
 /**
  * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
  * that supports common Java annotations out of the box, in particular the JSR-250
- * annotations in the {@code javax.annotation} package. These common Java
- * annotations are supported in many Java EE 5 technologies (e.g. JSF 1.2),
+ * annotations in the {@code jakarta.annotation} package. These common Java
+ * annotations are supported in many Jakarta EE technologies (e.g. JSF 1.2),
  * as well as in Java 6's JAX-WS.
  *
- * <p>This post-processor includes support for the {@link javax.annotation.PostConstruct}
- * and {@link javax.annotation.PreDestroy} annotations - as init annotation
+ * <p>This post-processor includes support for the {@link jakarta.annotation.PostConstruct}
+ * and {@link jakarta.annotation.PreDestroy} annotations - as init annotation
  * and destroy annotation, respectively - through inheriting from
  * {@link InitDestroyAnnotationBeanPostProcessor} with pre-configured annotation types.
  *
- * <p>The central element is the {@link javax.annotation.Resource} annotation
+ * <p>The central element is the {@link jakarta.annotation.Resource} annotation
  * for annotation-driven injection of named beans, by default from the containing
  * Spring BeanFactory, with only {@code mappedName} references resolved in JNDI.
  * The {@link #setAlwaysUseJndiLookup "alwaysUseJndiLookup" flag} enforces JNDI lookups
- * equivalent to standard Java EE 5 resource injection for {@code name} references
+ * equivalent to standard Jakarta EE resource injection for {@code name} references
  * and default names as well. The target beans can be simple POJOs, with no special
  * requirements other than the type having to match.
  *
  * <p>The JAX-WS {@link javax.xml.ws.WebServiceRef} annotation is supported too,
- * analogous to {@link javax.annotation.Resource} but with the capability of creating
+ * analogous to {@link jakarta.annotation.Resource} but with the capability of creating
  * specific JAX-WS service endpoints. This may either point to an explicitly defined
  * resource by name or operate on a locally specified JAX-WS service class. Finally,
- * this post-processor also supports the EJB 3 {@link javax.ejb.EJB} annotation,
- * analogous to {@link javax.annotation.Resource} as well, with the capability to
+ * this post-processor also supports the EJB 3 {@link jakarta.ejb.EJB} annotation,
+ * analogous to {@link jakarta.annotation.Resource} as well, with the capability to
  * specify both a local bean name and a global JNDI name for fallback retrieval.
  * The target beans can be plain POJOs as well as EJB 3 Session Beans in this case.
  *
- * <p>The common annotations supported by this post-processor are available in
- * Java 6 (JDK 1.6) as well as in Java EE 5/6 (which provides a standalone jar for
- * its common annotations as well, allowing for use in any Java 5 based application).
- *
  * <p>For default usage, resolving resource names as Spring bean names,
  * simply define the following in your application context:
  *
@@ -114,7 +111,7 @@
  * &lt;bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/&gt;</pre>
  *
  * For direct JNDI access, resolving resource names as JNDI resource references
- * within the Java EE application's "java:comp/env/" namespace, use the following:
+ * within the Jakarta EE application's "java:comp/env/" namespace, use the following:
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"&gt;
@@ -156,7 +153,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 
 	static {
 		webServiceRefClass = loadAnnotationType("javax.xml.ws.WebServiceRef");
-		ejbClass = loadAnnotationType("javax.ejb.EJB");
+		ejbClass = loadAnnotationType("jakarta.ejb.EJB");
 
 		resourceAnnotationTypes.add(Resource.class);
 		if (webServiceRefClass != null) {
@@ -191,7 +188,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	/**
 	 * Create a new CommonAnnotationBeanPostProcessor,
 	 * with the init and destroy annotation types set to
-	 * {@link javax.annotation.PostConstruct} and {@link javax.annotation.PreDestroy},
+	 * {@link jakarta.annotation.PostConstruct} and {@link jakarta.annotation.PreDestroy},
 	 * respectively.
 	 */
 	public CommonAnnotationBeanPostProcessor() {
@@ -229,11 +226,11 @@ public void setFallbackToDefaultTypeMatch(boolean fallbackToDefaultTypeMatch) {
 	}
 
 	/**
-	 * Set whether to always use JNDI lookups equivalent to standard Java EE 5 resource
+	 * Set whether to always use JNDI lookups equivalent to standard Jakarta EE resource
 	 * injection, <b>even for {@code name} attributes and default names</b>.
 	 * <p>Default is "false": Resource names are used for Spring bean lookups in the
 	 * containing BeanFactory; only {@code mappedName} attributes point directly
-	 * into JNDI. Switch this flag to "true" for enforcing Java EE style JNDI lookups
+	 * into JNDI. Switch this flag to "true" for enforcing Jakarta EE style JNDI lookups
 	 * in any case, even for {@code name} attributes and default names.
 	 * @see #setJndiFactory
 	 * @see #setResourceFactory
@@ -249,7 +246,7 @@ public void setAlwaysUseJndiLookup(boolean alwaysUseJndiLookup) {
 	 * This factory will also be used if "alwaysUseJndiLookup" is set to "true" in order
 	 * to enforce JNDI lookups even for {@code name} attributes and default names.
 	 * <p>The default is a {@link org.springframework.jndi.support.SimpleJndiBeanFactory}
-	 * for JNDI lookup behavior equivalent to standard Java EE 5 resource injection.
+	 * for JNDI lookup behavior equivalent to standard Jakarta EE resource injection.
 	 * @see #setResourceFactory
 	 * @see #setAlwaysUseJndiLookup
 	 */
@@ -266,7 +263,7 @@ public void setJndiFactory(BeanFactory jndiFactory) {
 	 * if any, looking up resource names as Spring bean names. Specify the resource
 	 * factory explicitly for programmatic usage of this post-processor.
 	 * <p>Specifying Spring's {@link org.springframework.jndi.support.SimpleJndiBeanFactory}
-	 * leads to JNDI lookup behavior equivalent to standard Java EE 5 resource injection,
+	 * leads to JNDI lookup behavior equivalent to standard Jakarta EE resource injection,
 	 * even for {@code name} attributes and default names. This is the same behavior
 	 * that the "alwaysUseJndiLookup" flag enables.
 	 * @see #setAlwaysUseJndiLookup
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
index 725999d89c82..0826d1904a8b 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
@@ -86,7 +86,7 @@
  * <p>{@code @Configuration} is meta-annotated with {@link Component @Component}, therefore
  * {@code @Configuration} classes are candidates for component scanning (typically using
  * Spring XML's {@code <context:component-scan/>} element) and therefore may also take
- * advantage of {@link Autowired @Autowired}/{@link javax.inject.Inject @Inject}
+ * advantage of {@link Autowired @Autowired}/{@link jakarta.inject.Inject @Inject}
  * like any regular {@code @Component}. In particular, if a single constructor is present
  * autowiring semantics will be applied transparently for that constructor:
  *
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
index d9e033a83389..7dc65574f4cd 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
@@ -26,7 +26,7 @@
 
 /**
  * Simple {@link ScopeMetadataResolver} implementation that follows JSR-330 scoping rules:
- * defaulting to prototype scope unless {@link javax.inject.Singleton} is present.
+ * defaulting to prototype scope unless {@link jakarta.inject.Singleton} is present.
  *
  * <p>This scope resolver can be used with {@link ClassPathBeanDefinitionScanner} and
  * {@link AnnotatedBeanDefinitionReader} for standard JSR-330 compliance. However,
@@ -46,7 +46,7 @@ public class Jsr330ScopeMetadataResolver implements ScopeMetadataResolver {
 
 
 	public Jsr330ScopeMetadataResolver() {
-		registerScope("javax.inject.Singleton", BeanDefinition.SCOPE_SINGLETON);
+		registerScope("jakarta.inject.Singleton", BeanDefinition.SCOPE_SINGLETON);
 	}
 
 
@@ -93,7 +93,7 @@ public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 			String found = null;
 			for (String annType : annTypes) {
 				Set<String> metaAnns = annDef.getMetadata().getMetaAnnotationTypes(annType);
-				if (metaAnns.contains("javax.inject.Scope")) {
+				if (metaAnns.contains("jakarta.inject.Scope")) {
 					if (found != null) {
 						throw new IllegalStateException("Found ambiguous scope annotations on bean class [" +
 								definition.getBeanClassName() + "]: " + found + ", " + annType);
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java b/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
index 9d04a9df26ee..e708f36b31fb 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
@@ -44,9 +44,9 @@
  *
  * <p>In addition to its role for component initialization, this annotation may also be placed
  * on injection points marked with {@link org.springframework.beans.factory.annotation.Autowired}
- * or {@link javax.inject.Inject}: In that context, it leads to the creation of a
+ * or {@link jakarta.inject.Inject}: In that context, it leads to the creation of a
  * lazy-resolution proxy for all affected dependencies, as an alternative to using
- * {@link org.springframework.beans.factory.ObjectFactory} or {@link javax.inject.Provider}.
+ * {@link org.springframework.beans.factory.ObjectFactory} or {@link jakarta.inject.Provider}.
  *
  * @author Chris Beams
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java
index ea4f5b64a67c..25715f82cad7 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import javax.management.MBeanServer;
-import javax.naming.NamingException;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -28,14 +27,10 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.jmx.MBeanServerNotFoundException;
 import org.springframework.jmx.export.annotation.AnnotationMBeanExporter;
 import org.springframework.jmx.support.RegistrationPolicy;
-import org.springframework.jmx.support.WebSphereMBeanServerFactoryBean;
-import org.springframework.jndi.JndiLocatorDelegate;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -116,15 +111,6 @@ private void setupServer(AnnotationMBeanExporter exporter, AnnotationAttributes
 			Assert.state(this.beanFactory != null, "No BeanFactory set");
 			exporter.setServer(this.beanFactory.getBean(server, MBeanServer.class));
 		}
-		else {
-			SpecificPlatform specificPlatform = SpecificPlatform.get();
-			if (specificPlatform != null) {
-				MBeanServer mbeanServer = specificPlatform.getMBeanServer();
-				if (mbeanServer != null) {
-					exporter.setServer(mbeanServer);
-				}
-			}
-		}
 	}
 
 	private void setupRegistrationPolicy(AnnotationMBeanExporter exporter, AnnotationAttributes enableMBeanExport) {
@@ -132,58 +118,4 @@ private void setupRegistrationPolicy(AnnotationMBeanExporter exporter, Annotatio
 		exporter.setRegistrationPolicy(registrationPolicy);
 	}
 
-
-	/**
-	 * Specific platforms that might need custom MBean handling.
-	 */
-	public enum SpecificPlatform {
-
-		/**
-		 * Weblogic.
-		 */
-		WEBLOGIC("weblogic.management.Helper") {
-			@Override
-			public MBeanServer getMBeanServer() {
-				try {
-					return new JndiLocatorDelegate().lookup("java:comp/env/jmx/runtime", MBeanServer.class);
-				}
-				catch (NamingException ex) {
-					throw new MBeanServerNotFoundException("Failed to retrieve WebLogic MBeanServer from JNDI", ex);
-				}
-			}
-		},
-
-		/**
-		 * Websphere.
-		 */
-		WEBSPHERE("com.ibm.websphere.management.AdminServiceFactory") {
-			@Override
-			public MBeanServer getMBeanServer() {
-				WebSphereMBeanServerFactoryBean fb = new WebSphereMBeanServerFactoryBean();
-				fb.afterPropertiesSet();
-				return fb.getObject();
-			}
-		};
-
-		private final String identifyingClass;
-
-		SpecificPlatform(String identifyingClass) {
-			this.identifyingClass = identifyingClass;
-		}
-
-		@Nullable
-		public abstract MBeanServer getMBeanServer();
-
-		@Nullable
-		public static SpecificPlatform get() {
-			ClassLoader classLoader = MBeanExportConfiguration.class.getClassLoader();
-			for (SpecificPlatform environment : values()) {
-				if (ClassUtils.isPresent(environment.identifyingClass, classLoader)) {
-					return environment;
-				}
-			}
-			return null;
-		}
-	}
-
 }
diff --git a/spring-context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java
index e1bba29d3305..14caba9b4a23 100644
--- a/spring-context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/config/MBeanExportBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,12 +76,6 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 		if (StringUtils.hasText(serverBeanName)) {
 			builder.addPropertyReference("server", serverBeanName);
 		}
-		else {
-			AbstractBeanDefinition specialServer = MBeanServerBeanDefinitionParser.findServerForSpecialEnvironment();
-			if (specialServer != null) {
-				builder.addPropertyValue("server", specialServer);
-			}
-		}
 
 		String registration = element.getAttribute(REGISTRATION_ATTRIBUTE);
 		RegistrationPolicy registrationPolicy = RegistrationPolicy.FAIL_ON_EXISTING;
diff --git a/spring-context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java
index 78062b65835e..89114cf23628 100644
--- a/spring-context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/config/MBeanServerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,6 @@
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.jmx.support.MBeanServerFactoryBean;
-import org.springframework.jmx.support.WebSphereMBeanServerFactoryBean;
-import org.springframework.jndi.JndiObjectFactoryBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -49,17 +45,6 @@ class MBeanServerBeanDefinitionParser extends AbstractBeanDefinitionParser {
 	private static final String AGENT_ID_ATTRIBUTE = "agent-id";
 
 
-	private static final boolean weblogicPresent;
-
-	private static final boolean webspherePresent;
-
-	static {
-		ClassLoader classLoader = MBeanServerBeanDefinitionParser.class.getClassLoader();
-		weblogicPresent = ClassUtils.isPresent("weblogic.management.Helper", classLoader);
-		webspherePresent = ClassUtils.isPresent("com.ibm.websphere.management.AdminServiceFactory", classLoader);
-	}
-
-
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
 		String id = element.getAttribute(ID_ATTRIBUTE);
@@ -74,10 +59,7 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 			bd.getPropertyValues().add("agentId", agentId);
 			return bd;
 		}
-		AbstractBeanDefinition specialServer = findServerForSpecialEnvironment();
-		if (specialServer != null) {
-			return specialServer;
-		}
+
 		RootBeanDefinition bd = new RootBeanDefinition(MBeanServerFactoryBean.class);
 		bd.getPropertyValues().add("locateExistingServerIfPossible", Boolean.TRUE);
 
@@ -87,19 +69,4 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 		return bd;
 	}
 
-	@Nullable
-	static AbstractBeanDefinition findServerForSpecialEnvironment() {
-		if (weblogicPresent) {
-			RootBeanDefinition bd = new RootBeanDefinition(JndiObjectFactoryBean.class);
-			bd.getPropertyValues().add("jndiName", "java:comp/env/jmx/runtime");
-			return bd;
-		}
-		else if (webspherePresent) {
-			return new RootBeanDefinition(WebSphereMBeanServerFactoryBean.class);
-		}
-		else {
-			return null;
-		}
-	}
-
 }
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
index 5820735ce041..11072d21a095 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,6 @@
 import org.springframework.instrument.classloading.glassfish.GlassFishLoadTimeWeaver;
 import org.springframework.instrument.classloading.jboss.JBossLoadTimeWeaver;
 import org.springframework.instrument.classloading.tomcat.TomcatLoadTimeWeaver;
-import org.springframework.instrument.classloading.weblogic.WebLogicLoadTimeWeaver;
-import org.springframework.instrument.classloading.websphere.WebSphereLoadTimeWeaver;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -45,10 +43,9 @@
  * on a {@code @Configuration} class.
  *
  * <p>This class implements a runtime environment check for obtaining the
- * appropriate weaver implementation. As of Spring Framework 5.0, it detects
- * Oracle WebLogic 10+, GlassFish 4+, Tomcat 8+, WildFly 8+, IBM WebSphere 8.5+,
- * {@link InstrumentationSavingAgent Spring's VM agent}, and any {@link ClassLoader}
- * supported by Spring's {@link ReflectiveLoadTimeWeaver} (such as Liberty's).
+ * appropriate weaver implementation, including
+ * {@link InstrumentationSavingAgent Spring's VM agent} and any {@link ClassLoader}
+ * supported by Spring's {@link ReflectiveLoadTimeWeaver}.
  *
  * @author Juergen Hoeller
  * @author Ramnivas Laddad
@@ -120,12 +117,6 @@ else if (name.startsWith("org.glassfish")) {
 			else if (name.startsWith("org.jboss.modules")) {
 				return new JBossLoadTimeWeaver(classLoader);
 			}
-			else if (name.startsWith("com.ibm.ws.classloader")) {
-				return new WebSphereLoadTimeWeaver(classLoader);
-			}
-			else if (name.startsWith("weblogic")) {
-				return new WebLogicLoadTimeWeaver(classLoader);
-			}
 		}
 		catch (Exception ex) {
 			if (logger.isInfoEnabled()) {
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
deleted file mode 100644
index 1a294ffc9ae3..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import javax.naming.NamingException;
-
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteConnectFailureException;
-import org.springframework.remoting.RemoteLookupFailureException;
-
-/**
- * Base class for interceptors proxying remote Stateless Session Beans.
- * Designed for EJB 2.x, but works for EJB 3 Session Beans as well.
- *
- * <p>Such an interceptor must be the last interceptor in the advice chain.
- * In this case, there is no target object.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor {
-
-	private boolean refreshHomeOnConnectFailure = false;
-
-	private volatile boolean homeAsComponent;
-
-
-
-	/**
-	 * Set whether to refresh the EJB home on connect failure.
-	 * Default is "false".
-	 * <p>Can be turned on to allow for hot restart of the EJB server.
-	 * If a cached EJB home throws an RMI exception that indicates a
-	 * remote connect failure, a fresh home will be fetched and the
-	 * invocation will be retried.
-	 * @see java.rmi.ConnectException
-	 * @see java.rmi.ConnectIOException
-	 * @see java.rmi.NoSuchObjectException
-	 */
-	public void setRefreshHomeOnConnectFailure(boolean refreshHomeOnConnectFailure) {
-		this.refreshHomeOnConnectFailure = refreshHomeOnConnectFailure;
-	}
-
-	@Override
-	protected boolean isHomeRefreshable() {
-		return this.refreshHomeOnConnectFailure;
-	}
-
-
-	/**
-	 * Check for EJB3-style home object that serves as EJB component directly.
-	 */
-	@Override
-	protected Method getCreateMethod(Object home) throws EjbAccessException {
-		if (this.homeAsComponent) {
-			return null;
-		}
-		if (!(home instanceof EJBHome)) {
-			// An EJB3 Session Bean...
-			this.homeAsComponent = true;
-			return null;
-		}
-		return super.getCreateMethod(home);
-	}
-
-
-	/**
-	 * Fetches an EJB home object and delegates to {@code doInvoke}.
-	 * <p>If configured to refresh on connect failure, it will call
-	 * {@link #refreshAndRetry} on corresponding RMI exceptions.
-	 * @see #getHome
-	 * @see #doInvoke
-	 * @see #refreshAndRetry
-	 */
-	@Override
-	@Nullable
-	public Object invokeInContext(MethodInvocation invocation) throws Throwable {
-		try {
-			return doInvoke(invocation);
-		}
-		catch (RemoteConnectFailureException ex) {
-			return handleRemoteConnectFailure(invocation, ex);
-		}
-		catch (RemoteException ex) {
-			if (isConnectFailure(ex)) {
-				return handleRemoteConnectFailure(invocation, ex);
-			}
-			else {
-				throw ex;
-			}
-		}
-	}
-
-	/**
-	 * Determine whether the given RMI exception indicates a connect failure.
-	 * <p>The default implementation delegates to RmiClientInterceptorUtils.
-	 * @param ex the RMI exception to check
-	 * @return whether the exception should be treated as connect failure
-	 * @see org.springframework.remoting.rmi.RmiClientInterceptorUtils#isConnectFailure
-	 */
-	@SuppressWarnings("deprecation")
-	protected boolean isConnectFailure(RemoteException ex) {
-		return org.springframework.remoting.rmi.RmiClientInterceptorUtils.isConnectFailure(ex);
-	}
-
-	@Nullable
-	private Object handleRemoteConnectFailure(MethodInvocation invocation, Exception ex) throws Throwable {
-		if (this.refreshHomeOnConnectFailure) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Could not connect to remote EJB [" + getJndiName() + "] - retrying", ex);
-			}
-			else if (logger.isWarnEnabled()) {
-				logger.warn("Could not connect to remote EJB [" + getJndiName() + "] - retrying");
-			}
-			return refreshAndRetry(invocation);
-		}
-		else {
-			throw ex;
-		}
-	}
-
-	/**
-	 * Refresh the EJB home object and retry the given invocation.
-	 * Called by invoke on connect failure.
-	 * @param invocation the AOP method invocation
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 * @see #invoke
-	 */
-	@Nullable
-	protected Object refreshAndRetry(MethodInvocation invocation) throws Throwable {
-		try {
-			refreshHome();
-		}
-		catch (NamingException ex) {
-			throw new RemoteLookupFailureException("Failed to locate remote EJB [" + getJndiName() + "]", ex);
-		}
-		return doInvoke(invocation);
-	}
-
-
-	/**
-	 * Perform the given invocation on the current EJB home.
-	 * Template method to be implemented by subclasses.
-	 * @param invocation the AOP method invocation
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 * @see #getHome
-	 * @see #newSessionBeanInstance
-	 */
-	@Nullable
-	protected abstract Object doInvoke(MethodInvocation invocation) throws Throwable;
-
-
-	/**
-	 * Return a new instance of the stateless session bean.
-	 * To be invoked by concrete remote SLSB invoker subclasses.
-	 * <p>Can be overridden to change the algorithm.
-	 * @throws NamingException if thrown by JNDI
-	 * @throws InvocationTargetException if thrown by the create method
-	 * @see #create
-	 */
-	protected Object newSessionBeanInstance() throws NamingException, InvocationTargetException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Trying to create reference to remote EJB");
-		}
-		Object ejbInstance = create();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Obtained reference to remote EJB: " + ejbInstance);
-		}
-		return ejbInstance;
-	}
-
-	/**
-	 * Remove the given EJB instance.
-	 * To be invoked by concrete remote SLSB invoker subclasses.
-	 * @param ejb the EJB instance to remove
-	 * @see javax.ejb.EJBObject#remove
-	 */
-	protected void removeSessionBeanInstance(@Nullable EJBObject ejb) {
-		if (ejb != null && !this.homeAsComponent) {
-			try {
-				ejb.remove();
-			}
-			catch (Throwable ex) {
-				logger.warn("Could not invoke 'remove' on remote EJB proxy", ex);
-			}
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
deleted file mode 100644
index 06657499d6e4..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.jndi.JndiObjectLocator;
-import org.springframework.lang.Nullable;
-
-/**
- * Base class for AOP interceptors invoking local or remote Stateless Session Beans.
- * Designed for EJB 2.x, but works for EJB 3 Session Beans as well.
- *
- * <p>Such an interceptor must be the last interceptor in the advice chain.
- * In this case, there is no direct target object: The call is handled in a
- * special way, getting executed on an EJB instance retrieved via an EJB home.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractSlsbInvokerInterceptor extends JndiObjectLocator
-		implements MethodInterceptor {
-
-	private boolean lookupHomeOnStartup = true;
-
-	private boolean cacheHome = true;
-
-	private boolean exposeAccessContext = false;
-
-	/**
-	 * The EJB's home object, potentially cached.
-	 * The type must be Object as it could be either EJBHome or EJBLocalHome.
-	 */
-	@Nullable
-	private Object cachedHome;
-
-	/**
-	 * The no-arg create() method required on EJB homes, potentially cached.
-	 */
-	@Nullable
-	private Method createMethod;
-
-	private final Object homeMonitor = new Object();
-
-
-	/**
-	 * Set whether to look up the EJB home object on startup.
-	 * Default is "true".
-	 * <p>Can be turned off to allow for late start of the EJB server.
-	 * In this case, the EJB home object will be fetched on first access.
-	 * @see #setCacheHome
-	 */
-	public void setLookupHomeOnStartup(boolean lookupHomeOnStartup) {
-		this.lookupHomeOnStartup = lookupHomeOnStartup;
-	}
-
-	/**
-	 * Set whether to cache the EJB home object once it has been located.
-	 * Default is "true".
-	 * <p>Can be turned off to allow for hot restart of the EJB server.
-	 * In this case, the EJB home object will be fetched for each invocation.
-	 * @see #setLookupHomeOnStartup
-	 */
-	public void setCacheHome(boolean cacheHome) {
-		this.cacheHome = cacheHome;
-	}
-
-	/**
-	 * Set whether to expose the JNDI environment context for all access to the target
-	 * EJB, i.e. for all method invocations on the exposed object reference.
-	 * <p>Default is "false", i.e. to only expose the JNDI context for object lookup.
-	 * Switch this flag to "true" in order to expose the JNDI environment (including
-	 * the authorization context) for each EJB invocation, as needed by WebLogic
-	 * for EJBs with authorization requirements.
-	 */
-	public void setExposeAccessContext(boolean exposeAccessContext) {
-		this.exposeAccessContext = exposeAccessContext;
-	}
-
-
-	/**
-	 * Fetches EJB home on startup, if necessary.
-	 * @see #setLookupHomeOnStartup
-	 * @see #refreshHome
-	 */
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		super.afterPropertiesSet();
-		if (this.lookupHomeOnStartup) {
-			// look up EJB home and create method
-			refreshHome();
-		}
-	}
-
-	/**
-	 * Refresh the cached home object, if applicable.
-	 * Also caches the create method on the home object.
-	 * @throws NamingException if thrown by the JNDI lookup
-	 * @see #lookup
-	 * @see #getCreateMethod
-	 */
-	protected void refreshHome() throws NamingException {
-		synchronized (this.homeMonitor) {
-			Object home = lookup();
-			if (this.cacheHome) {
-				this.cachedHome = home;
-				this.createMethod = getCreateMethod(home);
-			}
-		}
-	}
-
-	/**
-	 * Determine the create method of the given EJB home object.
-	 * @param home the EJB home object
-	 * @return the create method
-	 * @throws EjbAccessException if the method couldn't be retrieved
-	 */
-	@Nullable
-	protected Method getCreateMethod(Object home) throws EjbAccessException {
-		try {
-			// Cache the EJB create() method that must be declared on the home interface.
-			return home.getClass().getMethod("create");
-		}
-		catch (NoSuchMethodException ex) {
-			throw new EjbAccessException("EJB home [" + home + "] has no no-arg create() method");
-		}
-	}
-
-	/**
-	 * Return the EJB home object to use. Called for each invocation.
-	 * <p>Default implementation returns the home created on initialization,
-	 * if any; else, it invokes lookup to get a new proxy for each invocation.
-	 * <p>Can be overridden in subclasses, for example to cache a home object
-	 * for a given amount of time before recreating it, or to test the home
-	 * object whether it is still alive.
-	 * @return the EJB home object to use for an invocation
-	 * @throws NamingException if proxy creation failed
-	 * @see #lookup
-	 * @see #getCreateMethod
-	 */
-	protected Object getHome() throws NamingException {
-		if (!this.cacheHome || (this.lookupHomeOnStartup && !isHomeRefreshable())) {
-			return (this.cachedHome != null ? this.cachedHome : lookup());
-		}
-		else {
-			synchronized (this.homeMonitor) {
-				if (this.cachedHome == null) {
-					this.cachedHome = lookup();
-					this.createMethod = getCreateMethod(this.cachedHome);
-				}
-				return this.cachedHome;
-			}
-		}
-	}
-
-	/**
-	 * Return whether the cached EJB home object is potentially
-	 * subject to on-demand refreshing. Default is "false".
-	 */
-	protected boolean isHomeRefreshable() {
-		return false;
-	}
-
-
-	/**
-	 * Prepares the thread context if necessary, and delegates to
-	 * {@link #invokeInContext}.
-	 */
-	@Override
-	@Nullable
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		Context ctx = (this.exposeAccessContext ? getJndiTemplate().getContext() : null);
-		try {
-			return invokeInContext(invocation);
-		}
-		finally {
-			getJndiTemplate().releaseContext(ctx);
-		}
-	}
-
-	/**
-	 * Perform the given invocation on the current EJB home,
-	 * within the thread context being prepared accordingly.
-	 * Template method to be implemented by subclasses.
-	 * @param invocation the AOP method invocation
-	 * @return the invocation result, if any
-	 * @throws Throwable in case of invocation failure
-	 */
-	@Nullable
-	protected abstract Object invokeInContext(MethodInvocation invocation) throws Throwable;
-
-
-	/**
-	 * Invokes the {@code create()} method on the cached EJB home object.
-	 * @return a new EJBObject or EJBLocalObject
-	 * @throws NamingException if thrown by JNDI
-	 * @throws InvocationTargetException if thrown by the create method
-	 */
-	protected Object create() throws NamingException, InvocationTargetException {
-		try {
-			Object home = getHome();
-			Method createMethodToUse = this.createMethod;
-			if (createMethodToUse == null) {
-				createMethodToUse = getCreateMethod(home);
-			}
-			if (createMethodToUse == null) {
-				return home;
-			}
-			// Invoke create() method on EJB home object.
-			return createMethodToUse.invoke(home, (Object[]) null);
-		}
-		catch (IllegalAccessException ex) {
-			throw new EjbAccessException("Could not access EJB home create() method", ex);
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
deleted file mode 100644
index 50f18064c71f..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import org.springframework.core.NestedRuntimeException;
-
-/**
- * Exception that gets thrown when an EJB stub cannot be accessed properly.
- *
- * @author Juergen Hoeller
- * @since 2.0
- */
-@SuppressWarnings("serial")
-public class EjbAccessException extends NestedRuntimeException {
-
-	/**
-	 * Constructor for EjbAccessException.
-	 * @param msg the detail message
-	 */
-	public EjbAccessException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructor for EjbAccessException.
-	 * @param msg the detail message
-	 * @param cause the root cause
-	 */
-	public EjbAccessException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
deleted file mode 100644
index 027b7ef87368..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.EJBLocalObject;
-import javax.naming.NamingException;
-
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Invoker for a local Stateless Session Bean.
- * Designed for EJB 2.x, but works for EJB 3 Session Beans as well.
- *
- * <p>Caches the home object, since a local EJB home can never go stale.
- * See {@link org.springframework.jndi.JndiObjectLocator} for info on
- * how to specify the JNDI location of the target EJB.
- *
- * <p>In a bean container, this class is normally best used as a singleton. However,
- * if that bean container pre-instantiates singletons (as do the XML ApplicationContext
- * variants) you may have a problem if the bean container is loaded before the EJB
- * container loads the target EJB. That is because by default the JNDI lookup will be
- * performed in the init method of this class and cached, but the EJB will not have been
- * bound at the target location yet. The best solution is to set the lookupHomeOnStartup
- * property to false, in which case the home will be fetched on first access to the EJB.
- * (This flag is only true by default for backwards compatibility reasons).
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @see AbstractSlsbInvokerInterceptor#setLookupHomeOnStartup
- * @see AbstractSlsbInvokerInterceptor#setCacheHome
- */
-public class LocalSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor {
-
-	private volatile boolean homeAsComponent;
-
-
-	/**
-	 * This implementation "creates" a new EJB instance for each invocation.
-	 * Can be overridden for custom invocation strategies.
-	 * <p>Alternatively, override {@link #getSessionBeanInstance} and
-	 * {@link #releaseSessionBeanInstance} to change EJB instance creation,
-	 * for example to hold a single shared EJB instance.
-	 */
-	@Override
-	@Nullable
-	public Object invokeInContext(MethodInvocation invocation) throws Throwable {
-		Object ejb = null;
-		try {
-			ejb = getSessionBeanInstance();
-			Method method = invocation.getMethod();
-			if (method.getDeclaringClass().isInstance(ejb)) {
-				// directly implemented
-				return method.invoke(ejb, invocation.getArguments());
-			}
-			else {
-				// not directly implemented
-				Method ejbMethod = ejb.getClass().getMethod(method.getName(), method.getParameterTypes());
-				return ejbMethod.invoke(ejb, invocation.getArguments());
-			}
-		}
-		catch (InvocationTargetException ex) {
-			Throwable targetEx = ex.getTargetException();
-			if (logger.isDebugEnabled()) {
-				logger.debug("Method of local EJB [" + getJndiName() + "] threw exception", targetEx);
-			}
-			if (targetEx instanceof CreateException) {
-				throw new EjbAccessException("Could not create local EJB [" + getJndiName() + "]", targetEx);
-			}
-			else {
-				throw targetEx;
-			}
-		}
-		catch (NamingException ex) {
-			throw new EjbAccessException("Failed to locate local EJB [" + getJndiName() + "]", ex);
-		}
-		catch (IllegalAccessException ex) {
-			throw new EjbAccessException("Could not access method [" + invocation.getMethod().getName() +
-				"] of local EJB [" + getJndiName() + "]", ex);
-		}
-		finally {
-			if (ejb instanceof EJBLocalObject) {
-				releaseSessionBeanInstance((EJBLocalObject) ejb);
-			}
-		}
-	}
-
-	/**
-	 * Check for EJB3-style home object that serves as EJB component directly.
-	 */
-	@Override
-	protected Method getCreateMethod(Object home) throws EjbAccessException {
-		if (this.homeAsComponent) {
-			return null;
-		}
-		if (!(home instanceof EJBLocalHome)) {
-			// An EJB3 Session Bean...
-			this.homeAsComponent = true;
-			return null;
-		}
-		return super.getCreateMethod(home);
-	}
-
-	/**
-	 * Return an EJB instance to delegate the call to.
-	 * Default implementation delegates to newSessionBeanInstance.
-	 * @throws NamingException if thrown by JNDI
-	 * @throws InvocationTargetException if thrown by the create method
-	 * @see #newSessionBeanInstance
-	 */
-	protected Object getSessionBeanInstance() throws NamingException, InvocationTargetException {
-		return newSessionBeanInstance();
-	}
-
-	/**
-	 * Release the given EJB instance.
-	 * Default implementation delegates to removeSessionBeanInstance.
-	 * @param ejb the EJB instance to release
-	 * @see #removeSessionBeanInstance
-	 */
-	protected void releaseSessionBeanInstance(EJBLocalObject ejb) {
-		removeSessionBeanInstance(ejb);
-	}
-
-	/**
-	 * Return a new instance of the stateless session bean.
-	 * Can be overridden to change the algorithm.
-	 * @throws NamingException if thrown by JNDI
-	 * @throws InvocationTargetException if thrown by the create method
-	 * @see #create
-	 */
-	protected Object newSessionBeanInstance() throws NamingException, InvocationTargetException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Trying to create reference to local EJB");
-		}
-		Object ejbInstance = create();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Obtained reference to local EJB: " + ejbInstance);
-		}
-		return ejbInstance;
-	}
-
-	/**
-	 * Remove the given EJB instance.
-	 * @param ejb the EJB instance to remove
-	 * @see javax.ejb.EJBLocalObject#remove()
-	 */
-	protected void removeSessionBeanInstance(@Nullable EJBLocalObject ejb) {
-		if (ejb != null && !this.homeAsComponent) {
-			try {
-				ejb.remove();
-			}
-			catch (Throwable ex) {
-				logger.warn("Could not invoke 'remove' on local EJB proxy", ex);
-			}
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
deleted file mode 100644
index 1b780af7258f..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import javax.naming.NamingException;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-/**
- * Convenient {@link FactoryBean} for local Stateless Session Bean (SLSB) proxies.
- * Designed for EJB 2.x, but works for EJB 3 Session Beans as well.
- *
- * <p>See {@link org.springframework.jndi.JndiObjectLocator} for info on
- * how to specify the JNDI location of the target EJB.
- *
- * <p>If you want control over interceptor chaining, use an AOP ProxyFactoryBean
- * with LocalSlsbInvokerInterceptor rather than rely on this class.
- *
- * <p>In a bean container, this class is normally best used as a singleton. However,
- * if that bean container pre-instantiates singletons (as do the XML ApplicationContext
- * variants) you may have a problem if the bean container is loaded before the EJB
- * container loads the target EJB. That is because by default the JNDI lookup will be
- * performed in the init method of this class and cached, but the EJB will not have been
- * bound at the target location yet. The best solution is to set the "lookupHomeOnStartup"
- * property to "false", in which case the home will be fetched on first access to the EJB.
- * (This flag is only true by default for backwards compatibility reasons).
- *
- * @author Rod Johnson
- * @author Colin Sampaleanu
- * @since 09.05.2003
- * @see AbstractSlsbInvokerInterceptor#setLookupHomeOnStartup
- * @see AbstractSlsbInvokerInterceptor#setCacheHome
- */
-public class LocalStatelessSessionProxyFactoryBean extends LocalSlsbInvokerInterceptor
-		implements FactoryBean<Object>, BeanClassLoaderAware {
-
-	/** The business interface of the EJB we're proxying. */
-	@Nullable
-	private Class<?> businessInterface;
-
-	@Nullable
-	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
-
-	/** EJBLocalObject. */
-	@Nullable
-	private Object proxy;
-
-
-	/**
-	 * Set the business interface of the EJB we're proxying.
-	 * This will normally be a super-interface of the EJB local component interface.
-	 * Using a business methods interface is a best practice when implementing EJBs.
-	 * @param businessInterface set the business interface of the EJB
-	 */
-	public void setBusinessInterface(@Nullable Class<?> businessInterface) {
-		this.businessInterface = businessInterface;
-	}
-
-	/**
-	 * Return the business interface of the EJB we're proxying.
-	 */
-	@Nullable
-	public Class<?> getBusinessInterface() {
-		return this.businessInterface;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		super.afterPropertiesSet();
-		if (this.businessInterface == null) {
-			throw new IllegalArgumentException("businessInterface is required");
-		}
-		this.proxy = new ProxyFactory(this.businessInterface, this).getProxy(this.beanClassLoader);
-	}
-
-
-	@Override
-	@Nullable
-	public Object getObject() {
-		return this.proxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return this.businessInterface;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
deleted file mode 100644
index 292ddb640937..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import java.lang.reflect.InvocationTargetException;
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBObject;
-import javax.naming.NamingException;
-
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.lang.Nullable;
-import org.springframework.remoting.RemoteLookupFailureException;
-
-/**
- * Basic invoker for a remote Stateless Session Bean.
- * Designed for EJB 2.x, but works for EJB 3 Session Beans as well.
- *
- * <p>"Creates" a new EJB instance for each invocation, or caches the session
- * bean instance for all invocations (see {@link #setCacheSessionBean}).
- * See {@link org.springframework.jndi.JndiObjectLocator} for info on
- * how to specify the JNDI location of the target EJB.
- *
- * <p>In a bean container, this class is normally best used as a singleton. However,
- * if that bean container pre-instantiates singletons (as do the XML ApplicationContext
- * variants) you may have a problem if the bean container is loaded before the EJB
- * container loads the target EJB. That is because by default the JNDI lookup will be
- * performed in the init method of this class and cached, but the EJB will not have been
- * bound at the target location yet. The best solution is to set the "lookupHomeOnStartup"
- * property to "false", in which case the home will be fetched on first access to the EJB.
- * (This flag is only true by default for backwards compatibility reasons).
- *
- * <p>This invoker is typically used with an RMI business interface, which serves
- * as super-interface of the EJB component interface. Alternatively, this invoker
- * can also proxy a remote SLSB with a matching non-RMI business interface, i.e. an
- * interface that mirrors the EJB business methods but does not declare RemoteExceptions.
- * In the latter case, RemoteExceptions thrown by the EJB stub will automatically get
- * converted to Spring's unchecked RemoteAccessException.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 09.05.2003
- * @see org.springframework.remoting.RemoteAccessException
- * @see AbstractSlsbInvokerInterceptor#setLookupHomeOnStartup
- * @see AbstractSlsbInvokerInterceptor#setCacheHome
- * @see AbstractRemoteSlsbInvokerInterceptor#setRefreshHomeOnConnectFailure
- */
-public class SimpleRemoteSlsbInvokerInterceptor extends AbstractRemoteSlsbInvokerInterceptor
-		implements DisposableBean {
-
-	private boolean cacheSessionBean = false;
-
-	@Nullable
-	private Object beanInstance;
-
-	private final Object beanInstanceMonitor = new Object();
-
-
-	/**
-	 * Set whether to cache the actual session bean object.
-	 * <p>Off by default for standard EJB compliance. Turn this flag
-	 * on to optimize session bean access for servers that are
-	 * known to allow for caching the actual session bean object.
-	 * @see #setCacheHome
-	 */
-	public void setCacheSessionBean(boolean cacheSessionBean) {
-		this.cacheSessionBean = cacheSessionBean;
-	}
-
-
-	/**
-	 * This implementation "creates" a new EJB instance for each invocation.
-	 * Can be overridden for custom invocation strategies.
-	 * <p>Alternatively, override {@link #getSessionBeanInstance} and
-	 * {@link #releaseSessionBeanInstance} to change EJB instance creation,
-	 * for example to hold a single shared EJB component instance.
-	 */
-	@Override
-	@Nullable
-	@SuppressWarnings("deprecation")
-	protected Object doInvoke(MethodInvocation invocation) throws Throwable {
-		Object ejb = null;
-		try {
-			ejb = getSessionBeanInstance();
-			return org.springframework.remoting.rmi.RmiClientInterceptorUtils.invokeRemoteMethod(invocation, ejb);
-		}
-		catch (NamingException ex) {
-			throw new RemoteLookupFailureException("Failed to locate remote EJB [" + getJndiName() + "]", ex);
-		}
-		catch (InvocationTargetException ex) {
-			Throwable targetEx = ex.getTargetException();
-			if (targetEx instanceof RemoteException) {
-				RemoteException rex = (RemoteException) targetEx;
-				throw org.springframework.remoting.rmi.RmiClientInterceptorUtils.convertRmiAccessException(
-						invocation.getMethod(), rex, isConnectFailure(rex), getJndiName());
-			}
-			else if (targetEx instanceof CreateException) {
-				throw org.springframework.remoting.rmi.RmiClientInterceptorUtils.convertRmiAccessException(
-						invocation.getMethod(), targetEx, "Could not create remote EJB [" + getJndiName() + "]");
-			}
-			throw targetEx;
-		}
-		finally {
-			if (ejb instanceof EJBObject) {
-				releaseSessionBeanInstance((EJBObject) ejb);
-			}
-		}
-	}
-
-	/**
-	 * Return an EJB component instance to delegate the call to.
-	 * <p>The default implementation delegates to {@link #newSessionBeanInstance}.
-	 * @return the EJB component instance
-	 * @throws NamingException if thrown by JNDI
-	 * @throws InvocationTargetException if thrown by the create method
-	 * @see #newSessionBeanInstance
-	 */
-	protected Object getSessionBeanInstance() throws NamingException, InvocationTargetException {
-		if (this.cacheSessionBean) {
-			synchronized (this.beanInstanceMonitor) {
-				if (this.beanInstance == null) {
-					this.beanInstance = newSessionBeanInstance();
-				}
-				return this.beanInstance;
-			}
-		}
-		else {
-			return newSessionBeanInstance();
-		}
-	}
-
-	/**
-	 * Release the given EJB instance.
-	 * <p>The default implementation delegates to {@link #removeSessionBeanInstance}.
-	 * @param ejb the EJB component instance to release
-	 * @see #removeSessionBeanInstance
-	 */
-	protected void releaseSessionBeanInstance(EJBObject ejb) {
-		if (!this.cacheSessionBean) {
-			removeSessionBeanInstance(ejb);
-		}
-	}
-
-	/**
-	 * Reset the cached session bean instance, if necessary.
-	 */
-	@Override
-	protected void refreshHome() throws NamingException {
-		super.refreshHome();
-		if (this.cacheSessionBean) {
-			synchronized (this.beanInstanceMonitor) {
-				this.beanInstance = null;
-			}
-		}
-	}
-
-	/**
-	 * Remove the cached session bean instance, if necessary.
-	 */
-	@Override
-	public void destroy() {
-		if (this.cacheSessionBean) {
-			synchronized (this.beanInstanceMonitor) {
-				if (this.beanInstance instanceof EJBObject) {
-					removeSessionBeanInstance((EJBObject) this.beanInstance);
-				}
-			}
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
deleted file mode 100644
index 2cf93ad81fa5..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import javax.naming.NamingException;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-/**
- * Convenient {@link FactoryBean} for remote SLSB proxies.
- * Designed for EJB 2.x, but works for EJB 3 Session Beans as well.
- *
- * <p>See {@link org.springframework.jndi.JndiObjectLocator} for info on
- * how to specify the JNDI location of the target EJB.
- *
- * <p>If you want control over interceptor chaining, use an AOP ProxyFactoryBean
- * with SimpleRemoteSlsbInvokerInterceptor rather than rely on this class.
- *
- * <p>In a bean container, this class is normally best used as a singleton. However,
- * if that bean container pre-instantiates singletons (as do the XML ApplicationContext
- * variants) you may have a problem if the bean container is loaded before the EJB
- * container loads the target EJB. That is because by default the JNDI lookup will be
- * performed in the init method of this class and cached, but the EJB will not have been
- * bound at the target location yet. The best solution is to set the lookupHomeOnStartup
- * property to false, in which case the home will be fetched on first access to the EJB.
- * (This flag is only true by default for backwards compatibility reasons).
- *
- * <p>This proxy factory is typically used with an RMI business interface, which serves
- * as super-interface of the EJB component interface. Alternatively, this factory
- * can also proxy a remote SLSB with a matching non-RMI business interface, i.e. an
- * interface that mirrors the EJB business methods but does not declare RemoteExceptions.
- * In the latter case, RemoteExceptions thrown by the EJB stub will automatically get
- * converted to Spring's unchecked RemoteAccessException.
- *
- * @author Rod Johnson
- * @author Colin Sampaleanu
- * @author Juergen Hoeller
- * @since 09.05.2003
- * @see org.springframework.remoting.RemoteAccessException
- * @see AbstractSlsbInvokerInterceptor#setLookupHomeOnStartup
- * @see AbstractSlsbInvokerInterceptor#setCacheHome
- * @see AbstractRemoteSlsbInvokerInterceptor#setRefreshHomeOnConnectFailure
- */
-public class SimpleRemoteStatelessSessionProxyFactoryBean extends SimpleRemoteSlsbInvokerInterceptor
-	implements FactoryBean<Object>, BeanClassLoaderAware {
-
-	/** The business interface of the EJB we're proxying. */
-	@Nullable
-	private Class<?> businessInterface;
-
-	@Nullable
-	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
-
-	/** EJBObject. */
-	@Nullable
-	private Object proxy;
-
-
-	/**
-	 * Set the business interface of the EJB we're proxying.
-	 * This will normally be a super-interface of the EJB remote component interface.
-	 * Using a business methods interface is a best practice when implementing EJBs.
-	 * <p>You can also specify a matching non-RMI business interface, i.e. an interface
-	 * that mirrors the EJB business methods but does not declare RemoteExceptions.
-	 * In this case, RemoteExceptions thrown by the EJB stub will automatically get
-	 * converted to Spring's generic RemoteAccessException.
-	 * @param businessInterface the business interface of the EJB
-	 */
-	public void setBusinessInterface(@Nullable Class<?> businessInterface) {
-		this.businessInterface = businessInterface;
-	}
-
-	/**
-	 * Return the business interface of the EJB we're proxying.
-	 */
-	@Nullable
-	public Class<?> getBusinessInterface() {
-		return this.businessInterface;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		super.afterPropertiesSet();
-		if (this.businessInterface == null) {
-			throw new IllegalArgumentException("businessInterface is required");
-		}
-		this.proxy = new ProxyFactory(this.businessInterface, this).getProxy(this.beanClassLoader);
-	}
-
-
-	@Override
-	@Nullable
-	public Object getObject() {
-		return this.proxy;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return this.businessInterface;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
deleted file mode 100644
index 54011fa2eccb..000000000000
--- a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * This package contains classes that allow easy access to EJBs.
- * The basis are AOP interceptors run before and after the EJB invocation.
- * In particular, the classes in this package allow transparent access
- * to stateless session beans (SLSBs) with local interfaces, avoiding
- * the need for application code using them to use EJB-specific APIs
- * and JNDI lookups, and work with business interfaces that could be
- * implemented without using EJB. This provides a valuable decoupling
- * of client (such as web components) and business objects (which may
- * or may not be EJBs). This gives us the choice of introducing EJB
- * into an application (or removing EJB from an application) without
- * affecting code using business objects.
- *
- * <p>The motivation for the classes in this package is discussed in Chapter 11 of
- * <a href="https://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
- * by Rod Johnson (Wrox, 2002).
- *
- * <p>However, the implementation and naming of classes in this package has changed.
- * It now uses FactoryBeans and AOP, rather than the custom bean definitions described in
- * <i>Expert One-on-One J2EE</i>.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.ejb.access;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
index 5027c4aa2876..035fad6581f5 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 
 import org.w3c.dom.Element;
 
-import org.springframework.ejb.access.LocalStatelessSessionProxyFactoryBean;
+import org.springframework.jndi.JndiObjectFactoryBean;
 
 /**
  * {@link org.springframework.beans.factory.xml.BeanDefinitionParser}
  * implementation for parsing '{@code local-slsb}' tags and
- * creating {@link LocalStatelessSessionProxyFactoryBean} definitions.
+ * creating plain {@link JndiObjectFactoryBean} definitions.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -32,8 +32,8 @@
 class LocalStatelessSessionBeanDefinitionParser extends AbstractJndiLocatingBeanDefinitionParser {
 
 	@Override
-	protected String getBeanClassName(Element element) {
-		return "org.springframework.ejb.access.LocalStatelessSessionProxyFactoryBean";
+	protected Class<?> getBeanClass(Element element) {
+		return JndiObjectFactoryBean.class;
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
index 15883bdb14ca..a88c5f646189 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 
 import org.w3c.dom.Element;
 
-import org.springframework.ejb.access.SimpleRemoteStatelessSessionProxyFactoryBean;
+import org.springframework.jndi.JndiObjectFactoryBean;
 
 /**
  * {@link org.springframework.beans.factory.xml.BeanDefinitionParser}
  * implementation for parsing '{@code remote-slsb}' tags and
- * creating {@link SimpleRemoteStatelessSessionProxyFactoryBean} definitions.
+ * creating plain {@link JndiObjectFactoryBean} definitions.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -32,8 +32,8 @@
 class RemoteStatelessSessionBeanDefinitionParser extends AbstractJndiLocatingBeanDefinitionParser {
 
 	@Override
-	protected String getBeanClassName(Element element) {
-		return "org.springframework.ejb.access.SimpleRemoteStatelessSessionProxyFactoryBean";
+	protected Class<?> getBeanClass(Element element) {
+		return JndiObjectFactoryBean.class;
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/package-info.java b/spring-context/src/main/java/org/springframework/ejb/config/package-info.java
index a5442d93e90d..501900852b51 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Support package for EJB/Java EE-related configuration,
+ * Support package for EJB/Jakarta EE-related configuration,
  * with XML schema being the primary configuration format.
  */
 @NonNullApi
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
deleted file mode 100644
index 1e4e0cd05bb5..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- * 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.instrument.classloading.weblogic;
-
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.springframework.util.Assert;
-
-/**
- * Reflective wrapper around a WebLogic 10 class loader. Used to
- * encapsulate the classloader-specific methods (discovered and
- * called through reflection) from the load-time weaver.
- *
- * @author Costin Leau
- * @author Juergen Hoeller
- * @since 2.5
- */
-class WebLogicClassLoaderAdapter {
-
-	private static final String GENERIC_CLASS_LOADER_NAME = "weblogic.utils.classloaders.GenericClassLoader";
-
-	private static final String CLASS_PRE_PROCESSOR_NAME = "weblogic.utils.classloaders.ClassPreProcessor";
-
-
-	private final ClassLoader classLoader;
-
-	private final Class<?> wlPreProcessorClass;
-
-	private final Method addPreProcessorMethod;
-
-	private final Method getClassFinderMethod;
-
-	private final Method getParentMethod;
-
-	private final Constructor<?> wlGenericClassLoaderConstructor;
-
-
-	public WebLogicClassLoaderAdapter(ClassLoader classLoader) {
-		Class<?> wlGenericClassLoaderClass;
-		try {
-			wlGenericClassLoaderClass = classLoader.loadClass(GENERIC_CLASS_LOADER_NAME);
-			this.wlPreProcessorClass = classLoader.loadClass(CLASS_PRE_PROCESSOR_NAME);
-			this.addPreProcessorMethod = classLoader.getClass().getMethod(
-					"addInstanceClassPreProcessor", this.wlPreProcessorClass);
-			this.getClassFinderMethod = classLoader.getClass().getMethod("getClassFinder");
-			this.getParentMethod = classLoader.getClass().getMethod("getParent");
-			this.wlGenericClassLoaderConstructor = wlGenericClassLoaderClass.getConstructor(
-					this.getClassFinderMethod.getReturnType(), ClassLoader.class);
-		}
-		catch (Throwable ex) {
-			throw new IllegalStateException(
-					"Could not initialize WebLogic LoadTimeWeaver because WebLogic 10 API classes are not available", ex);
-		}
-
-		if (!wlGenericClassLoaderClass.isInstance(classLoader)) {
-			throw new IllegalArgumentException(
-					"ClassLoader must be an instance of [" + wlGenericClassLoaderClass.getName() + "]: " + classLoader);
-		}
-		this.classLoader = classLoader;
-	}
-
-
-	public void addTransformer(ClassFileTransformer transformer) {
-		Assert.notNull(transformer, "ClassFileTransformer must not be null");
-		try {
-			InvocationHandler adapter = new WebLogicClassPreProcessorAdapter(transformer, this.classLoader);
-			Object adapterInstance = Proxy.newProxyInstance(this.wlPreProcessorClass.getClassLoader(),
-					new Class<?>[] {this.wlPreProcessorClass}, adapter);
-			this.addPreProcessorMethod.invoke(this.classLoader, adapterInstance);
-		}
-		catch (InvocationTargetException ex) {
-			throw new IllegalStateException("WebLogic addInstanceClassPreProcessor method threw exception", ex.getCause());
-		}
-		catch (Throwable ex) {
-			throw new IllegalStateException("Could not invoke WebLogic addInstanceClassPreProcessor method", ex);
-		}
-	}
-
-	public ClassLoader getClassLoader() {
-		return this.classLoader;
-	}
-
-	public ClassLoader getThrowawayClassLoader() {
-		try {
-			Object classFinder = this.getClassFinderMethod.invoke(this.classLoader);
-			Object parent = this.getParentMethod.invoke(this.classLoader);
-			// arguments for 'clone'-like method
-			return (ClassLoader) this.wlGenericClassLoaderConstructor.newInstance(classFinder, parent);
-		}
-		catch (InvocationTargetException ex) {
-			throw new IllegalStateException("WebLogic GenericClassLoader constructor failed", ex.getCause());
-		}
-		catch (Throwable ex) {
-			throw new IllegalStateException("Could not construct WebLogic GenericClassLoader", ex);
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
deleted file mode 100644
index 36c8834412e9..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- * 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.instrument.classloading.weblogic;
-
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.instrument.IllegalClassFormatException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Adapter that implements WebLogic ClassPreProcessor interface, delegating to a
- * standard JDK {@link ClassFileTransformer} underneath.
- *
- * <p>To avoid compile time checks again the vendor API, a dynamic proxy is
- * being used.
- *
- * @author Costin Leau
- * @author Juergen Hoeller
- * @since 2.5
- */
-class WebLogicClassPreProcessorAdapter implements InvocationHandler {
-
-	private final ClassFileTransformer transformer;
-
-	private final ClassLoader loader;
-
-
-	/**
-	 * Construct a new {@link WebLogicClassPreProcessorAdapter}.
-	 */
-	public WebLogicClassPreProcessorAdapter(ClassFileTransformer transformer, ClassLoader loader) {
-		this.transformer = transformer;
-		this.loader = loader;
-	}
-
-
-	@Override
-	@Nullable
-	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-		String name = method.getName();
-		if ("equals".equals(name)) {
-			return (proxy == args[0]);
-		}
-		else if ("hashCode".equals(name)) {
-			return hashCode();
-		}
-		else if ("toString".equals(name)) {
-			return toString();
-		}
-		else if ("initialize".equals(name)) {
-			initialize((Hashtable<?, ?>) args[0]);
-			return null;
-		}
-		else if ("preProcess".equals(name)) {
-			return preProcess((String) args[0], (byte[]) args[1]);
-		}
-		else {
-			throw new IllegalArgumentException("Unknown method: " + method);
-		}
-	}
-
-	public void initialize(Hashtable<?, ?> params) {
-	}
-
-	public byte[] preProcess(String className, byte[] classBytes) {
-		try {
-			byte[] result = this.transformer.transform(this.loader, className, null, null, classBytes);
-			return (result != null ? result : classBytes);
-		}
-		catch (IllegalClassFormatException ex) {
-			throw new IllegalStateException("Cannot transform due to illegal class format", ex);
-		}
-	}
-
-	@Override
-	public String toString() {
-		return getClass().getName() + " for transformer: " + this.transformer;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
deleted file mode 100644
index 9ca2b222b480..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- * 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.instrument.classloading.weblogic;
-
-import java.lang.instrument.ClassFileTransformer;
-
-import org.springframework.core.OverridingClassLoader;
-import org.springframework.instrument.classloading.LoadTimeWeaver;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * {@link LoadTimeWeaver} implementation for WebLogic's instrumentable
- * ClassLoader.
- *
- * <p><b>NOTE:</b> Requires BEA WebLogic version 10 or higher.
- *
- * @author Costin Leau
- * @author Juergen Hoeller
- * @since 2.5
- */
-public class WebLogicLoadTimeWeaver implements LoadTimeWeaver {
-
-	private final WebLogicClassLoaderAdapter classLoader;
-
-
-	/**
-	 * Creates a new instance of the {@link WebLogicLoadTimeWeaver} class using
-	 * the default {@link ClassLoader class loader}.
-	 * @see org.springframework.util.ClassUtils#getDefaultClassLoader()
-	 */
-	public WebLogicLoadTimeWeaver() {
-		this(ClassUtils.getDefaultClassLoader());
-	}
-
-	/**
-	 * Creates a new instance of the {@link WebLogicLoadTimeWeaver} class using
-	 * the supplied {@link ClassLoader}.
-	 * @param classLoader the {@code ClassLoader} to delegate to for weaving
-	 */
-	public WebLogicLoadTimeWeaver(@Nullable ClassLoader classLoader) {
-		Assert.notNull(classLoader, "ClassLoader must not be null");
-		this.classLoader = new WebLogicClassLoaderAdapter(classLoader);
-	}
-
-
-	@Override
-	public void addTransformer(ClassFileTransformer transformer) {
-		this.classLoader.addTransformer(transformer);
-	}
-
-	@Override
-	public ClassLoader getInstrumentableClassLoader() {
-		return this.classLoader.getClassLoader();
-	}
-
-	@Override
-	public ClassLoader getThrowawayClassLoader() {
-		return new OverridingClassLoader(this.classLoader.getClassLoader(),
-				this.classLoader.getThrowawayClassLoader());
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
deleted file mode 100644
index 9335b6934192..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Support for class instrumentation on BEA WebLogic 10+.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.instrument.classloading.weblogic;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
deleted file mode 100644
index bb68f0748e6f..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.
- * 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.instrument.classloading.websphere;
-
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.List;
-
-import org.springframework.util.Assert;
-
-/**
- * Reflective wrapper around a WebSphere 7+ class loader. Used to
- * encapsulate the classloader-specific methods (discovered and
- * called through reflection) from the load-time weaver.
- *
- * @author Costin Leau
- * @author Juergen Hoeller
- * @since 3.1
- */
-class WebSphereClassLoaderAdapter {
-
-	private static final String COMPOUND_CLASS_LOADER_NAME = "com.ibm.ws.classloader.CompoundClassLoader";
-
-	private static final String CLASS_PRE_PROCESSOR_NAME = "com.ibm.websphere.classloader.ClassLoaderInstancePreDefinePlugin";
-
-	private static final String PLUGINS_FIELD = "preDefinePlugins";
-
-
-	private ClassLoader classLoader;
-
-	private Class<?> wsPreProcessorClass;
-
-	private Method addPreDefinePlugin;
-
-	private Constructor<? extends ClassLoader> cloneConstructor;
-
-	private Field transformerList;
-
-
-	public WebSphereClassLoaderAdapter(ClassLoader classLoader) {
-		Class<?> wsCompoundClassLoaderClass;
-		try {
-			wsCompoundClassLoaderClass = classLoader.loadClass(COMPOUND_CLASS_LOADER_NAME);
-			this.cloneConstructor = classLoader.getClass().getDeclaredConstructor(wsCompoundClassLoaderClass);
-			this.cloneConstructor.setAccessible(true);
-
-			this.wsPreProcessorClass = classLoader.loadClass(CLASS_PRE_PROCESSOR_NAME);
-			this.addPreDefinePlugin = classLoader.getClass().getMethod("addPreDefinePlugin", this.wsPreProcessorClass);
-			this.transformerList = wsCompoundClassLoaderClass.getDeclaredField(PLUGINS_FIELD);
-			this.transformerList.setAccessible(true);
-		}
-		catch (Throwable ex) {
-			throw new IllegalStateException(
-					"Could not initialize WebSphere LoadTimeWeaver because WebSphere API classes are not available", ex);
-		}
-
-		if (!wsCompoundClassLoaderClass.isInstance(classLoader)) {
-			throw new IllegalArgumentException(
-					"ClassLoader must be an instance of [" + COMPOUND_CLASS_LOADER_NAME + "]: " + classLoader);
-		}
-		this.classLoader = classLoader;
-	}
-
-
-	public ClassLoader getClassLoader() {
-		return this.classLoader;
-	}
-
-	public void addTransformer(ClassFileTransformer transformer) {
-		Assert.notNull(transformer, "ClassFileTransformer must not be null");
-		try {
-			InvocationHandler adapter = new WebSphereClassPreDefinePlugin(transformer);
-			Object adapterInstance = Proxy.newProxyInstance(this.wsPreProcessorClass.getClassLoader(),
-					new Class<?>[] {this.wsPreProcessorClass}, adapter);
-			this.addPreDefinePlugin.invoke(this.classLoader, adapterInstance);
-		}
-		catch (InvocationTargetException ex) {
-			throw new IllegalStateException("WebSphere addPreDefinePlugin method threw exception", ex.getCause());
-		}
-		catch (Throwable ex) {
-			throw new IllegalStateException("Could not invoke WebSphere addPreDefinePlugin method", ex);
-		}
-	}
-
-	public ClassLoader getThrowawayClassLoader() {
-		try {
-			ClassLoader loader = this.cloneConstructor.newInstance(getClassLoader());
-			// Clear out the transformers (copied as well)
-			List<?> list = (List<?>) this.transformerList.get(loader);
-			list.clear();
-			return loader;
-		}
-		catch (InvocationTargetException ex) {
-			throw new IllegalStateException("WebSphere CompoundClassLoader constructor failed", ex.getCause());
-		}
-		catch (Throwable ex) {
-			throw new IllegalStateException("Could not construct WebSphere CompoundClassLoader", ex);
-		}
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
deleted file mode 100644
index c2d96a6ab9aa..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.
- * 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.instrument.classloading.websphere;
-
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.security.CodeSource;
-
-import org.springframework.util.FileCopyUtils;
-
-/**
- * Adapter that implements WebSphere 7.0 ClassPreProcessPlugin interface,
- * delegating to a standard JDK {@link ClassFileTransformer} underneath.
- *
- * <p>To avoid compile time checks again the vendor API, a dynamic proxy is
- * being used.
- *
- * @author Costin Leau
- * @since 3.1
- */
-class WebSphereClassPreDefinePlugin implements InvocationHandler {
-
-	private final ClassFileTransformer transformer;
-
-
-	/**
-	 * Create a new {@link WebSphereClassPreDefinePlugin}.
-	 * @param transformer the {@link ClassFileTransformer} to be adapted
-	 * (must not be {@code null})
-	 */
-	public WebSphereClassPreDefinePlugin(ClassFileTransformer transformer) {
-		this.transformer = transformer;
-		ClassLoader classLoader = transformer.getClass().getClassLoader();
-
-		// First force the full class loading of the weaver by invoking transformation on a dummy class
-		try {
-			String dummyClass = Dummy.class.getName().replace('.', '/');
-			byte[] bytes = FileCopyUtils.copyToByteArray(classLoader.getResourceAsStream(dummyClass + ".class"));
-			transformer.transform(classLoader, dummyClass, null, null, bytes);
-		}
-		catch (Throwable ex) {
-			throw new IllegalArgumentException("Cannot load transformer", ex);
-		}
-	}
-
-
-	@Override
-	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-		switch (method.getName()) {
-			case "equals":
-				return (proxy == args[0]);
-			case "hashCode":
-				return hashCode();
-			case "toString":
-				return toString();
-			case "transformClass":
-				return transform((String) args[0], (byte[]) args[1], (CodeSource) args[2], (ClassLoader) args[3]);
-			default:
-				throw new IllegalArgumentException("Unknown method: " + method);
-		}
-	}
-
-	protected byte[] transform(String className, byte[] classfileBuffer, CodeSource codeSource, ClassLoader classLoader)
-			throws Exception {
-
-		// NB: WebSphere passes className as "." without class while the transformer expects a VM "/" format
-		byte[] result = this.transformer.transform(classLoader, className.replace('.', '/'), null, null, classfileBuffer);
-		return (result != null ? result : classfileBuffer);
-	}
-
-	@Override
-	public String toString() {
-		return getClass().getName() + " for transformer: " + this.transformer;
-	}
-
-
-	private static class Dummy {
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
deleted file mode 100644
index 0160aefe1604..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- * 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.instrument.classloading.websphere;
-
-import java.lang.instrument.ClassFileTransformer;
-
-import org.springframework.core.OverridingClassLoader;
-import org.springframework.instrument.classloading.LoadTimeWeaver;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-/**
- * {@link LoadTimeWeaver} implementation for WebSphere's instrumentable ClassLoader.
- * Compatible with WebSphere 7 as well as 8 and 9.
- *
- * @author Costin Leau
- * @since 3.1
- */
-public class WebSphereLoadTimeWeaver implements LoadTimeWeaver {
-
-	private final WebSphereClassLoaderAdapter classLoader;
-
-
-	/**
-	 * Create a new instance of the {@link WebSphereLoadTimeWeaver} class using
-	 * the default {@link ClassLoader class loader}.
-	 * @see org.springframework.util.ClassUtils#getDefaultClassLoader()
-	 */
-	public WebSphereLoadTimeWeaver() {
-		this(ClassUtils.getDefaultClassLoader());
-	}
-
-	/**
-	 * Create a new instance of the {@link WebSphereLoadTimeWeaver} class using
-	 * the supplied {@link ClassLoader}.
-	 * @param classLoader the {@code ClassLoader} to delegate to for weaving
-	 */
-	public WebSphereLoadTimeWeaver(@Nullable ClassLoader classLoader) {
-		Assert.notNull(classLoader, "ClassLoader must not be null");
-		this.classLoader = new WebSphereClassLoaderAdapter(classLoader);
-	}
-
-
-	@Override
-	public void addTransformer(ClassFileTransformer transformer) {
-		this.classLoader.addTransformer(transformer);
-	}
-
-	@Override
-	public ClassLoader getInstrumentableClassLoader() {
-		return this.classLoader.getClassLoader();
-	}
-
-	@Override
-	public ClassLoader getThrowawayClassLoader() {
-		return new OverridingClassLoader(this.classLoader.getClassLoader(),
-				this.classLoader.getThrowawayClassLoader());
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
deleted file mode 100644
index 7bf0ff58b9be..000000000000
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Support for class instrumentation on IBM WebSphere Application Server 7+.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.instrument.classloading.websphere;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
deleted file mode 100644
index fc0d4b8c5350..000000000000
--- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.
- * 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.jmx.support;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.management.MBeanServer;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jmx.MBeanServerNotFoundException;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link FactoryBean} that obtains a WebSphere {@link javax.management.MBeanServer}
- * reference through WebSphere's proprietary {@code AdminServiceFactory} API,
- * available on WebSphere 5.1 and higher.
- *
- * <p>Exposes the {@code MBeanServer} for bean references.
- *
- * <p>This {@code FactoryBean} is a direct alternative to {@link MBeanServerFactoryBean},
- * which uses standard JMX 1.2 API to access the platform's {@link MBeanServer}.
- *
- * <p>See the javadocs for WebSphere's
- * <a href="https://www.ibm.com/support/knowledgecenter/SSEQTJ_9.0.0/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/management/AdminServiceFactory.html">{@code AdminServiceFactory}</a>
- * and
- * <a href="https://www.ibm.com/support/knowledgecenter/SSEQTJ_9.0.0/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/management/MBeanFactory.html">{@code MBeanFactory}</a>.
- *
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @since 2.0.3
- * @see javax.management.MBeanServer
- * @see MBeanServerFactoryBean
- */
-public class WebSphereMBeanServerFactoryBean implements FactoryBean<MBeanServer>, InitializingBean {
-
-	private static final String ADMIN_SERVICE_FACTORY_CLASS = "com.ibm.websphere.management.AdminServiceFactory";
-
-	private static final String GET_MBEAN_FACTORY_METHOD = "getMBeanFactory";
-
-	private static final String GET_MBEAN_SERVER_METHOD = "getMBeanServer";
-
-
-	@Nullable
-	private MBeanServer mbeanServer;
-
-
-	@Override
-	public void afterPropertiesSet() throws MBeanServerNotFoundException {
-		try {
-			/*
-			 * this.mbeanServer = AdminServiceFactory.getMBeanFactory().getMBeanServer();
-			 */
-			Class<?> adminServiceClass = getClass().getClassLoader().loadClass(ADMIN_SERVICE_FACTORY_CLASS);
-			Method getMBeanFactoryMethod = adminServiceClass.getMethod(GET_MBEAN_FACTORY_METHOD);
-			Object mbeanFactory = getMBeanFactoryMethod.invoke(null);
-			Method getMBeanServerMethod = mbeanFactory.getClass().getMethod(GET_MBEAN_SERVER_METHOD);
-			this.mbeanServer = (MBeanServer) getMBeanServerMethod.invoke(mbeanFactory);
-		}
-		catch (ClassNotFoundException ex) {
-			throw new MBeanServerNotFoundException("Could not find WebSphere's AdminServiceFactory class", ex);
-		}
-		catch (InvocationTargetException ex) {
-			throw new MBeanServerNotFoundException(
-					"WebSphere's AdminServiceFactory.getMBeanFactory/getMBeanServer method failed", ex.getTargetException());
-		}
-		catch (Exception ex) {
-			throw new MBeanServerNotFoundException(
-					"Could not access WebSphere's AdminServiceFactory.getMBeanFactory/getMBeanServer method", ex);
-		}
-	}
-
-
-	@Override
-	@Nullable
-	public MBeanServer getObject() {
-		return this.mbeanServer;
-	}
-
-	@Override
-	public Class<? extends MBeanServer> getObjectType() {
-		return (this.mbeanServer != null ? this.mbeanServer.getClass() : MBeanServer.class);
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
index 7b0c0f2f2f95..640bdc81f28f 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
@@ -77,7 +77,7 @@ public static JndiLocatorDelegate createDefaultResourceRefLocator() {
 	}
 
 	/**
-	 * Check whether a default JNDI environment, as in a Java EE environment,
+	 * Check whether a default JNDI environment, as in a Jakarta EE environment,
 	 * is available on this JVM.
 	 * @return {@code true} if a default InitialContext can be used,
 	 * {@code false} if not
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java
index be910152a377..5b901f6c415d 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorSupport.java
@@ -27,7 +27,7 @@
  * bean properties.
  *
  * <p>JNDI names may or may not include the "java:comp/env/" prefix expected
- * by Java EE applications when accessing a locally mapped (ENC - Environmental
+ * by Jakarta EE applications when accessing a locally mapped (ENC - Environmental
  * Naming Context) resource. If it doesn't, the "java:comp/env/" prefix will
  * be prepended if the "resourceRef" property is true (the default is
  * <strong>false</strong>) and no other scheme (e.g. "java:") is given.
@@ -40,7 +40,7 @@
  */
 public abstract class JndiLocatorSupport extends JndiAccessor {
 
-	/** JNDI prefix used in a Java EE container. */
+	/** JNDI prefix used in a Jakarta EE container. */
 	public static final String CONTAINER_PREFIX = "java:comp/env/";
 
 
@@ -48,7 +48,7 @@ public abstract class JndiLocatorSupport extends JndiAccessor {
 
 
 	/**
-	 * Set whether the lookup occurs in a Java EE container, i.e. if the prefix
+	 * Set whether the lookup occurs in a Jakarta EE container, i.e. if the prefix
 	 * "java:comp/env/" needs to be added if the JNDI name doesn't already
 	 * contain it. Default is "false".
 	 * <p>Note: Will only get applied if no other scheme (e.g. "java:") is given.
@@ -58,7 +58,7 @@ public void setResourceRef(boolean resourceRef) {
 	}
 
 	/**
-	 * Return whether the lookup occurs in a Java EE container.
+	 * Return whether the lookup occurs in a Jakarta EE container.
 	 */
 	public boolean isResourceRef() {
 		return this.resourceRef;
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
index 7de88c4432c1..ff2a0ffb5a0d 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
@@ -28,7 +28,7 @@
  * providing configurable lookup of a specific JNDI resource.
  *
  * <p>Exposes a {@link #setJndiName "jndiName"} property. This may or may not
- * include the "java:comp/env/" prefix expected by Java EE applications when
+ * include the "java:comp/env/" prefix expected by Jakarta EE applications when
  * accessing a locally mapped (Environmental Naming Context) resource. If it
  * doesn't, the "java:comp/env/" prefix will be prepended if the "resourceRef"
  * property is true (the default is <strong>false</strong>) and no other scheme
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
index 83da60219dab..21b1e0cdae65 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
@@ -39,7 +39,7 @@
  * &lt;/bean&gt;
  *
  * &lt;bean id="queueConnectionFactory" class="org.springframework.aop.framework.ProxyFactoryBean"&gt;
- *   &lt;property name="proxyInterfaces" value="javax.jms.QueueConnectionFactory"/&gt;
+ *   &lt;property name="proxyInterfaces" value="jakarta.jms.QueueConnectionFactory"/&gt;
  *   &lt;property name="targetSource" ref="queueConnectionFactoryTarget"/&gt;
  * &lt;/bean&gt;</pre>
  *
diff --git a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
index 06bb11db5b56..25249087720f 100644
--- a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
+++ b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
@@ -44,7 +44,7 @@
  * the {@link org.springframework.beans.factory.ListableBeanFactory} interface.
  *
  * <p>This factory resolves given bean names as JNDI names within the
- * Java EE application's "java:comp/env/" namespace. It caches the resolved
+ * Jakarta EE application's "java:comp/env/" namespace. It caches the resolved
  * types for all obtained objects, and optionally also caches shareable
  * objects (if they are explicitly marked as
  * {@link #addShareableResource shareable resource}.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
index 326923d10d47..ad81312237e7 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
@@ -39,7 +39,7 @@
  * and adding extended trigger capabilities.
  *
  * <p>This interface is roughly equivalent to a JSR-236
- * {@code ManagedScheduledExecutorService} as supported in Java EE 7
+ * {@code ManagedScheduledExecutorService} as supported in Jakarta EE
  * environments but aligned with Spring's {@code TaskExecutor} model.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
index 496afa98119f..40e572f0e8cc 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
@@ -41,7 +41,7 @@
  * {@code Future} that can be used to track the result of the asynchronous method
  * execution. However, since the target method needs to implement the same signature,
  * it will have to return a temporary {@code Future} handle that just passes a value
- * through: e.g. Spring's {@link AsyncResult}, EJB 3.1's {@link javax.ejb.AsyncResult},
+ * through: e.g. Spring's {@link AsyncResult}, EJB 3.1's {@link jakarta.ejb.AsyncResult},
  * or {@link java.util.concurrent.CompletableFuture#completedFuture(Object)}.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
index c5636f2daa00..9b97ccfa6eca 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
@@ -42,7 +42,7 @@
  * annotation. This annotation can be used at the method and type level in
  * implementation classes as well as in service interfaces.
  *
- * <p>This advisor detects the EJB 3.1 {@code javax.ejb.Asynchronous}
+ * <p>This advisor detects the EJB 3.1 {@code jakarta.ejb.Asynchronous}
  * annotation as well, treating it exactly like Spring's own {@code Async}.
  * Furthermore, a custom async annotation type may get specified through the
  * {@link #setAsyncAnnotationType "asyncAnnotationType"} property.
@@ -99,7 +99,7 @@ public AsyncAnnotationAdvisor(
 		asyncAnnotationTypes.add(Async.class);
 		try {
 			asyncAnnotationTypes.add((Class<? extends Annotation>)
-					ClassUtils.forName("javax.ejb.Asynchronous", AsyncAnnotationAdvisor.class.getClassLoader()));
+					ClassUtils.forName("jakarta.ejb.Asynchronous", AsyncAnnotationAdvisor.class.getClassLoader()));
 		}
 		catch (ClassNotFoundException ex) {
 			// If EJB 3.1 API not present, simply ignore.
@@ -112,7 +112,7 @@ public AsyncAnnotationAdvisor(
 	/**
 	 * Set the 'async' annotation type.
 	 * <p>The default async annotation type is the {@link Async} annotation, as well
-	 * as the EJB 3.1 {@code javax.ejb.Asynchronous} annotation (if present).
+	 * as the EJB 3.1 {@code jakarta.ejb.Asynchronous} annotation (if present).
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation type to indicate that a method is to
 	 * be executed asynchronously.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
index 1e7d9bb49302..54d66d2f8be6 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
@@ -42,7 +42,7 @@
  * be provided as well as the annotation type that indicates a method should be
  * invoked asynchronously. If no annotation type is specified, this post-
  * processor will detect both Spring's {@link Async @Async} annotation as well
- * as the EJB 3.1 {@code javax.ejb.Asynchronous} annotation.
+ * as the EJB 3.1 {@code jakarta.ejb.Asynchronous} annotation.
  *
  * <p>For methods having a {@code void} return type, any exception thrown
  * during the asynchronous method invocation cannot be accessed by the
@@ -130,7 +130,7 @@ public void setExceptionHandler(AsyncUncaughtExceptionHandler exceptionHandler)
 	/**
 	 * Set the 'async' annotation type to be detected at either class or method
 	 * level. By default, both the {@link Async} annotation and the EJB 3.1
-	 * {@code javax.ejb.Asynchronous} annotation will be detected.
+	 * {@code jakarta.ejb.Asynchronous} annotation will be detected.
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation type to indicate that a method (or all
 	 * methods of a given class) should be invoked asynchronously.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 71f3f03c6dc1..5e394ae7c75e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -43,7 +43,7 @@
  * }</pre>
  *
  * {@code MyAsyncBean} is a user-defined type with one or more methods annotated with
- * either Spring's {@code @Async} annotation, the EJB 3.1 {@code @javax.ejb.Asynchronous}
+ * either Spring's {@code @Async} annotation, the EJB 3.1 {@code @jakarta.ejb.Asynchronous}
  * annotation, or any custom annotation specified via the {@link #annotation} attribute.
  * The aspect is added transparently for any registered bean, for instance via this
  * configuration:
@@ -166,7 +166,7 @@
 	 * Indicate the 'async' annotation type to be detected at either class
 	 * or method level.
 	 * <p>By default, both Spring's @{@link Async} annotation and the EJB 3.1
-	 * {@code @javax.ejb.Asynchronous} annotation will be detected.
+	 * {@code @jakarta.ejb.Asynchronous} annotation will be detected.
 	 * <p>This attribute exists so that developers can provide their own
 	 * custom annotation type to indicate that a method (or all methods of
 	 * a given class) should be invoked asynchronously.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
index 0b976d3f00a3..1161c453303f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
@@ -23,8 +23,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import javax.enterprise.concurrent.ManagedExecutors;
-import javax.enterprise.concurrent.ManagedTask;
+import jakarta.enterprise.concurrent.ManagedExecutors;
+import jakarta.enterprise.concurrent.ManagedTask;
 
 import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.core.task.TaskDecorator;
@@ -41,11 +41,11 @@
  * Also detects an extended {@code java.util.concurrent.ExecutorService}, adapting
  * the {@link org.springframework.core.task.AsyncTaskExecutor} interface accordingly.
  *
- * <p>Autodetects a JSR-236 {@link javax.enterprise.concurrent.ManagedExecutorService}
- * in order to expose {@link javax.enterprise.concurrent.ManagedTask} adapters for it,
+ * <p>Autodetects a JSR-236 {@link jakarta.enterprise.concurrent.ManagedExecutorService}
+ * in order to expose {@link jakarta.enterprise.concurrent.ManagedTask} adapters for it,
  * exposing a long-running hint based on {@link SchedulingAwareRunnable} and an identity
  * name based on the given Runnable/Callable's {@code toString()}. For JSR-236 style
- * lookup in a Java EE 7 environment, consider using {@link DefaultManagedTaskExecutor}.
+ * lookup in a Jakarta EE environment, consider using {@link DefaultManagedTaskExecutor}.
  *
  * <p>Note that there is a pre-built {@link ThreadPoolTaskExecutor} that allows
  * for defining a {@link java.util.concurrent.ThreadPoolExecutor} in bean style,
@@ -70,7 +70,7 @@ public class ConcurrentTaskExecutor implements AsyncListenableTaskExecutor, Sche
 	static {
 		try {
 			managedExecutorServiceClass = ClassUtils.forName(
-					"javax.enterprise.concurrent.ManagedExecutorService",
+					"jakarta.enterprise.concurrent.ManagedExecutorService",
 					ConcurrentTaskScheduler.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
@@ -95,8 +95,8 @@ public ConcurrentTaskExecutor() {
 
 	/**
 	 * Create a new ConcurrentTaskExecutor, using the given {@link java.util.concurrent.Executor}.
-	 * <p>Autodetects a JSR-236 {@link javax.enterprise.concurrent.ManagedExecutorService}
-	 * in order to expose {@link javax.enterprise.concurrent.ManagedTask} adapters for it.
+	 * <p>Autodetects a JSR-236 {@link jakarta.enterprise.concurrent.ManagedExecutorService}
+	 * in order to expose {@link jakarta.enterprise.concurrent.ManagedTask} adapters for it.
 	 * @param executor the {@link java.util.concurrent.Executor} to delegate to
 	 */
 	public ConcurrentTaskExecutor(@Nullable Executor executor) {
@@ -107,8 +107,8 @@ public ConcurrentTaskExecutor(@Nullable Executor executor) {
 
 	/**
 	 * Specify the {@link java.util.concurrent.Executor} to delegate to.
-	 * <p>Autodetects a JSR-236 {@link javax.enterprise.concurrent.ManagedExecutorService}
-	 * in order to expose {@link javax.enterprise.concurrent.ManagedTask} adapters for it.
+	 * <p>Autodetects a JSR-236 {@link jakarta.enterprise.concurrent.ManagedExecutorService}
+	 * in order to expose {@link jakarta.enterprise.concurrent.ManagedTask} adapters for it.
 	 */
 	public final void setConcurrentExecutor(@Nullable Executor executor) {
 		this.concurrentExecutor = (executor != null ? executor : Executors.newSingleThreadExecutor());
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
index 887c3f596518..ca16b976e172 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
@@ -25,8 +25,8 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.concurrent.LastExecution;
-import javax.enterprise.concurrent.ManagedScheduledExecutorService;
+import jakarta.enterprise.concurrent.LastExecution;
+import jakarta.enterprise.concurrent.ManagedScheduledExecutorService;
 
 import org.springframework.core.task.TaskRejectedException;
 import org.springframework.lang.Nullable;
@@ -44,11 +44,11 @@
  * Extends {@link ConcurrentTaskExecutor} in order to implement the
  * {@link org.springframework.scheduling.SchedulingTaskExecutor} interface as well.
  *
- * <p>Autodetects a JSR-236 {@link javax.enterprise.concurrent.ManagedScheduledExecutorService}
+ * <p>Autodetects a JSR-236 {@link jakarta.enterprise.concurrent.ManagedScheduledExecutorService}
  * in order to use it for trigger-based scheduling if possible, instead of Spring's
  * local trigger management which ends up delegating to regular delay-based scheduling
  * against the {@code java.util.concurrent.ScheduledExecutorService} API. For JSR-236 style
- * lookup in a Java EE 7 environment, consider using {@link DefaultManagedTaskScheduler}.
+ * lookup in a Jakarta EE environment, consider using {@link DefaultManagedTaskScheduler}.
  *
  * <p>Note that there is a pre-built {@link ThreadPoolTaskScheduler} that allows for
  * defining a {@link java.util.concurrent.ScheduledThreadPoolExecutor} in bean style,
@@ -73,7 +73,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 	static {
 		try {
 			managedScheduledExecutorServiceClass = ClassUtils.forName(
-					"javax.enterprise.concurrent.ManagedScheduledExecutorService",
+					"jakarta.enterprise.concurrent.ManagedScheduledExecutorService",
 					ConcurrentTaskScheduler.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
@@ -106,7 +106,7 @@ public ConcurrentTaskScheduler() {
 	/**
 	 * Create a new ConcurrentTaskScheduler, using the given
 	 * {@link java.util.concurrent.ScheduledExecutorService} as shared delegate.
-	 * <p>Autodetects a JSR-236 {@link javax.enterprise.concurrent.ManagedScheduledExecutorService}
+	 * <p>Autodetects a JSR-236 {@link jakarta.enterprise.concurrent.ManagedScheduledExecutorService}
 	 * in order to use it for trigger-based scheduling if possible,
 	 * instead of Spring's local trigger management.
 	 * @param scheduledExecutor the {@link java.util.concurrent.ScheduledExecutorService}
@@ -121,7 +121,7 @@ public ConcurrentTaskScheduler(ScheduledExecutorService scheduledExecutor) {
 	/**
 	 * Create a new ConcurrentTaskScheduler, using the given {@link java.util.concurrent.Executor}
 	 * and {@link java.util.concurrent.ScheduledExecutorService} as delegates.
-	 * <p>Autodetects a JSR-236 {@link javax.enterprise.concurrent.ManagedScheduledExecutorService}
+	 * <p>Autodetects a JSR-236 {@link jakarta.enterprise.concurrent.ManagedScheduledExecutorService}
 	 * in order to use it for trigger-based scheduling if possible,
 	 * instead of Spring's local trigger management.
 	 * @param concurrentExecutor the {@link java.util.concurrent.Executor} to delegate to
@@ -150,7 +150,7 @@ private ScheduledExecutorService initScheduledExecutor(@Nullable ScheduledExecut
 
 	/**
 	 * Specify the {@link java.util.concurrent.ScheduledExecutorService} to delegate to.
-	 * <p>Autodetects a JSR-236 {@link javax.enterprise.concurrent.ManagedScheduledExecutorService}
+	 * <p>Autodetects a JSR-236 {@link jakarta.enterprise.concurrent.ManagedScheduledExecutorService}
 	 * in order to use it for trigger-based scheduling if possible,
 	 * instead of Spring's local trigger management.
 	 * <p>Note: This will only apply to {@link TaskScheduler} invocations.
@@ -275,7 +275,7 @@ private class EnterpriseConcurrentTriggerScheduler {
 
 		public ScheduledFuture<?> schedule(Runnable task, final Trigger trigger) {
 			ManagedScheduledExecutorService executor = (ManagedScheduledExecutorService) scheduledExecutor;
-			return executor.schedule(task, new javax.enterprise.concurrent.Trigger() {
+			return executor.schedule(task, new jakarta.enterprise.concurrent.Trigger() {
 				@Override
 				@Nullable
 				public Date getNextRunTime(@Nullable LastExecution le, Date taskScheduledTime) {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java
index ab1871578365..d52b92ed7597 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java
@@ -31,10 +31,10 @@
 
 /**
  * JNDI-based variant of {@link CustomizableThreadFactory}, performing a default lookup
- * for JSR-236's "java:comp/DefaultManagedThreadFactory" in a Java EE 7 environment,
+ * for JSR-236's "java:comp/DefaultManagedThreadFactory" in a Jakarta EE environment,
  * falling back to the local {@link CustomizableThreadFactory} setup if not found.
  *
- * <p>This is a convenient way to use managed threads when running in a Java EE 7
+ * <p>This is a convenient way to use managed threads when running in a Jakarta EE
  * environment, simply using regular local threads otherwise - without conditional
  * setup (i.e. without profiles).
  *
@@ -77,7 +77,7 @@ public void setJndiEnvironment(Properties jndiEnvironment) {
 	}
 
 	/**
-	 * Set whether the lookup occurs in a Java EE container, i.e. if the prefix
+	 * Set whether the lookup occurs in a Jakarta EE container, i.e. if the prefix
 	 * "java:comp/env/" needs to be added if the JNDI name doesn't already
 	 * contain it. PersistenceAnnotationBeanPostProcessor's default is "true".
 	 * @see org.springframework.jndi.JndiLocatorSupport#setResourceRef
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java
index 62cb3dd9fb1f..bf40a15f3dd2 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java
@@ -28,16 +28,16 @@
 
 /**
  * JNDI-based variant of {@link ConcurrentTaskExecutor}, performing a default lookup for
- * JSR-236's "java:comp/DefaultManagedExecutorService" in a Java EE 7/8 environment.
+ * JSR-236's "java:comp/DefaultManagedExecutorService" in a Jakarta EE/8 environment.
  *
  * <p>Note: This class is not strictly JSR-236 based; it can work with any regular
  * {@link java.util.concurrent.Executor} that can be found in JNDI.
- * The actual adapting to {@link javax.enterprise.concurrent.ManagedExecutorService}
+ * The actual adapting to {@link jakarta.enterprise.concurrent.ManagedExecutorService}
  * happens in the base class {@link ConcurrentTaskExecutor} itself.
  *
  * @author Juergen Hoeller
  * @since 4.0
- * @see javax.enterprise.concurrent.ManagedExecutorService
+ * @see jakarta.enterprise.concurrent.ManagedExecutorService
  */
 public class DefaultManagedTaskExecutor extends ConcurrentTaskExecutor implements InitializingBean {
 
@@ -64,7 +64,7 @@ public void setJndiEnvironment(Properties jndiEnvironment) {
 	}
 
 	/**
-	 * Set whether the lookup occurs in a Java EE container, i.e. if the prefix
+	 * Set whether the lookup occurs in a Jakarta EE container, i.e. if the prefix
 	 * "java:comp/env/" needs to be added if the JNDI name doesn't already
 	 * contain it. PersistenceAnnotationBeanPostProcessor's default is "true".
 	 * @see org.springframework.jndi.JndiLocatorSupport#setResourceRef
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java
index 133527ed7712..b1845b563c17 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java
@@ -28,16 +28,16 @@
 
 /**
  * JNDI-based variant of {@link ConcurrentTaskScheduler}, performing a default lookup for
- * JSR-236's "java:comp/DefaultManagedScheduledExecutorService" in a Java EE 7 environment.
+ * JSR-236's "java:comp/DefaultManagedScheduledExecutorService" in a Jakarta EE environment.
  *
  * <p>Note: This class is not strictly JSR-236 based; it can work with any regular
  * {@link java.util.concurrent.ScheduledExecutorService} that can be found in JNDI.
- * The actual adapting to {@link javax.enterprise.concurrent.ManagedScheduledExecutorService}
+ * The actual adapting to {@link jakarta.enterprise.concurrent.ManagedScheduledExecutorService}
  * happens in the base class {@link ConcurrentTaskScheduler} itself.
  *
  * @author Juergen Hoeller
  * @since 4.0
- * @see javax.enterprise.concurrent.ManagedScheduledExecutorService
+ * @see jakarta.enterprise.concurrent.ManagedScheduledExecutorService
  */
 public class DefaultManagedTaskScheduler extends ConcurrentTaskScheduler implements InitializingBean {
 
@@ -64,7 +64,7 @@ public void setJndiEnvironment(Properties jndiEnvironment) {
 	}
 
 	/**
-	 * Set whether the lookup occurs in a Java EE container, i.e. if the prefix
+	 * Set whether the lookup occurs in a Jakarta EE container, i.e. if the prefix
 	 * "java:comp/env/" needs to be added if the JNDI name doesn't already
 	 * contain it. PersistenceAnnotationBeanPostProcessor's default is "true".
 	 * @see org.springframework.jndi.JndiLocatorSupport#setResourceRef
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
index 559890ef5096..dc9a249bdd9f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
@@ -71,7 +71,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 	/**
 	 * Set the ThreadFactory to use for the ExecutorService's thread pool.
 	 * Default is the underlying ExecutorService's default thread factory.
-	 * <p>In a Java EE 7 or other managed environment with JSR-236 support,
+	 * <p>In a Jakarta EE or other managed environment with JSR-236 support,
 	 * consider specifying a JNDI-located ManagedThreadFactory: by default,
 	 * to be found at "java:comp/DefaultManagedThreadFactory".
 	 * Use the "jee:jndi-lookup" namespace element in XML or the programmatic
@@ -79,7 +79,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 	 * Alternatively, consider using Spring's {@link DefaultManagedAwareThreadFactory}
 	 * with its fallback to local threads in case of no managed thread factory found.
 	 * @see java.util.concurrent.Executors#defaultThreadFactory()
-	 * @see javax.enterprise.concurrent.ManagedThreadFactory
+	 * @see jakarta.enterprise.concurrent.ManagedThreadFactory
 	 * @see DefaultManagedAwareThreadFactory
 	 */
 	public void setThreadFactory(@Nullable ThreadFactory threadFactory) {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
index a8ea96ee4eeb..7caa0796d908 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Scheduling convenience classes for the {@code java.util.concurrent}
- * and {@code javax.enterprise.concurrent} packages, allowing to set up a
+ * and {@code jakarta.enterprise.concurrent} packages, allowing to set up a
  * ThreadPoolExecutor or ScheduledThreadPoolExecutor as a bean in a Spring
  * context. Provides support for the native {@code java.util.concurrent}
  * interfaces as well as the Spring {@code TaskExecutor} mechanism.
diff --git a/spring-context/src/main/java/org/springframework/stereotype/Repository.java b/spring-context/src/main/java/org/springframework/stereotype/Repository.java
index 97cb1358080b..68f668e80afa 100644
--- a/spring-context/src/main/java/org/springframework/stereotype/Repository.java
+++ b/spring-context/src/main/java/org/springframework/stereotype/Repository.java
@@ -29,7 +29,7 @@
  * Domain-Driven Design (Evans, 2003) as "a mechanism for encapsulating storage,
  * retrieval, and search behavior which emulates a collection of objects".
  *
- * <p>Teams implementing traditional Java EE patterns such as "Data Access Object"
+ * <p>Teams implementing traditional Jakarta EE patterns such as "Data Access Object"
  * may also apply this stereotype to DAO classes, though care should be taken to
  * understand the distinction between Data Access Object and DDD-style repositories
  * before doing so. This annotation is a general-purpose stereotype and individual teams
diff --git a/spring-context/src/main/java/org/springframework/validation/ObjectError.java b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
index 227cd0839529..0a02d714a763 100644
--- a/spring-context/src/main/java/org/springframework/validation/ObjectError.java
+++ b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
@@ -76,7 +76,7 @@ public String getObjectName() {
 	/**
 	 * Preserve the source behind this error: possibly an {@link Exception}
 	 * (typically {@link org.springframework.beans.PropertyAccessException})
-	 * or a Bean Validation {@link javax.validation.ConstraintViolation}.
+	 * or a Bean Validation {@link jakarta.validation.ConstraintViolation}.
 	 * <p>Note that any such source object is being stored as transient:
 	 * that is, it won't be part of a serialized error representation.
 	 * @param source the source object
@@ -92,7 +92,7 @@ public void wrap(Object source) {
 	/**
 	 * Unwrap the source behind this error: possibly an {@link Exception}
 	 * (typically {@link org.springframework.beans.PropertyAccessException})
-	 * or a Bean Validation {@link javax.validation.ConstraintViolation}.
+	 * or a Bean Validation {@link jakarta.validation.ConstraintViolation}.
 	 * <p>The cause of the outermost exception will be introspected as well,
 	 * e.g. the underlying conversion exception or exception thrown from a setter
 	 * (instead of having to unwrap the {@code PropertyAccessException} in turn).
@@ -117,7 +117,7 @@ else if (this.source instanceof Throwable) {
 	/**
 	 * Check the source behind this error: possibly an {@link Exception}
 	 * (typically {@link org.springframework.beans.PropertyAccessException})
-	 * or a Bean Validation {@link javax.validation.ConstraintViolation}.
+	 * or a Bean Validation {@link jakarta.validation.ConstraintViolation}.
 	 * <p>The cause of the outermost exception will be introspected as well,
 	 * e.g. the underlying conversion exception or exception thrown from a setter
 	 * (instead of having to unwrap the {@code PropertyAccessException} in turn).
diff --git a/spring-context/src/main/java/org/springframework/validation/SmartValidator.java b/spring-context/src/main/java/org/springframework/validation/SmartValidator.java
index 4cc17002964b..36ad9f588d60 100644
--- a/spring-context/src/main/java/org/springframework/validation/SmartValidator.java
+++ b/spring-context/src/main/java/org/springframework/validation/SmartValidator.java
@@ -42,7 +42,7 @@ public interface SmartValidator extends Validator {
 	 * @param target the object that is to be validated
 	 * @param errors contextual state about the validation process
 	 * @param validationHints one or more hint objects to be passed to the validation engine
-	 * @see javax.validation.Validator#validate(Object, Class[])
+	 * @see jakarta.validation.Validator#validate(Object, Class[])
 	 */
 	void validate(Object target, Errors errors, Object... validationHints);
 
@@ -56,7 +56,7 @@ public interface SmartValidator extends Validator {
 	 * @param errors contextual state about the validation process
 	 * @param validationHints one or more hint objects to be passed to the validation engine
 	 * @since 5.1
-	 * @see javax.validation.Validator#validateValue(Class, String, Object, Class[])
+	 * @see jakarta.validation.Validator#validateValue(Class, String, Object, Class[])
 	 */
 	default void validateValue(
 			Class<?> targetType, String fieldName, @Nullable Object value, Errors errors, Object... validationHints) {
diff --git a/spring-context/src/main/java/org/springframework/validation/annotation/Validated.java b/spring-context/src/main/java/org/springframework/validation/annotation/Validated.java
index a5939a3b16d0..02a651ac8fef 100644
--- a/spring-context/src/main/java/org/springframework/validation/annotation/Validated.java
+++ b/spring-context/src/main/java/org/springframework/validation/annotation/Validated.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Variant of JSR-303's {@link javax.validation.Valid}, supporting the
+ * Variant of JSR-303's {@link jakarta.validation.Valid}, supporting the
  * specification of validation groups. Designed for convenient use with
  * Spring's JSR-303 support but not JSR-303 specific.
  *
@@ -43,7 +43,7 @@
  *
  * @author Juergen Hoeller
  * @since 3.1
- * @see javax.validation.Validator#validate(Object, Class[])
+ * @see jakarta.validation.Validator#validate(Object, Class[])
  * @see org.springframework.validation.SmartValidator#validate(Object, org.springframework.validation.Errors, Object...)
  * @see org.springframework.validation.beanvalidation.SpringValidatorAdapter
  * @see org.springframework.validation.beanvalidation.MethodValidationPostProcessor
diff --git a/spring-context/src/main/java/org/springframework/validation/annotation/ValidationAnnotationUtils.java b/spring-context/src/main/java/org/springframework/validation/annotation/ValidationAnnotationUtils.java
index 196f6fc6c74e..a5309bcb02c2 100644
--- a/spring-context/src/main/java/org/springframework/validation/annotation/ValidationAnnotationUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/annotation/ValidationAnnotationUtils.java
@@ -34,7 +34,7 @@ public abstract class ValidationAnnotationUtils {
 
 	/**
 	 * Determine any validation hints by the given annotation.
-	 * <p>This implementation checks for {@code @javax.validation.Valid},
+	 * <p>This implementation checks for {@code @jakarta.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)
@@ -45,7 +45,7 @@ public abstract class ValidationAnnotationUtils {
 	public static Object[] determineValidationHints(Annotation ann) {
 		Class<? extends Annotation> annotationType = ann.annotationType();
 		String annotationName = annotationType.getName();
-		if ("javax.validation.Valid".equals(annotationName)) {
+		if ("jakarta.validation.Valid".equals(annotationName)) {
 			return EMPTY_OBJECT_ARRAY;
 		}
 		Validated validatedAnn = AnnotationUtils.getAnnotation(ann, Validated.class);
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
index 11dccd32aa9b..77c7966a0ed1 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
@@ -19,10 +19,10 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.BeansException;
@@ -60,7 +60,7 @@ public void setValidator(Validator validator) {
 	 * Set the JSR-303 ValidatorFactory to delegate to for validating beans,
 	 * using its default Validator.
 	 * <p>Default is the default ValidatorFactory's default Validator.
-	 * @see javax.validation.ValidatorFactory#getValidator()
+	 * @see jakarta.validation.ValidatorFactory#getValidator()
 	 */
 	public void setValidatorFactory(ValidatorFactory validatorFactory) {
 		this.validator = validatorFactory.getValidator();
@@ -105,7 +105,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
 	/**
 	 * Perform validation of the given bean.
 	 * @param bean the bean instance to validate
-	 * @see javax.validation.Validator#validate
+	 * @see jakarta.validation.Validator#validate
 	 */
 	protected void doValidate(Object bean) {
 		Assert.state(this.validator != null, "No Validator set");
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
index b9c074fb24e5..37800c7df5f4 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
@@ -16,12 +16,12 @@
 
 package org.springframework.validation.beanvalidation;
 
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorContext;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorContext;
+import jakarta.validation.ValidatorFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
@@ -48,7 +48,7 @@ public class CustomValidatorBean extends SpringValidatorAdapter implements Valid
 
 	/**
 	 * Set the ValidatorFactory to obtain the target Validator from.
-	 * <p>Default is {@link javax.validation.Validation#buildDefaultValidatorFactory()}.
+	 * <p>Default is {@link jakarta.validation.Validation#buildDefaultValidatorFactory()}.
 	 */
 	public void setValidatorFactory(ValidatorFactory validatorFactory) {
 		this.validatorFactory = validatorFactory;
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
index 73ec646bead7..58bc3c2f60ef 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
@@ -27,20 +27,20 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.validation.Configuration;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.ParameterNameProvider;
-import javax.validation.TraversableResolver;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.Validator;
-import javax.validation.ValidatorContext;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
-import javax.validation.bootstrap.ProviderSpecificBootstrap;
-
+import jakarta.validation.ClockProvider;
+import jakarta.validation.Configuration;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorContext;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.bootstrap.ProviderSpecificBootstrap;
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
 
 import org.springframework.beans.factory.DisposableBean;
@@ -57,11 +57,11 @@
 import org.springframework.util.ReflectionUtils;
 
 /**
- * This is the central class for {@code javax.validation} (JSR-303) setup in a Spring
- * application context: It bootstraps a {@code javax.validation.ValidationFactory} and
+ * This is the central class for {@code jakarta.validation} (JSR-303) setup in a Spring
+ * application context: It bootstraps a {@code jakarta.validation.ValidationFactory} and
  * exposes it through the Spring {@link org.springframework.validation.Validator} interface
- * as well as through the JSR-303 {@link javax.validation.Validator} interface and the
- * {@link javax.validation.ValidatorFactory} interface itself.
+ * as well as through the JSR-303 {@link jakarta.validation.Validator} interface and the
+ * {@link jakarta.validation.ValidatorFactory} interface itself.
  *
  * <p>When talking to an instance of this bean through the Spring or JSR-303 Validator interfaces,
  * you'll be talking to the default Validator of the underlying ValidatorFactory. This is very
@@ -69,22 +69,15 @@
  * you will almost always use the default Validator anyway. This can also be injected directly
  * into any target dependency of type {@link org.springframework.validation.Validator}!
  *
- * <p><b>As of Spring 5.0, this class requires Bean Validation 1.1+, with special support
- * for Hibernate Validator 5.x</b> (see {@link #setValidationMessageSource}).
- * This class is also runtime-compatible with Bean Validation 2.0 and Hibernate Validator 6.0,
- * with one special note: If you'd like to call BV 2.0's {@code getClockProvider()} method,
- * obtain the native {@code ValidatorFactory} through {@code #unwrap(ValidatorFactory.class)}
- * and call the {@code getClockProvider()} method on the returned native reference there.
- *
  * <p>This class is also being used by Spring's MVC configuration namespace, in case of the
- * {@code javax.validation} API being present but no explicit Validator having been configured.
+ * {@code jakarta.validation} API being present but no explicit Validator having been configured.
  *
  * @author Juergen Hoeller
  * @since 3.0
- * @see javax.validation.ValidatorFactory
- * @see javax.validation.Validator
- * @see javax.validation.Validation#buildDefaultValidatorFactory()
- * @see javax.validation.ValidatorFactory#getValidator()
+ * @see jakarta.validation.ValidatorFactory
+ * @see jakarta.validation.Validator
+ * @see jakarta.validation.Validation#buildDefaultValidatorFactory()
+ * @see jakarta.validation.ValidatorFactory#getValidator()
  */
 public class LocalValidatorFactoryBean extends SpringValidatorAdapter
 		implements ValidatorFactory, ApplicationContextAware, InitializingBean, DisposableBean {
@@ -123,8 +116,8 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
 	/**
 	 * Specify the desired provider class, if any.
 	 * <p>If not specified, JSR-303's default search mechanism will be used.
-	 * @see javax.validation.Validation#byProvider(Class)
-	 * @see javax.validation.Validation#byDefaultProvider()
+	 * @see jakarta.validation.Validation#byProvider(Class)
+	 * @see jakarta.validation.Validation#byDefaultProvider()
 	 */
 	@SuppressWarnings("rawtypes")
 	public void setProviderClass(Class providerClass) {
@@ -208,7 +201,7 @@ public void setMappingLocations(Resource... mappingLocations) {
 	 * Specify bean validation properties to be passed to the validation provider.
 	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor)
 	 * or a "props" element in XML bean definitions.
-	 * @see javax.validation.Configuration#addProperty(String, String)
+	 * @see jakarta.validation.Configuration#addProperty(String, String)
 	 */
 	public void setValidationProperties(Properties jpaProperties) {
 		CollectionUtils.mergePropertiesIntoMap(jpaProperties, this.validationPropertyMap);
@@ -217,7 +210,7 @@ public void setValidationProperties(Properties jpaProperties) {
 	/**
 	 * Specify bean validation properties to be passed to the validation provider as a Map.
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
-	 * @see javax.validation.Configuration#addProperty(String, String)
+	 * @see jakarta.validation.Configuration#addProperty(String, String)
 	 */
 	public void setValidationPropertyMap(@Nullable Map<String, String> validationProperties) {
 		if (validationProperties != null) {
@@ -400,18 +393,11 @@ public ParameterNameProvider getParameterNameProvider() {
 		return this.validatorFactory.getParameterNameProvider();
 	}
 
-	// Bean Validation 2.0: currently not implemented here since it would imply
-	// a hard dependency on the new javax.validation.ClockProvider interface.
-	// To be resolved once Spring Framework requires Bean Validation 2.0+.
-	// Obtain the native ValidatorFactory through unwrap(ValidatorFactory.class)
-	// instead which will fully support a getClockProvider() call as well.
-	/*
 	@Override
-	public javax.validation.ClockProvider getClockProvider() {
+	public ClockProvider getClockProvider() {
 		Assert.notNull(this.validatorFactory, "No target ValidatorFactory set");
 		return this.validatorFactory.getClockProvider();
 	}
-	*/
 
 	@Override
 	@SuppressWarnings("unchecked")
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
index 40854bc3b1d0..0a97ba2c7800 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
@@ -18,7 +18,7 @@
 
 import java.util.Locale;
 
-import javax.validation.MessageInterpolator;
+import jakarta.validation.MessageInterpolator;
 
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.util.Assert;
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
index 8baf92adbfcb..6e68a740583a 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
@@ -19,13 +19,12 @@
 import java.lang.reflect.Method;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.executable.ExecutableValidator;
-
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.executable.ExecutableValidator;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -57,7 +56,7 @@
  * @author Juergen Hoeller
  * @since 3.1
  * @see MethodValidationPostProcessor
- * @see javax.validation.executable.ExecutableValidator
+ * @see jakarta.validation.executable.ExecutableValidator
  */
 public class MethodValidationInterceptor implements MethodInterceptor {
 
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
index 45e5d13a5fb6..e24c9a02288d 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
@@ -18,9 +18,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.aopalliance.aop.Advice;
 
 import org.springframework.aop.Pointcut;
@@ -55,7 +54,7 @@
  * @author Juergen Hoeller
  * @since 3.1
  * @see MethodValidationInterceptor
- * @see javax.validation.executable.ExecutableValidator
+ * @see jakarta.validation.executable.ExecutableValidator
  */
 @SuppressWarnings("serial")
 public class MethodValidationPostProcessor extends AbstractBeanFactoryAwareAdvisingPostProcessor
@@ -101,7 +100,7 @@ else if (validator instanceof SpringValidatorAdapter) {
 	 * Set the JSR-303 ValidatorFactory to delegate to for validating methods,
 	 * using its default Validator.
 	 * <p>Default is the default ValidatorFactory's default Validator.
-	 * @see javax.validation.ValidatorFactory#getValidator()
+	 * @see jakarta.validation.ValidatorFactory#getValidator()
 	 */
 	public void setValidatorFactory(ValidatorFactory validatorFactory) {
 		this.validator = validatorFactory.getValidator();
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/OptionalValidatorFactoryBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/OptionalValidatorFactoryBean.java
index 6d306943b08a..a2991e556333 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/OptionalValidatorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/OptionalValidatorFactoryBean.java
@@ -16,8 +16,7 @@
 
 package org.springframework.validation.beanvalidation;
 
-import javax.validation.ValidationException;
-
+import jakarta.validation.ValidationException;
 import org.apache.commons.logging.LogFactory;
 
 /**
@@ -26,7 +25,7 @@
  * in case of no Bean Validation provider being available.
  *
  * <p>This is the actual class used by Spring's MVC configuration namespace,
- * in case of the {@code javax.validation} API being present but no explicit
+ * in case of the {@code jakarta.validation} API being present but no explicit
  * Validator having been configured.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
index 5b68f0728351..f26a033a8aba 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
@@ -16,8 +16,8 @@
 
 package org.springframework.validation.beanvalidation;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
 
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.util.Assert;
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
index cf41fed3b29d..de02082dffe7 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
@@ -25,13 +25,13 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ElementKind;
-import javax.validation.Path;
-import javax.validation.ValidationException;
-import javax.validation.executable.ExecutableValidator;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
+import jakarta.validation.ValidationException;
+import jakarta.validation.executable.ExecutableValidator;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.ConstraintDescriptor;
 
 import org.springframework.beans.NotReadablePropertyException;
 import org.springframework.context.MessageSourceResolvable;
@@ -63,7 +63,7 @@
  * @see CustomValidatorBean
  * @see LocalValidatorFactoryBean
  */
-public class SpringValidatorAdapter implements SmartValidator, javax.validation.Validator {
+public class SpringValidatorAdapter implements SmartValidator, jakarta.validation.Validator {
 
 	private static final Set<String> internalAnnotationAttributes = new HashSet<>(4);
 
@@ -74,14 +74,14 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation.
 	}
 
 	@Nullable
-	private javax.validation.Validator targetValidator;
+	private jakarta.validation.Validator targetValidator;
 
 
 	/**
 	 * Create a new SpringValidatorAdapter for the given JSR-303 Validator.
 	 * @param targetValidator the JSR-303 Validator to wrap
 	 */
-	public SpringValidatorAdapter(javax.validation.Validator targetValidator) {
+	public SpringValidatorAdapter(jakarta.validation.Validator targetValidator) {
 		Assert.notNull(targetValidator, "Target Validator must not be null");
 		this.targetValidator = targetValidator;
 	}
@@ -89,7 +89,7 @@ public SpringValidatorAdapter(javax.validation.Validator targetValidator) {
 	SpringValidatorAdapter() {
 	}
 
-	void setTargetValidator(javax.validation.Validator targetValidator) {
+	void setTargetValidator(jakarta.validation.Validator targetValidator) {
 		this.targetValidator = targetValidator;
 	}
 
@@ -199,7 +199,7 @@ protected void processConstraintViolations(Set<ConstraintViolation<Object>> viol
 	 * @param violation the current JSR-303 ConstraintViolation
 	 * @return the Spring-reported field (for use with {@link Errors})
 	 * @since 4.2
-	 * @see javax.validation.ConstraintViolation#getPropertyPath()
+	 * @see jakarta.validation.ConstraintViolation#getPropertyPath()
 	 * @see org.springframework.validation.FieldError#getField()
 	 */
 	protected String determineField(ConstraintViolation<Object> violation) {
@@ -239,7 +239,7 @@ protected String determineField(ConstraintViolation<Object> violation) {
 	 * @param descriptor the JSR-303 ConstraintDescriptor for the current violation
 	 * @return a corresponding error code (for use with {@link Errors})
 	 * @since 4.2
-	 * @see javax.validation.metadata.ConstraintDescriptor#getAnnotation()
+	 * @see jakarta.validation.metadata.ConstraintDescriptor#getAnnotation()
 	 * @see org.springframework.validation.MessageCodesResolver
 	 */
 	protected String determineErrorCode(ConstraintDescriptor<?> descriptor) {
@@ -305,7 +305,7 @@ protected MessageSourceResolvable getResolvableField(String objectName, String f
 	 * which contains the current field's value
 	 * @return the invalid value to expose as part of the field error
 	 * @since 4.2
-	 * @see javax.validation.ConstraintViolation#getInvalidValue()
+	 * @see jakarta.validation.ConstraintViolation#getInvalidValue()
 	 * @see org.springframework.validation.FieldError#getRejectedValue()
 	 */
 	@Nullable
@@ -387,7 +387,7 @@ public <T> T unwrap(@Nullable Class<T> type) {
 		}
 		catch (ValidationException ex) {
 			// Ignore if just being asked for plain JSR-303 Validator
-			if (javax.validation.Validator.class == type) {
+			if (jakarta.validation.Validator.class == type) {
 				return (T) this.targetValidator;
 			}
 			throw ex;
diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.xsd
index ad681b198dad..283e803db813 100644
--- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.xsd
+++ b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.xsd
@@ -13,7 +13,7 @@
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
-	Defines configuration elements for access to traditional Java EE components
+	Defines configuration elements for access to traditional Jakarta EE components
 	such as JNDI resources and EJB session beans.
 		]]></xsd:documentation>
 	</xsd:annotation>
@@ -95,62 +95,23 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="local-slsb" type="ejbType">
+	<xsd:element name="local-slsb" type="jndiLocatingType">
 		<xsd:annotation>
-			<xsd:documentation source="java:org.springframework.ejb.access.LocalStatelessSessionProxyFactoryBean"><![CDATA[
+			<xsd:documentation source="java:org.springframework.jndi.JndiObjectFactoryBean"><![CDATA[
 	Exposes a reference to a local EJB Stateless SessionBean.
 			]]></xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
 
-	<xsd:element name="remote-slsb">
+	<xsd:element name="remote-slsb" type="jndiLocatingType">
 		<xsd:annotation>
-			<xsd:documentation source="java:org.springframework.ejb.access.SimpleRemoteStatelessSessionProxyFactoryBean"><![CDATA[
+			<xsd:documentation source="java:org.springframework.jndi.JndiObjectFactoryBean"><![CDATA[
 	Exposes a reference to a remote EJB Stateless SessionBean.
 			]]></xsd:documentation>
 		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="ejbType">
-					<xsd:attribute name="home-interface" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The home interface that will be narrowed to before performing
-	the parameterless SLSB create() call that returns the actual
-	SLSB proxy.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="refresh-home-on-connect-failure" type="xsd:boolean" default="false">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Controls whether to refresh the EJB home on connect failure.
-
-	Can be turned on to allow for hot restart of the EJB server.
-	If a cached EJB home throws an RMI exception that indicates a
-	remote connect failure, a fresh home will be fetched and the
-	invocation will be retried.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="cache-session-bean" type="xsd:boolean" default="false">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Controls whether to cache the actual session bean object.
-
-	Off by default for standard EJB compliance. Turn this flag
-	on to optimize session bean access for servers that are
-	known to allow for caching the actual session bean object.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
 	</xsd:element>
 
-	<!-- base types -->
-	<xsd:complexType name="jndiLocatingType" abstract="true">
+	<xsd:complexType name="jndiLocatingType">
 		<xsd:complexContent>
 			<xsd:extension base="beans:identifiedType">
 				<xsd:sequence>
@@ -178,7 +139,7 @@
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	The JNDI name to look up. This may be a fully-qualified JNDI path
-	or a local Java EE environment naming context path in which case the
+	or a local Jakarta EE environment naming context path in which case the
 	prefix "java:comp/env/" will be prepended if applicable.
 						]]></xsd:documentation>
 					</xsd:annotation>
@@ -186,7 +147,7 @@
 				<xsd:attribute name="resource-ref" type="xsd:boolean" default="true">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
-	Controls whether the lookup occurs in a Java EE container, i.e. if the
+	Controls whether the lookup occurs in a Jakarta EE container, i.e. if the
 	prefix "java:comp/env/" needs to be added if the JNDI name doesn't
 	already contain it. Default is "true" (since Spring 2.5).
 						]]></xsd:documentation>
@@ -222,37 +183,6 @@
 		</xsd:complexContent>
 	</xsd:complexType>
 
-	<xsd:complexType name="ejbType">
-		<xsd:complexContent>
-			<xsd:extension base="jndiLocatingType">
-				<xsd:attribute name="lookup-home-on-startup" type="xsd:boolean" default="true">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	Controls whether the lookup of the EJB home object is performed
-	immediately on startup (if true, the default), or on first access
-	(if false).
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="cache-home" type="xsd:boolean" default="true">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	Controls whether the EJB home object is cached once it has been located.
-	On by default; turn this flag off to always reobtain fresh home objects.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="business-interface" type="xsd:string" use="required">
-					<xsd:annotation>
-						<xsd:documentation source="java:java.lang.Class"><![CDATA[
-	The business interface of the EJB being proxied.
-						]]></xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
 	<xsd:simpleType name="environmentRefType">
 		<xsd:annotation>
 			<xsd:appinfo>
diff --git a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
index fc59dcf58d51..72232fb83115 100644
--- a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
+++ b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
@@ -18,7 +18,7 @@
 
 import java.util.concurrent.Future;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
index de062761fac8..2b5425f8ecfc 100644
--- a/spring-context/src/test/java/example/scannable/FooServiceImpl.java
+++ b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.concurrent.Future;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
index 0be289d07b47..d0d555ca5b11 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.beans.factory.annotation;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java b/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
index b36639ad7de4..f2f3e2af9e18 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
@@ -21,10 +21,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Qualifier;
-
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.scope.ScopedProxyUtils;
@@ -40,7 +39,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
- * Integration tests for handling JSR-303 {@link javax.inject.Qualifier} annotations.
+ * Integration tests for handling JSR-303 {@link jakarta.inject.Qualifier} annotations.
  *
  * @author Juergen Hoeller
  * @since 3.0
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java
index c73ddf7ad59e..0f73a07a1fa0 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.context.annotation;
 
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PreDestroy;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
index 3d300b71dbe0..14ae10d2b319 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
@@ -18,11 +18,10 @@
 
 import java.util.Properties;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeansException;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
index 0aaf4c00a069..a63a94be1872 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.context.annotation;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
index 3b1f1a7f0dd9..d8e78ee153f3 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
@@ -23,8 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
index 31a2d7c631d7..342573f7397e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.context.annotation;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
index faada752fdb3..8b73c760ee10 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
@@ -26,8 +26,7 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import javax.inject.Inject;
-
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
index 0fb249595f43..82caf5254e98 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
@@ -20,9 +20,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
@@ -49,8 +48,8 @@
  * <li>{@link InitializingBean} &amp; {@link DisposableBean} interfaces</li>
  * <li>Custom {@link RootBeanDefinition#getInitMethodName() init} &amp;
  * {@link RootBeanDefinition#getDestroyMethodName() destroy} methods</li>
- * <li>JSR 250's {@link javax.annotation.PostConstruct @PostConstruct} &amp;
- * {@link javax.annotation.PreDestroy @PreDestroy} annotations</li>
+ * <li>JSR 250's {@link jakarta.annotation.PostConstruct @PostConstruct} &amp;
+ * {@link jakarta.annotation.PreDestroy @PreDestroy} annotations</li>
  * </ul>
  *
  * @author Sam Brannen
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
index fa9052002566..2a8eca47d36e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
@@ -22,8 +22,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Provider;
-
+import jakarta.inject.Provider;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
index 89da3b916225..ddc5db678c6c 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
@@ -22,9 +22,8 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import javax.annotation.Resource;
-import javax.inject.Provider;
-
+import jakarta.annotation.Resource;
+import jakarta.inject.Provider;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java
index 8c069e16add0..5c4f58d5063e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.context.annotation.configuration;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java b/spring-context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java
index d474a99d4a44..e84bad2a5288 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation6/Jsr330NamedForScanning.java
@@ -16,7 +16,7 @@
 
 package org.springframework.context.annotation6;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named
 public class Jsr330NamedForScanning {
diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
index c493f075b1ae..8c51dd29420b 100644
--- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
@@ -30,9 +30,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
deleted file mode 100644
index f34897711754..000000000000
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.EJBLocalObject;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.jndi.JndiTemplate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Chris Beams
-*/
-public class LocalSlsbInvokerInterceptorTests {
-
-	/**
-	 * Test that it performs the correct lookup.
-	 */
-	@Test
-	public void testPerformsLookup() throws Exception {
-		LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class);
-
-		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		configuredInterceptor(mockContext, jndiName);
-
-		verify(mockContext).close();
-	}
-
-	@Test
-	public void testLookupFailure() throws Exception {
-		final NamingException nex = new NamingException();
-		final String jndiName= "foobar";
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) throws NamingException {
-				assertThat(jndiName.equals(name)).isTrue();
-				throw nex;
-			}
-		};
-
-		LocalSlsbInvokerInterceptor si = new LocalSlsbInvokerInterceptor();
-		si.setJndiName("foobar");
-		// default resourceRef=false should cause this to fail, as java:/comp/env will not
-		// automatically be added
-		si.setJndiTemplate(jt);
-		assertThatExceptionOfType(NamingException.class)
-			.isThrownBy(si::afterPropertiesSet)
-			.isSameAs(nex);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstance() throws Exception {
-		Object retVal = new Object();
-		LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class);
-		given(ejb.targetMethod()).willReturn(retVal);
-
-		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-
-		ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class });
-		pf.addAdvice(si);
-		BusinessMethods target = (BusinessMethods) pf.getProxy();
-
-		assertThat(target.targetMethod() == retVal).isTrue();
-
-		verify(mockContext).close();
-		verify(ejb).remove();
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithSeparateBusinessMethods() throws Exception {
-		Object retVal = new Object();
-		LocalInterface ejb = mock(LocalInterface.class);
-		given(ejb.targetMethod()).willReturn(retVal);
-
-		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-
-		ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class });
-		pf.addAdvice(si);
-		BusinessMethods target = (BusinessMethods) pf.getProxy();
-
-		assertThat(target.targetMethod() == retVal).isTrue();
-
-		verify(mockContext).close();
-		verify(ejb).remove();
-	}
-
-	private void testException(Exception expected) throws Exception {
-		LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class);
-		given(ejb.targetMethod()).willThrow(expected);
-
-		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-
-		ProxyFactory pf = new ProxyFactory(new Class<?>[] { LocalInterfaceWithBusinessMethods.class });
-		pf.addAdvice(si);
-		LocalInterfaceWithBusinessMethods target = (LocalInterfaceWithBusinessMethods) pf.getProxy();
-
-		assertThatExceptionOfType(Exception.class)
-			.isThrownBy(target::targetMethod)
-			.isSameAs(expected);
-
-		verify(mockContext).close();
-	}
-
-	@Test
-	public void testApplicationException() throws Exception {
-		testException(new ApplicationException());
-	}
-
-	protected Context mockContext(final String jndiName, final Object ejbInstance)
-			throws Exception {
-		SlsbHome mockHome = mock(SlsbHome.class);
-		given(mockHome.create()).willReturn((LocalInterface)ejbInstance);
-		Context mockCtx = mock(Context.class);
-		given(mockCtx.lookup("java:comp/env/" + jndiName)).willReturn(mockHome);
-		return mockCtx;
-	}
-
-	protected LocalSlsbInvokerInterceptor configuredInterceptor(final Context mockCtx, final String jndiName)
-			throws Exception {
-
-		LocalSlsbInvokerInterceptor si = new LocalSlsbInvokerInterceptor();
-		si.setJndiTemplate(new JndiTemplate() {
-			@Override
-			protected Context createInitialContext() throws NamingException {
-				return mockCtx;
-			}
-		});
-		si.setJndiName(jndiName);
-		si.setResourceRef(true);
-		si.afterPropertiesSet();
-
-		return si;
-	}
-
-
-	/**
-	 * Needed so that we can mock the create() method.
-	 */
-	private interface SlsbHome extends EJBLocalHome {
-
-		LocalInterface create() throws CreateException;
-	}
-
-
-	private interface BusinessMethods {
-
-		Object targetMethod() throws ApplicationException;
-	}
-
-
-	private interface LocalInterface extends EJBLocalObject {
-
-		Object targetMethod() throws ApplicationException;
-	}
-
-
-	private interface LocalInterfaceWithBusinessMethods extends LocalInterface, BusinessMethods {
-	}
-
-
-	@SuppressWarnings("serial")
-	private class ApplicationException extends Exception {
-
-		public ApplicationException() {
-			super("appException");
-		}
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
deleted file mode 100644
index 545e6c288af7..000000000000
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import java.lang.reflect.Proxy;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.EJBLocalObject;
-import javax.naming.NamingException;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.jndi.JndiTemplate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Chris Beams
- * @since 21.05.2003
- */
-public class LocalStatelessSessionProxyFactoryBeanTests {
-
-	@Test
-	public void testInvokesMethod() throws Exception {
-		final int value = 11;
-		final String jndiName = "foo";
-
-		MyEjb myEjb = mock(MyEjb.class);
-		given(myEjb.getValue()).willReturn(value);
-
-		final MyHome home = mock(MyHome.class);
-		given(home.create()).willReturn(myEjb);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) throws NamingException {
-				// parameterize
-				assertThat(name.equals("java:comp/env/" + jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		LocalStatelessSessionProxyFactoryBean fb = new LocalStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		fb.setResourceRef(true);
-		fb.setBusinessInterface(MyBusinessMethods.class);
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-		assertThat(mbm.getValue() == value).isTrue();
-		verify(myEjb).remove();
-	}
-
-	@Test
-	public void testInvokesMethodOnEjb3StyleBean() throws Exception {
-		final int value = 11;
-		final String jndiName = "foo";
-
-		final MyEjb myEjb = mock(MyEjb.class);
-		given(myEjb.getValue()).willReturn(value);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) throws NamingException {
-				// parameterize
-				assertThat(name.equals("java:comp/env/" + jndiName)).isTrue();
-				return myEjb;
-			}
-		};
-
-		LocalStatelessSessionProxyFactoryBean fb = new LocalStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		fb.setResourceRef(true);
-		fb.setBusinessInterface(MyBusinessMethods.class);
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-		assertThat(mbm.getValue() == value).isTrue();
-	}
-
-	@Test
-	public void testCreateException() throws Exception {
-		final String jndiName = "foo";
-
-		final CreateException cex = new CreateException();
-		final MyHome home = mock(MyHome.class);
-		given(home.create()).willThrow(cex);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) throws NamingException {
-				// parameterize
-				assertThat(name.equals(jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		LocalStatelessSessionProxyFactoryBean fb = new LocalStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		fb.setResourceRef(false);	// no java:comp/env prefix
-		fb.setBusinessInterface(MyBusinessMethods.class);
-		assertThat(MyBusinessMethods.class).isEqualTo(fb.getBusinessInterface());
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-
-		assertThatExceptionOfType(EjbAccessException.class).isThrownBy(
-				mbm::getValue)
-			.withCause(cex);
-	}
-
-	@Test
-	public void testNoBusinessInterfaceSpecified() throws Exception {
-		// Will do JNDI lookup to get home but won't call create
-		// Could actually try to figure out interface from create?
-		final String jndiName = "foo";
-
-		final MyHome home = mock(MyHome.class);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) throws NamingException {
-				// parameterize
-				assertThat(name.equals("java:comp/env/" + jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		LocalStatelessSessionProxyFactoryBean fb = new LocalStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		fb.setResourceRef(true);
-		// Don't set business interface
-		fb.setJndiTemplate(jt);
-
-		// Check it's a singleton
-		assertThat(fb.isSingleton()).isTrue();
-
-		assertThatIllegalArgumentException().isThrownBy(
-				fb::afterPropertiesSet)
-			.withMessageContaining("businessInterface");
-
-		// Expect no methods on home
-		verifyNoInteractions(home);
-	}
-
-
-	public interface MyHome extends EJBLocalHome {
-
-		MyBusinessMethods create() throws CreateException;
-	}
-
-
-	public interface MyBusinessMethods  {
-
-		int getValue();
-	}
-
-
-	public interface MyEjb extends EJBLocalObject, MyBusinessMethods {
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
deleted file mode 100644
index 3397cb05ee05..000000000000
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import java.rmi.ConnectException;
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.jndi.JndiTemplate;
-import org.springframework.remoting.RemoteAccessException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Chris Beams
- */
-public class SimpleRemoteSlsbInvokerInterceptorTests {
-
-	private Context mockContext(
-			String jndiName, RemoteInterface ejbInstance)
-			throws Exception {
-		SlsbHome mockHome = mock(SlsbHome.class);
-		given(mockHome.create()).willReturn(ejbInstance);
-		Context mockCtx = mock(Context.class);
-		given(mockCtx.lookup("java:comp/env/" + jndiName)).willReturn(mockHome);
-		return mockCtx;
-	}
-
-	private SimpleRemoteSlsbInvokerInterceptor configuredInterceptor(
-			final Context mockCtx, String jndiName) throws Exception {
-
-		SimpleRemoteSlsbInvokerInterceptor si = createInterceptor();
-		si.setJndiTemplate(new JndiTemplate() {
-			@Override
-			protected Context createInitialContext() {
-				return mockCtx;
-			}
-		});
-		si.setResourceRef(true);
-		si.setJndiName(jndiName);
-
-		return si;
-	}
-
-	protected SimpleRemoteSlsbInvokerInterceptor createInterceptor() {
-		return new SimpleRemoteSlsbInvokerInterceptor();
-	}
-
-	protected Object configuredProxy(SimpleRemoteSlsbInvokerInterceptor si, Class<?> ifc) throws NamingException {
-		si.afterPropertiesSet();
-		ProxyFactory pf = new ProxyFactory(new Class<?>[] {ifc});
-		pf.addAdvice(si);
-		return pf.getProxy();
-	}
-
-
-	@Test
-	public void testPerformsLookup() throws Exception {
-		RemoteInterface ejb = mock(RemoteInterface.class);
-
-		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-		configuredProxy(si, RemoteInterface.class);
-
-		verify(mockContext).close();
-	}
-
-	@Test
-	public void testPerformsLookupWithAccessContext() throws Exception {
-		RemoteInterface ejb = mock(RemoteInterface.class);
-
-		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-		si.setExposeAccessContext(true);
-		RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class);
-		assertThat(target.targetMethod()).isNull();
-
-		verify(mockContext, times(2)).close();
-		verify(ejb).targetMethod();
-
-	}
-
-	@Test
-	public void testLookupFailure() throws Exception {
-		final NamingException nex = new NamingException();
-		final String jndiName = "foobar";
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) throws NamingException {
-				assertThat(jndiName.equals(name)).isTrue();
-				throw nex;
-			}
-		};
-
-		SimpleRemoteSlsbInvokerInterceptor si = new SimpleRemoteSlsbInvokerInterceptor();
-		si.setJndiName("foobar");
-		// default resourceRef=false should cause this to fail, as java:/comp/env will not
-		// automatically be added
-		si.setJndiTemplate(jt);
-		assertThatExceptionOfType(NamingException.class)
-			.isThrownBy(si::afterPropertiesSet)
-			.isSameAs(nex);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstance() throws Exception {
-		doTestInvokesMethodOnEjbInstance(true, true);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithLazyLookup() throws Exception {
-		doTestInvokesMethodOnEjbInstance(false, true);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithLazyLookupAndNoCache() throws Exception {
-		doTestInvokesMethodOnEjbInstance(false, false);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithNoCache() throws Exception {
-		doTestInvokesMethodOnEjbInstance(true, false);
-	}
-
-	private void doTestInvokesMethodOnEjbInstance(boolean lookupHomeOnStartup, boolean cacheHome) throws Exception {
-		Object retVal = new Object();
-		final RemoteInterface ejb = mock(RemoteInterface.class);
-		given(ejb.targetMethod()).willReturn(retVal);
-
-		int lookupCount = 1;
-		if (!cacheHome) {
-			lookupCount++;
-			if (lookupHomeOnStartup) {
-				lookupCount++;
-			}
-		}
-
-		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-		si.setLookupHomeOnStartup(lookupHomeOnStartup);
-		si.setCacheHome(cacheHome);
-
-		RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class);
-		assertThat(target.targetMethod() == retVal).isTrue();
-		assertThat(target.targetMethod() == retVal).isTrue();
-
-		verify(mockContext, times(lookupCount)).close();
-		verify(ejb, times(2)).remove();
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithRemoteException() throws Exception {
-		final RemoteInterface ejb = mock(RemoteInterface.class);
-		given(ejb.targetMethod()).willThrow(new RemoteException());
-		ejb.remove();
-
-		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-
-		RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class);
-		assertThatExceptionOfType(RemoteException.class).isThrownBy(
-				target::targetMethod);
-
-		verify(mockContext).close();
-		verify(ejb, times(2)).remove();
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh() throws Exception {
-		doTestInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh(true, true);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithConnectExceptionWithRefreshAndLazyLookup() throws Exception {
-		doTestInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh(false, true);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithConnectExceptionWithRefreshAndLazyLookupAndNoCache() throws Exception {
-		doTestInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh(false, false);
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithConnectExceptionWithRefreshAndNoCache() throws Exception {
-		doTestInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh(true, false);
-	}
-
-	private void doTestInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh(
-			boolean lookupHomeOnStartup, boolean cacheHome) throws Exception {
-
-		final RemoteInterface ejb = mock(RemoteInterface.class);
-		given(ejb.targetMethod()).willThrow(new ConnectException(""));
-
-		int lookupCount = 2;
-		if (!cacheHome) {
-			lookupCount++;
-			if (lookupHomeOnStartup) {
-				lookupCount++;
-			}
-		}
-
-		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-		si.setRefreshHomeOnConnectFailure(true);
-		si.setLookupHomeOnStartup(lookupHomeOnStartup);
-		si.setCacheHome(cacheHome);
-
-		RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class);
-		assertThatExceptionOfType(ConnectException.class).isThrownBy(
-				target::targetMethod);
-
-		verify(mockContext, times(lookupCount)).close();
-		verify(ejb, times(2)).remove();
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithBusinessInterface() throws Exception {
-		Object retVal = new Object();
-		final RemoteInterface ejb = mock(RemoteInterface.class);
-		given(ejb.targetMethod()).willReturn(retVal);
-
-		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-
-		BusinessInterface target = (BusinessInterface) configuredProxy(si, BusinessInterface.class);
-		assertThat(target.targetMethod() == retVal).isTrue();
-
-		verify(mockContext).close();
-		verify(ejb).remove();
-	}
-
-	@Test
-	public void testInvokesMethodOnEjbInstanceWithBusinessInterfaceWithRemoteException() throws Exception {
-		final RemoteInterface ejb = mock(RemoteInterface.class);
-		given(ejb.targetMethod()).willThrow(new RemoteException());
-
-		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-
-		BusinessInterface target = (BusinessInterface) configuredProxy(si, BusinessInterface.class);
-		assertThatExceptionOfType(RemoteAccessException.class).isThrownBy(
-				target::targetMethod);
-
-		verify(mockContext).close();
-		verify(ejb).remove();
-	}
-
-	@Test
-	public void testApplicationException() throws Exception {
-		doTestException(new ApplicationException());
-	}
-
-	@Test
-	public void testRemoteException() throws Exception {
-		doTestException(new RemoteException());
-	}
-
-	private void doTestException(Exception expected) throws Exception {
-		final RemoteInterface ejb = mock(RemoteInterface.class);
-		given(ejb.targetMethod()).willThrow(expected);
-
-		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb);
-
-		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
-
-		RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class);
-		assertThatExceptionOfType(Exception.class)
-			.isThrownBy(target::targetMethod)
-			.isSameAs(expected);
-		verify(mockContext).close();
-		verify(ejb).remove();
-	}
-
-
-	/**
-	 * Needed so that we can mock create() method.
-	 */
-	protected interface SlsbHome extends EJBHome {
-
-		EJBObject create() throws RemoteException, CreateException;
-	}
-
-
-	protected interface RemoteInterface extends EJBObject {
-
-		// Also business exception!?
-		Object targetMethod() throws RemoteException, ApplicationException;
-	}
-
-
-	protected interface BusinessInterface {
-
-		Object targetMethod() throws ApplicationException;
-	}
-
-
-	@SuppressWarnings("serial")
-	protected class ApplicationException extends Exception {
-
-		public ApplicationException() {
-			super("appException");
-		}
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
deleted file mode 100644
index cc5dd44b693d..000000000000
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * 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.
- * 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.ejb.access;
-
-import java.lang.reflect.Proxy;
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-import javax.naming.NamingException;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.jndi.JndiTemplate;
-import org.springframework.remoting.RemoteAccessException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 21.05.2003
- */
-public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRemoteSlsbInvokerInterceptorTests {
-
-	@Override
-	protected SimpleRemoteSlsbInvokerInterceptor createInterceptor() {
-		return new SimpleRemoteStatelessSessionProxyFactoryBean();
-	}
-
-	@Override
-	protected Object configuredProxy(SimpleRemoteSlsbInvokerInterceptor si, Class<?> ifc) throws NamingException {
-		SimpleRemoteStatelessSessionProxyFactoryBean fb = (SimpleRemoteStatelessSessionProxyFactoryBean) si;
-		fb.setBusinessInterface(ifc);
-		fb.afterPropertiesSet();
-		return fb.getObject();
-	}
-
-	@Test
-	public void testInvokesMethod() throws Exception {
-		final int value = 11;
-		final String jndiName = "foo";
-
-		MyEjb myEjb = mock(MyEjb.class);
-		given(myEjb.getValue()).willReturn(value);
-
-		final MyHome home = mock(MyHome.class);
-		given(home.create()).willReturn(myEjb);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) {
-				// parameterize
-				assertThat(name.equals("java:comp/env/" + jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		fb.setResourceRef(true);
-		fb.setBusinessInterface(MyBusinessMethods.class);
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-		assertThat(mbm.getValue()).as("Returns expected value").isEqualTo(value);
-		verify(myEjb).remove();
-	}
-
-	@Test
-	public void testInvokesMethodOnEjb3StyleBean() throws Exception {
-		final int value = 11;
-		final String jndiName = "foo";
-
-		final MyEjb myEjb = mock(MyEjb.class);
-		given(myEjb.getValue()).willReturn(value);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) {
-				// parameterize
-				assertThat(name.equals("java:comp/env/" + jndiName)).isTrue();
-				return myEjb;
-			}
-		};
-
-		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		fb.setResourceRef(true);
-		fb.setBusinessInterface(MyBusinessMethods.class);
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-		assertThat(mbm.getValue()).as("Returns expected value").isEqualTo(value);
-	}
-
-	@Override
-	@Test
-	public void testRemoteException() throws Exception {
-		final RemoteException rex = new RemoteException();
-		final String jndiName = "foo";
-
-		MyEjb myEjb = mock(MyEjb.class);
-		given(myEjb.getValue()).willThrow(rex);
-		// TODO might want to control this behaviour...
-		// Do we really want to call remove after a remote exception?
-
-		final MyHome home = mock(MyHome.class);
-		given(home.create()).willReturn(myEjb);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) {
-				// parameterize
-				assertThat(name.equals("java:comp/env/" + jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		fb.setResourceRef(true);
-		fb.setBusinessInterface(MyBusinessMethods.class);
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-		assertThatExceptionOfType(RemoteException.class)
-			.isThrownBy(mbm::getValue)
-			.isSameAs(rex);
-		verify(myEjb).remove();
-	}
-
-	@Test
-	public void testCreateException() throws Exception {
-		final String jndiName = "foo";
-
-		final CreateException cex = new CreateException();
-		final MyHome home = mock(MyHome.class);
-		given(home.create()).willThrow(cex);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) {
-				// parameterize
-				assertThat(name.equals(jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		// rely on default setting of resourceRef=false, no auto addition of java:/comp/env prefix
-		fb.setBusinessInterface(MyBusinessMethods.class);
-		assertThat(MyBusinessMethods.class).isEqualTo(fb.getBusinessInterface());
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-		assertThatExceptionOfType(RemoteException.class).isThrownBy(mbm::getValue);
-	}
-
-	@Test
-	public void testCreateExceptionWithLocalBusinessInterface() throws Exception {
-		final String jndiName = "foo";
-
-		final CreateException cex = new CreateException();
-		final MyHome home = mock(MyHome.class);
-		given(home.create()).willThrow(cex);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) {
-				// parameterize
-				assertThat(name.equals(jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		// rely on default setting of resourceRef=false, no auto addition of java:/comp/env prefix
-		fb.setBusinessInterface(MyLocalBusinessMethods.class);
-		assertThat(MyLocalBusinessMethods.class).isEqualTo(fb.getBusinessInterface());
-		fb.setJndiTemplate(jt);
-
-		// Need lifecycle methods
-		fb.afterPropertiesSet();
-
-		MyLocalBusinessMethods mbm = (MyLocalBusinessMethods) fb.getObject();
-		assertThat(Proxy.isProxyClass(mbm.getClass())).isTrue();
-		assertThatExceptionOfType(RemoteAccessException.class).isThrownBy(
-				mbm::getValue)
-			.withCause(cex);
-	}
-
-	@Test
-	public void testNoBusinessInterfaceSpecified() throws Exception {
-		// Will do JNDI lookup to get home but won't call create
-		// Could actually try to figure out interface from create?
-		final String jndiName = "foo";
-
-		final MyHome home = mock(MyHome.class);
-
-		JndiTemplate jt = new JndiTemplate() {
-			@Override
-			public Object lookup(String name) throws NamingException {
-				// parameterize
-				assertThat(name.equals(jndiName)).isTrue();
-				return home;
-			}
-		};
-
-		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
-		fb.setJndiName(jndiName);
-		// rely on default setting of resourceRef=false, no auto addition of java:/comp/env prefix
-		// Don't set business interface
-		fb.setJndiTemplate(jt);
-
-		// Check it's a singleton
-		assertThat(fb.isSingleton()).isTrue();
-
-		assertThatIllegalArgumentException().isThrownBy(
-				fb::afterPropertiesSet)
-			.withMessageContaining("businessInterface");
-
-		// Expect no methods on home
-		verifyNoInteractions(home);
-	}
-
-
-	protected interface MyHome extends EJBHome {
-
-		MyBusinessMethods create() throws CreateException, RemoteException;
-	}
-
-
-	protected interface MyBusinessMethods  {
-
-		int getValue() throws RemoteException;
-	}
-
-
-	protected interface MyLocalBusinessMethods  {
-
-		int getValue();
-	}
-
-
-	protected interface MyEjb extends EJBObject, MyBusinessMethods {
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
index dc0e81943f33..71692278a41e 100644
--- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,20 +35,21 @@
  */
 public class JeeNamespaceHandlerEventTests {
 
-	private CollectingReaderEventListener eventListener = new CollectingReaderEventListener();
+	private final CollectingReaderEventListener eventListener = new CollectingReaderEventListener();
 
-	private XmlBeanDefinitionReader reader;
+	private final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 
-	private DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+	private XmlBeanDefinitionReader reader;
 
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	public void setup() throws Exception {
 		this.reader = new XmlBeanDefinitionReader(this.beanFactory);
 		this.reader.setEventListener(this.eventListener);
 		this.reader.loadBeanDefinitions(new ClassPathResource("jeeNamespaceHandlerTests.xml", getClass()));
 	}
 
+
 	@Test
 	public void testJndiLookupComponentEventReceived() {
 		ComponentDefinition component = this.eventListener.getComponentDefinition("simple");
diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
index ec9662810e6b..65292d305730 100644
--- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.ejb.access.LocalStatelessSessionProxyFactoryBean;
-import org.springframework.ejb.access.SimpleRemoteStatelessSessionProxyFactoryBean;
 import org.springframework.jndi.JndiObjectFactoryBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -93,44 +91,15 @@ public void testWithReferencedEnvironment() {
 	@Test
 	public void testSimpleLocalSlsb() {
 		BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("simpleLocalEjb");
-		assertThat(beanDefinition.getBeanClassName()).isEqualTo(LocalStatelessSessionProxyFactoryBean.class.getName());
-		assertPropertyValue(beanDefinition, "businessInterface", ITestBean.class.getName());
+		assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName());
 		assertPropertyValue(beanDefinition, "jndiName", "ejb/MyLocalBean");
 	}
 
 	@Test
 	public void testSimpleRemoteSlsb() {
 		BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("simpleRemoteEjb");
-		assertThat(beanDefinition.getBeanClassName()).isEqualTo(SimpleRemoteStatelessSessionProxyFactoryBean.class.getName());
-		assertPropertyValue(beanDefinition, "businessInterface", ITestBean.class.getName());
-		assertPropertyValue(beanDefinition, "jndiName", "ejb/MyRemoteBean");
-	}
-
-	@Test
-	public void testComplexLocalSlsb() {
-		BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("complexLocalEjb");
-		assertThat(beanDefinition.getBeanClassName()).isEqualTo(LocalStatelessSessionProxyFactoryBean.class.getName());
-		assertPropertyValue(beanDefinition, "businessInterface", ITestBean.class.getName());
-		assertPropertyValue(beanDefinition, "jndiName", "ejb/MyLocalBean");
-		assertPropertyValue(beanDefinition, "cacheHome", "true");
-		assertPropertyValue(beanDefinition, "lookupHomeOnStartup", "true");
-		assertPropertyValue(beanDefinition, "resourceRef", "true");
-		assertPropertyValue(beanDefinition, "jndiEnvironment", "foo=bar");
-	}
-
-	@Test
-	public void testComplexRemoteSlsb() {
-		BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition("complexRemoteEjb");
-		assertThat(beanDefinition.getBeanClassName()).isEqualTo(SimpleRemoteStatelessSessionProxyFactoryBean.class.getName());
-		assertPropertyValue(beanDefinition, "businessInterface", ITestBean.class.getName());
+		assertThat(beanDefinition.getBeanClassName()).isEqualTo(JndiObjectFactoryBean.class.getName());
 		assertPropertyValue(beanDefinition, "jndiName", "ejb/MyRemoteBean");
-		assertPropertyValue(beanDefinition, "cacheHome", "true");
-		assertPropertyValue(beanDefinition, "lookupHomeOnStartup", "true");
-		assertPropertyValue(beanDefinition, "resourceRef", "true");
-		assertPropertyValue(beanDefinition, "jndiEnvironment", "foo=bar");
-		assertPropertyValue(beanDefinition, "homeInterface", "org.springframework.beans.testfixture.beans.ITestBean");
-		assertPropertyValue(beanDefinition, "refreshHomeOnConnectFailure", "true");
-		assertPropertyValue(beanDefinition, "cacheSessionBean", "true");
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
index 4ec8ce0c59d9..cc6b89e9db87 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.validation.beanvalidation;
 
-import javax.annotation.PostConstruct;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
@@ -99,7 +98,7 @@ public void testSizeConstraint() {
 		bd.getPropertyValues().add("stringValue", "s");
 		ac.registerBeanDefinition("bean", bd);
 		assertThatExceptionOfType(BeanCreationException.class)
-			.isThrownBy(() -> ac.refresh())
+			.isThrownBy(ac::refresh)
 			.havingRootCause()
 			.withMessageContainingAll("stringValue", "invalid");
 		ac.close();
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
index bdfa8705d36c..974f431462a2 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
@@ -19,12 +19,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.groups.Default;
-
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.groups.Default;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
@@ -49,15 +48,17 @@
 public class MethodValidationTests {
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testMethodValidationInterceptor() {
 		MyValidBean bean = new MyValidBean();
 		ProxyFactory proxyFactory = new ProxyFactory(bean);
 		proxyFactory.addAdvice(new MethodValidationInterceptor());
 		proxyFactory.addAdvisor(new AsyncAnnotationAdvisor());
-		doTestProxyValidation((MyValidInterface<?>) proxyFactory.getProxy());
+		doTestProxyValidation((MyValidInterface<String>) proxyFactory.getProxy());
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testMethodValidationPostProcessor() {
 		StaticApplicationContext ac = new StaticApplicationContext();
 		ac.registerSingleton("mvpp", MethodValidationPostProcessor.class);
@@ -70,8 +71,7 @@ public void testMethodValidationPostProcessor() {
 		ac.close();
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private void doTestProxyValidation(MyValidInterface proxy) {
+	private void doTestProxyValidation(MyValidInterface<String> proxy) {
 		assertThat(proxy.myValidMethod("value", 5)).isNotNull();
 		assertThatExceptionOfType(ValidationException.class).isThrownBy(() ->
 				proxy.myValidMethod("value", 15));
@@ -90,8 +90,8 @@ private void doTestProxyValidation(MyValidInterface proxy) {
 	}
 
 	@Test
-	@SuppressWarnings("resource")
 	public void testLazyValidatorForMethodValidation() {
+		@SuppressWarnings("resource")
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(
 				LazyMethodValidationConfig.class, CustomValidatorBean.class,
 				MyValidBean.class, MyValidFactoryBean.class);
@@ -99,8 +99,8 @@ public void testLazyValidatorForMethodValidation() {
 	}
 
 	@Test
-	@SuppressWarnings("resource")
 	public void testLazyValidatorForMethodValidationWithProxyTargetClass() {
+		@SuppressWarnings("resource")
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(
 				LazyMethodValidationConfigWithProxyTargetClass.class, CustomValidatorBean.class,
 				MyValidBean.class, MyValidFactoryBean.class);
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java
index fe5f62b59848..83138f4344f9 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java
@@ -26,23 +26,24 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.Payload;
-import javax.validation.Valid;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Payload;
+import jakarta.validation.Valid;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -228,6 +229,48 @@ private List<Child> createChildren(Parent parent) {
 		return Arrays.asList(child1, child2);
 	}
 
+	@Test  // SPR-15839
+	public void testListElementConstraint() {
+		BeanWithListElementConstraint bean = new BeanWithListElementConstraint();
+		bean.setProperty(Arrays.asList("no", "element", "can", "be", null));
+
+		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bean, "bean");
+		validatorAdapter.validate(bean, errors);
+
+		assertThat(errors.getFieldErrorCount("property[4]")).isEqualTo(1);
+		assertThat(errors.getFieldValue("property[4]")).isNull();
+	}
+
+	@Test  // SPR-15839
+	public void testMapValueConstraint() {
+		Map<String, String> property = new HashMap<>();
+		property.put("no value can be", null);
+
+		BeanWithMapEntryConstraint bean = new BeanWithMapEntryConstraint();
+		bean.setProperty(property);
+
+		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bean, "bean");
+		validatorAdapter.validate(bean, errors);
+
+		assertThat(errors.getFieldErrorCount("property[no value can be]")).isEqualTo(1);
+		assertThat(errors.getFieldValue("property[no value can be]")).isNull();
+	}
+
+	@Test  // SPR-15839
+	public void testMapEntryConstraint() {
+		Map<String, String> property = new HashMap<>();
+		property.put(null, null);
+
+		BeanWithMapEntryConstraint bean = new BeanWithMapEntryConstraint();
+		bean.setProperty(property);
+
+		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(bean, "bean");
+		validatorAdapter.validate(bean, errors);
+
+		assertThat(errors.hasFieldErrors("property[]")).isTrue();
+		assertThat(errors.getFieldValue("property[]")).isNull();
+	}
+
 
 	@Same(field = "password", comparingField = "confirmPassword")
 	@Same(field = "email", comparingField = "confirmEmail")
@@ -485,4 +528,34 @@ public boolean isValid(Object value, ConstraintValidatorContext context) {
 		}
 	}
 
+
+	public class BeanWithListElementConstraint {
+
+		@Valid
+		private List<@NotNull String> property;
+
+		public List<String> getProperty() {
+			return property;
+		}
+
+		public void setProperty(List<String> property) {
+			this.property = property;
+		}
+	}
+
+
+	public class BeanWithMapEntryConstraint {
+
+		@Valid
+		private Map<@NotNull String, @NotNull String> property;
+
+		public Map<String, String> getProperty() {
+			return property;
+		}
+
+		public void setProperty(Map<String, String> property) {
+			this.property = property;
+		}
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
index a8ae01122e36..29c485dc7722 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
@@ -28,16 +28,15 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.Payload;
-import javax.validation.Valid;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotNull;
-
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Payload;
+import jakarta.validation.Valid;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.NotNull;
 import org.hibernate.validator.HibernateValidator;
 import org.hibernate.validator.HibernateValidatorFactory;
 import org.junit.jupiter.api.Test;
diff --git a/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml b/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
index 6d0dc55e40ed..e8a47157a877 100644
--- a/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
+++ b/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
@@ -40,39 +40,14 @@
 	</util:properties>
 
 	<!-- Local EJB Tests -->
-	<jee:local-slsb id="simpleLocalEjb" jndi-name="ejb/MyLocalBean"
-			business-interface="org.springframework.beans.testfixture.beans.ITestBean"/>
-
-	<jee:local-slsb id="complexLocalEjb"
-			jndi-name="ejb/MyLocalBean"
-			business-interface="org.springframework.beans.testfixture.beans.ITestBean"
-			cache-home="true"
-			lookup-home-on-startup="true"
-			resource-ref="true">
-		<jee:environment>foo=bar</jee:environment>
-	</jee:local-slsb>
+	<jee:local-slsb id="simpleLocalEjb" jndi-name="ejb/MyLocalBean"/>
 
 	<!-- Remote EJB Tests -->
-	<jee:remote-slsb id="simpleRemoteEjb" jndi-name="ejb/MyRemoteBean"
-			business-interface="org.springframework.beans.testfixture.beans.ITestBean"/>
-
-	<jee:remote-slsb id="complexRemoteEjb"
-			jndi-name="ejb/MyRemoteBean"
-			business-interface="org.springframework.beans.testfixture.beans.ITestBean"
-			cache-home="true"
-			lookup-home-on-startup="true"
-			resource-ref="true"
-			home-interface="org.springframework.beans.testfixture.beans.ITestBean"
-			refresh-home-on-connect-failure="true"
-      cache-session-bean="true">
-		<jee:environment>foo=bar</jee:environment>
-	</jee:remote-slsb>
+	<jee:remote-slsb id="simpleRemoteEjb" jndi-name="ejb/MyRemoteBean"/>
 
 	<!-- Lazy beans Tests-->
-	<jee:jndi-lookup id="lazyDataSource" jndi-name="jdbc/MyDataSource" lazy-init="true" />
-	<jee:local-slsb id="lazyLocalBean" jndi-name="ejb/MyLocalBean"
-		business-interface="org.springframework.beans.testfixture.beans.ITestBean" lazy-init="true" />
-	<jee:remote-slsb id="lazyRemoteBean" jndi-name="ejb/MyRemoteBean"
-		business-interface="org.springframework.beans.testfixture.beans.ITestBean" lazy-init="true" />
+	<jee:jndi-lookup id="lazyDataSource" jndi-name="jdbc/MyDataSource" lazy-init="true"/>
+	<jee:local-slsb id="lazyLocalBean" jndi-name="ejb/MyLocalBean" lazy-init="true"/>
+	<jee:remote-slsb id="lazyRemoteBean" jndi-name="ejb/MyRemoteBean" lazy-init="true"/>
 
 </beans>
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
index d686261d1a57..d0a014175fdd 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
@@ -42,7 +42,7 @@
  * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
- * able to use traditional Java EE data access code outside of a Java EE
+ * able to use traditional Jakarta EE data access code outside of a Jakarta EE
  * container.
  *
  * <p>There are various choices for DataSource implementations:
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index a6e5e309b073..de0f6a756e08 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -52,8 +52,8 @@ dependencies {
 	optional("io.netty:netty-buffer")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("com.google.code.findbugs:jsr305")
-	testImplementation("javax.annotation:javax.annotation-api")
-	testImplementation("javax.xml.bind:jaxb-api")
+	testImplementation("jakarta.annotation:jakarta.annotation-api")
+	testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
 	testImplementation("com.fasterxml.woodstox:woodstox-core")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
index 42a0dfca93fc..3ec9549cb60f 100644
--- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java
+++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
@@ -409,7 +409,7 @@ public boolean isOptional() {
 
 	/**
 	 * Check whether this method parameter is annotated with any variant of a
-	 * {@code Nullable} annotation, e.g. {@code javax.annotation.Nullable} or
+	 * {@code Nullable} annotation, e.g. {@code jakarta.annotation.Nullable} or
 	 * {@code edu.umd.cs.findbugs.annotations.Nullable}.
 	 */
 	private boolean hasNullableAnnotation() {
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
index 1fe06d42d7f5..a57a0179c3e9 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
@@ -29,7 +29,7 @@
  * {@code AnnotationAwareOrderComparator} is an extension of
  * {@link OrderComparator} that supports Spring's
  * {@link org.springframework.core.Ordered} interface as well as the
- * {@link Order @Order} and {@link javax.annotation.Priority @Priority}
+ * {@link Order @Order} and {@link jakarta.annotation.Priority @Priority}
  * annotations, with an order value provided by an {@code Ordered}
  * instance overriding a statically defined annotation value (if any).
  *
@@ -42,7 +42,7 @@
  * @since 2.0.1
  * @see org.springframework.core.Ordered
  * @see org.springframework.core.annotation.Order
- * @see javax.annotation.Priority
+ * @see jakarta.annotation.Priority
  */
 public class AnnotationAwareOrderComparator extends OrderComparator {
 
@@ -54,7 +54,7 @@ public class AnnotationAwareOrderComparator extends OrderComparator {
 
 	/**
 	 * This implementation checks for {@link Order @Order} or
-	 * {@link javax.annotation.Priority @Priority} on various kinds of
+	 * {@link jakarta.annotation.Priority @Priority} on various kinds of
 	 * elements, in addition to the {@link org.springframework.core.Ordered}
 	 * check in the superclass.
 	 */
@@ -80,7 +80,7 @@ private Integer findOrderFromAnnotation(Object obj) {
 	}
 
 	/**
-	 * This implementation retrieves an @{@link javax.annotation.Priority}
+	 * This implementation retrieves an @{@link jakarta.annotation.Priority}
 	 * value, allowing for additional semantics over the regular @{@link Order}
 	 * annotation: typically, selecting one object over another in case of
 	 * multiple matches but only one object to be returned.
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/Order.java b/spring-core/src/main/java/org/springframework/core/annotation/Order.java
index a60a439bc618..84f8d067e7c3 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/Order.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/Order.java
@@ -40,7 +40,7 @@
  * order which is an orthogonal concern determined by dependency relationships and
  * {@code @DependsOn} declarations (influencing a runtime-determined dependency graph).
  *
- * <p>Since Spring 4.1, the standard {@link javax.annotation.Priority} annotation
+ * <p>Since Spring 4.1, the standard {@link jakarta.annotation.Priority} annotation
  * can be used as a drop-in replacement for this annotation in ordering scenarios.
  * Note that {@code @Priority} may have additional semantics when a single element
  * has to be picked (see {@link AnnotationAwareOrderComparator#getPriority}).
@@ -58,7 +58,7 @@
  * @see org.springframework.core.Ordered
  * @see AnnotationAwareOrderComparator
  * @see OrderUtils
- * @see javax.annotation.Priority
+ * @see jakarta.annotation.Priority
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/OrderUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/OrderUtils.java
index 25acbc848161..46d196e5d2d1 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/OrderUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/OrderUtils.java
@@ -25,20 +25,20 @@
 
 /**
  * General utility for determining the order of an object based on its type declaration.
- * Handles Spring's {@link Order} annotation as well as {@link javax.annotation.Priority}.
+ * Handles Spring's {@link Order} annotation as well as {@link jakarta.annotation.Priority}.
  *
  * @author Stephane Nicoll
  * @author Juergen Hoeller
  * @since 4.1
  * @see Order
- * @see javax.annotation.Priority
+ * @see jakarta.annotation.Priority
  */
 public abstract class OrderUtils {
 
 	/** Cache marker for a non-annotated Class. */
 	private static final Object NOT_ANNOTATED = new Object();
 
-	private static final String JAVAX_PRIORITY_ANNOTATION = "javax.annotation.Priority";
+	private static final String JAVAX_PRIORITY_ANNOTATION = "jakarta.annotation.Priority";
 
 	/** Cache for @Order value (or NOT_ANNOTATED marker) per Class. */
 	private static final Map<AnnotatedElement, Object> orderCache = new ConcurrentReferenceHashMap<>(64);
@@ -47,7 +47,7 @@ public abstract class OrderUtils {
 	/**
 	 * Return the order on the specified {@code type}, or the specified
 	 * default value if none can be found.
-	 * <p>Takes care of {@link Order @Order} and {@code @javax.annotation.Priority}.
+	 * <p>Takes care of {@link Order @Order} and {@code @jakarta.annotation.Priority}.
 	 * @param type the type to handle
 	 * @return the priority value, or the specified default order if none can be found
 	 * @since 5.0
@@ -61,7 +61,7 @@ public static int getOrder(Class<?> type, int defaultOrder) {
 	/**
 	 * Return the order on the specified {@code type}, or the specified
 	 * default value if none can be found.
-	 * <p>Takes care of {@link Order @Order} and {@code @javax.annotation.Priority}.
+	 * <p>Takes care of {@link Order @Order} and {@code @jakarta.annotation.Priority}.
 	 * @param type the type to handle
 	 * @return the priority value, or the specified default order if none can be found
 	 * @see #getPriority(Class)
@@ -74,7 +74,7 @@ public static Integer getOrder(Class<?> type, @Nullable Integer defaultOrder) {
 
 	/**
 	 * Return the order on the specified {@code type}.
-	 * <p>Takes care of {@link Order @Order} and {@code @javax.annotation.Priority}.
+	 * <p>Takes care of {@link Order @Order} and {@code @jakarta.annotation.Priority}.
 	 * @param type the type to handle
 	 * @return the order value, or {@code null} if none can be found
 	 * @see #getPriority(Class)
@@ -86,7 +86,7 @@ public static Integer getOrder(Class<?> type) {
 
 	/**
 	 * Return the order declared on the specified {@code element}.
-	 * <p>Takes care of {@link Order @Order} and {@code @javax.annotation.Priority}.
+	 * <p>Takes care of {@link Order @Order} and {@code @jakarta.annotation.Priority}.
 	 * @param element the annotated element (e.g. type or method)
 	 * @return the order value, or {@code null} if none can be found
 	 * @since 5.3
@@ -99,7 +99,7 @@ public static Integer getOrder(AnnotatedElement element) {
 	/**
 	 * Return the order from the specified annotations collection.
 	 * <p>Takes care of {@link Order @Order} and
-	 * {@code @javax.annotation.Priority}.
+	 * {@code @jakarta.annotation.Priority}.
 	 * @param element the source element
 	 * @param annotations the annotation to consider
 	 * @return the order value, or {@code null} if none can be found
@@ -132,7 +132,7 @@ private static Integer findOrder(MergedAnnotations annotations) {
 	}
 
 	/**
-	 * Return the value of the {@code javax.annotation.Priority} annotation
+	 * Return the value of the {@code jakarta.annotation.Priority} annotation
 	 * declared on the specified type, or {@code null} if none.
 	 * @param type the type to handle
 	 * @return the priority value if the annotation is declared, or {@code null} if none
diff --git a/spring-core/src/main/java/org/springframework/core/io/ContextResource.java b/spring-core/src/main/java/org/springframework/core/io/ContextResource.java
index f5df62938b18..30f75e00c334 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ContextResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ContextResource.java
@@ -18,7 +18,7 @@
 
 /**
  * Extended interface for a resource that is loaded from an enclosing
- * 'context', e.g. from a {@link javax.servlet.ServletContext} but also
+ * 'context', e.g. from a {@link jakarta.servlet.ServletContext} but also
  * from plain classpath paths or relative file system paths (specified
  * without an explicit prefix, hence applying relative to the local
  * {@link ResourceLoader}'s context).
diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
index 7d96032ad80b..fe0104f58982 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
@@ -102,7 +102,7 @@ public SimpleAsyncTaskExecutor(ThreadFactory threadFactory) {
 	 * Specify an external factory to use for creating new Threads,
 	 * instead of relying on the local properties of this executor.
 	 * <p>You may specify an inner ThreadFactory bean or also a ThreadFactory reference
-	 * obtained from JNDI (on a Java EE 6 server) or some other lookup mechanism.
+	 * obtained from JNDI (on a Jakarta EE server) or some other lookup mechanism.
 	 * @see #setThreadNamePrefix
 	 * @see #setThreadPriority
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
index 3297ff16e11e..0c22b7651b31 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
@@ -30,12 +30,12 @@
  * <p>This is primarily for adapting to client components that communicate via the
  * {@code java.util.concurrent.ExecutorService} API. It can also be used as
  * common ground between a local Spring {@code TaskExecutor} backend and a
- * JNDI-located {@code ManagedExecutorService} in a Java EE 7 environment.
+ * JNDI-located {@code ManagedExecutorService} in a Jakarta EE environment.
  *
  * <p><b>NOTE:</b> This ExecutorService adapter does <em>not</em> support the
  * lifecycle methods in the {@code java.util.concurrent.ExecutorService} API
  * ("shutdown()" etc), similar to a server-wide {@code ManagedExecutorService}
- * in a Java EE 7 environment. The lifecycle is always up to the backend pool,
+ * in a Jakarta EE environment. The lifecycle is always up to the backend pool,
  * with this adapter acting as an access-only proxy for that target pool.
  *
  * @author Juergen Hoeller
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
index 2957f31863c8..99b10db9b7eb 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
@@ -32,9 +32,9 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.Resource;
 import javax.annotation.meta.When;
 
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java
index afe0bcc76200..97ff1aabb516 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java
@@ -19,8 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Priority;
-
+import jakarta.annotation.Priority;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index e9e3586bb6a4..f0502a9687d1 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -35,8 +35,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.Ordered;
@@ -3011,14 +3010,14 @@ public void handleMappedWithDifferentPathAndValueAttributes() {
 	}
 
 	/**
-	 * Mimics javax.persistence.Id
+	 * Mimics jakarta.persistence.Id
 	 */
 	@Retention(RUNTIME)
 	@interface Id {
 	}
 
 	/**
-	 * Mimics javax.persistence.GeneratedValue
+	 * Mimics jakarta.persistence.GeneratedValue
 	 */
 	@Retention(RUNTIME)
 	@interface GeneratedValue {
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/OrderUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/OrderUtilsTests.java
index 08d980baf00b..35c96f2ada67 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/OrderUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/OrderUtilsTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.core.annotation;
 
-import javax.annotation.Priority;
-
+import jakarta.annotation.Priority;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-core/src/test/java/org/springframework/util/Base64UtilsTests.java b/spring-core/src/test/java/org/springframework/util/Base64UtilsTests.java
index 593d81eb6847..17f07b407317 100644
--- a/spring-core/src/test/java/org/springframework/util/Base64UtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/Base64UtilsTests.java
@@ -18,8 +18,7 @@
 
 import java.io.UnsupportedEncodingException;
 
-import javax.xml.bind.DatatypeConverter;
-
+import jakarta.xml.bind.DatatypeConverter;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-jdbc/spring-jdbc.gradle b/spring-jdbc/spring-jdbc.gradle
index 41aa3f198720..389462f3bb41 100644
--- a/spring-jdbc/spring-jdbc.gradle
+++ b/spring-jdbc/spring-jdbc.gradle
@@ -7,7 +7,7 @@ dependencies {
 	api(project(":spring-core"))
 	api(project(":spring-tx"))
 	optional(project(":spring-context"))  // for JndiDataSourceLookup
-	optional("javax.transaction:javax.transaction-api")
+	optional("jakarta.transaction:jakarta.transaction-api")
 	optional("org.hsqldb:hsqldb")
 	optional("com.h2database:h2")
 	optional("org.apache.derby:derby")
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
index d2f619a4d176..2c84c34014f8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
@@ -52,14 +52,14 @@
  *
  * <p>Application code is required to retrieve the JDBC Connection via
  * {@link DataSourceUtils#getConnection(DataSource)} instead of a standard
- * Java EE-style {@link DataSource#getConnection()} call. Spring classes such as
+ * Jakarta EE-style {@link DataSource#getConnection()} call. Spring classes such as
  * {@link org.springframework.jdbc.core.JdbcTemplate} use this strategy implicitly.
  * If not used in combination with this transaction manager, the
  * {@link DataSourceUtils} lookup strategy behaves exactly like the native
  * DataSource lookup; it can thus be used in a portable fashion.
  *
  * <p>Alternatively, you can allow application code to work with the standard
- * Java EE-style lookup pattern {@link DataSource#getConnection()}, for example for
+ * Jakarta EE-style lookup pattern {@link DataSource#getConnection()}, for example for
  * legacy code that is not aware of Spring at all. In that case, define a
  * {@link TransactionAwareDataSourceProxy} for your target DataSource, and pass
  * that proxy DataSource to your DAOs, which will automatically participate in
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
index f803cd46770c..875ac1e88715 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
@@ -34,7 +34,7 @@
  * connection pool, implementing the same standard interface, but creating new
  * Connections on every call.
  *
- * <p>Useful for test or standalone environments outside of a Java EE container, either
+ * <p>Useful for test or standalone environments outside of a Jakarta EE container, either
  * as a DataSource bean in a corresponding ApplicationContext or in conjunction with
  * a simple JNDI environment. Pool-assuming {@code Connection.close()} calls will
  * simply close the Connection, so any DataSource-aware persistence code should work.
@@ -44,7 +44,7 @@
  * loading issues with the JDBC DriverManager that be resolved through direct Driver
  * usage (which is exactly what SimpleDriverDataSource does).</b>
  *
- * <p>In a Java EE container, it is recommended to use a JNDI DataSource provided by
+ * <p>In a Jakarta EE container, it is recommended to use a JNDI DataSource provided by
  * the container. Such a DataSource can be exposed as a DataSource bean in a Spring
  * ApplicationContext via {@link org.springframework.jndi.JndiObjectFactoryBean},
  * for seamless switching to and from a local DataSource bean like this class.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
index e22d47de3723..6ca3f9f1880b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
@@ -57,7 +57,7 @@
  * without paying a performance penalty if no actual data access happens.
  *
  * <p>This DataSource proxy gives you behavior analogous to JTA and a
- * transactional JNDI DataSource (as provided by the Java EE server), even
+ * transactional JNDI DataSource (as provided by the Jakarta EE server), even
  * with a local transaction strategy like DataSourceTransactionManager or
  * HibernateTransactionManager. It does not add value with Spring's
  * JtaTransactionManager as transaction strategy.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
index 09e813d13afa..55b75e02bf73 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
@@ -35,7 +35,7 @@
  * connection pool, implementing the same standard interface, but creating new
  * Connections on every call.
  *
- * <p>In a Java EE container, it is recommended to use a JNDI DataSource provided by
+ * <p>In a Jakarta EE container, it is recommended to use a JNDI DataSource provided by
  * the container. Such a DataSource can be exposed as a DataSource bean in a Spring
  * ApplicationContext via {@link org.springframework.jndi.JndiObjectFactoryBean},
  * for seamless switching to and from a local DataSource bean like this class.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
index aed3ddb54b4c..9edaca7857a4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
@@ -32,7 +32,7 @@
 /**
  * Proxy for a target JDBC {@link javax.sql.DataSource}, adding awareness of
  * Spring-managed transactions. Similar to a transactional JNDI DataSource
- * as provided by a Java EE server.
+ * as provided by a Jakarta EE server.
  *
  * <p>Data access code that should remain unaware of Spring's data access support
  * can work with this proxy to seamlessly participate in Spring-managed transactions.
@@ -52,7 +52,7 @@
  * Connection. If not within a transaction, normal DataSource behavior applies.
  *
  * <p>This proxy allows data access code to work with the plain JDBC API and still
- * participate in Spring-managed transactions, similar to JDBC code in a Java EE/JTA
+ * participate in Spring-managed transactions, similar to JDBC code in a Jakarta EE/JTA
  * environment. However, if possible, use Spring's DataSourceUtils, JdbcTemplate or
  * JDBC operation objects to get transaction participation even without a proxy for
  * the target DataSource, avoiding the need to define such a proxy in the first place.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
deleted file mode 100644
index 95e7a2daada5..000000000000
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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.
- * 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.jdbc.datasource;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * {@link DataSource} implementation that delegates all calls to a WebSphere
- * target {@link DataSource}, typically obtained from JNDI, applying a current
- * isolation level and/or current user credentials to every Connection obtained
- * from it.
- *
- * <p>Uses IBM-specific API to get a JDBC Connection with a specific isolation
- * level (and read-only flag) from a WebSphere DataSource
- * (<a href="https://publib.boulder.ibm.com/infocenter/wasinfo/v5r1//topic/com.ibm.websphere.base.doc/info/aes/ae/rdat_extiapi.html">IBM code example</a>).
- * Supports the transaction-specific isolation level exposed by
- * {@link org.springframework.transaction.support.TransactionSynchronizationManager#getCurrentTransactionIsolationLevel()}.
- * It's also possible to specify a default isolation level, to be applied when the
- * current Spring-managed transaction does not define a specific isolation level.
- *
- * <p>Usage example, defining the target DataSource as an inner-bean JNDI lookup
- * (of course, you can link to any WebSphere DataSource through a bean reference):
- *
- * <pre class="code">
- * &lt;bean id="myDataSource" class="org.springframework.jdbc.datasource.WebSphereDataSourceAdapter"&gt;
- *   &lt;property name="targetDataSource"&gt;
- *     &lt;bean class="org.springframework.jndi.JndiObjectFactoryBean"&gt;
- *       &lt;property name="jndiName" value="jdbc/myds"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
- *
- * Thanks to Ricardo Olivieri for submitting the original implementation
- * of this approach!
- *
- * @author Juergen Hoeller
- * @author <a href="mailto:lari.hotari@sagire.fi">Lari Hotari</a>
- * @author <a href="mailto:roliv@us.ibm.com">Ricardo N. Olivieri</a>
- * @since 2.0.3
- * @see com.ibm.websphere.rsadapter.JDBCConnectionSpec
- * @see com.ibm.websphere.rsadapter.WSDataSource#getConnection(com.ibm.websphere.rsadapter.JDBCConnectionSpec)
- * @see org.springframework.transaction.support.TransactionSynchronizationManager#getCurrentTransactionIsolationLevel()
- * @see org.springframework.transaction.support.TransactionSynchronizationManager#isCurrentTransactionReadOnly()
- */
-public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private Class<?> wsDataSourceClass;
-
-	private Method newJdbcConnSpecMethod;
-
-	private Method wsDataSourceGetConnectionMethod;
-
-	private Method setTransactionIsolationMethod;
-
-	private Method setReadOnlyMethod;
-
-	private Method setUserNameMethod;
-
-	private Method setPasswordMethod;
-
-
-	/**
-	 * This constructor retrieves the WebSphere JDBC connection spec API,
-	 * so we can get obtain specific WebSphere Connections using reflection.
-	 */
-	public WebSphereDataSourceAdapter() {
-		try {
-			this.wsDataSourceClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.WSDataSource");
-			Class<?> jdbcConnSpecClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.JDBCConnectionSpec");
-			Class<?> wsrraFactoryClass = getClass().getClassLoader().loadClass("com.ibm.websphere.rsadapter.WSRRAFactory");
-			this.newJdbcConnSpecMethod = wsrraFactoryClass.getMethod("createJDBCConnectionSpec");
-			this.wsDataSourceGetConnectionMethod =
-					this.wsDataSourceClass.getMethod("getConnection", jdbcConnSpecClass);
-			this.setTransactionIsolationMethod =
-					jdbcConnSpecClass.getMethod("setTransactionIsolation", int.class);
-			this.setReadOnlyMethod = jdbcConnSpecClass.getMethod("setReadOnly", Boolean.class);
-			this.setUserNameMethod = jdbcConnSpecClass.getMethod("setUserName", String.class);
-			this.setPasswordMethod = jdbcConnSpecClass.getMethod("setPassword", String.class);
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException(
-					"Could not initialize WebSphereDataSourceAdapter because WebSphere API classes are not available: " + ex);
-		}
-	}
-
-	/**
-	 * Checks that the specified 'targetDataSource' actually is
-	 * a WebSphere WSDataSource.
-	 */
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-
-		if (!this.wsDataSourceClass.isInstance(getTargetDataSource())) {
-			throw new IllegalStateException(
-					"Specified 'targetDataSource' is not a WebSphere WSDataSource: " + getTargetDataSource());
-		}
-	}
-
-
-	/**
-	 * Builds a WebSphere JDBCConnectionSpec object for the current settings
-	 * and calls {@code WSDataSource.getConnection(JDBCConnectionSpec)}.
-	 * @see #createConnectionSpec
-	 * @see com.ibm.websphere.rsadapter.WSDataSource#getConnection(com.ibm.websphere.rsadapter.JDBCConnectionSpec)
-	 */
-	@Override
-	protected Connection doGetConnection(@Nullable String username, @Nullable String password) throws SQLException {
-		// Create JDBCConnectionSpec using current isolation level value and read-only flag.
-		Object connSpec = createConnectionSpec(
-				getCurrentIsolationLevel(), getCurrentReadOnlyFlag(), username, password);
-		if (logger.isDebugEnabled()) {
-			logger.debug("Obtaining JDBC Connection from WebSphere DataSource [" +
-					getTargetDataSource() + "], using ConnectionSpec [" + connSpec + "]");
-		}
-		// Create Connection through invoking WSDataSource.getConnection(JDBCConnectionSpec)
-		Connection con = (Connection) invokeJdbcMethod(
-				this.wsDataSourceGetConnectionMethod, obtainTargetDataSource(), connSpec);
-		Assert.state(con != null, "No Connection");
-		return con;
-	}
-
-	/**
-	 * Create a WebSphere {@code JDBCConnectionSpec} object for the given characteristics.
-	 * <p>The default implementation uses reflection to apply the given settings.
-	 * Can be overridden in subclasses to customize the JDBCConnectionSpec object
-	 * (<a href="https://publib.boulder.ibm.com/infocenter/wasinfo/v6r0/topic/com.ibm.websphere.javadoc.doc/public_html/api/com/ibm/websphere/rsadapter/JDBCConnectionSpec.html">JDBCConnectionSpec javadoc</a>;
-	 * <a href="https://www.ibm.com/developerworks/websphere/library/techarticles/0404_tang/0404_tang.html">IBM developerWorks article</a>).
-	 * @param isolationLevel the isolation level to apply (or {@code null} if none)
-	 * @param readOnlyFlag the read-only flag to apply (or {@code null} if none)
-	 * @param username the username to apply ({@code null} or empty indicates the default)
-	 * @param password the password to apply (may be {@code null} or empty)
-	 * @throws SQLException if thrown by JDBCConnectionSpec API methods
-	 * @see com.ibm.websphere.rsadapter.JDBCConnectionSpec
-	 */
-	protected Object createConnectionSpec(@Nullable Integer isolationLevel, @Nullable Boolean readOnlyFlag,
-			@Nullable String username, @Nullable String password) throws SQLException {
-
-		Object connSpec = invokeJdbcMethod(this.newJdbcConnSpecMethod, null);
-		Assert.state(connSpec != null, "No JDBCConnectionSpec");
-		if (isolationLevel != null) {
-			invokeJdbcMethod(this.setTransactionIsolationMethod, connSpec, isolationLevel);
-		}
-		if (readOnlyFlag != null) {
-			invokeJdbcMethod(this.setReadOnlyMethod, connSpec, readOnlyFlag);
-		}
-		// If the username is empty, we'll simply let the target DataSource
-		// use its default credentials.
-		if (StringUtils.hasLength(username)) {
-			invokeJdbcMethod(this.setUserNameMethod, connSpec, username);
-			invokeJdbcMethod(this.setPasswordMethod, connSpec, password);
-		}
-		return connSpec;
-	}
-
-
-	@Nullable
-	private static Object invokeJdbcMethod(Method method, @Nullable Object target, @Nullable Object... args)
-			throws SQLException {
-		try {
-			return method.invoke(target, args);
-		}
-		catch (IllegalAccessException ex) {
-			ReflectionUtils.handleReflectionException(ex);
-		}
-		catch (InvocationTargetException ex) {
-			if (ex.getTargetException() instanceof SQLException) {
-				throw (SQLException) ex.getTargetException();
-			}
-			ReflectionUtils.handleInvocationTargetException(ex);
-		}
-		throw new IllegalStateException("Should never get here");
-	}
-
-}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
index 13e87b621bcd..dfd67268392b 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
@@ -23,13 +23,13 @@
 import java.util.Map;
 
 import javax.sql.DataSource;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
 
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-jms/spring-jms.gradle b/spring-jms/spring-jms.gradle
index 32485dff84ba..6757f90eca2c 100644
--- a/spring-jms/spring-jms.gradle
+++ b/spring-jms/spring-jms.gradle
@@ -5,15 +5,14 @@ dependencies {
 	api(project(":spring-core"))
 	api(project(":spring-messaging"))
 	api(project(":spring-tx"))
-	compileOnly("javax.jms:javax.jms-api")
+	compileOnly("jakarta.jms:jakarta.jms-api")
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
-	optional("javax.resource:javax.resource-api")
-	optional("javax.transaction:javax.transaction-api")
+	optional("jakarta.resource:jakarta.resource-api")
+	optional("jakarta.transaction:jakarta.transaction-api")
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-tx")))
-	testImplementation("org.apache.activemq:activemq-broker")
-	testImplementation("javax.jms:javax.jms-api")
+	testImplementation("jakarta.jms:jakarta.jms-api")
 }
diff --git a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
index 1b6d7924f057..87c9192e0605 100644
--- a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.IllegalStateException
+ * @see jakarta.jms.IllegalStateException
  */
 @SuppressWarnings("serial")
 public class IllegalStateException extends JmsException {
 
-	public IllegalStateException(javax.jms.IllegalStateException cause) {
+	public IllegalStateException(jakarta.jms.IllegalStateException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
index 25f915971488..d4e84a4bb834 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.InvalidClientIDException
+ * @see jakarta.jms.InvalidClientIDException
  */
 @SuppressWarnings("serial")
 public class InvalidClientIDException extends JmsException {
 
-	public InvalidClientIDException(javax.jms.InvalidClientIDException cause) {
+	public InvalidClientIDException(jakarta.jms.InvalidClientIDException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
index a40434a23161..b1ac9001ebbf 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.InvalidDestinationException
+ * @see jakarta.jms.InvalidDestinationException
  */
 @SuppressWarnings("serial")
 public class InvalidDestinationException extends JmsException {
 
-	public InvalidDestinationException(javax.jms.InvalidDestinationException cause) {
+	public InvalidDestinationException(jakarta.jms.InvalidDestinationException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
index da4c6df92c58..a065af5f8730 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.InvalidSelectorException
+ * @see jakarta.jms.InvalidSelectorException
  */
 @SuppressWarnings("serial")
 public class InvalidSelectorException extends JmsException {
 
-	public InvalidSelectorException(javax.jms.InvalidSelectorException cause) {
+	public InvalidSelectorException(jakarta.jms.InvalidSelectorException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
index 0c847adea3e1..77a712e6ed60 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.lang.Nullable;
@@ -44,7 +44,7 @@ public JmsException(String msg) {
 	 * Constructor that takes a message and a root cause.
 	 * @param msg the detail message
 	 * @param cause the cause of the exception. This argument is generally
-	 * expected to be a proper subclass of {@link javax.jms.JMSException},
+	 * expected to be a proper subclass of {@link jakarta.jms.JMSException},
 	 * but can also be a JNDI NamingException or the like.
 	 */
 	public JmsException(String msg, @Nullable Throwable cause) {
@@ -53,9 +53,9 @@ public JmsException(String msg, @Nullable Throwable cause) {
 
 	/**
 	 * Constructor that takes a plain root cause, intended for
-	 * subclasses mirroring corresponding {@code javax.jms} exceptions.
+	 * subclasses mirroring corresponding {@code jakarta.jms} exceptions.
 	 * @param cause the cause of the exception. This argument is generally
-	 * expected to be a proper subclass of {@link javax.jms.JMSException}.
+	 * expected to be a proper subclass of {@link jakarta.jms.JMSException}.
 	 */
 	public JmsException(@Nullable Throwable cause) {
 		super(cause != null ? cause.getMessage() : null, cause);
@@ -80,7 +80,7 @@ public String getErrorCode() {
 	/**
 	 * Return the detail message, including the message from the linked exception
 	 * if there is one.
-	 * @see javax.jms.JMSException#getLinkedException()
+	 * @see jakarta.jms.JMSException#getLinkedException()
 	 */
 	@Override
 	@Nullable
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
index a55352d9d56b..1db9307340d9 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.JMSSecurityException
+ * @see jakarta.jms.JMSSecurityException
  */
 @SuppressWarnings("serial")
 public class JmsSecurityException extends JmsException {
 
-	public JmsSecurityException(javax.jms.JMSSecurityException cause) {
+	public JmsSecurityException(jakarta.jms.JMSSecurityException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
index 93cafa81b929..d6f53d1b1b79 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.MessageEOFException
+ * @see jakarta.jms.MessageEOFException
  */
 @SuppressWarnings("serial")
 public class MessageEOFException extends JmsException {
 
-	public MessageEOFException(javax.jms.MessageEOFException cause) {
+	public MessageEOFException(jakarta.jms.MessageEOFException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
index 5fd26326c543..d70f1fcfb705 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.MessageFormatException
+ * @see jakarta.jms.MessageFormatException
  */
 @SuppressWarnings("serial")
 public class MessageFormatException extends JmsException {
 
-	public MessageFormatException(javax.jms.MessageFormatException cause) {
+	public MessageFormatException(jakarta.jms.MessageFormatException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
index d17acc90bf17..04e3221754f6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.MessageNotReadableException
+ * @see jakarta.jms.MessageNotReadableException
  */
 @SuppressWarnings("serial")
 public class MessageNotReadableException extends JmsException {
 
-	public MessageNotReadableException(javax.jms.MessageNotReadableException cause) {
+	public MessageNotReadableException(jakarta.jms.MessageNotReadableException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
index 52aa0223627a..a4a4961577c6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.MessageNotWriteableException
+ * @see jakarta.jms.MessageNotWriteableException
  */
 @SuppressWarnings("serial")
 public class MessageNotWriteableException extends JmsException {
 
-	public MessageNotWriteableException(javax.jms.MessageNotWriteableException cause) {
+	public MessageNotWriteableException(jakarta.jms.MessageNotWriteableException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
index 31ded9822361..d3a1f674553d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.ResourceAllocationException
+ * @see jakarta.jms.ResourceAllocationException
  */
 @SuppressWarnings("serial")
 public class ResourceAllocationException extends JmsException {
 
-	public ResourceAllocationException(javax.jms.ResourceAllocationException cause) {
+	public ResourceAllocationException(jakarta.jms.ResourceAllocationException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
index 37bab68acdfe..2b271ae13975 100644
--- a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.TransactionInProgressException
+ * @see jakarta.jms.TransactionInProgressException
  */
 @SuppressWarnings("serial")
 public class TransactionInProgressException extends JmsException {
 
-	public TransactionInProgressException(javax.jms.TransactionInProgressException cause) {
+	public TransactionInProgressException(jakarta.jms.TransactionInProgressException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
index 3d0cd7501b09..d29b98206c8b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
@@ -21,12 +21,12 @@
  *
  * @author Mark Pollack
  * @since 1.1
- * @see javax.jms.TransactionRolledBackException
+ * @see jakarta.jms.TransactionRolledBackException
  */
 @SuppressWarnings("serial")
 public class TransactionRolledBackException extends JmsException {
 
-	public TransactionRolledBackException(javax.jms.TransactionRolledBackException cause) {
+	public TransactionRolledBackException(jakarta.jms.TransactionRolledBackException cause) {
 		super(cause);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
index ebf07cdf05df..f449cbacd8cb 100644
--- a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
@@ -37,7 +37,7 @@ public UncategorizedJmsException(String msg) {
 	 * Constructor that takes a message and a root cause.
 	 * @param msg the detail message
 	 * @param cause the cause of the exception. This argument is generally
-	 * expected to be a proper subclass of {@link javax.jms.JMSException},
+	 * expected to be a proper subclass of {@link jakarta.jms.JMSException},
 	 * but can also be a JNDI NamingException or the like.
 	 */
 	public UncategorizedJmsException(String msg, Throwable cause) {
@@ -47,7 +47,7 @@ public UncategorizedJmsException(String msg, Throwable cause) {
 	/**
 	 * Constructor that takes a root cause only.
 	 * @param cause the cause of the exception. This argument is generally
-	 * expected to be a proper subclass of {@link javax.jms.JMSException},
+	 * expected to be a proper subclass of {@link jakarta.jms.JMSException},
 	 * but can also be a JNDI NamingException or the like.
 	 */
 	public UncategorizedJmsException(Throwable cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java b/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
index 79c4a3bca051..589e0e8e1380 100644
--- a/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
+++ b/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
@@ -74,8 +74,8 @@
  * is set a {@code JmsListenerContainerFactory} bean with name {@code jmsListenerContainerFactory} is
  * assumed to be present.
  *
- * <p>the following configuration would ensure that every time a {@link javax.jms.Message}
- * is received on the {@link javax.jms.Destination} named "myQueue", {@code MyService.process()}
+ * <p>the following configuration would ensure that every time a {@link jakarta.jms.Message}
+ * is received on the {@link jakarta.jms.Destination} named "myQueue", {@code MyService.process()}
  * is called with the content of the message:
  *
  * <pre class="code">
diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java
index 20847545785b..7fee7e70935c 100644
--- a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java
@@ -47,8 +47,8 @@
  * <p>Annotated JMS listener methods are allowed to have flexible signatures similar
  * to what {@link MessageMapping} provides:
  * <ul>
- * <li>{@link javax.jms.Session} to get access to the JMS session</li>
- * <li>{@link javax.jms.Message} or one of its subclasses to get access to the raw JMS message</li>
+ * <li>{@link jakarta.jms.Session} to get access to the JMS session</li>
+ * <li>{@link jakarta.jms.Message} or one of its subclasses to get access to the raw JMS message</li>
  * <li>{@link org.springframework.messaging.Message} to use Spring's messaging abstraction counterpart</li>
  * <li>{@link org.springframework.messaging.handler.annotation.Payload @Payload}-annotated method
  * arguments, including support for validation</li>
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
index 39007467a0b9..049aa4bcc061 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
@@ -16,9 +16,8 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.ExceptionListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerEndpoint.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerEndpoint.java
index 2e0fb1a9b4bc..96df64e0e67f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerEndpoint.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerEndpoint.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
 
 import org.springframework.jms.listener.AbstractMessageListenerContainer;
 import org.springframework.jms.listener.MessageListenerContainer;
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
index a8e66fd602c4..787b0622ca72 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.Session;
-
+import jakarta.jms.Session;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/DefaultJcaListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/DefaultJcaListenerContainerFactory.java
index a14af147cfa7..0338478a0864 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/DefaultJcaListenerContainerFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/DefaultJcaListenerContainerFactory.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.config;
 
-import javax.resource.spi.ResourceAdapter;
+import jakarta.resource.spi.ResourceAdapter;
 
 import org.springframework.jms.listener.endpoint.JmsActivationSpecConfig;
 import org.springframework.jms.listener.endpoint.JmsActivationSpecFactory;
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
index 0738ecfae1c7..e88259bbdc77 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.Session;
-
+import jakarta.jms.Session;
 import org.w3c.dom.Element;
 
 import org.springframework.beans.MutablePropertyValues;
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/SimpleJmsListenerEndpoint.java b/spring-jms/src/main/java/org/springframework/jms/config/SimpleJmsListenerEndpoint.java
index 33be14be058d..5dfc42ad2883 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/SimpleJmsListenerEndpoint.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/SimpleJmsListenerEndpoint.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.MessageListener;
+import jakarta.jms.MessageListener;
 
 import org.springframework.jms.listener.MessageListenerContainer;
 import org.springframework.lang.Nullable;
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
index 5f919cc67012..a077dac8d49f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
@@ -16,14 +16,14 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.QueueReceiver;
-import javax.jms.Topic;
-import javax.jms.TopicSubscriber;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueReceiver;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicSubscriber;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
index daae35af0aa9..91f24ccd00a0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
@@ -16,15 +16,15 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.CompletionListener;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
+import jakarta.jms.CompletionListener;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueSender;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicPublisher;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
index d9b8027f1aa3..109762e0888d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
@@ -30,18 +30,18 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.Topic;
-import javax.jms.TopicSession;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.TemporaryQueue;
+import jakarta.jms.TemporaryTopic;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicSession;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -49,8 +49,8 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * {@link SingleConnectionFactory} subclass that adds {@link javax.jms.Session}
- * caching as well {@link javax.jms.MessageProducer} caching. This ConnectionFactory
+ * {@link SingleConnectionFactory} subclass that adds {@link jakarta.jms.Session}
+ * caching as well {@link jakarta.jms.MessageProducer} caching. This ConnectionFactory
  * also switches the {@link #setReconnectOnException "reconnectOnException" property}
  * to "true" by default, allowing for automatic recovery of the underlying Connection.
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java b/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
index eb5d0beac028..6a7b58ba295e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
@@ -19,8 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
 
 import org.springframework.util.Assert;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
index 3de9bc71ffa9..0f7b72fd2e21 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
@@ -16,17 +16,16 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
+import jakarta.jms.TopicSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,7 +35,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Helper class for managing a JMS {@link javax.jms.ConnectionFactory}, in particular
+ * Helper class for managing a JMS {@link jakarta.jms.ConnectionFactory}, in particular
  * for obtaining transactional JMS resources for a given ConnectionFactory.
  *
  * <p>Mainly for internal use within the framework. Used by
@@ -264,7 +263,7 @@ public boolean isSynchedLocalTransactionAllowed() {
 	 * JMS resources
 	 * @return the transactional Session, or {@code null} if none found
 	 * @throws JMSException in case of JMS failure
-	 * @see #doGetTransactionalSession(javax.jms.ConnectionFactory, ResourceFactory, boolean)
+	 * @see #doGetTransactionalSession(jakarta.jms.ConnectionFactory, ResourceFactory, boolean)
 	 */
 	@Nullable
 	public static Session doGetTransactionalSession(
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
index 1cdedc3a61fb..ea72ff38c6ec 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
@@ -16,22 +16,22 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * {@link javax.jms.ConnectionFactory} implementation that delegates all calls
- * to a given target {@link javax.jms.ConnectionFactory}, adapting specific
+ * {@link jakarta.jms.ConnectionFactory} implementation that delegates all calls
+ * to a given target {@link jakarta.jms.ConnectionFactory}, adapting specific
  * {@code create(Queue/Topic)Connection} calls to the target ConnectionFactory
  * if necessary (e.g. when running JMS 1.0.2 API based code against a generic
  * JMS 1.1 ConnectionFactory, such as ActiveMQ's PooledConnectionFactory).
@@ -126,7 +126,7 @@ public QueueConnection createQueueConnection() throws JMSException {
 		else {
 			Connection con = target.createConnection();
 			if (!(con instanceof QueueConnection)) {
-				throw new javax.jms.IllegalStateException("'targetConnectionFactory' is not a QueueConnectionFactory");
+				throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a QueueConnectionFactory");
 			}
 			return (QueueConnection) con;
 		}
@@ -141,7 +141,7 @@ public QueueConnection createQueueConnection(String username, String password) t
 		else {
 			Connection con = target.createConnection(username, password);
 			if (!(con instanceof QueueConnection)) {
-				throw new javax.jms.IllegalStateException("'targetConnectionFactory' is not a QueueConnectionFactory");
+				throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a QueueConnectionFactory");
 			}
 			return (QueueConnection) con;
 		}
@@ -156,7 +156,7 @@ public TopicConnection createTopicConnection() throws JMSException {
 		else {
 			Connection con = target.createConnection();
 			if (!(con instanceof TopicConnection)) {
-				throw new javax.jms.IllegalStateException("'targetConnectionFactory' is not a TopicConnectionFactory");
+				throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a TopicConnectionFactory");
 			}
 			return (TopicConnection) con;
 		}
@@ -171,7 +171,7 @@ public TopicConnection createTopicConnection(String username, String password) t
 		else {
 			Connection con = target.createConnection(username, password);
 			if (!(con instanceof TopicConnection)) {
-				throw new javax.jms.IllegalStateException("'targetConnectionFactory' is not a TopicConnectionFactory");
+				throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a TopicConnectionFactory");
 			}
 			return (TopicConnection) con;
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
index a8e9c86dbe1e..7b43c35152c0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
@@ -22,12 +22,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.jms.TransactionInProgressException;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
+import jakarta.jms.TransactionInProgressException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -243,7 +242,7 @@ public void commitAll() throws JMSException {
 			catch (TransactionInProgressException ex) {
 				// Ignore -> can only happen in case of a JTA transaction.
 			}
-			catch (javax.jms.IllegalStateException ex) {
+			catch (jakarta.jms.IllegalStateException ex) {
 				if (this.connectionFactory != null) {
 					try {
 						Method getDataSourceMethod = this.connectionFactory.getClass().getMethod("getDataSource");
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
index 28de1e8df06f..2bc43f20da25 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
@@ -16,11 +16,11 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.jms.TransactionRolledBackException;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
+import jakarta.jms.TransactionRolledBackException;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
@@ -38,7 +38,7 @@
 
 /**
  * {@link org.springframework.transaction.PlatformTransactionManager} implementation
- * for a single JMS {@link javax.jms.ConnectionFactory}. Binds a JMS
+ * for a single JMS {@link jakarta.jms.ConnectionFactory}. Binds a JMS
  * Connection/Session pair from the specified ConnectionFactory to the thread,
  * potentially allowing for one thread-bound Session per ConnectionFactory.
  *
@@ -52,12 +52,12 @@
  *
  * <p>Application code is required to retrieve the transactional JMS Session via
  * {@link ConnectionFactoryUtils#getTransactionalSession} instead of a standard
- * Java EE-style {@link ConnectionFactory#createConnection()} call with subsequent
+ * Jakarta EE-style {@link ConnectionFactory#createConnection()} call with subsequent
  * Session creation. Spring's {@link org.springframework.jms.core.JmsTemplate}
  * will autodetect a thread-bound Session and automatically participate in it.
  *
  * <p>Alternatively, you can allow application code to work with the standard
- * Java EE-style lookup pattern on a ConnectionFactory, for example for legacy code
+ * Jakarta EE-style lookup pattern on a ConnectionFactory, for example for legacy code
  * that is not aware of Spring at all. In that case, define a
  * {@link TransactionAwareConnectionFactoryProxy} for your target ConnectionFactory,
  * which will automatically participate in Spring-managed transactions.
@@ -324,7 +324,7 @@ protected void doCleanupAfterCompletion(Object transaction) {
 	 * Create a JMS Connection via this template's ConnectionFactory.
 	 * <p>This implementation uses JMS 1.1 API.
 	 * @return the new JMS Connection
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	protected Connection createConnection() throws JMSException {
 		return obtainConnectionFactory().createConnection();
@@ -335,7 +335,7 @@ protected Connection createConnection() throws JMSException {
 	 * <p>This implementation uses JMS 1.1 API.
 	 * @param con the JMS Connection to create a Session for
 	 * @return the new JMS Session
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	protected Session createSession(Connection con) throws JMSException {
 		return con.createSession(true, Session.AUTO_ACKNOWLEDGE);
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
index f6443252b41b..cd4ccbb5b800 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
@@ -16,17 +16,17 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 /**
- * Subinterface of {@link javax.jms.Session} to be implemented by
+ * Subinterface of {@link jakarta.jms.Session} to be implemented by
  * Session proxies. Allows access to the underlying target Session.
  *
  * @author Juergen Hoeller
  * @since 2.0.4
  * @see TransactionAwareConnectionFactoryProxy
  * @see CachingConnectionFactory
- * @see ConnectionFactoryUtils#getTargetSession(javax.jms.Session)
+ * @see ConnectionFactoryUtils#getTargetSession(jakarta.jms.Session)
  */
 public interface SessionProxy extends Session {
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
index 1a463c3b4fef..0c5e629022a3 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
@@ -25,17 +25,16 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.Session;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.Session;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -49,7 +48,7 @@
 /**
  * A JMS ConnectionFactory adapter that returns the same Connection
  * from all {@link #createConnection()} calls, and ignores calls to
- * {@link javax.jms.Connection#close()}. According to the JMS Connection
+ * {@link jakarta.jms.Connection#close()}. According to the JMS Connection
  * model, this is perfectly thread-safe (in contrast to e.g. JDBC). The
  * shared Connection can be automatically recovered in case of an Exception.
  *
@@ -170,7 +169,7 @@ public ConnectionFactory getTargetConnectionFactory() {
 	 * <p>Note that client IDs need to be unique among all active Connections
 	 * of the underlying JMS provider. Furthermore, a client ID can only be
 	 * assigned if the original ConnectionFactory hasn't already assigned one.
-	 * @see javax.jms.Connection#setClientID
+	 * @see jakarta.jms.Connection#setClientID
 	 * @see #setTargetConnectionFactory
 	 */
 	public void setClientId(@Nullable String clientId) {
@@ -245,7 +244,7 @@ public Connection createConnection() throws JMSException {
 
 	@Override
 	public Connection createConnection(String username, String password) throws JMSException {
-		throw new javax.jms.IllegalStateException(
+		throw new jakarta.jms.IllegalStateException(
 				"SingleConnectionFactory does not support custom username and password");
 	}
 
@@ -257,7 +256,7 @@ public QueueConnection createQueueConnection() throws JMSException {
 			con = createConnection();
 		}
 		if (!(con instanceof QueueConnection)) {
-			throw new javax.jms.IllegalStateException(
+			throw new jakarta.jms.IllegalStateException(
 					"This SingleConnectionFactory does not hold a QueueConnection but rather: " + con);
 		}
 		return ((QueueConnection) con);
@@ -265,7 +264,7 @@ public QueueConnection createQueueConnection() throws JMSException {
 
 	@Override
 	public QueueConnection createQueueConnection(String username, String password) throws JMSException {
-		throw new javax.jms.IllegalStateException(
+		throw new jakarta.jms.IllegalStateException(
 				"SingleConnectionFactory does not support custom username and password");
 	}
 
@@ -277,7 +276,7 @@ public TopicConnection createTopicConnection() throws JMSException {
 			con = createConnection();
 		}
 		if (!(con instanceof TopicConnection)) {
-			throw new javax.jms.IllegalStateException(
+			throw new jakarta.jms.IllegalStateException(
 					"This SingleConnectionFactory does not hold a TopicConnection but rather: " + con);
 		}
 		return ((TopicConnection) con);
@@ -285,7 +284,7 @@ public TopicConnection createTopicConnection() throws JMSException {
 
 	@Override
 	public TopicConnection createTopicConnection(String username, String password) throws JMSException {
-		throw new javax.jms.IllegalStateException(
+		throw new jakarta.jms.IllegalStateException(
 				"SingleConnectionFactory does not support custom username and password");
 	}
 
@@ -319,7 +318,7 @@ private ConnectionFactory obtainTargetConnectionFactory() {
 	/**
 	 * Obtain an initialized shared Connection.
 	 * @return the Connection (never {@code null})
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 * @see #initConnection()
 	 */
 	protected Connection getConnection() throws JMSException {
@@ -335,7 +334,7 @@ protected Connection getConnection() throws JMSException {
 	 * Initialize the underlying shared Connection.
 	 * <p>Closes and reinitializes the Connection if an underlying
 	 * Connection is present already.
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 * @see #prepareConnection
 	 */
 	public void initConnection() throws JMSException {
@@ -396,7 +395,7 @@ public void resetConnection() {
 	/**
 	 * Create a JMS Connection via this template's ConnectionFactory.
 	 * @return the new JMS Connection
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	protected Connection doCreateConnection() throws JMSException {
 		ConnectionFactory cf = getTargetConnectionFactory();
@@ -502,7 +501,7 @@ protected void closeConnection(Connection con) {
 				con.close();
 			}
 		}
-		catch (javax.jms.IllegalStateException ex) {
+		catch (jakarta.jms.IllegalStateException ex) {
 			logger.debug("Ignoring Connection state exception - assuming already closed: " + ex);
 		}
 		catch (Throwable ex) {
@@ -569,7 +568,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 						return null;
 					}
 					else {
-						throw new javax.jms.IllegalStateException(
+						throw new jakarta.jms.IllegalStateException(
 								"setClientID call not supported on proxy for shared Connection. " +
 								"Set the 'clientId' property on the SingleConnectionFactory instead.");
 					}
@@ -590,7 +589,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 							return null;
 						}
 						else {
-							throw new javax.jms.IllegalStateException(
+							throw new jakarta.jms.IllegalStateException(
 									"setExceptionListener call not supported on proxy for shared Connection. " +
 									"Set the 'exceptionListener' property on the SingleConnectionFactory instead. " +
 									"Alternatively, activate SingleConnectionFactory's 'reconnectOnException' feature, " +
@@ -650,7 +649,7 @@ else if (args.length == 2) {
 							catch (Throwable ex) {
 								logger.trace("Failed to close newly obtained JMS Session", ex);
 							}
-							throw new javax.jms.IllegalStateException(msg);
+							throw new jakarta.jms.IllegalStateException(msg);
 						}
 						return session;
 					}
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
index 222627a7f327..00eb4c6b1eaa 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
@@ -16,11 +16,11 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
 
 /**
- * Extension of the {@code javax.jms.ConnectionFactory} interface,
+ * Extension of the {@code jakarta.jms.ConnectionFactory} interface,
  * indicating how to release Connections obtained from it.
  *
  * @author Juergen Hoeller
@@ -32,7 +32,7 @@ public interface SmartConnectionFactory extends ConnectionFactory {
 	 * Should we stop the Connection, obtained from this ConnectionFactory?
 	 * @param con the Connection to check
 	 * @return whether a stop call is necessary
-	 * @see javax.jms.Connection#stop()
+	 * @see jakarta.jms.Connection#stop()
 	 */
 	boolean shouldStop(Connection con);
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
index 311de08a2aa6..a4fbdb961f31 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
 
 import org.springframework.jms.JmsException;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
index 3dbbfb5c7327..2bac2fa55d03 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
@@ -23,27 +23,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
-import javax.jms.TransactionInProgressException;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
+import jakarta.jms.TopicSession;
+import jakarta.jms.TransactionInProgressException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
- * Proxy for a target JMS {@link javax.jms.ConnectionFactory}, adding awareness of
+ * Proxy for a target JMS {@link jakarta.jms.ConnectionFactory}, adding awareness of
  * Spring-managed transactions. Similar to a transactional JNDI ConnectionFactory
- * as provided by a Java EE application server.
+ * as provided by a Jakarta EE application server.
  *
  * <p>Messaging code which should remain unaware of Spring's JMS support can work with
  * this proxy to seamlessly participate in Spring-managed transactions. Note that the
@@ -164,7 +164,7 @@ public Connection createConnection(String username, String password) throws JMSE
 	public QueueConnection createQueueConnection() throws JMSException {
 		ConnectionFactory target = getTargetConnectionFactory();
 		if (!(target instanceof QueueConnectionFactory)) {
-			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no QueueConnectionFactory");
+			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is no QueueConnectionFactory");
 		}
 		QueueConnection targetConnection = ((QueueConnectionFactory) target).createQueueConnection();
 		return (QueueConnection) getTransactionAwareConnectionProxy(targetConnection);
@@ -174,7 +174,7 @@ public QueueConnection createQueueConnection() throws JMSException {
 	public QueueConnection createQueueConnection(String username, String password) throws JMSException {
 		ConnectionFactory target = getTargetConnectionFactory();
 		if (!(target instanceof QueueConnectionFactory)) {
-			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no QueueConnectionFactory");
+			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is no QueueConnectionFactory");
 		}
 		QueueConnection targetConnection = ((QueueConnectionFactory) target).createQueueConnection(username, password);
 		return (QueueConnection) getTransactionAwareConnectionProxy(targetConnection);
@@ -184,7 +184,7 @@ public QueueConnection createQueueConnection(String username, String password) t
 	public TopicConnection createTopicConnection() throws JMSException {
 		ConnectionFactory target = getTargetConnectionFactory();
 		if (!(target instanceof TopicConnectionFactory)) {
-			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no TopicConnectionFactory");
+			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is no TopicConnectionFactory");
 		}
 		TopicConnection targetConnection = ((TopicConnectionFactory) target).createTopicConnection();
 		return (TopicConnection) getTransactionAwareConnectionProxy(targetConnection);
@@ -194,7 +194,7 @@ public TopicConnection createTopicConnection() throws JMSException {
 	public TopicConnection createTopicConnection(String username, String password) throws JMSException {
 		ConnectionFactory target = getTargetConnectionFactory();
 		if (!(target instanceof TopicConnectionFactory)) {
-			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no TopicConnectionFactory");
+			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is no TopicConnectionFactory");
 		}
 		TopicConnection targetConnection = ((TopicConnectionFactory) target).createTopicConnection(username, password);
 		return (TopicConnection) getTransactionAwareConnectionProxy(targetConnection);
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
index f8d2e4b9b42e..ef8dd8585fa9 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
@@ -16,14 +16,14 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.NamedThreadLocal;
@@ -32,7 +32,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * An adapter for a target JMS {@link javax.jms.ConnectionFactory}, applying the
+ * An adapter for a target JMS {@link jakarta.jms.ConnectionFactory}, applying the
  * given user credentials to every standard {@code createConnection()} call,
  * that is, implicitly invoking {@code createConnection(username, password)}
  * on the target. All other methods simply delegate to the corresponding methods
@@ -179,8 +179,8 @@ public Connection createConnection(String username, String password) throws JMSE
 	 * @param username the username to use
 	 * @param password the password to use
 	 * @return the Connection
-	 * @see javax.jms.ConnectionFactory#createConnection(String, String)
-	 * @see javax.jms.ConnectionFactory#createConnection()
+	 * @see jakarta.jms.ConnectionFactory#createConnection(String, String)
+	 * @see jakarta.jms.ConnectionFactory#createConnection()
 	 */
 	protected Connection doCreateConnection(@Nullable String username, @Nullable String password) throws JMSException {
 		ConnectionFactory target = obtainTargetConnectionFactory();
@@ -225,15 +225,15 @@ public QueueConnection createQueueConnection(String username, String password) t
 	 * @param username the username to use
 	 * @param password the password to use
 	 * @return the Connection
-	 * @see javax.jms.QueueConnectionFactory#createQueueConnection(String, String)
-	 * @see javax.jms.QueueConnectionFactory#createQueueConnection()
+	 * @see jakarta.jms.QueueConnectionFactory#createQueueConnection(String, String)
+	 * @see jakarta.jms.QueueConnectionFactory#createQueueConnection()
 	 */
 	protected QueueConnection doCreateQueueConnection(
 			@Nullable String username, @Nullable String password) throws JMSException {
 
 		ConnectionFactory target = obtainTargetConnectionFactory();
 		if (!(target instanceof QueueConnectionFactory)) {
-			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is not a QueueConnectionFactory");
+			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a QueueConnectionFactory");
 		}
 		QueueConnectionFactory queueFactory = (QueueConnectionFactory) target;
 		if (StringUtils.hasLength(username)) {
@@ -277,15 +277,15 @@ public TopicConnection createTopicConnection(String username, String password) t
 	 * @param username the username to use
 	 * @param password the password to use
 	 * @return the Connection
-	 * @see javax.jms.TopicConnectionFactory#createTopicConnection(String, String)
-	 * @see javax.jms.TopicConnectionFactory#createTopicConnection()
+	 * @see jakarta.jms.TopicConnectionFactory#createTopicConnection(String, String)
+	 * @see jakarta.jms.TopicConnectionFactory#createTopicConnection()
 	 */
 	protected TopicConnection doCreateTopicConnection(
 			@Nullable String username, @Nullable String password) throws JMSException {
 
 		ConnectionFactory target = obtainTargetConnectionFactory();
 		if (!(target instanceof TopicConnectionFactory)) {
-			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is not a TopicConnectionFactory");
+			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a TopicConnectionFactory");
 		}
 		TopicConnectionFactory queueFactory = (TopicConnectionFactory) target;
 		if (StringUtils.hasLength(username)) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
index 5142cd350801..1a076bad5012 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.JMSException;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueBrowser;
+import jakarta.jms.Session;
 
 import org.springframework.lang.Nullable;
 
@@ -39,13 +39,13 @@
 public interface BrowserCallback<T> {
 
 	/**
-	 * Perform operations on the given {@link javax.jms.Session} and
-	 * {@link javax.jms.QueueBrowser}.
+	 * Perform operations on the given {@link jakarta.jms.Session} and
+	 * {@link jakarta.jms.QueueBrowser}.
 	 * @param session the JMS {@code Session} object to use
 	 * @param browser the JMS {@code QueueBrowser} object to use
 	 * @return a result object from working with the {@code Session}, if any
 	 * (or {@code null} if none)
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	@Nullable
 	T doInJms(Session session, QueueBrowser browser) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsMessageOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsMessageOperations.java
index 50bba1b04ffe..ebb821da62cd 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsMessageOperations.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsMessageOperations.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
@@ -31,7 +31,7 @@
 /**
  * A specialization of {@link MessageSendingOperations}, {@link MessageReceivingOperations}
  * and {@link MessageRequestReplyOperations} for JMS related operations that allow to specify
- * a destination name rather than the actual {@link javax.jms.Destination}.
+ * a destination name rather than the actual {@link jakarta.jms.Destination}.
  *
  * @author Stephane Nicoll
  * @since 4.1
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsMessagingTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsMessagingTemplate.java
index 7eaa1bd8d988..0835ae2e9b19 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsMessagingTemplate.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsMessagingTemplate.java
@@ -18,10 +18,10 @@
 
 import java.util.Map;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jms.InvalidDestinationException;
@@ -123,7 +123,7 @@ public JmsTemplate getJmsTemplate() {
 
 	/**
 	 * Set the {@link MessageConverter} to use to convert a {@link Message} from
-	 * the messaging to and from a {@link javax.jms.Message}. By default, a
+	 * the messaging to and from a {@link jakarta.jms.Message}. By default, a
 	 * {@link MessagingMessageConverter} is defined using a {@link SimpleMessageConverter}
 	 * to convert the payload of the message.
 	 * <p>Consider configuring a {@link MessagingMessageConverter} with a different
@@ -139,7 +139,7 @@ public void setJmsMessageConverter(MessageConverter jmsMessageConverter) {
 
 	/**
 	 * Return the {@link MessageConverter} to use to convert a {@link Message}
-	 * from the messaging to and from a {@link javax.jms.Message}.
+	 * from the messaging to and from a {@link jakarta.jms.Message}.
 	 */
 	public MessageConverter getJmsMessageConverter() {
 		return this.jmsMessageConverter;
@@ -373,7 +373,7 @@ protected void doSend(String destinationName, Message<?> message) {
 	@Nullable
 	protected Message<?> doReceive(Destination destination) {
 		try {
-			javax.jms.Message jmsMessage = obtainJmsTemplate().receive(destination);
+			jakarta.jms.Message jmsMessage = obtainJmsTemplate().receive(destination);
 			return convertJmsMessage(jmsMessage);
 		}
 		catch (JmsException ex) {
@@ -384,7 +384,7 @@ protected Message<?> doReceive(Destination destination) {
 	@Nullable
 	protected Message<?> doReceive(String destinationName) {
 		try {
-			javax.jms.Message jmsMessage = obtainJmsTemplate().receive(destinationName);
+			jakarta.jms.Message jmsMessage = obtainJmsTemplate().receive(destinationName);
 			return convertJmsMessage(jmsMessage);
 		}
 		catch (JmsException ex) {
@@ -396,7 +396,7 @@ protected Message<?> doReceive(String destinationName) {
 	@Nullable
 	protected Message<?> doSendAndReceive(Destination destination, Message<?> requestMessage) {
 		try {
-			javax.jms.Message jmsMessage = obtainJmsTemplate().sendAndReceive(
+			jakarta.jms.Message jmsMessage = obtainJmsTemplate().sendAndReceive(
 					destination, createMessageCreator(requestMessage));
 			return convertJmsMessage(jmsMessage);
 		}
@@ -408,7 +408,7 @@ protected Message<?> doSendAndReceive(Destination destination, Message<?> reques
 	@Nullable
 	protected Message<?> doSendAndReceive(String destinationName, Message<?> requestMessage) {
 		try {
-			javax.jms.Message jmsMessage = obtainJmsTemplate().sendAndReceive(
+			jakarta.jms.Message jmsMessage = obtainJmsTemplate().sendAndReceive(
 					destinationName, createMessageCreator(requestMessage));
 			return convertJmsMessage(jmsMessage);
 		}
@@ -431,7 +431,7 @@ protected String getRequiredDefaultDestinationName() {
 	}
 
 	@Nullable
-	protected Message<?> convertJmsMessage(@Nullable javax.jms.Message message) {
+	protected Message<?> convertJmsMessage(@Nullable jakarta.jms.Message message) {
 		if (message == null) {
 			return null;
 		}
@@ -468,7 +468,7 @@ public MessagingMessageCreator(Message<?> message, MessageConverter messageConve
 		}
 
 		@Override
-		public javax.jms.Message createMessage(Session session) throws JMSException {
+		public jakarta.jms.Message createMessage(Session session) throws JMSException {
 			try {
 				return this.messageConverter.toMessage(this.message, session);
 			}
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
index 9b2cef401b92..845be02a12e0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.Queue;
+import jakarta.jms.Destination;
+import jakarta.jms.Message;
+import jakarta.jms.Queue;
 
 import org.springframework.jms.JmsException;
 import org.springframework.lang.Nullable;
@@ -41,10 +41,10 @@
  * @author Stephane Nicoll
  * @since 1.1
  * @see JmsTemplate
- * @see javax.jms.Destination
- * @see javax.jms.Session
- * @see javax.jms.MessageProducer
- * @see javax.jms.MessageConsumer
+ * @see jakarta.jms.Destination
+ * @see jakarta.jms.Session
+ * @see jakarta.jms.MessageProducer
+ * @see jakarta.jms.MessageConsumer
  */
 public interface JmsOperations {
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
index a190fe48dcf2..cdbc1bc0bb55 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
@@ -16,18 +16,18 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueBrowser;
+import jakarta.jms.Session;
+import jakarta.jms.TemporaryQueue;
 
 import org.springframework.jms.JmsException;
 import org.springframework.jms.connection.ConnectionFactoryUtils;
@@ -50,7 +50,7 @@
  * domain.
  *
  * <p>Default settings for JMS Sessions are "not transacted" and "auto-acknowledge".
- * As defined by the Java EE specification, the transaction and acknowledgement
+ * As defined by the Jakarta EE specification, the transaction and acknowledgement
  * parameters are ignored when a JMS Session is created inside an active
  * transaction, no matter if a JTA transaction or a Spring-managed transaction.
  * To configure them for native JMS usage, specify appropriate values for
@@ -70,7 +70,7 @@
  * {@link org.springframework.jms.connection.SingleConnectionFactory} as a
  * decorator for your target {@code ConnectionFactory}, reusing a single
  * JMS Connection in a thread-safe fashion; this is often good enough for the
- * purpose of sending messages via this template. In a Java EE environment,
+ * purpose of sending messages via this template. In a Jakarta EE environment,
  * make sure that the {@code ConnectionFactory} is obtained from the
  * application's environment naming context via JNDI; application servers
  * typically expose pooled, transaction-aware factories there.
@@ -83,8 +83,8 @@
  * @see #setPubSubDomain
  * @see #setDestinationResolver
  * @see #setMessageConverter
- * @see javax.jms.MessageProducer
- * @see javax.jms.MessageConsumer
+ * @see jakarta.jms.MessageProducer
+ * @see jakarta.jms.MessageConsumer
  */
 public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations {
 
@@ -195,7 +195,7 @@ private Queue getDefaultQueue() {
 	 * @see #convertAndSend(Object)
 	 * @see #convertAndSend(Object, MessagePostProcessor)
 	 * @see #setDestinationResolver
-	 * @see #setDefaultDestination(javax.jms.Destination)
+	 * @see #setDefaultDestination(jakarta.jms.Destination)
 	 */
 	public void setDefaultDestinationName(@Nullable String destinationName) {
 		this.defaultDestination = destinationName;
@@ -254,7 +254,7 @@ private MessageConverter getRequiredMessageConverter() throws IllegalStateExcept
 	 * Set whether message IDs are enabled. Default is "true".
 	 * <p>This is only a hint to the JMS producer.
 	 * See the JMS javadocs for details.
-	 * @see javax.jms.MessageProducer#setDisableMessageID
+	 * @see jakarta.jms.MessageProducer#setDisableMessageID
 	 */
 	public void setMessageIdEnabled(boolean messageIdEnabled) {
 		this.messageIdEnabled = messageIdEnabled;
@@ -271,7 +271,7 @@ public boolean isMessageIdEnabled() {
 	 * Set whether message timestamps are enabled. Default is "true".
 	 * <p>This is only a hint to the JMS producer.
 	 * See the JMS javadocs for details.
-	 * @see javax.jms.MessageProducer#setDisableMessageTimestamp
+	 * @see jakarta.jms.MessageProducer#setDisableMessageTimestamp
 	 */
 	public void setMessageTimestampEnabled(boolean messageTimestampEnabled) {
 		this.messageTimestampEnabled = messageTimestampEnabled;
@@ -287,7 +287,7 @@ public boolean isMessageTimestampEnabled() {
 	/**
 	 * Set whether to inhibit the delivery of messages published by its own connection.
 	 * Default is "false".
-	 * @see javax.jms.Session#createConsumer(javax.jms.Destination, String, boolean)
+	 * @see jakarta.jms.Session#createConsumer(jakarta.jms.Destination, String, boolean)
 	 */
 	public void setPubSubNoLocal(boolean pubSubNoLocal) {
 		this.pubSubNoLocal = pubSubNoLocal;
@@ -308,9 +308,9 @@ public boolean isPubSubNoLocal() {
 	 * to indicate that a receive operation should check if a message is
 	 * immediately available without blocking.
 	 * @see #receiveFromConsumer(MessageConsumer, long)
-	 * @see javax.jms.MessageConsumer#receive(long)
-	 * @see javax.jms.MessageConsumer#receiveNoWait()
-	 * @see javax.jms.MessageConsumer#receive()
+	 * @see jakarta.jms.MessageConsumer#receive(long)
+	 * @see jakarta.jms.MessageConsumer#receiveNoWait()
+	 * @see jakarta.jms.MessageConsumer#receive()
 	 */
 	public void setReceiveTimeout(long receiveTimeout) {
 		this.receiveTimeout = receiveTimeout;
@@ -388,8 +388,8 @@ public void setQosSettings(QosSettings settings) {
 	 * mode accordingly, to either "PERSISTENT" (2) or "NON_PERSISTENT" (1).
 	 * <p>Default is "true" a.k.a. delivery mode "PERSISTENT".
 	 * @see #setDeliveryMode(int)
-	 * @see javax.jms.DeliveryMode#PERSISTENT
-	 * @see javax.jms.DeliveryMode#NON_PERSISTENT
+	 * @see jakarta.jms.DeliveryMode#PERSISTENT
+	 * @see jakarta.jms.DeliveryMode#NON_PERSISTENT
 	 */
 	public void setDeliveryPersistent(boolean deliveryPersistent) {
 		this.deliveryMode = (deliveryPersistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
@@ -402,10 +402,10 @@ public void setDeliveryPersistent(boolean deliveryPersistent) {
 	 * this is only used when "isExplicitQosEnabled" equals "true".
 	 * @param deliveryMode the delivery mode to use
 	 * @see #isExplicitQosEnabled
-	 * @see javax.jms.DeliveryMode#PERSISTENT
-	 * @see javax.jms.DeliveryMode#NON_PERSISTENT
-	 * @see javax.jms.Message#DEFAULT_DELIVERY_MODE
-	 * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long)
+	 * @see jakarta.jms.DeliveryMode#PERSISTENT
+	 * @see jakarta.jms.DeliveryMode#NON_PERSISTENT
+	 * @see jakarta.jms.Message#DEFAULT_DELIVERY_MODE
+	 * @see jakarta.jms.MessageProducer#send(jakarta.jms.Message, int, int, long)
 	 */
 	public void setDeliveryMode(int deliveryMode) {
 		this.deliveryMode = deliveryMode;
@@ -423,8 +423,8 @@ public int getDeliveryMode() {
 	 * <p>Since a default value may be defined administratively,
 	 * this is only used when "isExplicitQosEnabled" equals "true".
 	 * @see #isExplicitQosEnabled
-	 * @see javax.jms.Message#DEFAULT_PRIORITY
-	 * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long)
+	 * @see jakarta.jms.Message#DEFAULT_PRIORITY
+	 * @see jakarta.jms.MessageProducer#send(jakarta.jms.Message, int, int, long)
 	 */
 	public void setPriority(int priority) {
 		this.priority = priority;
@@ -443,8 +443,8 @@ public int getPriority() {
 	 * this is only used when "isExplicitQosEnabled" equals "true".
 	 * @param timeToLive the message's lifetime (in milliseconds)
 	 * @see #isExplicitQosEnabled
-	 * @see javax.jms.Message#DEFAULT_TIME_TO_LIVE
-	 * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long)
+	 * @see jakarta.jms.Message#DEFAULT_TIME_TO_LIVE
+	 * @see jakarta.jms.MessageProducer#send(jakarta.jms.Message, int, int, long)
 	 */
 	public void setTimeToLive(long timeToLive) {
 		this.timeToLive = timeToLive;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
index d14ec884a251..80cf2a7e85f7 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 /**
  * Creates a JMS message given a {@link Session}.
@@ -27,7 +27,7 @@
  * of the {@link JmsTemplate} class.
  *
  * <p>Implementations <i>do not</i> need to concern themselves with
- * checked {@code JMSExceptions} (from the '{@code javax.jms}'
+ * checked {@code JMSExceptions} (from the '{@code jakarta.jms}'
  * package) that may be thrown from operations they attempt. The
  * {@code JmsTemplate} will catch and handle these
  * {@code JMSExceptions} appropriately.
@@ -43,7 +43,7 @@ public interface MessageCreator {
 	 * @param session the JMS {@link Session} to be used to create the
 	 * {@code Message} (never {@code null})
 	 * @return the {@code Message} to be sent
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	Message createMessage(Session session) throws JMSException;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java b/spring-jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java
index 84c4c5da9445..962e5caf519f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/MessagePostProcessor.java
@@ -16,8 +16,8 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 /**
  * To be used with JmsTemplate's send method that converts an object to a message.
@@ -30,7 +30,7 @@
  * @author Mark Pollack
  * @since 1.1
  * @see JmsTemplate#convertAndSend(String, Object, MessagePostProcessor)
- * @see JmsTemplate#convertAndSend(javax.jms.Destination, Object, MessagePostProcessor)
+ * @see JmsTemplate#convertAndSend(jakarta.jms.Destination, Object, MessagePostProcessor)
  * @see org.springframework.jms.support.converter.MessageConverter
  */
 @FunctionalInterface
@@ -42,7 +42,7 @@ public interface MessagePostProcessor {
 	 * @param message the JMS message from the MessageConverter
 	 * @return a post-processed variant of the message, or simply the incoming
 	 * message; never {@code null}
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	Message postProcessMessage(Message message) throws JMSException;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
index 961ad4aa803d..952d3a6d15a0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
 
 import org.springframework.lang.Nullable;
 
@@ -36,7 +36,7 @@
  * @since 1.1
  * @param <T> the result type
  * @see JmsTemplate#execute(ProducerCallback)
- * @see JmsTemplate#execute(javax.jms.Destination, ProducerCallback)
+ * @see JmsTemplate#execute(jakarta.jms.Destination, ProducerCallback)
  * @see JmsTemplate#execute(String, ProducerCallback)
  */
 @FunctionalInterface
@@ -50,7 +50,7 @@ public interface ProducerCallback<T> {
 	 * @param producer the JMS {@code MessageProducer} object to use
 	 * @return a result object from working with the {@code Session}, if any
 	 * (or {@code null} if none)
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	@Nullable
 	T doInJms(Session session, MessageProducer producer) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
index 8bbd1fe31f62..99dfe64b0ca8 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
@@ -16,8 +16,8 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 import org.springframework.lang.Nullable;
 
@@ -41,7 +41,7 @@ public interface SessionCallback<T> {
 	 * @param session the JMS {@code Session}
 	 * @return a result object from working with the {@code Session}, if any
 	 * (or {@code null} if none)
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	@Nullable
 	T doInJms(Session session) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
index 0ce0650a00c4..f85c3db9925d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.core.support;
 
-import javax.jms.ConnectionFactory;
-
+import jakarta.jms.ConnectionFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -54,7 +53,7 @@ public abstract class JmsGatewaySupport implements InitializingBean {
 	 * Set the JMS connection factory to be used by the gateway.
 	 * Will automatically create a JmsTemplate for the given ConnectionFactory.
 	 * @see #createJmsTemplate
-	 * @see #setConnectionFactory(javax.jms.ConnectionFactory)
+	 * @see #setConnectionFactory(jakarta.jms.ConnectionFactory)
 	 */
 	public final void setConnectionFactory(ConnectionFactory connectionFactory) {
 		this.jmsTemplate = createJmsTemplate(connectionFactory);
@@ -83,7 +82,7 @@ public final ConnectionFactory getConnectionFactory() {
 
 	/**
 	 * Set the JmsTemplate for the gateway.
-	 * @see #setConnectionFactory(javax.jms.ConnectionFactory)
+	 * @see #setConnectionFactory(jakarta.jms.ConnectionFactory)
 	 */
 	public final void setJmsTemplate(@Nullable JmsTemplate jmsTemplate) {
 		this.jmsTemplate = jmsTemplate;
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
index b7e1734bb99f..30ee11c812be 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
@@ -20,8 +20,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
 
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.DisposableBean;
@@ -94,7 +94,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	 * <p>Note that client IDs need to be unique among all active Connections
 	 * of the underlying JMS provider. Furthermore, a client ID can only be
 	 * assigned if the original ConnectionFactory hasn't already assigned one.
-	 * @see javax.jms.Connection#setClientID
+	 * @see jakarta.jms.Connection#setClientID
 	 * @see #setConnectionFactory
 	 */
 	public void setClientId(@Nullable String clientId) {
@@ -191,7 +191,7 @@ public void destroy() {
 
 	/**
 	 * Initialize this container.
-	 * <p>Creates a JMS Connection, starts the {@link javax.jms.Connection}
+	 * <p>Creates a JMS Connection, starts the {@link jakarta.jms.Connection}
 	 * (if {@link #setAutoStartup(boolean) "autoStartup"} hasn't been turned off),
 	 * and calls {@link #doInitialize()}.
 	 * @throws org.springframework.jms.JmsException if startup failed
@@ -439,7 +439,7 @@ protected void prepareSharedConnection(Connection connection) throws JMSExceptio
 	/**
 	 * Start the shared Connection.
 	 * @throws JMSException if thrown by JMS API methods
-	 * @see javax.jms.Connection#start()
+	 * @see jakarta.jms.Connection#start()
 	 */
 	protected void startSharedConnection() throws JMSException {
 		synchronized (this.sharedConnectionMonitor) {
@@ -448,7 +448,7 @@ protected void startSharedConnection() throws JMSException {
 				try {
 					this.sharedConnection.start();
 				}
-				catch (javax.jms.IllegalStateException ex) {
+				catch (jakarta.jms.IllegalStateException ex) {
 					logger.debug("Ignoring Connection start exception - assuming already started: " + ex);
 				}
 			}
@@ -458,7 +458,7 @@ protected void startSharedConnection() throws JMSException {
 	/**
 	 * Stop the shared Connection.
 	 * @throws JMSException if thrown by JMS API methods
-	 * @see javax.jms.Connection#start()
+	 * @see jakarta.jms.Connection#start()
 	 */
 	protected void stopSharedConnection() throws JMSException {
 		synchronized (this.sharedConnectionMonitor) {
@@ -467,7 +467,7 @@ protected void stopSharedConnection() throws JMSException {
 				try {
 					this.sharedConnection.stop();
 				}
-				catch (javax.jms.IllegalStateException ex) {
+				catch (jakarta.jms.IllegalStateException ex) {
 					logger.debug("Ignoring Connection stop exception - assuming already stopped: " + ex);
 				}
 			}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
index 534e12285f05..eb4c7e4e46c2 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
@@ -16,16 +16,16 @@
 
 package org.springframework.jms.listener;
 
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
 
 import org.springframework.jms.support.JmsUtils;
 import org.springframework.jms.support.QosSettings;
@@ -35,12 +35,12 @@
 
 /**
  * Abstract base class for Spring message listener container implementations.
- * Can either host a standard JMS {@link javax.jms.MessageListener} or Spring's
+ * Can either host a standard JMS {@link jakarta.jms.MessageListener} or Spring's
  * {@link SessionAwareMessageListener} for actual message processing.
  *
  * <p>Usually holds a single JMS {@link Connection} that all listeners are supposed
  * to be registered on, which is the standard JMS way of managing listener sessions.
- * Can alternatively also be used with a fresh Connection per listener, for Java EE
+ * Can alternatively also be used with a fresh Connection per listener, for Jakarta EE
  * style XA-aware JMS messaging. The actual registration process is up to concrete
  * subclasses.
  *
@@ -99,7 +99,7 @@
  * supported by {@link DefaultMessageListenerContainer}, through specifying
  * an external "transactionManager" (typically a
  * {@link org.springframework.transaction.jta.JtaTransactionManager}, with
- * a corresponding XA-aware JMS {@link javax.jms.ConnectionFactory} passed in
+ * a corresponding XA-aware JMS {@link jakarta.jms.ConnectionFactory} passed in
  * as "connectionFactory").
  * </ul>
  * Note that XA transaction coordination adds significant runtime overhead,
@@ -116,7 +116,7 @@
  * <li>Alternatively, specify a
  * {@link org.springframework.transaction.jta.JtaTransactionManager} as
  * "transactionManager" for a fully XA-aware JMS provider - typically when
- * running on a Java EE server, but also for other environments with a JTA
+ * running on a Jakarta EE server, but also for other environments with a JTA
  * transaction manager present. This will give full "exactly-once" guarantees
  * without custom duplicate message checks, at the price of additional
  * runtime processing overhead.
@@ -132,7 +132,7 @@
  * @author Stephane Nicoll
  * @since 2.0
  * @see #setMessageListener
- * @see javax.jms.MessageListener
+ * @see jakarta.jms.MessageListener
  * @see SessionAwareMessageListener
  * @see #handleListenerException
  * @see DefaultMessageListenerContainer
@@ -222,7 +222,7 @@ public Destination getDestination() {
 	 * container picking up the new destination immediately (works e.g. with
 	 * DefaultMessageListenerContainer, as long as the cache level is less than
 	 * CACHE_CONSUMER). However, this is considered advanced usage; use it with care!
-	 * @see #setDestination(javax.jms.Destination)
+	 * @see #setDestination(jakarta.jms.Destination)
 	 */
 	public void setDestinationName(@Nullable String destinationName) {
 		this.destination = destinationName;
@@ -280,7 +280,7 @@ public String getMessageSelector() {
 	 * CACHE_CONSUMER). However, this is considered advanced usage; use it with care!
 	 * @throws IllegalArgumentException if the supplied listener is not a
 	 * {@link MessageListener} or a {@link SessionAwareMessageListener}
-	 * @see javax.jms.MessageListener
+	 * @see jakarta.jms.MessageListener
 	 * @see SessionAwareMessageListener
 	 */
 	public void setMessageListener(@Nullable Object messageListener) {
@@ -307,7 +307,7 @@ public Object getMessageListener() {
 	 * @param messageListener the message listener object to check
 	 * @throws IllegalArgumentException if the supplied listener is not a
 	 * {@link MessageListener} or a {@link SessionAwareMessageListener}
-	 * @see javax.jms.MessageListener
+	 * @see jakarta.jms.MessageListener
 	 * @see SessionAwareMessageListener
 	 */
 	protected void checkMessageListener(@Nullable Object messageListener) {
@@ -449,7 +449,7 @@ public String getDurableSubscriptionName() {
 	 * Set whether to inhibit the delivery of messages published by its own connection.
 	 * Default is "false".
 	 * @since 4.1
-	 * @see javax.jms.Session#createConsumer(javax.jms.Destination, String, boolean)
+	 * @see jakarta.jms.Session#createConsumer(jakarta.jms.Destination, String, boolean)
 	 */
 	public void setPubSubNoLocal(boolean pubSubNoLocal) {
 		this.pubSubNoLocal = pubSubNoLocal;
@@ -478,8 +478,8 @@ public void setReplyPubSubDomain(boolean replyPubSubDomain) {
 	}
 
 	/**
-	 * Return whether the Publish/Subscribe domain ({@link javax.jms.Topic Topics}) is used
-	 * for replies. Otherwise, the Point-to-Point domain ({@link javax.jms.Queue Queues})
+	 * Return whether the Publish/Subscribe domain ({@link jakarta.jms.Topic Topics}) is used
+	 * for replies. Otherwise, the Point-to-Point domain ({@link jakarta.jms.Queue Queues})
 	 * is used.
 	 * @since 4.2
 	 */
@@ -755,7 +755,7 @@ protected void doInvokeListener(SessionAwareMessageListener listener, Session se
 	 * @param listener the JMS MessageListener to invoke
 	 * @param message the received JMS Message
 	 * @throws JMSException if thrown by JMS API methods
-	 * @see javax.jms.MessageListener#onMessage
+	 * @see jakarta.jms.MessageListener#onMessage
 	 */
 	protected void doInvokeListener(MessageListener listener, Message message) throws JMSException {
 		listener.onMessage(message);
@@ -765,7 +765,7 @@ protected void doInvokeListener(MessageListener listener, Message message) throw
 	 * Perform a commit or message acknowledgement, as appropriate.
 	 * @param session the JMS Session to commit
 	 * @param message the Message to acknowledge
-	 * @throws javax.jms.JMSException in case of commit failure
+	 * @throws jakarta.jms.JMSException in case of commit failure
 	 */
 	protected void commitIfNecessary(Session session, @Nullable Message message) throws JMSException {
 		// Commit session or acknowledge message.
@@ -784,7 +784,7 @@ else if (message != null && isClientAcknowledge(session)) {
 	/**
 	 * Perform a rollback, if appropriate.
 	 * @param session the JMS Session to rollback
-	 * @throws javax.jms.JMSException in case of a rollback error
+	 * @throws jakarta.jms.JMSException in case of a rollback error
 	 */
 	protected void rollbackIfNecessary(Session session) throws JMSException {
 		if (session.getTransacted()) {
@@ -802,7 +802,7 @@ else if (isClientAcknowledge(session)) {
 	 * Perform a rollback, handling rollback exceptions properly.
 	 * @param session the JMS Session to rollback
 	 * @param ex the thrown application exception or error
-	 * @throws javax.jms.JMSException in case of a rollback error
+	 * @throws jakarta.jms.JMSException in case of a rollback error
 	 */
 	protected void rollbackOnExceptionIfNecessary(Session session, Throwable ex) throws JMSException {
 		try {
@@ -850,7 +850,7 @@ protected boolean isSessionLocallyTransacted(Session session) {
 	 * @param session the JMS Session to create a MessageConsumer for
 	 * @param destination the JMS Destination to create a MessageConsumer for
 	 * @return the new JMS MessageConsumer
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 */
 	protected MessageConsumer createConsumer(Session session, Destination destination) throws JMSException {
 		if (isPubSubDomain() && destination instanceof Topic) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
index 0a6287169a40..e681aaef1b19 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
@@ -16,12 +16,12 @@
 
 package org.springframework.jms.listener;
 
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
 
 import org.springframework.jms.connection.ConnectionFactoryUtils;
 import org.springframework.jms.connection.JmsResourceHolder;
@@ -38,7 +38,7 @@
 
 /**
  * Base class for listener container implementations which are based on polling.
- * Provides support for listener handling based on {@link javax.jms.MessageConsumer},
+ * Provides support for listener handling based on {@link jakarta.jms.MessageConsumer},
  * optionally participating in externally managed transactions.
  *
  * <p>This listener container variant is built for repeated polling attempts,
@@ -48,7 +48,7 @@
  * configured through the {@link #setReceiveTimeout "receiveTimeout"} property.
  *
  * <p>The underlying mechanism is based on standard JMS MessageConsumer handling,
- * which is perfectly compatible with both native JMS and JMS in a Java EE environment.
+ * which is perfectly compatible with both native JMS and JMS in a Jakarta EE environment.
  * Neither the JMS {@code MessageConsumer.setMessageListener} facility  nor the JMS
  * ServerSessionPool facility is required. A further advantage of this approach is
  * full control over the listening process, allowing for custom scaling and throttling
@@ -59,7 +59,7 @@
  * {@link org.springframework.transaction.PlatformTransactionManager} into the
  * {@link #setTransactionManager "transactionManager"} property. This will usually
  * be a {@link org.springframework.transaction.jta.JtaTransactionManager} in a
- * Java EE environment, in combination with a JTA-aware JMS ConnectionFactory
+ * Jakarta EE environment, in combination with a JTA-aware JMS ConnectionFactory
  * obtained from JNDI (check your application server's documentation).
  *
  * <p>This base class does not assume any specific mechanism for asynchronous
@@ -165,9 +165,9 @@ public void setTransactionTimeout(int transactionTimeout) {
 	 * discouraged since such a listener container cannot cleanly shut down.
 	 * A negative value such as -1 indicates a no-wait receive operation.
 	 * @see #receiveFromConsumer(MessageConsumer, long)
-	 * @see javax.jms.MessageConsumer#receive(long)
-	 * @see javax.jms.MessageConsumer#receiveNoWait()
-	 * @see javax.jms.MessageConsumer#receive()
+	 * @see jakarta.jms.MessageConsumer#receive(long)
+	 * @see jakarta.jms.MessageConsumer#receiveNoWait()
+	 * @see jakarta.jms.MessageConsumer#receive()
 	 * @see #setTransactionTimeout
 	 */
 	public void setReceiveTimeout(long receiveTimeout) {
@@ -211,7 +211,7 @@ public void initialize() {
 	 * registering a MessageListener for the specified listener.
 	 * @param session the JMS Session to work on
 	 * @return the MessageConsumer
-	 * @throws javax.jms.JMSException if thrown by JMS methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS methods
 	 * @see #receiveAndExecute
 	 */
 	protected MessageConsumer createListenerConsumer(Session session) throws JMSException {
@@ -266,7 +266,7 @@ protected boolean receiveAndExecute(
 	 * @param status the TransactionStatus (may be {@code null})
 	 * @return whether a message has been received
 	 * @throws JMSException if thrown by JMS methods
-	 * @see #doExecuteListener(javax.jms.Session, javax.jms.Message)
+	 * @see #doExecuteListener(jakarta.jms.Session, jakarta.jms.Message)
 	 */
 	protected boolean doReceiveAndExecute(Object invoker, @Nullable Session session,
 			@Nullable MessageConsumer consumer, @Nullable TransactionStatus status) throws JMSException {
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
index 856be8c914da..41fc11034f65 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -20,10 +20,10 @@
 import java.util.Set;
 import java.util.concurrent.Executor;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
 
 import org.springframework.core.Constants;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
@@ -45,7 +45,7 @@
  * Message listener container variant that uses plain JMS client APIs, specifically
  * a loop of {@code MessageConsumer.receive()} calls that also allow for
  * transactional reception of messages (registering them with XA transactions).
- * Designed to work in a native JMS environment as well as in a Java EE environment,
+ * Designed to work in a native JMS environment as well as in a Jakarta EE environment,
  * with only minimal differences in configuration.
  *
  * <p>This is a simple but nevertheless powerful form of message listener container.
@@ -62,7 +62,7 @@
  * abstraction. By default, the specified number of invoker tasks will be created
  * on startup, according to the {@link #setConcurrentConsumers "concurrentConsumers"}
  * setting. Specify an alternative {@code TaskExecutor} to integrate with an existing
- * thread pool facility (such as a Java EE server's), for example using a
+ * thread pool facility (such as a Jakarta EE server's), for example using a
  * {@link org.springframework.scheduling.commonj.WorkManagerTaskExecutor CommonJ WorkManager}.
  * With a native JMS setup, each of those listener threads is going to use a
  * cached JMS {@code Session} and {@code MessageConsumer} (only refreshed in case
@@ -73,11 +73,11 @@
  * {@link org.springframework.transaction.PlatformTransactionManager} into the
  * {@link #setTransactionManager "transactionManager"} property. This will usually
  * be a {@link org.springframework.transaction.jta.JtaTransactionManager} in a
- * Java EE environment, in combination with a JTA-aware JMS {@code ConnectionFactory}
- * obtained from JNDI (check your Java EE server's documentation). Note that this
+ * Jakarta EE environment, in combination with a JTA-aware JMS {@code ConnectionFactory}
+ * obtained from JNDI (check your Jakarta EE server's documentation). Note that this
  * listener container will automatically reobtain all JMS handles for each transaction
  * in case an external transaction manager is specified, for compatibility with
- * all Java EE servers (in particular JBoss). This non-caching behavior can be
+ * all Jakarta EE servers (in particular JBoss). This non-caching behavior can be
  * overridden through the {@link #setCacheLevel "cacheLevel"} /
  * {@link #setCacheLevelName "cacheLevelName"} property, enforcing caching of
  * the {@code Connection} (or also {@code Session} and {@code MessageConsumer})
@@ -119,7 +119,7 @@
  * @since 2.0
  * @see #setTransactionManager
  * @see #setCacheLevel
- * @see javax.jms.MessageConsumer#receive(long)
+ * @see jakarta.jms.MessageConsumer#receive(long)
  * @see SimpleMessageListenerContainer
  * @see org.springframework.jms.listener.endpoint.JmsMessageEndpointManager
  */
@@ -219,7 +219,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 	 * of concurrent consumers.
 	 * <p>Specify an alternative {@code TaskExecutor} for integration with an existing
 	 * thread pool. Note that this really only adds value if the threads are
-	 * managed in a specific fashion, for example within a Java EE environment.
+	 * managed in a specific fashion, for example within a Jakarta EE environment.
 	 * A plain thread pool does not add much value, as this listener container
 	 * will occupy a number of threads for its entire lifetime.
 	 * @see #setConcurrentConsumers
@@ -273,7 +273,7 @@ public void setCacheLevelName(String constantName) throws IllegalArgumentExcepti
 	 * <p>Default is {@link #CACHE_NONE} if an external transaction manager has been specified
 	 * (to reobtain all resources freshly within the scope of the external transaction),
 	 * and {@link #CACHE_CONSUMER} otherwise (operating with local JMS resources).
-	 * <p>Some Java EE servers only register their JMS resources with an ongoing XA
+	 * <p>Some Jakarta EE servers only register their JMS resources with an ongoing XA
 	 * transaction in case of a freshly obtained JMS {@code Connection} and {@code Session},
 	 * which is why this listener container by default does not cache any of those.
 	 * However, depending on the rules of your server with respect to the caching
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java
index 2adad4f3cdb4..c0148da51fc5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/LocallyExposedJmsResourceHolder.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.listener;
 
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import org.springframework.jms.connection.JmsResourceHolder;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/MessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/MessageListenerContainer.java
index 89bfe78daacc..8610e2f7e4aa 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/MessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/MessageListenerContainer.java
@@ -40,7 +40,7 @@ public interface MessageListenerContainer extends SmartLifecycle {
 
 	/**
 	 * Return the {@link MessageConverter} that can be used to
-	 * convert {@link javax.jms.Message}, if any.
+	 * convert {@link jakarta.jms.Message}, if any.
 	 */
 	@Nullable
 	MessageConverter getMessageConverter();
@@ -53,15 +53,15 @@ public interface MessageListenerContainer extends SmartLifecycle {
 	DestinationResolver getDestinationResolver();
 
 	/**
-	 * Return whether the Publish/Subscribe domain ({@link javax.jms.Topic Topics}) is used.
-	 * Otherwise, the Point-to-Point domain ({@link javax.jms.Queue Queues}) is used.
+	 * Return whether the Publish/Subscribe domain ({@link jakarta.jms.Topic Topics}) is used.
+	 * Otherwise, the Point-to-Point domain ({@link jakarta.jms.Queue Queues}) is used.
 	 */
 	boolean isPubSubDomain();
 
 	/**
 	 * Return whether the reply destination uses Publish/Subscribe domain
-	 * ({@link javax.jms.Topic Topics}). Otherwise, the Point-to-Point domain
-	 * ({@link javax.jms.Queue Queues}) is used.
+	 * ({@link jakarta.jms.Topic Topics}). Otherwise, the Point-to-Point domain
+	 * ({@link jakarta.jms.Queue Queues}) is used.
 	 * <p>By default, the value is identical to {@link #isPubSubDomain()}.
 	 */
 	boolean isReplyPubSubDomain();
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
index af07dfae5a65..f2ba17487c0e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
@@ -16,12 +16,12 @@
 
 package org.springframework.jms.listener;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 /**
- * Variant of the standard JMS {@link javax.jms.MessageListener} interface,
+ * Variant of the standard JMS {@link jakarta.jms.MessageListener} interface,
  * offering not only the received Message but also the underlying
  * JMS Session object. The latter can be used to send reply messages,
  * without the need to access an external Connection/Session,
@@ -40,7 +40,7 @@
  * @see DefaultMessageListenerContainer
  * @see SimpleMessageListenerContainer
  * @see org.springframework.jms.listener.endpoint.JmsMessageEndpointManager
- * @see javax.jms.MessageListener
+ * @see jakarta.jms.MessageListener
  */
 @FunctionalInterface
 public interface SessionAwareMessageListener<M extends Message> {
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
index 469dfd43c871..b45de7781a6f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
@@ -20,14 +20,14 @@
 import java.util.Set;
 import java.util.concurrent.Executor;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
 
 import org.springframework.jms.support.JmsUtils;
 import org.springframework.lang.Nullable;
@@ -59,7 +59,7 @@
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see javax.jms.MessageConsumer#setMessageListener
+ * @see jakarta.jms.MessageConsumer#setMessageListener
  * @see DefaultMessageListenerContainer
  * @see org.springframework.jms.listener.endpoint.JmsMessageEndpointManager
  */
@@ -174,7 +174,7 @@ public void setConcurrentConsumers(int concurrentConsumers) {
 	 * underlying Session.</b> As a consequence, it is not recommended to use
 	 * this setting with a {@link SessionAwareMessageListener}, at least not
 	 * if the latter performs actual work on the given Session. A standard
-	 * {@link javax.jms.MessageListener} will work fine, in general.
+	 * {@link jakarta.jms.MessageListener} will work fine, in general.
 	 * @see #setConcurrentConsumers
 	 * @see org.springframework.core.task.SimpleAsyncTaskExecutor
 	 * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java b/spring-jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java
index c8622a78c06d..d1178618d9d2 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SubscriptionNameProvider.java
@@ -21,7 +21,7 @@
  * name for a durable subscription that they might be registered with. Otherwise
  * the listener class name will be used as a default subscription name.
  *
- * <p>Applies to {@link javax.jms.MessageListener} objects as well as to
+ * <p>Applies to {@link jakarta.jms.MessageListener} objects as well as to
  * {@link SessionAwareMessageListener} objects and plain listener methods
  * (as supported by {@link org.springframework.jms.listener.adapter.MessageListenerAdapter}.
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
index e4b9cd442617..0bfec3872626 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
@@ -16,15 +16,14 @@
 
 package org.springframework.jms.listener.adapter;
 
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
+import jakarta.jms.BytesMessage;
+import jakarta.jms.Destination;
+import jakarta.jms.InvalidDestinationException;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -96,7 +95,7 @@ public void setDefaultResponseDestination(Destination destination) {
 	 * "JMSReplyTo" field.
 	 * <p>Alternatively, specify a JMS Destination object as "defaultResponseDestination".
 	 * @see #setDestinationResolver
-	 * @see #setDefaultResponseDestination(javax.jms.Destination)
+	 * @see #setDefaultResponseDestination(jakarta.jms.Destination)
 	 */
 	public void setDefaultResponseQueueName(String destinationName) {
 		this.defaultResponseDestination = new DestinationNameHolder(destinationName, false);
@@ -108,7 +107,7 @@ public void setDefaultResponseQueueName(String destinationName) {
 	 * "JMSReplyTo" field.
 	 * <p>Alternatively, specify a JMS Destination object as "defaultResponseDestination".
 	 * @see #setDestinationResolver
-	 * @see #setDefaultResponseDestination(javax.jms.Destination)
+	 * @see #setDefaultResponseDestination(jakarta.jms.Destination)
 	 */
 	public void setDefaultResponseTopicName(String destinationName) {
 		this.defaultResponseDestination = new DestinationNameHolder(destinationName, true);
@@ -139,9 +138,9 @@ protected DestinationResolver getDestinationResolver() {
 	 * listener method arguments, and objects returned from listener
 	 * methods back to JMS messages.
 	 * <p>The default converter is a {@link SimpleMessageConverter}, which is able
-	 * to handle {@link javax.jms.BytesMessage BytesMessages},
-	 * {@link javax.jms.TextMessage TextMessages} and
-	 * {@link javax.jms.ObjectMessage ObjectMessages}.
+	 * to handle {@link jakarta.jms.BytesMessage BytesMessages},
+	 * {@link jakarta.jms.TextMessage TextMessages} and
+	 * {@link jakarta.jms.ObjectMessage ObjectMessages}.
 	 */
 	public void setMessageConverter(@Nullable MessageConverter messageConverter) {
 		this.messageConverter = messageConverter;
@@ -208,7 +207,7 @@ protected QosSettings getResponseQosSettings() {
 	 * message listener container) for handling result objects as well.
 	 * @param message the incoming JMS message
 	 * @see #handleListenerException
-	 * @see #onMessage(javax.jms.Message, javax.jms.Session)
+	 * @see #onMessage(jakarta.jms.Message, jakarta.jms.Session)
 	 */
 	@Override
 	public void onMessage(Message message) {
@@ -230,7 +229,7 @@ public void onMessage(Message message) {
 	 * In case of the Spring {@link SessionAwareMessageListener} mechanism,
 	 * exceptions get handled by the caller instead.
 	 * @param ex the exception to handle
-	 * @see #onMessage(javax.jms.Message)
+	 * @see #onMessage(jakarta.jms.Message)
 	 */
 	protected void handleListenerException(Throwable ex) {
 		logger.error("Listener execution failed", ex);
@@ -343,7 +342,7 @@ protected Object preProcessResponse(Object result) {
 	 * @param request the original incoming JMS message
 	 * @param response the outgoing JMS message about to be sent
 	 * @throws JMSException if thrown by JMS API methods
-	 * @see javax.jms.Message#setJMSCorrelationID
+	 * @see jakarta.jms.Message#setJMSCorrelationID
 	 */
 	protected void postProcessResponse(Message request, Message response) throws JMSException {
 		String correlation = request.getJMSCorrelationID();
@@ -373,15 +372,15 @@ private Destination getResponseDestination(Message request, Message response, Se
 	 * it is returned; if it is {@code null}, then the configured
 	 * {@link #resolveDefaultResponseDestination default response destination}
 	 * is returned; if this too is {@code null}, then an
-	 * {@link javax.jms.InvalidDestinationException} is thrown.
+	 * {@link jakarta.jms.InvalidDestinationException} is thrown.
 	 * @param request the original incoming JMS message
 	 * @param response the outgoing JMS message about to be sent
 	 * @param session the JMS Session to operate on
 	 * @return the response destination (never {@code null})
 	 * @throws JMSException if thrown by JMS API methods
-	 * @throws javax.jms.InvalidDestinationException if no {@link Destination} can be determined
+	 * @throws jakarta.jms.InvalidDestinationException if no {@link Destination} can be determined
 	 * @see #setDefaultResponseDestination
-	 * @see javax.jms.Message#getJMSReplyTo()
+	 * @see jakarta.jms.Message#getJMSReplyTo()
 	 */
 	protected Destination getResponseDestination(Message request, Message response, Session session)
 			throws JMSException {
@@ -401,7 +400,7 @@ protected Destination getResponseDestination(Message request, Message response,
 	 * Resolve the default response destination into a JMS {@link Destination}, using this
 	 * accessor's {@link DestinationResolver} in case of a destination name.
 	 * @return the located {@link Destination}
-	 * @throws javax.jms.JMSException if resolution failed
+	 * @throws jakarta.jms.JMSException if resolution failed
 	 * @see #setDefaultResponseDestination
 	 * @see #setDefaultResponseQueueName
 	 * @see #setDefaultResponseTopicName
@@ -426,8 +425,8 @@ protected Destination resolveDefaultResponseDestination(Session session) throws
 	 * @param session the JMS session to operate on
 	 * @throws JMSException if thrown by JMS API methods
 	 * @see #postProcessProducer
-	 * @see javax.jms.Session#createProducer
-	 * @see javax.jms.MessageProducer#send
+	 * @see jakarta.jms.Session#createProducer
+	 * @see jakarta.jms.MessageProducer#send
 	 */
 	protected void sendResponse(Session session, Destination destination, Message response) throws JMSException {
 		MessageProducer producer = session.createProducer(destination);
@@ -460,13 +459,13 @@ protected void postProcessProducer(MessageProducer producer, Message response) t
 
 	/**
 	 * A {@link MessagingMessageConverter} that lazily invokes payload extraction and
-	 * delegates it to {@link #extractMessage(javax.jms.Message)} in order to enforce
+	 * delegates it to {@link #extractMessage(jakarta.jms.Message)} in order to enforce
 	 * backward compatibility.
 	 */
 	private class MessagingMessageConverterAdapter extends MessagingMessageConverter {
 
 		@Override
-		public Object fromMessage(javax.jms.Message message) throws JMSException, MessageConversionException {
+		public Object fromMessage(jakarta.jms.Message message) throws JMSException, MessageConversionException {
 			return new LazyResolutionMessage(message);
 		}
 
@@ -505,7 +504,7 @@ protected Message createMessageForPayload(Object payload, Session session, @Null
 
 		protected class LazyResolutionMessage implements org.springframework.messaging.Message<Object> {
 
-			private final javax.jms.Message message;
+			private final jakarta.jms.Message message;
 
 			@Nullable
 			private Object payload;
@@ -513,7 +512,7 @@ protected class LazyResolutionMessage implements org.springframework.messaging.M
 			@Nullable
 			private MessageHeaders headers;
 
-			public LazyResolutionMessage(javax.jms.Message message) {
+			public LazyResolutionMessage(jakarta.jms.Message message) {
 				this.message = message;
 			}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java
index a1f425774e56..16564a3b6c2e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.listener.adapter;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 import org.springframework.jms.support.destination.DestinationResolver;
 import org.springframework.lang.Nullable;
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
index 2743b70439c5..1cf7c230d838 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
@@ -18,10 +18,10 @@
 
 import java.lang.reflect.InvocationTargetException;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Session;
 
 import org.springframework.jms.listener.SessionAwareMessageListener;
 import org.springframework.jms.listener.SubscriptionNameProvider;
@@ -51,7 +51,7 @@
  * message content type such as {@code String} or byte array), it will get
  * wrapped in a JMS {@code Message} and sent to the response destination
  * (either the JMS "reply-to" destination or a
- * {@link #setDefaultResponseDestination(javax.jms.Destination) specified default
+ * {@link #setDefaultResponseDestination(jakarta.jms.Destination) specified default
  * destination}).
  *
  * <p><b>Note:</b> The sending of response messages is only available when
@@ -86,7 +86,7 @@
  *
  * This next example illustrates a {@code Message} delegate
  * that just consumes the {@code String} contents of
- * {@link javax.jms.TextMessage TextMessages}. Notice also how the
+ * {@link jakarta.jms.TextMessage TextMessages}. Notice also how the
  * name of the {@code Message} handling method is different from the
  * {@link #ORIGINAL_DEFAULT_LISTENER_METHOD original} (this will have to
  * be configured in the attendant bean definition). Again, no {@code Message}
@@ -98,9 +98,9 @@
  *
  * This final example illustrates a {@code Message} delegate
  * that just consumes the {@code String} contents of
- * {@link javax.jms.TextMessage TextMessages}. Notice how the return type
+ * {@link jakarta.jms.TextMessage TextMessages}. Notice how the return type
  * of this method is {@code String}: This will result in the configured
- * {@link MessageListenerAdapter} sending a {@link javax.jms.TextMessage} in response.
+ * {@link MessageListenerAdapter} sending a {@link jakarta.jms.TextMessage} in response.
  *
  * <pre class="code">public interface ResponsiveTextMessageContentDelegate {
  *    String handleMessage(String text);
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java
index 91072e40cb5e..c858d2b1519c 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java
@@ -16,8 +16,8 @@
 
 package org.springframework.jms.listener.adapter;
 
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.jms.support.JmsHeaderMapper;
@@ -31,14 +31,14 @@
 import org.springframework.util.Assert;
 
 /**
- * A {@link javax.jms.MessageListener} adapter that invokes a configurable
+ * A {@link jakarta.jms.MessageListener} adapter that invokes a configurable
  * {@link InvocableHandlerMethod}.
  *
- * <p>Wraps the incoming {@link javax.jms.Message} to Spring's {@link Message}
+ * <p>Wraps the incoming {@link jakarta.jms.Message} to Spring's {@link Message}
  * abstraction, copying the JMS standard headers using a configurable
  * {@link JmsHeaderMapper}.
  *
- * <p>The original {@link javax.jms.Message} and the {@link javax.jms.Session}
+ * <p>The original {@link jakarta.jms.Message} and the {@link jakarta.jms.Session}
  * are provided as additional arguments so that these can be injected as
  * method arguments if necessary.
  *
@@ -56,7 +56,7 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis
 
 	/**
 	 * Set the {@link InvocableHandlerMethod} to use to invoke the method
-	 * processing an incoming {@link javax.jms.Message}.
+	 * processing an incoming {@link jakarta.jms.Message}.
 	 */
 	public void setHandlerMethod(InvocableHandlerMethod handlerMethod) {
 		this.handlerMethod = handlerMethod;
@@ -69,7 +69,7 @@ private InvocableHandlerMethod getHandlerMethod() {
 
 
 	@Override
-	public void onMessage(javax.jms.Message jmsMessage, @Nullable Session session) throws JMSException {
+	public void onMessage(jakarta.jms.Message jmsMessage, @Nullable Session session) throws JMSException {
 		Message<?> message = toMessagingMessage(jmsMessage);
 		if (logger.isDebugEnabled()) {
 			logger.debug("Processing [" + message + "]");
@@ -94,7 +94,7 @@ protected Object preProcessResponse(Object result) {
 				AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType).build();
 	}
 
-	protected Message<?> toMessagingMessage(javax.jms.Message jmsMessage) {
+	protected Message<?> toMessagingMessage(jakarta.jms.Message jmsMessage) {
 		try {
 			return (Message<?>) getMessagingMessageConverter().fromMessage(jmsMessage);
 		}
@@ -108,7 +108,7 @@ protected Message<?> toMessagingMessage(javax.jms.Message jmsMessage) {
 	 * with a dedicated error message.
 	 */
 	@Nullable
-	private Object invokeHandler(javax.jms.Message jmsMessage, @Nullable Session session, Message<?> message) {
+	private Object invokeHandler(jakarta.jms.Message jmsMessage, @Nullable Session session, Message<?> message) {
 		InvocableHandlerMethod handlerMethod = getHandlerMethod();
 		try {
 			return handlerMethod.invoke(message, jmsMessage, session);
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
index 1702070063b0..810d848138c0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
@@ -16,9 +16,8 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.jms.Session;
-import javax.resource.spi.ResourceAdapter;
-
+import jakarta.jms.Session;
+import jakarta.resource.spi.ResourceAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
index ba2f6da68a94..9109654e2ff7 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.jms.Session;
+import jakarta.jms.Session;
 
 import org.springframework.core.Constants;
 import org.springframework.jms.support.QosSettings;
@@ -36,11 +36,11 @@
  * @since 2.5
  * @see JmsActivationSpecFactory
  * @see JmsMessageEndpointManager#setActivationSpecConfig
- * @see javax.resource.spi.ResourceAdapter#endpointActivation
+ * @see jakarta.resource.spi.ResourceAdapter#endpointActivation
  */
 public class JmsActivationSpecConfig {
 
-	/** Constants instance for {@code javax.jms.Session}. */
+	/** Constants instance for {@code jakarta.jms.Session}. */
 	private static final Constants sessionConstants = new Constants(Session.class);
 
 
@@ -184,10 +184,10 @@ public String getMessageSelector() {
 	 * supports "SESSION_TRANSACTED" in the form of RA-managed transactions
 	 * (automatically translated by Spring's {@link DefaultJmsActivationSpecFactory}.
 	 * @param constantName the name of the {@link Session} acknowledge mode constant
-	 * @see javax.jms.Session#AUTO_ACKNOWLEDGE
-	 * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
-	 * @see javax.jms.Session#DUPS_OK_ACKNOWLEDGE
-	 * @see javax.jms.Session#SESSION_TRANSACTED
+	 * @see jakarta.jms.Session#AUTO_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#CLIENT_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#DUPS_OK_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#SESSION_TRANSACTED
 	 * @see StandardJmsActivationSpecFactory
 	 * @see DefaultJmsActivationSpecFactory
 	 */
@@ -197,10 +197,10 @@ public void setAcknowledgeModeName(String constantName) {
 
 	/**
 	 * Set the JMS acknowledgement mode to use.
-	 * @see javax.jms.Session#AUTO_ACKNOWLEDGE
-	 * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
-	 * @see javax.jms.Session#DUPS_OK_ACKNOWLEDGE
-	 * @see javax.jms.Session#SESSION_TRANSACTED
+	 * @see jakarta.jms.Session#AUTO_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#CLIENT_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#DUPS_OK_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#SESSION_TRANSACTED
 	 */
 	public void setAcknowledgeMode(int acknowledgeMode) {
 		this.acknowledgeMode = acknowledgeMode;
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java
index 2ef3bcbb5d33..2be2e2a20469 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecFactory.java
@@ -16,8 +16,8 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.ResourceAdapter;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.ResourceAdapter;
 
 /**
  * Strategy interface for creating JCA 1.5 ActivationSpec objects
@@ -32,7 +32,7 @@
  * @since 2.5
  * @see JmsActivationSpecConfig
  * @see JmsMessageEndpointManager#setActivationSpecFactory
- * @see javax.resource.spi.ResourceAdapter#endpointActivation
+ * @see jakarta.resource.spi.ResourceAdapter#endpointActivation
  */
 public interface JmsActivationSpecFactory {
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
index c27867f6f5b3..5151aaa3cb66 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
@@ -16,10 +16,10 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.resource.ResourceException;
-import javax.resource.spi.UnavailableException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.UnavailableException;
 
 import org.springframework.jca.endpoint.AbstractMessageEndpointFactory;
 import org.springframework.lang.Nullable;
@@ -27,9 +27,9 @@
 
 /**
  * JMS-specific implementation of the JCA 1.7
- * {@link javax.resource.spi.endpoint.MessageEndpointFactory} interface,
+ * {@link jakarta.resource.spi.endpoint.MessageEndpointFactory} interface,
  * providing transaction management capabilities for a JMS listener object
- * (e.g. a {@link javax.jms.MessageListener} object).
+ * (e.g. a {@link jakarta.jms.MessageListener} object).
  *
  * <p>Uses a static endpoint implementation, simply wrapping the
  * specified message listener object and exposing all of its implemented
@@ -38,7 +38,7 @@
  * <p>Typically used with Spring's {@link JmsMessageEndpointManager},
  * but not tied to it. As a consequence, this endpoint factory could
  * also be used with programmatic endpoint management on a native
- * {@link javax.resource.spi.ResourceAdapter} instance.
+ * {@link jakarta.resource.spi.ResourceAdapter} instance.
  *
  * @author Juergen Hoeller
  * @author Stephane Nicoll
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
index 518736f59e20..72a4f99fab31 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
@@ -16,8 +16,8 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.jms.MessageListener;
-import javax.resource.ResourceException;
+import jakarta.jms.MessageListener;
+import jakarta.resource.ResourceException;
 
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.jca.endpoint.GenericMessageEndpointManager;
@@ -37,15 +37,15 @@
  * object for activating the endpoint.
  *
  * <p><b>NOTE:</b> This JCA-based endpoint manager supports standard JMS
- * {@link javax.jms.MessageListener} endpoints only. It does <i>not</i> support
+ * {@link jakarta.jms.MessageListener} endpoints only. It does <i>not</i> support
  * Spring's {@link org.springframework.jms.listener.SessionAwareMessageListener}
  * variant, simply because the JCA endpoint management contract does not allow
- * for obtaining the current JMS {@link javax.jms.Session}.
+ * for obtaining the current JMS {@link jakarta.jms.Session}.
  *
  * @author Juergen Hoeller
  * @author Stephane Nicoll
  * @since 2.5
- * @see javax.jms.MessageListener
+ * @see jakarta.jms.MessageListener
  * @see #setActivationSpecConfig
  * @see JmsActivationSpecConfig
  * @see JmsActivationSpecFactory
@@ -86,7 +86,7 @@ public MessageListener getMessageListener() {
 	 * invocations, enlisting the endpoint resource in each such transaction.
 	 * <p>The passed-in object may be a transaction manager which implements
 	 * Spring's {@link org.springframework.transaction.jta.TransactionFactory}
-	 * interface, or a plain {@link javax.transaction.TransactionManager}.
+	 * interface, or a plain {@link jakarta.transaction.TransactionManager}.
 	 * <p>If no transaction manager is specified, the endpoint invocation
 	 * will simply not be wrapped in an XA transaction. Consult your
 	 * resource provider's ActivationSpec documentation for the local
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
index 632a12513163..f93eef259521 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
@@ -18,12 +18,12 @@
 
 import java.util.Map;
 
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.ResourceAdapter;
+import jakarta.jms.JMSException;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.ResourceAdapter;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
@@ -193,11 +193,11 @@ else if (config.isSubscriptionDurable()) {
 	 * having been requested.
 	 * @param bw the BeanWrapper wrapping the ActivationSpec object
 	 * @param ackMode the configured acknowledge mode
-	 * (according to the constants in {@link javax.jms.Session}
-	 * @see javax.jms.Session#AUTO_ACKNOWLEDGE
-	 * @see javax.jms.Session#DUPS_OK_ACKNOWLEDGE
-	 * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
-	 * @see javax.jms.Session#SESSION_TRANSACTED
+	 * (according to the constants in {@link jakarta.jms.Session}
+	 * @see jakarta.jms.Session#AUTO_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#DUPS_OK_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#CLIENT_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#SESSION_TRANSACTED
 	 */
 	protected void applyAcknowledgeMode(BeanWrapper bw, int ackMode) {
 		if (ackMode == Session.SESSION_TRANSACTED) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
index 305fc824983b..5e8e19c7505f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
@@ -16,11 +16,10 @@
 
 package org.springframework.jms.support;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Session;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -47,7 +46,7 @@
  */
 public abstract class JmsAccessor implements InitializingBean {
 
-	/** Constants instance for {@code javax.jms.Session}. */
+	/** Constants instance for {@code jakarta.jms.Session}. */
 	private static final Constants sessionConstants = new Constants(Session.class);
 
 
@@ -95,7 +94,7 @@ protected final ConnectionFactory obtainConnectionFactory() {
 	 * Default is "false".
 	 * <p>Note that within a JTA transaction, the parameters passed to
 	 * {@code create(Queue/Topic)Session(boolean transacted, int acknowledgeMode)}
-	 * method are not taken into account. Depending on the Java EE transaction context,
+	 * method are not taken into account. Depending on the Jakarta EE transaction context,
 	 * the container makes its own decisions on these values. Analogously, these
 	 * parameters are not taken into account within a locally managed transaction
 	 * either, since the accessor operates on an existing JMS Session in this case.
@@ -106,7 +105,7 @@ protected final ConnectionFactory obtainConnectionFactory() {
 	 * transaction being managed alongside the main transaction (which might
 	 * be a native JDBC transaction), with the JMS transaction committing
 	 * right after the main transaction.
-	 * @see javax.jms.Connection#createSession(boolean, int)
+	 * @see jakarta.jms.Connection#createSession(boolean, int)
 	 */
 	public void setSessionTransacted(boolean sessionTransacted) {
 		this.sessionTransacted = sessionTransacted;
@@ -127,10 +126,10 @@ public boolean isSessionTransacted() {
 	 * <p>If you want to use vendor-specific extensions to the acknowledgment mode,
 	 * use {@link #setSessionAcknowledgeMode(int)} instead.
 	 * @param constantName the name of the {@link Session} acknowledge mode constant
-	 * @see javax.jms.Session#AUTO_ACKNOWLEDGE
-	 * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
-	 * @see javax.jms.Session#DUPS_OK_ACKNOWLEDGE
-	 * @see javax.jms.Connection#createSession(boolean, int)
+	 * @see jakarta.jms.Session#AUTO_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#CLIENT_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#DUPS_OK_ACKNOWLEDGE
+	 * @see jakarta.jms.Connection#createSession(boolean, int)
 	 */
 	public void setSessionAcknowledgeModeName(String constantName) {
 		setSessionAcknowledgeMode(sessionConstants.asNumber(constantName).intValue());
@@ -147,10 +146,10 @@ public void setSessionAcknowledgeModeName(String constantName) {
 	 * the container makes its own decisions on these values. See section 17.3.5
 	 * of the EJB spec.
 	 * @param sessionAcknowledgeMode the acknowledgement mode constant
-	 * @see javax.jms.Session#AUTO_ACKNOWLEDGE
-	 * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
-	 * @see javax.jms.Session#DUPS_OK_ACKNOWLEDGE
-	 * @see javax.jms.Connection#createSession(boolean, int)
+	 * @see jakarta.jms.Session#AUTO_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#CLIENT_ACKNOWLEDGE
+	 * @see jakarta.jms.Session#DUPS_OK_ACKNOWLEDGE
+	 * @see jakarta.jms.Connection#createSession(boolean, int)
 	 */
 	public void setSessionAcknowledgeMode(int sessionAcknowledgeMode) {
 		this.sessionAcknowledgeMode = sessionAcknowledgeMode;
@@ -172,7 +171,7 @@ public void afterPropertiesSet() {
 
 
 	/**
-	 * Convert the specified checked {@link javax.jms.JMSException JMSException} to
+	 * Convert the specified checked {@link jakarta.jms.JMSException JMSException} to
 	 * a Spring runtime {@link org.springframework.jms.JmsException JmsException}
 	 * equivalent.
 	 * <p>The default implementation delegates to the
@@ -190,7 +189,7 @@ protected JmsException convertJmsAccessException(JMSException ex) {
 	 * <p>This implementation uses JMS 1.1 API.
 	 * @return the new JMS Connection
 	 * @throws JMSException if thrown by JMS API methods
-	 * @see javax.jms.ConnectionFactory#createConnection()
+	 * @see jakarta.jms.ConnectionFactory#createConnection()
 	 */
 	protected Connection createConnection() throws JMSException {
 		return obtainConnectionFactory().createConnection();
@@ -202,7 +201,7 @@ protected Connection createConnection() throws JMSException {
 	 * @param con the JMS Connection to create a Session for
 	 * @return the new JMS Session
 	 * @throws JMSException if thrown by JMS API methods
-	 * @see javax.jms.Connection#createSession(boolean, int)
+	 * @see jakarta.jms.Connection#createSession(boolean, int)
 	 */
 	protected Session createSession(Connection con) throws JMSException {
 		return con.createSession(isSessionTransacted(), getSessionAcknowledgeMode());
@@ -213,9 +212,9 @@ protected Session createSession(Connection con) throws JMSException {
 	 * <p>This implementation uses JMS 1.1 API.
 	 * @param session the JMS Session to check
 	 * @return whether the given Session is in client acknowledge mode
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
-	 * @see javax.jms.Session#getAcknowledgeMode()
-	 * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
+	 * @see jakarta.jms.Session#getAcknowledgeMode()
+	 * @see jakarta.jms.Session#CLIENT_ACKNOWLEDGE
 	 */
 	protected boolean isClientAcknowledge(Session session) throws JMSException {
 		return (session.getAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java
index 3914d61bede5..75e4d4fa3272 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java
@@ -16,13 +16,13 @@
 
 package org.springframework.jms.support;
 
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 import org.springframework.messaging.support.HeaderMapper;
 
 /**
  * Strategy interface for mapping {@link org.springframework.messaging.Message}
- * headers to an outbound JMS {@link javax.jms.Message} (e.g. to configure JMS
+ * headers to an outbound JMS {@link jakarta.jms.Message} (e.g. to configure JMS
  * properties) or extracting messaging header values from an inbound JMS Message.
  *
  * @author Mark Fisher
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaders.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaders.java
index f4e5c028e7af..a2e7867e92f7 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaders.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaders.java
@@ -37,53 +37,53 @@ public interface JmsHeaders {
 	 * Correlation ID for the message. This may be the {@link #MESSAGE_ID} of
 	 * the message that this message replies to. It may also be an
 	 * application-specific identifier.
-	 * @see javax.jms.Message#getJMSCorrelationID()
+	 * @see jakarta.jms.Message#getJMSCorrelationID()
 	 */
 	String CORRELATION_ID = PREFIX + "correlationId";
 
 	/**
 	 * Name of the destination (topic or queue) of the message.
 	 * <p>Read-only value.
-	 * @see javax.jms.Message#getJMSDestination()
-	 * @see javax.jms.Destination
-	 * @see javax.jms.Queue
-	 * @see javax.jms.Topic
+	 * @see jakarta.jms.Message#getJMSDestination()
+	 * @see jakarta.jms.Destination
+	 * @see jakarta.jms.Queue
+	 * @see jakarta.jms.Topic
 	 */
 	String DESTINATION = PREFIX + "destination";
 
 	/**
 	 * Distribution mode.
 	 * <p>Read-only value.
-	 * @see javax.jms.Message#getJMSDeliveryMode()
-	 * @see javax.jms.DeliveryMode
+	 * @see jakarta.jms.Message#getJMSDeliveryMode()
+	 * @see jakarta.jms.DeliveryMode
 	 */
 	String DELIVERY_MODE = PREFIX + "deliveryMode";
 
 	/**
 	 * Message expiration date and time.
 	 * <p>Read-only value.
-	 * @see javax.jms.Message#getJMSExpiration()
+	 * @see jakarta.jms.Message#getJMSExpiration()
 	 */
 	String EXPIRATION = PREFIX + "expiration";
 
 	/**
 	 * Unique identifier for a message.
 	 * <p>Read-only value.
-	 * @see javax.jms.Message#getJMSMessageID()
+	 * @see jakarta.jms.Message#getJMSMessageID()
 	 */
 	String MESSAGE_ID = PREFIX + "messageId";
 
 	/**
 	 * The message priority level.
 	 * <p>Read-only value.
-	 * @see javax.jms.Message#getJMSPriority()
+	 * @see jakarta.jms.Message#getJMSPriority()
 	 */
 	String PRIORITY = PREFIX + "priority";
 
 	/**
 	 * Name of the destination (topic or queue) the message replies should
 	 * be sent to.
-	 * @see javax.jms.Message#getJMSReplyTo()
+	 * @see jakarta.jms.Message#getJMSReplyTo()
 	 */
 	String REPLY_TO = PREFIX + "replyTo";
 
@@ -91,21 +91,21 @@ public interface JmsHeaders {
 	 * Specify if the message was resent. This occurs when a message
 	 * consumer fails to acknowledge the message reception.
 	 * <p>Read-only value.
-	 * @see javax.jms.Message#getJMSRedelivered()
+	 * @see jakarta.jms.Message#getJMSRedelivered()
 	 */
 	String REDELIVERED = PREFIX + "redelivered";
 
 	/**
 	 * Message type label. This type is a string value describing the message
 	 * in a functional manner.
-	 * @see javax.jms.Message#getJMSType()
+	 * @see jakarta.jms.Message#getJMSType()
 	 */
 	String TYPE = PREFIX + "type";
 
 	/**
 	 * Date and time of the message sending operation.
 	 * <p>Read-only value.
-	 * @see javax.jms.Message#getJMSTimestamp()
+	 * @see jakarta.jms.Message#getJMSTimestamp()
 	 */
 	String TIMESTAMP = PREFIX + "timestamp";
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java
index c7ccdf4e96cb..3523c7808ba6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
index 3f33ba102110..4d6b136264c3 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
@@ -16,14 +16,13 @@
 
 package org.springframework.jms.support;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.QueueBrowser;
-import javax.jms.QueueRequestor;
-import javax.jms.Session;
-
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.QueueBrowser;
+import jakarta.jms.QueueRequestor;
+import jakarta.jms.Session;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -85,7 +84,7 @@ public static void closeConnection(@Nullable Connection con, boolean stop) {
 					con.close();
 				}
 			}
-			catch (javax.jms.IllegalStateException ex) {
+			catch (jakarta.jms.IllegalStateException ex) {
 				logger.debug("Ignoring Connection state exception - assuming already closed: " + ex);
 			}
 			catch (JMSException ex) {
@@ -217,7 +216,7 @@ public static void commitIfNecessary(Session session) throws JMSException {
 		try {
 			session.commit();
 		}
-		catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
+		catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) {
 			// Ignore -> can only happen in case of a JTA transaction.
 		}
 	}
@@ -232,7 +231,7 @@ public static void rollbackIfNecessary(Session session) throws JMSException {
 		try {
 			session.rollback();
 		}
-		catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
+		catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) {
 			// Ignore -> can only happen in case of a JTA transaction.
 		}
 	}
@@ -242,7 +241,7 @@ public static void rollbackIfNecessary(Session session) throws JMSException {
 	 * incorporating a linked exception's message if appropriate.
 	 * @param ex the JMSException to build a message for
 	 * @return the descriptive message String
-	 * @see javax.jms.JMSException#getLinkedException()
+	 * @see jakarta.jms.JMSException#getLinkedException()
 	 */
 	public static String buildExceptionMessage(JMSException ex) {
 		String message = ex.getMessage();
@@ -262,7 +261,7 @@ public static String buildExceptionMessage(JMSException ex) {
 	}
 
 	/**
-	 * Convert the specified checked {@link javax.jms.JMSException JMSException} to a
+	 * Convert the specified checked {@link jakarta.jms.JMSException JMSException} to a
 	 * Spring runtime {@link org.springframework.jms.JmsException JmsException} equivalent.
 	 * @param ex the original checked JMSException to convert
 	 * @return the Spring runtime JmsException wrapping the given exception
@@ -270,41 +269,41 @@ public static String buildExceptionMessage(JMSException ex) {
 	public static JmsException convertJmsAccessException(JMSException ex) {
 		Assert.notNull(ex, "JMSException must not be null");
 
-		if (ex instanceof javax.jms.IllegalStateException) {
-			return new org.springframework.jms.IllegalStateException((javax.jms.IllegalStateException) ex);
+		if (ex instanceof jakarta.jms.IllegalStateException) {
+			return new org.springframework.jms.IllegalStateException((jakarta.jms.IllegalStateException) ex);
 		}
-		if (ex instanceof javax.jms.InvalidClientIDException) {
-			return new InvalidClientIDException((javax.jms.InvalidClientIDException) ex);
+		if (ex instanceof jakarta.jms.InvalidClientIDException) {
+			return new InvalidClientIDException((jakarta.jms.InvalidClientIDException) ex);
 		}
-		if (ex instanceof javax.jms.InvalidDestinationException) {
-			return new InvalidDestinationException((javax.jms.InvalidDestinationException) ex);
+		if (ex instanceof jakarta.jms.InvalidDestinationException) {
+			return new InvalidDestinationException((jakarta.jms.InvalidDestinationException) ex);
 		}
-		if (ex instanceof javax.jms.InvalidSelectorException) {
-			return new InvalidSelectorException((javax.jms.InvalidSelectorException) ex);
+		if (ex instanceof jakarta.jms.InvalidSelectorException) {
+			return new InvalidSelectorException((jakarta.jms.InvalidSelectorException) ex);
 		}
-		if (ex instanceof javax.jms.JMSSecurityException) {
-			return new JmsSecurityException((javax.jms.JMSSecurityException) ex);
+		if (ex instanceof jakarta.jms.JMSSecurityException) {
+			return new JmsSecurityException((jakarta.jms.JMSSecurityException) ex);
 		}
-		if (ex instanceof javax.jms.MessageEOFException) {
-			return new MessageEOFException((javax.jms.MessageEOFException) ex);
+		if (ex instanceof jakarta.jms.MessageEOFException) {
+			return new MessageEOFException((jakarta.jms.MessageEOFException) ex);
 		}
-		if (ex instanceof javax.jms.MessageFormatException) {
-			return new MessageFormatException((javax.jms.MessageFormatException) ex);
+		if (ex instanceof jakarta.jms.MessageFormatException) {
+			return new MessageFormatException((jakarta.jms.MessageFormatException) ex);
 		}
-		if (ex instanceof javax.jms.MessageNotReadableException) {
-			return new MessageNotReadableException((javax.jms.MessageNotReadableException) ex);
+		if (ex instanceof jakarta.jms.MessageNotReadableException) {
+			return new MessageNotReadableException((jakarta.jms.MessageNotReadableException) ex);
 		}
-		if (ex instanceof javax.jms.MessageNotWriteableException) {
-			return new MessageNotWriteableException((javax.jms.MessageNotWriteableException) ex);
+		if (ex instanceof jakarta.jms.MessageNotWriteableException) {
+			return new MessageNotWriteableException((jakarta.jms.MessageNotWriteableException) ex);
 		}
-		if (ex instanceof javax.jms.ResourceAllocationException) {
-			return new ResourceAllocationException((javax.jms.ResourceAllocationException) ex);
+		if (ex instanceof jakarta.jms.ResourceAllocationException) {
+			return new ResourceAllocationException((jakarta.jms.ResourceAllocationException) ex);
 		}
-		if (ex instanceof javax.jms.TransactionInProgressException) {
-			return new TransactionInProgressException((javax.jms.TransactionInProgressException) ex);
+		if (ex instanceof jakarta.jms.TransactionInProgressException) {
+			return new TransactionInProgressException((jakarta.jms.TransactionInProgressException) ex);
 		}
-		if (ex instanceof javax.jms.TransactionRolledBackException) {
-			return new TransactionRolledBackException((javax.jms.TransactionRolledBackException) ex);
+		if (ex instanceof jakarta.jms.TransactionRolledBackException) {
+			return new TransactionRolledBackException((jakarta.jms.TransactionRolledBackException) ex);
 		}
 
 		// fallback
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java b/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java
index f19a6970e429..2cd329fff708 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.support;
 
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 import org.springframework.lang.Nullable;
 
@@ -59,10 +59,10 @@ public QosSettings(int deliveryMode, int priority, long timeToLive) {
 	 * Set the delivery mode to use when sending a message.
 	 * Default is the JMS Message default: "PERSISTENT".
 	 * @param deliveryMode the delivery mode to use
-	 * @see javax.jms.DeliveryMode#PERSISTENT
-	 * @see javax.jms.DeliveryMode#NON_PERSISTENT
-	 * @see javax.jms.Message#DEFAULT_DELIVERY_MODE
-	 * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long)
+	 * @see jakarta.jms.DeliveryMode#PERSISTENT
+	 * @see jakarta.jms.DeliveryMode#NON_PERSISTENT
+	 * @see jakarta.jms.Message#DEFAULT_DELIVERY_MODE
+	 * @see jakarta.jms.MessageProducer#send(jakarta.jms.Message, int, int, long)
 	 */
 	public void setDeliveryMode(int deliveryMode) {
 		this.deliveryMode = deliveryMode;
@@ -77,8 +77,8 @@ public int getDeliveryMode() {
 
 	/**
 	 * Set the priority of a message when sending.
-	 * @see javax.jms.Message#DEFAULT_PRIORITY
-	 * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long)
+	 * @see jakarta.jms.Message#DEFAULT_PRIORITY
+	 * @see jakarta.jms.MessageProducer#send(jakarta.jms.Message, int, int, long)
 	 */
 	public void setPriority(int priority) {
 		this.priority = priority;
@@ -94,8 +94,8 @@ public int getPriority() {
 	/**
 	 * Set the time-to-live of the message when sending.
 	 * @param timeToLive the message's lifetime (in milliseconds)
-	 * @see javax.jms.Message#DEFAULT_TIME_TO_LIVE
-	 * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long)
+	 * @see jakarta.jms.Message#DEFAULT_TIME_TO_LIVE
+	 * @see jakarta.jms.MessageProducer#send(jakarta.jms.Message, int, int, long)
 	 */
 	public void setTimeToLive(long timeToLive) {
 		this.timeToLive = timeToLive;
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java
index 36569911c694..43d53cf3ffc3 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java
@@ -23,9 +23,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.support.AbstractHeaderMapper;
@@ -61,7 +61,7 @@ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper<Message> impleme
 
 
 	@Override
-	public void fromHeaders(MessageHeaders headers, javax.jms.Message jmsMessage) {
+	public void fromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
 		try {
 			Object jmsCorrelationId = headers.get(JmsHeaders.CORRELATION_ID);
 			if (jmsCorrelationId instanceof Number) {
@@ -125,7 +125,7 @@ else if (logger.isDebugEnabled()) {
 	}
 
 	@Override
-	public MessageHeaders toHeaders(javax.jms.Message jmsMessage) {
+	public MessageHeaders toHeaders(jakarta.jms.Message jmsMessage) {
 		Map<String, Object> headers = new HashMap<>();
 		try {
 			try {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
index 401f5c0cb5ed..7b6c3370aed1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -24,18 +24,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.core.MethodParameter;
@@ -212,7 +211,7 @@ public Message toMessage(Object object, Session session, @Nullable Object conver
 	 * @param session the Session to use for creating a JMS Message
 	 * @param jsonView the view to use to filter the content
 	 * @return the JMS Message
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 * @throws MessageConversionException in case of conversion failure
 	 * @since 4.3
 	 */
@@ -343,7 +342,7 @@ protected Message mapToMessage(Object object, Session session, ObjectWriter obje
 	 * @param object the payload object to set a type id for
 	 * @param message the JMS Message on which to set the type id property
 	 * @throws JMSException if thrown by JMS methods
-	 * @see #getJavaTypeForMessage(javax.jms.Message)
+	 * @see #getJavaTypeForMessage(jakarta.jms.Message)
 	 * @see #setTypeIdPropertyName(String)
 	 * @see #setTypeIdMappings(java.util.Map)
 	 */
@@ -445,7 +444,7 @@ protected Object convertFromMessage(Message message, JavaType targetJavaType)
 	 * a different strategy, e.g. doing some heuristics based on message origin.
 	 * @param message the JMS Message from which to get the type id property
 	 * @throws JMSException if thrown by JMS methods
-	 * @see #setTypeIdOnMessage(Object, javax.jms.Message)
+	 * @see #setTypeIdOnMessage(Object, jakarta.jms.Message)
 	 * @see #setTypeIdPropertyName(String)
 	 * @see #setTypeIdMappings(java.util.Map)
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
index 99c38631fdac..b420ec92c6b0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
@@ -22,16 +22,17 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import jakarta.jms.BytesMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
 import org.springframework.oxm.Marshaller;
@@ -144,8 +145,8 @@ public void afterPropertiesSet() {
 
 
 	/**
-	 * This implementation marshals the given object to a {@link javax.jms.TextMessage} or
-	 * {@link javax.jms.BytesMessage}. The desired message type can be defined by setting
+	 * This implementation marshals the given object to a {@link jakarta.jms.TextMessage} or
+	 * {@link jakarta.jms.BytesMessage}. The desired message type can be defined by setting
 	 * the {@link #setTargetType "marshalTo"} property.
 	 * @see #marshalToTextMessage
 	 * @see #marshalToBytesMessage
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
index 837b19bb04cb..e6ba699751d0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
@@ -21,7 +21,7 @@
 
 /**
  * Thrown by {@link MessageConverter} implementations when the conversion
- * of an object to/from a {@link javax.jms.Message} fails.
+ * of an object to/from a {@link jakarta.jms.Message} fails.
  *
  * @author Mark Pollack
  * @since 1.1
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
index b4c75ab02335..433123d19535 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.support.converter;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 /**
  * Strategy interface that specifies a converter between Java objects and JMS messages.
@@ -42,7 +42,7 @@ public interface MessageConverter {
 	 * @param object the object to convert
 	 * @param session the Session to use for creating a JMS Message
 	 * @return the JMS Message
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 * @throws MessageConversionException in case of conversion failure
 	 */
 	Message toMessage(Object object, Session session) throws JMSException, MessageConversionException;
@@ -51,7 +51,7 @@ public interface MessageConverter {
 	 * Convert from a JMS Message to a Java object.
 	 * @param message the message to convert
 	 * @return the converted Java object
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 * @throws MessageConversionException in case of conversion failure
 	 */
 	Object fromMessage(Message message) throws JMSException, MessageConversionException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
index edaea0e38cd9..98b46c77bbcf 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
@@ -18,8 +18,8 @@
 
 /**
  * Constants that indicate a target message type to convert to: a
- * {@link javax.jms.TextMessage}, a {@link javax.jms.BytesMessage},
- * a {@link javax.jms.MapMessage} or an {@link javax.jms.ObjectMessage}.
+ * {@link jakarta.jms.TextMessage}, a {@link jakarta.jms.BytesMessage},
+ * a {@link jakarta.jms.MapMessage} or an {@link jakarta.jms.ObjectMessage}.
  *
  * @author Juergen Hoeller
  * @since 3.0
@@ -28,22 +28,22 @@
 public enum MessageType {
 
 	/**
-	 * A {@link javax.jms.TextMessage}.
+	 * A {@link jakarta.jms.TextMessage}.
 	 */
 	TEXT,
 
 	/**
-	 * A {@link javax.jms.BytesMessage}.
+	 * A {@link jakarta.jms.BytesMessage}.
 	 */
 	BYTES,
 
 	/**
-	 * A {@link javax.jms.MapMessage}.
+	 * A {@link jakarta.jms.MapMessage}.
 	 */
 	MAP,
 
 	/**
-	 * A {@link javax.jms.ObjectMessage}.
+	 * A {@link jakarta.jms.ObjectMessage}.
 	 */
 	OBJECT
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java
index 441f306d7289..98e8ad026395 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java
@@ -18,8 +18,8 @@
 
 import java.util.Map;
 
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jms.support.JmsHeaderMapper;
@@ -33,7 +33,7 @@
 
 /**
  * Convert a {@link Message} from the messaging abstraction to and from a
- * {@link javax.jms.Message} using an underlying {@link MessageConverter}
+ * {@link jakarta.jms.Message} using an underlying {@link MessageConverter}
  * for the payload and a {@link org.springframework.jms.support.JmsHeaderMapper}
  * to map the JMS headers to and from standard message headers.
  *
@@ -100,7 +100,7 @@ public void afterPropertiesSet() {
 
 
 	@Override
-	public javax.jms.Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
+	public jakarta.jms.Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		if (!(object instanceof Message)) {
 			throw new IllegalArgumentException("Could not convert [" + object + "] - only [" +
 					Message.class.getName() + "] is handled by this converter");
@@ -108,14 +108,14 @@ public javax.jms.Message toMessage(Object object, Session session) throws JMSExc
 		Message<?> input = (Message<?>) object;
 		MessageHeaders headers = input.getHeaders();
 		Object conversionHint = headers.get(AbstractMessagingTemplate.CONVERSION_HINT_HEADER);
-		javax.jms.Message reply = createMessageForPayload(input.getPayload(), session, conversionHint);
+		jakarta.jms.Message reply = createMessageForPayload(input.getPayload(), session, conversionHint);
 		this.headerMapper.fromHeaders(headers, reply);
 		return reply;
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Object fromMessage(javax.jms.Message message) throws JMSException, MessageConversionException {
+	public Object fromMessage(jakarta.jms.Message message) throws JMSException, MessageConversionException {
 		Map<String, Object> mappedHeaders = extractHeaders(message);
 		Object convertedObject = extractPayload(message);
 		MessageBuilder<Object> builder = (convertedObject instanceof org.springframework.messaging.Message ?
@@ -125,9 +125,9 @@ public Object fromMessage(javax.jms.Message message) throws JMSException, Messag
 	}
 
 	/**
-	 * Extract the payload of the specified {@link javax.jms.Message}.
+	 * Extract the payload of the specified {@link jakarta.jms.Message}.
 	 */
-	protected Object extractPayload(javax.jms.Message message) throws JMSException {
+	protected Object extractPayload(jakarta.jms.Message message) throws JMSException {
 		return this.payloadConverter.fromMessage(message);
 	}
 
@@ -138,13 +138,13 @@ protected Object extractPayload(javax.jms.Message message) throws JMSException {
 	 * @since 4.3
 	 * @see MessageConverter#toMessage(Object, Session)
 	 */
-	protected javax.jms.Message createMessageForPayload(
+	protected jakarta.jms.Message createMessageForPayload(
 			Object payload, Session session, @Nullable Object conversionHint) throws JMSException {
 
 		return this.payloadConverter.toMessage(payload, session);
 	}
 
-	protected final MessageHeaders extractHeaders(javax.jms.Message message) {
+	protected final MessageHeaders extractHeaders(jakarta.jms.Message message) {
 		return this.headerMapper.toHeaders(message);
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
index 4c28352000b8..deab9e8677f1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
@@ -21,13 +21,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.MapMessage;
+import jakarta.jms.Message;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.springframework.util.ObjectUtils;
 
@@ -37,9 +37,9 @@
  * by {@link org.springframework.jms.core.JmsTemplate}, for
  * {@code convertAndSend} and {@code receiveAndConvert} operations.
  *
- * <p>Converts a String to a {@link javax.jms.TextMessage}, a byte array to a
- * {@link javax.jms.BytesMessage}, a Map to a {@link javax.jms.MapMessage}, and
- * a Serializable object to a {@link javax.jms.ObjectMessage} (or vice versa).
+ * <p>Converts a String to a {@link jakarta.jms.TextMessage}, a byte array to a
+ * {@link jakarta.jms.BytesMessage}, a Map to a {@link jakarta.jms.MapMessage}, and
+ * a Serializable object to a {@link jakarta.jms.ObjectMessage} (or vice versa).
  *
  * @author Juergen Hoeller
  * @since 1.1
@@ -117,7 +117,7 @@ else if (message instanceof ObjectMessage) {
 	 * @param session current JMS session
 	 * @return the resulting message
 	 * @throws JMSException if thrown by JMS methods
-	 * @see javax.jms.Session#createTextMessage
+	 * @see jakarta.jms.Session#createTextMessage
 	 */
 	protected TextMessage createMessageForString(String text, Session session) throws JMSException {
 		return session.createTextMessage(text);
@@ -129,7 +129,7 @@ protected TextMessage createMessageForString(String text, Session session) throw
 	 * @param session current JMS session
 	 * @return the resulting message
 	 * @throws JMSException if thrown by JMS methods
-	 * @see javax.jms.Session#createBytesMessage
+	 * @see jakarta.jms.Session#createBytesMessage
 	 */
 	protected BytesMessage createMessageForByteArray(byte[] bytes, Session session) throws JMSException {
 		BytesMessage message = session.createBytesMessage();
@@ -143,7 +143,7 @@ protected BytesMessage createMessageForByteArray(byte[] bytes, Session session)
 	 * @param session current JMS session
 	 * @return the resulting message
 	 * @throws JMSException if thrown by JMS methods
-	 * @see javax.jms.Session#createMapMessage
+	 * @see jakarta.jms.Session#createMapMessage
 	 */
 	protected MapMessage createMessageForMap(Map<?, ?> map, Session session) throws JMSException {
 		MapMessage message = session.createMapMessage();
@@ -164,7 +164,7 @@ protected MapMessage createMessageForMap(Map<?, ?> map, Session session) throws
 	 * @param session current JMS session
 	 * @return the resulting message
 	 * @throws JMSException if thrown by JMS methods
-	 * @see javax.jms.Session#createObjectMessage
+	 * @see jakarta.jms.Session#createObjectMessage
 	 */
 	protected ObjectMessage createMessageForSerializable(Serializable object, Session session) throws JMSException {
 		return session.createObjectMessage(object);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SmartMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SmartMessageConverter.java
index 8ae6a8944847..ab180e4ecebc 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SmartMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SmartMessageConverter.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.support.converter;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 import org.springframework.lang.Nullable;
 
@@ -43,7 +43,7 @@ public interface SmartMessageConverter extends MessageConverter {
 	 * @param conversionHint an extra object passed to the {@link MessageConverter},
 	 * e.g. the associated {@code MethodParameter} (may be {@code null}}
 	 * @return the JMS Message
-	 * @throws javax.jms.JMSException if thrown by JMS API methods
+	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 * @throws MessageConversionException in case of conversion failure
 	 * @see #toMessage(Object, Session)
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
index 0a7d5beaf3d2..291e7a3d0790 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.support.destination;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -30,7 +30,7 @@
  * {@link DestinationResolver} implementation based on a Spring {@link BeanFactory}.
  *
  * <p>Will lookup Spring managed beans identified by bean name,
- * expecting them to be of type {@code javax.jms.Destination}.
+ * expecting them to be of type {@code jakarta.jms.Destination}.
  *
  * @author Juergen Hoeller
  * @since 2.5
@@ -57,7 +57,7 @@ public BeanFactoryDestinationResolver() {
 	 * replaced by the {@link BeanFactory} that creates it (c.f. the
 	 * {@link BeanFactoryAware} contract). So only use this constructor if you
 	 * are using this class outside the context of a Spring IoC container.
-	 * @param beanFactory the bean factory to be used to lookup {@link javax.jms.Destination Destination}
+	 * @param beanFactory the bean factory to be used to lookup {@link jakarta.jms.Destination Destination}
 	 */
 	public BeanFactoryDestinationResolver(BeanFactory beanFactory) {
 		Assert.notNull(beanFactory, "BeanFactory is required");
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
index 7767f3d2ccd9..ddc273729ab6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jms.support.destination;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 import org.springframework.lang.Nullable;
 
@@ -51,7 +51,7 @@ public interface DestinationResolver {
 	 * @param destinationName the name of the destination
 	 * @param pubSubDomain {@code true} if the domain is pub-sub, {@code false} if P2P
 	 * @return the JMS destination (either a topic or a queue)
-	 * @throws javax.jms.JMSException if the JMS Session failed to resolve the destination
+	 * @throws jakarta.jms.JMSException if the JMS Session failed to resolve the destination
 	 * @throws DestinationResolutionException in case of general destination resolution failure
 	 */
 	Destination resolveDestinationName(@Nullable Session session, String destinationName, boolean pubSubDomain)
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
index 80d69145f9ab..0a1d885f7ef5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
@@ -16,11 +16,11 @@
 
 package org.springframework.jms.support.destination;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -31,8 +31,8 @@
  *
  * @author Juergen Hoeller
  * @since 1.1
- * @see javax.jms.Session#createQueue
- * @see javax.jms.Session#createTopic
+ * @see jakarta.jms.Session#createQueue
+ * @see jakarta.jms.Session#createTopic
  */
 public class DynamicDestinationResolver implements DestinationResolver {
 
@@ -42,9 +42,9 @@ public class DynamicDestinationResolver implements DestinationResolver {
 	 * @param destinationName the name of the destination
 	 * @param pubSubDomain {@code true} if the domain is pub-sub, {@code false} if P2P
 	 * @return the JMS destination (either a topic or a queue)
-	 * @throws javax.jms.JMSException if resolution failed
-	 * @see #resolveTopic(javax.jms.Session, String)
-	 * @see #resolveQueue(javax.jms.Session, String)
+	 * @throws jakarta.jms.JMSException if resolution failed
+	 * @see #resolveTopic(jakarta.jms.Session, String)
+	 * @see #resolveQueue(jakarta.jms.Session, String)
 	 */
 	@Override
 	public Destination resolveDestinationName(@Nullable Session session, String destinationName, boolean pubSubDomain)
@@ -66,7 +66,7 @@ public Destination resolveDestinationName(@Nullable Session session, String dest
 	 * @param session the current JMS Session
 	 * @param topicName the name of the desired {@link Topic}
 	 * @return the JMS {@link Topic}
-	 * @throws javax.jms.JMSException if resolution failed
+	 * @throws jakarta.jms.JMSException if resolution failed
 	 * @see Session#createTopic(String)
 	 */
 	protected Topic resolveTopic(Session session, String topicName) throws JMSException {
@@ -78,7 +78,7 @@ protected Topic resolveTopic(Session session, String topicName) throws JMSExcept
 	 * @param session the current JMS Session
 	 * @param queueName the name of the desired {@link Queue}
 	 * @return the JMS {@link Queue}
-	 * @throws javax.jms.JMSException if resolution failed
+	 * @throws jakarta.jms.JMSException if resolution failed
 	 * @see Session#createQueue(String)
 	 */
 	protected Queue resolveQueue(Session session, String queueName) throws JMSException {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
index 56953b02a7d3..6711e7030f72 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
@@ -16,11 +16,11 @@
 
 package org.springframework.jms.support.destination;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
 
 import org.springframework.jms.support.JmsAccessor;
 import org.springframework.lang.Nullable;
@@ -62,7 +62,7 @@ public abstract class JmsDestinationAccessor extends JmsAccessor {
 
 	/**
 	 * Set the {@link DestinationResolver} that is to be used to resolve
-	 * {@link javax.jms.Destination} references for this accessor.
+	 * {@link jakarta.jms.Destination} references for this accessor.
 	 * <p>The default resolver is a DynamicDestinationResolver. Specify a
 	 * JndiDestinationResolver for resolving destination names as JNDI locations.
 	 * @see org.springframework.jms.support.destination.DynamicDestinationResolver
@@ -85,8 +85,8 @@ public DestinationResolver getDestinationResolver() {
 	 * Default is Point-to-Point (Queues).
 	 * <p>This setting primarily indicates what type of destination to resolve
 	 * if dynamic destinations are enabled.
-	 * @param pubSubDomain "true" for the Publish/Subscribe domain ({@link javax.jms.Topic Topics}),
-	 * "false" for the Point-to-Point domain ({@link javax.jms.Queue Queues})
+	 * @param pubSubDomain "true" for the Publish/Subscribe domain ({@link jakarta.jms.Topic Topics}),
+	 * "false" for the Point-to-Point domain ({@link jakarta.jms.Queue Queues})
 	 * @see #setDestinationResolver
 	 */
 	public void setPubSubDomain(boolean pubSubDomain) {
@@ -94,8 +94,8 @@ public void setPubSubDomain(boolean pubSubDomain) {
 	}
 
 	/**
-	 * Return whether the Publish/Subscribe domain ({@link javax.jms.Topic Topics}) is used.
-	 * Otherwise, the Point-to-Point domain ({@link javax.jms.Queue Queues}) is used.
+	 * Return whether the Publish/Subscribe domain ({@link jakarta.jms.Topic Topics}) is used.
+	 * Otherwise, the Point-to-Point domain ({@link jakarta.jms.Queue Queues}) is used.
 	 */
 	public boolean isPubSubDomain() {
 		return this.pubSubDomain;
@@ -108,7 +108,7 @@ public boolean isPubSubDomain() {
 	 * @param session the current JMS {@link Session}
 	 * @param destinationName the name of the destination
 	 * @return the located {@link Destination}
-	 * @throws javax.jms.JMSException if resolution failed
+	 * @throws jakarta.jms.JMSException if resolution failed
 	 * @see #setDestinationResolver
 	 */
 	protected Destination resolveDestinationName(Session session, String destinationName) throws JMSException {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
index 86e0e7da2ad5..b27d883a0884 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
@@ -19,13 +19,14 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.Topic;
 import javax.naming.NamingException;
 
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+
 import org.springframework.jndi.JndiLocatorSupport;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.xsd
index f454160fa58c..e38673903d83 100644
--- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.xsd
+++ b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.xsd
@@ -151,7 +151,7 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.jms.ConnectionFactory"/>
+							<tool:expected-type type="jakarta.jms.ConnectionFactory"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -178,7 +178,7 @@
 	A reference to the DestinationResolver strategy for resolving destination names.
 	Default is a DynamicDestinationResolver, using the JMS provider's queue/topic
 	name resolution. Alternatively, specify a reference to a JndiDestinationResolver
-	(typically in a Java EE environment).
+	(typically in a Jakarta EE environment).
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
@@ -260,7 +260,7 @@
 	The cache level for JMS resources: "none", "connection", "session", "consumer"
 	or "auto". By default ("auto"), the cache level will effectively be "consumer",
 	unless an external transaction manager has been specified - in which case the
-	effective default will be "none" (assuming Java EE-style transaction management
+	effective default will be "none" (assuming Jakarta EE-style transaction management
 	where the given ConnectionFactory is an XA-aware pool).
 					]]></xsd:documentation>
 				</xsd:annotation>
@@ -411,7 +411,7 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.resource.spi.ResourceAdapter"/>
+							<tool:expected-type type="jakarta.resource.spi.ResourceAdapter"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -435,7 +435,7 @@
 					<xsd:documentation><![CDATA[
 	A reference to the DestinationResolver strategy for resolving destination names.
 	Default is to pass in the destination name Strings into the JCA ActivationSpec as-is.
-	Alternatively, specify a reference to a JndiDestinationResolver (typically in a Java EE
+	Alternatively, specify a reference to a JndiDestinationResolver (typically in a Jakarta EE
 	environment, in particular if the server insists on receiving Destination objects).
 					]]></xsd:documentation>
 					<xsd:appinfo>
@@ -516,7 +516,7 @@
 			<xsd:attribute name="transaction-manager" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	A reference to the Spring JtaTransactionManager or [javax.transaction.TransactionManager],
+	A reference to the Spring JtaTransactionManager or [jakarta.transaction.TransactionManager],
 	for kicking off an XA transaction for each incoming message.
 	If not specified, native acknowledging will be used (see "acknowledge" attribute).
 					]]></xsd:documentation>
diff --git a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
index 41950530e371..f7df15458d5d 100644
--- a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
+++ b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
@@ -16,10 +16,10 @@
 
 package org.springframework.jca;
 
-import javax.resource.ResourceException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.InvalidPropertyException;
-import javax.resource.spi.ResourceAdapter;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.InvalidPropertyException;
+import jakarta.resource.spi.ResourceAdapter;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
index 787f6250a52d..5f751395e1a4 100644
--- a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
+++ b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
@@ -16,14 +16,15 @@
 
 package org.springframework.jca;
 
-import javax.resource.ResourceException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
 import javax.transaction.xa.XAResource;
 
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.BootstrapContext;
+import jakarta.resource.spi.ResourceAdapter;
+import jakarta.resource.spi.ResourceAdapterInternalException;
+import jakarta.resource.spi.endpoint.MessageEndpointFactory;
+
 /**
  * @author Juergen Hoeller
  */
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
index a8df4ed3774e..a85c43aefe9d 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
@@ -16,10 +16,10 @@
 
 package org.springframework.jms;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
 
 /**
  * A stub implementation of the JMS ConnectionFactory for testing.
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
index c529a2c066b5..34e10a51143e 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
@@ -16,10 +16,10 @@
 
 package org.springframework.jms;
 
-import javax.jms.Queue;
+import jakarta.jms.Queue;
 
 /**
- * Stub implementation of the {@link javax.jms.Queue} interface.
+ * Stub implementation of the {@link jakarta.jms.Queue} interface.
  *
  * @author Rick Evans
  */
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java b/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java
index cb4d0ee6f121..3276634761b0 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubTextMessage.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.TextMessage;
 
 /**
  * Stub JMS Message implementation intended for testing purposes only.
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
index 2621b9aea188..c11b925dc49a 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms;
 
-import javax.jms.Topic;
+import jakarta.jms.Topic;
 
 /**
  * Stub implementation of the {@link Topic} interface.
diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
index d0986f527dcd..8ac5af2c9567 100644
--- a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
@@ -18,9 +18,8 @@
 
 import java.lang.reflect.Method;
 
-import javax.jms.JMSException;
-import javax.jms.Session;
-
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.ApplicationContext;
diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/AnnotationDrivenNamespaceTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/AnnotationDrivenNamespaceTests.java
index f2d84d307b27..e4d28bcd3a4a 100644
--- a/spring-jms/src/test/java/org/springframework/jms/annotation/AnnotationDrivenNamespaceTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/annotation/AnnotationDrivenNamespaceTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.jms.annotation;
 
-import javax.jms.JMSException;
-import javax.jms.MessageListener;
-
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageListener;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.ApplicationContext;
diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java
index 1bdc0d20c0e4..1a1d61c5235d 100644
--- a/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java
@@ -19,9 +19,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.jms.JMSException;
-import javax.jms.MessageListener;
-
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageListener;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java
index f1efec4d74a9..b84fb7060c21 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java
@@ -20,12 +20,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
index 865a0edc08fe..c1cba94e1a76 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
@@ -16,11 +16,10 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-import javax.transaction.TransactionManager;
-
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Session;
+import jakarta.transaction.TransactionManager;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.DirectFieldAccessor;
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java
index fa93a7f257c6..0f66f2393a76 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.MessageListener;
-
+import jakarta.jms.MessageListener;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.DirectFieldAccessor;
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
index 43b9a1a6ca58..658ecf62ab41 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
@@ -21,11 +21,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
index 4e74d2dc4090..8e1c3ecd5109 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
@@ -22,14 +22,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.Destination;
-import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.QueueSender;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
+import jakarta.jms.Destination;
+import jakarta.jms.InvalidDestinationException;
+import jakarta.jms.JMSException;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.QueueSender;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
@@ -127,7 +126,7 @@ void setExtraCollaborators() {
 
 	@Test
 	void resolveMessageAndSession() throws JMSException {
-		MessagingMessageListenerAdapter listener = createDefaultInstance(javax.jms.Message.class, Session.class);
+		MessagingMessageListenerAdapter listener = createDefaultInstance(jakarta.jms.Message.class, Session.class);
 
 		Session session = mock(Session.class);
 		listener.onMessage(createSimpleJmsTextMessage("test"), session);
@@ -521,7 +520,7 @@ static class JmsEndpointSampleBean {
 
 		private final Map<String, Boolean> invocations = new HashMap<>();
 
-		public void resolveMessageAndSession(javax.jms.Message message, Session session) {
+		public void resolveMessageAndSession(jakarta.jms.Message message, Session session) {
 			this.invocations.put("resolveMessageAndSession", true);
 			assertThat(message).as("Message not injected").isNotNull();
 			assertThat(session).as("Session not injected").isNotNull();
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/SimpleJmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/SimpleJmsListenerEndpointTests.java
index b8ef640a60c9..0ba4c762cb57 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/SimpleJmsListenerEndpointTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/SimpleJmsListenerEndpointTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.config;
 
-import javax.jms.MessageListener;
-
+import jakarta.jms.MessageListener;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.listener.SimpleMessageListenerContainer;
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
index ae0878a29df6..3b9897df3ff4 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
@@ -16,14 +16,13 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java
index 85a6126dde2e..110ffa2b106e 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/SingleConnectionFactoryTests.java
@@ -16,18 +16,17 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.TopicConnection;
+import jakarta.jms.TopicConnectionFactory;
+import jakarta.jms.TopicSession;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
index 3cef4288d493..99ebfa92ff9c 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
@@ -16,15 +16,15 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionMetaData;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.Topic;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionConsumer;
+import jakarta.jms.ConnectionMetaData;
+import jakarta.jms.Destination;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.ServerSessionPool;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
index 57b77ad160ad..1e95a8c98b46 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
@@ -16,8 +16,8 @@
 
 package org.springframework.jms.connection;
 
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java
index 96148ab15f45..10b633294677 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java
@@ -20,13 +20,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageFormatException;
-import javax.jms.MessageNotWriteableException;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageFormatException;
+import jakarta.jms.MessageNotWriteableException;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -237,7 +236,7 @@ public void convertAndSendNoDefaultSet() throws JMSException {
 	public void convertAndSendCustomJmsMessageConverter() throws JMSException {
 		this.messagingTemplate.setJmsMessageConverter(new SimpleMessageConverter() {
 			@Override
-			public javax.jms.Message toMessage(Object object, Session session)
+			public jakarta.jms.Message toMessage(Object object, Session session)
 					throws JMSException, org.springframework.jms.support.converter.MessageConversionException {
 				throw new org.springframework.jms.support.converter.MessageConversionException("Test exception");
 			}
@@ -275,7 +274,7 @@ public void convertAndSendPayloadAndHeadersName() throws JMSException {
 	@Test
 	public void receive() {
 		Destination destination = new Destination() {};
-		javax.jms.Message jmsMessage = createJmsTextMessage();
+		jakarta.jms.Message jmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
 
 		Message<?> message = this.messagingTemplate.receive(destination);
@@ -285,7 +284,7 @@ public void receive() {
 
 	@Test
 	public void receiveName() {
-		javax.jms.Message jmsMessage = createJmsTextMessage();
+		jakarta.jms.Message jmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
 
 		Message<?> message = this.messagingTemplate.receive("myQueue");
@@ -297,7 +296,7 @@ public void receiveName() {
 	public void receiveDefaultDestination() {
 		Destination destination = new Destination() {};
 		this.messagingTemplate.setDefaultDestination(destination);
-		javax.jms.Message jmsMessage = createJmsTextMessage();
+		jakarta.jms.Message jmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
 
 		Message<?> message = this.messagingTemplate.receive();
@@ -308,7 +307,7 @@ public void receiveDefaultDestination() {
 	@Test
 	public void receiveDefaultDestinationName() {
 		this.messagingTemplate.setDefaultDestinationName("myQueue");
-		javax.jms.Message jmsMessage = createJmsTextMessage();
+		jakarta.jms.Message jmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
 
 		Message<?> message = this.messagingTemplate.receive();
@@ -325,7 +324,7 @@ public void receiveNoDefaultSet() {
 	@Test
 	public void receiveAndConvert() {
 		Destination destination = new Destination() {};
-		javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
+		jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
 		given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
 
 		String payload = this.messagingTemplate.receiveAndConvert(destination, String.class);
@@ -335,7 +334,7 @@ public void receiveAndConvert() {
 
 	@Test
 	public void receiveAndConvertName() {
-		javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
+		jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
 		given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
 
 		String payload = this.messagingTemplate.receiveAndConvert("myQueue", String.class);
@@ -347,7 +346,7 @@ public void receiveAndConvertName() {
 	public void receiveAndConvertDefaultDestination() {
 		Destination destination = new Destination() {};
 		this.messagingTemplate.setDefaultDestination(destination);
-		javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
+		jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
 		given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
 
 		String payload = this.messagingTemplate.receiveAndConvert(String.class);
@@ -358,7 +357,7 @@ public void receiveAndConvertDefaultDestination() {
 	@Test
 	public void receiveAndConvertDefaultDestinationName() {
 		this.messagingTemplate.setDefaultDestinationName("myQueue");
-		javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
+		jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
 		given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
 
 		String payload = this.messagingTemplate.receiveAndConvert(String.class);
@@ -368,7 +367,7 @@ public void receiveAndConvertDefaultDestinationName() {
 
 	@Test
 	public void receiveAndConvertWithConversion() {
-		javax.jms.Message jmsMessage = createJmsTextMessage("123");
+		jakarta.jms.Message jmsMessage = createJmsTextMessage("123");
 		given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
 
 		this.messagingTemplate.setMessageConverter(new GenericMessageConverter());
@@ -380,7 +379,7 @@ public void receiveAndConvertWithConversion() {
 
 	@Test
 	public void receiveAndConvertNoConverter() {
-		javax.jms.Message jmsMessage = createJmsTextMessage("Hello");
+		jakarta.jms.Message jmsMessage = createJmsTextMessage("Hello");
 		given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
 
 		assertThatExceptionOfType(org.springframework.messaging.converter.MessageConversionException.class).isThrownBy(() ->
@@ -398,7 +397,7 @@ public void receiveAndConvertNoInput() {
 	public void sendAndReceive() {
 		Destination destination = new Destination() {};
 		Message<String> request = createTextMessage();
-		javax.jms.Message replyJmsMessage = createJmsTextMessage();
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
 
 		Message<?> actual = this.messagingTemplate.sendAndReceive(destination, request);
@@ -409,7 +408,7 @@ public void sendAndReceive() {
 	@Test
 	public void sendAndReceiveName() {
 		Message<String> request = createTextMessage();
-		javax.jms.Message replyJmsMessage = createJmsTextMessage();
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
 
 		Message<?> actual = this.messagingTemplate.sendAndReceive("myQueue", request);
@@ -422,7 +421,7 @@ public void sendAndReceiveDefaultDestination() {
 		Destination destination = new Destination() {};
 		this.messagingTemplate.setDefaultDestination(destination);
 		Message<String> request = createTextMessage();
-		javax.jms.Message replyJmsMessage = createJmsTextMessage();
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
 
 		Message<?> actual = this.messagingTemplate.sendAndReceive(request);
@@ -434,7 +433,7 @@ public void sendAndReceiveDefaultDestination() {
 	public void sendAndReceiveDefaultDestinationName() {
 		this.messagingTemplate.setDefaultDestinationName("myQueue");
 		Message<String> request = createTextMessage();
-		javax.jms.Message replyJmsMessage = createJmsTextMessage();
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
 		given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
 
 		Message<?> actual = this.messagingTemplate.sendAndReceive(request);
@@ -453,7 +452,7 @@ public void sendAndReceiveNoDefaultSet() {
 	@Test
 	public void convertSendAndReceivePayload() throws JMSException {
 		Destination destination = new Destination() {};
-		javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
 		given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
 
 		String reply = this.messagingTemplate.convertSendAndReceive(destination, "my Payload", String.class);
@@ -463,7 +462,7 @@ public void convertSendAndReceivePayload() throws JMSException {
 
 	@Test
 	public void convertSendAndReceivePayloadName() throws JMSException {
-		javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
 		given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
 
 		String reply = this.messagingTemplate.convertSendAndReceive("myQueue", "my Payload", String.class);
@@ -475,7 +474,7 @@ public void convertSendAndReceivePayloadName() throws JMSException {
 	public void convertSendAndReceiveDefaultDestination() throws JMSException {
 		Destination destination = new Destination() {};
 		this.messagingTemplate.setDefaultDestination(destination);
-		javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
 		given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
 
 		String reply = this.messagingTemplate.convertSendAndReceive("my Payload", String.class);
@@ -486,7 +485,7 @@ public void convertSendAndReceiveDefaultDestination() throws JMSException {
 	@Test
 	public void convertSendAndReceiveDefaultDestinationName() throws JMSException {
 		this.messagingTemplate.setDefaultDestinationName("myQueue");
-		javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
+		jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
 		given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
 
 		String reply = this.messagingTemplate.convertSendAndReceive("my Payload", String.class);
@@ -515,7 +514,7 @@ public void convertMessageConversionExceptionOnSend() throws JMSException {
 
 	@Test
 	public void convertMessageConversionExceptionOnReceive() throws JMSException {
-		javax.jms.Message message = createJmsTextMessage();
+		jakarta.jms.Message message = createJmsTextMessage();
 		MessageConverter messageConverter = mock(MessageConverter.class);
 		willThrow(org.springframework.jms.support.converter.MessageConversionException.class)
 				.given(messageConverter).fromMessage(message);
@@ -611,7 +610,7 @@ private Message<String> createTextMessage() {
 		return createTextMessage("Hello");
 	}
 
-	private javax.jms.Message createJmsTextMessage(String payload) {
+	private jakarta.jms.Message createJmsTextMessage(String payload) {
 		try {
 			StubTextMessage jmsMessage = new StubTextMessage(payload);
 			jmsMessage.setStringProperty("foo", "bar");
@@ -622,7 +621,7 @@ private javax.jms.Message createJmsTextMessage(String payload) {
 		}
 	}
 
-	private javax.jms.Message createJmsTextMessage() {
+	private jakarta.jms.Message createJmsTextMessage() {
 		return createJmsTextMessage("Hello");
 	}
 
@@ -650,7 +649,7 @@ protected TextMessage createTextMessage(MessageCreator creator) throws JMSExcept
 		given(mock.createTextMessage(any())).willAnswer(
 				(Answer<TextMessage>) invocation ->
 						new StubTextMessage((String) invocation.getArguments()[0]));
-		javax.jms.Message message = creator.createMessage(mock);
+		jakarta.jms.Message message = creator.createMessage(mock);
 		verify(mock).createTextMessage(any());
 		return (TextMessage) message;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
index 0690e7d349d8..9f82be855f91 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
@@ -20,20 +20,20 @@
 import java.io.StringWriter;
 import java.util.List;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
-import javax.jms.TextMessage;
 import javax.naming.Context;
 
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.TemporaryQueue;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -721,67 +721,67 @@ else if (explicitDestination) {
 
 	@Test
 	void testIllegalStateException() throws Exception {
-		doTestJmsException(new javax.jms.IllegalStateException(""), org.springframework.jms.IllegalStateException.class);
+		doTestJmsException(new jakarta.jms.IllegalStateException(""), org.springframework.jms.IllegalStateException.class);
 	}
 
 	@Test
 	void testInvalidClientIDException() throws Exception {
-		doTestJmsException(new javax.jms.InvalidClientIDException(""), InvalidClientIDException.class);
+		doTestJmsException(new jakarta.jms.InvalidClientIDException(""), InvalidClientIDException.class);
 	}
 
 	@Test
 	void testInvalidDestinationException() throws Exception {
-		doTestJmsException(new javax.jms.InvalidDestinationException(""), InvalidDestinationException.class);
+		doTestJmsException(new jakarta.jms.InvalidDestinationException(""), InvalidDestinationException.class);
 	}
 
 	@Test
 	void testInvalidSelectorException() throws Exception {
-		doTestJmsException(new javax.jms.InvalidSelectorException(""), InvalidSelectorException.class);
+		doTestJmsException(new jakarta.jms.InvalidSelectorException(""), InvalidSelectorException.class);
 	}
 
 	@Test
 	void testJmsSecurityException() throws Exception {
-		doTestJmsException(new javax.jms.JMSSecurityException(""), JmsSecurityException.class);
+		doTestJmsException(new jakarta.jms.JMSSecurityException(""), JmsSecurityException.class);
 	}
 
 	@Test
 	void testMessageEOFException() throws Exception {
-		doTestJmsException(new javax.jms.MessageEOFException(""), MessageEOFException.class);
+		doTestJmsException(new jakarta.jms.MessageEOFException(""), MessageEOFException.class);
 	}
 
 	@Test
 	void testMessageFormatException() throws Exception {
-		doTestJmsException(new javax.jms.MessageFormatException(""), MessageFormatException.class);
+		doTestJmsException(new jakarta.jms.MessageFormatException(""), MessageFormatException.class);
 	}
 
 	@Test
 	void testMessageNotReadableException() throws Exception {
-		doTestJmsException(new javax.jms.MessageNotReadableException(""), MessageNotReadableException.class);
+		doTestJmsException(new jakarta.jms.MessageNotReadableException(""), MessageNotReadableException.class);
 	}
 
 	@Test
 	void testMessageNotWriteableException() throws Exception {
-		doTestJmsException(new javax.jms.MessageNotWriteableException(""), MessageNotWriteableException.class);
+		doTestJmsException(new jakarta.jms.MessageNotWriteableException(""), MessageNotWriteableException.class);
 	}
 
 	@Test
 	void testResourceAllocationException() throws Exception {
-		doTestJmsException(new javax.jms.ResourceAllocationException(""), ResourceAllocationException.class);
+		doTestJmsException(new jakarta.jms.ResourceAllocationException(""), ResourceAllocationException.class);
 	}
 
 	@Test
 	void testTransactionInProgressException() throws Exception {
-		doTestJmsException(new javax.jms.TransactionInProgressException(""), TransactionInProgressException.class);
+		doTestJmsException(new jakarta.jms.TransactionInProgressException(""), TransactionInProgressException.class);
 	}
 
 	@Test
 	void testTransactionRolledBackException() throws Exception {
-		doTestJmsException(new javax.jms.TransactionRolledBackException(""), TransactionRolledBackException.class);
+		doTestJmsException(new jakarta.jms.TransactionRolledBackException(""), TransactionRolledBackException.class);
 	}
 
 	@Test
 	void testUncategorizedJmsException() throws Exception {
-		doTestJmsException(new javax.jms.JMSException(""), UncategorizedJmsException.class);
+		doTestJmsException(new jakarta.jms.JMSException(""), UncategorizedJmsException.class);
 	}
 
 	protected void doTestJmsException(JMSException original, Class<? extends JmsException> thrownExceptionClass) throws Exception {
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
index db51d87d1322..e23fe83228f8 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.core;
 
-import javax.jms.Session;
-
+import jakarta.jms.Session;
 import org.junit.jupiter.api.BeforeEach;
 
 import static org.mockito.BDDMockito.given;
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index b4b7d3ab4452..ead313c5396d 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
@@ -18,8 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jms.ConnectionFactory;
-
+import jakarta.jms.ConnectionFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.core.JmsTemplate;
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
index 4a83e858a337..66d638143f0f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
@@ -19,11 +19,10 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
 import org.junit.jupiter.api.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerIntegrationTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerIntegrationTests.java
deleted file mode 100644
index 306c88394f43..000000000000
--- a/spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerIntegrationTests.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2002-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.jms.listener;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.jms.core.JmsTemplate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Juergen Hoeller
- * @since 5.3.5
- */
-public class MessageListenerContainerIntegrationTests {
-
-	@Test
-	public void simpleMessageListenerContainer() throws InterruptedException {
-		SimpleMessageListenerContainer mlc = new SimpleMessageListenerContainer();
-
-		testMessageListenerContainer(mlc);
-	}
-
-	@Test
-	public void defaultMessageListenerContainer() throws InterruptedException {
-		DefaultMessageListenerContainer mlc = new DefaultMessageListenerContainer();
-
-		testMessageListenerContainer(mlc);
-	}
-
-	@Test
-	public void defaultMessageListenerContainerWithMaxMessagesPerTask() throws InterruptedException {
-		DefaultMessageListenerContainer mlc = new DefaultMessageListenerContainer();
-		mlc.setConcurrentConsumers(1);
-		mlc.setMaxConcurrentConsumers(2);
-		mlc.setMaxMessagesPerTask(1);
-
-		testMessageListenerContainer(mlc);
-	}
-
-	@Test
-	public void defaultMessageListenerContainerWithIdleReceivesPerTaskLimit() throws InterruptedException {
-		DefaultMessageListenerContainer mlc = new DefaultMessageListenerContainer();
-		mlc.setConcurrentConsumers(1);
-		mlc.setMaxConcurrentConsumers(2);
-		mlc.setIdleReceivesPerTaskLimit(1);
-
-		testMessageListenerContainer(mlc);
-	}
-
-	private void testMessageListenerContainer(AbstractMessageListenerContainer mlc) throws InterruptedException {
-		ActiveMQConnectionFactory aqcf = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
-		TestMessageListener tml = new TestMessageListener();
-
-		mlc.setConnectionFactory(aqcf);
-		mlc.setMessageListener(tml);
-		mlc.setDestinationName("test");
-		mlc.afterPropertiesSet();
-		mlc.start();
-
-		JmsTemplate jt = new JmsTemplate(aqcf);
-		jt.setDefaultDestinationName("test");
-
-		Set<String> messages = new HashSet<>();
-		messages.add("text1");
-		messages.add("text2");
-		for (String message : messages) {
-			jt.convertAndSend(message);
-		}
-		assertThat(tml.result()).isEqualTo(messages);
-
-		mlc.destroy();
-	}
-
-
-	private static class TestMessageListener implements SessionAwareMessageListener<TextMessage> {
-
-		private final CountDownLatch latch = new CountDownLatch(2);
-
-		private final Set<String> messages = new CopyOnWriteArraySet<>();
-
-		@Override
-		public void onMessage(TextMessage message, Session session) throws JMSException {
-			this.messages.add(message.getText());
-			this.latch.countDown();
-		}
-
-		public Set<String> result() throws InterruptedException {
-			assertThat(this.latch.await(5, TimeUnit.SECONDS)).isTrue();
-			return this.messages;
-		}
-	}
-
-}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
index 76bd754e2cc5..7b001de2ab2a 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
@@ -19,15 +19,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Session;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.GenericApplicationContext;
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java
index b373b061a9b3..c32fc0dd14ee 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/JmsResponseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@
 
 package org.springframework.jms.listener.adapter;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
-
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.support.destination.DestinationResolver;
@@ -54,7 +53,7 @@ public void resolveDestinationForQueue() throws JMSException {
 	}
 
 	@Test
-	public void createWithNulResponse() {
+	public void createWithNullResponse() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				JmsResponse.forQueue(null, "myQueue"));
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java
index 7138f269868b..3c8f4de9cec5 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageDelegate.java
@@ -16,10 +16,10 @@
 
 package org.springframework.jms.listener.adapter;
 
-import javax.jms.BytesMessage;
-import javax.jms.MapMessage;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.MapMessage;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.TextMessage;
 
 /**
  * See the MessageListenerAdapterTests class for usage.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
index ceeab1c3b36a..751ca9c27a26 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
@@ -19,18 +19,17 @@
 import java.io.ByteArrayInputStream;
 import java.io.Serializable;
 
-import javax.jms.BytesMessage;
-import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
+import jakarta.jms.BytesMessage;
+import jakarta.jms.InvalidDestinationException;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java
index 4a984a256e37..03f44a70f30e 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java
@@ -20,16 +20,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-
 import com.fasterxml.jackson.annotation.JsonView;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
+import jakarta.jms.Topic;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -85,7 +84,7 @@ public void buildMessageWithStandardMessage() throws JMSException {
 		Session session = mock(Session.class);
 		given(session.createTextMessage("Response")).willReturn(new StubTextMessage("Response"));
 		MessagingMessageListenerAdapter listener = getSimpleInstance("echo", Message.class);
-		javax.jms.Message replyMessage = listener.buildMessage(session, result);
+		jakarta.jms.Message replyMessage = listener.buildMessage(session, result);
 
 		verify(session).createTextMessage("Response");
 		assertThat(replyMessage).as("reply should never be null").isNotNull();
@@ -97,7 +96,7 @@ public void buildMessageWithStandardMessage() throws JMSException {
 
 	@Test
 	public void exceptionInListener() {
-		javax.jms.Message message = new StubTextMessage("foo");
+		jakarta.jms.Message message = new StubTextMessage("foo");
 		Session session = mock(Session.class);
 		MessagingMessageListenerAdapter listener = getSimpleInstance("fail", String.class);
 		assertThatExceptionOfType(ListenerExecutionFailedException.class)
@@ -109,7 +108,7 @@ public void exceptionInListener() {
 
 	@Test
 	public void exceptionInInvocation() {
-		javax.jms.Message message = new StubTextMessage("foo");
+		jakarta.jms.Message message = new StubTextMessage("foo");
 		Session session = mock(Session.class);
 		MessagingMessageListenerAdapter listener = getSimpleInstance("wrongParam", Integer.class);
 
@@ -120,7 +119,7 @@ public void exceptionInInvocation() {
 
 	@Test
 	public void payloadConversionLazilyInvoked() throws JMSException {
-		javax.jms.Message jmsMessage = mock(javax.jms.Message.class);
+		jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class);
 		MessageConverter messageConverter = mock(MessageConverter.class);
 		given(messageConverter.fromMessage(jmsMessage)).willReturn("FooBar");
 		MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class);
@@ -133,7 +132,7 @@ public void payloadConversionLazilyInvoked() throws JMSException {
 
 	@Test
 	public void headerConversionLazilyInvoked() throws JMSException {
-		javax.jms.Message jmsMessage = mock(javax.jms.Message.class);
+		jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class);
 		given(jmsMessage.getPropertyNames()).willThrow(new IllegalArgumentException("Header failure"));
 		MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class);
 		Message<?> message = listener.toMessagingMessage(jmsMessage);
@@ -146,7 +145,7 @@ public void headerConversionLazilyInvoked() throws JMSException {
 
 	@Test
 	public void incomingMessageUsesMessageConverter() throws JMSException {
-		javax.jms.Message jmsMessage = mock(javax.jms.Message.class);
+		jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class);
 		Session session = mock(Session.class);
 		MessageConverter messageConverter = mock(MessageConverter.class);
 		given(messageConverter.fromMessage(jmsMessage)).willReturn("FooBar");
@@ -167,7 +166,7 @@ public void replyUsesMessageConverterForPayload() throws JMSException {
 		Message<String> result = MessageBuilder.withPayload("Response").build();
 		MessagingMessageListenerAdapter listener = getSimpleInstance("echo", Message.class);
 		listener.setMessageConverter(messageConverter);
-		javax.jms.Message replyMessage = listener.buildMessage(session, result);
+		jakarta.jms.Message replyMessage = listener.buildMessage(session, result);
 
 		verify(messageConverter, times(1)).toMessage("Response", session);
 		assertThat(replyMessage).as("reply should never be null").isNotNull();
@@ -186,7 +185,7 @@ public void replyPayloadToQueue() throws JMSException {
 		given(session.createProducer(replyDestination)).willReturn(messageProducer);
 
 		MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToQueue", Message.class);
-		listener.onMessage(mock(javax.jms.Message.class), session);
+		listener.onMessage(mock(jakarta.jms.Message.class), session);
 
 		verify(session).createQueue("queueOut");
 		verify(session).createTextMessage("Response");
@@ -209,11 +208,11 @@ public void replyWithCustomTimeToLive() throws JMSException {
 		QosSettings settings = new QosSettings();
 		settings.setTimeToLive(6000);
 		listener.setResponseQosSettings(settings);
-		listener.onMessage(mock(javax.jms.Message.class), session);
+		listener.onMessage(mock(jakarta.jms.Message.class), session);
 		verify(session).createQueue("queueOut");
 		verify(session).createTextMessage("Response");
-		verify(messageProducer).send(responseMessage, javax.jms.Message.DEFAULT_DELIVERY_MODE,
-				javax.jms.Message.DEFAULT_PRIORITY, 6000);
+		verify(messageProducer).send(responseMessage, jakarta.jms.Message.DEFAULT_DELIVERY_MODE,
+				jakarta.jms.Message.DEFAULT_PRIORITY, 6000);
 		verify(messageProducer).close();
 	}
 
@@ -231,7 +230,7 @@ public void replyWithFullQoS() throws JMSException {
 		MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToQueue", Message.class);
 		QosSettings settings = new QosSettings(DeliveryMode.NON_PERSISTENT, 6, 6000);
 		listener.setResponseQosSettings(settings);
-		listener.onMessage(mock(javax.jms.Message.class), session);
+		listener.onMessage(mock(jakarta.jms.Message.class), session);
 		verify(session).createQueue("queueOut");
 		verify(session).createTextMessage("Response");
 		verify(messageProducer).send(responseMessage, DeliveryMode.NON_PERSISTENT, 6, 6000);
@@ -250,7 +249,7 @@ public void replyPayloadToTopic() throws JMSException {
 		given(session.createProducer(replyDestination)).willReturn(messageProducer);
 
 		MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToTopic", Message.class);
-		listener.onMessage(mock(javax.jms.Message.class), session);
+		listener.onMessage(mock(jakarta.jms.Message.class), session);
 
 		verify(session).createTopic("topicOut");
 		verify(session).createTextMessage("Response");
@@ -267,7 +266,7 @@ public void replyPayloadToDestination() throws JMSException {
 		given(session.createProducer(sharedReplyDestination)).willReturn(messageProducer);
 
 		MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToDestination", Message.class);
-		listener.onMessage(mock(javax.jms.Message.class), session);
+		listener.onMessage(mock(jakarta.jms.Message.class), session);
 
 		verify(session, times(0)).createQueue(anyString());
 		verify(session).createTextMessage("Response");
@@ -288,7 +287,7 @@ public void replyPayloadNoDestination() throws JMSException {
 		MessagingMessageListenerAdapter listener =
 				getPayloadInstance("Response", "replyPayloadNoDestination", Message.class);
 		listener.setDefaultResponseDestination(replyDestination);
-		listener.onMessage(mock(javax.jms.Message.class), session);
+		listener.onMessage(mock(jakarta.jms.Message.class), session);
 
 		verify(session, times(0)).createQueue(anyString());
 		verify(session).createTextMessage("Response");
@@ -331,7 +330,7 @@ public TextMessage testReplyWithJackson(String methodName, String replyContent)
 		messageConverter.setTargetType(MessageType.TEXT);
 		listener.setMessageConverter(messageConverter);
 		listener.setDefaultResponseDestination(replyDestination);
-		listener.onMessage(mock(javax.jms.Message.class), session);
+		listener.onMessage(mock(jakarta.jms.Message.class), session);
 
 		verify(session, times(0)).createQueue(anyString());
 		verify(session).createTextMessage(replyContent);
@@ -358,7 +357,7 @@ protected MessagingMessageListenerAdapter getPayloadInstance(final Object payloa
 		Method method = ReflectionUtils.findMethod(SampleBean.class, methodName, parameterTypes);
 		MessagingMessageListenerAdapter adapter = new MessagingMessageListenerAdapter() {
 			@Override
-			protected Object extractMessage(javax.jms.Message message) {
+			protected Object extractMessage(jakarta.jms.Message message) {
 				return payload;
 			}
 		};
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
index 1ad045348404..0fcecaed3d95 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.listener.adapter;
 
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 /**
  * See the MessageListenerAdapterTests class for usage.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java
index c162dc098147..fe4b6970c93f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveMessageDelegate.java
@@ -19,10 +19,10 @@
 import java.io.Serializable;
 import java.util.Map;
 
-import javax.jms.BytesMessage;
-import javax.jms.MapMessage;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.MapMessage;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.TextMessage;
 
 /**
  * See the MessageListenerAdapterTests class for usage.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
index 32e9400b7c11..0540c97ea30d 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.jms.Destination;
-import javax.jms.Session;
-
+import jakarta.jms.Destination;
+import jakarta.jms.Session;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jca.StubResourceAdapter;
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java
index c9d16c4e04bb..b648e7f8daa9 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpec.java
@@ -16,7 +16,7 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.springframework.jca.StubActivationSpec;
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
index 17e4aafd554e..735070cc5db4 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
@@ -16,8 +16,8 @@
 
 package org.springframework.jms.listener.endpoint;
 
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.ResourceAdapter;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.ResourceAdapter;
 
 import org.springframework.jca.StubActivationSpec;
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java
index bb1710043e58..1e2f4b667637 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/JmsAccessorTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.support;
 
-import javax.jms.Session;
-
+import jakarta.jms.Session;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java
index 2255f34ea5d7..939cb6aa29b8 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java
@@ -18,9 +18,8 @@
 
 import java.util.Map;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.StubTextMessage;
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleJmsHeaderMapperTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleJmsHeaderMapperTests.java
index 8839696b4d38..331fdaa0a568 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleJmsHeaderMapperTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleJmsHeaderMapperTests.java
@@ -19,10 +19,9 @@
 import java.util.Date;
 import java.util.Map;
 
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.StubTextMessage;
@@ -51,7 +50,7 @@ public void jmsReplyToMappedFromHeader() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader(JmsHeaders.REPLY_TO, replyTo).build();
 
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSReplyTo()).isNotNull();
 		assertThat(jmsMessage.getJMSReplyTo()).isSameAs(replyTo);
@@ -61,7 +60,7 @@ public void jmsReplyToMappedFromHeader() throws JMSException {
 	public void JmsReplyToIgnoredIfIncorrectType() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader(JmsHeaders.REPLY_TO, "not-a-destination").build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSReplyTo()).isNull();
 	}
@@ -71,7 +70,7 @@ public void jmsCorrelationIdMappedFromHeader() throws JMSException {
 		String jmsCorrelationId = "ABC-123";
 		Message<String> message = initBuilder()
 				.setHeader(JmsHeaders.CORRELATION_ID, jmsCorrelationId).build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSCorrelationID()).isNotNull();
 		assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo(jmsCorrelationId);
@@ -81,7 +80,7 @@ public void jmsCorrelationIdMappedFromHeader() throws JMSException {
 	public void jmsCorrelationIdNumberConvertsToString() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader(JmsHeaders.CORRELATION_ID, 123).build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo("123");
 	}
@@ -90,7 +89,7 @@ public void jmsCorrelationIdNumberConvertsToString() throws JMSException {
 	public void jmsCorrelationIdIgnoredIfIncorrectType() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader(JmsHeaders.CORRELATION_ID, new Date()).build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSCorrelationID()).isNull();
 	}
@@ -100,7 +99,7 @@ public void jmsTypeMappedFromHeader() throws JMSException {
 		String jmsType = "testing";
 		Message<String> message = initBuilder()
 				.setHeader(JmsHeaders.TYPE, jmsType).build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSType()).isNotNull();
 		assertThat(jmsMessage.getJMSType()).isEqualTo(jmsType);
@@ -110,7 +109,7 @@ public void jmsTypeMappedFromHeader() throws JMSException {
 	public void jmsTypeIgnoredIfIncorrectType() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader(JmsHeaders.TYPE, 123).build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSType()).isNull();
 	}
@@ -126,13 +125,13 @@ public void jmsReadOnlyPropertiesNotMapped() throws JMSException {
 				.setHeader(JmsHeaders.REDELIVERED, true)
 				.setHeader(JmsHeaders.TIMESTAMP, System.currentTimeMillis())
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		assertThat(jmsMessage.getJMSDestination()).isNull();
 		assertThat(jmsMessage.getJMSDeliveryMode()).isEqualTo(DeliveryMode.PERSISTENT);
 		assertThat(jmsMessage.getJMSExpiration()).isEqualTo(0);
 		assertThat(jmsMessage.getJMSMessageID()).isNull();
-		assertThat(jmsMessage.getJMSPriority()).isEqualTo(javax.jms.Message.DEFAULT_PRIORITY);
+		assertThat(jmsMessage.getJMSPriority()).isEqualTo(jakarta.jms.Message.DEFAULT_PRIORITY);
 		assertThat(jmsMessage.getJMSRedelivered()).isFalse();
 		assertThat(jmsMessage.getJMSTimestamp()).isEqualTo(0);
 	}
@@ -142,7 +141,7 @@ public void contentTypePropertyMappedFromHeader() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader(MessageHeaders.CONTENT_TYPE, "foo")
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty(JmsHeaderMapper.CONTENT_TYPE_PROPERTY);
 		assertThat(value).isNotNull();
@@ -154,7 +153,7 @@ public void userDefinedPropertyMappedFromHeader() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader("foo", 123)
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty("foo");
 		assertThat(value).isNotNull();
@@ -168,7 +167,7 @@ public void userDefinedPropertyMappedFromHeaderWithCustomPrefix() throws JMSExce
 				.setHeader("foo", 123)
 				.build();
 		mapper.setOutboundPrefix("custom_");
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty("custom_foo");
 		assertThat(value).isNotNull();
@@ -182,7 +181,7 @@ public void userDefinedPropertyWithUnsupportedType() throws JMSException {
 		Message<String> message = initBuilder()
 				.setHeader("destination", destination)
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		mapper.fromHeaders(message.getHeaders(), jmsMessage);
 		Object value = jmsMessage.getObjectProperty("destination");
 		assertThat(value).isNull();
@@ -190,7 +189,7 @@ public void userDefinedPropertyWithUnsupportedType() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedCorrelationIdPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public String getJMSCorrelationID() throws JMSException {
 				throw new JMSException("illegal property");
@@ -201,7 +200,7 @@ public String getJMSCorrelationID() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedDestinationPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public Destination getJMSDestination() throws JMSException {
 				throw new JMSException("illegal property");
@@ -212,7 +211,7 @@ public Destination getJMSDestination() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedDeliveryModePropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public int getJMSDeliveryMode() throws JMSException {
 				throw new JMSException("illegal property");
@@ -223,7 +222,7 @@ public int getJMSDeliveryMode() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedExpirationPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public long getJMSExpiration() throws JMSException {
 				throw new JMSException("illegal property");
@@ -234,7 +233,7 @@ public long getJMSExpiration() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedMessageIdPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public String getJMSMessageID() throws JMSException {
 				throw new JMSException("illegal property");
@@ -245,7 +244,7 @@ public String getJMSMessageID() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedPriorityPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public int getJMSPriority() throws JMSException {
 				throw new JMSException("illegal property");
@@ -256,7 +255,7 @@ public int getJMSPriority() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedReplyToPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public Destination getJMSReplyTo() throws JMSException {
 				throw new JMSException("illegal property");
@@ -267,7 +266,7 @@ public Destination getJMSReplyTo() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedRedeliveredPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public boolean getJMSRedelivered() throws JMSException {
 				throw new JMSException("illegal property");
@@ -278,7 +277,7 @@ public boolean getJMSRedelivered() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedTypePropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public String getJMSType() throws JMSException {
 				throw new JMSException("illegal property");
@@ -289,7 +288,7 @@ public String getJMSType() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedTimestampPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public long getJMSTimestamp() throws JMSException {
 				throw new JMSException("illegal property");
@@ -300,7 +299,7 @@ public long getJMSTimestamp() throws JMSException {
 
 	@Test
 	public void attemptToReadDisallowedUserPropertyIsNotFatal() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public Object getObjectProperty(String name) throws JMSException {
 				if (name.equals("fail")) {
@@ -321,7 +320,7 @@ public Object getObjectProperty(String name) throws JMSException {
 	@Test
 	public void jmsCorrelationIdMappedToHeader() throws JMSException {
 		String correlationId = "ABC-123";
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSCorrelationID(correlationId);
 		assertInboundHeader(jmsMessage, JmsHeaders.CORRELATION_ID, correlationId);
 	}
@@ -329,7 +328,7 @@ public void jmsCorrelationIdMappedToHeader() throws JMSException {
 	@Test
 	public void destinationMappedToHeader() throws JMSException {
 		Destination destination = new Destination() {};
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSDestination(destination);
 		assertInboundHeader(jmsMessage, JmsHeaders.DESTINATION, destination);
 	}
@@ -337,7 +336,7 @@ public void destinationMappedToHeader() throws JMSException {
 	@Test
 	public void jmsDeliveryModeMappedToHeader() throws JMSException {
 		int deliveryMode = 1;
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSDeliveryMode(deliveryMode);
 		assertInboundHeader(jmsMessage, JmsHeaders.DELIVERY_MODE, deliveryMode);
 	}
@@ -345,7 +344,7 @@ public void jmsDeliveryModeMappedToHeader() throws JMSException {
 	@Test
 	public void jmsExpirationMappedToHeader() throws JMSException {
 		long expiration = 1000L;
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSExpiration(expiration);
 		assertInboundHeader(jmsMessage, JmsHeaders.EXPIRATION, expiration);
 	}
@@ -353,7 +352,7 @@ public void jmsExpirationMappedToHeader() throws JMSException {
 	@Test
 	public void jmsMessageIdMappedToHeader() throws JMSException {
 		String messageId = "ID:ABC-123";
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSMessageID(messageId);
 		assertInboundHeader(jmsMessage, JmsHeaders.MESSAGE_ID, messageId);
 	}
@@ -361,7 +360,7 @@ public void jmsMessageIdMappedToHeader() throws JMSException {
 	@Test
 	public void jmsPriorityMappedToHeader() throws JMSException {
 		int priority = 8;
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSPriority(priority);
 		assertInboundHeader(jmsMessage, JmsHeaders.PRIORITY, priority);
 	}
@@ -369,7 +368,7 @@ public void jmsPriorityMappedToHeader() throws JMSException {
 	@Test
 	public void jmsReplyToMappedToHeader() throws JMSException {
 		Destination replyTo = new Destination() {};
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSReplyTo(replyTo);
 		assertInboundHeader(jmsMessage, JmsHeaders.REPLY_TO, replyTo);
 	}
@@ -377,7 +376,7 @@ public void jmsReplyToMappedToHeader() throws JMSException {
 	@Test
 	public void jmsTypeMappedToHeader() throws JMSException {
 		String type = "testing";
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSType(type);
 		assertInboundHeader(jmsMessage, JmsHeaders.TYPE, type);
 	}
@@ -385,28 +384,28 @@ public void jmsTypeMappedToHeader() throws JMSException {
 	@Test
 	public void jmsTimestampMappedToHeader() throws JMSException {
 		long timestamp = 123L;
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setJMSTimestamp(timestamp);
 		assertInboundHeader(jmsMessage, JmsHeaders.TIMESTAMP, timestamp);
 	}
 
 	@Test
 	public void contentTypePropertyMappedToHeader() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setStringProperty("content_type", "foo");
 		assertInboundHeader(jmsMessage, MessageHeaders.CONTENT_TYPE, "foo");
 	}
 
 	@Test
 	public void userDefinedPropertyMappedToHeader() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setIntProperty("foo", 123);
 		assertInboundHeader(jmsMessage, "foo", 123);
 	}
 
 	@Test
 	public void userDefinedPropertyMappedToHeaderWithCustomPrefix() throws JMSException {
-		javax.jms.Message jmsMessage = new StubTextMessage();
+		jakarta.jms.Message jmsMessage = new StubTextMessage();
 		jmsMessage.setIntProperty("foo", 123);
 		mapper.setInboundPrefix("custom_");
 		assertInboundHeader(jmsMessage, "custom_foo", 123);
@@ -419,7 +418,7 @@ public void propertyMappingExceptionIsNotFatal() throws JMSException {
 				.setHeader("bad", 456)
 				.setHeader("bar", 789)
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public void setObjectProperty(String name, Object value) throws JMSException {
 				if (name.equals("bad")) {
@@ -444,7 +443,7 @@ public void illegalArgumentExceptionIsNotFatal() throws JMSException {
 				.setHeader("bad", 456)
 				.setHeader("bar", 789)
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public void setObjectProperty(String name, Object value) throws JMSException {
 				if (name.equals("bad")) {
@@ -468,7 +467,7 @@ public void attemptToWriteDisallowedReplyToPropertyIsNotFatal() throws JMSExcept
 				.setHeader(JmsHeaders.REPLY_TO, new Destination() {})
 				.setHeader("foo", "bar")
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public void setJMSReplyTo(Destination replyTo) throws JMSException {
 				throw new JMSException("illegal property");
@@ -486,7 +485,7 @@ public void attemptToWriteDisallowedTypePropertyIsNotFatal() throws JMSException
 				.setHeader(JmsHeaders.TYPE, "someType")
 				.setHeader("foo", "bar")
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public void setJMSType(String type) throws JMSException {
 				throw new JMSException("illegal property");
@@ -504,7 +503,7 @@ public void attemptToWriteDisallowedCorrelationIdStringPropertyIsNotFatal() thro
 				.setHeader(JmsHeaders.CORRELATION_ID, "abc")
 				.setHeader("foo", "bar")
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public void setJMSCorrelationID(String correlationId) throws JMSException {
 				throw new JMSException("illegal property");
@@ -522,7 +521,7 @@ public void attemptToWriteDisallowedCorrelationIdNumberPropertyIsNotFatal() thro
 				.setHeader(JmsHeaders.CORRELATION_ID, 123)
 				.setHeader("foo", "bar")
 				.build();
-		javax.jms.Message jmsMessage = new StubTextMessage() {
+		jakarta.jms.Message jmsMessage = new StubTextMessage() {
 			@Override
 			public void setJMSCorrelationID(String correlationId) throws JMSException {
 				throw new JMSException("illegal property");
@@ -535,7 +534,7 @@ public void setJMSCorrelationID(String correlationId) throws JMSException {
 	}
 
 
-	private void assertInboundHeader(javax.jms.Message jmsMessage, String headerId, Object value) {
+	private void assertInboundHeader(jakarta.jms.Message jmsMessage, String headerId, Object value) {
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
 		Object headerValue = headers.get(headerId);
 		if (value == null) {
@@ -548,7 +547,7 @@ private void assertInboundHeader(javax.jms.Message jmsMessage, String headerId,
 		}
 	}
 
-	private void assertAttemptReadDisallowedPropertyIsNotFatal(javax.jms.Message jmsMessage, String headerId)
+	private void assertAttemptReadDisallowedPropertyIsNotFatal(jakarta.jms.Message jmsMessage, String headerId)
 			throws JMSException {
 		jmsMessage.setStringProperty("foo", "bar");
 		Map<String, Object> headers = mapper.toHeaders(jmsMessage);
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
index 41aed17f47aa..bcbb41a64a3f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
@@ -21,14 +21,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
+import jakarta.jms.BytesMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.MapMessage;
+import jakarta.jms.Message;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
index 4f428c270939..42eb86a6871f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
@@ -23,12 +23,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
 import com.fasterxml.jackson.annotation.JsonView;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java
index b0c23cd0bff6..a0c37d174505 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MarshallingMessageConverterTests.java
@@ -16,12 +16,12 @@
 
 package org.springframework.jms.support.converter;
 
-import javax.jms.BytesMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 
+import jakarta.jms.BytesMessage;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java
index d1c28956e5e3..e5e5a26bb470 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java
@@ -18,11 +18,10 @@
 
 import java.io.Serializable;
 
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
+import jakarta.jms.JMSException;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.StubTextMessage;
@@ -75,7 +74,7 @@ static class TestMessageConverter extends SimpleMessageConverter {
 		private boolean called;
 
 		@Override
-		public Object fromMessage(javax.jms.Message message) throws JMSException, MessageConversionException {
+		public Object fromMessage(jakarta.jms.Message message) throws JMSException, MessageConversionException {
 			if (this.called) {
 				throw new java.lang.IllegalStateException("Converter called twice");
 			}
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java
index 0a11c2e186b9..841cb96bd523 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/DynamicDestinationResolverTests.java
@@ -16,14 +16,13 @@
 
 package org.springframework.jms.support.destination;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicSession;
-
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueSession;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+import jakarta.jms.TopicSession;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.StubQueue;
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
index 24e1777ca42f..3e02eabc4ee3 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.jms.support.destination;
 
-import javax.jms.ConnectionFactory;
-
+import jakarta.jms.ConnectionFactory;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
index 29003335868a..895373eab595 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
@@ -16,10 +16,10 @@
 
 package org.springframework.jms.support.destination;
 
-import javax.jms.Destination;
-import javax.jms.Session;
 import javax.naming.NamingException;
 
+import jakarta.jms.Destination;
+import jakarta.jms.Session;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jms.StubTopic;
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index c0c7270ebde2..61554bc71839 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -13,15 +13,15 @@ dependencies {
 	optional("io.rsocket:rsocket-transport-netty")
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	optional("com.google.code.gson:gson")
-	optional("javax.json.bind:javax.json.bind-api")
-	optional("javax.xml.bind:jaxb-api")
+	optional("jakarta.json.bind:jakarta.json.bind-api")
+	optional("jakarta.xml.bind:jakarta.xml.bind-api")
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
 	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation("javax.inject:javax.inject-tck")
-	testImplementation("javax.servlet:javax.servlet-api")
-	testImplementation("javax.validation:validation-api")
+	testImplementation("jakarta.inject:jakarta.inject-tck")
+	testImplementation("jakarta.servlet:jakarta.servlet-api")
+	testImplementation("jakarta.validation:jakarta.validation-api")
 	testImplementation("com.thoughtworks.xstream:xstream")
 	testImplementation("org.apache.activemq:activemq-broker")
 	testImplementation("org.apache.activemq:activemq-kahadb-store")
@@ -32,10 +32,10 @@ dependencies {
 	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
-	testRuntimeOnly("com.sun.activation:javax.activation")
+	testRuntimeOnly("com.sun.activation:jakarta.activation")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
-	testRuntimeOnly("javax.json:javax.json-api")
-	testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
+	testRuntimeOnly("jakarta.json:jakarta.json-api")
+	testRuntimeOnly("org.eclipse:yasson")
 	testRuntimeOnly(project(":spring-context"))
 }
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java
index e327edbc2fcb..53ea6058798b 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/JsonbMessageConverter.java
@@ -21,9 +21,9 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
 
 import org.springframework.util.Assert;
 
@@ -33,8 +33,8 @@
  *
  * @author Juergen Hoeller
  * @since 5.3
- * @see javax.json.bind.Jsonb
- * @see javax.json.bind.JsonbBuilder
+ * @see jakarta.json.bind.Jsonb
+ * @see jakarta.json.bind.JsonbBuilder
  * @see #setJsonb
  */
 public class JsonbMessageConverter extends AbstractJsonMessageConverter {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java
index c36a99ba97a4..07b0d28a4dfc 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java
@@ -63,7 +63,7 @@
  * {@link DataBuffer DataBuffer}.
  *
  * <p>Validation is applied if the method argument is annotated with
- * {@code @javax.validation.Valid} or
+ * {@code @jakarta.validation.Valid} or
  * {@link org.springframework.validation.annotation.Validated}. Validation
  * failure results in an {@link MethodArgumentNotValidException}.
  *
@@ -143,7 +143,7 @@ public boolean supportsParameter(MethodParameter parameter) {
 	 * {@link Decoder}.
 	 *
 	 * <p>Validation is applied if the method argument is annotated with
-	 * {@code @javax.validation.Valid} or
+	 * {@code @jakarta.validation.Valid} or
 	 * {@link org.springframework.validation.annotation.Validated}. Validation
 	 * failure results in an {@link MethodArgumentNotValidException}.
 	 *
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java
index 2ced8c86cd45..92e5d5ecc9f5 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java
@@ -190,7 +190,7 @@ protected Class<?> resolveTargetClass(MethodParameter parameter, Message<?> mess
 
 	/**
 	 * Validate the payload if applicable.
-	 * <p>The default implementation checks for {@code @javax.validation.Valid},
+	 * <p>The default implementation checks for {@code @jakarta.validation.Valid},
 	 * Spring's {@link Validated},
 	 * and custom annotations whose name starts with "Valid".
 	 * @param message the currently processed message
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
index fb4150ad7b0e..c44ff260103a 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -112,7 +112,7 @@ public abstract class AbstractMessageBrokerConfiguration implements ApplicationC
 		jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&
 				ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
 		gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader);
-		jsonbPresent = ClassUtils.isPresent("javax.json.bind.Jsonb", classLoader);
+		jsonbPresent = ClassUtils.isPresent("jakarta.json.bind.Jsonb", classLoader);
 		kotlinSerializationJsonPresent = ClassUtils.isPresent("kotlinx.serialization.json.Json", classLoader);
 	}
 
@@ -553,7 +553,7 @@ protected Validator simpValidator() {
 			if (this.applicationContext != null && this.applicationContext.containsBean(MVC_VALIDATOR_NAME)) {
 				validator = this.applicationContext.getBean(MVC_VALIDATOR_NAME, Validator.class);
 			}
-			else if (ClassUtils.isPresent("javax.validation.Validator", getClass().getClassLoader())) {
+			else if (ClassUtils.isPresent("jakarta.validation.Validator", getClass().getClassLoader())) {
 				Class<?> clazz;
 				try {
 					String className = "org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean";
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java
index 63380ea4ebcf..b5026deffdc1 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.messaging.converter;
 
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -74,8 +75,8 @@ public void fromMessageUntyped() {
 		HashMap<String, Object> actual = (HashMap<String, Object>) converter.fromMessage(message, HashMap.class);
 
 		assertThat(actual.get("string")).isEqualTo("Foo");
-		assertThat(actual.get("number")).isEqualTo(42);
-		assertThat((Double) actual.get("fraction")).isCloseTo(42D, within(0D));
+		assertThat(actual.get("number")).isEqualTo(new BigDecimal(42));
+		assertThat((BigDecimal) actual.get("fraction")).isCloseTo(new BigDecimal(42), within(new BigDecimal(0)));
 		assertThat(actual.get("array")).isEqualTo(Arrays.asList("Foo", "Bar"));
 		assertThat(actual.get("bool")).isEqualTo(Boolean.TRUE);
 	}
@@ -165,7 +166,7 @@ public void toMessageUtf16() {
 		String payload = "H\u00e9llo W\u00f6rld";
 		Message<?> message = converter.toMessage(payload, headers);
 
-		assertThat(new String((byte[]) message.getPayload(), StandardCharsets.UTF_16BE)).isEqualTo(payload);
+		assertThat(new String((byte[]) message.getPayload(), StandardCharsets.UTF_16BE)).isEqualTo("\"" + payload + "\"");
 		assertThat(message.getHeaders().get(MessageHeaders.CONTENT_TYPE)).isEqualTo(contentType);
 	}
 
@@ -181,7 +182,7 @@ public void toMessageUtf16String() {
 		String payload = "H\u00e9llo W\u00f6rld";
 		Message<?> message = converter.toMessage(payload, headers);
 
-		assertThat(message.getPayload()).isEqualTo(payload);
+		assertThat(message.getPayload()).isEqualTo("\"" + payload + "\"");
 		assertThat(message.getHeaders().get(MessageHeaders.CONTENT_TYPE)).isEqualTo(contentType);
 	}
 
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java
index a676edb99b10..19aad50fdd98 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java
@@ -19,8 +19,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.diff.DifferenceEvaluator;
diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
index 7870f5d77d72..d7d2bebf52bb 100644
--- a/spring-orm/spring-orm.gradle
+++ b/spring-orm/spring-orm.gradle
@@ -9,13 +9,13 @@ dependencies {
 	optional(project(":spring-context"))
 	optional(project(":spring-web"))
 	optional("org.eclipse.persistence:org.eclipse.persistence.jpa")
-	optional("org.hibernate:hibernate-core")
-	optional("javax.servlet:javax.servlet-api")
+	optional("org.hibernate:hibernate-core-jakarta")
+	optional("jakarta.servlet:jakarta.servlet-api")
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-web")))
 	testImplementation("org.aspectj:aspectjweaver")
 	testImplementation("org.hsqldb:hsqldb")
-	testRuntimeOnly("javax.xml.bind:jaxb-api")
+	testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java
index 839fe1777ca3..38265a6f1f9d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/ConfigurableJtaPlatform.java
@@ -16,14 +16,13 @@
 
 package org.springframework.orm.hibernate5;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.UserTransaction;
-
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.UserTransaction;
 import org.hibernate.TransactionException;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
index bfd086eb626e..2f69163421f6 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
@@ -16,8 +16,7 @@
 
 package org.springframework.orm.hibernate5;
 
-import javax.persistence.PersistenceException;
-
+import jakarta.persistence.PersistenceException;
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
index e624fca329af..dd2d7ff1fadb 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
@@ -25,8 +25,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.persistence.PersistenceException;
-
+import jakarta.persistence.PersistenceException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java
index 65990f3e8333..8d0001c57411 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java
@@ -20,9 +20,9 @@
 import java.sql.ResultSet;
 import java.util.function.Consumer;
 
-import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 
+import jakarta.persistence.PersistenceException;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java
index dc840bdfdc5c..eb8fc4acfebf 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java
@@ -281,7 +281,7 @@ public void setPhysicalNamingStrategy(PhysicalNamingStrategy physicalNamingStrat
 
 	/**
 	 * Set the Spring {@link org.springframework.transaction.jta.JtaTransactionManager}
-	 * or the JTA {@link javax.transaction.TransactionManager} to be used with Hibernate,
+	 * or the JTA {@link jakarta.transaction.TransactionManager} to be used with Hibernate,
 	 * if any. Implicitly sets up {@code JtaPlatform}.
 	 * @see LocalSessionFactoryBuilder#setJtaTransactionManager
 	 */
@@ -343,8 +343,8 @@ public Properties getHibernateProperties() {
 	/**
 	 * Specify custom type filters for Spring-based scanning for entity classes.
 	 * <p>Default is to search all specified packages for classes annotated with
-	 * {@code @javax.persistence.Entity}, {@code @javax.persistence.Embeddable}
-	 * or {@code @javax.persistence.MappedSuperclass}.
+	 * {@code @jakarta.persistence.Entity}, {@code @jakarta.persistence.Embeddable}
+	 * or {@code @jakarta.persistence.MappedSuperclass}.
 	 * @see #setPackagesToScan
 	 */
 	public void setEntityTypeFilters(TypeFilter... entityTypeFilters) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
index 9011db8fb55b..5fac7741cd22 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
@@ -28,14 +28,14 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
 import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
 
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.transaction.TransactionManager;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
@@ -269,8 +269,8 @@ public void setCurrentTenantIdentifierResolver(CurrentTenantIdentifierResolver c
 	/**
 	 * Specify custom type filters for Spring-based scanning for entity classes.
 	 * <p>Default is to search all specified packages for classes annotated with
-	 * {@code @javax.persistence.Entity}, {@code @javax.persistence.Embeddable}
-	 * or {@code @javax.persistence.MappedSuperclass}.
+	 * {@code @jakarta.persistence.Entity}, {@code @jakarta.persistence.Embeddable}
+	 * or {@code @jakarta.persistence.MappedSuperclass}.
 	 * @see #scanPackages
 	 */
 	public LocalSessionFactoryBuilder setEntityTypeFilters(TypeFilter... entityTypeFilters) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
index d3b61969aac0..32cf2bc90e72 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
@@ -19,9 +19,9 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 
+import jakarta.persistence.PersistenceException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.HibernateException;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
index 859abaf72841..a7a5e2f3d26a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
@@ -16,10 +16,9 @@
 
 package org.springframework.orm.hibernate5;
 
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionManager;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInViewFilter.java
index 3379e517c383..7c90bf31ba11 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInViewFilter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInViewFilter.java
@@ -18,11 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
index 4a787866287d..1a7328254610 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
@@ -34,15 +34,15 @@
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-import javax.persistence.SynchronizationType;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
 import javax.sql.DataSource;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Query;
+import jakarta.persistence.SynchronizationType;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -64,7 +64,7 @@
 
 /**
  * Abstract {@link org.springframework.beans.factory.FactoryBean} that creates
- * a local JPA {@link javax.persistence.EntityManagerFactory} instance within
+ * a local JPA {@link jakarta.persistence.EntityManagerFactory} instance within
  * a Spring application context.
  *
  * <p>Encapsulates the common functionality between the different JPA bootstrap
@@ -149,8 +149,8 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	 * taken from the JpaVendorAdapter (if any) or retrieved through scanning
 	 * (as far as possible).
 	 * @see JpaVendorAdapter#getPersistenceProvider()
-	 * @see javax.persistence.spi.PersistenceProvider
-	 * @see javax.persistence.Persistence
+	 * @see jakarta.persistence.spi.PersistenceProvider
+	 * @see jakarta.persistence.Persistence
 	 */
 	public void setPersistenceProviderClass(Class<? extends PersistenceProvider> persistenceProviderClass) {
 		this.persistenceProvider = BeanUtils.instantiateClass(persistenceProviderClass);
@@ -162,8 +162,8 @@ public void setPersistenceProviderClass(Class<? extends PersistenceProvider> per
 	 * will be taken from the JpaVendorAdapter (if any) or determined
 	 * by the persistence unit deployment descriptor (as far as possible).
 	 * @see JpaVendorAdapter#getPersistenceProvider()
-	 * @see javax.persistence.spi.PersistenceProvider
-	 * @see javax.persistence.Persistence
+	 * @see jakarta.persistence.spi.PersistenceProvider
+	 * @see jakarta.persistence.Persistence
 	 */
 	public void setPersistenceProvider(@Nullable PersistenceProvider persistenceProvider) {
 		this.persistenceProvider = persistenceProvider;
@@ -180,7 +180,7 @@ public PersistenceProvider getPersistenceProvider() {
 	 * <p>Default is none, indicating the default EntityManagerFactory
 	 * configuration. The persistence provider will throw an exception if
 	 * ambiguous EntityManager configurations are found.
-	 * @see javax.persistence.Persistence#createEntityManagerFactory(String)
+	 * @see jakarta.persistence.Persistence#createEntityManagerFactory(String)
 	 */
 	public void setPersistenceUnitName(@Nullable String persistenceUnitName) {
 		this.persistenceUnitName = persistenceUnitName;
@@ -197,8 +197,8 @@ public String getPersistenceUnitName() {
 	 * {@code Persistence.createEntityManagerFactory} (if any).
 	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor) or a
 	 * "props" element in XML bean definitions.
-	 * @see javax.persistence.Persistence#createEntityManagerFactory(String, Map)
-	 * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
+	 * @see jakarta.persistence.Persistence#createEntityManagerFactory(String, Map)
+	 * @see jakarta.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
 	 */
 	public void setJpaProperties(Properties jpaProperties) {
 		CollectionUtils.mergePropertiesIntoMap(jpaProperties, this.jpaPropertyMap);
@@ -208,8 +208,8 @@ public void setJpaProperties(Properties jpaProperties) {
 	 * Specify JPA properties as a Map, to be passed into
 	 * {@code Persistence.createEntityManagerFactory} (if any).
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
-	 * @see javax.persistence.Persistence#createEntityManagerFactory(String, Map)
-	 * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
+	 * @see jakarta.persistence.Persistence#createEntityManagerFactory(String, Map)
+	 * @see jakarta.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
 	 */
 	public void setJpaPropertyMap(@Nullable Map<String, ?> jpaProperties) {
 		if (jpaProperties != null) {
@@ -231,7 +231,7 @@ public Map<String, Object> getJpaPropertyMap() {
 	 * Specify the (potentially vendor-specific) EntityManagerFactory interface
 	 * that this EntityManagerFactory proxy is supposed to implement.
 	 * <p>The default will be taken from the specific JpaVendorAdapter, if any,
-	 * or set to the standard {@code javax.persistence.EntityManagerFactory}
+	 * or set to the standard {@code jakarta.persistence.EntityManagerFactory}
 	 * interface else.
 	 * @see JpaVendorAdapter#getEntityManagerFactoryInterface()
 	 */
@@ -243,7 +243,7 @@ public void setEntityManagerFactoryInterface(Class<? extends EntityManagerFactor
 	 * Specify the (potentially vendor-specific) EntityManager interface
 	 * that this factory's EntityManagers are supposed to implement.
 	 * <p>The default will be taken from the specific JpaVendorAdapter, if any,
-	 * or set to the standard {@code javax.persistence.EntityManager}
+	 * or set to the standard {@code jakarta.persistence.EntityManager}
 	 * interface else.
 	 * @see JpaVendorAdapter#getEntityManagerInterface()
 	 * @see EntityManagerFactoryInfo#getEntityManagerInterface()
@@ -468,7 +468,7 @@ else if (emf != null) {
 			if (entityManagerFactoryInterface != null) {
 				throw new IllegalStateException("EntityManagerFactory interface [" + entityManagerFactoryInterface +
 						"] seems to conflict with Spring's EntityManagerFactoryInfo mixin - consider resetting the "+
-						"'entityManagerFactoryInterface' property to plain [javax.persistence.EntityManagerFactory]", ex);
+						"'entityManagerFactoryInterface' property to plain [jakarta.persistence.EntityManagerFactory]", ex);
 			}
 			else {
 				throw new IllegalStateException("Conflicting EntityManagerFactory interfaces - " +
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
index 7fe2d71eeffb..d78a2f79948b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.sql.SQLException;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.datasource.ConnectionHandle;
@@ -53,7 +53,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	 * is no state to be kept for a standard JPA transaction. Hence, subclasses do not
 	 * have to care about the return value ({@code null}) of this implementation
 	 * and are free to return their own transaction data Object.
-	 * @see javax.persistence.EntityTransaction#begin
+	 * @see jakarta.persistence.EntityTransaction#begin
 	 * @see org.springframework.transaction.InvalidIsolationLevelException
 	 * @see #cleanupTransaction
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
index b7ca9b83cd06..5f73add85814 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
@@ -20,9 +20,8 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -59,8 +58,8 @@ public abstract class EntityManagerFactoryAccessor implements BeanFactoryAware {
 	/**
 	 * Set the JPA EntityManagerFactory that should be used to create
 	 * EntityManagers.
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager()
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager()
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	public void setEntityManagerFactory(@Nullable EntityManagerFactory emf) {
 		this.entityManagerFactory = emf;
@@ -112,7 +111,7 @@ public String getPersistenceUnitName() {
 	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor)
 	 * or a "props" element in XML bean definitions.
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	public void setJpaProperties(Properties jpaProperties) {
 		CollectionUtils.mergePropertiesIntoMap(jpaProperties, this.jpaPropertyMap);
@@ -122,7 +121,7 @@ public void setJpaProperties(Properties jpaProperties) {
 	 * Specify JPA properties as a Map, to be passed into
 	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	public void setJpaPropertyMap(@Nullable Map<String, Object> jpaProperties) {
 		if (jpaProperties != null) {
@@ -162,8 +161,8 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 	 * <p>Can be overridden in subclasses to create specific EntityManager variants.
 	 * @return a new EntityManager
 	 * @throws IllegalStateException if this accessor is not configured with an EntityManagerFactory
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager()
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager()
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	protected EntityManager createEntityManager() throws IllegalStateException {
 		EntityManagerFactory emf = obtainEntityManagerFactory();
@@ -175,8 +174,8 @@ protected EntityManager createEntityManager() throws IllegalStateException {
 	 * Obtain the transactional EntityManager for this accessor's EntityManagerFactory, if any.
 	 * @return the transactional EntityManager, or {@code null} if none
 	 * @throws IllegalStateException if this accessor is not configured with an EntityManagerFactory
-	 * @see EntityManagerFactoryUtils#getTransactionalEntityManager(javax.persistence.EntityManagerFactory)
-	 * @see EntityManagerFactoryUtils#getTransactionalEntityManager(javax.persistence.EntityManagerFactory, java.util.Map)
+	 * @see EntityManagerFactoryUtils#getTransactionalEntityManager(jakarta.persistence.EntityManagerFactory)
+	 * @see EntityManagerFactoryUtils#getTransactionalEntityManager(jakarta.persistence.EntityManagerFactory, java.util.Map)
 	 */
 	@Nullable
 	protected EntityManager getTransactionalEntityManager() throws IllegalStateException{
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
index 2b4d72159b4d..cdb9dda3ce55 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
@@ -18,12 +18,13 @@
 
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
 import javax.sql.DataSource;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+
 import org.springframework.lang.Nullable;
 
 /**
@@ -65,7 +66,7 @@ public interface EntityManagerFactoryInfo {
 	 * {@code getPersistenceUnitName()} must be equal to the value returned by
 	 * {@code PersistenceUnitInfo.getPersistenceUnitName()}.
 	 * @see #getPersistenceUnitInfo()
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getPersistenceUnitName()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getPersistenceUnitName()
 	 */
 	@Nullable
 	String getPersistenceUnitName();
@@ -83,7 +84,7 @@ public interface EntityManagerFactoryInfo {
 	 * that this factory's EntityManagers will implement.
 	 * <p>A {@code null} return value suggests that autodetection is supposed
 	 * to happen: either based on a target {@code EntityManager} instance
-	 * or simply defaulting to {@code javax.persistence.EntityManager}.
+	 * or simply defaulting to {@code jakarta.persistence.EntityManager}.
 	 */
 	@Nullable
 	Class<? extends EntityManager> getEntityManagerInterface();
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
index e8fb5e15fb8c..2bf679271249 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@@ -18,21 +18,20 @@
 
 import java.util.Map;
 
-import javax.persistence.EntityExistsException;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.LockTimeoutException;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
-import javax.persistence.PessimisticLockException;
-import javax.persistence.Query;
-import javax.persistence.QueryTimeoutException;
-import javax.persistence.SynchronizationType;
-import javax.persistence.TransactionRequiredException;
-
+import jakarta.persistence.EntityExistsException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.LockTimeoutException;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.PessimisticLockException;
+import jakarta.persistence.Query;
+import jakarta.persistence.QueryTimeoutException;
+import jakarta.persistence.SynchronizationType;
+import jakarta.persistence.TransactionRequiredException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -168,8 +167,8 @@ public static EntityManager getTransactionalEntityManager(EntityManagerFactory e
 	 * @param properties the properties to be passed into the {@code createEntityManager}
 	 * call (may be {@code null})
 	 * @return the EntityManager, or {@code null} if none found
-	 * @throws javax.persistence.PersistenceException if the EntityManager couldn't be created
-	 * @see #getTransactionalEntityManager(javax.persistence.EntityManagerFactory)
+	 * @throws jakarta.persistence.PersistenceException if the EntityManager couldn't be created
+	 * @see #getTransactionalEntityManager(jakarta.persistence.EntityManagerFactory)
 	 * @see JpaTransactionManager
 	 */
 	@Nullable
@@ -189,8 +188,8 @@ public static EntityManager doGetTransactionalEntityManager(EntityManagerFactory
 	 * @param synchronizedWithTransaction whether to automatically join ongoing
 	 * transactions (according to the JPA 2.1 SynchronizationType rules)
 	 * @return the EntityManager, or {@code null} if none found
-	 * @throws javax.persistence.PersistenceException if the EntityManager couldn't be created
-	 * @see #getTransactionalEntityManager(javax.persistence.EntityManagerFactory)
+	 * @throws jakarta.persistence.PersistenceException if the EntityManager couldn't be created
+	 * @see #getTransactionalEntityManager(jakarta.persistence.EntityManagerFactory)
 	 * @see JpaTransactionManager
 	 */
 	@Nullable
@@ -334,7 +333,7 @@ private static void cleanupTransaction(@Nullable Object transactionData, EntityM
 
 	/**
 	 * Apply the current transaction timeout, if any, to the given JPA Query object.
-	 * <p>This method sets the JPA 2.0 query hint "javax.persistence.query.timeout" accordingly.
+	 * <p>This method sets the JPA 2.0 query hint "jakarta.persistence.query.timeout" accordingly.
 	 * @param query the JPA Query object
 	 * @param emf the JPA EntityManagerFactory that the Query was created for
 	 */
@@ -343,7 +342,7 @@ public static void applyTransactionTimeout(Query query, EntityManagerFactory emf
 		if (emHolder != null && emHolder.hasTimeout()) {
 			int timeoutValue = (int) emHolder.getTimeToLiveInMillis();
 			try {
-				query.setHint("javax.persistence.query.timeout", timeoutValue);
+				query.setHint("jakarta.persistence.query.timeout", timeoutValue);
 			}
 			catch (IllegalArgumentException ex) {
 				// oh well, at least we tried...
@@ -418,7 +417,7 @@ public static DataAccessException convertJpaAccessExceptionIfPossible(RuntimeExc
 	 * Close the given JPA EntityManager,
 	 * catching and logging any cleanup exceptions thrown.
 	 * @param em the JPA EntityManager to close (may be {@code null})
-	 * @see javax.persistence.EntityManager#close()
+	 * @see jakarta.persistence.EntityManager#close()
 	 */
 	public static void closeEntityManager(@Nullable EntityManager em) {
 		if (em != null) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java
index 512cac8fe9c2..cc72652674dd 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerHolder.java
@@ -16,7 +16,7 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.SavepointManager;
@@ -26,7 +26,7 @@
 /**
  * Resource holder wrapping a JPA {@link EntityManager}.
  * {@link JpaTransactionManager} binds instances of this class to the thread,
- * for a given {@link javax.persistence.EntityManagerFactory}.
+ * for a given {@link jakarta.persistence.EntityManagerFactory}.
  *
  * <p>Also serves as a base class for {@link org.springframework.orm.hibernate5.SessionHolder},
  * as of 5.1.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
index 84e574d538f1..704b60d234cd 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
@@ -16,14 +16,14 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 /**
- * Subinterface of {@link javax.persistence.EntityManager} to be implemented by
+ * Subinterface of {@link jakarta.persistence.EntityManager} to be implemented by
  * EntityManager proxies. Allows access to the underlying target EntityManager.
  *
  * <p>This interface is mainly intended for framework usage. Application code
- * should prefer the use of the {@link javax.persistence.EntityManager#getDelegate()}
+ * should prefer the use of the {@link jakarta.persistence.EntityManager#getDelegate()}
  * method to access native functionality of the underlying resource.
  *
  * @author Juergen Hoeller
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
index 8e9173a94bfd..29b7a008ca93 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -25,13 +25,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.TransactionRequiredException;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.TransactionRequiredException;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -47,14 +46,14 @@
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 /**
- * Delegate for creating a variety of {@link javax.persistence.EntityManager}
+ * Delegate for creating a variety of {@link jakarta.persistence.EntityManager}
  * proxies that follow the JPA spec's semantics for "extended" EntityManagers.
  *
  * <p>Supports several different variants of "extended" EntityManagers:
  * in particular, an "application-managed extended EntityManager", as defined
- * by {@link javax.persistence.EntityManagerFactory#createEntityManager()},
+ * by {@link jakarta.persistence.EntityManagerFactory#createEntityManager()},
  * as well as a "container-managed extended EntityManager", as defined by
- * {@link javax.persistence.PersistenceContextType#EXTENDED}.
+ * {@link jakarta.persistence.PersistenceContextType#EXTENDED}.
  *
  * <p>The original difference between "application-managed" and "container-managed"
  * was the need for explicit joining of an externally managed transaction through
@@ -69,9 +68,9 @@
  * @author Rod Johnson
  * @author Mark Paluch
  * @since 2.0
- * @see javax.persistence.EntityManagerFactory#createEntityManager()
- * @see javax.persistence.PersistenceContextType#EXTENDED
- * @see javax.persistence.EntityManager#joinTransaction()
+ * @see jakarta.persistence.EntityManagerFactory#createEntityManager()
+ * @see jakarta.persistence.PersistenceContextType#EXTENDED
+ * @see jakarta.persistence.EntityManager#joinTransaction()
  * @see SharedEntityManagerCreator
  */
 public abstract class ExtendedEntityManagerCreator {
@@ -131,7 +130,7 @@ public static EntityManager createContainerManagedEntityManager(
 	 * JpaDialect and PersistenceUnitInfo will be detected accordingly.
 	 * @return a container-managed EntityManager that will automatically participate
 	 * in any managed transaction
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager()
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager()
 	 */
 	public static EntityManager createContainerManagedEntityManager(EntityManagerFactory emf) {
 		return createContainerManagedEntityManager(emf, null, true);
@@ -146,7 +145,7 @@ public static EntityManager createContainerManagedEntityManager(EntityManagerFac
 	 * call (may be {@code null})
 	 * @return a container-managed EntityManager that will automatically participate
 	 * in any managed transaction
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	public static EntityManager createContainerManagedEntityManager(EntityManagerFactory emf, @Nullable Map<?, ?> properties) {
 		return createContainerManagedEntityManager(emf, properties, true);
@@ -164,7 +163,7 @@ public static EntityManager createContainerManagedEntityManager(EntityManagerFac
 	 * @return a container-managed EntityManager that expects container-driven lifecycle
 	 * management but may opt out of automatic transaction synchronization
 	 * @since 4.0
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	public static EntityManager createContainerManagedEntityManager(
 			EntityManagerFactory emf, @Nullable Map<?, ?> properties, boolean synchronizedWithTransaction) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
index 9ef53884a49f..b2c172b453f2 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
@@ -18,8 +18,8 @@
 
 import java.sql.SQLException;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
 
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.jdbc.datasource.ConnectionHandle;
@@ -73,11 +73,11 @@ public interface JpaDialect extends PersistenceExceptionTranslator {
 	 * @return an arbitrary object that holds transaction data, if any
 	 * (to be passed into {@link #cleanupTransaction}). May implement the
 	 * {@link org.springframework.transaction.SavepointManager} interface.
-	 * @throws javax.persistence.PersistenceException if thrown by JPA methods
+	 * @throws jakarta.persistence.PersistenceException if thrown by JPA methods
 	 * @throws java.sql.SQLException if thrown by JDBC methods
 	 * @throws org.springframework.transaction.TransactionException in case of invalid arguments
 	 * @see #cleanupTransaction
-	 * @see javax.persistence.EntityTransaction#begin
+	 * @see jakarta.persistence.EntityTransaction#begin
 	 * @see org.springframework.jdbc.datasource.DataSourceUtils#prepareConnectionForTransaction
 	 */
 	@Nullable
@@ -100,7 +100,7 @@ Object beginTransaction(EntityManager entityManager, TransactionDefinition defin
 	 * @param name the name of the transaction (if any)
 	 * @return an arbitrary object that holds transaction data, if any
 	 * (to be passed into cleanupTransaction)
-	 * @throws javax.persistence.PersistenceException if thrown by JPA methods
+	 * @throws jakarta.persistence.PersistenceException if thrown by JPA methods
 	 * @see #cleanupTransaction
 	 */
 	@Nullable
@@ -143,7 +143,7 @@ Object prepareTransaction(EntityManager entityManager, boolean readOnly, @Nullab
 	 * @param readOnly whether the Connection is only needed for read-only purposes
 	 * @return a handle for the Connection, to be passed into {@code releaseJdbcConnection},
 	 * or {@code null} if no JDBC Connection can be retrieved
-	 * @throws javax.persistence.PersistenceException if thrown by JPA methods
+	 * @throws jakarta.persistence.PersistenceException if thrown by JPA methods
 	 * @throws java.sql.SQLException if thrown by JDBC methods
 	 * @see #releaseJdbcConnection
 	 * @see org.springframework.jdbc.datasource.ConnectionHandle#getConnection
@@ -163,7 +163,7 @@ ConnectionHandle getJdbcConnection(EntityManager entityManager, boolean readOnly
 	 * transaction completes or when the EntityManager is closed.
 	 * @param conHandle the JDBC Connection handle to release
 	 * @param entityManager the current JPA EntityManager
-	 * @throws javax.persistence.PersistenceException if thrown by JPA methods
+	 * @throws jakarta.persistence.PersistenceException if thrown by JPA methods
 	 * @throws java.sql.SQLException if thrown by JDBC methods
 	 * @see #getJdbcConnection
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
index 26e51471682b..20bb6ba841be 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityNotFoundException;
 
 import org.springframework.orm.ObjectRetrievalFailureException;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
index 89b6bfcce5cf..a6eb2d1c4462 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
 
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
index 2746339bc626..79e48b7d0f32 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
@@ -21,13 +21,14 @@
 import java.util.Properties;
 import java.util.function.Consumer;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceException;
-import javax.persistence.RollbackException;
 import javax.sql.DataSource;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.RollbackException;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -58,7 +59,7 @@
 
 /**
  * {@link org.springframework.transaction.PlatformTransactionManager} implementation
- * for a single JPA {@link javax.persistence.EntityManagerFactory}. Binds a JPA
+ * for a single JPA {@link jakarta.persistence.EntityManagerFactory}. Binds a JPA
  * EntityManager from the specified factory to the thread, potentially allowing for
  * one thread-bound EntityManager per factory. {@link SharedEntityManagerCreator} and
  * {@code @PersistenceContext} are aware of thread-bound entity managers and participate
@@ -209,7 +210,7 @@ public String getPersistenceUnitName() {
 	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor)
 	 * or a "props" element in XML bean definitions.
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	public void setJpaProperties(@Nullable Properties jpaProperties) {
 		CollectionUtils.mergePropertiesIntoMap(jpaProperties, this.jpaPropertyMap);
@@ -219,7 +220,7 @@ public void setJpaProperties(@Nullable Properties jpaProperties) {
 	 * Specify JPA properties as a Map, to be passed into
 	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
 	public void setJpaPropertyMap(@Nullable Map<String, ?> jpaProperties) {
 		if (jpaProperties != null) {
@@ -475,7 +476,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 	 * {@link EntityManagerFactoryInfo#createNativeEntityManager}
 	 * if possible which in turns applies
 	 * {@link JpaVendorAdapter#postProcessEntityManager(EntityManager)}.
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager()
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager()
 	 */
 	protected EntityManager createEntityManagerForTransaction() {
 		EntityManagerFactory emf = obtainEntityManagerFactory();
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
index 4d283283a3e7..7ea555d6d77d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
@@ -19,10 +19,10 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 
 import org.springframework.lang.Nullable;
 
@@ -64,10 +64,10 @@ default String getPersistenceProviderRootPackage() {
 	 * non-unit-dependent properties. Effectively, this PersistenceUnitInfo-based
 	 * variant only needs to be implemented if there is an actual need to react
 	 * to unit-specific characteristics such as the transaction type.
-	 * <p><b>NOTE:</b> This variant will only be invoked in case of Java EE style
+	 * <p><b>NOTE:</b> This variant will only be invoked in case of Jakarta EE style
 	 * container bootstrapping where a {@link PersistenceUnitInfo} is present
 	 * (i.e. {@link LocalContainerEntityManagerFactoryBean}. In case of simple
-	 * Java SE style bootstrapping via {@link javax.persistence.Persistence}
+	 * Java SE style bootstrapping via {@link jakarta.persistence.Persistence}
 	 * (i.e. {@link LocalEntityManagerFactoryBean}), the parameter-less
 	 * {@link #getJpaPropertyMap()} variant will be called directly.
 	 * @param pui the PersistenceUnitInfo for the current persistence unit
@@ -75,7 +75,7 @@ default String getPersistenceProviderRootPackage() {
 	 * facilities, or an empty Map if there are no properties to expose
 	 * @since 4.3.13
 	 * @see PersistenceUnitInfo#getTransactionType()
-	 * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
+	 * @see jakarta.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(PersistenceUnitInfo, Map)
 	 */
 	default Map<String, ?> getJpaPropertyMap(PersistenceUnitInfo pui) {
 		return getJpaPropertyMap();
@@ -89,7 +89,7 @@ default String getPersistenceProviderRootPackage() {
 	 * JPA property values specified here.
 	 * @return a Map of JPA properties, as accepted by the standard JPA bootstrap
 	 * facilities, or an empty Map if there are no properties to expose
-	 * @see javax.persistence.Persistence#createEntityManagerFactory(String, Map)
+	 * @see jakarta.persistence.Persistence#createEntityManagerFactory(String, Map)
 	 */
 	default Map<String, ?> getJpaPropertyMap() {
 		return Collections.emptyMap();
@@ -109,7 +109,7 @@ default JpaDialect getJpaDialect() {
 	 * that the EntityManagerFactory proxy is supposed to implement.
 	 * <p>If the provider does not offer any EntityManagerFactory extensions,
 	 * the adapter should simply return the standard
-	 * {@link javax.persistence.EntityManagerFactory} class here.
+	 * {@link jakarta.persistence.EntityManagerFactory} class here.
 	 * @since 2.5.2
 	 */
 	default Class<? extends EntityManagerFactory> getEntityManagerFactoryInterface() {
@@ -121,7 +121,7 @@ default Class<? extends EntityManagerFactory> getEntityManagerFactoryInterface()
 	 * that this provider's EntityManagers will implement.
 	 * <p>If the provider does not offer any EntityManager extensions,
 	 * the adapter should simply return the standard
-	 * {@link javax.persistence.EntityManager} class here.
+	 * {@link jakarta.persistence.EntityManager} class here.
 	 */
 	default Class<? extends EntityManager> getEntityManagerInterface() {
 		return EntityManager.class;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
index 6fc17b5c5fdc..3ec01ff8d847 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
@@ -16,14 +16,15 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import javax.persistence.SharedCacheMode;
-import javax.persistence.ValidationMode;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
 import javax.sql.DataSource;
 
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.SharedCacheMode;
+import jakarta.persistence.ValidationMode;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.context.weaving.LoadTimeWeaverAware;
@@ -40,7 +41,7 @@
 
 /**
  * {@link org.springframework.beans.factory.FactoryBean} that creates a JPA
- * {@link javax.persistence.EntityManagerFactory} according to JPA's standard
+ * {@link jakarta.persistence.EntityManagerFactory} according to JPA's standard
  * <i>container</i> bootstrap contract. This is the most powerful way to set
  * up a shared JPA EntityManagerFactory in a Spring application context;
  * the EntityManagerFactory can then be passed to JPA-based DAOs via
@@ -58,10 +59,10 @@
  * instead of being tied to a special VM agent specified on JVM startup.
  *
  * <p>Internally, this FactoryBean parses the {@code persistence.xml} file
- * itself and creates a corresponding {@link javax.persistence.spi.PersistenceUnitInfo}
+ * itself and creates a corresponding {@link jakarta.persistence.spi.PersistenceUnitInfo}
  * object (with further configuration merged in, such as JDBC DataSources and the
  * Spring LoadTimeWeaver), to be passed to the chosen JPA
- * {@link javax.persistence.spi.PersistenceProvider}. This corresponds to a
+ * {@link jakarta.persistence.spi.PersistenceProvider}. This corresponds to a
  * local JPA container with full support for the standard JPA container contract.
  *
  * <p>The exposed EntityManagerFactory object will implement all the interfaces of
@@ -84,7 +85,7 @@
  * @see EntityManagerFactoryInfo
  * @see LocalEntityManagerFactoryBean
  * @see org.springframework.orm.jpa.support.SharedEntityManagerBean
- * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory
+ * @see jakarta.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory
  */
 @SuppressWarnings("serial")
 public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean
@@ -220,7 +221,7 @@ public void setMappingResources(String... mappingResources) {
 	 * overriding a value in {@code persistence.xml} if set.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * @since 4.0
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getSharedCacheMode()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getSharedCacheMode()
 	 * @see #setPersistenceUnitManager
 	 */
 	public void setSharedCacheMode(SharedCacheMode sharedCacheMode) {
@@ -232,7 +233,7 @@ public void setSharedCacheMode(SharedCacheMode sharedCacheMode) {
 	 * overriding a value in {@code persistence.xml} if set.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * @since 4.0
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getValidationMode()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getValidationMode()
 	 * @see #setPersistenceUnitManager
 	 */
 	public void setValidationMode(ValidationMode validationMode) {
@@ -250,7 +251,7 @@ public void setValidationMode(ValidationMode validationMode) {
 	 * Note that this variant typically works for JTA transaction management as well;
 	 * if it does not, consider using the explicit {@link #setJtaDataSource} instead.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getNonJtaDataSource()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getNonJtaDataSource()
 	 * @see #setPersistenceUnitManager
 	 */
 	public void setDataSource(DataSource dataSource) {
@@ -267,7 +268,7 @@ public void setDataSource(DataSource dataSource) {
 	 * on the PersistenceUnitInfo passed to the PersistenceProvider, as well as
 	 * overriding data source configuration in {@code persistence.xml} (if any).
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getJtaDataSource()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getJtaDataSource()
 	 * @see #setPersistenceUnitManager
 	 */
 	public void setJtaDataSource(DataSource jtaDataSource) {
@@ -394,7 +395,7 @@ protected PersistenceUnitInfo determinePersistenceUnitInfo(PersistenceUnitManage
 	 * <p>The default implementation is empty.
 	 * @param emf the newly created EntityManagerFactory we are working with
 	 * @param pui the PersistenceUnitInfo used to configure the EntityManagerFactory
-	 * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory
+	 * @see jakarta.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory
 	 */
 	protected void postProcessEntityManagerFactory(EntityManagerFactory emf, PersistenceUnitInfo pui) {
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
index dcc9961f55c0..10e528cee583 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
@@ -16,14 +16,14 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.PersistenceException;
-import javax.persistence.spi.PersistenceProvider;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.spi.PersistenceProvider;
 
 /**
  * {@link org.springframework.beans.factory.FactoryBean} that creates a JPA
- * {@link javax.persistence.EntityManagerFactory} according to JPA's standard
+ * {@link jakarta.persistence.EntityManagerFactory} according to JPA's standard
  * <i>standalone</i> bootstrap contract. This is the simplest way to set up a
  * shared JPA EntityManagerFactory in a Spring application context; the
  * EntityManagerFactory can then be passed to JPA-based DAOs via
@@ -41,7 +41,7 @@
  * <p>This EntityManagerFactory bootstrap is appropriate for standalone applications
  * which solely use JPA for data access. If you want to set up your persistence
  * provider for an external DataSource and/or for global transactions which span
- * multiple resources, you will need to either deploy it into a full Java EE
+ * multiple resources, you will need to either deploy it into a full Jakarta EE
  * application server and access the deployed EntityManagerFactory via JNDI,
  * or use Spring's {@link LocalContainerEntityManagerFactoryBean} with appropriate
  * configuration for local setup according to JPA's container contract.
@@ -65,15 +65,15 @@
  * @see LocalContainerEntityManagerFactoryBean
  * @see org.springframework.jndi.JndiObjectFactoryBean
  * @see org.springframework.orm.jpa.support.SharedEntityManagerBean
- * @see javax.persistence.Persistence#createEntityManagerFactory
- * @see javax.persistence.spi.PersistenceProvider#createEntityManagerFactory
+ * @see jakarta.persistence.Persistence#createEntityManagerFactory
+ * @see jakarta.persistence.spi.PersistenceProvider#createEntityManagerFactory
  */
 @SuppressWarnings("serial")
 public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {
 
 	/**
 	 * Initialize the EntityManagerFactory for the given configuration.
-	 * @throws javax.persistence.PersistenceException in case of JPA initialization errors
+	 * @throws jakarta.persistence.PersistenceException in case of JPA initialization errors
 	 */
 	@Override
 	protected EntityManagerFactory createNativeEntityManagerFactory() throws PersistenceException {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index 5b109cf89864..26add517b036 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -28,13 +28,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.ParameterMode;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TransactionRequiredException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.ParameterMode;
+import jakarta.persistence.Query;
+import jakarta.persistence.StoredProcedureQuery;
+import jakarta.persistence.TransactionRequiredException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -45,8 +44,8 @@
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 /**
- * Delegate for creating a shareable JPA {@link javax.persistence.EntityManager}
- * reference for a given {@link javax.persistence.EntityManagerFactory}.
+ * Delegate for creating a shareable JPA {@link jakarta.persistence.EntityManager}
+ * reference for a given {@link jakarta.persistence.EntityManagerFactory}.
  *
  * <p>A shared EntityManager will behave just like an EntityManager fetched from
  * an application server's JNDI environment, as defined by the JPA specification.
@@ -54,17 +53,17 @@
  * otherwise it will fall back to a newly created EntityManager per operation.
  *
  * <p>For a behavioral definition of such a shared transactional EntityManager,
- * see {@link javax.persistence.PersistenceContextType#TRANSACTION} and its
+ * see {@link jakarta.persistence.PersistenceContextType#TRANSACTION} and its
  * discussion in the JPA spec document. This is also the default being used
- * for the annotation-based {@link javax.persistence.PersistenceContext#type()}.
+ * for the annotation-based {@link jakarta.persistence.PersistenceContext#type()}.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
  * @author Oliver Gierke
  * @author Mark Paluch
  * @since 2.0
- * @see javax.persistence.PersistenceContext
- * @see javax.persistence.PersistenceContextType#TRANSACTION
+ * @see jakarta.persistence.PersistenceContext
+ * @see jakarta.persistence.PersistenceContextType#TRANSACTION
  * @see org.springframework.orm.jpa.JpaTransactionManager
  * @see ExtendedEntityManagerCreator
  */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
index 162e886c2db2..0654e12c3d9e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
@@ -19,8 +19,7 @@
 import java.lang.instrument.ClassFileTransformer;
 import java.security.ProtectionDomain;
 
-import javax.persistence.spi.ClassTransformer;
-
+import jakarta.persistence.spi.ClassTransformer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -35,7 +34,7 @@
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 2.0
- * @see javax.persistence.spi.PersistenceUnitInfo#addTransformer(javax.persistence.spi.ClassTransformer)
+ * @see jakarta.persistence.spi.PersistenceUnitInfo#addTransformer(jakarta.persistence.spi.ClassTransformer)
  */
 class ClassFileTransformerAdapter implements ClassFileTransformer {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
index 8e2fd410d54b..c16527b6153d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
@@ -26,16 +26,16 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.Converter;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.PersistenceException;
-import javax.persistence.SharedCacheMode;
-import javax.persistence.ValidationMode;
-import javax.persistence.spi.PersistenceUnitInfo;
 import javax.sql.DataSource;
 
+import jakarta.persistence.Converter;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.SharedCacheMode;
+import jakarta.persistence.ValidationMode;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -274,7 +274,7 @@ public void setMappingResources(String... mappingResources) {
 	 * Specify the JPA 2.0 shared cache mode for all of this manager's persistence
 	 * units, overriding any value in {@code persistence.xml} if set.
 	 * @since 4.0
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getSharedCacheMode()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getSharedCacheMode()
 	 */
 	public void setSharedCacheMode(SharedCacheMode sharedCacheMode) {
 		this.sharedCacheMode = sharedCacheMode;
@@ -284,7 +284,7 @@ public void setSharedCacheMode(SharedCacheMode sharedCacheMode) {
 	 * Specify the JPA 2.0 validation mode for all of this manager's persistence
 	 * units, overriding any value in {@code persistence.xml} if set.
 	 * @since 4.0
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getValidationMode()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getValidationMode()
 	 */
 	public void setValidationMode(ValidationMode validationMode) {
 		this.validationMode = validationMode;
@@ -341,7 +341,7 @@ public DataSourceLookup getDataSourceLookup() {
 	 * <p>In JPA speak, a DataSource passed in here will be uses as "nonJtaDataSource"
 	 * on the PersistenceUnitInfo passed to the PersistenceProvider, provided that
 	 * none has been registered before.
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getNonJtaDataSource()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getNonJtaDataSource()
 	 */
 	public void setDefaultDataSource(@Nullable DataSource defaultDataSource) {
 		this.defaultDataSource = defaultDataSource;
@@ -363,7 +363,7 @@ public DataSource getDefaultDataSource() {
 	 * <p>In JPA speak, a DataSource passed in here will be uses as "jtaDataSource"
 	 * on the PersistenceUnitInfo passed to the PersistenceProvider, provided that
 	 * none has been registered before.
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getJtaDataSource()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getJtaDataSource()
 	 */
 	public void setDefaultJtaDataSource(@Nullable DataSource defaultJtaDataSource) {
 		this.defaultJtaDataSource = defaultJtaDataSource;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
index b006f76bfaff..7bd5304b0062 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
@@ -21,19 +21,20 @@
 import java.util.List;
 import java.util.Properties;
 
-import javax.persistence.SharedCacheMode;
-import javax.persistence.ValidationMode;
-import javax.persistence.spi.ClassTransformer;
-import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.sql.DataSource;
 
+import jakarta.persistence.SharedCacheMode;
+import jakarta.persistence.ValidationMode;
+import jakarta.persistence.spi.ClassTransformer;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
+
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
  * Spring's base implementation of the JPA
- * {@link javax.persistence.spi.PersistenceUnitInfo} interface,
+ * {@link jakarta.persistence.spi.PersistenceUnitInfo} interface,
  * used to bootstrap an {@code EntityManagerFactory} in a container.
  *
  * <p>This implementation is largely a JavaBean, offering mutators
@@ -171,7 +172,7 @@ public URL getPersistenceUnitRootUrl() {
 
 	/**
 	 * Add a managed class name to the persistence provider's metadata.
-	 * @see javax.persistence.spi.PersistenceUnitInfo#getManagedClassNames()
+	 * @see jakarta.persistence.spi.PersistenceUnitInfo#getManagedClassNames()
 	 * @see #addManagedPackage
 	 */
 	public void addManagedClassName(String managedClassName) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
index e9bb1429a7fd..bf69b58929e5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
@@ -16,14 +16,14 @@
 
 package org.springframework.orm.jpa.persistenceunit;
 
-import javax.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 
 /**
  * Interface that defines an abstraction for finding and managing
  * JPA PersistenceUnitInfos. Used by
  * {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean}
- * in order to obtain a {@link javax.persistence.spi.PersistenceUnitInfo}
- * for building a concrete {@link javax.persistence.EntityManagerFactory}.
+ * in order to obtain a {@link jakarta.persistence.spi.PersistenceUnitInfo}
+ * for building a concrete {@link jakarta.persistence.EntityManagerFactory}.
  *
  * <p>Obtaining a PersistenceUnitInfo instance is an exclusive process.
  * A PersistenceUnitInfo instance is not available for further calls
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
index 092285cd25fd..1b2cd4b53e22 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
@@ -22,13 +22,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.SharedCacheMode;
-import javax.persistence.ValidationMode;
-import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import jakarta.persistence.SharedCacheMode;
+import jakarta.persistence.ValidationMode;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java
index 1ed577af6e4d..3ad341cc9c1c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import javax.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 
 /**
  * Extension of the standard JPA PersistenceUnitInfo interface, for advanced collaboration
@@ -42,7 +42,7 @@ public interface SmartPersistenceUnitInfo extends PersistenceUnitInfo {
 
 	/**
 	 * Set the persistence provider's own package name, for exclusion from class transformation.
-	 * @see #addTransformer(javax.persistence.spi.ClassTransformer)
+	 * @see #addTransformer(jakarta.persistence.spi.ClassTransformer)
 	 * @see #getNewTempClassLoader()
 	 */
 	void setPersistenceProviderPackageName(String persistenceProviderPackageName);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java
index 0cf289f3ee14..da5e46fdbd83 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SpringPersistenceUnitInfo.java
@@ -16,7 +16,7 @@
 
 package org.springframework.orm.jpa.persistenceunit;
 
-import javax.persistence.spi.ClassTransformer;
+import jakarta.persistence.spi.ClassTransformer;
 
 import org.springframework.core.DecoratingClassLoader;
 import org.springframework.instrument.classloading.LoadTimeWeaver;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java
index 7f31393e1324..46efcd21cb75 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java
@@ -18,8 +18,7 @@
 
 import java.util.concurrent.Callable;
 
-import javax.persistence.EntityManagerFactory;
-
+import jakarta.persistence.EntityManagerFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
index a36c0d64c8f7..4b1854005440 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
@@ -18,13 +18,13 @@
 
 import java.io.IOException;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.lang.Nullable;
@@ -242,7 +242,7 @@ else if (!StringUtils.hasLength(puName) && wac.containsBean(DEFAULT_ENTITY_MANAG
 	 * Create a JPA EntityManager to be bound to a request.
 	 * <p>Can be overridden in subclasses.
 	 * @param emf the EntityManagerFactory to use
-	 * @see javax.persistence.EntityManagerFactory#createEntityManager()
+	 * @see jakarta.persistence.EntityManagerFactory#createEntityManager()
 	 */
 	protected EntityManager createEntityManager(EntityManagerFactory emf) {
 		return emf.createEntityManager();
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
index 5382e9bdfab7..e6cc8f14fe55 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
@@ -16,9 +16,9 @@
 
 package org.springframework.orm.jpa.support;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
index d9ff7afc1414..20747130ac71 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
@@ -29,13 +29,13 @@
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceProperty;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceProperty;
+import jakarta.persistence.PersistenceUnit;
+import jakarta.persistence.SynchronizationType;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.PropertyValues;
@@ -71,10 +71,10 @@
 import org.springframework.util.StringUtils;
 
 /**
- * BeanPostProcessor that processes {@link javax.persistence.PersistenceUnit}
- * and {@link javax.persistence.PersistenceContext} annotations, for injection of
- * the corresponding JPA resources {@link javax.persistence.EntityManagerFactory}
- * and {@link javax.persistence.EntityManager}. Any such annotated fields or methods
+ * BeanPostProcessor that processes {@link jakarta.persistence.PersistenceUnit}
+ * and {@link jakarta.persistence.PersistenceContext} annotations, for injection of
+ * the corresponding JPA resources {@link jakarta.persistence.EntityManagerFactory}
+ * and {@link jakarta.persistence.EntityManager}. Any such annotated fields or methods
  * in any Spring-managed object will automatically be injected.
  *
  * <p>This post-processor will inject sub-interfaces of {@code EntityManagerFactory}
@@ -88,7 +88,7 @@
  * with the "unitName" attribute, or no attribute at all (for the default unit).
  * If those annotations are present with the "name" attribute at the class level,
  * they will simply be ignored, since those only serve as deployment hint
- * (as per the Java EE specification).
+ * (as per the Jakarta EE specification).
  *
  * <p>This post-processor can either obtain EntityManagerFactory beans defined
  * in the Spring application context (the default), or obtain EntityManagerFactory
@@ -106,9 +106,9 @@
  *
  * In the JNDI case, specify the corresponding JNDI names in this post-processor's
  * {@link #setPersistenceUnits "persistenceUnits" map}, typically with matching
- * {@code persistence-unit-ref} entries in the Java EE deployment descriptor.
+ * {@code persistence-unit-ref} entries in the Jakarta EE deployment descriptor.
  * By default, those names are considered as resource references (according to the
- * Java EE resource-ref convention), located underneath the "java:comp/env/" namespace.
+ * Jakarta EE resource-ref convention), located underneath the "java:comp/env/" namespace.
  * For example:
  *
  * <pre class="code">
@@ -123,18 +123,18 @@
  *
  * In this case, the specified persistence units will always be resolved in JNDI
  * rather than as Spring-defined beans. The entire persistence unit deployment,
- * including the weaving of persistent classes, is then up to the Java EE server.
+ * including the weaving of persistent classes, is then up to the Jakarta EE server.
  * Persistence contexts (i.e. EntityManager references) will be built based on
  * those server-provided EntityManagerFactory references, using Spring's own
  * transaction synchronization facilities for transactional EntityManager handling
  * (typically with Spring's {@code @Transactional} annotation for demarcation
  * and {@link org.springframework.transaction.jta.JtaTransactionManager} as backend).
  *
- * <p>If you prefer the Java EE server's own EntityManager handling, specify entries
+ * <p>If you prefer the Jakarta EE server's own EntityManager handling, specify entries
  * in this post-processor's {@link #setPersistenceContexts "persistenceContexts" map}
  * (or {@link #setExtendedPersistenceContexts "extendedPersistenceContexts" map},
  * typically with matching {@code persistence-context-ref} entries in the
- * Java EE deployment descriptor. For example:
+ * Jakarta EE deployment descriptor. For example:
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"&gt;
@@ -165,8 +165,8 @@
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 2.0
- * @see javax.persistence.PersistenceUnit
- * @see javax.persistence.PersistenceContext
+ * @see jakarta.persistence.PersistenceUnit
+ * @see jakarta.persistence.PersistenceContext
  */
 @SuppressWarnings("serial")
 public class PersistenceAnnotationBeanPostProcessor
@@ -216,7 +216,7 @@ public void setJndiEnvironment(Properties jndiEnvironment) {
 	}
 
 	/**
-	 * Set whether the lookup occurs in a Java EE container, i.e. if the prefix
+	 * Set whether the lookup occurs in a Jakarta EE container, i.e. if the prefix
 	 * "java:comp/env/" needs to be added if the JNDI name doesn't already
 	 * contain it. PersistenceAnnotationBeanPostProcessor's default is "true".
 	 * @see org.springframework.jndi.JndiLocatorSupport#setResourceRef
@@ -230,12 +230,12 @@ public void setResourceRef(boolean resourceRef) {
 	 * as a Map from persistence unit name to persistence unit JNDI name
 	 * (which needs to resolve to an EntityManagerFactory instance).
 	 * <p>JNDI names specified here should refer to {@code persistence-unit-ref}
-	 * entries in the Java EE deployment descriptor, matching the target persistence unit.
+	 * entries in the Jakarta EE deployment descriptor, matching the target persistence unit.
 	 * <p>In case of no unit name specified in the annotation, the specified value
 	 * for the {@link #setDefaultPersistenceUnitName default persistence unit}
 	 * will be taken (by default, the value mapped to the empty String),
 	 * or simply the single persistence unit if there is only one.
-	 * <p>This is mainly intended for use in a Java EE environment, with all lookup
+	 * <p>This is mainly intended for use in a Jakarta EE environment, with all lookup
 	 * driven by the standard JPA annotations, and all EntityManagerFactory
 	 * references obtained from JNDI. No separate EntityManagerFactory bean
 	 * definitions are necessary in such a scenario.
@@ -244,7 +244,7 @@ public void setResourceRef(boolean resourceRef) {
 	 * EntityManagers built on top of the EntityManagerFactory defined here.
 	 * Note that those will be Spring-managed EntityManagers, which implement
 	 * transaction synchronization based on Spring's facilities.
-	 * If you prefer the Java EE server's own EntityManager handling,
+	 * If you prefer the Jakarta EE server's own EntityManager handling,
 	 * specify corresponding "persistenceContexts"/"extendedPersistenceContexts".
 	 */
 	public void setPersistenceUnits(Map<String, String> persistenceUnits) {
@@ -256,17 +256,17 @@ public void setPersistenceUnits(Map<String, String> persistenceUnits) {
 	 * as a Map from persistence unit name to persistence context JNDI name
 	 * (which needs to resolve to an EntityManager instance).
 	 * <p>JNDI names specified here should refer to {@code persistence-context-ref}
-	 * entries in the Java EE deployment descriptors, matching the target persistence unit
+	 * entries in the Jakarta EE deployment descriptors, matching the target persistence unit
 	 * and being set up with persistence context type {@code Transaction}.
 	 * <p>In case of no unit name specified in the annotation, the specified value
 	 * for the {@link #setDefaultPersistenceUnitName default persistence unit}
 	 * will be taken (by default, the value mapped to the empty String),
 	 * or simply the single persistence unit if there is only one.
-	 * <p>This is mainly intended for use in a Java EE environment, with all
+	 * <p>This is mainly intended for use in a Jakarta EE environment, with all
 	 * lookup driven by the standard JPA annotations, and all EntityManager
 	 * references obtained from JNDI. No separate EntityManagerFactory bean
 	 * definitions are necessary in such a scenario, and all EntityManager
-	 * handling is done by the Java EE server itself.
+	 * handling is done by the Jakarta EE server itself.
 	 */
 	public void setPersistenceContexts(Map<String, String> persistenceContexts) {
 		this.persistenceContexts = persistenceContexts;
@@ -277,17 +277,17 @@ public void setPersistenceContexts(Map<String, String> persistenceContexts) {
 	 * as a Map from persistence unit name to persistence context JNDI name
 	 * (which needs to resolve to an EntityManager instance).
 	 * <p>JNDI names specified here should refer to {@code persistence-context-ref}
-	 * entries in the Java EE deployment descriptors, matching the target persistence unit
+	 * entries in the Jakarta EE deployment descriptors, matching the target persistence unit
 	 * and being set up with persistence context type {@code Extended}.
 	 * <p>In case of no unit name specified in the annotation, the specified value
 	 * for the {@link #setDefaultPersistenceUnitName default persistence unit}
 	 * will be taken (by default, the value mapped to the empty String),
 	 * or simply the single persistence unit if there is only one.
-	 * <p>This is mainly intended for use in a Java EE environment, with all
+	 * <p>This is mainly intended for use in a Jakarta EE environment, with all
 	 * lookup driven by the standard JPA annotations, and all EntityManager
 	 * references obtained from JNDI. No separate EntityManagerFactory bean
 	 * definitions are necessary in such a scenario, and all EntityManager
-	 * handling is done by the Java EE server itself.
+	 * handling is done by the Jakarta EE server itself.
 	 */
 	public void setExtendedPersistenceContexts(Map<String, String> extendedPersistenceContexts) {
 		this.extendedPersistenceContexts = extendedPersistenceContexts;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
index 60c37803cdaa..a3f465dc68d9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
@@ -16,8 +16,8 @@
 
 package org.springframework.orm.jpa.support;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -28,10 +28,10 @@
 import org.springframework.util.Assert;
 
 /**
- * {@link FactoryBean} that exposes a shared JPA {@link javax.persistence.EntityManager}
+ * {@link FactoryBean} that exposes a shared JPA {@link jakarta.persistence.EntityManager}
  * reference for a given EntityManagerFactory. Typically used for an EntityManagerFactory
  * created by {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean},
- * as direct alternative to a JNDI lookup for a Java EE server's EntityManager reference.
+ * as direct alternative to a JNDI lookup for a Jakarta EE server's EntityManager reference.
  *
  * <p>The shared EntityManager will behave just like an EntityManager fetched from an
  * application server's JNDI environment, as defined by the JPA specification.
@@ -65,9 +65,9 @@ public class SharedEntityManagerBean extends EntityManagerFactoryAccessor
 	 * Specify the EntityManager interface to expose.
 	 * <p>Default is the EntityManager interface as defined by the
 	 * EntityManagerFactoryInfo, if available. Else, the standard
-	 * {@code javax.persistence.EntityManager} interface will be used.
+	 * {@code jakarta.persistence.EntityManager} interface will be used.
 	 * @see org.springframework.orm.jpa.EntityManagerFactoryInfo#getEntityManagerInterface()
-	 * @see javax.persistence.EntityManager
+	 * @see jakarta.persistence.EntityManager
 	 */
 	public void setEntityManagerInterface(Class<? extends EntityManager> entityManagerInterface) {
 		Assert.notNull(entityManagerInterface, "'entityManagerInterface' must not be null");
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
index 37203ab9c4bb..8e6d0101f564 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
@@ -19,9 +19,9 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 
 import org.springframework.lang.Nullable;
 import org.springframework.orm.jpa.JpaDialect;
@@ -89,7 +89,7 @@ protected String getDatabasePlatform() {
 	 * persistence provider. For any more advanced needs, specify the appropriate
 	 * vendor-specific settings as "jpaProperties".
 	 * <p><b>NOTE: Do not set this flag to 'true' while also setting JPA 2.1's
-	 * {@code javax.persistence.schema-generation.database.action} property.</b>
+	 * {@code jakarta.persistence.schema-generation.database.action} property.</b>
 	 * These two schema generation mechanisms - standard JPA versus provider-native -
 	 * are mutually exclusive, e.g. with Hibernate 5.
 	 * @see org.springframework.orm.jpa.AbstractEntityManagerFactoryBean#setJpaProperties
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
index 30db932f1677..7fefab90c241 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
@@ -19,9 +19,8 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
 import org.eclipse.persistence.sessions.UnitOfWork;
 
 import org.springframework.jdbc.datasource.ConnectionHandle;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
index f3bc463226b0..b64258d9dbf0 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
@@ -20,9 +20,8 @@
 import java.util.Map;
 import java.util.logging.Level;
 
-import javax.persistence.EntityManager;
-import javax.persistence.spi.PersistenceProvider;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.spi.PersistenceProvider;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.eclipse.persistence.config.TargetDatabase;
 import org.eclipse.persistence.jpa.JpaEntityManager;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
index a6d82beb63c1..327f887f08ff 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
@@ -19,9 +19,8 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
index 090bd23b5135..b02e90d04f86 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
@@ -18,8 +18,7 @@
 
 import java.lang.reflect.Method;
 
-import javax.persistence.EntityManagerFactory;
-
+import jakarta.persistence.EntityManagerFactory;
 import org.hibernate.SessionFactory;
 
 import org.springframework.beans.factory.FactoryBean;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index ef3324db3523..5807200a9c2a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -19,12 +19,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.AvailableSettings;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java
index 32c6b4ed5247..f0e98f85456a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java
@@ -20,9 +20,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceUnitInfo;
-
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
index 8885d6eb7e02..30218d1dd861 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
@@ -19,11 +19,10 @@
 import java.lang.reflect.Proxy;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.testfixture.io.SerializationTestUtils;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
index 3220e271bf2f..084391597c1b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import javax.persistence.spi.PersistenceUnitInfo;
-
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
index 56a6d288a5eb..5a314c2fa376 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
@@ -16,11 +16,11 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
 import javax.sql.DataSource;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
index 69986ebf539a..765d62bfcfbe 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
@@ -19,10 +19,9 @@
 import java.lang.reflect.Proxy;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TransactionRequiredException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.TransactionRequiredException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.orm.jpa.domain.Person;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
index f87101156d23..a61c10cd0a33 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
@@ -19,11 +19,10 @@
 import java.lang.reflect.Proxy;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-import javax.persistence.TransactionRequiredException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Query;
+import jakarta.persistence.TransactionRequiredException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
index fedb323fba7a..12c75166f6f6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.OptimisticLockException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.OptimisticLockException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.transaction.TransactionDefinition;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
index 4525931ed531..b651f8eb6772 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
@@ -16,16 +16,15 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityExistsException;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
-import javax.persistence.TransactionRequiredException;
-
+import jakarta.persistence.EntityExistsException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.TransactionRequiredException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.dao.DataAccessException;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
index 3a53b2cb9a1d..881bccca79b6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
@@ -19,11 +19,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.RollbackException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.RollbackException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
index a2495d2267cc..d3741988e257 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
@@ -19,16 +19,15 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.persistence.spi.ProviderUtil;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
+import jakarta.persistence.spi.ProviderUtil;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
index 4d6b8095b955..b3d16aaf0093 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
@@ -19,11 +19,10 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.ProviderUtil;
-
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.spi.PersistenceProvider;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.ProviderUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java
index 86df24330b85..f2768122b78b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java
@@ -16,13 +16,12 @@
 
 package org.springframework.orm.jpa;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.ParameterMode;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TransactionRequiredException;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.ParameterMode;
+import jakarta.persistence.Query;
+import jakarta.persistence.StoredProcedureQuery;
+import jakarta.persistence.TransactionRequiredException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
index 4bb0082dde48..0a088e3efe74 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
@@ -16,9 +16,9 @@
 
 package org.springframework.orm.jpa.domain;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name="DRIVERS_LICENSE")
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
index 1586a2c25017..b8c0e564b147 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
@@ -16,16 +16,16 @@
 
 package org.springframework.orm.jpa.domain;
 
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ApplicationContext;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/PersonListener.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/PersonListener.java
index 072e2f9795bd..90a6e94e00d1 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/PersonListener.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/PersonListener.java
@@ -16,7 +16,7 @@
 
 package org.springframework.orm.jpa.domain;
 
-import javax.persistence.PostLoad;
+import jakarta.persistence.PostLoad;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
index 03206c523cee..c8c9e5e2854f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.orm.jpa.hibernate;
 
-import javax.persistence.EntityManager;
-
+import jakarta.persistence.EntityManager;
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
index 5653474b60d1..2a959616964c 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.orm.jpa.hibernate;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java
index 5eb4055b4170..5e5d848e1afc 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.orm.jpa.hibernate;
 
-import javax.persistence.AttributeConverter;
-
+import jakarta.persistence.AttributeConverter;
 import org.hibernate.SessionFactory;
 import org.hibernate.resource.beans.container.spi.BeanContainer;
 import org.hibernate.resource.beans.container.spi.ContainedBean;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
index d7a78f9e87b8..253c3a2f2478 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
@@ -21,10 +21,10 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.sql.DataSource;
 
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
index 70360c26dea6..1851fdfb622f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
@@ -21,12 +21,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.FilterChain;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.FilterChain;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
index 9d5fc76147ac..82e22136e0be 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
@@ -16,13 +16,12 @@
 
 package org.springframework.orm.jpa.support;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.SynchronizationType;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.SynchronizationType;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
index 919f2fb1259c..c38924840ab6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
@@ -24,13 +24,12 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceProperty;
-import javax.persistence.PersistenceUnit;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceProperty;
+import jakarta.persistence.PersistenceUnit;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.FactoryBean;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
index 4e344c183000..93f53e1e5110 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.orm.jpa.support;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.orm.jpa.EntityManagerHolder;
diff --git a/spring-orm/src/test/resources/org/springframework/orm/jpa/domain/spring.components b/spring-orm/src/test/resources/org/springframework/orm/jpa/domain/spring.components
index 4b6de536dfa4..f42629baebf7 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/jpa/domain/spring.components
+++ b/spring-orm/src/test/resources/org/springframework/orm/jpa/domain/spring.components
@@ -1,2 +1,2 @@
-org.springframework.orm.jpa.domain.Person=javax.persistence.Entity
-org.springframework.orm.jpa.domain.DriversLicense=javax.persistence.Entity
\ No newline at end of file
+org.springframework.orm.jpa.domain.Person=jakarta.persistence.Entity
+org.springframework.orm.jpa.domain.DriversLicense=jakarta.persistence.Entity
\ No newline at end of file
diff --git a/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-native.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-native.xml
index 95572a9f7599..90c0d836c1d1 100644
--- a/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-native.xml
+++ b/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-native.xml
@@ -28,6 +28,6 @@
 
 	<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
 
-	<bean id="invalid" class="javax.persistence.AttributeConverter" lazy-init="true"/>
+	<bean id="invalid" class="jakarta.persistence.AttributeConverter" lazy-init="true"/>
 
 </beans>
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index f47726a8bd5b..bce9c1517691 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -4,17 +4,8 @@ plugins {
 
 description = "Spring Object/XML Marshalling"
 
-configurations {
-	jibx
-}
-
-dependencies {
-	jibx "org.jibx:jibx-bind:1.3.3"
-	jibx "org.apache.bcel:bcel:6.0"
-}
-
 xjc {
-	xjcVersion = '2.2'
+	xjcVersion = '3.0'
 }
 
 sourceSets {
@@ -26,10 +17,9 @@ sourceSets {
 dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
-	optional("javax.xml.bind:jaxb-api")
-	optional("javax.activation:javax.activation-api")
+	optional("jakarta.xml.bind:jakarta.xml.bind-api")
+	optional("jakarta.activation:jakarta.activation-api")
 	optional("com.thoughtworks.xstream:xstream")
-	optional("org.jibx:jibx-run")
 	testImplementation(project(":spring-context"))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("org.ogce:xpp3")
@@ -42,25 +32,3 @@ dependencies {
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
-
-// JiBX compiler is currently not compatible with JDK 9+.
-// If testToolchain has been set, we assume the custom JDK version is 9+.
-if ((JavaVersion.current() == JavaVersion.VERSION_1_8) && !project.hasProperty("testToolchain")) {
-	compileTestJava {
-		def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
-
-		doLast() {
-			project.ant {
-				taskdef(name: "jibx",
-						classname: "org.jibx.binding.ant.CompileTask",
-						classpath: configurations.jibx.asPath)
-
-				jibx(verbose: false, load: true, binding: bindingXml) {
-					classpathset(dir: sourceSets.test.java.classesDirectory.get().getAsFile()) {
-						include(name: "**/jibx/**/*")
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
index 520d2a627d75..b989541fd35a 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
@@ -20,11 +20,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 176ccc83f8ba..7267f311cc08 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,22 +38,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.MarshalException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.UnmarshalException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.ValidationException;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.bind.attachment.AttachmentUnmarshaller;
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
@@ -70,6 +55,21 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.MarshalException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.UnmarshalException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.ValidationException;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.attachment.AttachmentMarshaller;
+import jakarta.xml.bind.attachment.AttachmentUnmarshaller;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.ls.LSResourceResolver;
@@ -275,11 +275,11 @@ public void setJaxbContextProperties(Map<String, ?> jaxbContextProperties) {
 	 * <p>These properties will be set on the underlying JAXB {@code Marshaller},
 	 * and allow for features such as indentation.
 	 * @param properties the properties
-	 * @see javax.xml.bind.Marshaller#setProperty(String, Object)
-	 * @see javax.xml.bind.Marshaller#JAXB_ENCODING
-	 * @see javax.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT
-	 * @see javax.xml.bind.Marshaller#JAXB_NO_NAMESPACE_SCHEMA_LOCATION
-	 * @see javax.xml.bind.Marshaller#JAXB_SCHEMA_LOCATION
+	 * @see jakarta.xml.bind.Marshaller#setProperty(String, Object)
+	 * @see jakarta.xml.bind.Marshaller#JAXB_ENCODING
+	 * @see jakarta.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT
+	 * @see jakarta.xml.bind.Marshaller#JAXB_NO_NAMESPACE_SCHEMA_LOCATION
+	 * @see jakarta.xml.bind.Marshaller#JAXB_SCHEMA_LOCATION
 	 */
 	public void setMarshallerProperties(Map<String, ?> properties) {
 		this.marshallerProperties = properties;
@@ -289,7 +289,7 @@ public void setMarshallerProperties(Map<String, ?> properties) {
 	 * Set the JAXB {@code Unmarshaller} properties.
 	 * <p>These properties will be set on the underlying JAXB {@code Unmarshaller}.
 	 * @param properties the properties
-	 * @see javax.xml.bind.Unmarshaller#setProperty(String, Object)
+	 * @see jakarta.xml.bind.Unmarshaller#setProperty(String, Object)
 	 */
 	public void setUnmarshallerProperties(Map<String, ?> properties) {
 		this.unmarshallerProperties = properties;
@@ -409,7 +409,7 @@ public void setCheckForXmlRootElement(boolean checkForXmlRootElement) {
 
 	/**
 	 * Specify a JAXB mapped class for partial unmarshalling.
-	 * @see javax.xml.bind.Unmarshaller#unmarshal(javax.xml.transform.Source, Class)
+	 * @see jakarta.xml.bind.Unmarshaller#unmarshal(javax.xml.transform.Source, Class)
 	 */
 	public void setMappedClass(Class<?> mappedClass) {
 		this.mappedClass = mappedClass;
@@ -574,7 +574,7 @@ private JAXBContext createJaxbContextFromPackages(String... packagesToScan) thro
 		}
 	}
 
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	private Schema loadSchema(Resource[] resources, String schemaLanguage) throws IOException, SAXException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Setting validation schema to " +
@@ -857,7 +857,7 @@ protected Object unmarshalStaxSource(Unmarshaller jaxbUnmarshaller, Source staxS
 		}
 	}
 
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	private Source processSource(Source source) {
 		if (StaxUtils.isStaxSource(source) || source instanceof DOMSource) {
 			return source;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
index 035457239516..11f24456d0a7 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
@@ -16,7 +16,7 @@
 
 package org.springframework.oxm.mime;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.java
index e9436034e818..503fb73315b3 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.java
@@ -16,7 +16,7 @@
 
 package org.springframework.oxm.jaxb;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class Airplane {
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
index 4457329e31ba..b76441b806a4 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
@@ -16,10 +16,10 @@
 
 package org.springframework.oxm.jaxb;
 
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlAttachmentRef;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.activation.DataHandler;
+import jakarta.xml.bind.annotation.XmlAttachmentRef;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(namespace = "http://springframework.org/spring-ws")
 public class BinaryObject {
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
index a0e88fef2689..07453a56864d 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
@@ -23,11 +23,6 @@
 import java.lang.reflect.Type;
 import java.util.Collections;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Result;
 import javax.xml.transform.sax.SAXResult;
@@ -35,6 +30,11 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
@@ -141,7 +141,7 @@ void properties() throws Exception {
 		Jaxb2Marshaller marshaller = new Jaxb2Marshaller();
 		marshaller.setContextPath(CONTEXT_PATH);
 		marshaller.setMarshallerProperties(
-				Collections.singletonMap(javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE));
+				Collections.singletonMap(jakarta.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE));
 		marshaller.afterPropertiesSet();
 	}
 
@@ -307,10 +307,10 @@ void marshalAWrappedObjectHoldingAnXmlElementDeclElement() throws Exception {
 
 	@Test  // SPR-10806
 	void unmarshalStreamSourceWithXmlOptions() throws Exception {
-		final javax.xml.bind.Unmarshaller unmarshaller = mock(javax.xml.bind.Unmarshaller.class);
+		final jakarta.xml.bind.Unmarshaller unmarshaller = mock(jakarta.xml.bind.Unmarshaller.class);
 		Jaxb2Marshaller marshaller = new Jaxb2Marshaller() {
 			@Override
-			public javax.xml.bind.Unmarshaller createUnmarshaller() {
+			public jakarta.xml.bind.Unmarshaller createUnmarshaller() {
 				return unmarshaller;
 			}
 		};
@@ -341,10 +341,10 @@ public javax.xml.bind.Unmarshaller createUnmarshaller() {
 
 	@Test  // SPR-10806
 	void unmarshalSaxSourceWithXmlOptions() throws Exception {
-		final javax.xml.bind.Unmarshaller unmarshaller = mock(javax.xml.bind.Unmarshaller.class);
+		final jakarta.xml.bind.Unmarshaller unmarshaller = mock(jakarta.xml.bind.Unmarshaller.class);
 		Jaxb2Marshaller marshaller = new Jaxb2Marshaller() {
 			@Override
-			public javax.xml.bind.Unmarshaller createUnmarshaller() {
+			public jakarta.xml.bind.Unmarshaller createUnmarshaller() {
 				return unmarshaller;
 			}
 		};
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
index 4a4b9c9998ce..0b9ac09b56f7 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
@@ -20,14 +20,14 @@
 import java.io.IOException;
 import java.io.StringReader;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.xml.bind.JAXBElement;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
+import jakarta.xml.bind.JAXBElement;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.ClassPathResource;
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
index 2f61fc4b669b..d02de24e8081 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
@@ -16,9 +16,10 @@
 
 package org.springframework.oxm.jaxb;
 
-import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
+import jakarta.xml.bind.JAXBElement;
+
 /**
  * Used by {@link org.springframework.oxm.jaxb.Jaxb2MarshallerTests}.
  *
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
index c5e3c2ae7ed3..14adba20759c 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
@@ -26,17 +26,18 @@
 import java.util.GregorianCalendar;
 import java.util.UUID;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.activation.URLDataSource;
 import javax.imageio.ImageIO;
-import javax.xml.bind.JAXBElement;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.activation.URLDataSource;
+import jakarta.xml.bind.JAXBElement;
+
 /**
  * Used by {@link org.springframework.oxm.jaxb.Jaxb2MarshallerTests}.
  *
@@ -58,7 +59,7 @@ public StandardClasses() throws DatatypeConfigurationException {
 	javax.xml.datatype.Duration
 	java.lang.Object
 	java.awt.Image
-	javax.activation.DataHandler
+	jakarta.activation.DataHandler
 	javax.xml.transform.Source
 	java.util.UUID
 		 */
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java
index 458385eda86e..547367c856d8 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java
@@ -16,11 +16,12 @@
 
 package org.springframework.oxm.jaxb;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
 @XmlRegistry
 public class XmlRegObjectFactory {
 
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 365ce7d316f9..8d0e2076243c 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -14,21 +14,21 @@ dependencies {
 	optional(project(":spring-webflux"))
 	optional(project(":spring-webmvc"))
 	optional(project(":spring-websocket"))
-	optional("javax.activation:javax.activation-api")
-	optional("javax.el:javax.el-api")
-	optional("javax.inject:javax.inject")
-	optional("javax.servlet:javax.servlet-api")
-	optional("javax.servlet.jsp:javax.servlet.jsp-api")
-	optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api")
-	optional("javax.xml.bind:jaxb-api")
-	optional("javax.websocket:javax.websocket-api")
+	optional("jakarta.activation:jakarta.activation-api")
+	optional("jakarta.el:jakarta.el-api")
+	optional("jakarta.inject:jakarta.inject-api")
+	optional("jakarta.servlet:jakarta.servlet-api")
+	optional("jakarta.servlet.jsp:jakarta.servlet.jsp-api")
+	optional("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api")
+	optional("jakarta.xml.bind:jakarta.xml.bind-api")
+	optional("jakarta.websocket:jakarta.websocket-api")
 	optional("junit:junit")
+	optional("org.apache.tomcat.embed:tomcat-embed-core")
 	optional("org.junit.jupiter:junit-jupiter-api")
 	optional("org.testng:testng")
 	optional("org.aspectj:aspectjweaver")
 	optional("org.codehaus.groovy:groovy")
 	optional("org.hamcrest:hamcrest")
-	optional("org.apache.taglibs:taglibs-standard-jstlel")
 	optional("net.sourceforge.htmlunit:htmlunit")
 	optional("org.seleniumhq.selenium:htmlunit-driver") {
 		exclude group: "net.bytebuddy", module: "byte-buddy"
@@ -39,7 +39,6 @@ dependencies {
 	optional("org.xmlunit:xmlunit-matchers")
 	optional("org.skyscreamer:jsonassert")
 	optional("com.jayway.jsonpath:json-path")
-	optional("commons-fileupload:commons-fileupload")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("io.projectreactor:reactor-test")
@@ -52,14 +51,14 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-tx")))
 	testImplementation(testFixtures(project(":spring-web")))
-	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("jakarta.annotation:jakarta.annotation-api")
 	testImplementation("javax.cache:cache-api")
-	testImplementation("javax.ejb:javax.ejb-api")
-	testImplementation("javax.interceptor:javax.interceptor-api")
-	testImplementation("javax.mail:javax.mail-api")
-	testImplementation("org.hibernate:hibernate-core")
+	testImplementation("jakarta.ejb:jakarta.ejb-api")
+	testImplementation("jakarta.interceptor:jakarta.interceptor-api")
+	testImplementation("jakarta.mail:jakarta.mail-api")
+	testImplementation("org.hibernate:hibernate-core-jakarta")
 	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("javax.validation:validation-api")
+	testImplementation("jakarta.validation:jakarta.validation-api")
 	testImplementation("org.junit.platform:junit-platform-runner") {
 		exclude group: "junit", module: "junit"
 	}
@@ -67,9 +66,6 @@ dependencies {
 	testImplementation("com.fasterxml.jackson.core:jackson-databind")
 	testImplementation("com.thoughtworks.xstream:xstream")
 	testImplementation("com.rometools:rome")
-	testImplementation("org.apache.tiles:tiles-api")
-	testImplementation("org.apache.tiles:tiles-core")
-	testImplementation("org.apache.tiles:tiles-servlet")
 	testImplementation("org.hsqldb:hsqldb")
 	testImplementation("org.apache.httpcomponents:httpclient")
 	testImplementation("io.projectreactor.netty:reactor-netty-http")
@@ -77,7 +73,7 @@ dependencies {
 	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
 		exclude group: "junit", module: "junit"
 	}
-	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("org.glassfish:jakarta.el")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 2d6110b6926f..802dcaf32c43 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -39,7 +39,7 @@
  * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
- * able to use traditional Java EE data access code outside of a Java EE
+ * able to use traditional Jakarta EE data access code outside of a Jakarta EE
  * container.
  *
  * <p>There are various choices for DataSource implementations:
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
index fc31fe57512a..b2ec4eaacaa7 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
@@ -7,7 +7,7 @@
  *
  * <p>Useful for setting up a simple JNDI environment for test suites
  * or stand-alone applications. If, for example, JDBC DataSources get bound to the
- * same JNDI names as within a Java EE container, both application code and
+ * same JNDI names as within a Jakarta EE container, both application code and
  * configuration can be reused without changes.
  */
 @NonNullApi
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
index 4b69e1649156..1be569c22173 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -19,13 +19,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
 
 import org.springframework.util.Assert;
 
 /**
- * Delegating implementation of {@link javax.servlet.ServletInputStream}.
+ * Delegating implementation of {@link jakarta.servlet.ServletInputStream}.
  *
  * <p>Used by {@link MockHttpServletRequest}; typically not directly
  * used for testing application controllers.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 9fa54fed4822..41ff6b15b7d2 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -19,13 +19,13 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 
 import org.springframework.util.Assert;
 
 /**
- * Delegating implementation of {@link javax.servlet.ServletOutputStream}.
+ * Delegating implementation of {@link jakarta.servlet.ServletOutputStream}.
  *
  * <p>Used by {@link MockHttpServletResponse}; typically not directly
  * used for testing application controllers.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
index f3c6fcc1ad65..982d4e3b261e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
@@ -20,15 +20,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.lang.Nullable;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
index a8c31873b041..85ee83f89feb 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
@@ -21,14 +21,14 @@
 import java.io.StringReader;
 import java.io.Writer;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.BodyContent;
 
 import org.springframework.lang.Nullable;
 
 /**
- * Mock implementation of the {@link javax.servlet.jsp.tagext.BodyContent} class.
+ * Mock implementation of the {@link jakarta.servlet.jsp.tagext.BodyContent} class.
  * Only necessary for testing applications when testing custom JSP tags.
  *
  * @author Juergen Hoeller
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
index 372898cd5a36..a00d67e335d3 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
@@ -20,7 +20,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.lang.Nullable;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
deleted file mode 100644
index bfd549ac5dc5..000000000000
--- a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- * 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.mock.web;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
-import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
-
-/**
- * Mock implementation of the JSP 2.0 {@link javax.servlet.jsp.el.ExpressionEvaluator}
- * interface, delegating to the Apache JSTL {@link ExpressionEvaluatorManager}.
- * Only necessary for testing applications when testing custom JSP tags.
- *
- * <p>Note that the Apache JSTL implementation (jstl.jar, standard.jar) has to be
- * available on the classpath to use this expression evaluator.
- *
- * @author Juergen Hoeller
- * @since 1.1.5
- * @see org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager
- */
-@SuppressWarnings("deprecation")
-public class MockExpressionEvaluator extends javax.servlet.jsp.el.ExpressionEvaluator {
-
-	private final PageContext pageContext;
-
-
-	/**
-	 * Create a new MockExpressionEvaluator for the given PageContext.
-	 * @param pageContext the JSP PageContext to run in
-	 */
-	public MockExpressionEvaluator(PageContext pageContext) {
-		this.pageContext = pageContext;
-	}
-
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public javax.servlet.jsp.el.Expression parseExpression(final String expression, final Class expectedType,
-			final javax.servlet.jsp.el.FunctionMapper functionMapper) throws javax.servlet.jsp.el.ELException {
-
-		return new javax.servlet.jsp.el.Expression() {
-			@Override
-			public Object evaluate(javax.servlet.jsp.el.VariableResolver variableResolver) throws javax.servlet.jsp.el.ELException {
-				return doEvaluate(expression, expectedType, functionMapper);
-			}
-		};
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Object evaluate(String expression, Class expectedType, javax.servlet.jsp.el.VariableResolver variableResolver,
-			javax.servlet.jsp.el.FunctionMapper functionMapper) throws javax.servlet.jsp.el.ELException {
-
-		return doEvaluate(expression, expectedType, functionMapper);
-	}
-
-	@SuppressWarnings("rawtypes")
-	protected Object doEvaluate(String expression, Class expectedType, javax.servlet.jsp.el.FunctionMapper functionMapper)
-			throws javax.servlet.jsp.el.ELException {
-
-		try {
-			return ExpressionEvaluatorManager.evaluate("JSP EL expression", expression, expectedType, this.pageContext);
-		}
-		catch (JspException ex) {
-			throw new javax.servlet.jsp.el.ELException("Parsing of JSP EL expression \"" + expression + "\" failed", ex);
-		}
-	}
-
-}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
index 0f60d941476a..39b874b1664d 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
@@ -22,20 +22,20 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.FilterChain} interface.
+ * Mock implementation of the {@link jakarta.servlet.FilterChain} interface.
  *
  * <p>A {@link MockFilterChain} can be configured with one or more filters and a
  * Servlet to invoke. The first time the chain is called, it invokes all filters
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
index 172dd6468738..4755b5168353 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
@@ -21,17 +21,17 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.FilterConfig} interface.
+ * Mock implementation of the {@link jakarta.servlet.FilterConfig} interface.
  *
  * <p>Used for testing the web framework; also useful for testing
- * custom {@link javax.servlet.Filter} implementations.
+ * custom {@link jakarta.servlet.Filter} implementations.
  *
  * @author Juergen Hoeller
  * @since 1.0.2
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletMapping.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletMapping.java
index 62664d5dac32..17615a3bdcf9 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletMapping.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletMapping.java
@@ -16,8 +16,8 @@
 
 package org.springframework.mock.web;
 
-import javax.servlet.http.HttpServletMapping;
-import javax.servlet.http.MappingMatch;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.MappingMatch;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
index e12c278baca2..1a3e7102e9e1 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -43,20 +43,20 @@
 import java.util.TimeZone;
 import java.util.stream.Collectors;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -71,7 +71,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface.
+ * Mock implementation of the {@link jakarta.servlet.http.HttpServletRequest} interface.
  *
  * <p>The default, preferred {@link Locale} for the <em>server</em> mocked by this request
  * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale}
@@ -820,7 +820,7 @@ private void updateAcceptLanguageHeader() {
 	 * <p>In contrast to the Servlet specification, this mock implementation
 	 * does <strong>not</strong> take into consideration any locales
 	 * specified via the {@code Accept-Language} header.
-	 * @see javax.servlet.ServletRequest#getLocale()
+	 * @see jakarta.servlet.ServletRequest#getLocale()
 	 * @see #addPreferredLocale(Locale)
 	 * @see #setPreferredLocales(List)
 	 */
@@ -838,7 +838,7 @@ public Locale getLocale() {
 	 * <p>In contrast to the Servlet specification, this mock implementation
 	 * does <strong>not</strong> take into consideration any locales
 	 * specified via the {@code Accept-Language} header.
-	 * @see javax.servlet.ServletRequest#getLocales()
+	 * @see jakarta.servlet.ServletRequest#getLocales()
 	 * @see #addPreferredLocale(Locale)
 	 * @see #setPreferredLocales(List)
 	 */
@@ -861,7 +861,7 @@ public void setSecure(boolean secure) {
 	/**
 	 * Return {@code true} if the {@link #setSecure secure} flag has been set
 	 * to {@code true} or if the {@link #getScheme scheme} is {@code https}.
-	 * @see javax.servlet.ServletRequest#isSecure()
+	 * @see jakarta.servlet.ServletRequest#isSecure()
 	 */
 	@Override
 	public boolean isSecure() {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index a1b3eca3b08d..df02fa4deba8 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -38,9 +38,9 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -51,7 +51,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface.
+ * Mock implementation of the {@link jakarta.servlet.http.HttpServletResponse} interface.
  *
  * <p>As of Spring Framework 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
@@ -383,7 +383,7 @@ public void reset() {
 
 	@Override
 	public void setLocale(@Nullable Locale locale) {
-		// Although the Javadoc for javax.servlet.ServletResponse.setLocale(Locale) does not
+		// Although the Javadoc for jakarta.servlet.ServletResponse.setLocale(Locale) does not
 		// state how a null value for the supplied Locale should be handled, both Tomcat and
 		// Jetty simply ignore a null value. So we do the same here.
 		if (locale == null) {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
index fb8e8bdddd49..244880d8d798 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
@@ -25,17 +25,17 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.http.HttpSessionBindingListener;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.http.HttpSession} interface.
+ * Mock implementation of the {@link jakarta.servlet.http.HttpSession} interface.
  *
  * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
@@ -149,7 +149,7 @@ public int getMaxInactiveInterval() {
 	}
 
 	@Override
-	public javax.servlet.http.HttpSessionContext getSessionContext() {
+	public jakarta.servlet.http.HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException("getSessionContext");
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
index 5eabb13e27a7..b99202c1e530 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
@@ -20,13 +20,13 @@
 import java.io.PrintWriter;
 import java.io.Writer;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspWriter;
 
 import org.springframework.lang.Nullable;
 
 /**
- * Mock implementation of the {@link javax.servlet.jsp.JspWriter} class.
+ * Mock implementation of the {@link jakarta.servlet.jsp.JspWriter} class.
  * Only necessary for testing applications when testing custom JSP tags.
  *
  * @author Juergen Hoeller
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
index 15153dcea3e4..af199e423362 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
@@ -24,9 +24,9 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.Part;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
index 565da0386e1b..9911449917c9 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,24 +24,24 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import javax.el.ELContext;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import jakarta.el.ELContext;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.jsp.PageContext} interface.
+ * Mock implementation of the {@link jakarta.servlet.jsp.PageContext} interface.
  * Only necessary for testing applications when testing custom JSP tags.
  *
  * <p>Note: Expects initialization via the constructor rather than via the
@@ -293,8 +293,9 @@ public JspWriter getOut() {
 
 	@Override
 	@Deprecated
-	public javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() {
-		return new MockExpressionEvaluator(this);
+	@Nullable
+	public jakarta.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() {
+		return null;
 	}
 
 	@Override
@@ -306,7 +307,7 @@ public ELContext getELContext() {
 	@Override
 	@Deprecated
 	@Nullable
-	public javax.servlet.jsp.el.VariableResolver getVariableResolver() {
+	public jakarta.servlet.jsp.el.VariableResolver getVariableResolver() {
 		return null;
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPart.java b/spring-test/src/main/java/org/springframework/mock/web/MockPart.java
index d68dd3b3095c..f706aabbda74 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockPart.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockPart.java
@@ -22,7 +22,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -30,7 +30,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of {@code javax.servlet.http.Part}.
+ * Mock implementation of {@code jakarta.servlet.http.Part}.
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
index eb8d976539d8..9a34e6b45cce 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
@@ -16,18 +16,17 @@
 
 package org.springframework.mock.web;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.RequestDispatcher} interface.
+ * Mock implementation of the {@link jakarta.servlet.RequestDispatcher} interface.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
index 1f2208a10bcb..08b7d4826a31 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
@@ -21,14 +21,14 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.ServletConfig} interface.
+ * Mock implementation of the {@link jakarta.servlet.ServletConfig} interface.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
index 232faade3c34..736d44168ef1 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
@@ -31,17 +31,16 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -59,7 +58,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.ServletContext} interface.
+ * Mock implementation of the {@link jakarta.servlet.ServletContext} interface.
  *
  * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
@@ -663,7 +662,7 @@ public <T extends Servlet> T createServlet(Class<T> c) throws ServletException {
 
 	/**
 	 * This method always returns {@code null}.
-	 * @see javax.servlet.ServletContext#getServletRegistration(java.lang.String)
+	 * @see jakarta.servlet.ServletContext#getServletRegistration(java.lang.String)
 	 */
 	@Override
 	@Nullable
@@ -673,7 +672,7 @@ public ServletRegistration getServletRegistration(String servletName) {
 
 	/**
 	 * This method always returns an {@linkplain Collections#emptyMap empty map}.
-	 * @see javax.servlet.ServletContext#getServletRegistrations()
+	 * @see jakarta.servlet.ServletContext#getServletRegistrations()
 	 */
 	@Override
 	public Map<String, ? extends ServletRegistration> getServletRegistrations() {
@@ -702,7 +701,7 @@ public <T extends Filter> T createFilter(Class<T> c) throws ServletException {
 
 	/**
 	 * This method always returns {@code null}.
-	 * @see javax.servlet.ServletContext#getFilterRegistration(java.lang.String)
+	 * @see jakarta.servlet.ServletContext#getFilterRegistration(java.lang.String)
 	 */
 	@Override
 	@Nullable
@@ -712,7 +711,7 @@ public FilterRegistration getFilterRegistration(String filterName) {
 
 	/**
 	 * This method always returns an {@linkplain Collections#emptyMap empty map}.
-	 * @see javax.servlet.ServletContext#getFilterRegistrations()
+	 * @see jakarta.servlet.ServletContext#getFilterRegistrations()
 	 */
 	@Override
 	public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java
index 8ea88f1a8bc5..3a98a87a6027 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java
@@ -16,16 +16,16 @@
 
 package org.springframework.mock.web;
 
-import javax.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionCookieConfig;
 
 import org.springframework.lang.Nullable;
 
 /**
- * Mock implementation of the {@link javax.servlet.SessionCookieConfig} interface.
+ * Mock implementation of the {@link jakarta.servlet.SessionCookieConfig} interface.
  *
  * @author Juergen Hoeller
  * @since 4.0
- * @see javax.servlet.ServletContext#getSessionCookieConfig()
+ * @see jakarta.servlet.ServletContext#getSessionCookieConfig()
  */
 public class MockSessionCookieConfig implements SessionCookieConfig {
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
index dfc5f7b303ab..03fbfac1051c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
@@ -18,26 +18,26 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Implementation of the {@link javax.servlet.FilterConfig} interface which
+ * Implementation of the {@link jakarta.servlet.FilterConfig} interface which
  * simply passes the call through to a given Filter/FilterChain combination
  * (indicating the next Filter in the chain along with the FilterChain that it is
  * supposed to work on) or to a given Servlet (indicating the end of the chain).
  *
  * @author Juergen Hoeller
  * @since 2.0.3
- * @see javax.servlet.Filter
- * @see javax.servlet.Servlet
+ * @see jakarta.servlet.Filter
+ * @see jakarta.servlet.Servlet
  * @see MockFilterChain
  */
 public class PassThroughFilterChain implements FilterChain {
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
index 9eaabcb4f035..8b65d08e2b61 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
@@ -57,7 +57,7 @@
  * {@link org.springframework.stereotype.Component @Component},
  * {@link org.springframework.stereotype.Service @Service},
  * {@link org.springframework.stereotype.Repository @Repository}, etc.)</li>
- * <li>A JSR-330 compliant class that is annotated with {@code javax.inject} annotations</li>
+ * <li>A JSR-330 compliant class that is annotated with {@code jakarta.inject} annotations</li>
  * <li>Any class that contains {@link org.springframework.context.annotation.Bean @Bean}-methods</li>
  * <li>Any other class that is intended to be registered as a Spring component (i.e., a Spring bean
  * in the {@code ApplicationContext}), potentially taking advantage of automatic autowiring of a
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
index 232846264a1d..8856f6d89c87 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
@@ -72,8 +72,8 @@ public interface ContextLoader {
 	 * contexts} loaded by this ContextLoader. Beans will therefore automatically
 	 * be candidates for annotation-based dependency injection using
 	 * {@link org.springframework.beans.factory.annotation.Autowired @Autowired},
-	 * {@link javax.annotation.Resource @Resource}, and
-	 * {@link javax.inject.Inject @Inject}.
+	 * {@link jakarta.annotation.Resource @Resource}, and
+	 * {@link jakarta.inject.Inject @Inject}.
 	 * <p>Any ApplicationContext loaded by a ContextLoader <strong>must</strong>
 	 * register a JVM shutdown hook for itself. Unless the context gets closed
 	 * early, all context instances will be automatically closed on JVM
diff --git a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
index dfdd198c45fc..f59be7fc4f99 100644
--- a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
@@ -101,8 +101,8 @@ public interface SmartContextLoader extends ContextLoader {
 	 * {@code SmartContextLoader}. Beans will therefore automatically be
 	 * candidates for annotation-based dependency injection using
 	 * {@link org.springframework.beans.factory.annotation.Autowired @Autowired},
-	 * {@link javax.annotation.Resource @Resource}, and
-	 * {@link javax.inject.Inject @Inject}. In addition, concrete implementations
+	 * {@link jakarta.annotation.Resource @Resource}, and
+	 * {@link jakarta.inject.Inject @Inject}. In addition, concrete implementations
 	 * should set the active bean definition profiles in the context's
 	 * {@link org.springframework.core.env.Environment Environment}.
 	 * <p>Any {@code ApplicationContext} loaded by a
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
index c363dd2d671c..e42545a46994 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.web;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
index b981840f9ba5..3051524eb899 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.web;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java
index b375615283f7..cc86220b62d5 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java
@@ -21,16 +21,16 @@
 import java.util.Collections;
 import java.util.Set;
 
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.Session;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
 
 /**
- * Mock implementation of the {@link javax.websocket.server.ServerContainer} interface.
+ * Mock implementation of the {@link jakarta.websocket.server.ServerContainer} interface.
  *
  * @author Sam Brannen
  * @since 4.3.1
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
index 1a8e129f80a9..c746941672bf 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.web.socket;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.lang.Nullable;
@@ -27,7 +27,7 @@
 /**
  * {@link ContextCustomizer} that instantiates a new {@link MockServerContainer}
  * and stores it in the {@code ServletContext} under the attribute named
- * {@code "javax.websocket.server.ServerContainer"}.
+ * {@code "jakarta.websocket.server.ServerContainer"}.
  *
  * @author Sam Brannen
  * @since 4.3.1
@@ -40,7 +40,7 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
 			WebApplicationContext wac = (WebApplicationContext) context;
 			ServletContext sc = wac.getServletContext();
 			if (sc != null) {
-				sc.setAttribute("javax.websocket.server.ServerContainer", new MockServerContainer());
+				sc.setAttribute("jakarta.websocket.server.ServerContainer", new MockServerContainer());
 			}
 		}
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java
index e69b2bab0726..0cb74f154c0e 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java
@@ -42,7 +42,7 @@ class MockServerContainerContextCustomizerFactory implements ContextCustomizerFa
 	private static final String MOCK_SERVER_CONTAINER_CONTEXT_CUSTOMIZER_CLASS_NAME =
 			"org.springframework.test.context.web.socket.MockServerContainerContextCustomizer";
 
-	private static final boolean webSocketPresent = ClassUtils.isPresent("javax.websocket.server.ServerContainer",
+	private static final boolean webSocketPresent = ClassUtils.isPresent("jakarta.websocket.server.ServerContainer",
 			MockServerContainerContextCustomizerFactory.class.getClassLoader());
 
 
diff --git a/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java b/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
index 2197d861b0b0..419374b95767 100644
--- a/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
@@ -45,12 +45,12 @@
  * {@code public} setter methods for properties in a domain entity.</li>
  * <li>Spring's support for annotations such as
  * {@link org.springframework.beans.factory.annotation.Autowired @Autowired},
- * {@link javax.inject.Inject @Inject}, and
- * {@link javax.annotation.Resource @Resource} which provides dependency
+ * {@link jakarta.inject.Inject @Inject}, and
+ * {@link jakarta.annotation.Resource @Resource} which provides dependency
  * injection for {@code private} or {@code protected} fields, setter methods,
  * and configuration methods.</li>
- * <li>Use of annotations such as {@link javax.annotation.PostConstruct @PostConstruct}
- * and {@link javax.annotation.PreDestroy @PreDestroy} for lifecycle callback
+ * <li>Use of annotations such as {@link jakarta.annotation.PostConstruct @PostConstruct}
+ * and {@link jakarta.annotation.PreDestroy @PreDestroy} for lifecycle callback
  * methods.</li>
  * </ul>
  *
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index ec883b02a41c..0ce6350a5da6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,32 +16,36 @@
 
 package org.springframework.test.web.client.match;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.apache.tomcat.util.http.fileupload.FileUpload;
+import org.apache.tomcat.util.http.fileupload.UploadContext;
+import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
 import org.hamcrest.Matcher;
 import org.w3c.dom.Node;
 
 import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.converter.FormHttpMessageConverter;
+import org.springframework.lang.Nullable;
 import org.springframework.mock.http.MockHttpInputMessage;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.util.JsonExpectationsHelper;
 import org.springframework.test.util.XmlExpectationsHelper;
 import org.springframework.test.web.client.RequestMatcher;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StreamUtils;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.springframework.test.util.AssertionErrors.assertEquals;
@@ -217,7 +221,7 @@ public RequestMatcher multipartDataContains(Map<String, ?> expectedMap) {
 	@SuppressWarnings("ConstantConditions")
 	private RequestMatcher multipartData(MultiValueMap<String, ?> expectedMap, boolean containsExactly) {
 		return request -> {
-			MultiValueMap<String, ?> actualMap = MultipartHelper.parse(request);
+			MultiValueMap<String, ?> actualMap = MultipartHelper.parse((MockClientHttpRequest) request);
 			if (containsExactly) {
 				assertEquals("Multipart request content: " + actualMap, expectedMap.size(), actualMap.size());
 			}
@@ -235,8 +239,8 @@ private RequestMatcher multipartData(MultiValueMap<String, ?> expectedMap, boole
 						expected = StreamUtils.copyToByteArray(((Resource) expected).getInputStream());
 					}
 					if (expected instanceof byte[]) {
-						assertTrue("Multipart is not a file", actual instanceof MultipartFile);
-						assertEquals("Multipart content", expected, ((MultipartFile) actual).getBytes());
+						assertTrue("Multipart is not a file", actual instanceof byte[]);
+						assertEquals("Multipart content", expected, (byte[]) actual);
 					}
 					else if (expected instanceof String) {
 						assertTrue("Multipart is not a String", actual instanceof String);
@@ -356,28 +360,42 @@ public final void match(ClientHttpRequest request) throws IOException, Assertion
 
 	private static class MultipartHelper {
 
-		public static MultiValueMap<String, ?> parse(ClientHttpRequest request) {
-			MultipartHttpServletRequest servletRequest = adaptToMultipartRequest(request);
-			MultiValueMap<String, Object> result = new LinkedMultiValueMap<>();
-			for (Map.Entry<String, List<MultipartFile>> entry : servletRequest.getMultiFileMap().entrySet()) {
-				for (MultipartFile value : entry.getValue()) {
-					result.add(entry.getKey(), value);
+		public static MultiValueMap<String, ?> parse(MockClientHttpRequest request) {
+			try {
+				FileUpload fileUpload = new FileUpload(new DiskFileItemFactory());
+
+				List<FileItem> fileItems = fileUpload.parseRequest(new UploadContext() {
+					private final byte[] body = request.getBodyAsBytes();
+					@Override
+					@Nullable
+					public String getCharacterEncoding() {
+						return request.getHeaders().getFirst(HttpHeaders.CONTENT_ENCODING);
+					}
+					@Override
+					@Nullable
+					public String getContentType() {
+						return request.getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
+					}
+					@Override
+					public InputStream getInputStream() {
+						return new ByteArrayInputStream(this.body);
+					}
+					@Override
+					public long contentLength() {
+						return this.body.length;
+					}
+				});
+
+				MultiValueMap<String, Object> result = new LinkedMultiValueMap<>();
+				for (FileItem fileItem : fileItems) {
+					result.add(fileItem.getFieldName(),
+							(fileItem.isFormField() ? fileItem.getString() : fileItem.get()));
 				}
+				return result;
 			}
-			for (Map.Entry<String, String[]> entry : servletRequest.getParameterMap().entrySet()) {
-				for (String value : entry.getValue()) {
-					result.add(entry.getKey(), value);
-				}
+			catch (Exception ex) {
+				throw new IllegalStateException("Failed to parse multipart request", ex);
 			}
-			return result;
-		}
-
-		private static MultipartHttpServletRequest adaptToMultipartRequest(ClientHttpRequest request) {
-			MockClientHttpRequest source = (MockClientHttpRequest) request;
-			MockHttpServletRequest target = new MockHttpServletRequest();
-			target.setContent(source.getBodyAsBytes());
-			source.getHeaders().forEach((name, values) -> values.forEach(v -> target.addHeader(name, v)));
-			return new CommonsMultipartResolver().resolveMultipart(target);
 		}
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index 0c8a28c7fd69..16a968e9a852 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -20,13 +20,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.springframework.beans.Mergeable;
 import org.springframework.lang.Nullable;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
index d635b00b1bab..7ea2eac36338 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
@@ -19,8 +19,8 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.ServletException;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletException;
 
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.lang.Nullable;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
index db14261075d3..e6537d810d35 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
@@ -16,7 +16,7 @@
 
 package org.springframework.test.web.servlet;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java b/spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
index 8c9a4f9fb7ac..6d97dfce3485 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
@@ -20,10 +20,10 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.mock.web.MockAsyncContext;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
index cf1b2d60fe8a..e9ccb32e6b30 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.test.web.servlet.client;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 
 import org.springframework.http.client.reactive.ClientHttpConnector;
 import org.springframework.test.web.reactive.server.WebTestClient;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java
index 705e89432b7c..edfd28361e29 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java
@@ -23,8 +23,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.http.Cookie;
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.ResolvableType;
@@ -166,7 +165,7 @@ private MockHttpServletRequestBuilder initRequestBuilder(
 									buffer.read(partBytes);
 									DataBufferUtils.release(buffer);
 
-									// Adapt to javax.servlet.http.Part...
+									// Adapt to jakarta.servlet.http.Part...
 									MockPart mockPart = (part instanceof FilePart ?
 											new MockPart(part.name(), ((FilePart) part).filename(), partBytes) :
 											new MockPart(part.name(), partBytes));
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
index a59879f795d4..2738797ad09b 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
@@ -17,7 +17,7 @@
 
 import java.util.function.Supplier;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.client.reactive.ClientHttpConnector;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index 7d76e63e7511..16df1e7e4894 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -33,17 +33,16 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 import com.gargoylesoftware.htmlunit.CookieManager;
 import com.gargoylesoftware.htmlunit.FormEncodingType;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
 import com.gargoylesoftware.htmlunit.util.KeyDataPair;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.Mergeable;
 import org.springframework.http.MediaType;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java
index cbe396dc861b..e7d3eb3e3129 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java
@@ -85,7 +85,7 @@ public MockMvcWebConnection(MockMvc mockMvc, WebClient webClient) {
 	 * Create a new instance with the specified context path.
 	 * <p>The path may be {@code null} in which case the first path segment
 	 * of the URL is turned into the contextPath. Otherwise it must conform
-	 * to {@link javax.servlet.http.HttpServletRequest#getContextPath()}
+	 * to {@link jakarta.servlet.http.HttpServletRequest#getContextPath()}
 	 * which states that it can be an empty string and otherwise must start
 	 * with a "/" character and not end with a "/" character.
 	 * @param mockMvc the {@code MockMvc} instance to use (never {@code null})
@@ -105,7 +105,7 @@ public MockMvcWebConnection(MockMvc mockMvc, WebClient webClient, @Nullable Stri
 	/**
 	 * Validate the supplied {@code contextPath}.
 	 * <p>If the value is not {@code null}, it must conform to
-	 * {@link javax.servlet.http.HttpServletRequest#getContextPath()} which
+	 * {@link jakarta.servlet.http.HttpServletRequest#getContextPath()} which
 	 * states that it can be an empty string and otherwise must start with
 	 * a "/" character and not end with a "/" character.
 	 * @param contextPath the path to validate
@@ -155,10 +155,10 @@ private MockHttpServletResponse getResponse(RequestBuilder requestBuilder) throw
 		return resultActions.andReturn().getResponse();
 	}
 
-	private void storeCookies(WebRequest webRequest, javax.servlet.http.Cookie[] cookies) {
+	private void storeCookies(WebRequest webRequest, jakarta.servlet.http.Cookie[] cookies) {
 		Date now = new Date();
 		CookieManager cookieManager = this.webClient.getCookieManager();
-		for (javax.servlet.http.Cookie cookie : cookies) {
+		for (jakarta.servlet.http.Cookie cookie : cookies) {
 			if (cookie.getDomain() == null) {
 				cookie.setDomain(webRequest.getUrl().getHost());
 			}
@@ -173,7 +173,7 @@ private void storeCookies(WebRequest webRequest, javax.servlet.http.Cookie[] coo
 		}
 	}
 
-	private static com.gargoylesoftware.htmlunit.util.Cookie createCookie(javax.servlet.http.Cookie cookie) {
+	private static com.gargoylesoftware.htmlunit.util.Cookie createCookie(jakarta.servlet.http.Cookie cookie) {
 		Date expires = null;
 		if (cookie.getMaxAge() > -1) {
 			expires = new Date(System.currentTimeMillis() + cookie.getMaxAge() * 1000);
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index c4ec1cd91733..e7122070f130 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -30,10 +30,10 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.Mergeable;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -185,7 +185,7 @@ private static URI initUri(String url, Object[] vars) {
 	 * the requestURI. This is because most applications don't actually depend
 	 * on the name under which they're deployed. If specified here, the context
 	 * path must start with a "/" and must not end with a "/".
-	 * @see javax.servlet.http.HttpServletRequest#getContextPath()
+	 * @see jakarta.servlet.http.HttpServletRequest#getContextPath()
 	 */
 	public MockHttpServletRequestBuilder contextPath(String contextPath) {
 		if (StringUtils.hasText(contextPath)) {
@@ -207,7 +207,7 @@ public MockHttpServletRequestBuilder contextPath(String contextPath) {
 	 * {@code "/accounts/1"} as opposed to {@code "/main/accounts/1"}.
 	 * If specified here, the servletPath must start with a "/" and must not
 	 * end with a "/".
-	 * @see javax.servlet.http.HttpServletRequest#getServletPath()
+	 * @see jakarta.servlet.http.HttpServletRequest#getServletPath()
 	 */
 	public MockHttpServletRequestBuilder servletPath(String servletPath) {
 		if (StringUtils.hasText(servletPath)) {
@@ -224,7 +224,7 @@ public MockHttpServletRequestBuilder servletPath(String servletPath) {
 	 * by removing the contextPath and the servletPath from the requestURI and using any
 	 * remaining part. If specified here, the pathInfo must start with a "/".
 	 * <p>If specified, the pathInfo will be used as-is.
-	 * @see javax.servlet.http.HttpServletRequest#getPathInfo()
+	 * @see jakarta.servlet.http.HttpServletRequest#getPathInfo()
 	 */
 	public MockHttpServletRequestBuilder pathInfo(@Nullable String pathInfo) {
 		if (StringUtils.hasText(pathInfo)) {
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
index 73a0a3bd29db..e9a8b694493e 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
@@ -26,8 +26,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.Part;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
index 068320216f64..c9e7dbc74cc3 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
@@ -18,7 +18,7 @@
 
 import java.net.URI;
 
-import javax.servlet.DispatcherType;
+import jakarta.servlet.DispatcherType;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index f2d9360107f1..c91b2631ced0 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -20,10 +20,10 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
+import jakarta.servlet.http.HttpServletResponse;
 import org.hamcrest.Matcher;
 import org.w3c.dom.Node;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
index a548731f2abc..a8a40a29c448 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.result;
 
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.http.Cookie;
 import org.hamcrest.Matcher;
 
 import org.springframework.test.web.servlet.MvcResult;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
index f0ea1c5b658d..f9539b1a6a0a 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -21,9 +21,9 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
index 926e3f4349ff..2cd6f3b9fc28 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
@@ -18,9 +18,8 @@
 
 import java.util.concurrent.Callable;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import org.hamcrest.Matcher;
 
 import org.springframework.lang.Nullable;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
index e5ed43ce30aa..dcf4b06b687e 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
@@ -20,8 +20,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.ServletContext;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.mock.web.MockServletConfig;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
index 45b9f05d04a4..fcd96945c261 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
@@ -18,7 +18,7 @@
 
 import java.nio.charset.Charset;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 
 import org.springframework.test.web.servlet.DispatcherServletCustomizer;
 import org.springframework.test.web.servlet.MockMvcBuilder;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
index 4e47244f655c..7b72cc947461 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
@@ -16,7 +16,7 @@
 
 package org.springframework.test.web.servlet.setup;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.Assert;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
index 60bab94c01ef..71b523d7971d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
@@ -45,7 +45,7 @@ private MockMvcBuilders() {
 	 * <p>The {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}
 	 * will use the context to discover Spring MVC infrastructure and application
 	 * controllers in it. The context must have been configured with a
-	 * {@link javax.servlet.ServletContext ServletContext}.
+	 * {@link jakarta.servlet.ServletContext ServletContext}.
 	 */
 	public static DefaultMockMvcBuilder webAppContextSetup(WebApplicationContext context) {
 		return new DefaultMockMvcBuilder(context);
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
index 1966016813c4..2bcb3135b843 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
@@ -20,13 +20,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.util.Assert;
 import org.springframework.web.util.UrlPathHelper;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.java
index 7fcc663134a3..d12bca60d824 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/SharedHttpSessionConfigurer.java
@@ -16,7 +16,7 @@
 
 package org.springframework.test.web.servlet.setup;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.lang.Nullable;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index 1675a4940348..ac94d5c103fc 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
index c5271e8d18e8..368bd0bede23 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt
index e997204d3fd0..d00d9fe6c951 100644
--- a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt
+++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt
@@ -24,7 +24,7 @@ import org.springframework.test.web.servlet.request.RequestPostProcessor
 import org.springframework.util.MultiValueMap
 import java.security.Principal
 import java.util.*
-import javax.servlet.http.Cookie
+import jakarta.servlet.http.Cookie
 
 /**
  * Provide a [MockHttpServletRequestBuilder] Kotlin DSL in order to be able to write idiomatic Kotlin code.
diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt
index 1a2e83745a7d..e2b3ad565cf7 100644
--- a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt
+++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt
@@ -18,7 +18,7 @@ package org.springframework.test.web.servlet
 
 import org.springframework.mock.web.MockMultipartFile
 import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder
-import javax.servlet.http.Part
+import jakarta.servlet.http.Part
 
 /**
  * Provide a [MockMultipartHttpServletRequestBuilder] Kotlin DSL in order to be able to write idiomatic Kotlin code.
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java
index 4babe4467a32..de0a06343eec 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java
@@ -18,14 +18,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
index 6ade7c90a710..19c428eae0c1 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
@@ -30,8 +30,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
index fe0f90f7b500..bc4ebd8a9ea0 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
@@ -24,9 +24,8 @@
 import java.util.Collection;
 import java.util.Locale;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java
index a27c0f12c402..d20693b2d204 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java
@@ -18,9 +18,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
-
+import jakarta.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.http.HttpSessionBindingListener;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
index d9026333731e..6ab8d15b259d 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.mock.web;
 
-import javax.servlet.jsp.PageContext;
-
+import jakarta.servlet.jsp.PageContext;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
index fd26ff1e25ce..e9ef2635f8b3 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
@@ -21,10 +21,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRegistration;
-
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletRegistration;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/GroovySpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/groovy/GroovySpringContextTests.java
index ae020512502a..fd3034b4524d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/groovy/GroovySpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/groovy/GroovySpringContextTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.groovy;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/ControllerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/ControllerIntegrationTests.java
index c9a689f1ac74..d12afba4c47c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/ControllerIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/ControllerIntegrationTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.hierarchies.web;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests.java b/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests.java
index bb48aefa72db..b4485ebf1ed9 100644
--- a/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.hierarchies.web;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
index 5112f3770d35..1c95a609d2b4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.junit4;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
index 4f17e973e110..710957ab233d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.test.context.junit4;
 
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-
+import jakarta.annotation.Resource;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
index 6c0dc92e9001..d75539d4ebbc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.junit4.orm;
 
-import javax.persistence.PersistenceException;
-
+import jakarta.persistence.PersistenceException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.exception.ConstraintViolationException;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java
index 11e4d9e86961..e7889b92399f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.test.context.junit4.spr4868;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.After;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/LifecycleBean.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/LifecycleBean.java
index be527d05a90c..fe452ee03fc4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/LifecycleBean.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/LifecycleBean.java
@@ -16,9 +16,8 @@
 
 package org.springframework.test.context.junit4.spr4868;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1.java
index 4726b44119b0..9567ddd3b863 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1.java
@@ -16,9 +16,9 @@
 
 package org.springframework.test.context.junit4.spr8849;
 
-import javax.annotation.Resource;
 import javax.sql.DataSource;
 
+import jakarta.annotation.Resource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2.java
index 2b0c99398d53..0cca42550432 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2.java
@@ -16,9 +16,9 @@
 
 package org.springframework.test.context.junit4.spr8849;
 
-import javax.annotation.Resource;
 import javax.sql.DataSource;
 
+import jakarta.annotation.Resource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass3.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass3.java
index 953ee8e471d2..1d978e8524e5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass3.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass3.java
@@ -16,9 +16,9 @@
 
 package org.springframework.test.context.junit4.spr8849;
 
-import javax.annotation.Resource;
 import javax.sql.DataSource;
 
+import jakarta.annotation.Resource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass4.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass4.java
index 4f4f76f4bb76..7a6a189549fc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass4.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass4.java
@@ -16,9 +16,9 @@
 
 package org.springframework.test.context.junit4.spr8849;
 
-import javax.annotation.Resource;
 import javax.sql.DataSource;
 
+import jakarta.annotation.Resource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java
index 64876355d053..2a8c01156c2e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9051;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Simple POJO that contains lifecycle callbacks.
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
index 3da61007d1ee..191f03683fa6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.testng;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/AbstractEjbTxDaoTestNGTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/AbstractEjbTxDaoTestNGTests.java
index 98eae227ce6c..3b56ad3f3298 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/AbstractEjbTxDaoTestNGTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/AbstractEjbTxDaoTestNGTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.test.context.testng.transaction.ejb;
 
-import javax.ejb.EJB;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
+import jakarta.ejb.EJB;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
index 14bead449f18..e919453d2f42 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
@@ -18,8 +18,7 @@
 
 import java.io.File;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.testng.annotations.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/AbstractEjbTxDaoTests.java b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/AbstractEjbTxDaoTests.java
index a98ce7135cc5..03183be05c6e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/AbstractEjbTxDaoTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/AbstractEjbTxDaoTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.test.context.transaction.ejb;
 
-import javax.ejb.EJB;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
+import jakarta.ejb.EJB;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/AbstractEjbTxTestEntityDao.java b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/AbstractEjbTxTestEntityDao.java
index ed518cfc257c..f1bd39dcaf94 100644
--- a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/AbstractEjbTxTestEntityDao.java
+++ b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/AbstractEjbTxTestEntityDao.java
@@ -16,9 +16,9 @@
 
 package org.springframework.test.context.transaction.ejb.dao;
 
-import javax.ejb.TransactionAttribute;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import org.springframework.test.context.transaction.ejb.model.TestEntity;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiredEjbTxTestEntityDao.java b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiredEjbTxTestEntityDao.java
index f87fa0aa97da..667e6acbe87e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiredEjbTxTestEntityDao.java
+++ b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiredEjbTxTestEntityDao.java
@@ -16,10 +16,10 @@
 
 package org.springframework.test.context.transaction.ejb.dao;
 
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 /**
  * EJB implementation of {@link TestEntityDao} which declares transaction
diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiresNewEjbTxTestEntityDao.java b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiresNewEjbTxTestEntityDao.java
index e9957398501d..b7e9281c7c86 100644
--- a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiresNewEjbTxTestEntityDao.java
+++ b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiresNewEjbTxTestEntityDao.java
@@ -16,10 +16,10 @@
 
 package org.springframework.test.context.transaction.ejb.dao;
 
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 /**
  * EJB implementation of {@link TestEntityDao} which declares transaction
diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/model/TestEntity.java b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/model/TestEntity.java
index 9f1cd44840bb..79a87ac9908d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/model/TestEntity.java
+++ b/spring-test/src/test/java/org/springframework/test/context/transaction/ejb/model/TestEntity.java
@@ -16,10 +16,10 @@
 
 package org.springframework.test.context.transaction.ejb.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * Test entity for EJB transaction support in the TestContext framework.
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java
index facccee81efc..32a13490a22e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java
@@ -18,8 +18,7 @@
 
 import java.io.File;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/JUnit4SpringContextWebTests.java b/spring-test/src/test/java/org/springframework/test/context/web/JUnit4SpringContextWebTests.java
index 4119039364e7..a24e430b87d2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/JUnit4SpringContextWebTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/JUnit4SpringContextWebTests.java
@@ -18,8 +18,7 @@
 
 import java.io.File;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java b/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
index 3e0e84fc9c40..d9f0109ca0af 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.web;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.web.context.ServletContextAware;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/socket/WebSocketServletServerContainerFactoryBeanTests.java b/spring-test/src/test/java/org/springframework/test/context/web/socket/WebSocketServletServerContainerFactoryBeanTests.java
index 42fecb9d3afb..b508f44d64b4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/socket/WebSocketServletServerContainerFactoryBeanTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/socket/WebSocketServletServerContainerFactoryBeanTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.context.web.socket;
 
-import javax.websocket.server.ServerContainer;
-
+import jakarta.websocket.server.ServerContainer;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
index f0b41c658ac9..676592741381 100644
--- a/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
+++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
@@ -16,8 +16,8 @@
 
 package org.springframework.test.util.subpackage;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
diff --git a/spring-test/src/test/java/org/springframework/test/web/Person.java b/spring-test/src/test/java/org/springframework/test/web/Person.java
index 61e83c129be9..2282b70dc304 100644
--- a/spring-test/src/test/java/org/springframework/test/web/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/web/Person.java
@@ -16,8 +16,8 @@
 
 package org.springframework.test.web;
 
-import javax.validation.constraints.NotNull;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.springframework.util.ObjectUtils;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
index b36c9c9a068b..2210fcf08bcd 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
@@ -38,13 +37,7 @@
  */
 public class ContentRequestMatchersTests {
 
-	private MockClientHttpRequest request;
-
-
-	@BeforeEach
-	public void setUp() {
-		this.request = new MockClientHttpRequest();
-	}
+	private final MockClientHttpRequest request = new MockClientHttpRequest();
 
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java
index 9f70ea77980c..850bcb208daa 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/match/MultipartRequestMatchersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ public class MultipartRequestMatchersTests {
 
 
 	@BeforeEach
-	public void setUp() {
+	public void setup() {
 		this.request.getHeaders().setContentType(MediaType.MULTIPART_FORM_DATA);
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java
index 897a3fc36f67..23994b1b9852 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatchersIntegrationTests.java
@@ -22,12 +22,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java
index 6654a579f40e..d48d6d881ad7 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java
@@ -24,12 +24,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
index 23c2115e1d76..7dfd5189ddda 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
@@ -15,10 +15,9 @@
  */
 package org.springframework.test.web.reactive.server.samples;
 
-import javax.xml.bind.annotation.XmlRootElement;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 class Person {
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java
index 870c7231e056..fef7d629a2b2 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java
@@ -21,11 +21,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HelloController.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HelloController.java
index 848aa7042250..d430cdcd80bf 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HelloController.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HelloController.java
@@ -16,7 +16,7 @@
 
 package org.springframework.test.web.servlet.htmlunit;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index 96ebbb4ed529..5e3fdaa3f606 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -28,11 +28,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
-
 import com.gargoylesoftware.htmlunit.FormEncodingType;
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -40,6 +35,10 @@
 import com.gargoylesoftware.htmlunit.util.KeyDataPair;
 import com.gargoylesoftware.htmlunit.util.MimeType;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java
index 20abbd53e5d5..c2040c84912a 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java
@@ -19,12 +19,11 @@
 import java.io.IOException;
 import java.net.URL;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebConnection;
 import com.gargoylesoftware.htmlunit.WebRequest;
 import com.gargoylesoftware.htmlunit.WebResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
index ea425f63b413..ca50d3d90e2b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
@@ -19,14 +19,13 @@
 import java.io.IOException;
 import java.net.URL;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
 import com.gargoylesoftware.htmlunit.WebResponse;
 import com.gargoylesoftware.htmlunit.util.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.Configuration;
@@ -157,13 +156,13 @@ String cookie(@CookieValue(name = COOKIE_NAME, defaultValue = "NA") String cooki
 
 		@PostMapping(path = "/", produces = "text/plain")
 		String setCookie(@RequestParam String cookie, HttpServletResponse response) {
-			response.addCookie(new javax.servlet.http.Cookie(COOKIE_NAME, cookie));
+			response.addCookie(new jakarta.servlet.http.Cookie(COOKIE_NAME, cookie));
 			return "Set";
 		}
 
 		@DeleteMapping(path = "/", produces = "text/plain")
 		String deleteCookie(HttpServletResponse response) {
-			javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(COOKIE_NAME, "");
+			jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(COOKIE_NAME, "");
 			cookie.setMaxAge(0);
 			response.addCookie(cookie);
 			return "Delete";
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java
index eb4797cd0e74..9b6a102a2f4b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java
@@ -20,11 +20,10 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import javax.servlet.http.Cookie;
-
 import com.gargoylesoftware.htmlunit.WebRequest;
 import com.gargoylesoftware.htmlunit.WebResponse;
 import com.gargoylesoftware.htmlunit.util.NameValuePair;
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
index ee85328fc552..d817f25194ff 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
@@ -18,9 +18,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.gargoylesoftware.htmlunit.util.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
index b493cbbca4d0..6cdf99d09fce 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
@@ -29,9 +29,8 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
index 22263b909596..b58e329a3d61 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.request;
 
-import javax.servlet.http.Part;
-
+import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpMethod;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
index f91c39fda969..c7c3cab6772f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
@@ -22,9 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpSession;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java
index 7f27c859c6d7..3026b5af21b1 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/JavaConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,9 +39,7 @@
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 
 import static org.mockito.BDDMockito.given;
 
@@ -84,14 +82,6 @@ void person() {
 				.expectBody().json("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}");
 	}
 
-	@Test
-	void tilesDefinitions() {
-		testClient.get().uri("/")
-				.exchange()
-				.expectStatus().isOk()
-				.expectHeader().valueEquals("Forwarded-Url", "/WEB-INF/layouts/standardLayout.jsp");
-	}
-
 
 	@Configuration
 	static class RootConfig {
@@ -128,18 +118,6 @@ public void addViewControllers(ViewControllerRegistry registry) {
 		public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
 			configurer.enable();
 		}
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.tiles();
-		}
-
-		@Bean
-		TilesConfigurer tilesConfigurer() {
-			TilesConfigurer configurer = new TilesConfigurer();
-			configurer.setDefinitions("/WEB-INF/**/tiles.xml");
-			return configurer;
-		}
 	}
 
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java
index ec356ba0721c..58e58104d602 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/WebAppResourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,16 +60,6 @@ public void setup() {
 		this.testClient = MockMvcWebTestClient.bindToApplicationContext(this.wac).build();
 	}
 
-	// TilesConfigurer: resources under "/WEB-INF/**/tiles.xml"
-
-	@Test
-	public void tilesDefinitions() {
-		testClient.get().uri("/")
-				.exchange()
-				.expectStatus().isOk()
-				.expectHeader().valueEquals("Forwarded-Url", "/WEB-INF/layouts/standardLayout.jsp");
-	}
-
 	// Resources served via <mvc:resources/>
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java
index f3364da57952..84fa33c0d56b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/context/XmlConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,12 +73,4 @@ public void person() {
 				.expectBody().json("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}");
 	}
 
-	@Test
-	public void tilesDefinitions() {
-		testClient.get().uri("/")
-				.exchange()
-				.expectStatus().isOk()
-				.expectHeader().valueEquals("Forwarded-Url", "/WEB-INF/layouts/standardLayout.jsp");
-	}
-
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java
index 3016c00d7940..6adae504d183 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/FilterTests.java
@@ -20,19 +20,18 @@
 import java.security.Principal;
 import java.util.concurrent.CompletableFuture;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncListener;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import javax.validation.Valid;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import jakarta.validation.Valid;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java
index b60a0e6f6e37..66a60d16dd6b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/MultipartControllerTests.java
@@ -23,13 +23,12 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java
index 18c48affbcf1..0bd139cf9b79 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RedirectTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.samples.client.standalone;
 
-import javax.validation.Valid;
-
+import jakarta.validation.Valid;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.stereotype.Controller;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ResponseBodyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ResponseBodyTests.java
index 1f8cd1f787c7..691a60e8040e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ResponseBodyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ResponseBodyTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.samples.client.standalone;
 
-import javax.validation.constraints.NotNull;
-
+import jakarta.validation.constraints.NotNull;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
index 629ada4fa9a8..61ccee4fb326 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
@@ -18,9 +18,8 @@
 
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ModelAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ModelAssertionTests.java
index 76384b3b4370..3794eb416719 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ModelAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/ModelAssertionTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.samples.client.standalone.resultmatches;
 
-import javax.validation.Valid;
-
+import jakarta.validation.Valid;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpMethod;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java
index a60845993762..029b76861597 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XmlContentAssertionTests.java
@@ -19,12 +19,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java
index b464c4224907..e7f50190afcf 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java
@@ -21,12 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
index 9cde95fe2ce3..48646aa92a3a 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.samples.context;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -42,9 +41,7 @@
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -52,7 +49,6 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -130,13 +126,6 @@ public void andExpectAllWithMultipleFailures() {
 			.satisfies(error -> assertThat(error.getSuppressed()).hasSize(2));
 	}
 
-	@Test
-	public void tilesDefinitions() throws Exception {
-		this.mockMvc.perform(get("/"))
-			.andExpect(status().isOk())
-			.andExpect(forwardedUrl("/WEB-INF/layouts/standardLayout.jsp"));
-	}
-
 	/**
 	 * Verify that the breaking change introduced in <a
 	 * href="https://jira.spring.io/browse/SPR-12553">SPR-12553</a> has been reverted.
@@ -202,18 +191,6 @@ public void addViewControllers(ViewControllerRegistry registry) {
 		public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
 			configurer.enable();
 		}
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.tiles();
-		}
-
-		@Bean
-		public TilesConfigurer tilesConfigurer() {
-			TilesConfigurer configurer = new TilesConfigurer();
-			configurer.setDefinitions("/WEB-INF/**/tiles.xml");
-			return configurer;
-		}
 	}
 
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
index 57c3b1737a8b..b4c46125c7e1 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,14 +60,6 @@ public void setup() {
 		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).alwaysExpect(status().isOk()).build();
 	}
 
-	// TilesConfigurer: resources under "/WEB-INF/**/tiles.xml"
-
-	@Test
-	public void tilesDefinitions() throws Exception {
-		this.mockMvc.perform(get("/"))
-			.andExpect(forwardedUrl("/WEB-INF/layouts/standardLayout.jsp"));
-	}
-
 	// Resources served via <mvc:resources/>
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
index 783aead74799..bda280e7e95c 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
@@ -75,11 +74,4 @@ public void person() throws Exception {
 			.andExpect(content().string("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}"));
 	}
 
-	@Test
-	public void tilesDefinitions() throws Exception {
-		this.mockMvc.perform(get("/"))//
-		.andExpect(status().isOk())//
-		.andExpect(forwardedUrl("/WEB-INF/layouts/standardLayout.jsp"));
-	}
-
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java
index acf32025509b..e9aa203f394c 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/CustomRequestAttributesRequestContextHolderTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.test.web.servlet.samples.spr;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java
index 8cdafdf10c88..be54c77e7f07 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java
@@ -18,11 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
index 93bb514d195b..07b359ee6e39 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
@@ -20,20 +20,19 @@
 import java.security.Principal;
 import java.util.concurrent.CompletableFuture;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncListener;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import javax.validation.Valid;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import jakarta.validation.Valid;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/MultipartControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/MultipartControllerTests.java
index a00dd2774e3a..e61d50f0d6e4 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/MultipartControllerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/MultipartControllerTests.java
@@ -23,14 +23,13 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
index 0981973439a6..60df4a8fffdc 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.samples.standalone;
 
-import javax.validation.Valid;
-
+import jakarta.validation.Valid;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
index 9d47134e0fb6..726743039a13 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
@@ -18,9 +18,8 @@
 
 import java.io.StringWriter;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.test.web.servlet.result.PrintingResultHandler;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
index 1600c095263a..87986b2a0145 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
@@ -18,9 +18,8 @@
 
 import java.io.StringWriter;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
index a22b760bc82f..1f5e4471e0ac 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
-import javax.validation.Valid;
-
+import jakarta.validation.Valid;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
index 11540766e5e8..a2abe1f75b3c 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java
@@ -19,12 +19,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
index 4bd5d2fc3dd5..3bece04be76d 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
@@ -21,12 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
index 9fbc3c94569c..ffaa26a02a48 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
@@ -16,13 +16,12 @@
 
 package org.springframework.test.web.servlet.setup;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java
index 31f308cff655..92d194f51395 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/SharedHttpSessionTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.test.web.servlet.setup;
 
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.HttpSession;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.stereotype.Controller;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
index d55800e1817b..463ad1807308 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
@@ -18,14 +18,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ser.impl.UnknownSerializer;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.converter.json.SpringHandlerInstantiator;
diff --git a/spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml b/spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
index 0c442c5d7b8a..7322877fbb5f 100644
--- a/spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml
@@ -5,31 +5,16 @@
 		http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-    <mvc:annotation-driven />
+    <mvc:annotation-driven/>
 
     <bean class="org.springframework.test.web.servlet.samples.context.PersonController">
         <constructor-arg ref="personDao"/>
     </bean>
 
-    <mvc:view-controller path="/" view-name="home" />
+    <mvc:view-controller path="/" view-name="home"/>
 
-    <mvc:resources mapping="/resources/**" location="/resources/" />
+    <mvc:resources mapping="/resources/**" location="/resources/"/>
 
-    <mvc:default-servlet-handler />
-
-    <bean id="viewResolver"
-        class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-        <property name="viewClass"
-            value="org.springframework.web.servlet.view.tiles3.TilesView" />
-    </bean>
-
-    <bean id="tilesConfigurer"
-        class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
-        <property name="definitions">
-            <value>
-                /WEB-INF/**/tiles.xml
-			</value>
-        </property>
-    </bean>
+    <mvc:default-servlet-handler/>
 
 </beans>
\ No newline at end of file
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
index f3ec8c3f3ac3..293804e78cd6 100644
--- a/spring-tx/spring-tx.gradle
+++ b/spring-tx/spring-tx.gradle
@@ -7,11 +7,10 @@ dependencies {
 	api(project(":spring-core"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
-	optional("javax.ejb:javax.ejb-api")
-	optional("javax.interceptor:javax.interceptor-api")
-	optional("javax.resource:javax.resource-api")
-	optional("javax.transaction:javax.transaction-api")
-	optional("com.ibm.websphere:uow")
+	optional("jakarta.ejb:jakarta.ejb-api")
+	optional("jakarta.interceptor:jakarta.interceptor-api")
+	optional("jakarta.resource:jakarta.resource-api")
+	optional("jakarta.transaction:jakarta.transaction-api")
 	optional("io.projectreactor:reactor-core")
 	optional("io.vavr:vavr")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
@@ -23,6 +22,6 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("org.aspectj:aspectjweaver")
 	testImplementation("org.codehaus.groovy:groovy")
-	testImplementation("org.eclipse.persistence:javax.persistence")
+	testImplementation("jakarta.persistence:jakarta.persistence-api")
 	testImplementation("io.projectreactor:reactor-test")
 }
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
deleted file mode 100644
index 5685b061c97b..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import javax.resource.ResourceException;
-
-import org.springframework.dao.DataAccessResourceFailureException;
-
-/**
- * Exception thrown when the creating of a CCI Record failed
- * for connector-internal reasons.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class CannotCreateRecordException extends DataAccessResourceFailureException {
-
-	/**
-	 * Constructor for CannotCreateRecordException.
-	 * @param msg message
-	 * @param ex the root ResourceException cause
-	 */
-	public CannotCreateRecordException(String msg, ResourceException ex) {
-		super(msg, ex);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
deleted file mode 100644
index dcd68cecc409..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import javax.resource.ResourceException;
-
-import org.springframework.dao.DataAccessResourceFailureException;
-
-/**
- * Fatal exception thrown when we can't connect to an EIS using CCI.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class CannotGetCciConnectionException extends DataAccessResourceFailureException {
-
-	/**
-	 * Constructor for CannotGetCciConnectionException.
-	 * @param msg message
-	 * @param ex the root ResourceException cause
-	 */
-	public CannotGetCciConnectionException(String msg, ResourceException ex) {
-		super(msg, ex);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
deleted file mode 100644
index bc2d9df4be81..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import javax.resource.ResourceException;
-
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
-
-/**
- * Exception thrown when the connector doesn't support a specific CCI operation.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class CciOperationNotSupportedException extends InvalidDataAccessResourceUsageException {
-
-	/**
-	 * Constructor for CciOperationNotSupportedException.
-	 * @param msg message
-	 * @param ex the root ResourceException cause
-	 */
-	public CciOperationNotSupportedException(String msg, ResourceException ex) {
-		super(msg, ex);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
deleted file mode 100644
index f7a1895cf9ca..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import java.sql.SQLException;
-
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
-
-/**
- * Exception thrown when a ResultSet has been accessed in an invalid fashion.
- * Such exceptions always have a {@code java.sql.SQLException} root cause.
- *
- * <p>This typically happens when an invalid ResultSet column index or name
- * has been specified.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see javax.resource.cci.ResultSet
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class InvalidResultSetAccessException extends InvalidDataAccessResourceUsageException {
-
-	/**
-	 * Constructor for InvalidResultSetAccessException.
-	 * @param msg message
-	 * @param ex the root cause
-	 */
-	public InvalidResultSetAccessException(String msg, SQLException ex) {
-		super(ex.getMessage(), ex);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
deleted file mode 100644
index b4e9bacc7a4b..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import javax.resource.ResourceException;
-
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
-
-/**
- * Exception thrown when the creating of a CCI Record failed because
- * the connector doesn't support the desired CCI Record type.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class RecordTypeNotSupportedException extends InvalidDataAccessResourceUsageException {
-
-	/**
-	 * Constructor for RecordTypeNotSupportedException.
-	 * @param msg message
-	 * @param ex the root ResourceException cause
-	 */
-	public RecordTypeNotSupportedException(String msg, ResourceException ex) {
-		super(msg, ex);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
deleted file mode 100644
index 4b0ad9d51c03..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import javax.resource.NotSupportedException;
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.spi.LocalTransactionException;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.CannotCreateTransactionException;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionSystemException;
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-import org.springframework.transaction.support.ResourceTransactionManager;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.transaction.PlatformTransactionManager} implementation
- * that manages local transactions for a single CCI ConnectionFactory.
- * Binds a CCI Connection from the specified ConnectionFactory to the thread,
- * potentially allowing for one thread-bound Connection per ConnectionFactory.
- *
- * <p>Application code is required to retrieve the CCI Connection via
- * {@link ConnectionFactoryUtils#getConnection(ConnectionFactory)} instead of a standard
- * Java EE-style {@link ConnectionFactory#getConnection()} call. Spring classes such as
- * {@link org.springframework.jca.cci.core.CciTemplate} use this strategy implicitly.
- * If not used in combination with this transaction manager, the
- * {@link ConnectionFactoryUtils} lookup strategy behaves exactly like the native
- * DataSource lookup; it can thus be used in a portable fashion.
- *
- * <p>Alternatively, you can allow application code to work with the standard
- * Java EE lookup pattern {@link ConnectionFactory#getConnection()}, for example
- * for legacy code that is not aware of Spring at all. In that case, define a
- * {@link TransactionAwareConnectionFactoryProxy} for your target ConnectionFactory,
- * which will automatically participate in Spring-managed transactions.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see ConnectionFactoryUtils#getConnection(javax.resource.cci.ConnectionFactory)
- * @see ConnectionFactoryUtils#releaseConnection
- * @see TransactionAwareConnectionFactoryProxy
- * @see org.springframework.jca.cci.core.CciTemplate
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class CciLocalTransactionManager extends AbstractPlatformTransactionManager
-		implements ResourceTransactionManager, InitializingBean {
-
-	@Nullable
-	private ConnectionFactory connectionFactory;
-
-
-	/**
-	 * Create a new CciLocalTransactionManager instance.
-	 * A ConnectionFactory has to be set to be able to use it.
-	 * @see #setConnectionFactory
-	 */
-	public CciLocalTransactionManager() {
-	}
-
-	/**
-	 * Create a new CciLocalTransactionManager instance.
-	 * @param connectionFactory the CCI ConnectionFactory to manage local transactions for
-	 */
-	public CciLocalTransactionManager(ConnectionFactory connectionFactory) {
-		setConnectionFactory(connectionFactory);
-		afterPropertiesSet();
-	}
-
-
-	/**
-	 * Set the CCI ConnectionFactory that this instance should manage local
-	 * transactions for.
-	 */
-	public void setConnectionFactory(@Nullable ConnectionFactory cf) {
-		if (cf instanceof TransactionAwareConnectionFactoryProxy) {
-			// If we got a TransactionAwareConnectionFactoryProxy, we need to perform transactions
-			// for its underlying target ConnectionFactory, else JMS access code won't see
-			// properly exposed transactions (i.e. transactions for the target ConnectionFactory).
-			this.connectionFactory = ((TransactionAwareConnectionFactoryProxy) cf).getTargetConnectionFactory();
-		}
-		else {
-			this.connectionFactory = cf;
-		}
-	}
-
-	/**
-	 * Return the CCI ConnectionFactory that this instance manages local
-	 * transactions for.
-	 */
-	@Nullable
-	public ConnectionFactory getConnectionFactory() {
-		return this.connectionFactory;
-	}
-
-	private ConnectionFactory obtainConnectionFactory() {
-		ConnectionFactory connectionFactory = getConnectionFactory();
-		Assert.state(connectionFactory != null, "No ConnectionFactory set");
-		return connectionFactory;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (getConnectionFactory() == null) {
-			throw new IllegalArgumentException("Property 'connectionFactory' is required");
-		}
-	}
-
-
-	@Override
-	public Object getResourceFactory() {
-		return obtainConnectionFactory();
-	}
-
-	@Override
-	protected Object doGetTransaction() {
-		CciLocalTransactionObject txObject = new CciLocalTransactionObject();
-		ConnectionHolder conHolder =
-				(ConnectionHolder) TransactionSynchronizationManager.getResource(obtainConnectionFactory());
-		txObject.setConnectionHolder(conHolder);
-		return txObject;
-	}
-
-	@Override
-	protected boolean isExistingTransaction(Object transaction) {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) transaction;
-		// Consider a pre-bound connection as transaction.
-		return txObject.hasConnectionHolder();
-	}
-
-	@Override
-	protected void doBegin(Object transaction, TransactionDefinition definition) {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) transaction;
-		ConnectionFactory connectionFactory = obtainConnectionFactory();
-		Connection con = null;
-
-		try {
-			con = connectionFactory.getConnection();
-			if (logger.isDebugEnabled()) {
-				logger.debug("Acquired Connection [" + con + "] for local CCI transaction");
-			}
-
-			ConnectionHolder connectionHolder = new ConnectionHolder(con);
-			connectionHolder.setSynchronizedWithTransaction(true);
-
-			con.getLocalTransaction().begin();
-			int timeout = determineTimeout(definition);
-			if (timeout != TransactionDefinition.TIMEOUT_DEFAULT) {
-				connectionHolder.setTimeoutInSeconds(timeout);
-			}
-
-			txObject.setConnectionHolder(connectionHolder);
-			TransactionSynchronizationManager.bindResource(connectionFactory, connectionHolder);
-		}
-		catch (NotSupportedException ex) {
-			ConnectionFactoryUtils.releaseConnection(con, connectionFactory);
-			throw new CannotCreateTransactionException("CCI Connection does not support local transactions", ex);
-		}
-		catch (LocalTransactionException ex) {
-			ConnectionFactoryUtils.releaseConnection(con, connectionFactory);
-			throw new CannotCreateTransactionException("Could not begin local CCI transaction", ex);
-		}
-		catch (Throwable ex) {
-			ConnectionFactoryUtils.releaseConnection(con, connectionFactory);
-			throw new TransactionSystemException("Unexpected failure on begin of CCI local transaction", ex);
-		}
-	}
-
-	@Override
-	protected Object doSuspend(Object transaction) {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) transaction;
-		txObject.setConnectionHolder(null);
-		return TransactionSynchronizationManager.unbindResource(obtainConnectionFactory());
-	}
-
-	@Override
-	protected void doResume(@Nullable Object transaction, Object suspendedResources) {
-		ConnectionHolder conHolder = (ConnectionHolder) suspendedResources;
-		TransactionSynchronizationManager.bindResource(obtainConnectionFactory(), conHolder);
-	}
-
-	protected boolean isRollbackOnly(Object transaction) throws TransactionException {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) transaction;
-		return txObject.getConnectionHolder().isRollbackOnly();
-	}
-
-	@Override
-	protected void doCommit(DefaultTransactionStatus status) {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) status.getTransaction();
-		Connection con = txObject.getConnectionHolder().getConnection();
-		if (status.isDebug()) {
-			logger.debug("Committing CCI local transaction on Connection [" + con + "]");
-		}
-		try {
-			con.getLocalTransaction().commit();
-		}
-		catch (LocalTransactionException ex) {
-			throw new TransactionSystemException("Could not commit CCI local transaction", ex);
-		}
-		catch (ResourceException ex) {
-			throw new TransactionSystemException("Unexpected failure on commit of CCI local transaction", ex);
-		}
-	}
-
-	@Override
-	protected void doRollback(DefaultTransactionStatus status) {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) status.getTransaction();
-		Connection con = txObject.getConnectionHolder().getConnection();
-		if (status.isDebug()) {
-			logger.debug("Rolling back CCI local transaction on Connection [" + con + "]");
-		}
-		try {
-			con.getLocalTransaction().rollback();
-		}
-		catch (LocalTransactionException ex) {
-			throw new TransactionSystemException("Could not roll back CCI local transaction", ex);
-		}
-		catch (ResourceException ex) {
-			throw new TransactionSystemException("Unexpected failure on rollback of CCI local transaction", ex);
-		}
-	}
-
-	@Override
-	protected void doSetRollbackOnly(DefaultTransactionStatus status) {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) status.getTransaction();
-		if (status.isDebug()) {
-			logger.debug("Setting CCI local transaction [" + txObject.getConnectionHolder().getConnection() +
-					"] rollback-only");
-		}
-		txObject.getConnectionHolder().setRollbackOnly();
-	}
-
-	@Override
-	protected void doCleanupAfterCompletion(Object transaction) {
-		CciLocalTransactionObject txObject = (CciLocalTransactionObject) transaction;
-		ConnectionFactory connectionFactory = obtainConnectionFactory();
-
-		// Remove the connection holder from the thread.
-		TransactionSynchronizationManager.unbindResource(connectionFactory);
-		txObject.getConnectionHolder().clear();
-
-		Connection con = txObject.getConnectionHolder().getConnection();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Releasing CCI Connection [" + con + "] after transaction");
-		}
-		ConnectionFactoryUtils.releaseConnection(con, connectionFactory);
-	}
-
-
-	/**
-	 * CCI local transaction object, representing a ConnectionHolder.
-	 * Used as transaction object by CciLocalTransactionManager.
-	 * @see ConnectionHolder
-	 */
-	private static class CciLocalTransactionObject {
-
-		@Nullable
-		private ConnectionHolder connectionHolder;
-
-		public void setConnectionHolder(@Nullable ConnectionHolder connectionHolder) {
-			this.connectionHolder = connectionHolder;
-		}
-
-		public ConnectionHolder getConnectionHolder() {
-			Assert.state(this.connectionHolder != null, "No ConnectionHolder available");
-			return this.connectionHolder;
-		}
-
-		public boolean hasConnectionHolder() {
-			return (this.connectionHolder != null);
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
deleted file mode 100644
index 2f690e35cb6e..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.ConnectionSpec;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.support.ResourceHolderSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.util.Assert;
-
-/**
- * Helper class that provides static methods for obtaining CCI Connections
- * from a {@link javax.resource.cci.ConnectionFactory}. Includes special
- * support for Spring-managed transactional Connections, e.g. managed
- * by {@link CciLocalTransactionManager} or
- * {@link org.springframework.transaction.jta.JtaTransactionManager}.
- *
- * <p>Used internally by {@link org.springframework.jca.cci.core.CciTemplate},
- * Spring's CCI operation objects and the {@link CciLocalTransactionManager}.
- * Can also be used directly in application code.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see #getConnection
- * @see #releaseConnection
- * @see CciLocalTransactionManager
- * @see org.springframework.transaction.jta.JtaTransactionManager
- * @see org.springframework.transaction.support.TransactionSynchronizationManager
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public abstract class ConnectionFactoryUtils {
-
-	private static final Log logger = LogFactory.getLog(ConnectionFactoryUtils.class);
-
-
-	/**
-	 * Obtain a Connection from the given ConnectionFactory. Translates ResourceExceptions
-	 * into the Spring hierarchy of unchecked generic data access exceptions, simplifying
-	 * calling code and making any exception that is thrown more meaningful.
-	 * <p>Is aware of a corresponding Connection bound to the current thread, for example
-	 * when using {@link CciLocalTransactionManager}. Will bind a Connection to the thread
-	 * if transaction synchronization is active (e.g. if in a JTA transaction).
-	 * @param cf the ConnectionFactory to obtain Connection from
-	 * @return a CCI Connection from the given ConnectionFactory
-	 * @throws org.springframework.jca.cci.CannotGetCciConnectionException
-	 * if the attempt to get a Connection failed
-	 * @see #releaseConnection
-	 */
-	public static Connection getConnection(ConnectionFactory cf)
-			throws org.springframework.jca.cci.CannotGetCciConnectionException {
-
-		return getConnection(cf, null);
-	}
-
-	/**
-	 * Obtain a Connection from the given ConnectionFactory. Translates ResourceExceptions
-	 * into the Spring hierarchy of unchecked generic data access exceptions, simplifying
-	 * calling code and making any exception that is thrown more meaningful.
-	 * <p>Is aware of a corresponding Connection bound to the current thread, for example
-	 * when using {@link CciLocalTransactionManager}. Will bind a Connection to the thread
-	 * if transaction synchronization is active (e.g. if in a JTA transaction).
-	 * @param cf the ConnectionFactory to obtain Connection from
-	 * @param spec the ConnectionSpec for the desired Connection (may be {@code null}).
-	 * Note: If this is specified, a new Connection will be obtained for every call,
-	 * without participating in a shared transactional Connection.
-	 * @return a CCI Connection from the given ConnectionFactory
-	 * @throws org.springframework.jca.cci.CannotGetCciConnectionException
-	 * if the attempt to get a Connection failed
-	 * @see #releaseConnection
-	 */
-	public static Connection getConnection(ConnectionFactory cf, @Nullable ConnectionSpec spec)
-			throws org.springframework.jca.cci.CannotGetCciConnectionException {
-		try {
-			if (spec != null) {
-				Assert.notNull(cf, "No ConnectionFactory specified");
-				return cf.getConnection(spec);
-			}
-			else {
-				return doGetConnection(cf);
-			}
-		}
-		catch (ResourceException ex) {
-			throw new org.springframework.jca.cci.CannotGetCciConnectionException("Could not get CCI Connection", ex);
-		}
-	}
-
-	/**
-	 * Actually obtain a CCI Connection from the given ConnectionFactory.
-	 * Same as {@link #getConnection}, but throwing the original ResourceException.
-	 * <p>Is aware of a corresponding Connection bound to the current thread, for example
-	 * when using {@link CciLocalTransactionManager}. Will bind a Connection to the thread
-	 * if transaction synchronization is active (e.g. if in a JTA transaction).
-	 * <p>Directly accessed by {@link TransactionAwareConnectionFactoryProxy}.
-	 * @param cf the ConnectionFactory to obtain Connection from
-	 * @return a CCI Connection from the given ConnectionFactory
-	 * @throws ResourceException if thrown by CCI API methods
-	 * @see #doReleaseConnection
-	 */
-	public static Connection doGetConnection(ConnectionFactory cf) throws ResourceException {
-		Assert.notNull(cf, "No ConnectionFactory specified");
-
-		ConnectionHolder conHolder = (ConnectionHolder) TransactionSynchronizationManager.getResource(cf);
-		if (conHolder != null) {
-			return conHolder.getConnection();
-		}
-
-		logger.debug("Opening CCI Connection");
-		Connection con = cf.getConnection();
-
-		if (TransactionSynchronizationManager.isSynchronizationActive()) {
-			conHolder = new ConnectionHolder(con);
-			conHolder.setSynchronizedWithTransaction(true);
-			TransactionSynchronizationManager.registerSynchronization(new ConnectionSynchronization(conHolder, cf));
-			TransactionSynchronizationManager.bindResource(cf, conHolder);
-		}
-
-		return con;
-	}
-
-	/**
-	 * Determine whether the given JCA CCI Connection is transactional, that is,
-	 * bound to the current thread by Spring's transaction facilities.
-	 * @param con the Connection to check
-	 * @param cf the ConnectionFactory that the Connection was obtained from
-	 * (may be {@code null})
-	 * @return whether the Connection is transactional
-	 */
-	public static boolean isConnectionTransactional(Connection con, @Nullable ConnectionFactory cf) {
-		if (cf == null) {
-			return false;
-		}
-		ConnectionHolder conHolder = (ConnectionHolder) TransactionSynchronizationManager.getResource(cf);
-		return (conHolder != null && conHolder.getConnection() == con);
-	}
-
-	/**
-	 * Close the given Connection, obtained from the given ConnectionFactory,
-	 * if it is not managed externally (that is, not bound to the thread).
-	 * @param con the Connection to close if necessary
-	 * (if this is {@code null}, the call will be ignored)
-	 * @param cf the ConnectionFactory that the Connection was obtained from
-	 * (can be {@code null})
-	 * @see #getConnection
-	 */
-	public static void releaseConnection(@Nullable Connection con, @Nullable ConnectionFactory cf) {
-		try {
-			doReleaseConnection(con, cf);
-		}
-		catch (ResourceException ex) {
-			logger.debug("Could not close CCI Connection", ex);
-		}
-		catch (Throwable ex) {
-			// We don't trust the CCI driver: It might throw RuntimeException or Error.
-			logger.debug("Unexpected exception on closing CCI Connection", ex);
-		}
-	}
-
-	/**
-	 * Actually close the given Connection, obtained from the given ConnectionFactory.
-	 * Same as {@link #releaseConnection}, but throwing the original ResourceException.
-	 * <p>Directly accessed by {@link TransactionAwareConnectionFactoryProxy}.
-	 * @param con the Connection to close if necessary
-	 * (if this is {@code null}, the call will be ignored)
-	 * @param cf the ConnectionFactory that the Connection was obtained from
-	 * (can be {@code null})
-	 * @throws ResourceException if thrown by JCA CCI methods
-	 * @see #doGetConnection
-	 */
-	public static void doReleaseConnection(@Nullable Connection con, @Nullable ConnectionFactory cf)
-			throws ResourceException {
-
-		if (con == null || isConnectionTransactional(con, cf)) {
-			return;
-		}
-		con.close();
-	}
-
-
-	/**
-	 * Callback for resource cleanup at the end of a non-native CCI transaction
-	 * (e.g. when participating in a JTA transaction).
-	 */
-	private static class ConnectionSynchronization
-			extends ResourceHolderSynchronization<ConnectionHolder, ConnectionFactory> {
-
-		public ConnectionSynchronization(ConnectionHolder connectionHolder, ConnectionFactory connectionFactory) {
-			super(connectionHolder, connectionFactory);
-		}
-
-		@Override
-		protected void releaseResource(ConnectionHolder resourceHolder, ConnectionFactory resourceKey) {
-			releaseConnection(resourceHolder.getConnection(), resourceKey);
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
deleted file mode 100644
index 35e5afcf4d05..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import javax.resource.cci.Connection;
-
-import org.springframework.transaction.support.ResourceHolderSupport;
-
-/**
- * Resource holder wrapping a CCI {@link Connection}.
- * {@link CciLocalTransactionManager} binds instances of this class to the thread,
- * for a given {@link javax.resource.cci.ConnectionFactory}.
- *
- * <p>Note: This is an SPI class, not intended to be used by applications.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see CciLocalTransactionManager
- * @see ConnectionFactoryUtils
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public class ConnectionHolder extends ResourceHolderSupport {
-
-	private final Connection connection;
-
-
-	public ConnectionHolder(Connection connection) {
-		this.connection = connection;
-	}
-
-
-	public Connection getConnection() {
-		return this.connection;
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
deleted file mode 100644
index 2f80f0cefe57..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.ConnectionSpec;
-
-import org.springframework.core.NamedThreadLocal;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * An adapter for a target CCI {@link javax.resource.cci.ConnectionFactory},
- * applying the given ConnectionSpec to every standard {@code getConnection()}
- * call, that is, implicitly invoking {@code getConnection(ConnectionSpec)}
- * on the target. All other methods simply delegate to the corresponding methods
- * of the target ConnectionFactory.
- *
- * <p>Can be used to proxy a target JNDI ConnectionFactory that does not have a
- * ConnectionSpec configured. Client code can work with the ConnectionFactory
- * without passing in a ConnectionSpec on every {@code getConnection()} call.
- *
- * <p>In the following example, client code can simply transparently work with
- * the preconfigured "myConnectionFactory", implicitly accessing
- * "myTargetConnectionFactory" with the specified user credentials.
- *
- * <pre class="code">
- * &lt;bean id="myTargetConnectionFactory" class="org.springframework.jndi.JndiObjectFactoryBean"&gt;
- *   &lt;property name="jndiName" value="java:comp/env/cci/mycf"/&gt;
- * &lt;/bean>
- *
- * &lt;bean id="myConnectionFactory" class="org.springframework.jca.cci.connection.ConnectionSpecConnectionFactoryAdapter"&gt;
- *   &lt;property name="targetConnectionFactory" ref="myTargetConnectionFactory"/&gt;
- *   &lt;property name="connectionSpec"&gt;
- *     &lt;bean class="your.resource.adapter.ConnectionSpecImpl"&gt;
- *       &lt;property name="username" value="myusername"/&gt;
- *       &lt;property name="password" value="mypassword"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
- *
- * <p>If the "connectionSpec" is empty, this proxy will simply delegate to the
- * standard {@code getConnection()} method of the target ConnectionFactory.
- * This can be used to keep a UserCredentialsConnectionFactoryAdapter bean definition
- * just for the <i>option</i> of implicitly passing in a ConnectionSpec if the
- * particular target ConnectionFactory requires it.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see #getConnection
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class ConnectionSpecConnectionFactoryAdapter extends DelegatingConnectionFactory {
-
-	@Nullable
-	private ConnectionSpec connectionSpec;
-
-	private final ThreadLocal<ConnectionSpec> threadBoundSpec =
-			new NamedThreadLocal<>("Current CCI ConnectionSpec");
-
-
-	/**
-	 * Set the ConnectionSpec that this adapter should use for retrieving Connections.
-	 * Default is none.
-	 */
-	public void setConnectionSpec(ConnectionSpec connectionSpec) {
-		this.connectionSpec = connectionSpec;
-	}
-
-	/**
-	 * Set a ConnectionSpec for this proxy and the current thread.
-	 * The given ConnectionSpec will be applied to all subsequent
-	 * {@code getConnection()} calls on this ConnectionFactory proxy.
-	 * <p>This will override any statically specified "connectionSpec" property.
-	 * @param spec the ConnectionSpec to apply
-	 * @see #removeConnectionSpecFromCurrentThread
-	 */
-	public void setConnectionSpecForCurrentThread(ConnectionSpec spec) {
-		this.threadBoundSpec.set(spec);
-	}
-
-	/**
-	 * Remove any ConnectionSpec for this proxy from the current thread.
-	 * A statically specified ConnectionSpec applies again afterwards.
-	 * @see #setConnectionSpecForCurrentThread
-	 */
-	public void removeConnectionSpecFromCurrentThread() {
-		this.threadBoundSpec.remove();
-	}
-
-
-	/**
-	 * Determine whether there is currently a thread-bound ConnectionSpec,
-	 * using it if available, falling back to the statically specified
-	 * "connectionSpec" property else.
-	 * @see #doGetConnection
-	 */
-	@Override
-	public final Connection getConnection() throws ResourceException {
-		ConnectionSpec threadSpec = this.threadBoundSpec.get();
-		if (threadSpec != null) {
-			return doGetConnection(threadSpec);
-		}
-		else {
-			return doGetConnection(this.connectionSpec);
-		}
-	}
-
-	/**
-	 * This implementation delegates to the {@code getConnection(ConnectionSpec)}
-	 * method of the target ConnectionFactory, passing in the specified user credentials.
-	 * If the specified username is empty, it will simply delegate to the standard
-	 * {@code getConnection()} method of the target ConnectionFactory.
-	 * @param spec the ConnectionSpec to apply
-	 * @return the Connection
-	 * @see javax.resource.cci.ConnectionFactory#getConnection(javax.resource.cci.ConnectionSpec)
-	 * @see javax.resource.cci.ConnectionFactory#getConnection()
-	 */
-	protected Connection doGetConnection(@Nullable ConnectionSpec spec) throws ResourceException {
-		ConnectionFactory connectionFactory = getTargetConnectionFactory();
-		Assert.state(connectionFactory != null, "No 'targetConnectionFactory' set");
-		return (spec != null ? connectionFactory.getConnection(spec) : connectionFactory.getConnection());
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
deleted file mode 100644
index 08c9ac207227..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.ConnectionSpec;
-import javax.resource.cci.RecordFactory;
-import javax.resource.cci.ResourceAdapterMetaData;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * CCI {@link ConnectionFactory} implementation that delegates all calls
- * to a given target {@link ConnectionFactory}.
- *
- * <p>This class is meant to be subclassed, with subclasses overriding only
- * those methods (such as {@link #getConnection()}) that should not simply
- * delegate to the target {@link ConnectionFactory}.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see #getConnection
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class DelegatingConnectionFactory implements ConnectionFactory, InitializingBean {
-
-	@Nullable
-	private ConnectionFactory targetConnectionFactory;
-
-
-	/**
-	 * Set the target ConnectionFactory that this ConnectionFactory should delegate to.
-	 */
-	public void setTargetConnectionFactory(@Nullable ConnectionFactory targetConnectionFactory) {
-		this.targetConnectionFactory = targetConnectionFactory;
-	}
-
-	/**
-	 * Return the target ConnectionFactory that this ConnectionFactory should delegate to.
-	 */
-	@Nullable
-	public ConnectionFactory getTargetConnectionFactory() {
-		return this.targetConnectionFactory;
-	}
-
-	/**
-	 * Obtain the target {@code ConnectionFactory} for actual use (never {@code null}).
-	 * @since 5.0
-	 */
-	protected ConnectionFactory obtainTargetConnectionFactory() {
-		ConnectionFactory connectionFactory = getTargetConnectionFactory();
-		Assert.state(connectionFactory != null, "No 'targetConnectionFactory' set");
-		return connectionFactory;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		if (getTargetConnectionFactory() == null) {
-			throw new IllegalArgumentException("Property 'targetConnectionFactory' is required");
-		}
-	}
-
-
-	@Override
-	public Connection getConnection() throws ResourceException {
-		return obtainTargetConnectionFactory().getConnection();
-	}
-
-	@Override
-	public Connection getConnection(ConnectionSpec connectionSpec) throws ResourceException {
-		return obtainTargetConnectionFactory().getConnection(connectionSpec);
-	}
-
-	@Override
-	public RecordFactory getRecordFactory() throws ResourceException {
-		return obtainTargetConnectionFactory().getRecordFactory();
-	}
-
-	@Override
-	public ResourceAdapterMetaData getMetaData() throws ResourceException {
-		return obtainTargetConnectionFactory().getMetaData();
-	}
-
-	@Override
-	public Reference getReference() throws NamingException {
-		return obtainTargetConnectionFactory().getReference();
-	}
-
-	@Override
-	public void setReference(Reference reference) {
-		obtainTargetConnectionFactory().setReference(reference);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
deleted file mode 100644
index dc613f6d4c59..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import javax.resource.NotSupportedException;
-import javax.resource.ResourceException;
-import javax.resource.cci.IndexedRecord;
-import javax.resource.cci.MappedRecord;
-import javax.resource.cci.RecordFactory;
-
-/**
- * Implementation of the CCI RecordFactory interface that always throws
- * NotSupportedException.
- *
- * <p>Useful as a placeholder for a RecordFactory argument (for example as
- * defined by the RecordCreator callback), in particular when the connector's
- * {@code ConnectionFactory.getRecordFactory()} implementation happens to
- * throw NotSupportedException early rather than throwing the exception from
- * RecordFactory's methods.
- *
- * @author Juergen Hoeller
- * @since 1.2.4
- * @see org.springframework.jca.cci.core.RecordCreator#createRecord(javax.resource.cci.RecordFactory)
- * @see org.springframework.jca.cci.core.CciTemplate#getRecordFactory(javax.resource.cci.ConnectionFactory)
- * @see javax.resource.cci.ConnectionFactory#getRecordFactory()
- * @see javax.resource.NotSupportedException
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public class NotSupportedRecordFactory implements RecordFactory {
-
-	@Override
-	public MappedRecord createMappedRecord(String name) throws ResourceException {
-		throw new NotSupportedException("The RecordFactory facility is not supported by the connector");
-	}
-
-	@Override
-	public IndexedRecord createIndexedRecord(String name) throws ResourceException {
-		throw new NotSupportedException("The RecordFactory facility is not supported by the connector");
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
deleted file mode 100644
index 312fed4d4fa9..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import javax.resource.NotSupportedException;
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.ConnectionSpec;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * A CCI ConnectionFactory adapter that returns the same Connection on all
- * {@code getConnection} calls, and ignores calls to
- * {@code Connection.close()}.
- *
- * <p>Useful for testing and standalone environments, to keep using the same
- * Connection for multiple CciTemplate calls, without having a pooling
- * ConnectionFactory, also spanning any number of transactions.
- *
- * <p>You can either pass in a CCI Connection directly, or let this
- * factory lazily create a Connection via a given target ConnectionFactory.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see #getConnection()
- * @see javax.resource.cci.Connection#close()
- * @see org.springframework.jca.cci.core.CciTemplate
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class SingleConnectionFactory extends DelegatingConnectionFactory implements DisposableBean {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	/** Wrapped Connection. */
-	@Nullable
-	private Connection target;
-
-	/** Proxy Connection. */
-	@Nullable
-	private Connection connection;
-
-	/** Synchronization monitor for the shared Connection. */
-	private final Object connectionMonitor = new Object();
-
-
-	/**
-	 * Create a new SingleConnectionFactory for bean-style usage.
-	 * @see #setTargetConnectionFactory
-	 */
-	public SingleConnectionFactory() {
-	}
-
-	/**
-	 * Create a new SingleConnectionFactory that always returns the
-	 * given Connection.
-	 * @param target the single Connection
-	 */
-	public SingleConnectionFactory(Connection target) {
-		Assert.notNull(target, "Target Connection must not be null");
-		this.target = target;
-		this.connection = getCloseSuppressingConnectionProxy(target);
-	}
-
-	/**
-	 * Create a new SingleConnectionFactory that always returns a single
-	 * Connection which it will lazily create via the given target
-	 * ConnectionFactory.
-	 * @param targetConnectionFactory the target ConnectionFactory
-	 */
-	public SingleConnectionFactory(ConnectionFactory targetConnectionFactory) {
-		Assert.notNull(targetConnectionFactory, "Target ConnectionFactory must not be null");
-		setTargetConnectionFactory(targetConnectionFactory);
-	}
-
-
-	/**
-	 * Make sure a Connection or ConnectionFactory has been set.
-	 */
-	@Override
-	public void afterPropertiesSet() {
-		if (this.connection == null && getTargetConnectionFactory() == null) {
-			throw new IllegalArgumentException("Connection or 'targetConnectionFactory' is required");
-		}
-	}
-
-
-	@Override
-	public Connection getConnection() throws ResourceException {
-		synchronized (this.connectionMonitor) {
-			if (this.connection == null) {
-				initConnection();
-			}
-			return this.connection;
-		}
-	}
-
-	@Override
-	public Connection getConnection(ConnectionSpec connectionSpec) throws ResourceException {
-		throw new NotSupportedException(
-				"SingleConnectionFactory does not support custom ConnectionSpec");
-	}
-
-	/**
-	 * Close the underlying Connection.
-	 * The provider of this ConnectionFactory needs to care for proper shutdown.
-	 * <p>As this bean implements DisposableBean, a bean factory will
-	 * automatically invoke this on destruction of its cached singletons.
-	 */
-	@Override
-	public void destroy() {
-		resetConnection();
-	}
-
-
-	/**
-	 * Initialize the single underlying Connection.
-	 * <p>Closes and reinitializes the Connection if an underlying
-	 * Connection is present already.
-	 * @throws javax.resource.ResourceException if thrown by CCI API methods
-	 */
-	public void initConnection() throws ResourceException {
-		if (getTargetConnectionFactory() == null) {
-			throw new IllegalStateException(
-					"'targetConnectionFactory' is required for lazily initializing a Connection");
-		}
-		synchronized (this.connectionMonitor) {
-			if (this.target != null) {
-				closeConnection(this.target);
-			}
-			this.target = doCreateConnection();
-			prepareConnection(this.target);
-			if (logger.isDebugEnabled()) {
-				logger.debug("Established shared CCI Connection: " + this.target);
-			}
-			this.connection = getCloseSuppressingConnectionProxy(this.target);
-		}
-	}
-
-	/**
-	 * Reset the underlying shared Connection, to be reinitialized on next access.
-	 */
-	public void resetConnection() {
-		synchronized (this.connectionMonitor) {
-			if (this.target != null) {
-				closeConnection(this.target);
-			}
-			this.target = null;
-			this.connection = null;
-		}
-	}
-
-	/**
-	 * Create a CCI Connection via this template's ConnectionFactory.
-	 * @return the new CCI Connection
-	 * @throws javax.resource.ResourceException if thrown by CCI API methods
-	 */
-	protected Connection doCreateConnection() throws ResourceException {
-		ConnectionFactory connectionFactory = getTargetConnectionFactory();
-		Assert.state(connectionFactory != null, "No 'targetConnectionFactory' set");
-		return connectionFactory.getConnection();
-	}
-
-	/**
-	 * Prepare the given Connection before it is exposed.
-	 * <p>The default implementation is empty. Can be overridden in subclasses.
-	 * @param con the Connection to prepare
-	 */
-	protected void prepareConnection(Connection con) throws ResourceException {
-	}
-
-	/**
-	 * Close the given Connection.
-	 * @param con the Connection to close
-	 */
-	protected void closeConnection(Connection con) {
-		try {
-			con.close();
-		}
-		catch (Throwable ex) {
-			logger.warn("Could not close shared CCI Connection", ex);
-		}
-	}
-
-	/**
-	 * Wrap the given Connection with a proxy that delegates every method call to it
-	 * but suppresses close calls. This is useful for allowing application code to
-	 * handle a special framework Connection just like an ordinary Connection from a
-	 * CCI ConnectionFactory.
-	 * @param target the original Connection to wrap
-	 * @return the wrapped Connection
-	 */
-	protected Connection getCloseSuppressingConnectionProxy(Connection target) {
-		return (Connection) Proxy.newProxyInstance(
-				Connection.class.getClassLoader(),
-				new Class<?>[] {Connection.class},
-				new CloseSuppressingInvocationHandler(target));
-	}
-
-
-	/**
-	 * Invocation handler that suppresses close calls on CCI Connections.
-	 */
-	private static final class CloseSuppressingInvocationHandler implements InvocationHandler {
-
-		private final Connection target;
-
-		private CloseSuppressingInvocationHandler(Connection target) {
-			this.target = target;
-		}
-
-		@Override
-		@Nullable
-		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-			switch (method.getName()) {
-				case "equals":
-					// Only consider equal when proxies are identical.
-					return (proxy == args[0]);
-				case "hashCode":
-					// Use hashCode of Connection proxy.
-					return System.identityHashCode(proxy);
-				case "close":
-					// Handle close method: don't pass the call on.
-					return null;
-			}
-
-			try {
-				return method.invoke(this.target, args);
-			}
-			catch (InvocationTargetException ex) {
-				throw ex.getTargetException();
-			}
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
deleted file mode 100644
index e8fe835594b1..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.connection;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Proxy for a target CCI {@link javax.resource.cci.ConnectionFactory}, adding
- * awareness of Spring-managed transactions. Similar to a transactional JNDI
- * ConnectionFactory as provided by a Java EE server.
- *
- * <p>Data access code that should remain unaware of Spring's data access support
- * can work with this proxy to seamlessly participate in Spring-managed transactions.
- * Note that the transaction manager, for example the {@link CciLocalTransactionManager},
- * still needs to work with underlying ConnectionFactory, <i>not</i> with this proxy.
- *
- * <p><b>Make sure that TransactionAwareConnectionFactoryProxy is the outermost
- * ConnectionFactory of a chain of ConnectionFactory proxies/adapters.</b>
- * TransactionAwareConnectionFactoryProxy can delegate either directly to the
- * target connection pool or to some intermediate proxy/adapter like
- * {@link ConnectionSpecConnectionFactoryAdapter}.
- *
- * <p>Delegates to {@link ConnectionFactoryUtils} for automatically participating in
- * thread-bound transactions, for example managed by {@link CciLocalTransactionManager}.
- * {@code getConnection} calls and {@code close} calls on returned Connections
- * will behave properly within a transaction, i.e. always operate on the transactional
- * Connection. If not within a transaction, normal ConnectionFactory behavior applies.
- *
- * <p>This proxy allows data access code to work with the plain JCA CCI API and still
- * participate in Spring-managed transactions, similar to CCI code in a Java EE/JTA
- * environment. However, if possible, use Spring's ConnectionFactoryUtils, CciTemplate or
- * CCI operation objects to get transaction participation even without a proxy for
- * the target ConnectionFactory, avoiding the need to define such a proxy in the first place.
- *
- * <p><b>NOTE:</b> This ConnectionFactory proxy needs to return wrapped Connections
- * in order to handle close calls properly. Therefore, the returned Connections cannot
- * be cast to a native CCI Connection type or to a connection pool implementation type.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see javax.resource.cci.ConnectionFactory#getConnection
- * @see javax.resource.cci.Connection#close
- * @see ConnectionFactoryUtils#doGetConnection
- * @see ConnectionFactoryUtils#doReleaseConnection
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class TransactionAwareConnectionFactoryProxy extends DelegatingConnectionFactory {
-
-	/**
-	 * Create a new TransactionAwareConnectionFactoryProxy.
-	 * @see #setTargetConnectionFactory
-	 */
-	public TransactionAwareConnectionFactoryProxy() {
-	}
-
-	/**
-	 * Create a new TransactionAwareConnectionFactoryProxy.
-	 * @param targetConnectionFactory the target ConnectionFactory
-	 */
-	public TransactionAwareConnectionFactoryProxy(ConnectionFactory targetConnectionFactory) {
-		setTargetConnectionFactory(targetConnectionFactory);
-		afterPropertiesSet();
-	}
-
-
-	/**
-	 * Delegate to ConnectionFactoryUtils for automatically participating in Spring-managed
-	 * transactions. Throws the original ResourceException, if any.
-	 * @return a transactional Connection if any, a new one else
-	 * @see org.springframework.jca.cci.connection.ConnectionFactoryUtils#doGetConnection
-	 */
-	@Override
-	public Connection getConnection() throws ResourceException {
-		ConnectionFactory targetConnectionFactory = obtainTargetConnectionFactory();
-		Connection con = ConnectionFactoryUtils.doGetConnection(targetConnectionFactory);
-		return getTransactionAwareConnectionProxy(con, targetConnectionFactory);
-	}
-
-	/**
-	 * Wrap the given Connection with a proxy that delegates every method call to it
-	 * but delegates {@code close} calls to ConnectionFactoryUtils.
-	 * @param target the original Connection to wrap
-	 * @param cf the ConnectionFactory that the Connection came from
-	 * @return the wrapped Connection
-	 * @see javax.resource.cci.Connection#close()
-	 * @see ConnectionFactoryUtils#doReleaseConnection
-	 */
-	protected Connection getTransactionAwareConnectionProxy(Connection target, ConnectionFactory cf) {
-		return (Connection) Proxy.newProxyInstance(
-				Connection.class.getClassLoader(),
-				new Class<?>[] {Connection.class},
-				new TransactionAwareInvocationHandler(target, cf));
-	}
-
-
-	/**
-	 * Invocation handler that delegates close calls on CCI Connections
-	 * to ConnectionFactoryUtils for being aware of thread-bound transactions.
-	 */
-	private static class TransactionAwareInvocationHandler implements InvocationHandler {
-
-		private final Connection target;
-
-		private final ConnectionFactory connectionFactory;
-
-		public TransactionAwareInvocationHandler(Connection target, ConnectionFactory cf) {
-			this.target = target;
-			this.connectionFactory = cf;
-		}
-
-		@Override
-		@Nullable
-		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-			// Invocation on Connection interface coming in...
-
-			switch (method.getName()) {
-				case "equals":
-					// Only consider equal when proxies are identical.
-					return (proxy == args[0]);
-				case "hashCode":
-					// Use hashCode of Connection proxy.
-					return System.identityHashCode(proxy);
-				case "getLocalTransaction":
-					if (ConnectionFactoryUtils.isConnectionTransactional(this.target, this.connectionFactory)) {
-						throw new javax.resource.spi.IllegalStateException(
-								"Local transaction handling not allowed within a managed transaction");
-					}
-					return this.target.getLocalTransaction();
-				case "close":
-					// Handle close method: only close if not within a transaction.
-					ConnectionFactoryUtils.doReleaseConnection(this.target, this.connectionFactory);
-					return null;
-			}
-
-			// Invoke method on target Connection.
-			try {
-				return method.invoke(this.target, args);
-			}
-			catch (InvocationTargetException ex) {
-				throw ex.getTargetException();
-			}
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
deleted file mode 100644
index b90d61e6211c..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Provides a utility class for easy ConnectionFactory access,
- * a PlatformTransactionManager for local CCI transactions,
- * and various simple ConnectionFactory proxies/adapters.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jca.cci.connection;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciOperations.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciOperations.java
deleted file mode 100644
index 313d16f24a4b..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciOperations.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core;
-
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.Record;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
-
-/**
- * Interface that specifies a basic set of CCI operations on an EIS.
- * Implemented by CciTemplate. Not often used, but a useful option
- * to enhance testability, as it can easily be mocked or stubbed.
- *
- * <p>Alternatively, the standard CCI infrastructure can be mocked.
- * However, mocking this interface constitutes significantly less work.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see CciTemplate
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public interface CciOperations {
-
-	/**
-	 * Execute a request on an EIS with CCI, implemented as callback action
-	 * working on a CCI Connection. This allows for implementing arbitrary
-	 * data access operations, within Spring's managed CCI environment:
-	 * that is, participating in Spring-managed transactions and converting
-	 * JCA ResourceExceptions into Spring's DataAccessException hierarchy.
-	 * <p>The callback action can return a result object, for example a
-	 * domain object or a collection of domain objects.
-	 * @param action the callback object that specifies the action
-	 * @return the result object returned by the action, if any
-	 * @throws DataAccessException if there is any problem
-	 */
-	@Nullable
-	<T> T execute(ConnectionCallback<T> action) throws DataAccessException;
-
-	/**
-	 * Execute a request on an EIS with CCI, implemented as callback action
-	 * working on a CCI Interaction. This allows for implementing arbitrary
-	 * data access operations on a single Interaction, within Spring's managed
-	 * CCI environment: that is, participating in Spring-managed transactions
-	 * and converting JCA ResourceExceptions into Spring's DataAccessException
-	 * hierarchy.
-	 * <p>The callback action can return a result object, for example a
-	 * domain object or a collection of domain objects.
-	 * @param action the callback object that specifies the action
-	 * @return the result object returned by the action, if any
-	 * @throws DataAccessException if there is any problem
-	 */
-	@Nullable
-	<T> T execute(InteractionCallback<T> action) throws DataAccessException;
-
-	/**
-	 * Execute the specified interaction on an EIS with CCI.
-	 * @param spec the CCI InteractionSpec instance that defines
-	 * the interaction (connector-specific)
-	 * @param inputRecord the input record
-	 * @return the output record
-	 * @throws DataAccessException if there is any problem
-	 */
-	@Nullable
-	Record execute(InteractionSpec spec, Record inputRecord) throws DataAccessException;
-
-	/**
-	 * Execute the specified interaction on an EIS with CCI.
-	 * @param spec the CCI InteractionSpec instance that defines
-	 * the interaction (connector-specific)
-	 * @param inputRecord the input record
-	 * @param outputRecord the output record
-	 * @throws DataAccessException if there is any problem
-	 */
-	void execute(InteractionSpec spec, Record inputRecord, Record outputRecord) throws DataAccessException;
-
-	/**
-	 * Execute the specified interaction on an EIS with CCI.
-	 * @param spec the CCI InteractionSpec instance that defines
-	 * the interaction (connector-specific)
-	 * @param inputCreator object that creates the input record to use
-	 * @return the output record
-	 * @throws DataAccessException if there is any problem
-	 */
-	Record execute(InteractionSpec spec, RecordCreator inputCreator) throws DataAccessException;
-
-	/**
-	 * Execute the specified interaction on an EIS with CCI.
-	 * @param spec the CCI InteractionSpec instance that defines
-	 * the interaction (connector-specific)
-	 * @param inputRecord the input record
-	 * @param outputExtractor object to convert the output record to a result object
-	 * @return the output data extracted with the RecordExtractor object
-	 * @throws DataAccessException if there is any problem
-	 */
-	@Nullable
-	<T> T execute(InteractionSpec spec, Record inputRecord, RecordExtractor<T> outputExtractor)
-			throws DataAccessException;
-
-	/**
-	 * Execute the specified interaction on an EIS with CCI.
-	 * @param spec the CCI InteractionSpec instance that defines
-	 * the interaction (connector-specific)
-	 * @param inputCreator object that creates the input record to use
-	 * @param outputExtractor object to convert the output record to a result object
-	 * @return the output data extracted with the RecordExtractor object
-	 * @throws DataAccessException if there is any problem
-	 */
-	@Nullable
-	<T> T execute(InteractionSpec spec, RecordCreator inputCreator, RecordExtractor<T> outputExtractor)
-			throws DataAccessException;
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
deleted file mode 100644
index 181321e888a3..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core;
-
-import java.sql.SQLException;
-
-import javax.resource.NotSupportedException;
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.ConnectionSpec;
-import javax.resource.cci.IndexedRecord;
-import javax.resource.cci.Interaction;
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.MappedRecord;
-import javax.resource.cci.Record;
-import javax.resource.cci.RecordFactory;
-import javax.resource.cci.ResultSet;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * <b>This is the central class in the CCI core package.</b>
- * It simplifies the use of CCI and helps to avoid common errors.
- * It executes core CCI workflow, leaving application code to provide parameters
- * to CCI and extract results. This class executes EIS queries or updates,
- * catching ResourceExceptions and translating them to the generic exception
- * hierarchy defined in the {@code org.springframework.dao} package.
- *
- * <p>Code using this class can pass in and receive {@link javax.resource.cci.Record}
- * instances, or alternatively implement callback interfaces for creating input
- * Records and extracting result objects from output Records (or CCI ResultSets).
- *
- * <p>Can be used within a service implementation via direct instantiation
- * with a ConnectionFactory reference, or get prepared in an application context
- * and given to services as bean reference. Note: The ConnectionFactory should
- * always be configured as a bean in the application context, in the first case
- * given to the service directly, in the second case to the prepared template.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see RecordCreator
- * @see RecordExtractor
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public class CciTemplate implements CciOperations {
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	@Nullable
-	private ConnectionFactory connectionFactory;
-
-	@Nullable
-	private ConnectionSpec connectionSpec;
-
-	@Nullable
-	private RecordCreator outputRecordCreator;
-
-
-	/**
-	 * Construct a new CciTemplate for bean usage.
-	 * <p>Note: The ConnectionFactory has to be set before using the instance.
-	 * @see #setConnectionFactory
-	 */
-	public CciTemplate() {
-	}
-
-	/**
-	 * Construct a new CciTemplate, given a ConnectionFactory to obtain Connections from.
-	 * Note: This will trigger eager initialization of the exception translator.
-	 * @param connectionFactory the JCA ConnectionFactory to obtain Connections from
-	 */
-	public CciTemplate(ConnectionFactory connectionFactory) {
-		setConnectionFactory(connectionFactory);
-		afterPropertiesSet();
-	}
-
-	/**
-	 * Construct a new CciTemplate, given a ConnectionFactory to obtain Connections from.
-	 * Note: This will trigger eager initialization of the exception translator.
-	 * @param connectionFactory the JCA ConnectionFactory to obtain Connections from
-	 * @param connectionSpec the CCI ConnectionSpec to obtain Connections for
-	 * (may be {@code null})
-	 */
-	public CciTemplate(ConnectionFactory connectionFactory, @Nullable ConnectionSpec connectionSpec) {
-		setConnectionFactory(connectionFactory);
-		if (connectionSpec != null) {
-			setConnectionSpec(connectionSpec);
-		}
-		afterPropertiesSet();
-	}
-
-
-	/**
-	 * Set the CCI ConnectionFactory to obtain Connections from.
-	 */
-	public void setConnectionFactory(@Nullable ConnectionFactory connectionFactory) {
-		this.connectionFactory = connectionFactory;
-	}
-
-	/**
-	 * Return the CCI ConnectionFactory used by this template.
-	 */
-	@Nullable
-	public ConnectionFactory getConnectionFactory() {
-		return this.connectionFactory;
-	}
-
-	private ConnectionFactory obtainConnectionFactory() {
-		ConnectionFactory connectionFactory = getConnectionFactory();
-		Assert.state(connectionFactory != null, "No ConnectionFactory set");
-		return connectionFactory;
-	}
-
-	/**
-	 * Set the CCI ConnectionSpec that this template instance is
-	 * supposed to obtain Connections for.
-	 */
-	public void setConnectionSpec(@Nullable ConnectionSpec connectionSpec) {
-		this.connectionSpec = connectionSpec;
-	}
-
-	/**
-	 * Return the CCI ConnectionSpec used by this template, if any.
-	 */
-	@Nullable
-	public ConnectionSpec getConnectionSpec() {
-		return this.connectionSpec;
-	}
-
-	/**
-	 * Set a RecordCreator that should be used for creating default output Records.
-	 * <p>Default is none: When no explicit output Record gets passed into an
-	 * {@code execute} method, CCI's {@code Interaction.execute} variant
-	 * that returns an output Record will be called.
-	 * <p>Specify a RecordCreator here if you always need to call CCI's
-	 * {@code Interaction.execute} variant with a passed-in output Record.
-	 * Unless there is an explicitly specified output Record, CciTemplate will
-	 * then invoke this RecordCreator to create a default output Record instance.
-	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record)
-	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record, Record)
-	 */
-	public void setOutputRecordCreator(@Nullable RecordCreator creator) {
-		this.outputRecordCreator = creator;
-	}
-
-	/**
-	 * Return a RecordCreator that should be used for creating default output Records.
-	 */
-	@Nullable
-	public RecordCreator getOutputRecordCreator() {
-		return this.outputRecordCreator;
-	}
-
-	public void afterPropertiesSet() {
-		if (getConnectionFactory() == null) {
-			throw new IllegalArgumentException("Property 'connectionFactory' is required");
-		}
-	}
-
-
-	/**
-	 * Create a template derived from this template instance,
-	 * inheriting the ConnectionFactory and other settings but
-	 * overriding the ConnectionSpec used for obtaining Connections.
-	 * @param connectionSpec the CCI ConnectionSpec that the derived template
-	 * instance is supposed to obtain Connections for
-	 * @return the derived template instance
-	 * @see #setConnectionSpec
-	 */
-	public CciTemplate getDerivedTemplate(ConnectionSpec connectionSpec) {
-		CciTemplate derived = new CciTemplate(obtainConnectionFactory(), connectionSpec);
-		RecordCreator recordCreator = getOutputRecordCreator();
-		if (recordCreator != null) {
-			derived.setOutputRecordCreator(recordCreator);
-		}
-		return derived;
-	}
-
-
-	@Override
-	@Nullable
-	public <T> T execute(ConnectionCallback<T> action) throws DataAccessException {
-		Assert.notNull(action, "Callback object must not be null");
-		ConnectionFactory connectionFactory = obtainConnectionFactory();
-		Connection con = org.springframework.jca.cci.connection.ConnectionFactoryUtils.getConnection(
-				connectionFactory, getConnectionSpec());
-		try {
-			return action.doInConnection(con, connectionFactory);
-		}
-		catch (NotSupportedException ex) {
-			throw new org.springframework.jca.cci.CciOperationNotSupportedException(
-					"CCI operation not supported by connector", ex);
-		}
-		catch (ResourceException ex) {
-			throw new DataAccessResourceFailureException("CCI operation failed", ex);
-		}
-		catch (SQLException ex) {
-			throw new org.springframework.jca.cci.InvalidResultSetAccessException(
-					"Parsing of CCI ResultSet failed", ex);
-		}
-		finally {
-			org.springframework.jca.cci.connection.ConnectionFactoryUtils.releaseConnection(
-					con, getConnectionFactory());
-		}
-	}
-
-	@Override
-	@Nullable
-	public <T> T execute(final InteractionCallback<T> action) throws DataAccessException {
-		Assert.notNull(action, "Callback object must not be null");
-		return execute((ConnectionCallback<T>) (connection, connectionFactory) -> {
-			Interaction interaction = connection.createInteraction();
-			try {
-				return action.doInInteraction(interaction, connectionFactory);
-			}
-			finally {
-				closeInteraction(interaction);
-			}
-		});
-	}
-
-	@Override
-	@Nullable
-	public Record execute(InteractionSpec spec, Record inputRecord) throws DataAccessException {
-		return doExecute(spec, inputRecord, null, new SimpleRecordExtractor());
-	}
-
-	@Override
-	public void execute(InteractionSpec spec, Record inputRecord, Record outputRecord) throws DataAccessException {
-		doExecute(spec, inputRecord, outputRecord, null);
-	}
-
-	@Override
-	public Record execute(InteractionSpec spec, RecordCreator inputCreator) throws DataAccessException {
-		Record output = doExecute(spec, createRecord(inputCreator), null, new SimpleRecordExtractor());
-		Assert.state(output != null, "Invalid output record");
-		return output;
-	}
-
-	@Override
-	public <T> T execute(InteractionSpec spec, Record inputRecord, RecordExtractor<T> outputExtractor)
-			throws DataAccessException {
-
-		return doExecute(spec, inputRecord, null, outputExtractor);
-	}
-
-	@Override
-	public <T> T execute(InteractionSpec spec, RecordCreator inputCreator, RecordExtractor<T> outputExtractor)
-			throws DataAccessException {
-
-		return doExecute(spec, createRecord(inputCreator), null, outputExtractor);
-	}
-
-	/**
-	 * Execute the specified interaction on an EIS with CCI.
-	 * All other interaction execution methods go through this.
-	 * @param spec the CCI InteractionSpec instance that defines
-	 * the interaction (connector-specific)
-	 * @param inputRecord the input record
-	 * @param outputRecord output record (can be {@code null})
-	 * @param outputExtractor object to convert the output record to a result object
-	 * @return the output data extracted with the RecordExtractor object
-	 * @throws DataAccessException if there is any problem
-	 */
-	@Nullable
-	protected <T> T doExecute(
-			final InteractionSpec spec, final Record inputRecord, @Nullable final Record outputRecord,
-			@Nullable final RecordExtractor<T> outputExtractor) throws DataAccessException {
-
-		return execute((InteractionCallback<T>) (interaction, connectionFactory) -> {
-			Record outputRecordToUse = outputRecord;
-			try {
-				if (outputRecord != null || getOutputRecordCreator() != null) {
-					// Use the CCI execute method with output record as parameter.
-					if (outputRecord == null) {
-						RecordFactory recordFactory = getRecordFactory(connectionFactory);
-						outputRecordToUse = getOutputRecordCreator().createRecord(recordFactory);
-					}
-					interaction.execute(spec, inputRecord, outputRecordToUse);
-				}
-				else {
-					outputRecordToUse = interaction.execute(spec, inputRecord);
-				}
-				return (outputExtractor != null ? outputExtractor.extractData(outputRecordToUse) : null);
-			}
-			finally {
-				if (outputRecordToUse instanceof ResultSet) {
-					closeResultSet((ResultSet) outputRecordToUse);
-				}
-			}
-		});
-	}
-
-
-	/**
-	 * Create an indexed Record through the ConnectionFactory's RecordFactory.
-	 * @param name the name of the record
-	 * @return the Record
-	 * @throws DataAccessException if creation of the Record failed
-	 * @see #getRecordFactory(javax.resource.cci.ConnectionFactory)
-	 * @see javax.resource.cci.RecordFactory#createIndexedRecord(String)
-	 */
-	public IndexedRecord createIndexedRecord(String name) throws DataAccessException {
-		try {
-			RecordFactory recordFactory = getRecordFactory(obtainConnectionFactory());
-			return recordFactory.createIndexedRecord(name);
-		}
-		catch (NotSupportedException ex) {
-			throw new org.springframework.jca.cci.RecordTypeNotSupportedException(
-					"Creation of indexed Record not supported by connector", ex);
-		}
-		catch (ResourceException ex) {
-			throw new org.springframework.jca.cci.CannotCreateRecordException(
-					"Creation of indexed Record failed", ex);
-		}
-	}
-
-	/**
-	 * Create a mapped Record from the ConnectionFactory's RecordFactory.
-	 * @param name record name
-	 * @return the Record
-	 * @throws DataAccessException if creation of the Record failed
-	 * @see #getRecordFactory(javax.resource.cci.ConnectionFactory)
-	 * @see javax.resource.cci.RecordFactory#createMappedRecord(String)
-	 */
-	public MappedRecord createMappedRecord(String name) throws DataAccessException {
-		try {
-			RecordFactory recordFactory = getRecordFactory(obtainConnectionFactory());
-			return recordFactory.createMappedRecord(name);
-		}
-		catch (NotSupportedException ex) {
-			throw new org.springframework.jca.cci.RecordTypeNotSupportedException(
-					"Creation of mapped Record not supported by connector", ex);
-		}
-		catch (ResourceException ex) {
-			throw new org.springframework.jca.cci.CannotCreateRecordException(
-					"Creation of mapped Record failed", ex);
-		}
-	}
-
-	/**
-	 * Invoke the given RecordCreator, converting JCA ResourceExceptions
-	 * to Spring's DataAccessException hierarchy.
-	 * @param recordCreator the RecordCreator to invoke
-	 * @return the created Record
-	 * @throws DataAccessException if creation of the Record failed
-	 * @see #getRecordFactory(javax.resource.cci.ConnectionFactory)
-	 * @see RecordCreator#createRecord(javax.resource.cci.RecordFactory)
-	 */
-	protected Record createRecord(RecordCreator recordCreator) throws DataAccessException {
-		try {
-			RecordFactory recordFactory = getRecordFactory(obtainConnectionFactory());
-			return recordCreator.createRecord(recordFactory);
-		}
-		catch (NotSupportedException ex) {
-			throw new org.springframework.jca.cci.RecordTypeNotSupportedException(
-					"Creation of the desired Record type not supported by connector", ex);
-		}
-		catch (ResourceException ex) {
-			throw new org.springframework.jca.cci.CannotCreateRecordException(
-					"Creation of the desired Record failed", ex);
-		}
-	}
-
-	/**
-	 * Return a RecordFactory for the given ConnectionFactory.
-	 * <p>Default implementation returns the connector's RecordFactory if
-	 * available, falling back to a NotSupportedRecordFactory placeholder.
-	 * This allows to invoke a RecordCreator callback with a non-null
-	 * RecordFactory reference in any case.
-	 * @param connectionFactory the CCI ConnectionFactory
-	 * @return the CCI RecordFactory for the ConnectionFactory
-	 * @throws ResourceException if thrown by CCI methods
-	 * @see org.springframework.jca.cci.connection.NotSupportedRecordFactory
-	 */
-	protected RecordFactory getRecordFactory(ConnectionFactory connectionFactory) throws ResourceException {
-		try {
-			return connectionFactory.getRecordFactory();
-		}
-		catch (NotSupportedException ex) {
-			return new org.springframework.jca.cci.connection.NotSupportedRecordFactory();
-		}
-	}
-
-
-	/**
-	 * Close the given CCI Interaction and ignore any thrown exception.
-	 * This is useful for typical finally blocks in manual CCI code.
-	 * @param interaction the CCI Interaction to close
-	 * @see javax.resource.cci.Interaction#close()
-	 */
-	private void closeInteraction(@Nullable Interaction interaction) {
-		if (interaction != null) {
-			try {
-				interaction.close();
-			}
-			catch (ResourceException ex) {
-				logger.trace("Could not close CCI Interaction", ex);
-			}
-			catch (Throwable ex) {
-				// We don't trust the CCI driver: It might throw RuntimeException or Error.
-				logger.trace("Unexpected exception on closing CCI Interaction", ex);
-			}
-		}
-	}
-
-	/**
-	 * Close the given CCI ResultSet and ignore any thrown exception.
-	 * This is useful for typical finally blocks in manual CCI code.
-	 * @param resultSet the CCI ResultSet to close
-	 * @see javax.resource.cci.ResultSet#close()
-	 */
-	private void closeResultSet(@Nullable ResultSet resultSet) {
-		if (resultSet != null) {
-			try {
-				resultSet.close();
-			}
-			catch (SQLException ex) {
-				logger.trace("Could not close CCI ResultSet", ex);
-			}
-			catch (Throwable ex) {
-				// We don't trust the CCI driver: It might throw RuntimeException or Error.
-				logger.trace("Unexpected exception on closing CCI ResultSet", ex);
-			}
-		}
-	}
-
-
-	private static class SimpleRecordExtractor implements RecordExtractor<Record> {
-
-		@Override
-		public Record extractData(Record record) {
-			return record;
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
deleted file mode 100644
index a573f3583e61..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core;
-
-import java.sql.SQLException;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
-
-/**
- * Generic callback interface for code that operates on a CCI Connection.
- * Allows to execute any number of operations on a single Connection,
- * using any type and number of Interaction.
- *
- * <p>This is particularly useful for delegating to existing data access code
- * that expects a Connection to work on and throws ResourceException. For newly
- * written code, it is strongly recommended to use CciTemplate's more specific
- * {@code execute} variants.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @param <T> the result type
- * @see CciTemplate#execute(ConnectionCallback)
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, javax.resource.cci.Record)
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, RecordCreator, RecordExtractor)
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@FunctionalInterface
-public interface ConnectionCallback<T> {
-
-	/**
-	 * Gets called by {@code CciTemplate.execute} with an active CCI Connection.
-	 * Does not need to care about activating or closing the Connection, or handling
-	 * transactions.
-	 * <p>If called without a thread-bound CCI transaction (initiated by
-	 * CciLocalTransactionManager), the code will simply get executed on the CCI
-	 * Connection with its transactional semantics. If CciTemplate is configured
-	 * to use a JTA-aware ConnectionFactory, the CCI Connection and thus the callback
-	 * code will be transactional if a JTA transaction is active.
-	 * <p>Allows for returning a result object created within the callback, i.e.
-	 * a domain object or a collection of domain objects. Note that there's special
-	 * support for single step actions: see the {@code CciTemplate.execute}
-	 * variants. A thrown RuntimeException is treated as application exception:
-	 * it gets propagated to the caller of the template.
-	 * @param connection active CCI Connection
-	 * @param connectionFactory the CCI ConnectionFactory that the Connection was
-	 * created with (gives access to RecordFactory and ResourceAdapterMetaData)
-	 * @return a result object, or {@code null} if none
-	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
-	 * to a DataAccessException
-	 * @throws SQLException if thrown by a ResultSet method, to be auto-converted
-	 * to a DataAccessException
-	 * @throws DataAccessException in case of custom exceptions
-	 * @see javax.resource.cci.ConnectionFactory#getRecordFactory()
-	 * @see javax.resource.cci.ConnectionFactory#getMetaData()
-	 * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, RecordCreator, RecordExtractor)
-	 */
-	@Nullable
-	T doInConnection(Connection connection, ConnectionFactory connectionFactory)
-			throws ResourceException, SQLException, DataAccessException;
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
deleted file mode 100644
index 447a1432eb9e..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core;
-
-import java.sql.SQLException;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.Interaction;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
-
-/**
- * Generic callback interface for code that operates on a CCI Interaction.
- * Allows to execute any number of operations on a single Interaction, for
- * example a single execute call or repeated execute calls with varying
- * parameters.
- *
- * <p>This is particularly useful for delegating to existing data access code
- * that expects an Interaction to work on and throws ResourceException. For newly
- * written code, it is strongly recommended to use CciTemplate's more specific
- * {@code execute} variants.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @param <T> the result type
- * @see CciTemplate#execute(InteractionCallback)
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, javax.resource.cci.Record)
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, RecordCreator, RecordExtractor)
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@FunctionalInterface
-public interface InteractionCallback<T> {
-
-	/**
-	 * Gets called by {@code CciTemplate.execute} with an active CCI Interaction.
-	 * Does not need to care about activating or closing the Interaction, or
-	 * handling transactions.
-	 * <p>If called without a thread-bound CCI transaction (initiated by
-	 * CciLocalTransactionManager), the code will simply get executed on the CCI
-	 * Interaction with its transactional semantics. If CciTemplate is configured
-	 * to use a JTA-aware ConnectionFactory, the CCI Interaction and thus the callback
-	 * code will be transactional if a JTA transaction is active.
-	 * <p>Allows for returning a result object created within the callback, i.e.
-	 * a domain object or a collection of domain objects. Note that there's special
-	 * support for single step actions: see the {@code CciTemplate.execute}
-	 * variants. A thrown RuntimeException is treated as application exception:
-	 * it gets propagated to the caller of the template.
-	 * @param interaction active CCI Interaction
-	 * @param connectionFactory the CCI ConnectionFactory that the Connection was
-	 * created with (gives access to RecordFactory and ResourceAdapterMetaData)
-	 * @return a result object, or {@code null} if none
-	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
-	 * to a DataAccessException
-	 * @throws SQLException if thrown by a ResultSet method, to be auto-converted
-	 * to a DataAccessException
-	 * @throws DataAccessException in case of custom exceptions
-	 * @see javax.resource.cci.ConnectionFactory#getRecordFactory()
-	 * @see javax.resource.cci.ConnectionFactory#getMetaData()
-	 * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, RecordCreator, RecordExtractor)
-	 */
-	@Nullable
-	T doInInteraction(Interaction interaction, ConnectionFactory connectionFactory)
-			throws ResourceException, SQLException, DataAccessException;
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
deleted file mode 100644
index 18836887e032..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Record;
-import javax.resource.cci.RecordFactory;
-
-import org.springframework.dao.DataAccessException;
-
-/**
- * Callback interface for creating a CCI Record instance,
- * usually based on the passed-in CCI RecordFactory.
- *
- * <p>Used for input Record creation in CciTemplate. Alternatively,
- * Record instances can be passed into CciTemplate's corresponding
- * {@code execute} methods directly, either instantiated manually
- * or created through CciTemplate's Record factory methods.
- *
- * <P>Also used for creating default output Records in CciTemplate.
- * This is useful when the JCA connector needs an explicit output Record
- * instance, but no output Records should be passed into CciTemplate's
- * {@code execute} methods.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, RecordCreator)
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, RecordCreator, RecordExtractor)
- * @see CciTemplate#createIndexedRecord(String)
- * @see CciTemplate#createMappedRecord(String)
- * @see CciTemplate#setOutputRecordCreator(RecordCreator)
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@FunctionalInterface
-public interface RecordCreator {
-
-	/**
-	 * Create a CCI Record instance, usually based on the passed-in CCI RecordFactory.
-	 * <p>For use as <i>input</i> creator with CciTemplate's {@code execute} methods,
-	 * this method should create a <i>populated</i> Record instance. For use as
-	 * <i>output</i> Record creator, it should return an <i>empty</i> Record instance.
-	 * @param recordFactory the CCI RecordFactory (never {@code null}, but not guaranteed to be
-	 * supported by the connector: its create methods might throw NotSupportedException)
-	 * @return the Record instance
-	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
-	 * to a DataAccessException
-	 * @throws DataAccessException in case of custom exceptions
-	 */
-	Record createRecord(RecordFactory recordFactory) throws ResourceException, DataAccessException;
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
deleted file mode 100644
index 8c5e9e2b666d..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core;
-
-import java.sql.SQLException;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Record;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
-
-/**
- * Callback interface for extracting a result object from a CCI Record instance.
- *
- * <p>Used for output object creation in CciTemplate. Alternatively, output
- * Records can also be returned to client code as-is. In case of a CCI ResultSet
- * as execution result, you will almost always want to implement a RecordExtractor,
- * to be able to read the ResultSet in a managed fashion, with the CCI Connection
- * still open while reading the ResultSet.
- *
- * <p>Implementations of this interface perform the actual work of extracting
- * results, but don't need to worry about exception handling. ResourceExceptions
- * will be caught and handled correctly by the CciTemplate class.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @param <T> the result type
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, Record, RecordExtractor)
- * @see CciTemplate#execute(javax.resource.cci.InteractionSpec, RecordCreator, RecordExtractor)
- * @see javax.resource.cci.ResultSet
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@FunctionalInterface
-public interface RecordExtractor<T> {
-
-	/**
-	 * Process the data in the given Record, creating a corresponding result object.
-	 * @param record the Record to extract data from
-	 * (possibly a CCI ResultSet)
-	 * @return an arbitrary result object, or {@code null} if none
-	 * (the extractor will typically be stateful in the latter case)
-	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
-	 * to a DataAccessException
-	 * @throws SQLException if thrown by a ResultSet method, to be auto-converted
-	 * to a DataAccessException
-	 * @throws DataAccessException in case of custom exceptions
-	 * @see javax.resource.cci.ResultSet
-	 */
-	@Nullable
-	T extractData(Record record) throws ResourceException, SQLException, DataAccessException;
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
deleted file mode 100644
index 33d36edf29d8..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides the core JCA CCI support, based on CciTemplate
- * and its associated callback interfaces.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jca.cci.core;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
deleted file mode 100644
index e650bae60516..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core.support;
-
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.ConnectionSpec;
-
-import org.springframework.dao.support.DaoSupport;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Convenient super class for CCI-based data access objects.
- *
- * <p>Requires a {@link javax.resource.cci.ConnectionFactory} to be set,
- * providing a {@link org.springframework.jca.cci.core.CciTemplate} based
- * on it to subclasses through the {@link #getCciTemplate()} method.
- *
- * <p>This base class is mainly intended for CciTemplate usage but can
- * also be used when working with a Connection directly or when using
- * {@code org.springframework.jca.cci.object} classes.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see #setConnectionFactory
- * @see #getCciTemplate
- * @see org.springframework.jca.cci.core.CciTemplate
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public abstract class CciDaoSupport extends DaoSupport {
-
-	@Nullable
-	private org.springframework.jca.cci.core.CciTemplate cciTemplate;
-
-
-	/**
-	 * Set the ConnectionFactory to be used by this DAO.
-	 */
-	public final void setConnectionFactory(ConnectionFactory connectionFactory) {
-		if (this.cciTemplate == null || connectionFactory != this.cciTemplate.getConnectionFactory()) {
-			this.cciTemplate = createCciTemplate(connectionFactory);
-		}
-	}
-
-	/**
-	 * Create a CciTemplate for the given ConnectionFactory.
-	 * Only invoked if populating the DAO with a ConnectionFactory reference!
-	 * <p>Can be overridden in subclasses to provide a CciTemplate instance
-	 * with different configuration, or a custom CciTemplate subclass.
-	 * @param connectionFactory the CCI ConnectionFactory to create a CciTemplate for
-	 * @return the new CciTemplate instance
-	 * @see #setConnectionFactory(javax.resource.cci.ConnectionFactory)
-	 */
-	protected org.springframework.jca.cci.core.CciTemplate createCciTemplate(ConnectionFactory connectionFactory) {
-		return new org.springframework.jca.cci.core.CciTemplate(connectionFactory);
-	}
-
-	/**
-	 * Return the ConnectionFactory used by this DAO.
-	 */
-	@Nullable
-	public final ConnectionFactory getConnectionFactory() {
-		return (this.cciTemplate != null ? this.cciTemplate.getConnectionFactory() : null);
-	}
-
-	/**
-	 * Set the CciTemplate for this DAO explicitly,
-	 * as an alternative to specifying a ConnectionFactory.
-	 */
-	public final void setCciTemplate(org.springframework.jca.cci.core.CciTemplate cciTemplate) {
-		this.cciTemplate = cciTemplate;
-	}
-
-	/**
-	 * Return the CciTemplate for this DAO,
-	 * pre-initialized with the ConnectionFactory or set explicitly.
-	 */
-	@Nullable
-	public final org.springframework.jca.cci.core.CciTemplate getCciTemplate() {
-		return this.cciTemplate;
-	}
-
-	@Override
-	protected final void checkDaoConfig() {
-		if (this.cciTemplate == null) {
-			throw new IllegalArgumentException("'connectionFactory' or 'cciTemplate' is required");
-		}
-	}
-
-
-	/**
-	 * Obtain a CciTemplate derived from the main template instance,
-	 * inheriting the ConnectionFactory and other settings but
-	 * overriding the ConnectionSpec used for obtaining Connections.
-	 * @param connectionSpec the CCI ConnectionSpec that the returned
-	 * template instance is supposed to obtain Connections for
-	 * @return the derived template instance
-	 * @see org.springframework.jca.cci.core.CciTemplate#getDerivedTemplate(javax.resource.cci.ConnectionSpec)
-	 */
-	protected final org.springframework.jca.cci.core.CciTemplate getCciTemplate(ConnectionSpec connectionSpec) {
-		org.springframework.jca.cci.core.CciTemplate cciTemplate = getCciTemplate();
-		Assert.state(cciTemplate != null, "No CciTemplate set");
-		return cciTemplate.getDerivedTemplate(connectionSpec);
-	}
-
-	/**
-	 * Get a CCI Connection, either from the current transaction or a new one.
-	 * @return the CCI Connection
-	 * @throws org.springframework.jca.cci.CannotGetCciConnectionException
-	 * if the attempt to get a Connection failed
-	 * @see org.springframework.jca.cci.connection.ConnectionFactoryUtils#getConnection(javax.resource.cci.ConnectionFactory)
-	 */
-	protected final Connection getConnection() throws org.springframework.jca.cci.CannotGetCciConnectionException {
-		ConnectionFactory connectionFactory = getConnectionFactory();
-		Assert.state(connectionFactory != null, "No ConnectionFactory set");
-		return org.springframework.jca.cci.connection.ConnectionFactoryUtils.getConnection(connectionFactory);
-	}
-
-	/**
-	 * Close the given CCI Connection, created via this bean's ConnectionFactory,
-	 * if it isn't bound to the thread.
-	 * @param con the Connection to close
-	 * @see org.springframework.jca.cci.connection.ConnectionFactoryUtils#releaseConnection
-	 */
-	protected final void releaseConnection(Connection con) {
-		org.springframework.jca.cci.connection.ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory());
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
deleted file mode 100644
index 6f54b8b03cef..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.core.support;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.resource.cci.Record;
-import javax.resource.cci.Streamable;
-
-import org.springframework.util.FileCopyUtils;
-
-/**
- * CCI Record implementation for a COMMAREA, holding a byte array.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see org.springframework.jca.cci.object.MappingCommAreaOperation
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class CommAreaRecord implements Record, Streamable {
-
-	private byte[] bytes = new byte[0];
-
-	private String recordName = "";
-
-	private String recordShortDescription = "";
-
-
-	/**
-	 * Create a new CommAreaRecord.
-	 * @see #read(java.io.InputStream)
-	 */
-	public CommAreaRecord() {
-	}
-
-	/**
-	 * Create a new CommAreaRecord.
-	 * @param bytes the bytes to fill the record with
-	 */
-	public CommAreaRecord(byte[] bytes) {
-		this.bytes = bytes;
-	}
-
-
-	@Override
-	public void setRecordName(String recordName) {
-		this.recordName = recordName;
-	}
-
-	@Override
-	public String getRecordName() {
-		return this.recordName;
-	}
-
-	@Override
-	public void setRecordShortDescription(String recordShortDescription) {
-		this.recordShortDescription = recordShortDescription;
-	}
-
-	@Override
-	public String getRecordShortDescription() {
-		return this.recordShortDescription;
-	}
-
-
-	@Override
-	public void read(InputStream in) throws IOException {
-		this.bytes = FileCopyUtils.copyToByteArray(in);
-	}
-
-	@Override
-	public void write(OutputStream out) throws IOException {
-		out.write(this.bytes);
-		out.flush();
-	}
-
-	public byte[] toByteArray() {
-		return this.bytes;
-	}
-
-
-	@Override
-	public Object clone() {
-		return new CommAreaRecord(this.bytes);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
deleted file mode 100644
index d7bfd6bc0f22..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Classes supporting the {@code org.springframework.jca.cci.core} package.
- * Contains a DAO base class for CciTemplate usage.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jca.cci.core.support;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
deleted file mode 100644
index 7cbe685ef03f..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.object;
-
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.InteractionSpec;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Base class for EIS operation objects that work with the CCI API.
- * Encapsulates a CCI ConnectionFactory and a CCI InteractionSpec.
- *
- * <p>Works with a CciTemplate instance underneath. EIS operation objects
- * are an alternative to working with a CciTemplate directly.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @see #setConnectionFactory
- * @see #setInteractionSpec
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public abstract class EisOperation implements InitializingBean {
-
-	private org.springframework.jca.cci.core.CciTemplate cciTemplate =
-			new org.springframework.jca.cci.core.CciTemplate();
-
-	@Nullable
-	private InteractionSpec interactionSpec;
-
-
-	/**
-	 * Set the CciTemplate to be used by this operation.
-	 * Alternatively, specify a CCI ConnectionFactory.
-	 * @see #setConnectionFactory
-	 */
-	public void setCciTemplate(org.springframework.jca.cci.core.CciTemplate cciTemplate) {
-		Assert.notNull(cciTemplate, "CciTemplate must not be null");
-		this.cciTemplate = cciTemplate;
-	}
-
-	/**
-	 * Return the CciTemplate used by this operation.
-	 */
-	public org.springframework.jca.cci.core.CciTemplate getCciTemplate() {
-		return this.cciTemplate;
-	}
-
-	/**
-	 * Set the CCI ConnectionFactory to be used by this operation.
-	 */
-	public void setConnectionFactory(ConnectionFactory connectionFactory) {
-		this.cciTemplate.setConnectionFactory(connectionFactory);
-	}
-
-	/**
-	 * Set the CCI InteractionSpec for this operation.
-	 */
-	public void setInteractionSpec(@Nullable InteractionSpec interactionSpec) {
-		this.interactionSpec = interactionSpec;
-	}
-
-	/**
-	 * Return the CCI InteractionSpec for this operation.
-	 */
-	@Nullable
-	public InteractionSpec getInteractionSpec() {
-		return this.interactionSpec;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		this.cciTemplate.afterPropertiesSet();
-
-		if (this.interactionSpec == null) {
-			throw new IllegalArgumentException("InteractionSpec is required");
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
deleted file mode 100644
index 25db832ae20b..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.object;
-
-import java.io.IOException;
-
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.Record;
-import javax.resource.cci.RecordFactory;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataRetrievalFailureException;
-
-/**
- * EIS operation object for access to COMMAREA records.
- * Subclass of the generic MappingRecordOperation class.
- *
- * @author Thierry Templier
- * @since 1.2
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public abstract class MappingCommAreaOperation extends MappingRecordOperation {
-
-	/**
-	 * Create a new MappingCommAreaQuery.
-	 * @see #setConnectionFactory
-	 * @see #setInteractionSpec
-	 */
-	public MappingCommAreaOperation() {
-	}
-
-	/**
-	 * Create a new MappingCommAreaQuery.
-	 * @param connectionFactory the ConnectionFactory to use to obtain connections
-	 * @param interactionSpec specification to configure the interaction
-	 */
-	public MappingCommAreaOperation(ConnectionFactory connectionFactory, InteractionSpec interactionSpec) {
-		super(connectionFactory, interactionSpec);
-	}
-
-
-	@Override
-	protected final Record createInputRecord(RecordFactory recordFactory, Object inObject) {
-		try {
-			return new org.springframework.jca.cci.core.support.CommAreaRecord(objectToBytes(inObject));
-		}
-		catch (IOException ex) {
-			throw new DataRetrievalFailureException("I/O exception during bytes conversion", ex);
-		}
-	}
-
-	@Override
-	protected final Object extractOutputData(Record record) throws DataAccessException {
-		org.springframework.jca.cci.core.support.CommAreaRecord commAreaRecord =
-				(org.springframework.jca.cci.core.support.CommAreaRecord) record;
-		try {
-			return bytesToObject(commAreaRecord.toByteArray());
-		}
-		catch (IOException ex) {
-			throw new DataRetrievalFailureException("I/O exception during bytes conversion", ex);
-		}
-	}
-
-
-	/**
-	 * Method used to convert an object into COMMAREA bytes.
-	 * @param inObject the input data
-	 * @return the COMMAREA's bytes
-	 * @throws IOException if thrown by I/O methods
-	 * @throws DataAccessException if conversion failed
-	 */
-	protected abstract byte[] objectToBytes(Object inObject) throws IOException, DataAccessException;
-
-	/**
-	 * Method used to convert the COMMAREA's bytes to an object.
-	 * @param bytes the COMMAREA's bytes
-	 * @return the output data
-	 * @throws IOException if thrown by I/O methods
-	 * @throws DataAccessException if conversion failed
-	 */
-	protected abstract Object bytesToObject(byte[] bytes) throws IOException, DataAccessException;
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
deleted file mode 100644
index 148c181a44dd..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.object;
-
-import java.sql.SQLException;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.Record;
-import javax.resource.cci.RecordFactory;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * EIS operation object that expects mapped input and output objects,
- * converting to and from CCI Records.
- *
- * <p>Concrete subclasses must implement the abstract
- * {@code createInputRecord(RecordFactory, Object)} and
- * {@code extractOutputData(Record)} methods, to create an input
- * Record from an object and to convert an output Record into an object,
- * respectively.
- *
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @since 1.2
- * @see #createInputRecord(javax.resource.cci.RecordFactory, Object)
- * @see #extractOutputData(javax.resource.cci.Record)
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public abstract class MappingRecordOperation extends EisOperation {
-
-	/**
-	 * Constructor that allows use as a JavaBean.
-	 */
-	public MappingRecordOperation() {
-	}
-
-	/**
-	 * Convenient constructor with ConnectionFactory and specifications
-	 * (connection and interaction).
-	 * @param connectionFactory the ConnectionFactory to use to obtain connections
-	 */
-	public MappingRecordOperation(ConnectionFactory connectionFactory, InteractionSpec interactionSpec) {
-		getCciTemplate().setConnectionFactory(connectionFactory);
-		setInteractionSpec(interactionSpec);
-	}
-
-	/**
-	 * Set a RecordCreator that should be used for creating default output Records.
-	 * <p>Default is none: CCI's {@code Interaction.execute} variant
-	 * that returns an output Record will be called.
-	 * <p>Specify a RecordCreator here if you always need to call CCI's
-	 * {@code Interaction.execute} variant with a passed-in output Record.
-	 * This RecordCreator will then be invoked to create a default output Record instance.
-	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record)
-	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record, Record)
-	 * @see org.springframework.jca.cci.core.CciTemplate#setOutputRecordCreator
-	 */
-	public void setOutputRecordCreator(org.springframework.jca.cci.core.RecordCreator creator) {
-		getCciTemplate().setOutputRecordCreator(creator);
-	}
-
-	/**
-	 * Execute the interaction encapsulated by this operation object.
-	 * @param inputObject the input data, to be converted to a Record
-	 * by the {@code createInputRecord} method
-	 * @return the output data extracted with the {@code extractOutputData} method
-	 * @throws DataAccessException if there is any problem
-	 * @see #createInputRecord
-	 * @see #extractOutputData
-	 */
-	@Nullable
-	public Object execute(Object inputObject) throws DataAccessException {
-		InteractionSpec interactionSpec = getInteractionSpec();
-		Assert.state(interactionSpec != null, "No InteractionSpec set");
-		return getCciTemplate().execute(
-				interactionSpec, new RecordCreatorImpl(inputObject), new RecordExtractorImpl());
-	}
-
-
-	/**
-	 * Subclasses must implement this method to generate an input Record
-	 * from an input object passed into the {@code execute} method.
-	 * @param inputObject the passed-in input object
-	 * @return the CCI input Record
-	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
-	 * to a DataAccessException
-	 * @see #execute(Object)
-	 */
-	protected abstract Record createInputRecord(RecordFactory recordFactory, Object inputObject)
-			throws ResourceException, DataAccessException;
-
-	/**
-	 * Subclasses must implement this method to convert the Record returned
-	 * by CCI execution into a result object for the {@code execute} method.
-	 * @param outputRecord the Record returned by CCI execution
-	 * @return the result object
-	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
-	 * to a DataAccessException
-	 * @see #execute(Object)
-	 */
-	protected abstract Object extractOutputData(Record outputRecord)
-			throws ResourceException, SQLException, DataAccessException;
-
-
-	/**
-	 * Implementation of RecordCreator that calls the enclosing
-	 * class's {@code createInputRecord} method.
-	 */
-	protected class RecordCreatorImpl implements org.springframework.jca.cci.core.RecordCreator {
-
-		private final Object inputObject;
-
-		public RecordCreatorImpl(Object inObject) {
-			this.inputObject = inObject;
-		}
-
-		@Override
-		public Record createRecord(RecordFactory recordFactory) throws ResourceException, DataAccessException {
-			return createInputRecord(recordFactory, this.inputObject);
-		}
-	}
-
-
-	/**
-	 * Implementation of RecordExtractor that calls the enclosing
-	 * class's {@code extractOutputData} method.
-	 */
-	protected class RecordExtractorImpl implements org.springframework.jca.cci.core.RecordExtractor<Object> {
-
-		@Override
-		public Object extractData(Record record) throws ResourceException, SQLException, DataAccessException {
-			return extractOutputData(record);
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
deleted file mode 100644
index 5799ca935a89..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.
- * 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.jca.cci.object;
-
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.Record;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * EIS operation object that accepts a passed-in CCI input Record
- * and returns a corresponding CCI output Record.
- *
- * @author Juergen Hoeller
- * @since 1.2
- * @deprecated as of 5.3, in favor of specific data access APIs
- * (or native CCI usage if there is no alternative)
- */
-@Deprecated
-public class SimpleRecordOperation extends EisOperation {
-
-	/**
-	 * Constructor that allows use as a JavaBean.
-	 */
-	public SimpleRecordOperation() {
-	}
-
-	/**
-	 * Convenient constructor with ConnectionFactory and specifications
-	 * (connection and interaction).
-	 * @param connectionFactory the ConnectionFactory to use to obtain connections
-	 */
-	public SimpleRecordOperation(ConnectionFactory connectionFactory, InteractionSpec interactionSpec) {
-		getCciTemplate().setConnectionFactory(connectionFactory);
-		setInteractionSpec(interactionSpec);
-	}
-
-
-	/**
-	 * Execute the CCI interaction encapsulated by this operation object.
-	 * <p>This method will call CCI's {@code Interaction.execute} variant
-	 * that returns an output Record.
-	 * @param inputRecord the input record
-	 * @return the output record
-	 * @throws DataAccessException if there is any problem
-	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record)
-	 */
-	@Nullable
-	public Record execute(Record inputRecord) throws DataAccessException {
-		InteractionSpec interactionSpec = getInteractionSpec();
-		Assert.state(interactionSpec != null, "No InteractionSpec set");
-		return getCciTemplate().execute(interactionSpec, inputRecord);
-	}
-
-	/**
-	 * Execute the CCI interaction encapsulated by this operation object.
-	 * <p>This method will call CCI's {@code Interaction.execute} variant
-	 * with a passed-in output Record.
-	 * @param inputRecord the input record
-	 * @param outputRecord the output record
-	 * @throws DataAccessException if there is any problem
-	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record, Record)
-	 */
-	public void execute(Record inputRecord, Record outputRecord) throws DataAccessException {
-		InteractionSpec interactionSpec = getInteractionSpec();
-		Assert.state(interactionSpec != null, "No InteractionSpec set");
-		getCciTemplate().execute(interactionSpec, inputRecord, outputRecord);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
deleted file mode 100644
index 2c51b175d105..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * The classes in this package represent EIS operations as threadsafe,
- * reusable objects. This higher level of CCI abstraction depends on the
- * lower-level abstraction in the {@code org.springframework.jca.cci.core} package.
- * Exceptions thrown are as in the {@code org.springframework.dao} package,
- * meaning that code using this package does not need to worry about error handling.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jca.cci.object;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
deleted file mode 100644
index 469cdc926b3b..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * This package contains Spring's support for the Common Client Interface (CCI),
- * as defined by the J2EE Connector Architecture. It is conceptually similar
- * to the {@code org.springframework.jdbc} package, providing the same
- * levels of data access abstraction.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jca.cci;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
deleted file mode 100644
index 66c6b65c1d38..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- * 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.jca.context;
-
-import javax.resource.spi.BootstrapContext;
-
-import org.springframework.beans.factory.Aware;
-
-/**
- * Interface to be implemented by any object that wishes to be
- * notified of the BootstrapContext (typically determined by the
- * {@link ResourceAdapterApplicationContext}) that it runs in.
- *
- * @author Juergen Hoeller
- * @author Chris Beams
- * @since 2.5
- * @see javax.resource.spi.BootstrapContext
- */
-public interface BootstrapContextAware extends Aware {
-
-	/**
-	 * Set the BootstrapContext that this object runs in.
-	 * <p>Invoked after population of normal bean properties but before an init
-	 * callback like InitializingBean's {@code afterPropertiesSet} or a
-	 * custom init-method. Invoked after ApplicationContextAware's
-	 * {@code setApplicationContext}.
-	 * @param bootstrapContext the BootstrapContext object to be used by this object
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext
-	 */
-	void setBootstrapContext(BootstrapContext bootstrapContext);
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
deleted file mode 100644
index 1efb9d9a6915..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- * 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.jca.context;
-
-import javax.resource.spi.BootstrapContext;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link org.springframework.beans.factory.config.BeanPostProcessor}
- * implementation that passes the BootstrapContext to beans that implement
- * the {@link BootstrapContextAware} interface.
- *
- * <p>{@link ResourceAdapterApplicationContext} automatically registers
- * this processor with its underlying bean factory.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see BootstrapContextAware
- */
-class BootstrapContextAwareProcessor implements BeanPostProcessor {
-
-	@Nullable
-	private final BootstrapContext bootstrapContext;
-
-
-	/**
-	 * Create a new BootstrapContextAwareProcessor for the given context.
-	 */
-	public BootstrapContextAwareProcessor(@Nullable BootstrapContext bootstrapContext) {
-		this.bootstrapContext = bootstrapContext;
-	}
-
-
-	@Override
-	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-		if (this.bootstrapContext != null && bean instanceof BootstrapContextAware) {
-			((BootstrapContextAware) bean).setBootstrapContext(this.bootstrapContext);
-		}
-		return bean;
-	}
-
-	@Override
-	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-		return bean;
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java b/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
deleted file mode 100644
index 4154e2230469..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- * 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.jca.context;
-
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.work.WorkManager;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.context.ApplicationContext} implementation
- * for a JCA ResourceAdapter. Needs to be initialized with the JCA
- * {@link javax.resource.spi.BootstrapContext}, passing it on to
- * Spring-managed beans that implement {@link BootstrapContextAware}.
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see SpringContextResourceAdapter
- * @see BootstrapContextAware
- */
-public class ResourceAdapterApplicationContext extends GenericApplicationContext {
-
-	private final BootstrapContext bootstrapContext;
-
-
-	/**
-	 * Create a new ResourceAdapterApplicationContext for the given BootstrapContext.
-	 * @param bootstrapContext the JCA BootstrapContext that the ResourceAdapter
-	 * has been started with
-	 */
-	public ResourceAdapterApplicationContext(BootstrapContext bootstrapContext) {
-		Assert.notNull(bootstrapContext, "BootstrapContext must not be null");
-		this.bootstrapContext = bootstrapContext;
-	}
-
-
-	@Override
-	protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-		beanFactory.addBeanPostProcessor(new BootstrapContextAwareProcessor(this.bootstrapContext));
-		beanFactory.ignoreDependencyInterface(BootstrapContextAware.class);
-		beanFactory.registerResolvableDependency(BootstrapContext.class, this.bootstrapContext);
-
-		// JCA WorkManager resolved lazily - may not be available.
-		beanFactory.registerResolvableDependency(WorkManager.class,
-				(ObjectFactory<WorkManager>) this.bootstrapContext::getWorkManager);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
deleted file mode 100644
index 3c99117f6450..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * 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.
- * 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.jca.context;
-
-import javax.resource.NotSupportedException;
-import javax.resource.ResourceException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.xa.XAResource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.StandardEnvironment;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * JCA 1.7 {@link javax.resource.spi.ResourceAdapter} implementation
- * that loads a Spring {@link org.springframework.context.ApplicationContext},
- * starting and stopping Spring-managed beans as part of the ResourceAdapter's
- * lifecycle.
- *
- * <p>Ideal for application contexts that do not need any HTTP entry points
- * but rather just consist of message endpoints and scheduled jobs etc.
- * Beans in such a context may use application server resources such as the
- * JTA transaction manager and JNDI-bound JDBC DataSources and JMS
- * ConnectionFactory instances, and may also register with the platform's
- * JMX server - all through Spring's standard transaction management and
- * JNDI and JMX support facilities.
- *
- * <p>If the need for scheduling asynchronous work arises, consider using
- * Spring's {@link org.springframework.jca.work.WorkManagerTaskExecutor}
- * as a standard bean definition, to be injected into application beans
- * through dependency injection. This WorkManagerTaskExecutor will automatically
- * use the JCA WorkManager from the BootstrapContext that has been provided
- * to this ResourceAdapter.
- *
- * <p>The JCA {@link javax.resource.spi.BootstrapContext} may also be
- * accessed directly, through application components that implement the
- * {@link BootstrapContextAware} interface. When deployed using this
- * ResourceAdapter, the BootstrapContext is guaranteed to be passed on
- * to such components.
- *
- * <p>This ResourceAdapter is to be defined in a "META-INF/ra.xml" file
- * within a Java EE ".rar" deployment unit like as follows:
- *
- * <pre class="code">
- * &lt;?xml version="1.0" encoding="UTF-8"?&gt;
- * &lt;connector xmlns="http://java.sun.com/xml/ns/j2ee"
- *		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- *		 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee https://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- *		 version="1.5"&gt;
- *	 &lt;vendor-name&gt;Spring Framework&lt;/vendor-name&gt;
- *	 &lt;eis-type&gt;Spring Connector&lt;/eis-type&gt;
- *	 &lt;resourceadapter-version&gt;1.0&lt;/resourceadapter-version&gt;
- *	 &lt;resourceadapter&gt;
- *		 &lt;resourceadapter-class&gt;org.springframework.jca.context.SpringContextResourceAdapter&lt;/resourceadapter-class&gt;
- *		 &lt;config-property&gt;
- *			 &lt;config-property-name&gt;ContextConfigLocation&lt;/config-property-name&gt;
- *			 &lt;config-property-type&gt;java.lang.String&lt;/config-property-type&gt;
- *			 &lt;config-property-value&gt;META-INF/applicationContext.xml&lt;/config-property-value&gt;
- *		 &lt;/config-property&gt;
- *	 &lt;/resourceadapter&gt;
- * &lt;/connector&gt;</pre>
- *
- * Note that "META-INF/applicationContext.xml" is the default context config
- * location, so it doesn't have to specified unless you intend to specify
- * different/additional config files. So in the default case, you may remove
- * the entire {@code config-property} section above.
- *
- * <p><b>For simple deployment needs, all you need to do is the following:</b>
- * Package all application classes into a RAR file (which is just a standard
- * JAR file with a different file extension), add all required library jars
- * into the root of the RAR archive, add a "META-INF/ra.xml" deployment
- * descriptor as shown above as well as the corresponding Spring XML bean
- * definition file(s) (typically "META-INF/applicationContext.xml"),
- * and drop the resulting RAR file into your application server's
- * deployment directory!
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see #setContextConfigLocation
- * @see #loadBeanDefinitions
- * @see ResourceAdapterApplicationContext
- */
-public class SpringContextResourceAdapter implements ResourceAdapter {
-
-	/**
-	 * Any number of these characters are considered delimiters between
-	 * multiple context config paths in a single String value.
-	 * @see #setContextConfigLocation
-	 */
-	public static final String CONFIG_LOCATION_DELIMITERS = ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS;
-
-	/**
-	 * The default {@code applicationContext.xml} location.
-	 */
-	public static final String DEFAULT_CONTEXT_CONFIG_LOCATION = "META-INF/applicationContext.xml";
-
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private String contextConfigLocation = DEFAULT_CONTEXT_CONFIG_LOCATION;
-
-	@Nullable
-	private ConfigurableApplicationContext applicationContext;
-
-
-	/**
-	 * Set the location of the context configuration files, within the
-	 * resource adapter's deployment unit. This can be a delimited
-	 * String that consists of multiple resource location, separated
-	 * by commas, semicolons, whitespace, or line breaks.
-	 * <p>This can be specified as "ContextConfigLocation" config
-	 * property in the {@code ra.xml} deployment descriptor.
-	 * <p>The default is "classpath:META-INF/applicationContext.xml".
-	 */
-	public void setContextConfigLocation(String contextConfigLocation) {
-		this.contextConfigLocation = contextConfigLocation;
-	}
-
-	/**
-	 * Return the specified context configuration files.
-	 */
-	protected String getContextConfigLocation() {
-		return this.contextConfigLocation;
-	}
-
-	/**
-	 * Return a new {@link StandardEnvironment}.
-	 * <p>Subclasses may override this method in order to supply
-	 * a custom {@link ConfigurableEnvironment} implementation.
-	 */
-	protected ConfigurableEnvironment createEnvironment() {
-		return new StandardEnvironment();
-	}
-
-	/**
-	 * This implementation loads a Spring ApplicationContext through the
-	 * {@link #createApplicationContext} template method.
-	 */
-	@Override
-	public void start(BootstrapContext bootstrapContext) throws ResourceAdapterInternalException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Starting SpringContextResourceAdapter with BootstrapContext: " + bootstrapContext);
-		}
-		this.applicationContext = createApplicationContext(bootstrapContext);
-	}
-
-	/**
-	 * Build a Spring ApplicationContext for the given JCA BootstrapContext.
-	 * <p>The default implementation builds a {@link ResourceAdapterApplicationContext}
-	 * and delegates to {@link #loadBeanDefinitions} for actually parsing the
-	 * specified configuration files.
-	 * @param bootstrapContext this ResourceAdapter's BootstrapContext
-	 * @return the Spring ApplicationContext instance
-	 */
-	protected ConfigurableApplicationContext createApplicationContext(BootstrapContext bootstrapContext) {
-		ResourceAdapterApplicationContext applicationContext =
-				new ResourceAdapterApplicationContext(bootstrapContext);
-
-		// Set ResourceAdapter's ClassLoader as bean class loader.
-		applicationContext.setClassLoader(getClass().getClassLoader());
-
-		// Extract individual config locations.
-		String[] configLocations =
-				StringUtils.tokenizeToStringArray(getContextConfigLocation(), CONFIG_LOCATION_DELIMITERS);
-
-		loadBeanDefinitions(applicationContext, configLocations);
-		applicationContext.refresh();
-
-		return applicationContext;
-	}
-
-	/**
-	 * Load the bean definitions into the given registry,
-	 * based on the specified configuration files.
-	 * @param registry the registry to load into
-	 * @param configLocations the parsed config locations
-	 * @see #setContextConfigLocation
-	 */
-	protected void loadBeanDefinitions(BeanDefinitionRegistry registry, String[] configLocations) {
-		new XmlBeanDefinitionReader(registry).loadBeanDefinitions(configLocations);
-	}
-
-	/**
-	 * This implementation closes the Spring ApplicationContext.
-	 */
-	@Override
-	public void stop() {
-		logger.debug("Stopping SpringContextResourceAdapter");
-		if (this.applicationContext != null) {
-			this.applicationContext.close();
-		}
-	}
-
-
-	/**
-	 * This implementation always throws a NotSupportedException.
-	 */
-	@Override
-	public void endpointActivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec)
-			throws ResourceException {
-
-		throw new NotSupportedException("SpringContextResourceAdapter does not support message endpoints");
-	}
-
-	/**
-	 * This implementation does nothing.
-	 */
-	@Override
-	public void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) {
-	}
-
-	/**
-	 * This implementation always returns {@code null}.
-	 */
-	@Override
-	@Nullable
-	public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
-		return null;
-	}
-
-
-	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof SpringContextResourceAdapter &&
-				ObjectUtils.nullSafeEquals(getContextConfigLocation(),
-						((SpringContextResourceAdapter) other).getContextConfigLocation())));
-	}
-
-	@Override
-	public int hashCode() {
-		return ObjectUtils.nullSafeHashCode(getContextConfigLocation());
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/package-info.java b/spring-tx/src/main/java/org/springframework/jca/context/package-info.java
deleted file mode 100644
index 172bca88efe2..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/context/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Integration package that allows for deploying a Spring application context
- * as a JCA 1.7 compliant RAR file.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jca.context;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
index 46ee354a773d..bada813d61e2 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
@@ -18,15 +18,15 @@
 
 import java.lang.reflect.Method;
 
-import javax.resource.ResourceException;
-import javax.resource.spi.ApplicationServerInternalException;
-import javax.resource.spi.UnavailableException;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ApplicationServerInternalException;
+import jakarta.resource.spi.UnavailableException;
+import jakarta.resource.spi.endpoint.MessageEndpoint;
+import jakarta.resource.spi.endpoint.MessageEndpointFactory;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -38,7 +38,7 @@
 
 /**
  * Abstract base implementation of the JCA 1.7
- * {@link javax.resource.spi.endpoint.MessageEndpointFactory} interface,
+ * {@link jakarta.resource.spi.endpoint.MessageEndpointFactory} interface,
  * providing transaction management capabilities as well as ClassLoader
  * exposure for endpoint invocations.
  *
@@ -68,7 +68,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 	 * invocations, enlisting the endpoint resource in each such transaction.
 	 * <p>The passed-in object may be a transaction manager which implements
 	 * Spring's {@link org.springframework.transaction.jta.TransactionFactory}
-	 * interface, or a plain {@link javax.transaction.TransactionManager}.
+	 * interface, or a plain {@link jakarta.transaction.TransactionManager}.
 	 * <p>If no transaction manager is specified, the endpoint invocation
 	 * will simply not be wrapped in an XA transaction. Check out your
 	 * resource provider's ActivationSpec documentation for local
@@ -86,7 +86,7 @@ else if (transactionManager instanceof TransactionManager) {
 		else {
 			throw new IllegalArgumentException("Transaction manager [" + transactionManager +
 					"] is neither a [org.springframework.transaction.jta.TransactionFactory} nor a " +
-					"[javax.transaction.TransactionManager]");
+					"[jakarta.transaction.TransactionManager]");
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
index 15cb289dce3d..996f366ee6c4 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
@@ -16,11 +16,11 @@
 
 package org.springframework.jca.endpoint;
 
-import javax.resource.ResourceException;
-import javax.resource.spi.UnavailableException;
-import javax.resource.spi.endpoint.MessageEndpoint;
 import javax.transaction.xa.XAResource;
 
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.UnavailableException;
+import jakarta.resource.spi.endpoint.MessageEndpoint;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -32,10 +32,10 @@
 
 /**
  * Generic implementation of the JCA 1.7
- * {@link javax.resource.spi.endpoint.MessageEndpointFactory} interface,
+ * {@link jakarta.resource.spi.endpoint.MessageEndpointFactory} interface,
  * providing transaction management capabilities for any kind of message
- * listener object (e.g. {@link javax.jms.MessageListener} objects or
- * {@link javax.resource.cci.MessageListener} objects.
+ * listener object (e.g. {@link jakarta.jms.MessageListener} objects or
+ * {@link jakarta.resource.cci.MessageListener} objects.
  *
  * <p>Uses AOP proxies for concrete endpoint instances, simply wrapping
  * the specified message listener object and exposing all of its implemented
@@ -44,7 +44,7 @@
  * <p>Typically used with Spring's {@link GenericMessageEndpointManager},
  * but not tied to it. As a consequence, this endpoint factory could
  * also be used with programmatic endpoint management on a native
- * {@link javax.resource.spi.ResourceAdapter} instance.
+ * {@link jakarta.resource.spi.ResourceAdapter} instance.
  *
  * @author Juergen Hoeller
  * @since 2.5
@@ -60,8 +60,8 @@ public class GenericMessageEndpointFactory extends AbstractMessageEndpointFactor
 
 	/**
 	 * Specify the message listener object that the endpoint should expose
-	 * (e.g. a {@link javax.jms.MessageListener} objects or
-	 * {@link javax.resource.cci.MessageListener} implementation).
+	 * (e.g. a {@link jakarta.jms.MessageListener} objects or
+	 * {@link jakarta.resource.cci.MessageListener} implementation).
 	 */
 	public void setMessageListener(Object messageListener) {
 		this.messageListener = messageListener;
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
index f97dcc9bc909..090c2a20a52e 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
@@ -16,10 +16,10 @@
 
 package org.springframework.jca.endpoint;
 
-import javax.resource.ResourceException;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.ResourceAdapter;
+import jakarta.resource.spi.endpoint.MessageEndpointFactory;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -48,7 +48,7 @@
  * 	 &lt;property name="activationSpec"&gt;
  *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
  *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="javax.jms.Queue"/&gt;
+ *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
  *     &lt;/bean&gt;
  *   &lt;/property&gt;
  * &lt;/bean&gt;</pre>
@@ -56,7 +56,7 @@
  * In this example, Spring's own {@link GenericMessageEndpointFactory} is used
  * to point to a standard message listener object that happens to be supported
  * by the specified target ResourceAdapter: in this case, a JMS
- * {@link javax.jms.MessageListener} object as supported by the ActiveMQ
+ * {@link jakarta.jms.MessageListener} object as supported by the ActiveMQ
  * message broker, defined as a Spring bean:
  *
  * <pre class="code">
@@ -84,7 +84,7 @@
  * For a different target resource, the configuration would simply point to a
  * different ResourceAdapter and a different ActivationSpec object (which are
  * both specific to the resource provider), and possibly a different message
- * listener (e.g. a CCI {@link javax.resource.cci.MessageListener} for a
+ * listener (e.g. a CCI {@link jakarta.resource.cci.MessageListener} for a
  * resource adapter which is based on the JCA Common Client Interface).
  *
  * <p>The asynchronous execution strategy can be customized through the
@@ -97,7 +97,7 @@
  * as built by the specified MessageEndpointFactory. {@link GenericMessageEndpointFactory}
  * supports XA transaction participation through its "transactionManager" property,
  * typically with a Spring {@link org.springframework.transaction.jta.JtaTransactionManager}
- * or a plain {@link javax.transaction.TransactionManager} implementation specified there.
+ * or a plain {@link jakarta.transaction.TransactionManager} implementation specified there.
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointManager"&gt;
@@ -111,7 +111,7 @@
  * 	 &lt;property name="activationSpec"&gt;
  *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
  *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="javax.jms.Queue"/&gt;
+ *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
  *     &lt;/bean&gt;
  *   &lt;/property&gt;
  * &lt;/bean&gt;
@@ -133,7 +133,7 @@
  * 	 &lt;property name="activationSpec"&gt;
  *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
  *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="javax.jms.Queue"/&gt;
+ *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
  *       &lt;property name="useRAManagedTransaction" value="true"/&gt;
  *     &lt;/bean&gt;
  *   &lt;/property&gt;
@@ -141,10 +141,10 @@
  *
  * @author Juergen Hoeller
  * @since 2.5
- * @see javax.resource.spi.ResourceAdapter#endpointActivation
- * @see javax.resource.spi.ResourceAdapter#endpointDeactivation
- * @see javax.resource.spi.endpoint.MessageEndpointFactory
- * @see javax.resource.spi.ActivationSpec
+ * @see jakarta.resource.spi.ResourceAdapter#endpointActivation
+ * @see jakarta.resource.spi.ResourceAdapter#endpointDeactivation
+ * @see jakarta.resource.spi.endpoint.MessageEndpointFactory
+ * @see jakarta.resource.spi.ActivationSpec
  */
 public class GenericMessageEndpointManager implements SmartLifecycle, InitializingBean, DisposableBean {
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
index fd7d1bd05417..fe49bafdf5e8 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
@@ -16,9 +16,9 @@
 
 package org.springframework.jca.support;
 
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionManager;
-import javax.resource.spi.ManagedConnectionFactory;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ConnectionManager;
+import jakarta.resource.spi.ManagedConnectionFactory;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -29,13 +29,13 @@
  * a local JCA connection factory in "non-managed" mode (as defined by the
  * Java Connector Architecture specification). This is a direct alternative
  * to a {@link org.springframework.jndi.JndiObjectFactoryBean} definition that
- * obtains a connection factory handle from a Java EE server's naming environment.
+ * obtains a connection factory handle from a Jakarta EE server's naming environment.
  *
  * <p>The type of the connection factory is dependent on the actual connector:
  * the connector can either expose its native API (such as a JDBC
- * {@link javax.sql.DataSource} or a JMS {@link javax.jms.ConnectionFactory})
+ * {@link javax.sql.DataSource} or a JMS {@link jakarta.jms.ConnectionFactory})
  * or follow the standard Common Client Interface (CCI), as defined by the JCA spec.
- * The exposed interface in the CCI case is {@link javax.resource.cci.ConnectionFactory}.
+ * The exposed interface in the CCI case is {@link jakarta.resource.cci.ConnectionFactory}.
  *
  * <p>In order to use this FactoryBean, you must specify the connector's
  * {@link #setManagedConnectionFactory "managedConnectionFactory"} (usually
@@ -46,7 +46,7 @@
  *
  * <p><b>NOTE:</b> In non-managed mode, a connector is not deployed on an
  * application server, or more specifically not interacting with an application
- * server. Consequently, it cannot use a Java EE server's system contracts:
+ * server. Consequently, it cannot use a Jakarta EE server's system contracts:
  * connection management, transaction management, and security management.
  * A custom ConnectionManager implementation has to be used for applying those
  * services in conjunction with a standalone transaction coordinator etc.
@@ -65,8 +65,8 @@
  * @since 1.2
  * @see #setManagedConnectionFactory
  * @see #setConnectionManager
- * @see javax.resource.cci.ConnectionFactory
- * @see javax.resource.cci.Connection#getLocalTransaction
+ * @see jakarta.resource.cci.ConnectionFactory
+ * @see jakarta.resource.cci.Connection#getLocalTransaction
  * @see org.springframework.jca.cci.connection.CciLocalTransactionManager
  */
 public class LocalConnectionFactoryBean implements FactoryBean<Object>, InitializingBean {
@@ -91,11 +91,11 @@ public class LocalConnectionFactoryBean implements FactoryBean<Object>, Initiali
 	 * EntityManagerFactory.
 	 * <p>Note that the ManagerConnectionFactory implementation might expect
 	 * a reference to its JCA 1.7 ResourceAdapter, expressed through the
-	 * {@link javax.resource.spi.ResourceAdapterAssociation} interface.
+	 * {@link jakarta.resource.spi.ResourceAdapterAssociation} interface.
 	 * Simply inject the corresponding ResourceAdapter instance into its
 	 * "resourceAdapter" bean property in this case, before passing the
 	 * ManagerConnectionFactory into this LocalConnectionFactoryBean.
-	 * @see javax.resource.spi.ManagedConnectionFactory#createConnectionFactory()
+	 * @see jakarta.resource.spi.ManagedConnectionFactory#createConnectionFactory()
 	 */
 	public void setManagedConnectionFactory(ManagedConnectionFactory managedConnectionFactory) {
 		this.managedConnectionFactory = managedConnectionFactory;
@@ -107,7 +107,7 @@ public void setManagedConnectionFactory(ManagedConnectionFactory managedConnecti
 	 * <p>A ConnectionManager implementation for local usage is often
 	 * included with a JCA connector. Such an included ConnectionManager
 	 * might be set as default, with no need to explicitly specify one.
-	 * @see javax.resource.spi.ManagedConnectionFactory#createConnectionFactory(javax.resource.spi.ConnectionManager)
+	 * @see jakarta.resource.spi.ManagedConnectionFactory#createConnectionFactory(jakarta.resource.spi.ConnectionManager)
 	 */
 	public void setConnectionManager(ConnectionManager connectionManager) {
 		this.connectionManager = connectionManager;
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
index 7904e0bc614a..9969c97d571d 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
@@ -16,11 +16,11 @@
 
 package org.springframework.jca.support;
 
-import javax.resource.ResourceException;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.work.WorkManager;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.BootstrapContext;
+import jakarta.resource.spi.ResourceAdapter;
+import jakarta.resource.spi.XATerminator;
+import jakarta.resource.spi.work.WorkManager;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.DisposableBean;
@@ -30,8 +30,8 @@
 
 /**
  * {@link org.springframework.beans.factory.FactoryBean} that bootstraps
- * the specified JCA 1.7 {@link javax.resource.spi.ResourceAdapter},
- * starting it with a local {@link javax.resource.spi.BootstrapContext}
+ * the specified JCA 1.7 {@link jakarta.resource.spi.ResourceAdapter},
+ * starting it with a local {@link jakarta.resource.spi.BootstrapContext}
  * and exposing it for bean references. It will also stop the ResourceAdapter
  * on context shutdown. This corresponds to 'non-managed' bootstrap in a
  * local environment, according to the JCA 1.7 specification.
@@ -45,8 +45,8 @@
  * @see #setResourceAdapter
  * @see #setBootstrapContext
  * @see #setWorkManager
- * @see javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext)
- * @see javax.resource.spi.ResourceAdapter#stop()
+ * @see jakarta.resource.spi.ResourceAdapter#start(jakarta.resource.spi.BootstrapContext)
+ * @see jakarta.resource.spi.ResourceAdapter#stop()
  */
 public class ResourceAdapterFactoryBean implements FactoryBean<ResourceAdapter>, InitializingBean, DisposableBean {
 
@@ -114,7 +114,7 @@ public void setXaTerminator(XATerminator xaTerminator) {
 
 	/**
 	 * Builds the BootstrapContext and starts the ResourceAdapter with it.
-	 * @see javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext)
+	 * @see jakarta.resource.spi.ResourceAdapter#start(jakarta.resource.spi.BootstrapContext)
 	 */
 	@Override
 	public void afterPropertiesSet() throws ResourceException {
@@ -147,7 +147,7 @@ public boolean isSingleton() {
 
 	/**
 	 * Stops the ResourceAdapter.
-	 * @see javax.resource.spi.ResourceAdapter#stop()
+	 * @see jakarta.resource.spi.ResourceAdapter#stop()
 	 */
 	@Override
 	public void destroy() {
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
index 8ca15b9d901b..c607a6f2660a 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
@@ -18,18 +18,18 @@
 
 import java.util.Timer;
 
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.UnavailableException;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.work.WorkContext;
-import javax.resource.spi.work.WorkManager;
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.resource.spi.BootstrapContext;
+import jakarta.resource.spi.UnavailableException;
+import jakarta.resource.spi.XATerminator;
+import jakarta.resource.spi.work.WorkContext;
+import jakarta.resource.spi.work.WorkManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Simple implementation of the JCA 1.7 {@link javax.resource.spi.BootstrapContext}
+ * Simple implementation of the JCA 1.7 {@link jakarta.resource.spi.BootstrapContext}
  * interface, used for bootstrapping a JCA ResourceAdapter in a local environment.
  *
  * <p>Delegates to the given WorkManager and XATerminator, if any. Creates simple
@@ -37,7 +37,7 @@
  *
  * @author Juergen Hoeller
  * @since 2.0.3
- * @see javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext)
+ * @see jakarta.resource.spi.ResourceAdapter#start(jakarta.resource.spi.BootstrapContext)
  * @see ResourceAdapterFactoryBean
  */
 public class SimpleBootstrapContext implements BootstrapContext {
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java b/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
deleted file mode 100644
index da52a8536506..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- * 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.jca.work;
-
-import javax.resource.spi.work.Work;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple Work adapter that delegates to a given Runnable.
- *
- * @author Juergen Hoeller
- * @since 2.0.3
- * @see javax.resource.spi.work.Work
- * @see Runnable
- */
-public class DelegatingWork implements Work {
-
-	private final Runnable delegate;
-
-
-	/**
-	 * Create a new DelegatingWork.
-	 * @param delegate the Runnable implementation to delegate to
-	 */
-	public DelegatingWork(Runnable delegate) {
-		Assert.notNull(delegate, "Delegate must not be null");
-		this.delegate = delegate;
-	}
-
-	/**
-	 * Return the wrapped Runnable implementation.
-	 */
-	public final Runnable getDelegate() {
-		return this.delegate;
-	}
-
-
-	/**
-	 * Delegates execution to the underlying Runnable.
-	 */
-	@Override
-	public void run() {
-		this.delegate.run();
-	}
-
-	/**
-	 * This implementation is empty, since we expect the Runnable
-	 * to terminate based on some specific shutdown signal.
-	 */
-	@Override
-	public void release() {
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
deleted file mode 100644
index 90b8214df344..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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.
- * 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.jca.work;
-
-import javax.resource.spi.work.ExecutionContext;
-import javax.resource.spi.work.Work;
-import javax.resource.spi.work.WorkAdapter;
-import javax.resource.spi.work.WorkCompletedException;
-import javax.resource.spi.work.WorkEvent;
-import javax.resource.spi.work.WorkException;
-import javax.resource.spi.work.WorkListener;
-import javax.resource.spi.work.WorkManager;
-import javax.resource.spi.work.WorkRejectedException;
-
-import org.springframework.core.task.AsyncTaskExecutor;
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.core.task.SyncTaskExecutor;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.core.task.TaskRejectedException;
-import org.springframework.core.task.TaskTimeoutException;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Simple JCA 1.7 {@link javax.resource.spi.work.WorkManager} implementation that
- * delegates to a Spring {@link org.springframework.core.task.TaskExecutor}.
- * Provides simple task execution including start timeouts, but without support
- * for a JCA ExecutionContext (i.e. without support for imported transactions).
- *
- * <p>Uses a {@link org.springframework.core.task.SyncTaskExecutor} for {@link #doWork}
- * calls and a {@link org.springframework.core.task.SimpleAsyncTaskExecutor}
- * for {@link #startWork} and {@link #scheduleWork} calls, by default.
- * These default task executors can be overridden through configuration.
- *
- * <p><b>NOTE: This WorkManager does not provide thread pooling by default!</b>
- * Specify a {@link org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor}
- * (or any other thread-pooling TaskExecutor) as "asyncTaskExecutor" in order to
- * achieve actual thread pooling.
- *
- * <p>This WorkManager automatically detects a specified
- * {@link org.springframework.core.task.AsyncTaskExecutor} implementation
- * and uses its extended timeout functionality where appropriate.
- * JCA WorkListeners are fully supported in any case.
- *
- * @author Juergen Hoeller
- * @since 2.0.3
- * @see #setSyncTaskExecutor
- * @see #setAsyncTaskExecutor
- */
-public class SimpleTaskWorkManager implements WorkManager {
-
-	@Nullable
-	private TaskExecutor syncTaskExecutor = new SyncTaskExecutor();
-
-	@Nullable
-	private AsyncTaskExecutor asyncTaskExecutor = new SimpleAsyncTaskExecutor();
-
-
-	/**
-	 * Specify the TaskExecutor to use for <i>synchronous</i> work execution
-	 * (i.e. {@link #doWork} calls).
-	 * <p>Default is a {@link org.springframework.core.task.SyncTaskExecutor}.
-	 */
-	public void setSyncTaskExecutor(TaskExecutor syncTaskExecutor) {
-		this.syncTaskExecutor = syncTaskExecutor;
-	}
-
-	/**
-	 * Specify the TaskExecutor to use for <i>asynchronous</i> work execution
-	 * (i.e. {@link #startWork} and {@link #scheduleWork} calls).
-	 * <p>This will typically (but not necessarily) be an
-	 * {@link org.springframework.core.task.AsyncTaskExecutor} implementation.
-	 * Default is a {@link org.springframework.core.task.SimpleAsyncTaskExecutor}.
-	 */
-	public void setAsyncTaskExecutor(AsyncTaskExecutor asyncTaskExecutor) {
-		this.asyncTaskExecutor = asyncTaskExecutor;
-	}
-
-
-	@Override
-	public void doWork(Work work) throws WorkException {
-		doWork(work, WorkManager.INDEFINITE, null, null);
-	}
-
-	@Override
-	public void doWork(Work work, long startTimeout, @Nullable ExecutionContext executionContext, @Nullable WorkListener workListener)
-			throws WorkException {
-
-		Assert.state(this.syncTaskExecutor != null, "No 'syncTaskExecutor' set");
-		executeWork(this.syncTaskExecutor, work, startTimeout, false, executionContext, workListener);
-	}
-
-	@Override
-	public long startWork(Work work) throws WorkException {
-		return startWork(work, WorkManager.INDEFINITE, null, null);
-	}
-
-	@Override
-	public long startWork(Work work, long startTimeout, @Nullable ExecutionContext executionContext, @Nullable WorkListener workListener)
-			throws WorkException {
-
-		Assert.state(this.asyncTaskExecutor != null, "No 'asyncTaskExecutor' set");
-		return executeWork(this.asyncTaskExecutor, work, startTimeout, true, executionContext, workListener);
-	}
-
-	@Override
-	public void scheduleWork(Work work) throws WorkException {
-		scheduleWork(work, WorkManager.INDEFINITE, null, null);
-	}
-
-	@Override
-	public void scheduleWork(Work work, long startTimeout, @Nullable ExecutionContext executionContext, @Nullable WorkListener workListener)
-			throws WorkException {
-
-		Assert.state(this.asyncTaskExecutor != null, "No 'asyncTaskExecutor' set");
-		executeWork(this.asyncTaskExecutor, work, startTimeout, false, executionContext, workListener);
-	}
-
-
-	/**
-	 * Execute the given Work on the specified TaskExecutor.
-	 * @param taskExecutor the TaskExecutor to use
-	 * @param work the Work to execute
-	 * @param startTimeout the time duration within which the Work is supposed to start
-	 * @param blockUntilStarted whether to block until the Work has started
-	 * @param executionContext the JCA ExecutionContext for the given Work
-	 * @param workListener the WorkListener to clal for the given Work
-	 * @return the time elapsed from Work acceptance until start of execution
-	 * (or -1 if not applicable or not known)
-	 * @throws WorkException if the TaskExecutor did not accept the Work
-	 */
-	protected long executeWork(TaskExecutor taskExecutor, Work work, long startTimeout, boolean blockUntilStarted,
-			@Nullable ExecutionContext executionContext, @Nullable WorkListener workListener) throws WorkException {
-
-		if (executionContext != null && executionContext.getXid() != null) {
-			throw new WorkException("SimpleTaskWorkManager does not supported imported XIDs: " + executionContext.getXid());
-		}
-		WorkListener workListenerToUse = workListener;
-		if (workListenerToUse == null) {
-			workListenerToUse = new WorkAdapter();
-		}
-
-		boolean isAsync = (taskExecutor instanceof AsyncTaskExecutor);
-		DelegatingWorkAdapter workHandle = new DelegatingWorkAdapter(work, workListenerToUse, !isAsync);
-		try {
-			if (isAsync) {
-				((AsyncTaskExecutor) taskExecutor).execute(workHandle, startTimeout);
-			}
-			else {
-				taskExecutor.execute(workHandle);
-			}
-		}
-		catch (TaskTimeoutException ex) {
-			WorkException wex = new WorkRejectedException("TaskExecutor rejected Work because of timeout: " + work, ex);
-			wex.setErrorCode(WorkException.START_TIMED_OUT);
-			workListenerToUse.workRejected(new WorkEvent(this, WorkEvent.WORK_REJECTED, work, wex));
-			throw wex;
-		}
-		catch (TaskRejectedException ex) {
-			WorkException wex = new WorkRejectedException("TaskExecutor rejected Work: " + work, ex);
-			wex.setErrorCode(WorkException.INTERNAL);
-			workListenerToUse.workRejected(new WorkEvent(this, WorkEvent.WORK_REJECTED, work, wex));
-			throw wex;
-		}
-		catch (Throwable ex) {
-			WorkException wex = new WorkException("TaskExecutor failed to execute Work: " + work, ex);
-			wex.setErrorCode(WorkException.INTERNAL);
-			throw wex;
-		}
-		if (isAsync) {
-			workListenerToUse.workAccepted(new WorkEvent(this, WorkEvent.WORK_ACCEPTED, work, null));
-		}
-
-		if (blockUntilStarted) {
-			long acceptanceTime = System.currentTimeMillis();
-			synchronized (workHandle.monitor) {
-				try {
-					while (!workHandle.started) {
-						workHandle.monitor.wait();
-					}
-				}
-				catch (InterruptedException ex) {
-					Thread.currentThread().interrupt();
-				}
-			}
-			return (System.currentTimeMillis() - acceptanceTime);
-		}
-		else {
-			return WorkManager.UNKNOWN;
-		}
-	}
-
-
-	/**
-	 * Work adapter that supports start timeouts and WorkListener callbacks
-	 * for a given Work that it delegates to.
-	 */
-	private static class DelegatingWorkAdapter implements Work {
-
-		private final Work work;
-
-		private final WorkListener workListener;
-
-		private final boolean acceptOnExecution;
-
-		public final Object monitor = new Object();
-
-		public boolean started = false;
-
-		public DelegatingWorkAdapter(Work work, WorkListener workListener, boolean acceptOnExecution) {
-			this.work = work;
-			this.workListener = workListener;
-			this.acceptOnExecution = acceptOnExecution;
-		}
-
-		@Override
-		public void run() {
-			if (this.acceptOnExecution) {
-				this.workListener.workAccepted(new WorkEvent(this, WorkEvent.WORK_ACCEPTED, this.work, null));
-			}
-			synchronized (this.monitor) {
-				this.started = true;
-				this.monitor.notify();
-			}
-			this.workListener.workStarted(new WorkEvent(this, WorkEvent.WORK_STARTED, this.work, null));
-			try {
-				this.work.run();
-			}
-			catch (RuntimeException | Error ex) {
-				this.workListener.workCompleted(
-						new WorkEvent(this, WorkEvent.WORK_COMPLETED, this.work, new WorkCompletedException(ex)));
-				throw ex;
-			}
-			this.workListener.workCompleted(new WorkEvent(this, WorkEvent.WORK_COMPLETED, this.work, null));
-		}
-
-		@Override
-		public void release() {
-			this.work.release();
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
deleted file mode 100644
index e4fe06bfeb35..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * 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.
- * 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.jca.work;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-
-import javax.naming.NamingException;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.work.ExecutionContext;
-import javax.resource.spi.work.Work;
-import javax.resource.spi.work.WorkException;
-import javax.resource.spi.work.WorkListener;
-import javax.resource.spi.work.WorkManager;
-import javax.resource.spi.work.WorkRejectedException;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.core.task.TaskDecorator;
-import org.springframework.core.task.TaskRejectedException;
-import org.springframework.core.task.TaskTimeoutException;
-import org.springframework.jca.context.BootstrapContextAware;
-import org.springframework.jndi.JndiLocatorSupport;
-import org.springframework.lang.Nullable;
-import org.springframework.scheduling.SchedulingException;
-import org.springframework.scheduling.SchedulingTaskExecutor;
-import org.springframework.util.Assert;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureTask;
-
-/**
- * {@link org.springframework.core.task.TaskExecutor} implementation
- * that delegates to a JCA 1.7 WorkManager, implementing the
- * {@link javax.resource.spi.work.WorkManager} interface.
- *
- * <p>This is mainly intended for use within a JCA ResourceAdapter implementation,
- * but may also be used in a standalone environment, delegating to a locally
- * embedded WorkManager implementation (such as Geronimo's).
- *
- * <p>Also implements the JCA 1.7 WorkManager interface itself, delegating all
- * calls to the target WorkManager. Hence, a caller can choose whether it wants
- * to talk to this executor through the Spring TaskExecutor interface or the
- * WorkManager interface.
- *
- * <p>This adapter is also capable of obtaining a JCA WorkManager from JNDI.
- * This is for example appropriate on the Geronimo application server, where
- * WorkManager GBeans (e.g. Geronimo's default "DefaultWorkManager" GBean)
- * can be linked into the Java EE environment through "gbean-ref" entries
- * in the {@code geronimo-web.xml} deployment descriptor.
- *
- * @author Juergen Hoeller
- * @since 2.0.3
- * @see #setWorkManager
- * @see javax.resource.spi.work.WorkManager#scheduleWork
- */
-public class WorkManagerTaskExecutor extends JndiLocatorSupport
-		implements AsyncListenableTaskExecutor, SchedulingTaskExecutor, WorkManager, BootstrapContextAware, InitializingBean {
-
-	@Nullable
-	private WorkManager workManager;
-
-	@Nullable
-	private String workManagerName;
-
-	private boolean blockUntilStarted = false;
-
-	private boolean blockUntilCompleted = false;
-
-	@Nullable
-	private WorkListener workListener;
-
-	@Nullable
-	private TaskDecorator taskDecorator;
-
-
-	/**
-	 * Create a new WorkManagerTaskExecutor, expecting bean-style configuration.
-	 * @see #setWorkManager
-	 */
-	public WorkManagerTaskExecutor() {
-	}
-
-	/**
-	 * Create a new WorkManagerTaskExecutor for the given WorkManager.
-	 * @param workManager the JCA WorkManager to delegate to
-	 */
-	public WorkManagerTaskExecutor(WorkManager workManager) {
-		setWorkManager(workManager);
-	}
-
-
-	/**
-	 * Specify the JCA WorkManager instance to delegate to.
-	 */
-	public void setWorkManager(WorkManager workManager) {
-		Assert.notNull(workManager, "WorkManager must not be null");
-		this.workManager = workManager;
-	}
-
-	/**
-	 * Set the JNDI name of the JCA WorkManager.
-	 * <p>This can either be a fully qualified JNDI name,
-	 * or the JNDI name relative to the current environment
-	 * naming context if "resourceRef" is set to "true".
-	 * @see #setWorkManager
-	 * @see #setResourceRef
-	 */
-	public void setWorkManagerName(String workManagerName) {
-		this.workManagerName = workManagerName;
-	}
-
-	/**
-	 * Specify the JCA BootstrapContext that contains the
-	 * WorkManager to delegate to.
-	 */
-	@Override
-	public void setBootstrapContext(BootstrapContext bootstrapContext) {
-		Assert.notNull(bootstrapContext, "BootstrapContext must not be null");
-		this.workManager = bootstrapContext.getWorkManager();
-	}
-
-	/**
-	 * Set whether to let {@link #execute} block until the work
-	 * has been actually started.
-	 * <p>Uses the JCA {@code startWork} operation underneath,
-	 * instead of the default {@code scheduleWork}.
-	 * @see javax.resource.spi.work.WorkManager#startWork
-	 * @see javax.resource.spi.work.WorkManager#scheduleWork
-	 */
-	public void setBlockUntilStarted(boolean blockUntilStarted) {
-		this.blockUntilStarted = blockUntilStarted;
-	}
-
-	/**
-	 * Set whether to let {@link #execute} block until the work
-	 * has been completed.
-	 * <p>Uses the JCA {@code doWork} operation underneath,
-	 * instead of the default {@code scheduleWork}.
-	 * @see javax.resource.spi.work.WorkManager#doWork
-	 * @see javax.resource.spi.work.WorkManager#scheduleWork
-	 */
-	public void setBlockUntilCompleted(boolean blockUntilCompleted) {
-		this.blockUntilCompleted = blockUntilCompleted;
-	}
-
-	/**
-	 * Specify a JCA WorkListener to apply, if any.
-	 * <p>This shared WorkListener instance will be passed on to the
-	 * WorkManager by all {@link #execute} calls on this TaskExecutor.
-	 */
-	public void setWorkListener(@Nullable WorkListener workListener) {
-		this.workListener = workListener;
-	}
-
-	/**
-	 * Specify a custom {@link TaskDecorator} to be applied to any {@link Runnable}
-	 * about to be executed.
-	 * <p>Note that such a decorator is not necessarily being applied to the
-	 * user-supplied {@code Runnable}/{@code Callable} but rather to the actual
-	 * execution callback (which may be a wrapper around the user-supplied task).
-	 * <p>The primary use case is to set some execution context around the task's
-	 * invocation, or to provide some monitoring/statistics for task execution.
-	 * <p><b>NOTE:</b> Exception handling in {@code TaskDecorator} implementations
-	 * is limited to plain {@code Runnable} execution via {@code execute} calls.
-	 * In case of {@code #submit} calls, the exposed {@code Runnable} will be a
-	 * {@code FutureTask} which does not propagate any exceptions; you might
-	 * have to cast it and call {@code Future#get} to evaluate exceptions.
-	 * @since 4.3
-	 */
-	public void setTaskDecorator(TaskDecorator taskDecorator) {
-		this.taskDecorator = taskDecorator;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws NamingException {
-		if (this.workManager == null) {
-			if (this.workManagerName != null) {
-				this.workManager = lookup(this.workManagerName, WorkManager.class);
-			}
-			else {
-				this.workManager = getDefaultWorkManager();
-			}
-		}
-	}
-
-	/**
-	 * Obtain a default WorkManager to delegate to.
-	 * Called if no explicit WorkManager or WorkManager JNDI name has been specified.
-	 * <p>The default implementation returns a {@link SimpleTaskWorkManager}.
-	 * Can be overridden in subclasses.
-	 */
-	protected WorkManager getDefaultWorkManager() {
-		return new SimpleTaskWorkManager();
-	}
-
-	private WorkManager obtainWorkManager() {
-		Assert.state(this.workManager != null, "No WorkManager specified");
-		return this.workManager;
-	}
-
-
-	//-------------------------------------------------------------------------
-	// Implementation of the Spring SchedulingTaskExecutor interface
-	//-------------------------------------------------------------------------
-
-	@Override
-	public void execute(Runnable task) {
-		execute(task, TIMEOUT_INDEFINITE);
-	}
-
-	@Override
-	public void execute(Runnable task, long startTimeout) {
-		Work work = new DelegatingWork(this.taskDecorator != null ? this.taskDecorator.decorate(task) : task);
-		try {
-			if (this.blockUntilCompleted) {
-				if (startTimeout != TIMEOUT_INDEFINITE || this.workListener != null) {
-					obtainWorkManager().doWork(work, startTimeout, null, this.workListener);
-				}
-				else {
-					obtainWorkManager().doWork(work);
-				}
-			}
-			else if (this.blockUntilStarted) {
-				if (startTimeout != TIMEOUT_INDEFINITE || this.workListener != null) {
-					obtainWorkManager().startWork(work, startTimeout, null, this.workListener);
-				}
-				else {
-					obtainWorkManager().startWork(work);
-				}
-			}
-			else {
-				if (startTimeout != TIMEOUT_INDEFINITE || this.workListener != null) {
-					obtainWorkManager().scheduleWork(work, startTimeout, null, this.workListener);
-				}
-				else {
-					obtainWorkManager().scheduleWork(work);
-				}
-			}
-		}
-		catch (WorkRejectedException ex) {
-			if (WorkException.START_TIMED_OUT.equals(ex.getErrorCode())) {
-				throw new TaskTimeoutException("JCA WorkManager rejected task because of timeout: " + task, ex);
-			}
-			else {
-				throw new TaskRejectedException("JCA WorkManager rejected task: " + task, ex);
-			}
-		}
-		catch (WorkException ex) {
-			throw new SchedulingException("Could not schedule task on JCA WorkManager", ex);
-		}
-	}
-
-	@Override
-	public Future<?> submit(Runnable task) {
-		FutureTask<Object> future = new FutureTask<>(task, null);
-		execute(future, TIMEOUT_INDEFINITE);
-		return future;
-	}
-
-	@Override
-	public <T> Future<T> submit(Callable<T> task) {
-		FutureTask<T> future = new FutureTask<>(task);
-		execute(future, TIMEOUT_INDEFINITE);
-		return future;
-	}
-
-	@Override
-	public ListenableFuture<?> submitListenable(Runnable task) {
-		ListenableFutureTask<Object> future = new ListenableFutureTask<>(task, null);
-		execute(future, TIMEOUT_INDEFINITE);
-		return future;
-	}
-
-	@Override
-	public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
-		ListenableFutureTask<T> future = new ListenableFutureTask<>(task);
-		execute(future, TIMEOUT_INDEFINITE);
-		return future;
-	}
-
-
-	//-------------------------------------------------------------------------
-	// Implementation of the JCA WorkManager interface
-	//-------------------------------------------------------------------------
-
-	@Override
-	public void doWork(Work work) throws WorkException {
-		obtainWorkManager().doWork(work);
-	}
-
-	@Override
-	public void doWork(Work work, long delay, ExecutionContext executionContext, WorkListener workListener)
-			throws WorkException {
-
-		obtainWorkManager().doWork(work, delay, executionContext, workListener);
-	}
-
-	@Override
-	public long startWork(Work work) throws WorkException {
-		return obtainWorkManager().startWork(work);
-	}
-
-	@Override
-	public long startWork(Work work, long delay, ExecutionContext executionContext, WorkListener workListener)
-			throws WorkException {
-
-		return obtainWorkManager().startWork(work, delay, executionContext, workListener);
-	}
-
-	@Override
-	public void scheduleWork(Work work) throws WorkException {
-		obtainWorkManager().scheduleWork(work);
-	}
-
-	@Override
-	public void scheduleWork(Work work, long delay, ExecutionContext executionContext, WorkListener workListener)
-			throws WorkException {
-
-		obtainWorkManager().scheduleWork(work, delay, executionContext, workListener);
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/package-info.java b/spring-tx/src/main/java/org/springframework/jca/work/package-info.java
deleted file mode 100644
index a797e7215078..000000000000
--- a/spring-tx/src/main/java/org/springframework/jca/work/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Convenience classes for scheduling based on the JCA WorkManager facility,
- * as supported within ResourceAdapters.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.jca.work;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
index 1e2a44e8fe11..1aa8901f3f7e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
@@ -86,8 +86,8 @@ public interface TransactionDefinition {
 	 * <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
 	 * on all transaction managers. This in particular applies to
 	 * {@link org.springframework.transaction.jta.JtaTransactionManager},
-	 * which requires the {@code javax.transaction.TransactionManager} to be
-	 * made available it to it (which is server-specific in standard Java EE).
+	 * which requires the {@code jakarta.transaction.TransactionManager} to be
+	 * made available it to it (which is server-specific in standard Jakarta EE).
 	 * <p>A {@code PROPAGATION_REQUIRES_NEW} scope always defines its own
 	 * transaction synchronizations. Existing synchronizations will be suspended
 	 * and resumed appropriately.
@@ -101,8 +101,8 @@ public interface TransactionDefinition {
 	 * <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
 	 * on all transaction managers. This in particular applies to
 	 * {@link org.springframework.transaction.jta.JtaTransactionManager},
-	 * which requires the {@code javax.transaction.TransactionManager} to be
-	 * made available it to it (which is server-specific in standard Java EE).
+	 * which requires the {@code jakarta.transaction.TransactionManager} to be
+	 * made available it to it (which is server-specific in standard Jakarta EE).
 	 * <p>Note that transaction synchronization is <i>not</i> available within a
 	 * {@code PROPAGATION_NOT_SUPPORTED} scope. Existing synchronizations
 	 * will be suspended and resumed appropriately.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
index 4f8e46f6e96a..13f16a20e93e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
@@ -37,8 +37,8 @@
  *
  * <p>This class reads Spring's JDK 1.5+ {@link Transactional} annotation and
  * exposes corresponding transaction attributes to Spring's transaction infrastructure.
- * Also supports JTA 1.2's {@link javax.transaction.Transactional} and EJB3's
- * {@link javax.ejb.TransactionAttribute} annotation (if present).
+ * Also supports JTA 1.2's {@link jakarta.transaction.Transactional} and EJB3's
+ * {@link jakarta.ejb.TransactionAttribute} annotation (if present).
  * This class may also serve as base class for a custom TransactionAttributeSource,
  * or get customized through {@link TransactionAnnotationParser} strategies.
  *
@@ -62,8 +62,8 @@ public class AnnotationTransactionAttributeSource extends AbstractFallbackTransa
 
 	static {
 		ClassLoader classLoader = AnnotationTransactionAttributeSource.class.getClassLoader();
-		jta12Present = ClassUtils.isPresent("javax.transaction.Transactional", classLoader);
-		ejb3Present = ClassUtils.isPresent("javax.ejb.TransactionAttribute", classLoader);
+		jta12Present = ClassUtils.isPresent("jakarta.transaction.Transactional", classLoader);
+		ejb3Present = ClassUtils.isPresent("jakarta.ejb.TransactionAttribute", classLoader);
 	}
 
 	private final boolean publicMethodsOnly;
@@ -74,7 +74,7 @@ public class AnnotationTransactionAttributeSource extends AbstractFallbackTransa
 	/**
 	 * Create a default AnnotationTransactionAttributeSource, supporting
 	 * public methods that carry the {@code Transactional} annotation
-	 * or the EJB3 {@link javax.ejb.TransactionAttribute} annotation.
+	 * or the EJB3 {@link jakarta.ejb.TransactionAttribute} annotation.
 	 */
 	public AnnotationTransactionAttributeSource() {
 		this(true);
@@ -83,7 +83,7 @@ public AnnotationTransactionAttributeSource() {
 	/**
 	 * Create a custom AnnotationTransactionAttributeSource, supporting
 	 * public methods that carry the {@code Transactional} annotation
-	 * or the EJB3 {@link javax.ejb.TransactionAttribute} annotation.
+	 * or the EJB3 {@link jakarta.ejb.TransactionAttribute} annotation.
 	 * @param publicMethodsOnly whether to support public methods that carry
 	 * the {@code Transactional} annotation only (typically for use
 	 * with proxy-based AOP), or protected/private methods as well
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
index 8fd2db23d51e..ae8e5d237420 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.lang.reflect.AnnotatedElement;
 
-import javax.ejb.ApplicationException;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.ApplicationException;
+import jakarta.ejb.TransactionAttributeType;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.lang.Nullable;
@@ -28,7 +28,7 @@
 import org.springframework.transaction.interceptor.TransactionAttribute;
 
 /**
- * Strategy implementation for parsing EJB3's {@link javax.ejb.TransactionAttribute}
+ * Strategy implementation for parsing EJB3's {@link jakarta.ejb.TransactionAttribute}
  * annotation.
  *
  * @author Juergen Hoeller
@@ -39,13 +39,13 @@ public class Ejb3TransactionAnnotationParser implements TransactionAnnotationPar
 
 	@Override
 	public boolean isCandidateClass(Class<?> targetClass) {
-		return AnnotationUtils.isCandidateClass(targetClass, javax.ejb.TransactionAttribute.class);
+		return AnnotationUtils.isCandidateClass(targetClass, jakarta.ejb.TransactionAttribute.class);
 	}
 
 	@Override
 	@Nullable
 	public TransactionAttribute parseTransactionAnnotation(AnnotatedElement element) {
-		javax.ejb.TransactionAttribute ann = element.getAnnotation(javax.ejb.TransactionAttribute.class);
+		jakarta.ejb.TransactionAttribute ann = element.getAnnotation(jakarta.ejb.TransactionAttribute.class);
 		if (ann != null) {
 			return parseTransactionAnnotation(ann);
 		}
@@ -54,7 +54,7 @@ public TransactionAttribute parseTransactionAnnotation(AnnotatedElement element)
 		}
 	}
 
-	public TransactionAttribute parseTransactionAnnotation(javax.ejb.TransactionAttribute ann) {
+	public TransactionAttribute parseTransactionAnnotation(jakarta.ejb.TransactionAttribute ann) {
 		return new Ejb3TransactionAttribute(ann.value());
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java
index ccc018f6be6c..9e3b956848db 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java
@@ -31,7 +31,7 @@
 import org.springframework.transaction.interceptor.TransactionAttribute;
 
 /**
- * Strategy implementation for parsing JTA 1.2's {@link javax.transaction.Transactional} annotation.
+ * Strategy implementation for parsing JTA 1.2's {@link jakarta.transaction.Transactional} annotation.
  *
  * @author Juergen Hoeller
  * @since 4.0
@@ -41,14 +41,14 @@ public class JtaTransactionAnnotationParser implements TransactionAnnotationPars
 
 	@Override
 	public boolean isCandidateClass(Class<?> targetClass) {
-		return AnnotationUtils.isCandidateClass(targetClass, javax.transaction.Transactional.class);
+		return AnnotationUtils.isCandidateClass(targetClass, jakarta.transaction.Transactional.class);
 	}
 
 	@Override
 	@Nullable
 	public TransactionAttribute parseTransactionAnnotation(AnnotatedElement element) {
 		AnnotationAttributes attributes = AnnotatedElementUtils.getMergedAnnotationAttributes(
-				element, javax.transaction.Transactional.class);
+				element, jakarta.transaction.Transactional.class);
 		if (attributes != null) {
 			return parseTransactionAnnotation(attributes);
 		}
@@ -57,7 +57,7 @@ public TransactionAttribute parseTransactionAnnotation(AnnotatedElement element)
 		}
 	}
 
-	public TransactionAttribute parseTransactionAnnotation(javax.transaction.Transactional ann) {
+	public TransactionAttribute parseTransactionAnnotation(jakarta.transaction.Transactional ann) {
 		return parseTransactionAnnotation(AnnotationUtils.getAnnotationAttributes(ann, false, false));
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
index 1e235ce8770f..18e43cf16e8f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
@@ -61,8 +61,8 @@ public enum Propagation {
 	 * <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
 	 * on all transaction managers. This in particular applies to
 	 * {@link org.springframework.transaction.jta.JtaTransactionManager},
-	 * which requires the {@code javax.transaction.TransactionManager} to be
-	 * made available to it (which is server-specific in standard Java EE).
+	 * which requires the {@code jakarta.transaction.TransactionManager} to be
+	 * made available to it (which is server-specific in standard Jakarta EE).
 	 * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
 	 */
 	REQUIRES_NEW(TransactionDefinition.PROPAGATION_REQUIRES_NEW),
@@ -73,8 +73,8 @@ public enum Propagation {
 	 * <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
 	 * on all transaction managers. This in particular applies to
 	 * {@link org.springframework.transaction.jta.JtaTransactionManager},
-	 * which requires the {@code javax.transaction.TransactionManager} to be
-	 * made available to it (which is server-specific in standard Java EE).
+	 * which requires the {@code jakarta.transaction.TransactionManager} to be
+	 * made available to it (which is server-specific in standard Jakarta EE).
 	 * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
 	 */
 	NOT_SUPPORTED(TransactionDefinition.PROPAGATION_NOT_SUPPORTED),
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
index e486fbbdaaf0..0e9ee83a568d 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
@@ -25,8 +25,8 @@
  * Strategy interface for parsing known transaction annotation types.
  * {@link AnnotationTransactionAttributeSource} delegates to such
  * parsers for supporting specific annotation types such as Spring's own
- * {@link Transactional}, JTA 1.2's {@link javax.transaction.Transactional}
- * or EJB3's {@link javax.ejb.TransactionAttribute}.
+ * {@link Transactional}, JTA 1.2's {@link jakarta.transaction.Transactional}
+ * or EJB3's {@link jakarta.ejb.TransactionAttribute}.
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
index 5e16f915f81c..22551ceed15b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
@@ -57,7 +57,7 @@ protected String[] selectImports(AdviceMode adviceMode) {
 	}
 
 	private String determineTransactionAspectClass() {
-		return (ClassUtils.isPresent("javax.transaction.Transactional", getClass().getClassLoader()) ?
+		return (ClassUtils.isPresent("jakarta.transaction.Transactional", getClass().getClassLoader()) ?
 				TransactionManagementConfigUtils.JTA_TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME :
 				TransactionManagementConfigUtils.TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
index 42537572223f..d399e8b04eb2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
@@ -188,7 +188,7 @@
 	 * a transaction rollback.
 	 * <p>This can be a substring of a fully qualified class name, with no wildcard
 	 * support at present. For example, a value of {@code "ServletException"} would
-	 * match {@code javax.servlet.ServletException} and its subclasses.
+	 * match {@code jakarta.servlet.ServletException} and its subclasses.
 	 * <p><b>NB:</b> Consider carefully how specific the pattern is and whether
 	 * to include package information (which isn't mandatory). For example,
 	 * {@code "Exception"} will match nearly anything and will probably hide other
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
index 8d6ba603deb1..d7dca39ef5dc 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
@@ -65,7 +65,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		if ("aspectj".equals(mode)) {
 			// mode="aspectj"
 			registerTransactionAspect(element, parserContext);
-			if (ClassUtils.isPresent("javax.transaction.Transactional", getClass().getClassLoader())) {
+			if (ClassUtils.isPresent("jakarta.transaction.Transactional", getClass().getClassLoader())) {
 				registerJtaTransactionAspect(element, parserContext);
 			}
 		}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java
index cae08558e4a1..055b127e662b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,23 +21,20 @@
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.transaction.jta.JtaTransactionManager;
 
 /**
- * Parser for the &lt;tx:jta-transaction-manager/&gt; XML configuration element,
- * autodetecting WebLogic and WebSphere servers and exposing the corresponding
- * {@link org.springframework.transaction.jta.JtaTransactionManager} subclass.
+ * Parser for the &lt;tx:jta-transaction-manager/&gt; XML configuration element.
  *
  * @author Juergen Hoeller
  * @author Christian Dupuis
  * @since 2.5
- * @see org.springframework.transaction.jta.WebLogicJtaTransactionManager
- * @see org.springframework.transaction.jta.WebSphereUowTransactionManager
  */
 public class JtaTransactionManagerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser  {
 
 	@Override
-	protected String getBeanClassName(Element element) {
-		return JtaTransactionManagerFactoryBean.resolveJtaTransactionManagerClassName();
+	protected Class<?> getBeanClass(Element element) {
+		return JtaTransactionManager.class;
 	}
 
 	@Override
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java
index 09fe5062f3f6..a1cc1b87c6e8 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,62 +16,23 @@
 
 package org.springframework.transaction.config;
 
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.transaction.jta.JtaTransactionManager;
-import org.springframework.util.ClassUtils;
 
 /**
- * A {@link FactoryBean} equivalent to the &lt;tx:jta-transaction-manager/&gt; XML element,
- * autodetecting WebLogic and WebSphere servers and exposing the corresponding
- * {@link org.springframework.transaction.jta.JtaTransactionManager} subclass.
+ * A {@link FactoryBean} equivalent to the &lt;tx:jta-transaction-manager/&gt; XML element.
  *
  * @author Juergen Hoeller
  * @since 4.1.1
- * @see org.springframework.transaction.jta.WebLogicJtaTransactionManager
- * @see org.springframework.transaction.jta.WebSphereUowTransactionManager
+ * @deprecated as of 6.0, in favor of a straight {@link JtaTransactionManager} definition
  */
+@Deprecated
 public class JtaTransactionManagerFactoryBean implements FactoryBean<JtaTransactionManager>, InitializingBean {
 
-	private static final String WEBLOGIC_JTA_TRANSACTION_MANAGER_CLASS_NAME =
-			"org.springframework.transaction.jta.WebLogicJtaTransactionManager";
-
-	private static final String WEBSPHERE_TRANSACTION_MANAGER_CLASS_NAME =
-			"org.springframework.transaction.jta.WebSphereUowTransactionManager";
-
-	private static final String JTA_TRANSACTION_MANAGER_CLASS_NAME =
-			"org.springframework.transaction.jta.JtaTransactionManager";
-
-
-	private static final boolean weblogicPresent;
-
-	private static final boolean webspherePresent;
-
-	static {
-		ClassLoader classLoader = JtaTransactionManagerFactoryBean.class.getClassLoader();
-		weblogicPresent = ClassUtils.isPresent("weblogic.transaction.UserTransaction", classLoader);
-		webspherePresent = ClassUtils.isPresent("com.ibm.wsspi.uow.UOWManager", classLoader);
-	}
-
-
-	private final JtaTransactionManager transactionManager;
-
-
-	@SuppressWarnings("unchecked")
-	public JtaTransactionManagerFactoryBean() {
-		String className = resolveJtaTransactionManagerClassName();
-		try {
-			Class<? extends JtaTransactionManager> clazz = (Class<? extends JtaTransactionManager>)
-					ClassUtils.forName(className, JtaTransactionManagerFactoryBean.class.getClassLoader());
-			this.transactionManager = BeanUtils.instantiateClass(clazz);
-		}
-		catch (ClassNotFoundException ex) {
-			throw new IllegalStateException("Failed to load JtaTransactionManager class: " + className, ex);
-		}
-	}
+	private final JtaTransactionManager transactionManager = new JtaTransactionManager();
 
 
 	@Override
@@ -95,17 +56,4 @@ public boolean isSingleton() {
 		return true;
 	}
 
-
-	static String resolveJtaTransactionManagerClassName() {
-		if (weblogicPresent) {
-			return WEBLOGIC_JTA_TRANSACTION_MANAGER_CLASS_NAME;
-		}
-		else if (webspherePresent) {
-			return WEBSPHERE_TRANSACTION_MANAGER_CLASS_NAME;
-		}
-		else {
-			return JTA_TRANSACTION_MANAGER_CLASS_NAME;
-		}
-	}
-
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
index 07a59cc1131b..e0552d41f21a 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
@@ -74,7 +74,7 @@ public RollbackRuleAttribute(Class<?> clazz) {
 	 * for the given {@code exceptionName}.
 	 * <p>This can be a substring, with no wildcard support at present. A value
 	 * of "ServletException" would match
-	 * {@code javax.servlet.ServletException} and subclasses, for example.
+	 * {@code jakarta.servlet.ServletException} and subclasses, for example.
 	 * <p><b>NB:</b> Consider carefully how specific the pattern is, and
 	 * whether to include package information (which is not mandatory). For
 	 * example, "Exception" will match nearly anything, and will probably hide
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
index 807a19fcf712..15eb93ce5053 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
 
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationUtils;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
index c993fbf31fe4..6488332e75af 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,17 +23,18 @@
 import java.util.Properties;
 
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.UserTransaction;
+
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.InvalidTransactionException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.UserTransaction;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jndi.JndiTemplate;
@@ -56,7 +57,7 @@
 /**
  * {@link org.springframework.transaction.PlatformTransactionManager} implementation
  * for JTA, delegating to a backend JTA provider. This is typically used to delegate
- * to a Java EE server's transaction coordinator, but may also be configured with a
+ * to a Jakarta EE server's transaction coordinator, but may also be configured with a
  * local JTA provider which is embedded within the application.
  *
  * <p>This transaction manager is appropriate for handling distributed transactions,
@@ -67,8 +68,8 @@
  * HibernateTransactionManager is appropriate, for example.
  *
  * <p><b>For typical JTA transactions (REQUIRED, SUPPORTS, MANDATORY, NEVER), a plain
- * JtaTransactionManager definition is all you need, portable across all Java EE servers.</b>
- * This corresponds to the functionality of the JTA UserTransaction, for which Java EE
+ * JtaTransactionManager definition is all you need, portable across all Jakarta EE servers.</b>
+ * This corresponds to the functionality of the JTA UserTransaction, for which Jakarta EE
  * specifies a standard JNDI name ("java:comp/UserTransaction"). There is no need to
  * configure a server-specific TransactionManager lookup for this kind of JTA usage.
  *
@@ -77,26 +78,17 @@
  * autodetected by JtaTransactionManager, provided that the "autodetectTransactionManager"
  * flag is set to "true" (which it is by default).
  *
- * <p>Note: Support for the JTA TransactionManager interface is not required by Java EE.
- * Almost all Java EE servers expose it, but do so as extension to EE. There might be some
+ * <p>Note: Support for the JTA TransactionManager interface is not required by Jakarta EE.
+ * Almost all Jakarta EE servers expose it, but do so as extension to EE. There might be some
  * issues with compatibility, despite the TransactionManager interface being part of JTA.
- * As a consequence, Spring provides various vendor-specific PlatformTransactionManagers,
- * which are recommended to be used if appropriate: {@link WebLogicJtaTransactionManager}
- * and {@link WebSphereUowTransactionManager}. For all other Java EE servers, the
- * standard JtaTransactionManager is sufficient.
  *
  * <p>This pure JtaTransactionManager class supports timeouts but not per-transaction
  * isolation levels. Custom subclasses may override the {@link #doJtaBegin} method for
- * specific JTA extensions in order to provide this functionality; Spring includes a
- * corresponding {@link WebLogicJtaTransactionManager} class for WebLogic Server. Such
- * adapters for specific Java EE transaction coordinators may also expose transaction
- * names for monitoring; with standard JTA, transaction names will simply be ignored.
- *
- * <p><b>Consider using Spring's {@code tx:jta-transaction-manager} configuration
- * element for automatically picking the appropriate JTA platform transaction manager
- * (automatically detecting WebLogic and WebSphere).</b>
+ * specific JTA extensions in order to provide this functionality. Such adapters for
+ * specific Jakarta EE transaction coordinators may also expose transaction names for
+ * monitoring; with standard JTA, transaction names will simply be ignored.
  *
- * <p>JTA 1.1 adds the TransactionSynchronizationRegistry facility, as public Java EE 5
+ * <p>JTA 1.1 adds the TransactionSynchronizationRegistry facility, as public Jakarta EE
  * API in addition to the standard JTA UserTransaction handle. As of Spring 2.5, this
  * JtaTransactionManager autodetects the TransactionSynchronizationRegistry and uses
  * it for registering Spring-managed synchronizations when participating in an existing
@@ -108,21 +100,20 @@
  *
  * @author Juergen Hoeller
  * @since 24.03.2003
- * @see javax.transaction.UserTransaction
- * @see javax.transaction.TransactionManager
- * @see javax.transaction.TransactionSynchronizationRegistry
+ * @see jakarta.transaction.UserTransaction
+ * @see jakarta.transaction.TransactionManager
+ * @see jakarta.transaction.TransactionSynchronizationRegistry
  * @see #setUserTransactionName
  * @see #setUserTransaction
  * @see #setTransactionManagerName
  * @see #setTransactionManager
- * @see WebLogicJtaTransactionManager
  */
 @SuppressWarnings("serial")
 public class JtaTransactionManager extends AbstractPlatformTransactionManager
 		implements TransactionFactory, InitializingBean, Serializable {
 
 	/**
-	 * Default JNDI location for the JTA UserTransaction. Many Java EE servers
+	 * Default JNDI location for the JTA UserTransaction. Many Jakarta EE servers
 	 * also provide support for the JTA TransactionManager interface there.
 	 * @see #setUserTransactionName
 	 * @see #setAutodetectTransactionManager
@@ -141,7 +132,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 					"java:pm/TransactionManager", "java:/TransactionManager"};
 
 	/**
-	 * Standard Java EE 5 JNDI location for the JTA TransactionSynchronizationRegistry.
+	 * Standard Jakarta EE JNDI location for the JTA TransactionSynchronizationRegistry.
 	 * Autodetected when available.
 	 */
 	public static final String DEFAULT_TRANSACTION_SYNCHRONIZATION_REGISTRY_NAME =
@@ -265,7 +256,7 @@ public Properties getJndiEnvironment() {
 
 	/**
 	 * Set the JTA UserTransaction to use as direct reference.
-	 * <p>Typically just used for local JTA setups; in a Java EE environment,
+	 * <p>Typically just used for local JTA setups; in a Jakarta EE environment,
 	 * the UserTransaction will always be fetched from JNDI.
 	 * @see #setUserTransactionName
 	 * @see #setAutodetectUserTransaction
@@ -284,7 +275,7 @@ public UserTransaction getUserTransaction() {
 
 	/**
 	 * Set the JNDI name of the JTA UserTransaction.
-	 * <p>Note that the UserTransaction will be autodetected at the Java EE
+	 * <p>Note that the UserTransaction will be autodetected at the Jakarta EE
 	 * default location "java:comp/UserTransaction" if not specified explicitly.
 	 * @see #DEFAULT_USER_TRANSACTION_NAME
 	 * @see #setUserTransaction
@@ -296,7 +287,7 @@ public void setUserTransactionName(String userTransactionName) {
 
 	/**
 	 * Set whether to autodetect the JTA UserTransaction at its default
-	 * JNDI location "java:comp/UserTransaction", as specified by Java EE.
+	 * JNDI location "java:comp/UserTransaction", as specified by Jakarta EE.
 	 * Will proceed without UserTransaction if none found.
 	 * <p>Default is "true", autodetecting the UserTransaction unless
 	 * it has been specified explicitly. Turn this flag off to allow for
@@ -381,7 +372,7 @@ public void setAutodetectTransactionManager(boolean autodetectTransactionManager
 	 * <p>A TransactionSynchronizationRegistry allows for interposed registration
 	 * of transaction synchronizations, as an alternative to the regular registration
 	 * methods on the JTA TransactionManager API. Also, it is an official part of the
-	 * Java EE 5 platform, in contrast to the JTA TransactionManager itself.
+	 * Jakarta EE platform, in contrast to the JTA TransactionManager itself.
 	 * <p>Note that the TransactionSynchronizationRegistry will be autodetected in JNDI and
 	 * also from the UserTransaction/TransactionManager object if implemented there as well.
 	 * @see #setTransactionSynchronizationRegistryName
@@ -402,7 +393,7 @@ public TransactionSynchronizationRegistry getTransactionSynchronizationRegistry(
 	/**
 	 * Set the JNDI name of the JTA 1.1 TransactionSynchronizationRegistry.
 	 * <p>Note that the TransactionSynchronizationRegistry will be autodetected
-	 * at the Java EE 5 default location "java:comp/TransactionSynchronizationRegistry"
+	 * at the Jakarta EE default location "java:comp/TransactionSynchronizationRegistry"
 	 * if not specified explicitly.
 	 * @see #DEFAULT_TRANSACTION_SYNCHRONIZATION_REGISTRY_NAME
 	 */
@@ -741,7 +732,7 @@ protected TransactionManager findTransactionManager(@Nullable UserTransaction ut
 	/**
 	 * Find the JTA 1.1 TransactionSynchronizationRegistry through autodetection:
 	 * checking whether the UserTransaction object or TransactionManager object
-	 * implements it, and checking Java EE 5's standard JNDI location.
+	 * implements it, and checking Jakarta EE's standard JNDI location.
 	 * <p>The default implementation simply returns {@code null}.
 	 * @param ut the JTA UserTransaction object
 	 * @param tm the JTA TransactionManager object
@@ -834,7 +825,7 @@ protected boolean isExistingTransaction(Object transaction) {
 	 * <p>JTA implementations might support nested transactions via further
 	 * {@code UserTransaction.begin()} invocations, but never support savepoints.
 	 * @see #doBegin
-	 * @see javax.transaction.UserTransaction#begin()
+	 * @see jakarta.transaction.UserTransaction#begin()
 	 */
 	@Override
 	protected boolean useSavepointForNestedTransaction() {
@@ -874,8 +865,8 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 	 * @see #applyIsolationLevel
 	 * @see #applyTimeout
 	 * @see JtaTransactionObject#getUserTransaction()
-	 * @see javax.transaction.UserTransaction#setTransactionTimeout
-	 * @see javax.transaction.UserTransaction#begin
+	 * @see jakarta.transaction.UserTransaction#setTransactionTimeout
+	 * @see jakarta.transaction.UserTransaction#begin
 	 */
 	protected void doJtaBegin(JtaTransactionObject txObject, TransactionDefinition definition)
 			throws NotSupportedException, SystemException {
@@ -918,7 +909,7 @@ protected void applyIsolationLevel(JtaTransactionObject txObject, int isolationL
 	 * @throws SystemException if thrown by the JTA implementation
 	 * @see #doJtaBegin
 	 * @see JtaTransactionObject#getUserTransaction()
-	 * @see javax.transaction.UserTransaction#setTransactionTimeout(int)
+	 * @see jakarta.transaction.UserTransaction#setTransactionTimeout(int)
 	 */
 	protected void applyTimeout(JtaTransactionObject txObject, int timeout) throws SystemException {
 		if (timeout > TransactionDefinition.TIMEOUT_DEFAULT) {
@@ -948,7 +939,7 @@ protected Object doSuspend(Object transaction) {
 	 * @return the suspended JTA Transaction object
 	 * @throws SystemException if thrown by JTA methods
 	 * @see #getTransactionManager()
-	 * @see javax.transaction.TransactionManager#suspend()
+	 * @see jakarta.transaction.TransactionManager#suspend()
 	 */
 	protected Object doJtaSuspend(JtaTransactionObject txObject) throws SystemException {
 		if (getTransactionManager() == null) {
@@ -984,7 +975,7 @@ protected void doResume(@Nullable Object transaction, Object suspendedResources)
 	 * @throws InvalidTransactionException if thrown by JTA methods
 	 * @throws SystemException if thrown by JTA methods
 	 * @see #getTransactionManager()
-	 * @see javax.transaction.TransactionManager#resume(javax.transaction.Transaction)
+	 * @see jakarta.transaction.TransactionManager#resume(jakarta.transaction.Transaction)
 	 */
 	protected void doJtaResume(@Nullable JtaTransactionObject txObject, Object suspendedTransaction)
 		throws InvalidTransactionException, SystemException {
@@ -1144,8 +1135,8 @@ protected void registerAfterCompletionWithExistingTransaction(
 	 * @throws RollbackException if thrown by JTA methods
 	 * @throws SystemException if thrown by JTA methods
 	 * @see #getTransactionManager()
-	 * @see javax.transaction.Transaction#registerSynchronization
-	 * @see javax.transaction.TransactionSynchronizationRegistry#registerInterposedSynchronization
+	 * @see jakarta.transaction.Transaction#registerSynchronization
+	 * @see jakarta.transaction.TransactionSynchronizationRegistry#registerInterposedSynchronization
 	 */
 	protected void doRegisterAfterCompletionWithJtaTransaction(
 			JtaTransactionObject txObject, List<TransactionSynchronization> synchronizations)
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
index 4bbc8ff46ac0..b92453fa92ac 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
@@ -16,16 +16,16 @@
 
 package org.springframework.transaction.jta;
 
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.UserTransaction;
 
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.transaction.support.SmartTransactionObject;
 import org.springframework.transaction.support.TransactionSynchronizationUtils;
 
 /**
- * JTA transaction object, representing a {@link javax.transaction.UserTransaction}.
+ * JTA transaction object, representing a {@link jakarta.transaction.UserTransaction}.
  * Used as transaction object by Spring's {@link JtaTransactionManager}.
  *
  * <p>Note: This is an SPI class, not intended to be used by applications.
@@ -33,7 +33,7 @@
  * @author Juergen Hoeller
  * @since 1.1
  * @see JtaTransactionManager
- * @see javax.transaction.UserTransaction
+ * @see jakarta.transaction.UserTransaction
  */
 public class JtaTransactionObject implements SmartTransactionObject {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
index 47a804abc84e..6d5542b14d87 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
@@ -16,21 +16,22 @@
 
 package org.springframework.transaction.jta;
 
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.RollbackException;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+
 import org.springframework.util.Assert;
 
 /**
  * Adapter for a managed JTA Transaction handle, taking a JTA
- * {@link javax.transaction.TransactionManager} reference and creating
- * a JTA {@link javax.transaction.Transaction} handle for it.
+ * {@link jakarta.transaction.TransactionManager} reference and creating
+ * a JTA {@link jakarta.transaction.Transaction} handle for it.
  *
  * @author Juergen Hoeller
  * @since 3.0.2
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
index bd0828a9c370..f0977ac25e39 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
@@ -16,25 +16,25 @@
 
 package org.springframework.transaction.jta;
 
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
  * Default implementation of the {@link TransactionFactory} strategy interface,
- * simply wrapping a standard JTA {@link javax.transaction.TransactionManager}.
+ * simply wrapping a standard JTA {@link jakarta.transaction.TransactionManager}.
  *
  * <p>Does not support transaction names; simply ignores any specified name.
  *
  * @author Juergen Hoeller
  * @since 2.5
- * @see javax.transaction.TransactionManager#setTransactionTimeout(int)
- * @see javax.transaction.TransactionManager#begin()
- * @see javax.transaction.TransactionManager#getTransaction()
+ * @see jakarta.transaction.TransactionManager#setTransactionTimeout(int)
+ * @see jakarta.transaction.TransactionManager#begin()
+ * @see jakarta.transaction.TransactionManager#getTransaction()
  */
 public class SimpleTransactionFactory implements TransactionFactory {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
index d2f8282ef15a..aa718d7aed61 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,10 @@
 
 package org.springframework.transaction.jta;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -30,7 +29,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Adapter that implements the JTA {@link javax.transaction.Synchronization}
+ * Adapter that implements the JTA {@link jakarta.transaction.Synchronization}
  * interface delegating to an underlying Spring
  * {@link org.springframework.transaction.support.TransactionSynchronization}.
  *
@@ -40,7 +39,7 @@
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see javax.transaction.Transaction#registerSynchronization
+ * @see jakarta.transaction.Transaction#registerSynchronization
  * @see org.springframework.transaction.support.TransactionSynchronization
  */
 public class SpringJtaSynchronizationAdapter implements Synchronization {
@@ -82,9 +81,7 @@ public SpringJtaSynchronizationAdapter(TransactionSynchronization springSynchron
 			@Nullable UserTransaction jtaUserTransaction) {
 
 		this(springSynchronization);
-		if (jtaUserTransaction != null && !jtaUserTransaction.getClass().getName().startsWith("weblogic.")) {
-			this.jtaTransaction = jtaUserTransaction;
-		}
+		this.jtaTransaction = jtaUserTransaction;
 	}
 
 	/**
@@ -104,9 +101,7 @@ public SpringJtaSynchronizationAdapter(
 			TransactionSynchronization springSynchronization, @Nullable TransactionManager jtaTransactionManager) {
 
 		this(springSynchronization);
-		if (jtaTransactionManager != null && !jtaTransactionManager.getClass().getName().startsWith("weblogic.")) {
-			this.jtaTransaction = new UserTransactionAdapter(jtaTransactionManager);
-		}
+		this.jtaTransaction = new UserTransactionAdapter(jtaTransactionManager);
 	}
 
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
index 9317e9bb8ebb..b0ac31420835 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
@@ -16,24 +16,24 @@
 
 package org.springframework.transaction.jta;
 
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
 
 import org.springframework.lang.Nullable;
 
 /**
- * Strategy interface for creating JTA {@link javax.transaction.Transaction}
+ * Strategy interface for creating JTA {@link jakarta.transaction.Transaction}
  * objects based on specified transactional characteristics.
  *
  * <p>The default implementation, {@link SimpleTransactionFactory}, simply
- * wraps a standard JTA {@link javax.transaction.TransactionManager}.
+ * wraps a standard JTA {@link jakarta.transaction.TransactionManager}.
  * This strategy interface allows for more sophisticated implementations
  * that adapt to vendor-specific JTA extensions.
  *
  * @author Juergen Hoeller
  * @since 2.5
- * @see javax.transaction.TransactionManager#getTransaction()
+ * @see jakarta.transaction.TransactionManager#getTransaction()
  * @see SimpleTransactionFactory
  * @see JtaTransactionManager
  */
@@ -58,8 +58,8 @@ public interface TransactionFactory {
 	 * {@link org.springframework.jca.endpoint.AbstractMessageEndpointFactory}
 	 * in order to differentiate between invalid configuration and valid
 	 * ResourceAdapter-managed transactions.
-	 * @see javax.resource.spi.ResourceAdapter#endpointActivation
-	 * @see javax.resource.spi.endpoint.MessageEndpointFactory#isDeliveryTransacted
+	 * @see jakarta.resource.spi.ResourceAdapter#endpointActivation
+	 * @see jakarta.resource.spi.endpoint.MessageEndpointFactory#isDeliveryTransacted
 	 */
 	boolean supportsResourceAdapterManagedTransactions();
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
index 8302071f0e32..faf610fcced1 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
@@ -16,20 +16,20 @@
 
 package org.springframework.transaction.jta;
 
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 
 import org.springframework.util.Assert;
 
 /**
  * Adapter for a JTA UserTransaction handle, taking a JTA
- * {@link javax.transaction.TransactionManager} reference and creating
- * a JTA {@link javax.transaction.UserTransaction} handle for it.
+ * {@link jakarta.transaction.TransactionManager} reference and creating
+ * a JTA {@link jakarta.transaction.UserTransaction} handle for it.
  *
  * <p>The JTA UserTransaction interface is an exact subset of the JTA
  * TransactionManager interface. Unfortunately, it does not serve as
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
deleted file mode 100644
index 9d2cc38a723b..000000000000
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * 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.
- * 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.transaction.jta;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionSystemException;
-import org.springframework.util.Assert;
-
-/**
- * Special {@link JtaTransactionManager} variant for BEA WebLogic (9.0 and higher).
- * Supports the full power of Spring's transaction definitions on WebLogic's
- * transaction coordinator, <i>beyond standard JTA</i>: transaction names,
- * per-transaction isolation levels, and proper resuming of transactions in all cases.
- *
- * <p>Uses WebLogic's special {@code begin(name)} method to start a JTA transaction,
- * in order to make <b>Spring-driven transactions visible in WebLogic's transaction
- * monitor</b>. In case of Spring's declarative transactions, the exposed name will
- * (by default) be the fully-qualified class name + "." + method name.
- *
- * <p>Supports a <b>per-transaction isolation level</b> through WebLogic's corresponding
- * JTA transaction property "ISOLATION LEVEL". This will apply the specified isolation
- * level (e.g. ISOLATION_SERIALIZABLE) to all JDBC Connections that participate in the
- * given transaction.
- *
- * <p>Invokes WebLogic's special {@code forceResume} method if standard JTA resume
- * failed, to <b>also resume if the target transaction was marked rollback-only</b>.
- * If you're not relying on this feature of transaction suspension in the first
- * place, Spring's standard JtaTransactionManager will behave properly too.
- *
- * <p>By default, the JTA UserTransaction and TransactionManager handles are
- * fetched directly from WebLogic's {@code TransactionHelper}. This can be
- * overridden by specifying "userTransaction"/"userTransactionName" and
- * "transactionManager"/"transactionManagerName", passing in existing handles
- * or specifying corresponding JNDI locations to look up.
- *
- * <p><b>NOTE: This JtaTransactionManager is intended to refine specific transaction
- * demarcation behavior on Spring's side. It will happily co-exist with independently
- * configured WebLogic transaction strategies in your persistence provider, with no
- * need to specifically connect those setups in any way.</b>
- *
- * @author Juergen Hoeller
- * @since 1.1
- * @see org.springframework.transaction.TransactionDefinition#getName
- * @see org.springframework.transaction.TransactionDefinition#getIsolationLevel
- * @see weblogic.transaction.UserTransaction#begin(String)
- * @see weblogic.transaction.Transaction#setProperty
- * @see weblogic.transaction.TransactionManager#forceResume
- * @see weblogic.transaction.TransactionHelper
- */
-@SuppressWarnings("serial")
-public class WebLogicJtaTransactionManager extends JtaTransactionManager {
-
-	private static final String USER_TRANSACTION_CLASS_NAME = "weblogic.transaction.UserTransaction";
-
-	private static final String CLIENT_TRANSACTION_MANAGER_CLASS_NAME = "weblogic.transaction.ClientTransactionManager";
-
-	private static final String TRANSACTION_CLASS_NAME = "weblogic.transaction.Transaction";
-
-	private static final String TRANSACTION_HELPER_CLASS_NAME = "weblogic.transaction.TransactionHelper";
-
-	private static final String ISOLATION_LEVEL_KEY = "ISOLATION LEVEL";
-
-
-	private boolean weblogicUserTransactionAvailable;
-
-	@Nullable
-	private Method beginWithNameMethod;
-
-	@Nullable
-	private Method beginWithNameAndTimeoutMethod;
-
-	private boolean weblogicTransactionManagerAvailable;
-
-	@Nullable
-	private Method forceResumeMethod;
-
-	@Nullable
-	private Method setPropertyMethod;
-
-	@Nullable
-	private Object transactionHelper;
-
-
-	@Override
-	public void afterPropertiesSet() throws TransactionSystemException {
-		super.afterPropertiesSet();
-		loadWebLogicTransactionClasses();
-	}
-
-	@Override
-	@Nullable
-	protected UserTransaction retrieveUserTransaction() throws TransactionSystemException {
-		Object helper = loadWebLogicTransactionHelper();
-		try {
-			logger.trace("Retrieving JTA UserTransaction from WebLogic TransactionHelper");
-			Method getUserTransactionMethod = helper.getClass().getMethod("getUserTransaction");
-			return (UserTransaction) getUserTransactionMethod.invoke(this.transactionHelper);
-		}
-		catch (InvocationTargetException ex) {
-			throw new TransactionSystemException(
-					"WebLogic's TransactionHelper.getUserTransaction() method failed", ex.getTargetException());
-		}
-		catch (Exception ex) {
-			throw new TransactionSystemException(
-					"Could not invoke WebLogic's TransactionHelper.getUserTransaction() method", ex);
-		}
-	}
-
-	@Override
-	@Nullable
-	protected TransactionManager retrieveTransactionManager() throws TransactionSystemException {
-		Object helper = loadWebLogicTransactionHelper();
-		try {
-			logger.trace("Retrieving JTA TransactionManager from WebLogic TransactionHelper");
-			Method getTransactionManagerMethod = helper.getClass().getMethod("getTransactionManager");
-			return (TransactionManager) getTransactionManagerMethod.invoke(this.transactionHelper);
-		}
-		catch (InvocationTargetException ex) {
-			throw new TransactionSystemException(
-					"WebLogic's TransactionHelper.getTransactionManager() method failed", ex.getTargetException());
-		}
-		catch (Exception ex) {
-			throw new TransactionSystemException(
-					"Could not invoke WebLogic's TransactionHelper.getTransactionManager() method", ex);
-		}
-	}
-
-	private Object loadWebLogicTransactionHelper() throws TransactionSystemException {
-		Object helper = this.transactionHelper;
-		if (helper == null) {
-			try {
-				Class<?> transactionHelperClass = getClass().getClassLoader().loadClass(TRANSACTION_HELPER_CLASS_NAME);
-				Method getTransactionHelperMethod = transactionHelperClass.getMethod("getTransactionHelper");
-				helper = getTransactionHelperMethod.invoke(null);
-				this.transactionHelper = helper;
-				logger.trace("WebLogic TransactionHelper found");
-			}
-			catch (InvocationTargetException ex) {
-				throw new TransactionSystemException(
-						"WebLogic's TransactionHelper.getTransactionHelper() method failed", ex.getTargetException());
-			}
-			catch (Exception ex) {
-				throw new TransactionSystemException(
-						"Could not initialize WebLogicJtaTransactionManager because WebLogic API classes are not available",
-						ex);
-			}
-		}
-		return helper;
-	}
-
-	private void loadWebLogicTransactionClasses() throws TransactionSystemException {
-		try {
-			Class<?> userTransactionClass = getClass().getClassLoader().loadClass(USER_TRANSACTION_CLASS_NAME);
-			this.weblogicUserTransactionAvailable = userTransactionClass.isInstance(getUserTransaction());
-			if (this.weblogicUserTransactionAvailable) {
-				this.beginWithNameMethod = userTransactionClass.getMethod("begin", String.class);
-				this.beginWithNameAndTimeoutMethod = userTransactionClass.getMethod("begin", String.class, int.class);
-				logger.debug("Support for WebLogic transaction names available");
-			}
-			else {
-				logger.debug("Support for WebLogic transaction names not available");
-			}
-
-			// Obtain WebLogic ClientTransactionManager interface.
-			Class<?> transactionManagerClass =
-					getClass().getClassLoader().loadClass(CLIENT_TRANSACTION_MANAGER_CLASS_NAME);
-			logger.trace("WebLogic ClientTransactionManager found");
-
-			this.weblogicTransactionManagerAvailable = transactionManagerClass.isInstance(getTransactionManager());
-			if (this.weblogicTransactionManagerAvailable) {
-				Class<?> transactionClass = getClass().getClassLoader().loadClass(TRANSACTION_CLASS_NAME);
-				this.forceResumeMethod = transactionManagerClass.getMethod("forceResume", Transaction.class);
-				this.setPropertyMethod = transactionClass.getMethod("setProperty", String.class, Serializable.class);
-				logger.debug("Support for WebLogic forceResume available");
-			}
-			else {
-				logger.debug("Support for WebLogic forceResume not available");
-			}
-		}
-		catch (Exception ex) {
-			throw new TransactionSystemException(
-					"Could not initialize WebLogicJtaTransactionManager because WebLogic API classes are not available",
-					ex);
-		}
-	}
-
-	private TransactionManager obtainTransactionManager() {
-		TransactionManager tm = getTransactionManager();
-		Assert.state(tm != null, "No TransactionManager set");
-		return tm;
-	}
-
-
-	@Override
-	protected void doJtaBegin(JtaTransactionObject txObject, TransactionDefinition definition)
-			throws NotSupportedException, SystemException {
-
-		int timeout = determineTimeout(definition);
-
-		// Apply transaction name (if any) to WebLogic transaction.
-		if (this.weblogicUserTransactionAvailable && definition.getName() != null) {
-			try {
-				if (timeout > TransactionDefinition.TIMEOUT_DEFAULT) {
-					/*
-					weblogic.transaction.UserTransaction wut = (weblogic.transaction.UserTransaction) ut;
-					wut.begin(definition.getName(), timeout);
-					*/
-					Assert.state(this.beginWithNameAndTimeoutMethod != null, "WebLogic JTA API not initialized");
-					this.beginWithNameAndTimeoutMethod.invoke(txObject.getUserTransaction(), definition.getName(), timeout);
-				}
-				else {
-					/*
-					weblogic.transaction.UserTransaction wut = (weblogic.transaction.UserTransaction) ut;
-					wut.begin(definition.getName());
-					*/
-					Assert.state(this.beginWithNameMethod != null, "WebLogic JTA API not initialized");
-					this.beginWithNameMethod.invoke(txObject.getUserTransaction(), definition.getName());
-				}
-			}
-			catch (InvocationTargetException ex) {
-				throw new TransactionSystemException(
-						"WebLogic's UserTransaction.begin() method failed", ex.getTargetException());
-			}
-			catch (Exception ex) {
-				throw new TransactionSystemException(
-						"Could not invoke WebLogic's UserTransaction.begin() method", ex);
-			}
-		}
-		else {
-			// No WebLogic UserTransaction available or no transaction name specified
-			// -> standard JTA begin call.
-			applyTimeout(txObject, timeout);
-			txObject.getUserTransaction().begin();
-		}
-
-		// Specify isolation level, if any, through corresponding WebLogic transaction property.
-		if (this.weblogicTransactionManagerAvailable) {
-			if (definition.getIsolationLevel() != TransactionDefinition.ISOLATION_DEFAULT) {
-				try {
-					Transaction tx = obtainTransactionManager().getTransaction();
-					Integer isolationLevel = definition.getIsolationLevel();
-					/*
-					weblogic.transaction.Transaction wtx = (weblogic.transaction.Transaction) tx;
-					wtx.setProperty(ISOLATION_LEVEL_KEY, isolationLevel);
-					*/
-					Assert.state(this.setPropertyMethod != null, "WebLogic JTA API not initialized");
-					this.setPropertyMethod.invoke(tx, ISOLATION_LEVEL_KEY, isolationLevel);
-				}
-				catch (InvocationTargetException ex) {
-					throw new TransactionSystemException(
-							"WebLogic's Transaction.setProperty(String, Serializable) method failed", ex.getTargetException());
-				}
-				catch (Exception ex) {
-					throw new TransactionSystemException(
-							"Could not invoke WebLogic's Transaction.setProperty(String, Serializable) method", ex);
-				}
-			}
-		}
-		else {
-			applyIsolationLevel(txObject, definition.getIsolationLevel());
-		}
-	}
-
-	@Override
-	protected void doJtaResume(@Nullable JtaTransactionObject txObject, Object suspendedTransaction)
-			throws InvalidTransactionException, SystemException {
-
-		try {
-			obtainTransactionManager().resume((Transaction) suspendedTransaction);
-		}
-		catch (InvalidTransactionException ex) {
-			if (!this.weblogicTransactionManagerAvailable) {
-				throw ex;
-			}
-
-			if (logger.isDebugEnabled()) {
-				logger.debug("Standard JTA resume threw InvalidTransactionException: " + ex.getMessage() +
-					" - trying WebLogic JTA forceResume");
-			}
-			/*
-			weblogic.transaction.TransactionManager wtm =
-					(weblogic.transaction.TransactionManager) getTransactionManager();
-			wtm.forceResume(suspendedTransaction);
-			*/
-			try {
-				Assert.state(this.forceResumeMethod != null, "WebLogic JTA API not initialized");
-				this.forceResumeMethod.invoke(getTransactionManager(), suspendedTransaction);
-			}
-			catch (InvocationTargetException ex2) {
-				throw new TransactionSystemException(
-						"WebLogic's TransactionManager.forceResume(Transaction) method failed", ex2.getTargetException());
-			}
-			catch (Exception ex2) {
-				throw new TransactionSystemException(
-						"Could not access WebLogic's TransactionManager.forceResume(Transaction) method", ex2);
-			}
-		}
-	}
-
-	@Override
-	public Transaction createTransaction(@Nullable String name, int timeout) throws NotSupportedException, SystemException {
-		if (this.weblogicUserTransactionAvailable && name != null) {
-			try {
-				if (timeout >= 0) {
-					Assert.state(this.beginWithNameAndTimeoutMethod != null, "WebLogic JTA API not initialized");
-					this.beginWithNameAndTimeoutMethod.invoke(getUserTransaction(), name, timeout);
-				}
-				else {
-					Assert.state(this.beginWithNameMethod != null, "WebLogic JTA API not initialized");
-					this.beginWithNameMethod.invoke(getUserTransaction(), name);
-				}
-			}
-			catch (InvocationTargetException ex) {
-				if (ex.getTargetException() instanceof NotSupportedException) {
-					throw (NotSupportedException) ex.getTargetException();
-				}
-				else if (ex.getTargetException() instanceof SystemException) {
-					throw (SystemException) ex.getTargetException();
-				}
-				else if (ex.getTargetException() instanceof RuntimeException) {
-					throw (RuntimeException) ex.getTargetException();
-				}
-				else {
-					throw new SystemException(
-							"WebLogic's begin() method failed with an unexpected error: " + ex.getTargetException());
-				}
-			}
-			catch (Exception ex) {
-				throw new SystemException("Could not invoke WebLogic's UserTransaction.begin() method: " + ex);
-			}
-			return new ManagedTransactionAdapter(obtainTransactionManager());
-		}
-
-		else {
-			// No name specified - standard JTA is sufficient.
-			return super.createTransaction(name, timeout);
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
deleted file mode 100644
index 256cc9652950..000000000000
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * 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.
- * 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.transaction.jta;
-
-import java.util.List;
-
-import javax.naming.NamingException;
-
-import com.ibm.websphere.uow.UOWSynchronizationRegistry;
-import com.ibm.wsspi.uow.UOWAction;
-import com.ibm.wsspi.uow.UOWActionException;
-import com.ibm.wsspi.uow.UOWException;
-import com.ibm.wsspi.uow.UOWManager;
-import com.ibm.wsspi.uow.UOWManagerFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.IllegalTransactionStateException;
-import org.springframework.transaction.InvalidTimeoutException;
-import org.springframework.transaction.NestedTransactionNotSupportedException;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionException;
-import org.springframework.transaction.TransactionSystemException;
-import org.springframework.transaction.support.CallbackPreferringPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-import org.springframework.transaction.support.SmartTransactionObject;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.transaction.support.TransactionSynchronizationUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * WebSphere-specific PlatformTransactionManager implementation that delegates
- * to a {@link com.ibm.wsspi.uow.UOWManager} instance, obtained from WebSphere's
- * JNDI environment. This allows Spring to leverage the full power of the WebSphere
- * transaction coordinator, including transaction suspension, in a manner that is
- * perfectly compliant with officially supported WebSphere API.
- *
- * <p>The {@link CallbackPreferringPlatformTransactionManager} interface
- * implemented by this class indicates that callers should preferably pass in
- * a {@link TransactionCallback} through the {@link #execute} method, which
- * will be handled through the callback-based WebSphere UOWManager API instead
- * of through standard JTA API (UserTransaction / TransactionManager). This avoids
- * the use of the non-public {@code javax.transaction.TransactionManager}
- * API on WebSphere, staying within supported WebSphere API boundaries.
- *
- * <p>This transaction manager implementation derives from Spring's standard
- * {@link JtaTransactionManager}, inheriting the capability to support programmatic
- * transaction demarcation via {@code getTransaction} / {@code commit} /
- * {@code rollback} calls through a JTA UserTransaction handle, for callers
- * that do not use the TransactionCallback-based {@link #execute} method. However,
- * transaction suspension is <i>not</i> supported in this {@code getTransaction}
- * style (unless you explicitly specify a {@link #setTransactionManager} reference,
- * despite the official WebSphere recommendations). Use the {@link #execute} style
- * for any code that might require transaction suspension.
- *
- * <p>This transaction manager is compatible with WebSphere 6.1.0.9 and above.
- * The default JNDI location for the UOWManager is "java:comp/websphere/UOWManager".
- * If the location happens to differ according to your WebSphere documentation,
- * simply specify the actual location through this transaction manager's
- * "uowManagerName" bean property.
- *
- * <p><b>NOTE: This JtaTransactionManager is intended to refine specific transaction
- * demarcation behavior on Spring's side. It will happily co-exist with independently
- * configured WebSphere transaction strategies in your persistence provider, with no
- * need to specifically connect those setups in any way.</b>
- *
- * @author Juergen Hoeller
- * @since 2.5
- * @see #setUowManager
- * @see #setUowManagerName
- * @see com.ibm.wsspi.uow.UOWManager
- */
-@SuppressWarnings("serial")
-public class WebSphereUowTransactionManager extends JtaTransactionManager
-		implements CallbackPreferringPlatformTransactionManager {
-
-	/**
-	 * Default JNDI location for the WebSphere UOWManager.
-	 * @see #setUowManagerName
-	 */
-	public static final String DEFAULT_UOW_MANAGER_NAME = "java:comp/websphere/UOWManager";
-
-
-	@Nullable
-	private UOWManager uowManager;
-
-	@Nullable
-	private String uowManagerName;
-
-
-	/**
-	 * Create a new WebSphereUowTransactionManager.
-	 */
-	public WebSphereUowTransactionManager() {
-		setAutodetectTransactionManager(false);
-	}
-
-	/**
-	 * Create a new WebSphereUowTransactionManager for the given UOWManager.
-	 * @param uowManager the WebSphere UOWManager to use as direct reference
-	 */
-	public WebSphereUowTransactionManager(UOWManager uowManager) {
-		this();
-		this.uowManager = uowManager;
-	}
-
-
-	/**
-	 * Set the WebSphere UOWManager to use as direct reference.
-	 * <p>Typically just used for test setups; in a Java EE environment,
-	 * the UOWManager will always be fetched from JNDI.
-	 * @see #setUserTransactionName
-	 */
-	public void setUowManager(UOWManager uowManager) {
-		this.uowManager = uowManager;
-	}
-
-	/**
-	 * Set the JNDI name of the WebSphere UOWManager.
-	 * The default "java:comp/websphere/UOWManager" is used if not set.
-	 * @see #DEFAULT_USER_TRANSACTION_NAME
-	 * @see #setUowManager
-	 */
-	public void setUowManagerName(String uowManagerName) {
-		this.uowManagerName = uowManagerName;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() throws TransactionSystemException {
-		initUserTransactionAndTransactionManager();
-
-		// Fetch UOWManager handle from JNDI, if necessary.
-		if (this.uowManager == null) {
-			if (this.uowManagerName != null) {
-				this.uowManager = lookupUowManager(this.uowManagerName);
-			}
-			else {
-				this.uowManager = lookupDefaultUowManager();
-			}
-		}
-	}
-
-	/**
-	 * Look up the WebSphere UOWManager in JNDI via the configured name.
-	 * @param uowManagerName the JNDI name of the UOWManager
-	 * @return the UOWManager object
-	 * @throws TransactionSystemException if the JNDI lookup failed
-	 * @see #setJndiTemplate
-	 * @see #setUowManagerName
-	 */
-	protected UOWManager lookupUowManager(String uowManagerName) throws TransactionSystemException {
-		try {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Retrieving WebSphere UOWManager from JNDI location [" + uowManagerName + "]");
-			}
-			return getJndiTemplate().lookup(uowManagerName, UOWManager.class);
-		}
-		catch (NamingException ex) {
-			throw new TransactionSystemException(
-					"WebSphere UOWManager is not available at JNDI location [" + uowManagerName + "]", ex);
-		}
-	}
-
-	/**
-	 * Obtain the WebSphere UOWManager from the default JNDI location
-	 * "java:comp/websphere/UOWManager".
-	 * @return the UOWManager object
-	 * @throws TransactionSystemException if the JNDI lookup failed
-	 * @see #setJndiTemplate
-	 */
-	protected UOWManager lookupDefaultUowManager() throws TransactionSystemException {
-		try {
-			logger.debug("Retrieving WebSphere UOWManager from default JNDI location [" + DEFAULT_UOW_MANAGER_NAME + "]");
-			return getJndiTemplate().lookup(DEFAULT_UOW_MANAGER_NAME, UOWManager.class);
-		}
-		catch (NamingException ex) {
-			logger.debug("WebSphere UOWManager is not available at default JNDI location [" +
-					DEFAULT_UOW_MANAGER_NAME + "] - falling back to UOWManagerFactory lookup");
-			return UOWManagerFactory.getUOWManager();
-		}
-	}
-
-	private UOWManager obtainUOWManager() {
-		Assert.state(this.uowManager != null, "No UOWManager set");
-		return this.uowManager;
-	}
-
-
-	/**
-	 * Registers the synchronizations as interposed JTA Synchronization on the UOWManager.
-	 */
-	@Override
-	protected void doRegisterAfterCompletionWithJtaTransaction(
-			JtaTransactionObject txObject, List<TransactionSynchronization> synchronizations) {
-
-		obtainUOWManager().registerInterposedSynchronization(new JtaAfterCompletionSynchronization(synchronizations));
-	}
-
-	/**
-	 * Returns {@code true} since WebSphere ResourceAdapters (as exposed in JNDI)
-	 * implicitly perform transaction enlistment if the MessageEndpointFactory's
-	 * {@code isDeliveryTransacted} method returns {@code true}.
-	 * In that case we'll simply skip the {@link #createTransaction} call.
-	 * @see javax.resource.spi.endpoint.MessageEndpointFactory#isDeliveryTransacted
-	 * @see org.springframework.jca.endpoint.AbstractMessageEndpointFactory
-	 * @see TransactionFactory#createTransaction
-	 */
-	@Override
-	public boolean supportsResourceAdapterManagedTransactions() {
-		return true;
-	}
-
-
-	@Override
-	@Nullable
-	public <T> T execute(@Nullable TransactionDefinition definition, TransactionCallback<T> callback)
-			throws TransactionException {
-
-		// Use defaults if no transaction definition given.
-		TransactionDefinition def = (definition != null ? definition : TransactionDefinition.withDefaults());
-
-		if (def.getTimeout() < TransactionDefinition.TIMEOUT_DEFAULT) {
-			throw new InvalidTimeoutException("Invalid transaction timeout", def.getTimeout());
-		}
-
-		UOWManager uowManager = obtainUOWManager();
-		int pb = def.getPropagationBehavior();
-		boolean existingTx = (uowManager.getUOWStatus() != UOWSynchronizationRegistry.UOW_STATUS_NONE &&
-				uowManager.getUOWType() != UOWSynchronizationRegistry.UOW_TYPE_LOCAL_TRANSACTION);
-
-		int uowType = UOWSynchronizationRegistry.UOW_TYPE_GLOBAL_TRANSACTION;
-		boolean joinTx = false;
-		boolean newSynch = false;
-
-		if (existingTx) {
-			if (pb == TransactionDefinition.PROPAGATION_NEVER) {
-				throw new IllegalTransactionStateException(
-						"Transaction propagation 'never' but existing transaction found");
-			}
-			if (pb == TransactionDefinition.PROPAGATION_NESTED) {
-				throw new NestedTransactionNotSupportedException(
-						"Transaction propagation 'nested' not supported for WebSphere UOW transactions");
-			}
-			if (pb == TransactionDefinition.PROPAGATION_SUPPORTS ||
-					pb == TransactionDefinition.PROPAGATION_REQUIRED ||
-					pb == TransactionDefinition.PROPAGATION_MANDATORY) {
-				joinTx = true;
-				newSynch = (getTransactionSynchronization() != SYNCHRONIZATION_NEVER);
-			}
-			else if (pb == TransactionDefinition.PROPAGATION_NOT_SUPPORTED) {
-				uowType = UOWSynchronizationRegistry.UOW_TYPE_LOCAL_TRANSACTION;
-				newSynch = (getTransactionSynchronization() == SYNCHRONIZATION_ALWAYS);
-			}
-			else {
-				newSynch = (getTransactionSynchronization() != SYNCHRONIZATION_NEVER);
-			}
-		}
-		else {
-			if (pb == TransactionDefinition.PROPAGATION_MANDATORY) {
-				throw new IllegalTransactionStateException(
-						"Transaction propagation 'mandatory' but no existing transaction found");
-			}
-			if (pb == TransactionDefinition.PROPAGATION_SUPPORTS ||
-					pb == TransactionDefinition.PROPAGATION_NOT_SUPPORTED ||
-					pb == TransactionDefinition.PROPAGATION_NEVER) {
-				uowType = UOWSynchronizationRegistry.UOW_TYPE_LOCAL_TRANSACTION;
-				newSynch = (getTransactionSynchronization() == SYNCHRONIZATION_ALWAYS);
-			}
-			else {
-				newSynch = (getTransactionSynchronization() != SYNCHRONIZATION_NEVER);
-			}
-		}
-
-		boolean debug = logger.isDebugEnabled();
-		if (debug) {
-			logger.debug("Creating new transaction with name [" + def.getName() + "]: " + def);
-		}
-		SuspendedResourcesHolder suspendedResources = (!joinTx ? suspend(null) : null);
-		UOWActionAdapter<T> action = null;
-		try {
-			boolean actualTransaction = (uowType == UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-			if (actualTransaction && def.getTimeout() > TransactionDefinition.TIMEOUT_DEFAULT) {
-				uowManager.setUOWTimeout(uowType, def.getTimeout());
-			}
-			if (debug) {
-				logger.debug("Invoking WebSphere UOW action: type=" + uowType + ", join=" + joinTx);
-			}
-			action = new UOWActionAdapter<>(def, callback, actualTransaction, !joinTx, newSynch, debug);
-			uowManager.runUnderUOW(uowType, joinTx, action);
-			if (debug) {
-				logger.debug("Returned from WebSphere UOW action: type=" + uowType + ", join=" + joinTx);
-			}
-			return action.getResult();
-		}
-		catch (UOWException | UOWActionException ex) {
-			TransactionSystemException tse =
-					new TransactionSystemException("UOWManager transaction processing failed", ex);
-			Throwable appEx = action.getException();
-			if (appEx != null) {
-				logger.error("Application exception overridden by rollback exception", appEx);
-				tse.initApplicationException(appEx);
-			}
-			throw tse;
-		}
-		finally {
-			if (suspendedResources != null) {
-				resume(null, suspendedResources);
-			}
-		}
-	}
-
-
-	/**
-	 * Adapter that executes the given Spring transaction within the WebSphere UOWAction shape.
-	 */
-	private class UOWActionAdapter<T> implements UOWAction, SmartTransactionObject {
-
-		private final TransactionDefinition definition;
-
-		private final TransactionCallback<T> callback;
-
-		private final boolean actualTransaction;
-
-		private final boolean newTransaction;
-
-		private final boolean newSynchronization;
-
-		private boolean debug;
-
-		@Nullable
-		private T result;
-
-		@Nullable
-		private Throwable exception;
-
-		public UOWActionAdapter(TransactionDefinition definition, TransactionCallback<T> callback,
-				boolean actualTransaction, boolean newTransaction, boolean newSynchronization, boolean debug) {
-
-			this.definition = definition;
-			this.callback = callback;
-			this.actualTransaction = actualTransaction;
-			this.newTransaction = newTransaction;
-			this.newSynchronization = newSynchronization;
-			this.debug = debug;
-		}
-
-		@Override
-		public void run() {
-			UOWManager uowManager = obtainUOWManager();
-			DefaultTransactionStatus status = prepareTransactionStatus(
-					this.definition, (this.actualTransaction ? this : null),
-					this.newTransaction, this.newSynchronization, this.debug, null);
-			try {
-				this.result = this.callback.doInTransaction(status);
-				triggerBeforeCommit(status);
-			}
-			catch (Throwable ex) {
-				this.exception = ex;
-				if (status.isDebug()) {
-					logger.debug("Rolling back on application exception from transaction callback", ex);
-				}
-				uowManager.setRollbackOnly();
-			}
-			finally {
-				if (status.isLocalRollbackOnly()) {
-					if (status.isDebug()) {
-						logger.debug("Transaction callback has explicitly requested rollback");
-					}
-					uowManager.setRollbackOnly();
-				}
-				triggerBeforeCompletion(status);
-				if (status.isNewSynchronization()) {
-					List<TransactionSynchronization> synchronizations = TransactionSynchronizationManager.getSynchronizations();
-					TransactionSynchronizationManager.clear();
-					if (!synchronizations.isEmpty()) {
-						uowManager.registerInterposedSynchronization(new JtaAfterCompletionSynchronization(synchronizations));
-					}
-				}
-			}
-		}
-
-		@Nullable
-		public T getResult() {
-			if (this.exception != null) {
-				ReflectionUtils.rethrowRuntimeException(this.exception);
-			}
-			return this.result;
-		}
-
-		@Nullable
-		public Throwable getException() {
-			return this.exception;
-		}
-
-		@Override
-		public boolean isRollbackOnly() {
-			return obtainUOWManager().getRollbackOnly();
-		}
-
-		@Override
-		public void flush() {
-			TransactionSynchronizationUtils.triggerFlush();
-		}
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
index 74dc7a3d5a1e..0d21f4c89397 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
@@ -1152,8 +1152,8 @@ protected void doResume(@Nullable Object transaction, Object suspendedResources)
 	 * @see DefaultTransactionStatus#isLocalRollbackOnly()
 	 * @see org.springframework.transaction.TransactionStatus#setRollbackOnly()
 	 * @see org.springframework.transaction.UnexpectedRollbackException
-	 * @see javax.transaction.UserTransaction#commit()
-	 * @see javax.transaction.RollbackException
+	 * @see jakarta.transaction.UserTransaction#commit()
+	 * @see jakarta.transaction.RollbackException
 	 */
 	protected boolean shouldCommitOnGlobalRollbackOnly() {
 		return false;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java
index 923e00480456..90d0662c10d5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/SmartTransactionObject.java
@@ -36,8 +36,8 @@ public interface SmartTransactionObject extends Flushable {
 	/**
 	 * Return whether the transaction is internally marked as rollback-only.
 	 * Can, for example, check the JTA UserTransaction.
-	 * @see javax.transaction.UserTransaction#getStatus
-	 * @see javax.transaction.Status#STATUS_MARKED_ROLLBACK
+	 * @see jakarta.transaction.UserTransaction#getStatus
+	 * @see jakarta.transaction.Status#STATUS_MARKED_ROLLBACK
 	 */
 	boolean isRollbackOnly();
 
diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
index dff65b71ed11..c052cea1463a 100644
--- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
@@ -21,8 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.persistence.PersistenceException;
-
+import jakarta.persistence.PersistenceException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
index a09559481132..46e125464da4 100644
--- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.dao.annotation;
 
-import javax.persistence.PersistenceException;
-
+import jakarta.persistence.PersistenceException;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
deleted file mode 100644
index d45b326c090a..000000000000
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.Interaction;
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.LocalTransaction;
-import javax.resource.cci.Record;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.dao.DataRetrievalFailureException;
-import org.springframework.jca.cci.connection.CciLocalTransactionManager;
-import org.springframework.jca.cci.core.CciTemplate;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.springframework.transaction.support.TransactionTemplate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Thierry Templier
- * @author Chris Beams
- */
-@Deprecated
-public class CciLocalTransactionTests {
-
-	/**
-	 * Test if a transaction ( begin / commit ) is executed on the
-	 * LocalTransaction when CciLocalTransactionManager is specified as
-	 * transaction manager.
-	 */
-	@Test
-	public void testLocalTransactionCommit() throws ResourceException {
-		final ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		LocalTransaction localTransaction = mock(LocalTransaction.class);
-		final Record record = mock(Record.class);
-		final InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.getLocalTransaction()).willReturn(localTransaction);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, record, record)).willReturn(true);
-		given(connection.getLocalTransaction()).willReturn(localTransaction);
-
-		CciLocalTransactionManager tm = new CciLocalTransactionManager();
-		tm.setConnectionFactory(connectionFactory);
-		TransactionTemplate tt = new TransactionTemplate(tm);
-
-		tt.execute(new TransactionCallbackWithoutResult() {
-			@Override
-			protected void doInTransactionWithoutResult(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.hasResource(connectionFactory)).as("Has thread connection").isTrue();
-				CciTemplate ct = new CciTemplate(connectionFactory);
-				ct.execute(interactionSpec, record, record);
-			}
-		});
-
-		verify(localTransaction).begin();
-		verify(interaction).close();
-		verify(localTransaction).commit();
-		verify(connection).close();
-	}
-
-	/**
-	 * Test if a transaction ( begin / rollback ) is executed on the
-	 * LocalTransaction when CciLocalTransactionManager is specified as
-	 * transaction manager and a non-checked exception is thrown.
-	 */
-	@Test
-	public void testLocalTransactionRollback() throws ResourceException {
-		final ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		LocalTransaction localTransaction = mock(LocalTransaction.class);
-		final Record record = mock(Record.class);
-		final InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.getLocalTransaction()).willReturn(localTransaction);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, record, record)).willReturn(true);
-		given(connection.getLocalTransaction()).willReturn(localTransaction);
-
-		CciLocalTransactionManager tm = new CciLocalTransactionManager();
-		tm.setConnectionFactory(connectionFactory);
-		TransactionTemplate tt = new TransactionTemplate(tm);
-
-		try {
-			tt.execute(new TransactionCallback<Void>() {
-				@Override
-				public Void doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(connectionFactory)).as("Has thread connection").isTrue();
-					CciTemplate ct = new CciTemplate(connectionFactory);
-					ct.execute(interactionSpec, record, record);
-					throw new DataRetrievalFailureException("error");
-				}
-			});
-		}
-		catch (Exception ex) {
-		}
-
-		verify(localTransaction).begin();
-		verify(interaction).close();
-		verify(localTransaction).rollback();
-		verify(connection).close();
-	}
-}
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
deleted file mode 100644
index a67028f162a8..000000000000
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import java.sql.SQLException;
-
-import javax.resource.NotSupportedException;
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.ConnectionSpec;
-import javax.resource.cci.IndexedRecord;
-import javax.resource.cci.Interaction;
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.MappedRecord;
-import javax.resource.cci.Record;
-import javax.resource.cci.RecordFactory;
-import javax.resource.cci.ResultSet;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.jca.cci.connection.ConnectionSpecConnectionFactoryAdapter;
-import org.springframework.jca.cci.connection.NotSupportedRecordFactory;
-import org.springframework.jca.cci.core.CciTemplate;
-import org.springframework.jca.cci.core.ConnectionCallback;
-import org.springframework.jca.cci.core.InteractionCallback;
-import org.springframework.jca.cci.core.RecordCreator;
-import org.springframework.jca.cci.core.RecordExtractor;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Thierry Templier
- * @author Juergen Hoeller
- * @author Chris Beams
- */
-@Deprecated
-public class CciTemplateTests {
-
-	@Test
-	public void testCreateIndexedRecord() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		IndexedRecord indexedRecord = mock(IndexedRecord.class);
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(recordFactory.createIndexedRecord("name")).willReturn(indexedRecord);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.createIndexedRecord("name");
-
-		verify(recordFactory).createIndexedRecord("name");
-	}
-
-	@Test
-	public void testCreateMappedRecord() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		MappedRecord mappedRecord = mock(MappedRecord.class);
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(recordFactory.createMappedRecord("name")).willReturn(mappedRecord);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.createMappedRecord("name");
-
-		verify(recordFactory).createMappedRecord("name");
-	}
-
-	@Test
-	public void testTemplateExecuteInputOutput() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionSpec, inputRecord, outputRecord);
-
-		verify(interaction).execute(interactionSpec, inputRecord, outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteWithCreatorAndRecordFactoryNotSupported()
-			throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-
-		Record inputRecord = mock(Record.class);
-		final Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connectionFactory.getRecordFactory()).willThrow(new NotSupportedException("not supported"));
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.setOutputRecordCreator(new RecordCreator() {
-			@Override
-			public Record createRecord(RecordFactory recordFactory) {
-				boolean condition = recordFactory instanceof NotSupportedRecordFactory;
-				assertThat(condition).isTrue();
-				return outputRecord;
-			}
-		});
-		ct.execute(interactionSpec, inputRecord);
-
-		verify(interaction).execute(interactionSpec, inputRecord, outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputTrueWithCreator2()
-			throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordCreator creator = mock(RecordCreator.class);
-
-		Record inputRecord = mock(Record.class);
-		final Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(creator.createRecord(recordFactory)).willReturn(outputRecord);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.setOutputRecordCreator(creator);
-		ct.execute(interactionSpec, inputRecord);
-
-		verify(interaction).execute(interactionSpec, inputRecord, outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputFalse() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord)).willReturn(outputRecord);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionSpec, inputRecord);
-
-		verify(interaction).execute(interactionSpec, inputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testTemplateExecuteInputExtractorTrueWithCreator()
-			throws ResourceException, SQLException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordExtractor<Object> extractor = mock(RecordExtractor.class);
-		RecordCreator creator = mock(RecordCreator.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(creator.createRecord(recordFactory)).willReturn(outputRecord);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-		given(extractor.extractData(outputRecord)).willReturn(new Object());
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.setOutputRecordCreator(creator);
-		ct.execute(interactionSpec, inputRecord, extractor);
-
-		verify(extractor).extractData(outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testTemplateExecuteInputExtractorFalse()
-			throws ResourceException, SQLException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordExtractor<Object> extractor = mock(RecordExtractor.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord)).willReturn(outputRecord);
-		given(extractor.extractData(outputRecord)).willReturn(new Object());
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionSpec, inputRecord, extractor);
-
-		verify(extractor).extractData(outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputGeneratorTrueWithCreator()
-			throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordCreator generator = mock(RecordCreator.class);
-		RecordCreator creator = mock(RecordCreator.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(generator.createRecord(recordFactory)).willReturn(inputRecord);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(creator.createRecord(recordFactory)).willReturn(outputRecord);
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.setOutputRecordCreator(creator);
-		ct.execute(interactionSpec, generator);
-
-		verify(interaction).execute(interactionSpec, inputRecord, outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputGeneratorFalse()
-			throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordCreator generator = mock(RecordCreator.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(generator.createRecord(recordFactory)).willReturn(inputRecord);
-		given(interaction.execute(interactionSpec, inputRecord)).willReturn(outputRecord);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionSpec, generator);
-
-		verify(interaction).execute(interactionSpec, inputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testTemplateExecuteInputGeneratorExtractorTrueWithCreator()
-			throws ResourceException, SQLException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordCreator generator = mock(RecordCreator.class);
-		RecordExtractor<Object> extractor = mock(RecordExtractor.class);
-		RecordCreator creator = mock(RecordCreator.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		Object obj = new Object();
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(creator.createRecord(recordFactory)).willReturn(outputRecord);
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(generator.createRecord(recordFactory)).willReturn(inputRecord);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-		given(extractor.extractData(outputRecord)).willReturn(obj);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.setOutputRecordCreator(creator);
-		assertThat(ct.execute(interactionSpec, generator, extractor)).isEqualTo(obj);
-
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testTemplateExecuteInputGeneratorExtractorFalse()
-			throws ResourceException, SQLException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordCreator generator = mock(RecordCreator.class);
-		RecordExtractor<Object> extractor = mock(RecordExtractor.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(generator.createRecord(recordFactory)).willReturn(inputRecord);
-		given(interaction.execute(interactionSpec, inputRecord)).willReturn(outputRecord);
-		given(extractor.extractData(outputRecord)).willReturn(new Object());
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionSpec, generator, extractor);
-
-		verify(extractor).extractData(outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputOutputConnectionSpec() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		ConnectionSpec connectionSpec = mock(ConnectionSpec.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection(connectionSpec)).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-
-		ConnectionSpecConnectionFactoryAdapter adapter = new ConnectionSpecConnectionFactoryAdapter();
-		adapter.setTargetConnectionFactory(connectionFactory);
-		adapter.setConnectionSpec(connectionSpec);
-		CciTemplate ct = new CciTemplate(adapter);
-		ct.execute(interactionSpec, inputRecord, outputRecord);
-
-		verify(interaction).execute(interactionSpec, inputRecord, outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testTemplateExecuteInputOutputResultsSetFalse()
-			throws ResourceException, SQLException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		Record record = mock(Record.class);
-		ResultSet resultset = mock(ResultSet.class);
-		RecordCreator generator = mock(RecordCreator.class);
-		RecordExtractor<Object> extractor = mock(RecordExtractor.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(generator.createRecord(recordFactory)).willReturn(record);
-		given(interaction.execute(interactionSpec, record)).willReturn(resultset);
-		given(extractor.extractData(resultset)).willReturn(new Object());
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionSpec, generator, extractor);
-
-		verify(extractor).extractData(resultset);
-		verify(resultset).close();
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testTemplateExecuteConnectionCallback()
-			throws ResourceException, SQLException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		ConnectionCallback<Object> connectionCallback = mock(ConnectionCallback.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connectionCallback.doInConnection(connection, connectionFactory)).willReturn(new Object());
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(connectionCallback);
-
-		verify(connectionCallback).doInConnection(connection, connectionFactory);
-		verify(connection).close();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testTemplateExecuteInteractionCallback()
-			throws ResourceException, SQLException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		InteractionCallback<Object> interactionCallback = mock(InteractionCallback.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interactionCallback.doInInteraction(interaction,connectionFactory)).willReturn(new Object());
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionCallback);
-
-		verify(interactionCallback).doInInteraction(interaction,connectionFactory);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputTrueTrueWithCreator()
-			throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordCreator creator = mock(RecordCreator.class);
-
-		Record inputOutputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputOutputRecord, inputOutputRecord)).willReturn(true);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.setOutputRecordCreator(creator);
-		ct.execute(interactionSpec, inputOutputRecord, inputOutputRecord);
-
-		verify(interaction).execute(interactionSpec, inputOutputRecord, inputOutputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputTrueTrue() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		Record inputOutputRecord = mock(Record.class);
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputOutputRecord, inputOutputRecord)).willReturn(true);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		ct.execute(interactionSpec, inputOutputRecord, inputOutputRecord);
-
-		verify(interaction).execute(interactionSpec, inputOutputRecord, inputOutputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testTemplateExecuteInputFalseTrue() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		Record inputOutputRecord = mock(Record.class);
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputOutputRecord)).willReturn(null);
-
-		CciTemplate ct = new CciTemplate(connectionFactory);
-		Record tmpOutputRecord = ct.execute(interactionSpec, inputOutputRecord);
-		assertThat(tmpOutputRecord).isNull();
-
-		verify(interaction).execute(interactionSpec, inputOutputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
deleted file mode 100644
index 30f6febbda29..000000000000
--- a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * 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.
- * 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.jca.cci;
-
-import javax.resource.ResourceException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-import javax.resource.cci.Interaction;
-import javax.resource.cci.InteractionSpec;
-import javax.resource.cci.Record;
-import javax.resource.cci.RecordFactory;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.jca.cci.core.RecordCreator;
-import org.springframework.jca.cci.object.MappingRecordOperation;
-import org.springframework.jca.cci.object.SimpleRecordOperation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Thierry Templier
- * @author Chris Beams
- */
-@Deprecated
-public class EisOperationTests {
-
-	@Test
-	public void testSimpleRecordOperation() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		SimpleRecordOperation query = new SimpleRecordOperation(connectionFactory, interactionSpec);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord)).willReturn(outputRecord);
-
-		query.execute(inputRecord);
-
-		verify(interaction).execute(interactionSpec, inputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testSimpleRecordOperationWithExplicitOutputRecord() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		SimpleRecordOperation operation = new SimpleRecordOperation(connectionFactory, interactionSpec);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-
-		operation.execute(inputRecord, outputRecord);
-
-		verify(interaction).execute(interactionSpec, inputRecord, outputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testSimpleRecordOperationWithInputOutputRecord() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-
-		Record inputOutputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		SimpleRecordOperation query = new SimpleRecordOperation(connectionFactory, interactionSpec);
-
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputOutputRecord, inputOutputRecord)).willReturn(true);
-
-		query.execute(inputOutputRecord, inputOutputRecord);
-
-		verify(interaction).execute(interactionSpec, inputOutputRecord, inputOutputRecord);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testMappingRecordOperation() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		QueryCallDetector callDetector = mock(QueryCallDetector.class);
-
-		MappingRecordOperationImpl query = new MappingRecordOperationImpl(connectionFactory, interactionSpec);
-		query.setCallDetector(callDetector);
-
-		Object inObj = new Object();
-		Object outObj = new Object();
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(callDetector.callCreateInputRecord(recordFactory, inObj)).willReturn(inputRecord);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(interaction.execute(interactionSpec, inputRecord)).willReturn(outputRecord);
-		given(callDetector.callExtractOutputData(outputRecord)).willReturn(outObj);
-
-		assertThat(query.execute(inObj)).isSameAs(outObj);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-	@Test
-	public void testMappingRecordOperationWithOutputRecordCreator() throws ResourceException {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
-		Interaction interaction = mock(Interaction.class);
-		RecordFactory recordFactory = mock(RecordFactory.class);
-
-		Record inputRecord = mock(Record.class);
-		Record outputRecord = mock(Record.class);
-
-		RecordCreator outputCreator = mock(RecordCreator.class);
-
-		InteractionSpec interactionSpec = mock(InteractionSpec.class);
-
-		QueryCallDetector callDetector = mock(QueryCallDetector.class);
-
-		MappingRecordOperationImpl query = new MappingRecordOperationImpl(connectionFactory, interactionSpec);
-		query.setOutputRecordCreator(outputCreator);
-		query.setCallDetector(callDetector);
-
-		Object inObj = new Object();
-		Object outObj = new Object();
-
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(callDetector.callCreateInputRecord(recordFactory, inObj)).willReturn(inputRecord);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.createInteraction()).willReturn(interaction);
-		given(connectionFactory.getRecordFactory()).willReturn(recordFactory);
-		given(outputCreator.createRecord(recordFactory)).willReturn(outputRecord);
-		given(interaction.execute(interactionSpec, inputRecord, outputRecord)).willReturn(true);
-		given(callDetector.callExtractOutputData(outputRecord)).willReturn(outObj);
-
-		assertThat(query.execute(inObj)).isSameAs(outObj);
-		verify(interaction).close();
-		verify(connection).close();
-	}
-
-
-	private class MappingRecordOperationImpl extends MappingRecordOperation {
-
-		private QueryCallDetector callDetector;
-
-		public MappingRecordOperationImpl(ConnectionFactory connectionFactory, InteractionSpec interactionSpec) {
-			super(connectionFactory, interactionSpec);
-		}
-
-		public void setCallDetector(QueryCallDetector callDetector) {
-			this.callDetector = callDetector;
-		}
-
-		@Override
-		protected Record createInputRecord(RecordFactory recordFactory, Object inputObject) {
-			return this.callDetector.callCreateInputRecord(recordFactory, inputObject);
-		}
-
-		@Override
-		protected Object extractOutputData(Record outputRecord) throws ResourceException {
-			return this.callDetector.callExtractOutputData(outputRecord);
-		}
-	}
-
-
-	private interface QueryCallDetector {
-
-		Record callCreateInputRecord(RecordFactory recordFactory, Object inputObject);
-
-		Object callExtractOutputData(Record outputRecord);
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java b/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
index 37511b7dfaae..0ab4b95edda6 100644
--- a/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/support/LocalConnectionFactoryBeanTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.jca.support;
 
-import javax.resource.spi.ConnectionManager;
-import javax.resource.spi.ManagedConnectionFactory;
-
+import jakarta.resource.spi.ConnectionManager;
+import jakarta.resource.spi.ManagedConnectionFactory;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
index 2319d34261fc..611792ba826c 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@
 
 package org.springframework.transaction;
 
-import javax.transaction.Status;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
+import jakarta.transaction.Status;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
index 8666e6155bf2..84955e4cdeab 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,15 @@
 
 package org.springframework.transaction;
 
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
index 2adbfa549bce..0b45ade6c55c 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
@@ -16,15 +16,16 @@
 
 package org.springframework.transaction;
 
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
 import javax.transaction.xa.XAResource;
 
+import jakarta.transaction.Status;
+import jakarta.transaction.Synchronization;
+
 /**
  * @author Juergen Hoeller
  * @since 31.08.2004
  */
-public class MockJtaTransaction implements javax.transaction.Transaction {
+public class MockJtaTransaction implements jakarta.transaction.Transaction {
 
 	private Synchronization synchronization;
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
index d94dc4bf495d..aa02845750a2 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
@@ -22,10 +22,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
 
-import javax.ejb.TransactionAttributeType;
-
 import groovy.lang.GroovyObject;
 import groovy.lang.MetaClass;
+import jakarta.ejb.TransactionAttributeType;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.Advised;
@@ -745,7 +744,7 @@ static class Ejb3AnnotatedBean1 implements ITestBean1 {
 		private int age;
 
 		@Override
-		@javax.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS)
+		@jakarta.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS)
 		public String getName() {
 			return name;
 		}
@@ -756,7 +755,7 @@ public void setName(String name) {
 		}
 
 		@Override
-		@javax.ejb.TransactionAttribute
+		@jakarta.ejb.TransactionAttribute
 		public int getAge() {
 			return age;
 		}
@@ -768,7 +767,7 @@ public void setAge(int age) {
 	}
 
 
-	@javax.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS)
+	@jakarta.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS)
 	static class Ejb3AnnotatedBean2 implements ITestBean1 {
 
 		private String name;
@@ -786,7 +785,7 @@ public void setName(String name) {
 		}
 
 		@Override
-		@javax.ejb.TransactionAttribute
+		@jakarta.ejb.TransactionAttribute
 		public int getAge() {
 			return age;
 		}
@@ -798,10 +797,10 @@ public void setAge(int age) {
 	}
 
 
-	@javax.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS)
+	@jakarta.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS)
 	interface ITestEjb {
 
-		@javax.ejb.TransactionAttribute
+		@jakarta.ejb.TransactionAttribute
 		int getAge();
 
 		void setAge(int age);
@@ -847,7 +846,7 @@ static class JtaAnnotatedBean1 implements ITestBean1 {
 		private int age;
 
 		@Override
-		@javax.transaction.Transactional(javax.transaction.Transactional.TxType.SUPPORTS)
+		@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.SUPPORTS)
 		public String getName() {
 			return name;
 		}
@@ -858,7 +857,7 @@ public void setName(String name) {
 		}
 
 		@Override
-		@javax.transaction.Transactional
+		@jakarta.transaction.Transactional
 		public int getAge() {
 			return age;
 		}
@@ -870,7 +869,7 @@ public void setAge(int age) {
 	}
 
 
-	@javax.transaction.Transactional(javax.transaction.Transactional.TxType.SUPPORTS)
+	@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.SUPPORTS)
 	static class JtaAnnotatedBean2 implements ITestBean1 {
 
 		private String name;
@@ -888,7 +887,7 @@ public void setName(String name) {
 		}
 
 		@Override
-		@javax.transaction.Transactional
+		@jakarta.transaction.Transactional
 		public int getAge() {
 			return age;
 		}
@@ -900,10 +899,10 @@ public void setAge(int age) {
 	}
 
 
-	@javax.transaction.Transactional(javax.transaction.Transactional.TxType.SUPPORTS)
+	@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.SUPPORTS)
 	interface ITestJta {
 
-		@javax.transaction.Transactional
+		@jakarta.transaction.Transactional
 		int getAge();
 
 		void setAge(int age);
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
deleted file mode 100644
index 05c80273d3ba..000000000000
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.
- * 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.transaction.jta;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Synchronization;
-
-import com.ibm.wsspi.uow.UOWAction;
-import com.ibm.wsspi.uow.UOWActionException;
-import com.ibm.wsspi.uow.UOWException;
-import com.ibm.wsspi.uow.UOWManager;
-
-/**
- * @author Juergen Hoeller
- */
-public class MockUOWManager implements UOWManager {
-
-	private int type = UOW_TYPE_GLOBAL_TRANSACTION;
-
-	private boolean joined;
-
-	private int timeout;
-
-	private boolean rollbackOnly;
-
-	private int status = UOW_STATUS_NONE;
-
-	private final Map<Object, Object> resources = new HashMap<>();
-
-	private final List<Synchronization> synchronizations = new ArrayList<>();
-
-
-	@Override
-	public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWActionException, UOWException {
-		this.type = type;
-		this.joined = join;
-		try {
-			this.status = UOW_STATUS_ACTIVE;
-			action.run();
-			this.status = (this.rollbackOnly ? UOW_STATUS_ROLLEDBACK : UOW_STATUS_COMMITTED);
-		}
-		catch (Error | RuntimeException ex) {
-			this.status = UOW_STATUS_ROLLEDBACK;
-			throw ex;
-		}
-		catch (Exception ex) {
-			this.status = UOW_STATUS_ROLLEDBACK;
-			throw new UOWActionException(ex);
-		}
-	}
-
-	@Override
-	public int getUOWType() {
-		return this.type;
-	}
-
-	public boolean getJoined() {
-		return this.joined;
-	}
-
-	@Override
-	public long getLocalUOWId() {
-		return 0;
-	}
-
-	@Override
-	public void setUOWTimeout(int uowType, int timeout) {
-		this.timeout = timeout;
-	}
-
-	@Override
-	public int getUOWTimeout() {
-		return this.timeout;
-	}
-
-	@Override
-	public void setRollbackOnly() {
-		this.rollbackOnly = true;
-	}
-
-	@Override
-	public boolean getRollbackOnly() {
-		return this.rollbackOnly;
-	}
-
-	public void setUOWStatus(int status) {
-		this.status = status;
-	}
-
-	@Override
-	public int getUOWStatus() {
-		return this.status;
-	}
-
-	@Override
-	public void putResource(Object key, Object value) {
-		this.resources.put(key, value);
-	}
-
-	@Override
-	public Object getResource(Object key) throws NullPointerException {
-		return this.resources.get(key);
-	}
-
-	@Override
-	public void registerInterposedSynchronization(Synchronization sync) {
-		this.synchronizations.add(sync);
-	}
-
-	public List<Synchronization> getSynchronizations() {
-		return this.synchronizations;
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
deleted file mode 100644
index 06b4675f3a54..000000000000
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * 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.
- * 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.transaction.jta;
-
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.UserTransaction;
-
-import com.ibm.wsspi.uow.UOWAction;
-import com.ibm.wsspi.uow.UOWException;
-import com.ibm.wsspi.uow.UOWManager;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.context.testfixture.jndi.ExpectedLookupTemplate;
-import org.springframework.dao.OptimisticLockingFailureException;
-import org.springframework.transaction.IllegalTransactionStateException;
-import org.springframework.transaction.NestedTransactionNotSupportedException;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.TransactionSystemException;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
-import org.springframework.transaction.support.TransactionCallback;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Juergen Hoeller
- */
-public class WebSphereUowTransactionManagerTests {
-
-	@Test
-	public void uowManagerFoundInJndi() {
-		MockUOWManager manager = new MockUOWManager();
-		ExpectedLookupTemplate jndiTemplate =
-				new ExpectedLookupTemplate(WebSphereUowTransactionManager.DEFAULT_UOW_MANAGER_NAME, manager);
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager();
-		ptm.setJndiTemplate(jndiTemplate);
-		ptm.afterPropertiesSet();
-
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-	@Test
-	public void uowManagerAndUserTransactionFoundInJndi() throws Exception {
-		UserTransaction ut = mock(UserTransaction.class);
-		given(ut.getStatus()).willReturn( Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
-
-		MockUOWManager manager = new MockUOWManager();
-		ExpectedLookupTemplate jndiTemplate = new ExpectedLookupTemplate();
-		jndiTemplate.addObject(WebSphereUowTransactionManager.DEFAULT_USER_TRANSACTION_NAME, ut);
-		jndiTemplate.addObject(WebSphereUowTransactionManager.DEFAULT_UOW_MANAGER_NAME, manager);
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager();
-		ptm.setJndiTemplate(jndiTemplate);
-		ptm.afterPropertiesSet();
-
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		TransactionStatus ts = ptm.getTransaction(definition);
-		ptm.commit(ts);
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isFalse();
-		verify(ut).begin();
-		verify(ut).commit();
-	}
-
-	@Test
-	public void propagationMandatoryFailsInCaseOfNoExistingTransaction() {
-		MockUOWManager manager = new MockUOWManager();
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setPropagationBehavior(TransactionDefinition.PROPAGATION_MANDATORY);
-
-		assertThatExceptionOfType(IllegalTransactionStateException.class).isThrownBy(() ->
-			ptm.execute(definition, new TransactionCallback<String>() {
-				@Override
-				public String doInTransaction(TransactionStatus status) {
-					return "result";
-				}
-			}));
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationSupports() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_SUPPORTS, WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationNotSupported() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_NOT_SUPPORTED, WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationNever() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_NEVER, WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationSupportsAndSynchOnActual() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_SUPPORTS, WebSphereUowTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationNotSupportedAndSynchOnActual() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_NOT_SUPPORTED, WebSphereUowTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationNeverAndSynchOnActual() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_NEVER, WebSphereUowTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationSupportsAndSynchNever() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_SUPPORTS, WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationNotSupportedAndSynchNever() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_NOT_SUPPORTED, WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER);
-	}
-
-	@Test
-	public void newTransactionSynchronizationUsingPropagationNeverAndSynchNever() {
-		doTestNewTransactionSynchronization(
-				TransactionDefinition.PROPAGATION_NEVER, WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER);
-	}
-
-	private void doTestNewTransactionSynchronization(int propagationBehavior, final int synchMode) {
-		MockUOWManager manager = new MockUOWManager();
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		ptm.setTransactionSynchronization(synchMode);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setPropagationBehavior(propagationBehavior);
-		definition.setReadOnly(true);
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				if (synchMode == WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS) {
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-					assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-					assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isTrue();
-				}
-				else {
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-					assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-					assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-				}
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_LOCAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationRequired() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_REQUIRED, WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationRequiresNew() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_REQUIRES_NEW, WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationNested() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_NESTED, WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationRequiredAndSynchOnActual() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_REQUIRED, WebSphereUowTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationRequiresNewAndSynchOnActual() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_REQUIRES_NEW, WebSphereUowTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationNestedAndSynchOnActual() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_NESTED, WebSphereUowTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationRequiredAndSynchNever() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_REQUIRED, WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationRequiresNewAndSynchNever() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_REQUIRES_NEW, WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER);
-	}
-
-	@Test
-	public void newTransactionWithCommitUsingPropagationNestedAndSynchNever() {
-		doTestNewTransactionWithCommit(
-				TransactionDefinition.PROPAGATION_NESTED, WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER);
-	}
-
-	private void doTestNewTransactionWithCommit(int propagationBehavior, final int synchMode) {
-		MockUOWManager manager = new MockUOWManager();
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		ptm.setTransactionSynchronization(synchMode);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setPropagationBehavior(propagationBehavior);
-		definition.setReadOnly(true);
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				if (synchMode != WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER) {
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-					assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-					assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isTrue();
-				}
-				else {
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-					assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-					assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-				}
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-	@Test
-	public void newTransactionWithCommitAndTimeout() {
-		MockUOWManager manager = new MockUOWManager();
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setTimeout(10);
-		definition.setReadOnly(true);
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isTrue();
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(10);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-	@Test
-	public void newTransactionWithCommitException() {
-		final RollbackException rex = new RollbackException();
-		MockUOWManager manager = new MockUOWManager() {
-			@Override
-			public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWException {
-				throw new UOWException(rex);
-			}
-		};
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThatExceptionOfType(TransactionSystemException.class).isThrownBy(() ->
-				ptm.execute(definition, new TransactionCallback<String>() {
-					@Override
-					public String doInTransaction(TransactionStatus status) {
-						assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-						assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-						assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-						return "result";
-					}
-				}))
-			.withCauseInstanceOf(UOWException.class)
-			.satisfies(ex -> {
-				assertThat(ex.getRootCause()).isSameAs(rex);
-				assertThat(ex.getMostSpecificCause()).isSameAs(rex);
-			});
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-	}
-
-	@Test
-	public void newTransactionWithRollback() {
-		MockUOWManager manager = new MockUOWManager();
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThatExceptionOfType(OptimisticLockingFailureException.class).isThrownBy(() ->
-			ptm.execute(definition, new TransactionCallback<String>() {
-				@Override
-				public String doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-					assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-					assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-					throw new OptimisticLockingFailureException("");
-				}
-			}));
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isTrue();
-	}
-
-	@Test
-	public void newTransactionWithRollbackOnly() {
-		MockUOWManager manager = new MockUOWManager();
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-				status.setRollbackOnly();
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isTrue();
-	}
-
-	@Test
-	public void existingNonSpringTransaction() {
-		MockUOWManager manager = new MockUOWManager();
-		manager.setUOWStatus(UOWManager.UOW_STATUS_ACTIVE);
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isTrue();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-	@Test
-	public void propagationNeverFailsInCaseOfExistingTransaction() {
-		MockUOWManager manager = new MockUOWManager();
-		manager.setUOWStatus(UOWManager.UOW_STATUS_ACTIVE);
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER);
-
-		assertThatExceptionOfType(IllegalTransactionStateException.class).isThrownBy(() ->
-			ptm.execute(definition, new TransactionCallback<String>() {
-				@Override
-				public String doInTransaction(TransactionStatus status) {
-					return "result";
-				}
-			}));
-	}
-
-	@Test
-	public void propagationNestedFailsInCaseOfExistingTransaction() {
-		MockUOWManager manager = new MockUOWManager();
-		manager.setUOWStatus(UOWManager.UOW_STATUS_ACTIVE);
-		WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
-
-		assertThatExceptionOfType(NestedTransactionNotSupportedException.class).isThrownBy(() ->
-			ptm.execute(definition, new TransactionCallback<String>() {
-				@Override
-				public String doInTransaction(TransactionStatus status) {
-					return "result";
-				}
-			}));
-	}
-
-	@Test
-	public void existingTransactionWithParticipationUsingPropagationRequired() {
-		doTestExistingTransactionWithParticipation(TransactionDefinition.PROPAGATION_REQUIRED);
-	}
-
-	@Test
-	public void existingTransactionWithParticipationUsingPropagationSupports() {
-		doTestExistingTransactionWithParticipation(TransactionDefinition.PROPAGATION_SUPPORTS);
-	}
-
-	@Test
-	public void existingTransactionWithParticipationUsingPropagationMandatory() {
-		doTestExistingTransactionWithParticipation(TransactionDefinition.PROPAGATION_MANDATORY);
-	}
-
-	private void doTestExistingTransactionWithParticipation(int propagationBehavior) {
-		MockUOWManager manager = new MockUOWManager();
-		final WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		final DefaultTransactionDefinition definition2 = new DefaultTransactionDefinition();
-		definition2.setPropagationBehavior(propagationBehavior);
-		definition2.setReadOnly(true);
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-				assertThat(ptm.execute(definition2, new TransactionCallback<String>() {
-					@Override
-					public String doInTransaction(TransactionStatus status1) {
-						assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-						assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-						assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-						return "result2";
-					}
-				})).isEqualTo("result2");
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		assertThat(manager.getJoined()).isTrue();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-	@Test
-	public void existingTransactionWithSuspensionUsingPropagationRequiresNew() {
-		doTestExistingTransactionWithSuspension(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
-	}
-
-	@Test
-	public void existingTransactionWithSuspensionUsingPropagationNotSupported() {
-		doTestExistingTransactionWithSuspension(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
-	}
-
-	private void doTestExistingTransactionWithSuspension(final int propagationBehavior) {
-		MockUOWManager manager = new MockUOWManager();
-		final WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		final DefaultTransactionDefinition definition2 = new DefaultTransactionDefinition();
-		definition2.setPropagationBehavior(propagationBehavior);
-		definition2.setReadOnly(true);
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-				assertThat(ptm.execute(definition2, new TransactionCallback<String>() {
-					@Override
-					public String doInTransaction(TransactionStatus status1) {
-						assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-						assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isEqualTo((propagationBehavior == TransactionDefinition.PROPAGATION_REQUIRES_NEW));
-						assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isTrue();
-						return "result2";
-					}
-				})).isEqualTo("result2");
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		if (propagationBehavior == TransactionDefinition.PROPAGATION_REQUIRES_NEW) {
-			assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_GLOBAL_TRANSACTION);
-		}
-		else {
-			assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_LOCAL_TRANSACTION);
-		}
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-	@Test
-	public void existingTransactionUsingPropagationNotSupported() {
-		MockUOWManager manager = new MockUOWManager();
-		final WebSphereUowTransactionManager ptm = new WebSphereUowTransactionManager(manager);
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		final DefaultTransactionDefinition definition2 = new DefaultTransactionDefinition();
-		definition2.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
-		definition2.setReadOnly(true);
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(ptm.execute(definition, new TransactionCallback<String>() {
-			@Override
-			public String doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isTrue();
-				assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-				assertThat(ptm.execute(definition2, new TransactionCallback<String>() {
-					@Override
-					public String doInTransaction(TransactionStatus status1) {
-						assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-						assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-						assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isTrue();
-						return "result2";
-					}
-				})).isEqualTo("result2");
-				return "result";
-			}
-		})).isEqualTo("result");
-
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isActualTransactionActive()).isFalse();
-		assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse();
-
-		assertThat(manager.getUOWTimeout()).isEqualTo(0);
-		assertThat(manager.getUOWType()).isEqualTo(UOWManager.UOW_TYPE_LOCAL_TRANSACTION);
-		assertThat(manager.getJoined()).isFalse();
-		assertThat(manager.getRollbackOnly()).isFalse();
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
index d5390e33cb0a..296e08a6cacf 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.transaction.support;
 
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.UserTransaction;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.testfixture.jndi.SimpleNamingContextBuilder;
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index 716ecb4cecf3..f0e341db5d0a 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -10,16 +10,14 @@ dependencies {
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
-	optional("javax.servlet:javax.servlet-api") // Servlet 4 for mapping type
-	optional("javax.servlet.jsp:javax.servlet.jsp-api")
-	optional("javax.el:javax.el-api")
-	optional("javax.faces:javax.faces-api")
-	optional("javax.json.bind:javax.json.bind-api")
-	optional("javax.mail:javax.mail-api")
-	optional("javax.validation:validation-api")
-	optional("javax.xml.bind:jaxb-api")
-	optional("javax.xml.ws:jaxws-api")
-	optional("org.glassfish.main:javax.jws")
+	optional("jakarta.servlet:jakarta.servlet-api")
+	optional("jakarta.servlet.jsp:jakarta.servlet.jsp-api")
+	optional("jakarta.el:jakarta.el-api")
+	optional("jakarta.faces:jakarta.faces-api")
+	optional("jakarta.json.bind:jakarta.json.bind-api")
+	optional("jakarta.mail:jakarta.mail-api")
+	optional("jakarta.validation:jakarta.validation-api")
+	optional("jakarta.xml.bind:jakarta.xml.bind-api")
 	optional("io.reactivex.rxjava3:rxjava")
 	optional("io.netty:netty-buffer")
 	optional("io.netty:netty-handler")
@@ -29,10 +27,10 @@ dependencies {
 	optional("io.undertow:undertow-core")
 	optional("org.apache.tomcat.embed:tomcat-embed-core")
 	optional("org.eclipse.jetty:jetty-server") {
-		exclude group: "javax.servlet", module: "javax.servlet-api"
+		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
 	optional("org.eclipse.jetty:jetty-servlet") {
-		exclude group: "javax.servlet", module: "javax.servlet-api"
+		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
 	optional("org.eclipse.jetty:jetty-reactive-httpclient")
 	optional('org.apache.httpcomponents.client5:httpclient5')
@@ -40,8 +38,6 @@ dependencies {
 	optional("com.squareup.okhttp3:okhttp")
 	optional("org.apache.httpcomponents:httpclient")
 	optional("org.apache.httpcomponents:httpasyncclient")
-	optional("commons-fileupload:commons-fileupload")
-	optional("org.synchronoss.cloud:nio-multipart-parser")
 	optional("com.fasterxml.woodstox:woodstox-core")
 	optional("com.fasterxml:aalto-xml")
 	optional("com.fasterxml.jackson.core:jackson-databind")
@@ -52,7 +48,6 @@ dependencies {
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("com.googlecode.protobuf-java-format:protobuf-java-format")
 	optional("com.rometools:rome")
-	optional("com.caucho:hessian")
 	optional("org.codehaus.groovy:groovy")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
@@ -61,9 +56,7 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("io.projectreactor:reactor-test")
-	testImplementation("org.apache.taglibs:taglibs-standard-jstlel")
 	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
-	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-joda")
 	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 	testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 	testImplementation("org.apache.tomcat:tomcat-util")
@@ -76,16 +69,15 @@ dependencies {
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
 	testImplementation("io.projectreactor.tools:blockhound")
-	testRuntimeOnly("com.sun.mail:javax.mail")
+	testRuntimeOnly("com.sun.mail:jakarta.mail")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
-	testRuntimeOnly("javax.json:javax.json-api")
-	testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
-	testFixturesApi("javax.servlet:javax.servlet-api")
+	testRuntimeOnly("jakarta.json:jakarta.json-api")
+	testRuntimeOnly("org.eclipse:yasson")
+	testFixturesApi("jakarta.servlet:jakarta.servlet-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-params")
 	testFixturesImplementation("io.projectreactor:reactor-test")
-	testFixturesImplementation("org.apache.taglibs:taglibs-standard-jstlel")
 	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.bouncycastle:bcpkix-jdk15on") {
 		because("needed by Netty's SelfSignedCertificate on JDK 15+")
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
index 8aabf8957927..80ad419ef499 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
@@ -54,7 +54,6 @@ class JettyClientHttpRequest extends AbstractClientHttpRequest {
 	private final ReactiveRequest.Builder builder;
 
 
-
 	public JettyClientHttpRequest(Request jettyRequest, DataBufferFactory bufferFactory) {
 		this.jettyRequest = jettyRequest;
 		this.bufferFactory = bufferFactory;
@@ -137,10 +136,12 @@ protected void applyCookies() {
 	@Override
 	protected void applyHeaders() {
 		HttpHeaders headers = getHeaders();
-		headers.forEach((key, value) -> value.forEach(v -> this.jettyRequest.header(key, v)));
-		if (!headers.containsKey(HttpHeaders.ACCEPT)) {
-			this.jettyRequest.header(HttpHeaders.ACCEPT, "*/*");
-		}
+		this.jettyRequest.headers(fields -> {
+			headers.forEach((key, value) -> value.forEach(v -> fields.add(key, v)));
+			if (!headers.containsKey(HttpHeaders.ACCEPT)) {
+				fields.add(HttpHeaders.ACCEPT, "*/*");
+			}
+		});
 	}
 
 	public ReactiveRequest toReactiveRequest() {
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java
index 5d88c83ddf67..22cde72ac286 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java
@@ -16,13 +16,11 @@
 
 package org.springframework.http.client.reactive;
 
-import java.lang.reflect.Method;
 import java.net.HttpCookie;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.reactive.client.ReactiveResponse;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
@@ -32,11 +30,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseCookie;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * {@link ClientHttpResponse} implementation for the Jetty ReactiveStreams HTTP client.
@@ -50,10 +46,6 @@ class JettyClientHttpResponse implements ClientHttpResponse {
 
 	private static final Pattern SAMESITE_PATTERN = Pattern.compile("(?i).*SameSite=(Strict|Lax|None).*");
 
-	private static final ClassLoader classLoader = JettyClientHttpResponse.class.getClassLoader();
-
-	private static final boolean jetty10Present;
-
 
 	private final ReactiveResponse reactiveResponse;
 
@@ -62,25 +54,11 @@ class JettyClientHttpResponse implements ClientHttpResponse {
 	private final HttpHeaders headers;
 
 
-	static {
-		try {
-			Class<?> httpFieldsClass = classLoader.loadClass("org.eclipse.jetty.http.HttpFields");
-			jetty10Present = httpFieldsClass.isInterface();
-		}
-		catch (ClassNotFoundException ex) {
-			throw new IllegalStateException("No compatible Jetty version found", ex);
-		}
-	}
-
-
 	public JettyClientHttpResponse(ReactiveResponse reactiveResponse, Publisher<DataBuffer> content) {
 		this.reactiveResponse = reactiveResponse;
 		this.content = Flux.from(content);
 
-		MultiValueMap<String, String> headers = (jetty10Present ?
-				Jetty10HttpFieldsHelper.getHttpHeaders(reactiveResponse) :
-				new JettyHeadersAdapter(reactiveResponse.getHeaders()));
-
+		MultiValueMap<String, String> headers = new JettyHeadersAdapter(reactiveResponse.getHeaders());
 		this.headers = HttpHeaders.readOnlyHttpHeaders(headers);
 	}
 
@@ -132,40 +110,4 @@ public HttpHeaders getHeaders() {
 		return this.headers;
 	}
 
-
-	private static class Jetty10HttpFieldsHelper {
-
-		private static final Method getHeadersMethod;
-
-		private static final Method getNameMethod;
-
-		private static final Method getValueMethod;
-
-		static {
-			try {
-				getHeadersMethod = Response.class.getMethod("getHeaders");
-				Class<?> type = classLoader.loadClass("org.eclipse.jetty.http.HttpField");
-				getNameMethod = type.getMethod("getName");
-				getValueMethod = type.getMethod("getValue");
-			}
-			catch (ClassNotFoundException | NoSuchMethodException ex) {
-				throw new IllegalStateException("No compatible Jetty version found", ex);
-			}
-		}
-
-		public static HttpHeaders getHttpHeaders(ReactiveResponse response) {
-			HttpHeaders headers = new HttpHeaders();
-			Iterable<?> iterator = (Iterable<?>)
-					ReflectionUtils.invokeMethod(getHeadersMethod, response.getResponse());
-			Assert.notNull(iterator, "Iterator must not be null");
-			for (Object field : iterator) {
-				String name = (String) ReflectionUtils.invokeMethod(getNameMethod, field);
-				Assert.notNull(name, "Header name must not be null");
-				String value = (String) ReflectionUtils.invokeMethod(getValueMethod, field);
-				headers.add(name, value);
-			}
-			return headers;
-		}
-	}
-
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java
index f44362c9c3a2..6d42dc76204e 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java
@@ -39,6 +39,7 @@
  * <p>There is a duplicate of this class in the server package!
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 5.3
  */
 class JettyHeadersAdapter implements MultiValueMap<String, String> {
@@ -58,7 +59,10 @@ public String getFirst(String key) {
 
 	@Override
 	public void add(String key, @Nullable String value) {
-		this.headers.add(key, value);
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
+		((HttpFields.Mutable) this.headers).add(key, value);
 	}
 
 	@Override
@@ -73,7 +77,10 @@ public void addAll(MultiValueMap<String, String> values) {
 
 	@Override
 	public void set(String key, @Nullable String value) {
-		this.headers.put(key, value);
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
+		((HttpFields.Mutable) this.headers).put(key, value);
 	}
 
 	@Override
@@ -105,7 +112,7 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.headers.containsKey((String) key));
+		return (key instanceof String && this.headers.contains((String) key));
 	}
 
 	@Override
@@ -126,17 +133,23 @@ public List<String> get(Object key) {
 	@Nullable
 	@Override
 	public List<String> put(String key, List<String> value) {
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
 		List<String> oldValues = get(key);
-		this.headers.put(key, value);
+		((HttpFields.Mutable) this.headers).put(key, value);
 		return oldValues;
 	}
 
 	@Nullable
 	@Override
 	public List<String> remove(Object key) {
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
 		if (key instanceof String) {
 			List<String> oldValues = get(key);
-			this.headers.remove((String) key);
+			((HttpFields.Mutable) this.headers).remove((String) key);
 			return oldValues;
 		}
 		return null;
@@ -149,7 +162,10 @@ public void putAll(Map<? extends String, ? extends List<String>> map) {
 
 	@Override
 	public void clear() {
-		this.headers.clear();
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
+		((HttpFields.Mutable) this.headers).clear();
 	}
 
 	@Override
@@ -221,8 +237,11 @@ public List<String> getValue() {
 
 		@Override
 		public List<String> setValue(List<String> value) {
+			if (!(headers instanceof HttpFields.Mutable)) {
+				throw new IllegalStateException("Immutable headers");
+			}
 			List<String> previousValues = headers.getValuesList(this.key);
-			headers.put(this.key, value);
+			((HttpFields.Mutable) headers).put(this.key, value);
 			return previousValues;
 		}
 	}
@@ -266,13 +285,16 @@ public String next() {
 
 		@Override
 		public void remove() {
+			if (!(headers instanceof HttpFields.Mutable)) {
+				throw new IllegalStateException("Immutable headers");
+			}
 			if (this.currentName == null) {
 				throw new IllegalStateException("No current Header in iterator");
 			}
-			if (!headers.containsKey(this.currentName)) {
+			if (!headers.contains(this.currentName)) {
 				throw new IllegalStateException("Header not present: " + this.currentName);
 			}
-			headers.remove(this.currentName);
+			((HttpFields.Mutable) headers).remove(this.currentName);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java b/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java
index 4bbefc8c939c..c6f9222a19c0 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/ServerCodecConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,13 +84,6 @@ interface ServerDefaultCodecs extends DefaultCodecs {
 
 		/**
 		 * Configure the {@code HttpMessageReader} to use for multipart requests.
-		 * <p>By default, if
-		 * <a href="https://github.com/synchronoss/nio-multipart">Synchronoss NIO Multipart</a>
-		 * is present, this is set to
-		 * {@link org.springframework.http.codec.multipart.MultipartHttpMessageReader
-		 * MultipartHttpMessageReader} created with an instance of
-		 * {@link org.springframework.http.codec.multipart.SynchronossPartHttpMessageReader
-		 * SynchronossPartHttpMessageReader}.
 		 * <p>Note that {@link #maxInMemorySize(int)} and/or
 		 * {@link #enableLoggingRequestDetails(boolean)}, if configured, will be
 		 * applied to the given reader, if applicable.
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
deleted file mode 100644
index 032b787d887b..000000000000
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
+++ /dev/null
@@ -1,597 +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.http.codec.multipart;
-
-import java.io.IOException;
-import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.OpenOption;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-
-import org.synchronoss.cloud.nio.multipart.DefaultPartBodyStreamStorageFactory;
-import org.synchronoss.cloud.nio.multipart.Multipart;
-import org.synchronoss.cloud.nio.multipart.MultipartContext;
-import org.synchronoss.cloud.nio.multipart.MultipartUtils;
-import org.synchronoss.cloud.nio.multipart.NioMultipartParser;
-import org.synchronoss.cloud.nio.multipart.NioMultipartParserListener;
-import org.synchronoss.cloud.nio.multipart.PartBodyStreamStorageFactory;
-import org.synchronoss.cloud.nio.stream.storage.StreamStorage;
-import reactor.core.publisher.BaseSubscriber;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.FluxSink;
-import reactor.core.publisher.Mono;
-import reactor.core.publisher.SignalType;
-import reactor.core.scheduler.Schedulers;
-
-import org.springframework.core.ResolvableType;
-import org.springframework.core.codec.DecodingException;
-import org.springframework.core.codec.Hints;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferLimitException;
-import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.core.io.buffer.DefaultDataBufferFactory;
-import org.springframework.core.log.LogFormatUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ReactiveHttpInputMessage;
-import org.springframework.http.codec.HttpMessageReader;
-import org.springframework.http.codec.LoggingCodecSupport;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * {@code HttpMessageReader} for parsing {@code "multipart/form-data"} requests
- * to a stream of {@link Part}'s using the Synchronoss NIO Multipart library.
- *
- * <p>This reader can be provided to {@link MultipartHttpMessageReader} in order
- * to aggregate all parts into a Map.
- *
- * @author Sebastien Deleuze
- * @author Rossen Stoyanchev
- * @author Arjen Poutsma
- * @author Brian Clozel
- * @since 5.0
- * @see <a href="https://github.com/synchronoss/nio-multipart">Synchronoss NIO Multipart</a>
- * @see MultipartHttpMessageReader
- */
-public class SynchronossPartHttpMessageReader extends LoggingCodecSupport implements HttpMessageReader<Part> {
-
-	private static final String FILE_STORAGE_DIRECTORY_PREFIX = "synchronoss-file-upload-";
-
-	private int maxInMemorySize = 256 * 1024;
-
-	private long maxDiskUsagePerPart = -1;
-
-	private int maxParts = -1;
-
-	private final AtomicReference<Path> fileStorageDirectory = new AtomicReference<>();
-
-
-	/**
-	 * Configure the maximum amount of memory that is allowed to use per part.
-	 * When the limit is exceeded:
-	 * <ul>
-	 * <li>file parts are written to a temporary file.
-	 * <li>non-file parts are rejected with {@link DataBufferLimitException}.
-	 * </ul>
-	 * <p>By default this is set to 256K.
-	 * @param byteCount the in-memory limit in bytes; if set to -1 this limit is
-	 * not enforced, and all parts may be written to disk and are limited only
-	 * by the {@link #setMaxDiskUsagePerPart(long) maxDiskUsagePerPart} property.
-	 * @since 5.1.11
-	 */
-	public void setMaxInMemorySize(int byteCount) {
-		this.maxInMemorySize = byteCount;
-	}
-
-	/**
-	 * Get the {@link #setMaxInMemorySize configured} maximum in-memory size.
-	 * @since 5.1.11
-	 */
-	public int getMaxInMemorySize() {
-		return this.maxInMemorySize;
-	}
-
-	/**
-	 * Configure the maximum amount of disk space allowed for file parts.
-	 * <p>By default this is set to -1.
-	 * @param maxDiskUsagePerPart the disk limit in bytes, or -1 for unlimited
-	 * @since 5.1.11
-	 */
-	public void setMaxDiskUsagePerPart(long maxDiskUsagePerPart) {
-		this.maxDiskUsagePerPart = maxDiskUsagePerPart;
-	}
-
-	/**
-	 * Get the {@link #setMaxDiskUsagePerPart configured} maximum disk usage.
-	 * @since 5.1.11
-	 */
-	public long getMaxDiskUsagePerPart() {
-		return this.maxDiskUsagePerPart;
-	}
-
-	/**
-	 * Specify the maximum number of parts allowed in a given multipart request.
-	 * @since 5.1.11
-	 */
-	public void setMaxParts(int maxParts) {
-		this.maxParts = maxParts;
-	}
-
-	/**
-	 * Return the {@link #setMaxParts configured} limit on the number of parts.
-	 * @since 5.1.11
-	 */
-	public int getMaxParts() {
-		return this.maxParts;
-	}
-
-	/**
-	 * Set the directory used to store parts larger than
-	 * {@link #setMaxInMemorySize(int) maxInMemorySize}. By default, a new
-	 * temporary directory is created.
-	 * @throws IOException if an I/O error occurs, or the parent directory
-	 * does not exist
-	 * @since 5.3.7
-	 */
-	public void setFileStorageDirectory(Path fileStorageDirectory) throws IOException {
-		Assert.notNull(fileStorageDirectory, "FileStorageDirectory must not be null");
-		if (!Files.exists(fileStorageDirectory)) {
-			Files.createDirectory(fileStorageDirectory);
-		}
-		this.fileStorageDirectory.set(fileStorageDirectory);
-	}
-
-
-	@Override
-	public List<MediaType> getReadableMediaTypes() {
-		return MultipartHttpMessageReader.MIME_TYPES;
-	}
-
-	@Override
-	public boolean canRead(ResolvableType elementType, @Nullable MediaType mediaType) {
-		if (Part.class.equals(elementType.toClass())) {
-			if (mediaType == null) {
-				return true;
-			}
-			for (MediaType supportedMediaType : getReadableMediaTypes()) {
-				if (supportedMediaType.isCompatibleWith(mediaType)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public Flux<Part> read(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
-		return getFileStorageDirectory().flatMapMany(directory ->
-				Flux.create(new SynchronossPartGenerator(message, directory))
-						.doOnNext(part -> {
-							if (!Hints.isLoggingSuppressed(hints)) {
-								LogFormatUtils.traceDebug(logger, traceOn -> Hints.getLogPrefix(hints) + "Parsed " +
-										(isEnableLoggingRequestDetails() ?
-												LogFormatUtils.formatValue(part, !traceOn) :
-												"parts '" + part.name() + "' (content masked)"));
-							}
-						}));
-	}
-
-	@Override
-	public Mono<Part> readMono(ResolvableType elementType, ReactiveHttpInputMessage message, Map<String, Object> hints) {
-		return Mono.error(new UnsupportedOperationException("Cannot read multipart request body into single Part"));
-	}
-
-	private Mono<Path> getFileStorageDirectory() {
-		return Mono.defer(() -> {
-			Path directory = this.fileStorageDirectory.get();
-			if (directory != null) {
-				return Mono.just(directory);
-			}
-			else {
-				return Mono.fromCallable(() -> {
-					Path tempDirectory = Files.createTempDirectory(FILE_STORAGE_DIRECTORY_PREFIX);
-					if (this.fileStorageDirectory.compareAndSet(null, tempDirectory)) {
-						return tempDirectory;
-					}
-					else {
-						try {
-							Files.delete(tempDirectory);
-						}
-						catch (IOException ignored) {
-						}
-						return this.fileStorageDirectory.get();
-					}
-				}).subscribeOn(Schedulers.boundedElastic());
-			}
-		});
-	}
-
-
-	/**
-	 * Subscribe to the input stream and feed the Synchronoss parser. Then listen
-	 * for parser output, creating parts, and pushing them into the FluxSink.
-	 */
-	private class SynchronossPartGenerator extends BaseSubscriber<DataBuffer> implements Consumer<FluxSink<Part>> {
-
-		private final ReactiveHttpInputMessage inputMessage;
-
-		private final LimitedPartBodyStreamStorageFactory storageFactory = new LimitedPartBodyStreamStorageFactory();
-
-		private final Path fileStorageDirectory;
-
-		@Nullable
-		private NioMultipartParserListener listener;
-
-		@Nullable
-		private NioMultipartParser parser;
-
-		public SynchronossPartGenerator(ReactiveHttpInputMessage inputMessage, Path fileStorageDirectory) {
-			this.inputMessage = inputMessage;
-			this.fileStorageDirectory = fileStorageDirectory;
-		}
-
-		@Override
-		public void accept(FluxSink<Part> sink) {
-			HttpHeaders headers = this.inputMessage.getHeaders();
-			MediaType mediaType = headers.getContentType();
-			Assert.state(mediaType != null, "No content type set");
-
-			int length = getContentLength(headers);
-			Charset charset = Optional.ofNullable(mediaType.getCharset()).orElse(StandardCharsets.UTF_8);
-			MultipartContext context = new MultipartContext(mediaType.toString(), length, charset.name());
-
-			this.listener = new FluxSinkAdapterListener(sink, context, this.storageFactory);
-
-			this.parser = Multipart
-					.multipart(context)
-					.saveTemporaryFilesTo(this.fileStorageDirectory.toString())
-					.usePartBodyStreamStorageFactory(this.storageFactory)
-					.forNIO(this.listener);
-
-			this.inputMessage.getBody().subscribe(this);
-		}
-
-		@Override
-		protected void hookOnNext(DataBuffer buffer) {
-			Assert.state(this.parser != null && this.listener != null, "Not initialized yet");
-
-			int size = buffer.readableByteCount();
-			this.storageFactory.increaseByteCount(size);
-			byte[] resultBytes = new byte[size];
-			buffer.read(resultBytes);
-
-			try {
-				this.parser.write(resultBytes);
-			}
-			catch (IOException ex) {
-				cancel();
-				int index = this.storageFactory.getCurrentPartIndex();
-				this.listener.onError("Parser error for part [" + index + "]", ex);
-			}
-			finally {
-				DataBufferUtils.release(buffer);
-			}
-		}
-
-		@Override
-		protected void hookOnError(Throwable ex) {
-			if (this.listener != null) {
-				int index = this.storageFactory.getCurrentPartIndex();
-				this.listener.onError("Failure while parsing part[" + index + "]", ex);
-			}
-		}
-
-		@Override
-		protected void hookOnComplete() {
-			if (this.listener != null) {
-				this.listener.onAllPartsFinished();
-			}
-		}
-
-		@Override
-		protected void hookFinally(SignalType type) {
-			try {
-				if (this.parser != null) {
-					this.parser.close();
-				}
-			}
-			catch (IOException ex) {
-				// ignore
-			}
-		}
-
-		private int getContentLength(HttpHeaders headers) {
-			// Until this is fixed https://github.com/synchronoss/nio-multipart/issues/10
-			long length = headers.getContentLength();
-			return (int) length == length ? (int) length : -1;
-		}
-	}
-
-
-	private class LimitedPartBodyStreamStorageFactory implements PartBodyStreamStorageFactory {
-
-		private final PartBodyStreamStorageFactory storageFactory = (maxInMemorySize > 0 ?
-				new DefaultPartBodyStreamStorageFactory(maxInMemorySize) :
-				new DefaultPartBodyStreamStorageFactory());
-
-		private int index = 1;
-
-		private boolean isFilePart;
-
-		private long partSize;
-
-		public int getCurrentPartIndex() {
-			return this.index;
-		}
-
-		@Override
-		public StreamStorage newStreamStorageForPartBody(Map<String, List<String>> headers, int index) {
-			this.index = index;
-			this.isFilePart = (MultipartUtils.getFileName(headers) != null);
-			this.partSize = 0;
-			if (maxParts > 0 && index > maxParts) {
-				throw new DecodingException("Too many parts: Part[" + index + "] but maxParts=" + maxParts);
-			}
-			return this.storageFactory.newStreamStorageForPartBody(headers, index);
-		}
-
-		public void increaseByteCount(long byteCount) {
-			this.partSize += byteCount;
-			if (maxInMemorySize > 0 && !this.isFilePart && this.partSize >= maxInMemorySize) {
-				throw new DataBufferLimitException("Part[" + this.index + "] " +
-						"exceeded the in-memory limit of " + maxInMemorySize + " bytes");
-			}
-			if (maxDiskUsagePerPart > 0 && this.isFilePart && this.partSize > maxDiskUsagePerPart) {
-				throw new DecodingException("Part[" + this.index + "] " +
-						"exceeded the disk usage limit of " + maxDiskUsagePerPart + " bytes");
-			}
-		}
-
-		public void partFinished() {
-			this.index++;
-			this.isFilePart = false;
-			this.partSize = 0;
-		}
-	}
-
-
-	/**
-	 * Listen for parser output and adapt to {@code Flux<Sink<Part>>}.
-	 */
-	private static class FluxSinkAdapterListener implements NioMultipartParserListener {
-
-		private final FluxSink<Part> sink;
-
-		private final MultipartContext context;
-
-		private final LimitedPartBodyStreamStorageFactory storageFactory;
-
-		private final AtomicInteger terminated = new AtomicInteger();
-
-		FluxSinkAdapterListener(
-				FluxSink<Part> sink, MultipartContext context, LimitedPartBodyStreamStorageFactory factory) {
-
-			this.sink = sink;
-			this.context = context;
-			this.storageFactory = factory;
-		}
-
-		@Override
-		public void onPartFinished(StreamStorage storage, Map<String, List<String>> headers) {
-			HttpHeaders httpHeaders = new HttpHeaders();
-			httpHeaders.putAll(headers);
-			this.storageFactory.partFinished();
-			this.sink.next(createPart(storage, httpHeaders));
-		}
-
-		private Part createPart(StreamStorage storage, HttpHeaders httpHeaders) {
-			String filename = MultipartUtils.getFileName(httpHeaders);
-			if (filename != null) {
-				return new SynchronossFilePart(httpHeaders, filename, storage);
-			}
-			else if (MultipartUtils.isFormField(httpHeaders, this.context)) {
-				String value = MultipartUtils.readFormParameterValue(storage, httpHeaders);
-				return new SynchronossFormFieldPart(httpHeaders, value);
-			}
-			else {
-				return new SynchronossPart(httpHeaders, storage);
-			}
-		}
-
-		@Override
-		public void onError(String message, Throwable cause) {
-			if (this.terminated.getAndIncrement() == 0) {
-				this.sink.error(new DecodingException(message, cause));
-			}
-		}
-
-		@Override
-		public void onAllPartsFinished() {
-			if (this.terminated.getAndIncrement() == 0) {
-				this.sink.complete();
-			}
-		}
-
-		@Override
-		public void onNestedPartStarted(Map<String, List<String>> headersFromParentPart) {
-		}
-
-		@Override
-		public void onNestedPartFinished() {
-		}
-	}
-
-
-	private abstract static class AbstractSynchronossPart implements Part {
-
-		private final String name;
-
-		private final HttpHeaders headers;
-
-		AbstractSynchronossPart(HttpHeaders headers) {
-			Assert.notNull(headers, "HttpHeaders is required");
-			this.name = MultipartUtils.getFieldName(headers);
-			this.headers = headers;
-		}
-
-		@Override
-		public String name() {
-			return this.name;
-		}
-
-		@Override
-		public HttpHeaders headers() {
-			return this.headers;
-		}
-
-		@Override
-		public String toString() {
-			return "Part '" + this.name + "', headers=" + this.headers;
-		}
-	}
-
-
-	private static class SynchronossPart extends AbstractSynchronossPart {
-
-		private final StreamStorage storage;
-
-		SynchronossPart(HttpHeaders headers, StreamStorage storage) {
-			super(headers);
-			Assert.notNull(storage, "StreamStorage is required");
-			this.storage = storage;
-		}
-
-		@Override
-		@SuppressWarnings("resource")
-		public Flux<DataBuffer> content() {
-			return DataBufferUtils.readInputStream(
-					getStorage()::getInputStream, DefaultDataBufferFactory.sharedInstance, 4096);
-		}
-
-		protected StreamStorage getStorage() {
-			return this.storage;
-		}
-	}
-
-
-	private static class SynchronossFilePart extends SynchronossPart implements FilePart {
-
-		private static final OpenOption[] FILE_CHANNEL_OPTIONS =
-				{StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE};
-
-		private final String filename;
-
-		SynchronossFilePart(HttpHeaders headers, String filename, StreamStorage storage) {
-			super(headers, storage);
-			this.filename = filename;
-		}
-
-		@Override
-		public String filename() {
-			return this.filename;
-		}
-
-		@Override
-		public Mono<Void> transferTo(Path dest) {
-			ReadableByteChannel input = null;
-			FileChannel output = null;
-			try {
-				input = Channels.newChannel(getStorage().getInputStream());
-				output = FileChannel.open(dest, FILE_CHANNEL_OPTIONS);
-				long size = (input instanceof FileChannel ? ((FileChannel) input).size() : Long.MAX_VALUE);
-				long totalWritten = 0;
-				while (totalWritten < size) {
-					long written = output.transferFrom(input, totalWritten, size - totalWritten);
-					if (written <= 0) {
-						break;
-					}
-					totalWritten += written;
-				}
-			}
-			catch (IOException ex) {
-				return Mono.error(ex);
-			}
-			finally {
-				if (input != null) {
-					try {
-						input.close();
-					}
-					catch (IOException ignored) {
-					}
-				}
-				if (output != null) {
-					try {
-						output.close();
-					}
-					catch (IOException ignored) {
-					}
-				}
-			}
-			return Mono.empty();
-		}
-
-		@Override
-		public String toString() {
-			return "Part '" + name() + "', filename='" + this.filename + "'";
-		}
-	}
-
-
-	private static class SynchronossFormFieldPart extends AbstractSynchronossPart implements FormFieldPart {
-
-		private final String content;
-
-		SynchronossFormFieldPart(HttpHeaders headers, String content) {
-			super(headers);
-			this.content = content;
-		}
-
-		@Override
-		public String value() {
-			return this.content;
-		}
-
-		@Override
-		public Flux<DataBuffer> content() {
-			byte[] bytes = this.content.getBytes(getCharset());
-			return Flux.just(DefaultDataBufferFactory.sharedInstance.wrap(bytes));
-		}
-
-		private Charset getCharset() {
-			String name = MultipartUtils.getCharEncoding(headers());
-			return (name != null ? Charset.forName(name) : StandardCharsets.UTF_8);
-		}
-
-		@Override
-		public String toString() {
-			return "Part '" + name() + "=" + this.content + "'";
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java b/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java
index f23b17428d51..02055814b2eb 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java
@@ -58,7 +58,6 @@
 import org.springframework.http.codec.multipart.DefaultPartHttpMessageReader;
 import org.springframework.http.codec.multipart.MultipartHttpMessageReader;
 import org.springframework.http.codec.multipart.MultipartHttpMessageWriter;
-import org.springframework.http.codec.multipart.SynchronossPartHttpMessageReader;
 import org.springframework.http.codec.protobuf.ProtobufDecoder;
 import org.springframework.http.codec.protobuf.ProtobufEncoder;
 import org.springframework.http.codec.protobuf.ProtobufHttpMessageWriter;
@@ -103,7 +102,7 @@ class BaseDefaultCodecs implements CodecConfigurer.DefaultCodecs, CodecConfigure
 		jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&
 						ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
 		jackson2SmilePresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", classLoader);
-		jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder", classLoader);
+		jaxb2Present = ClassUtils.isPresent("jakarta.xml.bind.Binder", classLoader);
 		protobufPresent = ClassUtils.isPresent("com.google.protobuf.Message", classLoader);
 		synchronossMultipartPresent = ClassUtils.isPresent("org.synchronoss.cloud.nio.multipart.NioMultipartParser", classLoader);
 		nettyByteBufPresent = ClassUtils.isPresent("io.netty.buffer.ByteBuf", classLoader);
@@ -417,11 +416,6 @@ else if (codec instanceof EncoderHttpMessageWriter) {
 			if (codec instanceof DefaultPartHttpMessageReader) {
 				((DefaultPartHttpMessageReader) codec).setMaxInMemorySize(size);
 			}
-			if (synchronossMultipartPresent) {
-				if (codec instanceof SynchronossPartHttpMessageReader) {
-					((SynchronossPartHttpMessageReader) codec).setMaxInMemorySize(size);
-				}
-			}
 		}
 
 		Boolean enable = this.enableLoggingRequestDetails;
@@ -435,11 +429,6 @@ else if (codec instanceof EncoderHttpMessageWriter) {
 			if (codec instanceof DefaultPartHttpMessageReader) {
 				((DefaultPartHttpMessageReader) codec).setEnableLoggingRequestDetails(enable);
 			}
-			if (synchronossMultipartPresent) {
-				if (codec instanceof SynchronossPartHttpMessageReader) {
-					((SynchronossPartHttpMessageReader) codec).setEnableLoggingRequestDetails(enable);
-				}
-			}
 			if (codec instanceof FormHttpMessageWriter) {
 				((FormHttpMessageWriter) codec).setEnableLoggingRequestDetails(enable);
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
index 2221880c49ff..f30d0a5289fa 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,19 +24,19 @@
 import java.util.function.Function;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.UnmarshalException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.XMLEvent;
 
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.UnmarshalException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlType;
 import org.reactivestreams.Publisher;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Flux;
@@ -175,7 +175,6 @@ public Flux<Object> decode(Publisher<DataBuffer> inputStream, ResolvableType ele
 	}
 
 	@Override
-	@SuppressWarnings({"rawtypes", "unchecked", "cast"})  // XMLEventReader is Iterator<Object> on JDK 9
 	public Mono<Object> decodeToMono(Publisher<DataBuffer> input, ResolvableType elementType,
 			@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
 
@@ -184,12 +183,11 @@ public Mono<Object> decodeToMono(Publisher<DataBuffer> input, ResolvableType ele
 	}
 
 	@Override
-	@SuppressWarnings({"rawtypes", "unchecked", "cast"})  // XMLEventReader is Iterator<Object> on JDK 9
 	public Object decode(DataBuffer dataBuffer, ResolvableType targetType,
 			@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) throws DecodingException {
 
 		try {
-			Iterator eventReader = inputFactory.createXMLEventReader(dataBuffer.asInputStream());
+			Iterator<Object> eventReader = inputFactory.createXMLEventReader(dataBuffer.asInputStream());
 			List<XMLEvent> events = new ArrayList<>();
 			eventReader.forEachRemaining(event -> events.add((XMLEvent) event));
 			return unmarshal(events, targetType.toClass());
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java
index b29b610bb518..678e6c64ae70 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/xml/Jaxb2XmlEncoder.java
@@ -21,12 +21,11 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.MarshalException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.MarshalException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -48,8 +47,8 @@
 /**
  * Encode from single value to a byte stream containing XML elements.
  *
- * <p>{@link javax.xml.bind.annotation.XmlElements @XmlElements} and
- * {@link javax.xml.bind.annotation.XmlElement @XmlElement} can be used
+ * <p>{@link jakarta.xml.bind.annotation.XmlElements @XmlElements} and
+ * {@link jakarta.xml.bind.annotation.XmlElement @XmlElement} can be used
  * to specify how collections should be marshalled.
  *
  * @author Sebastien Deleuze
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java b/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java
index 49441c498c38..f5eee44d743d 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/xml/JaxbContextContainer.java
@@ -19,10 +19,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.springframework.core.codec.CodecException;
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index 8458ba1d6512..c113194183e6 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.mail.internet.MimeUtility;
+import jakarta.mail.internet.MimeUtility;
 
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
@@ -287,7 +287,7 @@ private void applyDefaultCharset() {
 	/**
 	 * Set the character set to use when writing multipart data to encode file
 	 * names. Encoding is based on the {@code encoded-word} syntax defined in
-	 * RFC 2047 and relies on {@code MimeUtility} from {@code javax.mail}.
+	 * RFC 2047 and relies on {@code MimeUtility} from {@code jakarta.mail}.
 	 * <p>As of 5.0 by default part headers, including {@code Content-Disposition}
 	 * (and its filename parameter) will be encoded based on the setting of
 	 * {@link #setCharset(Charset)} or {@code UTF-8} by default.
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java
index bdbc7221cfda..95c826783550 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java
@@ -21,9 +21,9 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+import jakarta.json.bind.JsonbConfig;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -39,8 +39,8 @@
  *
  * @author Juergen Hoeller
  * @since 5.0
- * @see javax.json.bind.Jsonb
- * @see javax.json.bind.JsonbBuilder
+ * @see jakarta.json.bind.Jsonb
+ * @see jakarta.json.bind.JsonbBuilder
  * @see #setJsonb
  */
 public class JsonbHttpMessageConverter extends AbstractJsonHttpMessageConverter {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
index 78d64e5da471..850f6e88a73a 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
@@ -62,13 +62,13 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
 
 	static {
 		ClassLoader classLoader = AllEncompassingFormHttpMessageConverter.class.getClassLoader();
-		jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder", classLoader);
+		jaxb2Present = ClassUtils.isPresent("jakarta.xml.bind.Binder", classLoader);
 		jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&
 						ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
 		jackson2XmlPresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper", classLoader);
 		jackson2SmilePresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", classLoader);
 		gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader);
-		jsonbPresent = ClassUtils.isPresent("javax.json.bind.Jsonb", classLoader);
+		jsonbPresent = ClassUtils.isPresent("jakarta.json.bind.Jsonb", classLoader);
 		kotlinSerializationJsonPresent = ClassUtils.isPresent("kotlinx.serialization.json.Json", classLoader);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java
index 811536c31657..11890fa419bb 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractJaxb2HttpMessageConverter.java
@@ -19,10 +19,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.springframework.http.converter.HttpMessageConversionException;
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
index ab3850c42bf7..c2e3bfdc10ad 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
@@ -26,17 +26,18 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.UnmarshalException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.UnmarshalException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
index ae4dbd9b6999..c41fb18b8545 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,20 +18,20 @@
 
 import java.io.StringReader;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.MarshalException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.UnmarshalException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.MarshalException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.UnmarshalException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -149,7 +149,7 @@ protected Object readFromSource(Class<?> clazz, HttpHeaders headers, Source sour
 		}
 	}
 
-	@SuppressWarnings("deprecation")  // on JDK 9
+	@SuppressWarnings("deprecation")
 	protected Source processSource(Source source) {
 		if (source instanceof StreamSource) {
 			StreamSource streamSource = (StreamSource) source;
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
index 866b2422456f..0a0d1b4fa39a 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
@@ -19,11 +19,11 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index b136e3fbcf2f..f7b3e9e99f0d 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -35,7 +35,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -234,7 +234,7 @@ private static boolean isFormPost(HttpServletRequest request) {
 	}
 
 	/**
-	 * Use {@link javax.servlet.ServletRequest#getParameterMap()} to reconstruct the
+	 * Use {@link jakarta.servlet.ServletRequest#getParameterMap()} to reconstruct the
 	 * body of a form 'POST' providing a predictable outcome as opposed to reading
 	 * from the body, which can fail if any other code has used the ServletRequest
 	 * to access a parameter, thus causing the input stream to be "consumed".
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
index 64436ffb1d85..1822b10f2be2 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
@@ -23,7 +23,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java
index 357662872860..b8d73163cea6 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java
@@ -39,6 +39,7 @@
  * <p>There is a duplicate of this class in the client package!
  *
  * @author Brian Clozel
+ * @author Juergen Hoeller
  * @since 5.1.1
  */
 class JettyHeadersAdapter implements MultiValueMap<String, String> {
@@ -58,7 +59,10 @@ public String getFirst(String key) {
 
 	@Override
 	public void add(String key, @Nullable String value) {
-		this.headers.add(key, value);
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
+		((HttpFields.Mutable) this.headers).add(key, value);
 	}
 
 	@Override
@@ -73,7 +77,10 @@ public void addAll(MultiValueMap<String, String> values) {
 
 	@Override
 	public void set(String key, @Nullable String value) {
-		this.headers.put(key, value);
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
+		((HttpFields.Mutable) this.headers).put(key, value);
 	}
 
 	@Override
@@ -105,7 +112,7 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.headers.containsKey((String) key));
+		return (key instanceof String && this.headers.contains((String) key));
 	}
 
 	@Override
@@ -126,17 +133,23 @@ public List<String> get(Object key) {
 	@Nullable
 	@Override
 	public List<String> put(String key, List<String> value) {
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
 		List<String> oldValues = get(key);
-		this.headers.put(key, value);
+		((HttpFields.Mutable) this.headers).put(key, value);
 		return oldValues;
 	}
 
 	@Nullable
 	@Override
 	public List<String> remove(Object key) {
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
 		if (key instanceof String) {
 			List<String> oldValues = get(key);
-			this.headers.remove((String) key);
+			((HttpFields.Mutable) this.headers).remove((String) key);
 			return oldValues;
 		}
 		return null;
@@ -149,7 +162,10 @@ public void putAll(Map<? extends String, ? extends List<String>> map) {
 
 	@Override
 	public void clear() {
-		this.headers.clear();
+		if (!(this.headers instanceof HttpFields.Mutable)) {
+			throw new IllegalStateException("Immutable headers");
+		}
+		((HttpFields.Mutable) this.headers).clear();
 	}
 
 	@Override
@@ -221,8 +237,11 @@ public List<String> getValue() {
 
 		@Override
 		public List<String> setValue(List<String> value) {
+			if (!(headers instanceof HttpFields.Mutable)) {
+				throw new IllegalStateException("Immutable headers");
+			}
 			List<String> previousValues = headers.getValuesList(this.key);
-			headers.put(this.key, value);
+			((HttpFields.Mutable) headers).put(this.key, value);
 			return previousValues;
 		}
 	}
@@ -266,13 +285,16 @@ public String next() {
 
 		@Override
 		public void remove() {
+			if (!(headers instanceof HttpFields.Mutable)) {
+				throw new IllegalStateException("Immutable headers");
+			}
 			if (this.currentName == null) {
 				throw new IllegalStateException("No current Header in iterator");
 			}
-			if (!headers.containsKey(this.currentName)) {
+			if (!headers.contains(this.currentName)) {
 				throw new IllegalStateException("Header not present: " + this.currentName);
 			}
-			headers.remove(this.currentName);
+			((HttpFields.Mutable) headers).remove(this.currentName);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
index 89a315068359..8f5f23be086a 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
@@ -21,13 +21,12 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
@@ -38,7 +37,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.MultiValueMap;
 
 /**
@@ -52,10 +50,6 @@
  */
 public class JettyHttpHandlerAdapter extends ServletHttpHandlerAdapter {
 
-	private static final boolean jetty10Present = ClassUtils.isPresent(
-			"org.eclipse.jetty.http.CookieCutter", JettyHttpHandlerAdapter.class.getClassLoader());
-
-
 	public JettyHttpHandlerAdapter(HttpHandler httpHandler) {
 		super(httpHandler);
 	}
@@ -65,11 +59,6 @@ public JettyHttpHandlerAdapter(HttpHandler httpHandler) {
 	protected ServletServerHttpRequest createRequest(HttpServletRequest request, AsyncContext context)
 			throws IOException, URISyntaxException {
 
-		// TODO: need to compile against Jetty 10 to use HttpFields (class->interface)
-		if (jetty10Present) {
-			return super.createRequest(request, context);
-		}
-
 		Assert.notNull(getServletPath(), "Servlet path is not initialized");
 		return new JettyServerHttpRequest(
 				request, context, getServletPath(), getDataBufferFactory(), getBufferSize());
@@ -79,15 +68,8 @@ protected ServletServerHttpRequest createRequest(HttpServletRequest request, Asy
 	protected ServletServerHttpResponse createResponse(HttpServletResponse response,
 			AsyncContext context, ServletServerHttpRequest request) throws IOException {
 
-		// TODO: need to compile against Jetty 10 to use HttpFields (class->interface)
-		if (jetty10Present) {
-			return new BaseJettyServerHttpResponse(
-					response, context, getDataBufferFactory(), getBufferSize(), request);
-		}
-		else {
-			return new JettyServerHttpResponse(
-					response, context, getDataBufferFactory(), getBufferSize(), request);
-		}
+		return new JettyServerHttpResponse(
+				response, context, getDataBufferFactory(), getBufferSize(), request);
 	}
 
 
@@ -120,39 +102,10 @@ else if (request instanceof HttpServletRequestWrapper) {
 						"] to org.eclipse.jetty.server.Request");
 			}
 		}
-
-
-	}
-
-
-	private static class BaseJettyServerHttpResponse extends ServletServerHttpResponse {
-
-		BaseJettyServerHttpResponse(HttpServletResponse response, AsyncContext asyncContext,
-				DataBufferFactory bufferFactory, int bufferSize, ServletServerHttpRequest request)
-				throws IOException {
-
-			super(response, asyncContext, bufferFactory, bufferSize, request);
-		}
-
-		BaseJettyServerHttpResponse(HttpHeaders headers, HttpServletResponse response, AsyncContext asyncContext,
-				DataBufferFactory bufferFactory, int bufferSize, ServletServerHttpRequest request)
-				throws IOException {
-
-			super(headers, response, asyncContext, bufferFactory, bufferSize, request);
-		}
-
-		@Override
-		protected int writeToOutputStream(DataBuffer dataBuffer) throws IOException {
-			ByteBuffer input = dataBuffer.asByteBuffer();
-			int len = input.remaining();
-			ServletResponse response = getNativeResponse();
-			((HttpOutput) response.getOutputStream()).write(input);
-			return len;
-		}
 	}
 
 
-	private static final class JettyServerHttpResponse extends BaseJettyServerHttpResponse {
+	private static final class JettyServerHttpResponse extends ServletServerHttpResponse {
 
 		JettyServerHttpResponse(HttpServletResponse response, AsyncContext asyncContext,
 				DataBufferFactory bufferFactory, int bufferSize, ServletServerHttpRequest request)
@@ -182,6 +135,15 @@ else if (response instanceof HttpServletResponseWrapper) {
 			}
 		}
 
+		@Override
+		protected int writeToOutputStream(DataBuffer dataBuffer) throws IOException {
+			ByteBuffer input = dataBuffer.asByteBuffer();
+			int len = input.remaining();
+			ServletResponse response = getNativeResponse();
+			((HttpOutput) response.getOutputStream()).write(input);
+			return len;
+		}
+
 		@Override
 		protected void applyHeaders() {
 			HttpServletResponse response = getNativeResponse();
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
index c38837c7ed03..0fe306911e78 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
@@ -21,20 +21,19 @@
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.DispatcherType;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
index a84ddc6d6e3d..93be805e7ff7 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
@@ -26,14 +26,13 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import reactor.core.publisher.Flux;
 
@@ -203,12 +202,12 @@ protected SslInfo initSslInfo() {
 
 	@Nullable
 	private String getSslSessionId() {
-		return (String) this.request.getAttribute("javax.servlet.request.ssl_session_id");
+		return (String) this.request.getAttribute("jakarta.servlet.request.ssl_session_id");
 	}
 
 	@Nullable
 	private X509Certificate[] getX509Certificates() {
-		String name = "javax.servlet.request.X509Certificate";
+		String name = "jakarta.servlet.request.X509Certificate";
 		return (X509Certificate[]) this.request.getAttribute(name);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
index ab7dd93c8d39..949be403dd4e 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
@@ -21,13 +21,12 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
 import org.reactivestreams.Processor;
 import org.reactivestreams.Publisher;
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
index 7920c7ffd8b4..f9a8e7277c5c 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
@@ -22,15 +22,14 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.apache.catalina.connector.CoyoteInputStream;
 import org.apache.catalina.connector.CoyoteOutputStream;
 import org.apache.catalina.connector.RequestFacade;
diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
index 91c572147f8f..0cd03ddb2042 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
@@ -19,7 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.http.MediaType;
 
diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
index 187d9dd8c544..542e60809448 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
@@ -18,15 +18,15 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Plain handler interface for components that process HTTP requests,
- * analogous to a Servlet. Only declares {@link javax.servlet.ServletException}
+ * analogous to a Servlet. Only declares {@link jakarta.servlet.ServletException}
  * and {@link java.io.IOException}, to allow for usage within any
- * {@link javax.servlet.http.HttpServlet}. This interface is essentially the
+ * {@link jakarta.servlet.http.HttpServlet}. This interface is essentially the
  * direct equivalent of an HttpServlet, reduced to a central handle method.
  *
  * <p>The easiest way to expose an HttpRequestHandler bean in Spring style
diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
index 0e61da306db7..4e1168d84deb 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
index 83a00b0de5a8..eaffd9d96b76 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index da3cd91c3d8c..9b50031d97a0 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -23,10 +23,10 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HandlesTypes;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HandlesTypes;
 
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.lang.Nullable;
@@ -43,7 +43,7 @@
  * method invoked by any Servlet 3.0-compliant container during container startup assuming
  * that the {@code spring-web} module JAR is present on the classpath. This occurs through
  * the JAR Services API {@link ServiceLoader#load(Class)} method detecting the
- * {@code spring-web} module's {@code META-INF/services/javax.servlet.ServletContainerInitializer}
+ * {@code spring-web} module's {@code META-INF/services/jakarta.servlet.ServletContainerInitializer}
  * service provider configuration file. See the
  * <a href="https://download.oracle.com/javase/6/docs/technotes/guides/jar/jar.html#Service%20Provider">
  * JAR Services API documentation</a> as well as section <em>8.2.4</em> of the Servlet 3.0
diff --git a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
index 337f53291e7a..ef326acbe8dd 100644
--- a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 
 /**
  * Interface to be implemented in Servlet 3.0+ environments in order to configure the
diff --git a/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
index 5413a34a5a0d..37385a7fd6e6 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
@@ -42,7 +42,7 @@
  *
  * <p>The method {@link #handleNoMatch} allow sub-classes to plug in additional
  * ways of looking up media types (e.g. through the Java Activation framework,
- * or {@link javax.servlet.ServletContext#getMimeType}. Media types resolved
+ * or {@link jakarta.servlet.ServletContext#getMimeType}. Media types resolved
  * via base classes are then added to the base class
  * {@link MappingMediaTypeFileExtensionResolver}, i.e. cached for new lookups.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
index c23db8e97c9c..a7c2358dd5e9 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java
index 3fc337b377b6..66a0354c1e50 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java
@@ -19,7 +19,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
diff --git a/spring-web/src/main/java/org/springframework/web/accept/ServletPathExtensionContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/ServletPathExtensionContentNegotiationStrategy.java
index f2a549589665..485727d718db 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/ServletPathExtensionContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/ServletPathExtensionContentNegotiationStrategy.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
index 16bf30ee01fc..db74e0020d3b 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.bind;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.http.HttpMethod;
@@ -56,7 +56,7 @@
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
- * @see #bind(javax.servlet.ServletRequest)
+ * @see #bind(jakarta.servlet.ServletRequest)
  * @see #registerCustomEditor
  * @see #setAllowedFields
  * @see #setRequiredFields
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
index 6d1b17de2c28..f127baee8492 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.bind;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
index 9537758b7930..f02c11fd830d 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.bind;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
index 65002541148b..feecdeef80fd 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
@@ -107,7 +107,7 @@ public final List<String[]> getParamConditionGroups() {
 
 	/**
 	 * Return the actual parameter Map associated with the ServletRequest.
-	 * @see javax.servlet.ServletRequest#getParameterMap()
+	 * @see jakarta.servlet.ServletRequest#getParameterMap()
 	 */
 	public final Map<String, String[]> getActualParams() {
 		return this.actualParams;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ControllerAdvice.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ControllerAdvice.java
index decfce3eb1af..24cca20a9399 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ControllerAdvice.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ControllerAdvice.java
@@ -36,7 +36,7 @@
  * as Spring beans or auto-detected via classpath scanning. All such beans are
  * sorted based on {@link org.springframework.core.Ordered Ordered} semantics or
  * {@link org.springframework.core.annotation.Order @Order} /
- * {@link javax.annotation.Priority @Priority} declarations, with {@code Ordered}
+ * {@link jakarta.annotation.Priority @Priority} declarations, with {@code Ordered}
  * semantics taking precedence over {@code @Order} / {@code @Priority} declarations.
  * {@code @ControllerAdvice} beans are then applied in that order at runtime.
  * Note, however, that {@code @ControllerAdvice} beans that implement
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
index 33e23a166a4e..9e8f3dae56e9 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
@@ -27,12 +27,12 @@
 /**
  * Annotation to indicate that a method parameter is bound to an HTTP cookie.
  *
- * <p>The method parameter may be declared as type {@link javax.servlet.http.Cookie}
+ * <p>The method parameter may be declared as type {@link jakarta.servlet.http.Cookie}
  * or as cookie value type (String, int, etc.).
  *
  * <p>Note that with spring-webmvc 5.3.x and earlier, the cookie value is URL
  * decoded. This will be changed in 6.0 but in the meantime, applications can
- * also declare parameters of type {@link javax.servlet.http.Cookie} to access
+ * also declare parameters of type {@link jakarta.servlet.http.Cookie} to access
  * the raw value.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
index 3f48fa431185..bf66c33ed053 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
@@ -38,8 +38,8 @@
  * exposed, whereas previously only an immediate cause was considered.
  * <li>Request and/or response objects (typically from the Servlet API).
  * You may choose any specific request/response type, e.g.
- * {@link javax.servlet.ServletRequest} / {@link javax.servlet.http.HttpServletRequest}.
- * <li>Session object: typically {@link javax.servlet.http.HttpSession}.
+ * {@link jakarta.servlet.ServletRequest} / {@link jakarta.servlet.http.HttpServletRequest}.
+ * <li>Session object: typically {@link jakarta.servlet.http.HttpSession}.
  * An argument of this type will enforce the presence of a corresponding session.
  * As a consequence, such an argument will never be {@code null}.
  * <i>Note that session access may not be thread-safe, in particular in a
@@ -88,7 +88,7 @@
  * {@linkplain org.springframework.http.converter.HttpMessageConverter message converters}.
  * <li>{@code void} if the method handles the response itself (by
  * writing the response content directly, declaring an argument of type
- * {@link javax.servlet.ServletResponse} / {@link javax.servlet.http.HttpServletResponse}
+ * {@link jakarta.servlet.ServletResponse} / {@link jakarta.servlet.http.HttpServletResponse}
  * for that purpose) or if the view name is supposed to be implicitly determined
  * through a {@link org.springframework.web.servlet.RequestToViewNameTranslator}
  * (not declaring a response argument in the handler method signature).
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
index eb3f0d962e13..6d59dd4aec05 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
@@ -176,7 +176,7 @@
 	 * If specified at both levels, the method level consumes condition overrides
 	 * the type level condition.
 	 * @see org.springframework.http.MediaType
-	 * @see javax.servlet.http.HttpServletRequest#getContentType()
+	 * @see jakarta.servlet.http.HttpServletRequest#getContentType()
 	 */
 	String[] consumes() default {};
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
index 0f8b430e54a5..b84f09ffd72f 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
@@ -34,7 +34,7 @@
  * with a method argument.
  *
  * <p>Supported method argument types include {@link MultipartFile} in conjunction with
- * Spring's {@link MultipartResolver} abstraction, {@code javax.servlet.http.Part} in
+ * Spring's {@link MultipartResolver} abstraction, {@code jakarta.servlet.http.Part} in
  * conjunction with Servlet 3.0 multipart requests, or otherwise for any other method
  * argument, the content of the part is passed through an {@link HttpMessageConverter}
  * taking into consideration the 'Content-Type' header of the request part. This is
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java
index 999348c91b7e..f69fef63fc73 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseStatus.java
@@ -53,7 +53,7 @@
  * @author Sam Brannen
  * @since 3.0
  * @see org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionResolver
- * @see javax.servlet.http.HttpServletResponse#sendError(int, String)
+ * @see jakarta.servlet.http.HttpServletResponse#sendError(int, String)
  */
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
@@ -71,8 +71,8 @@
 	 * <p>Default is {@link HttpStatus#INTERNAL_SERVER_ERROR}, which should
 	 * typically be changed to something more appropriate.
 	 * @since 4.2
-	 * @see javax.servlet.http.HttpServletResponse#setStatus(int)
-	 * @see javax.servlet.http.HttpServletResponse#sendError(int)
+	 * @see jakarta.servlet.http.HttpServletResponse#setStatus(int)
+	 * @see jakarta.servlet.http.HttpServletResponse#sendError(int)
 	 */
 	@AliasFor("value")
 	HttpStatus code() default HttpStatus.INTERNAL_SERVER_ERROR;
@@ -81,7 +81,7 @@
 	 * The <em>reason</em> to be used for the response.
 	 * <p>Defaults to an empty string which will be ignored. Set the reason to a
 	 * non-empty value to have it used for the response.
-	 * @see javax.servlet.http.HttpServletResponse#sendError(int, String)
+	 * @see jakarta.servlet.http.HttpServletResponse#sendError(int, String)
 	 */
 	String reason() default "";
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttribute.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttribute.java
index ca06dd1bdaea..7d6775308ee8 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttribute.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttribute.java
@@ -33,7 +33,7 @@
  *
  * <p>For use cases that require adding or removing session attributes consider
  * injecting {@code org.springframework.web.context.request.WebRequest} or
- * {@code javax.servlet.http.HttpSession} into the controller method.
+ * {@code jakarta.servlet.http.HttpSession} into the controller method.
  *
  * <p>For temporary storage of model attributes in the session as part of the
  * workflow for a controller, consider using {@link SessionAttributes} instead.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java
index b795b3eb7187..dcbc1a4c7a86 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/SpringWebConstraintValidatorFactory.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.bind.support;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
 
 import org.springframework.web.context.ContextLoader;
 import org.springframework.web.context.WebApplicationContext;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
index 76ea4abddab4..23e747a17c88 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.bind.support;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.http.HttpHeaders;
@@ -104,7 +104,7 @@ public WebRequestDataBinder(@Nullable Object target, String objectName) {
 	 * @param request the request with parameters to bind (can be multipart)
 	 * @see org.springframework.web.multipart.MultipartRequest
 	 * @see org.springframework.web.multipart.MultipartFile
-	 * @see javax.servlet.http.Part
+	 * @see jakarta.servlet.http.Part
 	 * @see #bind(org.springframework.beans.PropertyValues)
 	 */
 	public void bind(WebRequest request) {
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index 22662632475f..3d1bcb5b0a71 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -121,14 +121,14 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 	static {
 		ClassLoader classLoader = RestTemplate.class.getClassLoader();
 		romePresent = ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", classLoader);
-		jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder", classLoader);
+		jaxb2Present = ClassUtils.isPresent("jakarta.xml.bind.Binder", classLoader);
 		jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&
 				ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
 		jackson2XmlPresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper", classLoader);
 		jackson2SmilePresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", classLoader);
 		jackson2CborPresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.cbor.CBORFactory", classLoader);
 		gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader);
-		jsonbPresent = ClassUtils.isPresent("javax.json.bind.Jsonb", classLoader);
+		jsonbPresent = ClassUtils.isPresent("jakarta.json.bind.Jsonb", classLoader);
 		kotlinSerializationJsonPresent = ClassUtils.isPresent("kotlinx.serialization.json.Json", classLoader);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java b/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java
index 6cb40688e34e..01fae7c0aeac 100644
--- a/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
index c08b195fcdb3..831bad5cf1aa 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.lang.Nullable;
@@ -47,7 +47,7 @@ public interface ConfigurableWebApplicationContext extends WebApplicationContext
 
 	/**
 	 * Name of the ServletConfig environment bean in the factory.
-	 * @see javax.servlet.ServletConfig
+	 * @see jakarta.servlet.ServletConfig
 	 */
 	String SERVLET_CONFIG_BEAN_NAME = "servletConfig";
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebEnvironment.java b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebEnvironment.java
index 6d92f54530a2..d077036403a7 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebEnvironment.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebEnvironment.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
index 4225e0aba187..02034d0a19f7 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
@@ -18,10 +18,9 @@
 
 import java.util.Enumeration;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
index dfd4b0196caa..722fb7a17000 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
@@ -23,8 +23,7 @@
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
index 3c4d40722258..3f57d6764536 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 /**
  * Bootstrap listener to start up and shut down Spring's root {@link WebApplicationContext}.
@@ -59,7 +59,7 @@ public ContextLoaderListener() {
 	/**
 	 * Create a new {@code ContextLoaderListener} with the given application context. This
 	 * constructor is useful in Servlet 3.0+ environments where instance-based
-	 * registration of listeners is possible through the {@link javax.servlet.ServletContext#addListener}
+	 * registration of listeners is possible through the {@link jakarta.servlet.ServletContext#addListener}
 	 * API.
 	 * <p>The context may or may not yet be {@linkplain
 	 * org.springframework.context.ConfigurableApplicationContext#refresh() refreshed}. If it
diff --git a/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
index aaa5a9039096..60f399c1c3c5 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletConfig;
 
 import org.springframework.beans.factory.Aware;
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
index 709cce1c6ace..ebb47e56b5bb 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.Aware;
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
index b2c15d545c9a..cef050984829 100644
--- a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.lang.Nullable;
@@ -74,7 +74,7 @@ public interface WebApplicationContext extends ApplicationContext {
 
 	/**
 	 * Name of the ServletContext environment bean in the factory.
-	 * @see javax.servlet.ServletContext
+	 * @see jakarta.servlet.ServletContext
 	 */
 	String SERVLET_CONTEXT_BEAN_NAME = "servletContext";
 
@@ -82,17 +82,17 @@ public interface WebApplicationContext extends ApplicationContext {
 	 * Name of the ServletContext init-params environment bean in the factory.
 	 * <p>Note: Possibly merged with ServletConfig parameters.
 	 * ServletConfig parameters override ServletContext parameters of the same name.
-	 * @see javax.servlet.ServletContext#getInitParameterNames()
-	 * @see javax.servlet.ServletContext#getInitParameter(String)
-	 * @see javax.servlet.ServletConfig#getInitParameterNames()
-	 * @see javax.servlet.ServletConfig#getInitParameter(String)
+	 * @see jakarta.servlet.ServletContext#getInitParameterNames()
+	 * @see jakarta.servlet.ServletContext#getInitParameter(String)
+	 * @see jakarta.servlet.ServletConfig#getInitParameterNames()
+	 * @see jakarta.servlet.ServletConfig#getInitParameter(String)
 	 */
 	String CONTEXT_PARAMETERS_BEAN_NAME = "contextParameters";
 
 	/**
 	 * Name of the ServletContext attributes environment bean in the factory.
-	 * @see javax.servlet.ServletContext#getAttributeNames()
-	 * @see javax.servlet.ServletContext#getAttribute(String)
+	 * @see jakarta.servlet.ServletContext#getAttributeNames()
+	 * @see jakarta.servlet.ServletContext#getAttribute(String)
 	 */
 	String CONTEXT_ATTRIBUTES_BEAN_NAME = "contextAttributes";
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
index 69e280bd7d9a..57ef0b4110fd 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.http.HttpSessionBindingListener;
 
 /**
  * Adapter that implements the Servlet HttpSessionBindingListener interface,
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
index 9937a0c076fd..14df22d3b0e1 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
@@ -19,9 +19,8 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -31,7 +30,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * {@link RequestAttributes} adapter for a JSF {@link javax.faces.context.FacesContext}.
+ * {@link RequestAttributes} adapter for a JSF {@link jakarta.faces.context.FacesContext}.
  * Used as default in a JSF environment, wrapping the current FacesContext.
  *
  * <p><b>NOTE:</b> In contrast to {@link ServletRequestAttributes}, this variant does
@@ -44,9 +43,9 @@
  *
  * @author Juergen Hoeller
  * @since 2.5.2
- * @see javax.faces.context.FacesContext#getExternalContext()
- * @see javax.faces.context.ExternalContext#getRequestMap()
- * @see javax.faces.context.ExternalContext#getSessionMap()
+ * @see jakarta.faces.context.FacesContext#getExternalContext()
+ * @see jakarta.faces.context.ExternalContext#getRequestMap()
+ * @see jakarta.faces.context.ExternalContext#getSessionMap()
  * @see RequestContextHolder#currentRequestAttributes()
  */
 public class FacesRequestAttributes implements RequestAttributes {
@@ -62,7 +61,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 	/**
 	 * Create a new FacesRequestAttributes adapter for the given FacesContext.
 	 * @param facesContext the current FacesContext
-	 * @see javax.faces.context.FacesContext#getCurrentInstance()
+	 * @see jakarta.faces.context.FacesContext#getCurrentInstance()
 	 */
 	public FacesRequestAttributes(FacesContext facesContext) {
 		Assert.notNull(facesContext, "FacesContext must not be null");
@@ -79,7 +78,7 @@ protected final FacesContext getFacesContext() {
 
 	/**
 	 * Return the JSF ExternalContext that this adapter operates on.
-	 * @see javax.faces.context.FacesContext#getExternalContext()
+	 * @see jakarta.faces.context.FacesContext#getExternalContext()
 	 */
 	protected final ExternalContext getExternalContext() {
 		return getFacesContext().getExternalContext();
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
index d3d56213fa8d..733a6e8405e6 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
@@ -21,14 +21,14 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
 /**
- * {@link WebRequest} adapter for a JSF {@link javax.faces.context.FacesContext}.
+ * {@link WebRequest} adapter for a JSF {@link jakarta.faces.context.FacesContext}.
  *
  * <p>Requires JSF 2.0 or higher, as of Spring 4.0.
  *
@@ -40,7 +40,7 @@ public class FacesWebRequest extends FacesRequestAttributes implements NativeWeb
 	/**
 	 * Create a new FacesWebRequest adapter for the given FacesContext.
 	 * @param facesContext the current FacesContext
-	 * @see javax.faces.context.FacesContext#getCurrentInstance()
+	 * @see jakarta.faces.context.FacesContext#getCurrentInstance()
 	 */
 	public FacesWebRequest(FacesContext facesContext) {
 		super(facesContext);
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
index cf2e3247fb74..8d90775760a0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
@@ -32,13 +32,13 @@ public interface NativeWebRequest extends WebRequest {
 
 	/**
 	 * Return the underlying native request object.
-	 * @see javax.servlet.http.HttpServletRequest
+	 * @see jakarta.servlet.http.HttpServletRequest
 	 */
 	Object getNativeRequest();
 
 	/**
 	 * Return the underlying native response object, if any.
-	 * @see javax.servlet.http.HttpServletResponse
+	 * @see jakarta.servlet.http.HttpServletResponse
 	 */
 	@Nullable
 	Object getNativeResponse();
@@ -48,7 +48,7 @@ public interface NativeWebRequest extends WebRequest {
 	 * @param requiredType the desired type of request object
 	 * @return the matching request object, or {@code null} if none
 	 * of that type is available
-	 * @see javax.servlet.http.HttpServletRequest
+	 * @see jakarta.servlet.http.HttpServletRequest
 	 */
 	@Nullable
 	<T> T getNativeRequest(@Nullable Class<T> requiredType);
@@ -58,7 +58,7 @@ public interface NativeWebRequest extends WebRequest {
 	 * @param requiredType the desired type of response object
 	 * @return the matching response object, or {@code null} if none
 	 * of that type is available
-	 * @see javax.servlet.http.HttpServletResponse
+	 * @see jakarta.servlet.http.HttpServletResponse
 	 */
 	@Nullable
 	<T> T getNativeResponse(@Nullable Class<T> requiredType);
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
index a52c9915afcc..ba63120383d8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context.request;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.core.NamedInheritableThreadLocal;
 import org.springframework.core.NamedThreadLocal;
@@ -45,7 +45,7 @@
 public abstract class RequestContextHolder  {
 
 	private static final boolean jsfPresent =
-			ClassUtils.isPresent("javax.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());
+			ClassUtils.isPresent("jakarta.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());
 
 	private static final ThreadLocal<RequestAttributes> requestAttributesHolder =
 			new NamedThreadLocal<>("Request attributes");
@@ -119,7 +119,7 @@ public static RequestAttributes getRequestAttributes() {
 	 * @see #setRequestAttributes
 	 * @see ServletRequestAttributes
 	 * @see FacesRequestAttributes
-	 * @see javax.faces.context.FacesContext#getCurrentInstance()
+	 * @see jakarta.faces.context.FacesContext#getCurrentInstance()
 	 */
 	public static RequestAttributes currentRequestAttributes() throws IllegalStateException {
 		RequestAttributes attributes = getRequestAttributes();
@@ -147,8 +147,14 @@ private static class FacesRequestAttributesFactory {
 
 		@Nullable
 		public static RequestAttributes getFacesRequestAttributes() {
-			FacesContext facesContext = FacesContext.getCurrentInstance();
-			return (facesContext != null ? new FacesRequestAttributes(facesContext) : null);
+			try {
+				FacesContext facesContext = FacesContext.getCurrentInstance();
+				return (facesContext != null ? new FacesRequestAttributes(facesContext) : null);
+			}
+			catch (NoClassDefFoundError err) {
+				// typically for com/sun/faces/util/Util if only the JSF API jar is present
+				return null;
+			}
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
index ef42dba98eee..d6d1e3c3e801 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.context.request;
 
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.context.i18n.LocaleContextHolder;
 
@@ -37,7 +37,7 @@
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see javax.servlet.ServletRequestListener
+ * @see jakarta.servlet.ServletRequestListener
  * @see org.springframework.context.i18n.LocaleContextHolder
  * @see RequestContextHolder
  * @see org.springframework.web.filter.RequestContextFilter
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
index 88a46f8d84fb..a767b0b98f52 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
@@ -21,9 +21,9 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -39,8 +39,8 @@
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see javax.servlet.ServletRequest#getAttribute
- * @see javax.servlet.http.HttpSession#getAttribute
+ * @see jakarta.servlet.ServletRequest#getAttribute
+ * @see jakarta.servlet.http.HttpSession#getAttribute
  */
 public class ServletRequestAttributes extends AbstractRequestAttributes {
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
index 5fef231f283b..1b2917cf5ae0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
@@ -29,9 +29,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -43,7 +43,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * {@link WebRequest} adapter for an {@link javax.servlet.http.HttpServletRequest}.
+ * {@link WebRequest} adapter for an {@link jakarta.servlet.http.HttpServletRequest}.
  *
  * @author Juergen Hoeller
  * @author Brian Clozel
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
index 6985a3e564bf..fe8cdf480531 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
@@ -39,7 +39,7 @@ public interface WebRequest extends RequestAttributes {
 	 * Return the request header of the given name, or {@code null} if none.
 	 * <p>Retrieves the first header value in case of a multi-value header.
 	 * @since 3.0
-	 * @see javax.servlet.http.HttpServletRequest#getHeader(String)
+	 * @see jakarta.servlet.http.HttpServletRequest#getHeader(String)
 	 */
 	@Nullable
 	String getHeader(String headerName);
@@ -49,7 +49,7 @@ public interface WebRequest extends RequestAttributes {
 	 * or {@code null} if none.
 	 * <p>A single-value header will be exposed as an array with a single element.
 	 * @since 3.0
-	 * @see javax.servlet.http.HttpServletRequest#getHeaders(String)
+	 * @see jakarta.servlet.http.HttpServletRequest#getHeaders(String)
 	 */
 	@Nullable
 	String[] getHeaderValues(String headerName);
@@ -57,14 +57,14 @@ public interface WebRequest extends RequestAttributes {
 	/**
 	 * Return a Iterator over request header names.
 	 * @since 3.0
-	 * @see javax.servlet.http.HttpServletRequest#getHeaderNames()
+	 * @see jakarta.servlet.http.HttpServletRequest#getHeaderNames()
 	 */
 	Iterator<String> getHeaderNames();
 
 	/**
 	 * Return the request parameter of the given name, or {@code null} if none.
 	 * <p>Retrieves the first parameter value in case of a multi-value parameter.
-	 * @see javax.servlet.http.HttpServletRequest#getParameter(String)
+	 * @see jakarta.servlet.http.HttpServletRequest#getParameter(String)
 	 */
 	@Nullable
 	String getParameter(String paramName);
@@ -73,7 +73,7 @@ public interface WebRequest extends RequestAttributes {
 	 * Return the request parameter values for the given parameter name,
 	 * or {@code null} if none.
 	 * <p>A single-value parameter will be exposed as an array with a single element.
-	 * @see javax.servlet.http.HttpServletRequest#getParameterValues(String)
+	 * @see jakarta.servlet.http.HttpServletRequest#getParameterValues(String)
 	 */
 	@Nullable
 	String[] getParameterValues(String paramName);
@@ -81,7 +81,7 @@ public interface WebRequest extends RequestAttributes {
 	/**
 	 * Return a Iterator over request parameter names.
 	 * @since 3.0
-	 * @see javax.servlet.http.HttpServletRequest#getParameterNames()
+	 * @see jakarta.servlet.http.HttpServletRequest#getParameterNames()
 	 */
 	Iterator<String> getParameterNames();
 
@@ -89,47 +89,47 @@ public interface WebRequest extends RequestAttributes {
 	 * Return a immutable Map of the request parameters, with parameter names as map keys
 	 * and parameter values as map values. The map values will be of type String array.
 	 * <p>A single-value parameter will be exposed as an array with a single element.
-	 * @see javax.servlet.http.HttpServletRequest#getParameterMap()
+	 * @see jakarta.servlet.http.HttpServletRequest#getParameterMap()
 	 */
 	Map<String, String[]> getParameterMap();
 
 	/**
 	 * Return the primary Locale for this request.
-	 * @see javax.servlet.http.HttpServletRequest#getLocale()
+	 * @see jakarta.servlet.http.HttpServletRequest#getLocale()
 	 */
 	Locale getLocale();
 
 	/**
 	 * Return the context path for this request
 	 * (usually the base path that the current web application is mapped to).
-	 * @see javax.servlet.http.HttpServletRequest#getContextPath()
+	 * @see jakarta.servlet.http.HttpServletRequest#getContextPath()
 	 */
 	String getContextPath();
 
 	/**
 	 * Return the remote user for this request, if any.
-	 * @see javax.servlet.http.HttpServletRequest#getRemoteUser()
+	 * @see jakarta.servlet.http.HttpServletRequest#getRemoteUser()
 	 */
 	@Nullable
 	String getRemoteUser();
 
 	/**
 	 * Return the user principal for this request, if any.
-	 * @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
+	 * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal()
 	 */
 	@Nullable
 	Principal getUserPrincipal();
 
 	/**
 	 * Determine whether the user is in the given role for this request.
-	 * @see javax.servlet.http.HttpServletRequest#isUserInRole(String)
+	 * @see jakarta.servlet.http.HttpServletRequest#isUserInRole(String)
 	 */
 	boolean isUserInRole(String role);
 
 	/**
 	 * Return whether this request has been sent over a secure transport
 	 * mechanism (such as SSL).
-	 * @see javax.servlet.http.HttpServletRequest#isSecure()
+	 * @see jakarta.servlet.http.HttpServletRequest#isSecure()
 	 */
 	boolean isSecure();
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
index 06e4721cb97e..18d29550bfd8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
@@ -22,11 +22,11 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.util.Assert;
 import org.springframework.web.context.request.ServletWebRequest;
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
index 960ead38d050..9b7e1c484689 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
@@ -24,8 +24,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -99,7 +98,7 @@ public final class WebAsyncManager {
 
 	/**
 	 * Package-private constructor.
-	 * @see WebAsyncUtils#getAsyncManager(javax.servlet.ServletRequest)
+	 * @see WebAsyncUtils#getAsyncManager(jakarta.servlet.ServletRequest)
 	 * @see WebAsyncUtils#getAsyncManager(org.springframework.web.context.request.WebRequest)
 	 */
 	WebAsyncManager() {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java
index abd2336ab1d9..2798bb2158e4 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.context.request.async;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.WebRequest;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
index 6c47fc938fe8..86ac23e6b2f9 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.support.AbstractRefreshableConfigApplicationContext;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
index 5de3b4352b2e..ae2ffee7e658 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
@@ -38,7 +38,7 @@
  * implementation which accepts <em>component classes</em> as input &mdash; in particular
  * {@link org.springframework.context.annotation.Configuration @Configuration}-annotated
  * classes, but also plain {@link org.springframework.stereotype.Component @Component}
- * classes and JSR-330 compliant classes using {@code javax.inject} annotations.
+ * classes and JSR-330 compliant classes using {@code jakarta.inject} annotations.
  *
  * <p>Allows for registering classes one by one (specifying class names as config
  * location) as well as for classpath scanning (specifying base packages as config location).
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java
index fc6f1af7a5f2..55b32a46cab4 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ContextExposingHttpServletRequest.java
@@ -19,8 +19,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
index c8a39cb2908b..75a599d231a8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
index 97be4db90667..a97b402c36ab 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java
index 39cb3f8991dc..0a500097f143 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
index 1550875714d1..30d32153ebb0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
@@ -104,7 +104,7 @@ public String getSessionId() {
 	/**
 	 * Return the name of the user that was associated with the request
 	 * (usually the UserPrincipal).
-	 * @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
+	 * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal()
 	 */
 	@Nullable
 	public String getUserName() {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
index 01fd5d064dd2..72266c0bb96c 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletConfig;
 
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
index 8e8ac5518216..b1422251ab71 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
@@ -18,8 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,7 +42,7 @@
  *
  * @author Juergen Hoeller
  * @since 1.1.4
- * @see javax.servlet.ServletContext#getAttribute
+ * @see jakarta.servlet.ServletContext#getAttribute
  * @see WebApplicationContextUtils#getWebApplicationContext
  */
 public class ServletContextAttributeExporter implements ServletContextAware {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
index c835219b66aa..6830e27c2b82 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
index 0146649cc3df..239edb45f6ea 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java
index cb9e40f58aed..f8da1abc2dcb 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java
@@ -20,7 +20,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.util.Assert;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
index 74f5ef0d2bb3..3269917dcd35 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
index 468d1c3c04f7..ca100504c796 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
index 9f19b76d9971..3942fa0deab7 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
@@ -23,7 +23,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.core.io.AbstractFileResolvingResource;
 import org.springframework.core.io.ContextResource;
@@ -36,7 +36,7 @@
 
 /**
  * {@link org.springframework.core.io.Resource} implementation for
- * {@link javax.servlet.ServletContext} resources, interpreting
+ * {@link jakarta.servlet.ServletContext} resources, interpreting
  * relative paths within the web application root directory.
  *
  * <p>Always supports stream access and URL access, but only allows
@@ -45,9 +45,9 @@
  *
  * @author Juergen Hoeller
  * @since 28.12.2003
- * @see javax.servlet.ServletContext#getResourceAsStream
- * @see javax.servlet.ServletContext#getResource
- * @see javax.servlet.ServletContext#getRealPath
+ * @see jakarta.servlet.ServletContext#getResourceAsStream
+ * @see jakarta.servlet.ServletContext#getResource
+ * @see jakarta.servlet.ServletContext#getRealPath
  */
 public class ServletContextResource extends AbstractFileResolvingResource implements ContextResource {
 
@@ -96,7 +96,7 @@ public final String getPath() {
 
 	/**
 	 * This implementation checks {@code ServletContext.getResource}.
-	 * @see javax.servlet.ServletContext#getResource(String)
+	 * @see jakarta.servlet.ServletContext#getResource(String)
 	 */
 	@Override
 	public boolean exists() {
@@ -112,7 +112,7 @@ public boolean exists() {
 	/**
 	 * This implementation delegates to {@code ServletContext.getResourceAsStream},
 	 * which returns {@code null} in case of a non-readable resource (e.g. a directory).
-	 * @see javax.servlet.ServletContext#getResourceAsStream(String)
+	 * @see jakarta.servlet.ServletContext#getResourceAsStream(String)
 	 */
 	@Override
 	public boolean isReadable() {
@@ -150,7 +150,7 @@ public boolean isFile() {
 	/**
 	 * This implementation delegates to {@code ServletContext.getResourceAsStream},
 	 * but throws a FileNotFoundException if no resource found.
-	 * @see javax.servlet.ServletContext#getResourceAsStream(String)
+	 * @see jakarta.servlet.ServletContext#getResourceAsStream(String)
 	 */
 	@Override
 	public InputStream getInputStream() throws IOException {
@@ -164,7 +164,7 @@ public InputStream getInputStream() throws IOException {
 	/**
 	 * This implementation delegates to {@code ServletContext.getResource},
 	 * but throws a FileNotFoundException if no resource found.
-	 * @see javax.servlet.ServletContext#getResource(String)
+	 * @see jakarta.servlet.ServletContext#getResource(String)
 	 */
 	@Override
 	public URL getURL() throws IOException {
@@ -180,8 +180,8 @@ public URL getURL() throws IOException {
 	 * This implementation resolves "file:" URLs or alternatively delegates to
 	 * {@code ServletContext.getRealPath}, throwing a FileNotFoundException
 	 * if not found or not resolvable.
-	 * @see javax.servlet.ServletContext#getResource(String)
-	 * @see javax.servlet.ServletContext#getRealPath(String)
+	 * @see jakarta.servlet.ServletContext#getResource(String)
+	 * @see jakarta.servlet.ServletContext#getRealPath(String)
 	 */
 	@Override
 	public File getFile() throws IOException {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java
index 159878877600..fd36e66dfe71 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourceLoader.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
index 0f48ec38021a..c9bd0c447e9a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
@@ -23,8 +23,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -52,7 +51,7 @@ public class ServletContextResourcePatternResolver extends PathMatchingResourceP
 	/**
 	 * Create a new ServletContextResourcePatternResolver.
 	 * @param servletContext the ServletContext to load resources with
-	 * @see ServletContextResourceLoader#ServletContextResourceLoader(javax.servlet.ServletContext)
+	 * @see ServletContextResourceLoader#ServletContextResourceLoader(jakarta.servlet.ServletContext)
 	 */
 	public ServletContextResourcePatternResolver(ServletContext servletContext) {
 		super(new ServletContextResourceLoader(servletContext));
@@ -75,7 +74,7 @@ public ServletContextResourcePatternResolver(ResourceLoader resourceLoader) {
 	 * In case of other resources, delegates to the superclass version.
 	 * @see #doRetrieveMatchingServletContextResources
 	 * @see ServletContextResource
-	 * @see javax.servlet.ServletContext#getResourcePaths
+	 * @see jakarta.servlet.ServletContext#getResourcePaths
 	 */
 	@Override
 	protected Set<Resource> doFindPathMatchingFileResources(Resource rootDirResource, String subPattern)
@@ -104,7 +103,7 @@ protected Set<Resource> doFindPathMatchingFileResources(Resource rootDirResource
 	 * @param result the Set of matching Resources to add to
 	 * @throws IOException if directory contents could not be retrieved
 	 * @see ServletContextResource
-	 * @see javax.servlet.ServletContext#getResourcePaths
+	 * @see jakarta.servlet.ServletContext#getResourcePaths
 	 */
 	protected void doRetrieveMatchingServletContextResources(
 			ServletContext servletContext, String fullPattern, String dir, Set<Resource> result)
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
index 5da0d5298e27..3365318dfe58 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
@@ -19,7 +19,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.ObjectFactory;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
index bd3451328086..8ffbc9fdc8b9 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -101,7 +100,7 @@ public static void processInjectionBasedOnCurrentContext(Object target) {
 	 * <p>Intended for use as a delegate.
 	 * @param target the target object to process
 	 * @param servletContext the ServletContext to find the Spring web application context in
-	 * @see WebApplicationContextUtils#getWebApplicationContext(javax.servlet.ServletContext)
+	 * @see WebApplicationContextUtils#getWebApplicationContext(jakarta.servlet.ServletContext)
 	 */
 	public static void processInjectionBasedOnServletContext(Object target, ServletContext servletContext) {
 		Assert.notNull(target, "Target object must not be null");
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
index 3ec9b92be64a..28cfb4e8c38e 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MutablePropertySources;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
index 1a011a89dddb..2e0c6a5b9b48 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.support.StaticApplicationContext;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
index d9bfe57b1523..cf43e49a5300 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
@@ -22,13 +22,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -66,7 +66,7 @@
 public abstract class WebApplicationContextUtils {
 
 	private static final boolean jsfPresent =
-			ClassUtils.isPresent("javax.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());
+			ClassUtils.isPresent("jakarta.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());
 
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
index e0d213f09cd5..10d22569ccc9 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
@@ -18,7 +18,7 @@
 
 import java.io.File;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ApplicationObjectSupport;
@@ -70,7 +70,7 @@ protected boolean isContextRequired() {
 	}
 
 	/**
-	 * Calls {@link #initServletContext(javax.servlet.ServletContext)} if the
+	 * Calls {@link #initServletContext(jakarta.servlet.ServletContext)} if the
 	 * given ApplicationContext is a {@link WebApplicationContext}.
 	 */
 	@Override
@@ -89,7 +89,7 @@ protected void initApplicationContext(ApplicationContext context) {
 	 * on the ServletContext that this application object runs in.
 	 * <p>The default implementation is empty. Called by
 	 * {@link #initApplicationContext(org.springframework.context.ApplicationContext)}
-	 * as well as {@link #setServletContext(javax.servlet.ServletContext)}.
+	 * as well as {@link #setServletContext(jakarta.servlet.ServletContext)}.
 	 * @param servletContext the ServletContext that this application object runs in
 	 * (never {@code null})
 	 */
@@ -147,7 +147,7 @@ protected final ServletContext getServletContext() throws IllegalStateException
 	 * as provided by the servlet container.
 	 * @return the File representing the temporary directory
 	 * @throws IllegalStateException if not running within a ServletContext
-	 * @see org.springframework.web.util.WebUtils#getTempDir(javax.servlet.ServletContext)
+	 * @see org.springframework.web.util.WebUtils#getTempDir(jakarta.servlet.ServletContext)
 	 */
 	protected final File getTempDir() throws IllegalStateException {
 		ServletContext servletContext = getServletContext();
diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsConfigurationSource.java b/spring-web/src/main/java/org/springframework/web/cors/CorsConfigurationSource.java
index 27934a126f5e..c2111bb5b8a1 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/CorsConfigurationSource.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/CorsConfigurationSource.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.cors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java
index e162d77ebf7c..4b19c35d96ad 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java
@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java
index eec489d6cc27..e01a1a8bc2aa 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.cors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java
index 37d3fb8c9dd9..cc7aa88f752b 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java
@@ -22,9 +22,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-web/src/main/java/org/springframework/web/cors/UrlBasedCorsConfigurationSource.java b/spring-web/src/main/java/org/springframework/web/cors/UrlBasedCorsConfigurationSource.java
index 5aec15b6d6f7..cad0948f50a6 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/UrlBasedCorsConfigurationSource.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/UrlBasedCorsConfigurationSource.java
@@ -20,7 +20,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.server.PathContainer;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
index 271193cc6382..a91fbc2b16f9 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
@@ -21,11 +21,11 @@
 import java.util.Enumeration;
 import java.util.function.Predicate;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.ServletServerHttpRequest;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java
index be97ae84aa9f..d217feaaf83f 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/CharacterEncodingFilter.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -41,8 +41,8 @@
  * @since 15.03.2004
  * @see #setEncoding
  * @see #setForceEncoding
- * @see javax.servlet.http.HttpServletRequest#setCharacterEncoding
- * @see javax.servlet.http.HttpServletResponse#setCharacterEncoding
+ * @see jakarta.servlet.http.HttpServletRequest#setCharacterEncoding
+ * @see jakarta.servlet.http.HttpServletResponse#setCharacterEncoding
  */
 public class CharacterEncodingFilter extends OncePerRequestFilter {
 
@@ -107,7 +107,7 @@ public CharacterEncodingFilter(String encoding, boolean forceRequestEncoding, bo
 
 	/**
 	 * Set the encoding to use for requests. This encoding will be passed into a
-	 * {@link javax.servlet.http.HttpServletRequest#setCharacterEncoding} call.
+	 * {@link jakarta.servlet.http.HttpServletRequest#setCharacterEncoding} call.
 	 * <p>Whether this encoding will override existing request encodings
 	 * (and whether it will be applied as default response encoding as well)
 	 * depends on the {@link #setForceEncoding "forceEncoding"} flag.
@@ -129,7 +129,7 @@ public String getEncoding() {
 	 * Set whether the configured {@link #setEncoding encoding} of this filter
 	 * is supposed to override existing request and response encodings.
 	 * <p>Default is "false", i.e. do not modify the encoding if
-	 * {@link javax.servlet.http.HttpServletRequest#getCharacterEncoding()}
+	 * {@link jakarta.servlet.http.HttpServletRequest#getCharacterEncoding()}
 	 * returns a non-null value. Switch this to "true" to enforce the specified
 	 * encoding in any case, applying it as default response encoding as well.
 	 * <p>This is the equivalent to setting both {@link #setForceRequestEncoding(boolean)}
@@ -146,7 +146,7 @@ public void setForceEncoding(boolean forceEncoding) {
 	 * Set whether the configured {@link #setEncoding encoding} of this filter
 	 * is supposed to override existing request encodings.
 	 * <p>Default is "false", i.e. do not modify the encoding if
-	 * {@link javax.servlet.http.HttpServletRequest#getCharacterEncoding()}
+	 * {@link jakarta.servlet.http.HttpServletRequest#getCharacterEncoding()}
 	 * returns a non-null value. Switch this to "true" to enforce the specified
 	 * encoding in any case.
 	 * @since 4.3
diff --git a/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
index 564a47040bef..1329e138f426 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.filter;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Simple request logging filter that writes the request URI
diff --git a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
index f8ec4e37a0bd..a4700f5a3efe 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
@@ -20,12 +20,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 /**
  * A generic composite servlet {@link Filter} that just delegates its behavior
diff --git a/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java
index 4d0826f22a9c..725dfebddbbf 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.util.Assert;
 import org.springframework.web.cors.CorsConfiguration;
@@ -32,7 +32,7 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 /**
- * {@link javax.servlet.Filter} to handle CORS pre-flight requests and intercept
+ * {@link jakarta.servlet.Filter} to handle CORS pre-flight requests and intercept
  * CORS simple and actual requests with a {@link CorsProcessor}, and to update
  * the response, e.g. with CORS response headers, based on the policy matched
  * through the provided {@link CorsConfigurationSource}.
@@ -40,7 +40,7 @@
  * <p>This is an alternative to configuring CORS in the Spring MVC Java config
  * and the Spring MVC XML namespace. It is useful for applications depending
  * only on spring-web (not on spring-webmvc) or for security constraints that
- * require CORS checks to be performed at {@link javax.servlet.Filter} level.
+ * require CORS checks to be performed at {@link jakarta.servlet.Filter} level.
  *
  * <p>This filter could be used in conjunction with {@link DelegatingFilterProxy}
  * in order to help with its initialization.
diff --git a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
index bfbe62739dce..dff469446ad2 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
@@ -18,11 +18,11 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.lang.Nullable;
@@ -71,13 +71,13 @@
  * @since 1.2
  * @see #setTargetBeanName
  * @see #setTargetFilterLifecycle
- * @see javax.servlet.Filter#doFilter
- * @see javax.servlet.Filter#init
- * @see javax.servlet.Filter#destroy
+ * @see jakarta.servlet.Filter#doFilter
+ * @see jakarta.servlet.Filter#init
+ * @see jakarta.servlet.Filter#destroy
  * @see #DelegatingFilterProxy(Filter)
  * @see #DelegatingFilterProxy(String)
  * @see #DelegatingFilterProxy(String, WebApplicationContext)
- * @see javax.servlet.ServletContext#addFilter(String, Filter)
+ * @see jakarta.servlet.ServletContext#addFilter(String, Filter)
  * @see org.springframework.web.WebApplicationInitializer
  */
 public class DelegatingFilterProxy extends GenericFilterBean {
@@ -293,7 +293,7 @@ public void destroy() {
 	 * @return the {@code WebApplicationContext} for this proxy, or {@code null} if not found
 	 * @see #DelegatingFilterProxy(String, WebApplicationContext)
 	 * @see #getContextAttribute()
-	 * @see WebApplicationContextUtils#getWebApplicationContext(javax.servlet.ServletContext)
+	 * @see WebApplicationContextUtils#getWebApplicationContext(jakarta.servlet.ServletContext)
 	 * @see WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
 	@Nullable
@@ -330,7 +330,7 @@ protected WebApplicationContext findWebApplicationContext() {
 	 * @see #getTargetBeanName()
 	 * @see #isTargetFilterLifecycle()
 	 * @see #getFilterConfig()
-	 * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+	 * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig)
 	 */
 	protected Filter initDelegate(WebApplicationContext wac) throws ServletException {
 		String targetBeanName = getTargetBeanName();
@@ -363,7 +363,7 @@ protected void invokeDelegate(
 	 * Default implementation simply calls {@code Filter.destroy} on it.
 	 * @param delegate the Filter delegate (never {@code null})
 	 * @see #isTargetFilterLifecycle()
-	 * @see javax.servlet.Filter#destroy()
+	 * @see jakarta.servlet.Filter#destroy()
 	 */
 	protected void destroyDelegate(Filter delegate) {
 		if (isTargetFilterLifecycle()) {
diff --git a/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java
index 50ca13750784..a66a2ba49eca 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java
@@ -29,11 +29,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.MediaType;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
index 4b0b2db90283..27db5087a245 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
@@ -26,12 +26,12 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
index da36fb123b32..f9c79d6bff5f 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
@@ -20,11 +20,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -53,7 +52,7 @@
 import org.springframework.web.util.NestedServletException;
 
 /**
- * Simple base implementation of {@link javax.servlet.Filter} which treats
+ * Simple base implementation of {@link jakarta.servlet.Filter} which treats
  * its config parameters ({@code init-param} entries within the
  * {@code filter} tag in {@code web.xml}) as bean properties.
  *
@@ -64,7 +63,7 @@
  * setter will simply be ignored.
  *
  * <p>This filter leaves actual filtering to subclasses, which have to
- * implement the {@link javax.servlet.Filter#doFilter} method.
+ * implement the {@link jakarta.servlet.Filter#doFilter} method.
  *
  * <p>This generic filter base class has no dependency on the Spring
  * {@link org.springframework.context.ApplicationContext} concept.
@@ -167,7 +166,7 @@ public void setServletContext(ServletContext servletContext) {
 	 * <p>Only relevant in case of initialization as bean, where the
 	 * standard {@code init(FilterConfig)} method won't be called.
 	 * @see #initFilterBean()
-	 * @see #init(javax.servlet.FilterConfig)
+	 * @see #init(jakarta.servlet.FilterConfig)
 	 */
 	@Override
 	public void afterPropertiesSet() throws ServletException {
@@ -275,7 +274,7 @@ protected void initFilterBean() throws ServletException {
 	 * <p>Public to resemble the {@code getFilterConfig()} method
 	 * of the Servlet Filter version that shipped with WebLogic 6.1.
 	 * @return the FilterConfig instance, or {@code null} if none available
-	 * @see javax.servlet.GenericServlet#getServletConfig()
+	 * @see jakarta.servlet.GenericServlet#getServletConfig()
 	 */
 	@Nullable
 	public FilterConfig getFilterConfig() {
@@ -289,8 +288,8 @@ public FilterConfig getFilterConfig() {
 	 * If initialized as bean in a Spring application context,
 	 * it falls back to the bean name as defined in the bean factory.
 	 * @return the filter name, or {@code null} if none available
-	 * @see javax.servlet.GenericServlet#getServletName()
-	 * @see javax.servlet.FilterConfig#getFilterName()
+	 * @see jakarta.servlet.GenericServlet#getServletName()
+	 * @see jakarta.servlet.FilterConfig#getFilterName()
 	 * @see #setBeanName
 	 */
 	@Nullable
@@ -306,8 +305,8 @@ protected String getFilterName() {
 	 * it falls back to the ServletContext that the bean factory runs in.
 	 * @return the ServletContext instance
 	 * @throws IllegalStateException if no ServletContext is available
-	 * @see javax.servlet.GenericServlet#getServletContext()
-	 * @see javax.servlet.FilterConfig#getServletContext()
+	 * @see jakarta.servlet.GenericServlet#getServletContext()
+	 * @see jakarta.servlet.FilterConfig#getServletContext()
 	 * @see #setServletContext
 	 */
 	protected ServletContext getServletContext() {
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
index 0ed01daa40cb..a2abd162f2cb 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
@@ -22,11 +22,11 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.util.Assert;
@@ -34,7 +34,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * {@link javax.servlet.Filter} that converts posted method parameters into HTTP methods,
+ * {@link jakarta.servlet.Filter} that converts posted method parameters into HTTP methods,
  * retrievable via {@link HttpServletRequest#getMethod()}. Since browsers currently only
  * support GET and POST, a common technique - used by the Prototype library, for instance -
  * is to use a normal POST with an additional hidden form field ({@code _method})
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
index 2e6c04aa264a..acb0c0fbfe23 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
@@ -29,11 +29,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.MediaType;
@@ -46,7 +46,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * {@link javax.servlet.Filter} that makes form encoded data available through
+ * {@link jakarta.servlet.Filter} that makes form encoded data available through
  * the {@code ServletRequest.getParameter*()} family of methods during HTTP PUT
  * or PATCH requests.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
index 0f5e1a3831ad..953bda7f8692 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
@@ -18,13 +18,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
@@ -36,8 +36,8 @@
  * method with HttpServletRequest and HttpServletResponse arguments.
  *
  * <p>As of Servlet 3.0, a filter may be invoked as part of a
- * {@link javax.servlet.DispatcherType#REQUEST REQUEST} or
- * {@link javax.servlet.DispatcherType#ASYNC ASYNC} dispatches that occur in
+ * {@link jakarta.servlet.DispatcherType#REQUEST REQUEST} or
+ * {@link jakarta.servlet.DispatcherType#ASYNC ASYNC} dispatches that occur in
  * separate threads. A filter can be configured in {@code web.xml} whether it
  * should be involved in async dispatches. However, in some cases servlet
  * containers assume different default configuration. Therefore sub-classes can
@@ -54,7 +54,7 @@
  * the last one for the given request.
  *
  * <p>Yet another dispatch type that also occurs in its own thread is
- * {@link javax.servlet.DispatcherType#ERROR ERROR}. Subclasses can override
+ * {@link jakarta.servlet.DispatcherType#ERROR ERROR}. Subclasses can override
  * {@link #shouldNotFilterErrorDispatch()} if they wish to declare statically
  * if they should be invoked <em>once</em> during error dispatches.
  *
@@ -136,7 +136,7 @@ private boolean skipDispatch(HttpServletRequest request) {
 	}
 
 	/**
-	 * The dispatcher type {@code javax.servlet.DispatcherType.ASYNC} introduced
+	 * The dispatcher type {@code jakarta.servlet.DispatcherType.ASYNC} introduced
 	 * in Servlet 3.0 means a filter can be invoked in more than one thread over
 	 * the course of a single request. This method returns {@code true} if the
 	 * filter is currently executing within an asynchronous dispatch.
@@ -189,7 +189,7 @@ protected boolean shouldNotFilter(HttpServletRequest request) throws ServletExce
 	}
 
 	/**
-	 * The dispatcher type {@code javax.servlet.DispatcherType.ASYNC} introduced
+	 * The dispatcher type {@code jakarta.servlet.DispatcherType.ASYNC} introduced
 	 * in Servlet 3.0 means a filter can be invoked in more than one thread
 	 * over the course of a single request. Some filters only need to filter
 	 * the initial thread (e.g. request wrapping) while others may need
diff --git a/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectFilter.java b/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectFilter.java
index 25df286a0c48..86868520031b 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectFilter.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.util.Assert;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java
index baf4ab53ce9b..5f1fc11be844 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java
@@ -15,8 +15,8 @@
  */
 package org.springframework.web.filter;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java b/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
index 8bb6a821bb2e..3a57d72e9172 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java
index 40cf7681e20d..35bd66ce58bb 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ServletContextRequestLoggingFilter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.filter;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Simple request logging filter that writes the request URI
@@ -29,7 +29,7 @@
  * @see #setBeforeMessageSuffix
  * @see #setAfterMessagePrefix
  * @see #setAfterMessageSuffix
- * @see javax.servlet.ServletContext#log(String)
+ * @see jakarta.servlet.ServletContext#log(String)
  */
 public class ServletContextRequestLoggingFilter extends AbstractRequestLoggingFilter {
 
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java
index cc9e85015f47..eccdb82ae38b 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java
@@ -17,12 +17,12 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.server.RequestPath;
 import org.springframework.web.util.ServletRequestPathUtils;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
index de2935bc6860..06e164297f8f 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
@@ -20,12 +20,12 @@
 import java.io.InputStream;
 import java.io.PrintWriter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -37,7 +37,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * {@link javax.servlet.Filter} that generates an {@code ETag} value based on the
+ * {@link jakarta.servlet.Filter} that generates an {@code ETag} value based on the
  * content on the response. This ETag is compared to the {@code If-None-Match}
  * header of the request. If these headers are equal, the response content is
  * not sent, but rather a {@code 304 "Not Modified"} status instead.
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java b/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
index 7d8f082586f6..98dd6cce8a61 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.jsf;
 
-import javax.faces.application.NavigationHandler;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.lang.Nullable;
 
@@ -34,7 +34,7 @@
  *
  * @author Juergen Hoeller
  * @since 1.2.7
- * @see #handleNavigation(javax.faces.context.FacesContext, String, String, NavigationHandler)
+ * @see #handleNavigation(jakarta.faces.context.FacesContext, String, String, NavigationHandler)
  * @see DelegatingNavigationHandlerProxy
  */
 public abstract class DecoratingNavigationHandler extends NavigationHandler {
@@ -71,7 +71,7 @@ public final NavigationHandler getDecoratedNavigationHandler() {
 	 * This implementation of the standard JSF {@code handleNavigation} method
 	 * delegates to the overloaded variant, passing in constructor-injected
 	 * NavigationHandler as argument.
-	 * @see #handleNavigation(javax.faces.context.FacesContext, String, String, javax.faces.application.NavigationHandler)
+	 * @see #handleNavigation(jakarta.faces.context.FacesContext, String, String, jakarta.faces.application.NavigationHandler)
 	 */
 	@Override
 	public final void handleNavigation(FacesContext facesContext, String fromAction, String outcome) {
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
index a6eafaace42c..e1369563e9f8 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.jsf;
 
-import javax.faces.application.NavigationHandler;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
index 261d9baac1b3..45b312738ceb 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseEvent;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PhaseListener;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.ListableBeanFactory;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
index 144446031479..05c2addf4df2 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.jsf;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
index 922174d830d0..e30e7e7a7302 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
@@ -19,11 +19,11 @@
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
 
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotWritableException;
-import javax.faces.context.FacesContext;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.context.WebApplicationContext;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
index d729187464d3..6a072053fb15 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
@@ -19,11 +19,10 @@
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
 
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.faces.context.FacesContext;
-
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.faces.context.FacesContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
index 4e0c8095c608..703362d31e88 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.beans.ConversionNotSupportedException;
 import org.springframework.beans.TypeMismatchException;
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
index 18c60dee2b75..70f2a06e6140 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.method.annotation;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
index 94933860ce82..77489f0a9c3d 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
@@ -28,9 +28,8 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -70,7 +69,7 @@
  * <p>Model attributes are obtained from the model or created with a default
  * constructor (and then added to the model). Once created the attribute is
  * populated via data binding to Servlet request parameters. Validation may be
- * applied if the argument is annotated with {@code @javax.validation.Valid}.
+ * applied if the argument is annotated with {@code @jakarta.validation.Valid}.
  * or Spring's own {@code @org.springframework.validation.annotation.Validated}.
  *
  * <p>When this handler is created with {@code annotationNotRequired=true}
@@ -367,7 +366,7 @@ else if (StringUtils.startsWithIgnoreCase(
 
 	/**
 	 * Validate the model attribute if applicable.
-	 * <p>The default implementation checks for {@code @javax.validation.Valid},
+	 * <p>The default implementation checks for {@code @jakarta.validation.Valid},
 	 * Spring's {@link org.springframework.validation.annotation.Validated},
 	 * and custom annotations whose name starts with "Valid".
 	 * @param binder the DataBinder to be used
@@ -387,7 +386,7 @@ protected void validateIfApplicable(WebDataBinder binder, MethodParameter parame
 
 	/**
 	 * Validate the specified candidate value if applicable.
-	 * <p>The default implementation checks for {@code @javax.validation.Valid},
+	 * <p>The default implementation checks for {@code @jakarta.validation.Valid},
 	 * Spring's {@link org.springframework.validation.annotation.Validated},
 	 * and custom annotations whose name starts with "Valid".
 	 * @param binder the DataBinder to be used
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
index 221743e71541..7c71280f4fd4 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
@@ -20,8 +20,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
index e1d373ca5b81..ec1aeb1149d6 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -52,7 +52,7 @@
 /**
  * Resolves method arguments annotated with @{@link RequestParam}, arguments of
  * type {@link MultipartFile} in conjunction with Spring's {@link MultipartResolver}
- * abstraction, and arguments of type {@code javax.servlet.http.Part} in conjunction
+ * abstraction, and arguments of type {@code jakarta.servlet.http.Part} in conjunction
  * with Servlet 3.0 multipart requests. This resolver can also be created in default
  * resolution mode in which simple types (int, long, etc.) not annotated with
  * {@link RequestParam @RequestParam} are also treated as request parameters with
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
index e92a6c47fe68..725bbfc0dc80 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
@@ -134,7 +134,7 @@ default Resource getResource() {
 	 * @throws IllegalStateException if the file has already been moved
 	 * in the filesystem and is not available anymore for another transfer
 	 * @see org.apache.commons.fileupload.FileItem#write(File)
-	 * @see javax.servlet.http.Part#write(String)
+	 * @see jakarta.servlet.http.Part#write(String)
 	 */
 	void transferTo(File dest) throws IOException, IllegalStateException;
 
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
index 7788b1e70457..692dd710d22a 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.multipart;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -26,7 +26,7 @@
  * Provides additional methods for dealing with multipart content within a
  * servlet request, allowing to access uploaded files.
  * Implementations also need to override the standard
- * {@link javax.servlet.ServletRequest} methods for parameter access, making
+ * {@link jakarta.servlet.ServletRequest} methods for parameter access, making
  * multipart parameters available.
  *
  * <p>A concrete implementation is
@@ -40,9 +40,9 @@
  * @since 29.09.2003
  * @see MultipartResolver
  * @see MultipartFile
- * @see javax.servlet.http.HttpServletRequest#getParameter
- * @see javax.servlet.http.HttpServletRequest#getParameterNames
- * @see javax.servlet.http.HttpServletRequest#getParameterMap
+ * @see jakarta.servlet.http.HttpServletRequest#getParameter
+ * @see jakarta.servlet.http.HttpServletRequest#getParameterNames
+ * @see jakarta.servlet.http.HttpServletRequest#getParameterMap
  * @see org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest
  * @see org.springframework.web.multipart.support.AbstractMultipartHttpServletRequest
  */
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
index c8d7b6423911..cd18292d2606 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.multipart;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * A strategy interface for multipart file upload resolution in accordance
@@ -42,7 +42,7 @@
  *
  * <p>If a {@link org.springframework.web.servlet.DispatcherServlet} detects a
  * multipart request, it will resolve it via the configured {@link MultipartResolver}
- * and pass on a wrapped {@link javax.servlet.http.HttpServletRequest}. Controllers
+ * and pass on a wrapped {@link jakarta.servlet.http.HttpServletRequest}. Controllers
  * can then cast their given request to the {@link MultipartHttpServletRequest}
  * interface, which allows for access to any {@link MultipartFile MultipartFiles}.
  * Note that this cast is only supported in case of an actual multipart request.
@@ -106,9 +106,9 @@ public interface MultipartResolver {
 	 * @see MultipartHttpServletRequest#getFile
 	 * @see MultipartHttpServletRequest#getFileNames
 	 * @see MultipartHttpServletRequest#getFileMap
-	 * @see javax.servlet.http.HttpServletRequest#getParameter
-	 * @see javax.servlet.http.HttpServletRequest#getParameterNames
-	 * @see javax.servlet.http.HttpServletRequest#getParameterMap
+	 * @see jakarta.servlet.http.HttpServletRequest#getParameter
+	 * @see jakarta.servlet.http.HttpServletRequest#getParameterNames
+	 * @see jakarta.servlet.http.HttpServletRequest#getParameterMap
 	 */
 	MultipartHttpServletRequest resolveMultipart(HttpServletRequest request) throws MultipartException;
 
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
deleted file mode 100644
index 99fcee5f8c48..000000000000
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * 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.
- * 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.web.multipart.commons;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUpload;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.io.Resource;
-import org.springframework.core.log.LogFormatUtils;
-import org.springframework.http.MediaType;
-import org.springframework.lang.Nullable;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.util.WebUtils;
-
-/**
- * Base class for multipart resolvers that use Apache Commons FileUpload
- * 1.2 or above.
- *
- * <p>Provides common configuration properties and parsing functionality
- * for multipart requests, using a Map of Spring CommonsMultipartFile instances
- * as representation of uploaded files and a String-based parameter Map as
- * representation of uploaded form fields.
- *
- * @author Juergen Hoeller
- * @since 2.0
- * @see CommonsMultipartFile
- * @see CommonsMultipartResolver
- */
-public abstract class CommonsFileUploadSupport {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private final DiskFileItemFactory fileItemFactory;
-
-	private final FileUpload fileUpload;
-
-	private boolean uploadTempDirSpecified = false;
-
-	private boolean preserveFilename = false;
-
-
-	/**
-	 * Instantiate a new CommonsFileUploadSupport with its
-	 * corresponding FileItemFactory and FileUpload instances.
-	 * @see #newFileItemFactory
-	 * @see #newFileUpload
-	 */
-	public CommonsFileUploadSupport() {
-		this.fileItemFactory = newFileItemFactory();
-		this.fileUpload = newFileUpload(getFileItemFactory());
-	}
-
-
-	/**
-	 * Return the underlying {@code org.apache.commons.fileupload.disk.DiskFileItemFactory}
-	 * instance. There is hardly any need to access this.
-	 * @return the underlying DiskFileItemFactory instance
-	 */
-	public DiskFileItemFactory getFileItemFactory() {
-		return this.fileItemFactory;
-	}
-
-	/**
-	 * Return the underlying {@code org.apache.commons.fileupload.FileUpload}
-	 * instance. There is hardly any need to access this.
-	 * @return the underlying FileUpload instance
-	 */
-	public FileUpload getFileUpload() {
-		return this.fileUpload;
-	}
-
-	/**
-	 * Set the maximum allowed size (in bytes) before an upload gets rejected.
-	 * -1 indicates no limit (the default).
-	 * @param maxUploadSize the maximum upload size allowed
-	 * @see org.apache.commons.fileupload.FileUploadBase#setSizeMax
-	 */
-	public void setMaxUploadSize(long maxUploadSize) {
-		this.fileUpload.setSizeMax(maxUploadSize);
-	}
-
-	/**
-	 * Set the maximum allowed size (in bytes) for each individual file before
-	 * an upload gets rejected. -1 indicates no limit (the default).
-	 * @param maxUploadSizePerFile the maximum upload size per file
-	 * @since 4.2
-	 * @see org.apache.commons.fileupload.FileUploadBase#setFileSizeMax
-	 */
-	public void setMaxUploadSizePerFile(long maxUploadSizePerFile) {
-		this.fileUpload.setFileSizeMax(maxUploadSizePerFile);
-	}
-
-	/**
-	 * Set the maximum allowed size (in bytes) before uploads are written to disk.
-	 * Uploaded files will still be received past this amount, but they will not be
-	 * stored in memory. Default is 10240, according to Commons FileUpload.
-	 * @param maxInMemorySize the maximum in memory size allowed
-	 * @see org.apache.commons.fileupload.disk.DiskFileItemFactory#setSizeThreshold
-	 */
-	public void setMaxInMemorySize(int maxInMemorySize) {
-		this.fileItemFactory.setSizeThreshold(maxInMemorySize);
-	}
-
-	/**
-	 * Set the default character encoding to use for parsing requests,
-	 * to be applied to headers of individual parts and to form fields.
-	 * Default is ISO-8859-1, according to the Servlet spec.
-	 * <p>If the request specifies a character encoding itself, the request
-	 * encoding will override this setting. This also allows for generically
-	 * overriding the character encoding in a filter that invokes the
-	 * {@code ServletRequest.setCharacterEncoding} method.
-	 * @param defaultEncoding the character encoding to use
-	 * @see javax.servlet.ServletRequest#getCharacterEncoding
-	 * @see javax.servlet.ServletRequest#setCharacterEncoding
-	 * @see WebUtils#DEFAULT_CHARACTER_ENCODING
-	 * @see org.apache.commons.fileupload.FileUploadBase#setHeaderEncoding
-	 */
-	public void setDefaultEncoding(String defaultEncoding) {
-		this.fileUpload.setHeaderEncoding(defaultEncoding);
-	}
-
-	/**
-	 * Determine the default encoding to use for parsing requests.
-	 * @see #setDefaultEncoding
-	 */
-	protected String getDefaultEncoding() {
-		String encoding = getFileUpload().getHeaderEncoding();
-		if (encoding == null) {
-			encoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
-		}
-		return encoding;
-	}
-
-	/**
-	 * Set the temporary directory where uploaded files get stored.
-	 * Default is the servlet container's temporary directory for the web application.
-	 * @see org.springframework.web.util.WebUtils#TEMP_DIR_CONTEXT_ATTRIBUTE
-	 */
-	public void setUploadTempDir(Resource uploadTempDir) throws IOException {
-		if (!uploadTempDir.exists() && !uploadTempDir.getFile().mkdirs()) {
-			throw new IllegalArgumentException("Given uploadTempDir [" + uploadTempDir + "] could not be created");
-		}
-		this.fileItemFactory.setRepository(uploadTempDir.getFile());
-		this.uploadTempDirSpecified = true;
-	}
-
-	/**
-	 * Return the temporary directory where uploaded files get stored.
-	 * @see #setUploadTempDir
-	 */
-	protected boolean isUploadTempDirSpecified() {
-		return this.uploadTempDirSpecified;
-	}
-
-	/**
-	 * Set whether to preserve the filename as sent by the client, not stripping off
-	 * path information in {@link CommonsMultipartFile#getOriginalFilename()}.
-	 * <p>Default is "false", stripping off path information that may prefix the
-	 * actual filename e.g. from Opera. Switch this to "true" for preserving the
-	 * client-specified filename as-is, including potential path separators.
-	 * @since 4.3.5
-	 * @see MultipartFile#getOriginalFilename()
-	 * @see CommonsMultipartFile#setPreserveFilename(boolean)
-	 */
-	public void setPreserveFilename(boolean preserveFilename) {
-		this.preserveFilename = preserveFilename;
-	}
-
-
-	/**
-	 * Factory method for a Commons DiskFileItemFactory instance.
-	 * <p>Default implementation returns a standard DiskFileItemFactory.
-	 * Can be overridden to use a custom subclass, e.g. for testing purposes.
-	 * @return the new DiskFileItemFactory instance
-	 */
-	protected DiskFileItemFactory newFileItemFactory() {
-		return new DiskFileItemFactory();
-	}
-
-	/**
-	 * Factory method for a Commons FileUpload instance.
-	 * <p><b>To be implemented by subclasses.</b>
-	 * @param fileItemFactory the Commons FileItemFactory to build upon
-	 * @return the Commons FileUpload instance
-	 */
-	protected abstract FileUpload newFileUpload(FileItemFactory fileItemFactory);
-
-
-	/**
-	 * Determine an appropriate FileUpload instance for the given encoding.
-	 * <p>Default implementation returns the shared FileUpload instance
-	 * if the encoding matches, else creates a new FileUpload instance
-	 * with the same configuration other than the desired encoding.
-	 * @param encoding the character encoding to use
-	 * @return an appropriate FileUpload instance.
-	 */
-	protected FileUpload prepareFileUpload(@Nullable String encoding) {
-		FileUpload fileUpload = getFileUpload();
-		FileUpload actualFileUpload = fileUpload;
-
-		// Use new temporary FileUpload instance if the request specifies
-		// its own encoding that does not match the default encoding.
-		if (encoding != null && !encoding.equals(fileUpload.getHeaderEncoding())) {
-			actualFileUpload = newFileUpload(getFileItemFactory());
-			actualFileUpload.setSizeMax(fileUpload.getSizeMax());
-			actualFileUpload.setFileSizeMax(fileUpload.getFileSizeMax());
-			actualFileUpload.setHeaderEncoding(encoding);
-		}
-
-		return actualFileUpload;
-	}
-
-	/**
-	 * Parse the given List of Commons FileItems into a Spring MultipartParsingResult,
-	 * containing Spring MultipartFile instances and a Map of multipart parameter.
-	 * @param fileItems the Commons FileItems to parse
-	 * @param encoding the encoding to use for form fields
-	 * @return the Spring MultipartParsingResult
-	 * @see CommonsMultipartFile#CommonsMultipartFile(org.apache.commons.fileupload.FileItem)
-	 */
-	protected MultipartParsingResult parseFileItems(List<FileItem> fileItems, String encoding) {
-		MultiValueMap<String, MultipartFile> multipartFiles = new LinkedMultiValueMap<>();
-		Map<String, String[]> multipartParameters = new HashMap<>();
-		Map<String, String> multipartParameterContentTypes = new HashMap<>();
-
-		// Extract multipart files and multipart parameters.
-		for (FileItem fileItem : fileItems) {
-			if (fileItem.isFormField()) {
-				String value;
-				String partEncoding = determineEncoding(fileItem.getContentType(), encoding);
-				try {
-					value = fileItem.getString(partEncoding);
-				}
-				catch (UnsupportedEncodingException ex) {
-					if (logger.isWarnEnabled()) {
-						logger.warn("Could not decode multipart item '" + fileItem.getFieldName() +
-								"' with encoding '" + partEncoding + "': using platform default");
-					}
-					value = fileItem.getString();
-				}
-				String[] curParam = multipartParameters.get(fileItem.getFieldName());
-				if (curParam == null) {
-					// simple form field
-					multipartParameters.put(fileItem.getFieldName(), new String[] {value});
-				}
-				else {
-					// array of simple form fields
-					String[] newParam = StringUtils.addStringToArray(curParam, value);
-					multipartParameters.put(fileItem.getFieldName(), newParam);
-				}
-				multipartParameterContentTypes.put(fileItem.getFieldName(), fileItem.getContentType());
-			}
-			else {
-				// multipart file field
-				CommonsMultipartFile file = createMultipartFile(fileItem);
-				multipartFiles.add(file.getName(), file);
-				LogFormatUtils.traceDebug(logger, traceOn ->
-						"Part '" + file.getName() + "', size " + file.getSize() +
-								" bytes, filename='" + file.getOriginalFilename() + "'" +
-								(traceOn ? ", storage=" + file.getStorageDescription() : "")
-				);
-			}
-		}
-		return new MultipartParsingResult(multipartFiles, multipartParameters, multipartParameterContentTypes);
-	}
-
-	/**
-	 * Create a {@link CommonsMultipartFile} wrapper for the given Commons {@link FileItem}.
-	 * @param fileItem the Commons FileItem to wrap
-	 * @return the corresponding CommonsMultipartFile (potentially a custom subclass)
-	 * @since 4.3.5
-	 * @see #setPreserveFilename(boolean)
-	 * @see CommonsMultipartFile#setPreserveFilename(boolean)
-	 */
-	protected CommonsMultipartFile createMultipartFile(FileItem fileItem) {
-		CommonsMultipartFile multipartFile = new CommonsMultipartFile(fileItem);
-		multipartFile.setPreserveFilename(this.preserveFilename);
-		return multipartFile;
-	}
-
-	/**
-	 * Cleanup the Spring MultipartFiles created during multipart parsing,
-	 * potentially holding temporary data on disk.
-	 * <p>Deletes the underlying Commons FileItem instances.
-	 * @param multipartFiles a Collection of MultipartFile instances
-	 * @see org.apache.commons.fileupload.FileItem#delete()
-	 */
-	protected void cleanupFileItems(MultiValueMap<String, MultipartFile> multipartFiles) {
-		for (List<MultipartFile> files : multipartFiles.values()) {
-			for (MultipartFile file : files) {
-				if (file instanceof CommonsMultipartFile) {
-					CommonsMultipartFile cmf = (CommonsMultipartFile) file;
-					cmf.getFileItem().delete();
-					LogFormatUtils.traceDebug(logger, traceOn ->
-							"Cleaning up part '" + cmf.getName() +
-									"', filename '" + cmf.getOriginalFilename() + "'" +
-									(traceOn ? ", stored " + cmf.getStorageDescription() : ""));
-				}
-			}
-		}
-	}
-
-	private String determineEncoding(String contentTypeHeader, String defaultEncoding) {
-		if (!StringUtils.hasText(contentTypeHeader)) {
-			return defaultEncoding;
-		}
-		MediaType contentType = MediaType.parseMediaType(contentTypeHeader);
-		Charset charset = contentType.getCharset();
-		return (charset != null ? charset.name() : defaultEncoding);
-	}
-
-
-	/**
-	 * Holder for a Map of Spring MultipartFiles and a Map of
-	 * multipart parameters.
-	 */
-	protected static class MultipartParsingResult {
-
-		private final MultiValueMap<String, MultipartFile> multipartFiles;
-
-		private final Map<String, String[]> multipartParameters;
-
-		private final Map<String, String> multipartParameterContentTypes;
-
-		public MultipartParsingResult(MultiValueMap<String, MultipartFile> mpFiles,
-				Map<String, String[]> mpParams, Map<String, String> mpParamContentTypes) {
-
-			this.multipartFiles = mpFiles;
-			this.multipartParameters = mpParams;
-			this.multipartParameterContentTypes = mpParamContentTypes;
-		}
-
-		public MultiValueMap<String, MultipartFile> getMultipartFiles() {
-			return this.multipartFiles;
-		}
-
-		public Map<String, String[]> getMultipartParameters() {
-			return this.multipartParameters;
-		}
-
-		public Map<String, String> getMultipartParameterContentTypes() {
-			return this.multipartParameterContentTypes;
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
deleted file mode 100644
index 691b52519e23..000000000000
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * 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.
- * 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.web.multipart.commons;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.log.LogFormatUtils;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.util.StreamUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * {@link MultipartFile} implementation for Apache Commons FileUpload.
- *
- * @author Trevor D. Cook
- * @author Juergen Hoeller
- * @since 29.09.2003
- * @see CommonsMultipartResolver
- */
-@SuppressWarnings("serial")
-public class CommonsMultipartFile implements MultipartFile, Serializable {
-
-	protected static final Log logger = LogFactory.getLog(CommonsMultipartFile.class);
-
-	private final FileItem fileItem;
-
-	private final long size;
-
-	private boolean preserveFilename = false;
-
-
-	/**
-	 * Create an instance wrapping the given FileItem.
-	 * @param fileItem the FileItem to wrap
-	 */
-	public CommonsMultipartFile(FileItem fileItem) {
-		this.fileItem = fileItem;
-		this.size = this.fileItem.getSize();
-	}
-
-
-	/**
-	 * Return the underlying {@code org.apache.commons.fileupload.FileItem}
-	 * instance. There is hardly any need to access this.
-	 */
-	public final FileItem getFileItem() {
-		return this.fileItem;
-	}
-
-	/**
-	 * Set whether to preserve the filename as sent by the client, not stripping off
-	 * path information in {@link CommonsMultipartFile#getOriginalFilename()}.
-	 * <p>Default is "false", stripping off path information that may prefix the
-	 * actual filename e.g. from Opera. Switch this to "true" for preserving the
-	 * client-specified filename as-is, including potential path separators.
-	 * @since 4.3.5
-	 * @see #getOriginalFilename()
-	 * @see CommonsMultipartResolver#setPreserveFilename(boolean)
-	 */
-	public void setPreserveFilename(boolean preserveFilename) {
-		this.preserveFilename = preserveFilename;
-	}
-
-
-	@Override
-	public String getName() {
-		return this.fileItem.getFieldName();
-	}
-
-	@Override
-	public String getOriginalFilename() {
-		String filename = this.fileItem.getName();
-		if (filename == null) {
-			// Should never happen.
-			return "";
-		}
-		if (this.preserveFilename) {
-			// Do not try to strip off a path...
-			return filename;
-		}
-
-		// Check for Unix-style path
-		int unixSep = filename.lastIndexOf('/');
-		// Check for Windows-style path
-		int winSep = filename.lastIndexOf('\\');
-		// Cut off at latest possible point
-		int pos = Math.max(winSep, unixSep);
-		if (pos != -1)  {
-			// Any sort of path separator found...
-			return filename.substring(pos + 1);
-		}
-		else {
-			// A plain name
-			return filename;
-		}
-	}
-
-	@Override
-	public String getContentType() {
-		return this.fileItem.getContentType();
-	}
-
-	@Override
-	public boolean isEmpty() {
-		return (this.size == 0);
-	}
-
-	@Override
-	public long getSize() {
-		return this.size;
-	}
-
-	@Override
-	public byte[] getBytes() {
-		if (!isAvailable()) {
-			throw new IllegalStateException("File has been moved - cannot be read again");
-		}
-		byte[] bytes = this.fileItem.get();
-		return (bytes != null ? bytes : new byte[0]);
-	}
-
-	@Override
-	public InputStream getInputStream() throws IOException {
-		if (!isAvailable()) {
-			throw new IllegalStateException("File has been moved - cannot be read again");
-		}
-		InputStream inputStream = this.fileItem.getInputStream();
-		return (inputStream != null ? inputStream : StreamUtils.emptyInput());
-	}
-
-	@Override
-	public void transferTo(File dest) throws IOException, IllegalStateException {
-		if (!isAvailable()) {
-			throw new IllegalStateException("File has already been moved - cannot be transferred again");
-		}
-
-		if (dest.exists() && !dest.delete()) {
-			throw new IOException(
-					"Destination file [" + dest.getAbsolutePath() + "] already exists and could not be deleted");
-		}
-
-		try {
-			this.fileItem.write(dest);
-			LogFormatUtils.traceDebug(logger, traceOn -> {
-				String action = "transferred";
-				if (!this.fileItem.isInMemory()) {
-					action = (isAvailable() ? "copied" : "moved");
-				}
-				return "Part '" + getName() + "',  filename '" + getOriginalFilename() + "'" +
-						(traceOn ? ", stored " + getStorageDescription() : "") +
-						": " + action + " to [" + dest.getAbsolutePath() + "]";
-			});
-		}
-		catch (FileUploadException ex) {
-			throw new IllegalStateException(ex.getMessage(), ex);
-		}
-		catch (IllegalStateException | IOException ex) {
-			// Pass through IllegalStateException when coming from FileItem directly,
-			// or propagate an exception from I/O operations within FileItem.write
-			throw ex;
-		}
-		catch (Exception ex) {
-			throw new IOException("File transfer failed", ex);
-		}
-	}
-
-	@Override
-	public void transferTo(Path dest) throws IOException, IllegalStateException {
-		if (!isAvailable()) {
-			throw new IllegalStateException("File has already been moved - cannot be transferred again");
-		}
-
-		FileCopyUtils.copy(this.fileItem.getInputStream(), Files.newOutputStream(dest));
-	}
-
-	/**
-	 * Determine whether the multipart content is still available.
-	 * If a temporary file has been moved, the content is no longer available.
-	 */
-	protected boolean isAvailable() {
-		// If in memory, it's available.
-		if (this.fileItem.isInMemory()) {
-			return true;
-		}
-		// Check actual existence of temporary file.
-		if (this.fileItem instanceof DiskFileItem) {
-			return ((DiskFileItem) this.fileItem).getStoreLocation().exists();
-		}
-		// Check whether current file size is different than original one.
-		return (this.fileItem.getSize() == this.size);
-	}
-
-	/**
-	 * Return a description for the storage location of the multipart content.
-	 * Tries to be as specific as possible: mentions the file location in case
-	 * of a temporary file.
-	 */
-	public String getStorageDescription() {
-		if (this.fileItem.isInMemory()) {
-			return "in memory";
-		}
-		else if (this.fileItem instanceof DiskFileItem) {
-			return "at [" + ((DiskFileItem) this.fileItem).getStoreLocation().getAbsolutePath() + "]";
-		}
-		else {
-			return "on disk";
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "MultipartFile[field=\"" + this.fileItem.getFieldName() + "\"" +
-				(this.fileItem.getName() != null ? ", filename=" + this.fileItem.getName() : "" ) +
-				(this.fileItem.getContentType() != null ? ", contentType=" + this.fileItem.getContentType() : "") +
-				", size=" + this.fileItem.getSize() + "]";
-	}
-}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
deleted file mode 100644
index b6911fe9813d..000000000000
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
+++ /dev/null
@@ -1,237 +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.web.multipart.commons;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUpload;
-import org.apache.commons.fileupload.FileUploadBase;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.fileupload.servlet.ServletRequestContext;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.web.context.ServletContextAware;
-import org.springframework.web.multipart.MaxUploadSizeExceededException;
-import org.springframework.web.multipart.MultipartException;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.support.AbstractMultipartHttpServletRequest;
-import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest;
-import org.springframework.web.util.WebUtils;
-
-/**
- * Servlet-based {@link MultipartResolver} implementation for
- * <a href="https://commons.apache.org/proper/commons-fileupload">Apache Commons FileUpload</a>
- * 1.2 or above. This resolver variant delegates to a local FileUpload library
- * within the application, providing maximum portability across Servlet containers.
- *
- * <p>Commons FileUpload traditionally parses POST requests with any "multipart/" type.
- * Supported HTTP methods may be customized through {@link #setSupportedMethods}.
- *
- * <p>Provides "maxUploadSize", "maxInMemorySize" and "defaultEncoding" settings as
- * bean properties (inherited from {@link CommonsFileUploadSupport}). See corresponding
- * ServletFileUpload / DiskFileItemFactory properties ("sizeMax", "sizeThreshold",
- * "headerEncoding") for details in terms of defaults and accepted values.
- *
- * <p>Saves temporary files to the servlet container's temporary directory.
- * Needs to be initialized <i>either</i> by an application context <i>or</i>
- * via the constructor that takes a ServletContext (for standalone usage).
- *
- * <p>Note: The common alternative is
- * {@link org.springframework.web.multipart.support.StandardServletMultipartResolver},
- * delegating to the Servlet container's own multipart parser, with configuration to
- * happen at the container level and potentially with container-specific limitations.
- *
- * @author Trevor D. Cook
- * @author Juergen Hoeller
- * @since 29.09.2003
- * @see #CommonsMultipartResolver(ServletContext)
- * @see #setResolveLazily
- * @see #setSupportedMethods
- * @see org.apache.commons.fileupload.servlet.ServletFileUpload
- * @see org.apache.commons.fileupload.disk.DiskFileItemFactory
- * @see org.springframework.web.multipart.support.StandardServletMultipartResolver
- */
-public class CommonsMultipartResolver extends CommonsFileUploadSupport
-		implements MultipartResolver, ServletContextAware {
-
-	private boolean resolveLazily = false;
-
-	@Nullable
-	private Set<String> supportedMethods;
-
-
-	/**
-	 * Constructor for use as bean. Determines the servlet container's
-	 * temporary directory via the ServletContext passed in as through the
-	 * ServletContextAware interface (typically by a WebApplicationContext).
-	 * @see #setServletContext
-	 * @see org.springframework.web.context.ServletContextAware
-	 * @see org.springframework.web.context.WebApplicationContext
-	 */
-	public CommonsMultipartResolver() {
-		super();
-	}
-
-	/**
-	 * Constructor for standalone usage. Determines the servlet container's
-	 * temporary directory via the given ServletContext.
-	 * @param servletContext the ServletContext to use
-	 */
-	public CommonsMultipartResolver(ServletContext servletContext) {
-		this();
-		setServletContext(servletContext);
-	}
-
-
-	/**
-	 * Set whether to resolve the multipart request lazily at the time of
-	 * file or parameter access.
-	 * <p>Default is "false", resolving the multipart elements immediately, throwing
-	 * corresponding exceptions at the time of the {@link #resolveMultipart} call.
-	 * Switch this to "true" for lazy multipart parsing, throwing parse exceptions
-	 * once the application attempts to obtain multipart files or parameters.
-	 */
-	public void setResolveLazily(boolean resolveLazily) {
-		this.resolveLazily = resolveLazily;
-	}
-
-	/**
-	 * Specify supported methods as an array of HTTP method names.
-	 * The traditional Commons FileUpload default is "POST" only.
-	 * <p>When configured as a Spring property value,
-	 * this can be a comma-separated String: e.g. "POST,PUT".
-	 * @since 5.3.9
-	 */
-	public void setSupportedMethods(String... supportedMethods) {
-		this.supportedMethods = new HashSet<>(Arrays.asList(supportedMethods));
-	}
-
-	/**
-	 * Initialize the underlying {@code org.apache.commons.fileupload.servlet.ServletFileUpload}
-	 * instance. Can be overridden to use a custom subclass, e.g. for testing purposes.
-	 * @param fileItemFactory the Commons FileItemFactory to use
-	 * @return the new ServletFileUpload instance
-	 */
-	@Override
-	protected FileUpload newFileUpload(FileItemFactory fileItemFactory) {
-		return new ServletFileUpload(fileItemFactory);
-	}
-
-	@Override
-	public void setServletContext(ServletContext servletContext) {
-		if (!isUploadTempDirSpecified()) {
-			getFileItemFactory().setRepository(WebUtils.getTempDir(servletContext));
-		}
-	}
-
-
-	@Override
-	public boolean isMultipart(HttpServletRequest request) {
-		return (this.supportedMethods != null ?
-				this.supportedMethods.contains(request.getMethod()) &&
-						FileUploadBase.isMultipartContent(new ServletRequestContext(request)) :
-				ServletFileUpload.isMultipartContent(request));
-	}
-
-	@Override
-	public MultipartHttpServletRequest resolveMultipart(final HttpServletRequest request) throws MultipartException {
-		Assert.notNull(request, "Request must not be null");
-		if (this.resolveLazily) {
-			return new DefaultMultipartHttpServletRequest(request) {
-				@Override
-				protected void initializeMultipart() {
-					MultipartParsingResult parsingResult = parseRequest(request);
-					setMultipartFiles(parsingResult.getMultipartFiles());
-					setMultipartParameters(parsingResult.getMultipartParameters());
-					setMultipartParameterContentTypes(parsingResult.getMultipartParameterContentTypes());
-				}
-			};
-		}
-		else {
-			MultipartParsingResult parsingResult = parseRequest(request);
-			return new DefaultMultipartHttpServletRequest(request, parsingResult.getMultipartFiles(),
-					parsingResult.getMultipartParameters(), parsingResult.getMultipartParameterContentTypes());
-		}
-	}
-
-	/**
-	 * Parse the given servlet request, resolving its multipart elements.
-	 * @param request the request to parse
-	 * @return the parsing result
-	 * @throws MultipartException if multipart resolution failed.
-	 */
-	protected MultipartParsingResult parseRequest(HttpServletRequest request) throws MultipartException {
-		String encoding = determineEncoding(request);
-		FileUpload fileUpload = prepareFileUpload(encoding);
-		try {
-			List<FileItem> fileItems = ((ServletFileUpload) fileUpload).parseRequest(request);
-			return parseFileItems(fileItems, encoding);
-		}
-		catch (FileUploadBase.SizeLimitExceededException ex) {
-			throw new MaxUploadSizeExceededException(fileUpload.getSizeMax(), ex);
-		}
-		catch (FileUploadBase.FileSizeLimitExceededException ex) {
-			throw new MaxUploadSizeExceededException(fileUpload.getFileSizeMax(), ex);
-		}
-		catch (FileUploadException ex) {
-			throw new MultipartException("Failed to parse multipart servlet request", ex);
-		}
-	}
-
-	/**
-	 * Determine the encoding for the given request.
-	 * Can be overridden in subclasses.
-	 * <p>The default implementation checks the request encoding,
-	 * falling back to the default encoding specified for this resolver.
-	 * @param request current HTTP request
-	 * @return the encoding for the request (never {@code null})
-	 * @see javax.servlet.ServletRequest#getCharacterEncoding
-	 * @see #setDefaultEncoding
-	 */
-	protected String determineEncoding(HttpServletRequest request) {
-		String encoding = request.getCharacterEncoding();
-		if (encoding == null) {
-			encoding = getDefaultEncoding();
-		}
-		return encoding;
-	}
-
-	@Override
-	public void cleanupMultipart(MultipartHttpServletRequest request) {
-		if (!(request instanceof AbstractMultipartHttpServletRequest) ||
-				((AbstractMultipartHttpServletRequest) request).isResolved()) {
-			try {
-				cleanupFileItems(request.getMultiFileMap());
-			}
-			catch (Throwable ex) {
-				logger.warn("Failed to perform multipart cleanup for servlet request", ex);
-			}
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
deleted file mode 100644
index 03b636815d45..000000000000
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * MultipartResolver implementation for
- * <a href="https://commons.apache.org/proper/commons-fileupload">Apache Commons FileUpload</a>.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.web.multipart.commons;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
index 3c2a8834c563..8504b96816c9 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
index d882620af27b..3a7859e56159 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
index 414405d8038f..f19d587f5e2f 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.multipart.support;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.web.multipart.MultipartResolver;
 
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
index 1cd8fb2c3cec..276c5a05e201 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java
index 7d554e9052d7..6d480e858147 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartResolutionDelegate.java
@@ -20,8 +20,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
index e390f90f733f..aa1bfca3c3fc 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
@@ -21,8 +21,8 @@
 import java.io.InputStream;
 import java.nio.charset.Charset;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
index 6970c8e12ea7..7f21e5e2775b 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
@@ -32,9 +32,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.mail.internet.MimeUtility;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.mail.internet.MimeUtility;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.ContentDisposition;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
index dc06f0768bee..3a29473a4afb 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.multipart.support;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.http.MediaType;
@@ -29,7 +28,7 @@
 
 /**
  * Standard implementation of the {@link MultipartResolver} interface,
- * based on the Servlet 3.0 {@link javax.servlet.http.Part} API.
+ * based on the Servlet 3.0 {@link jakarta.servlet.http.Part} API.
  * To be added as "multipartResolver" bean to a Spring DispatcherServlet context,
  * without any extra configuration at the bean level (see below).
  *
@@ -44,9 +43,9 @@
  *
  * <p><b>Note:</b> In order to use Servlet 3.0 based multipart parsing,
  * you need to mark the affected servlet with a "multipart-config" section in
- * {@code web.xml}, or with a {@link javax.servlet.MultipartConfigElement}
+ * {@code web.xml}, or with a {@link jakarta.servlet.MultipartConfigElement}
  * in programmatic servlet registration, or (in case of a custom servlet class)
- * possibly with a {@link javax.servlet.annotation.MultipartConfig} annotation
+ * possibly with a {@link jakarta.servlet.annotation.MultipartConfig} annotation
  * on your servlet class. Configuration settings such as maximum sizes or
  * storage locations need to be applied at that servlet registration level;
  * Servlet 3.0 does not allow for them to be set at the MultipartResolver level.
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletPartUtils.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletPartUtils.java
index 6a9da0981c5f..5b5b18f13231 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletPartUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletPartUtils.java
@@ -19,8 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.util.LinkedMultiValueMap;
diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java b/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java
index afafa743394f..93db78699c2c 100644
--- a/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java
@@ -16,11 +16,11 @@
 
 package org.springframework.web.server.adapter;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
index faa0ccbf6431..64df59fb2738 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
@@ -27,16 +27,16 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
 
 /**
- * {@link javax.servlet.http.HttpServletRequest} wrapper that caches all content read from
+ * {@link jakarta.servlet.http.HttpServletRequest} wrapper that caches all content read from
  * the {@linkplain #getInputStream() input stream} and {@linkplain #getReader() reader},
  * and allows this content to be retrieved via a {@link #getContentAsByteArray() byte array}.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
index 1b8d3337d801..d1de91db742d 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
@@ -22,17 +22,17 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.util.FastByteArrayOutputStream;
 
 /**
- * {@link javax.servlet.http.HttpServletResponse} wrapper that caches all content written to
+ * {@link jakarta.servlet.http.HttpServletResponse} wrapper that caches all content written to
  * the {@linkplain #getOutputStream() output stream} and {@linkplain #getWriter() writer},
  * and allows this content to be retrieved via a {@link #getContentAsByteArray() byte array}.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
index 2324274e816c..82cc13d9eac6 100644
--- a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
+++ b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.util;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -68,7 +67,7 @@ public class CookieGenerator {
 
 	/**
 	 * Use the given name for cookies created by this generator.
-	 * @see javax.servlet.http.Cookie#getName()
+	 * @see jakarta.servlet.http.Cookie#getName()
 	 */
 	public void setCookieName(@Nullable String cookieName) {
 		this.cookieName = cookieName;
@@ -85,7 +84,7 @@ public String getCookieName() {
 	/**
 	 * Use the given domain for cookies created by this generator.
 	 * The cookie is only visible to servers in this domain.
-	 * @see javax.servlet.http.Cookie#setDomain
+	 * @see jakarta.servlet.http.Cookie#setDomain
 	 */
 	public void setCookieDomain(@Nullable String cookieDomain) {
 		this.cookieDomain = cookieDomain;
@@ -102,7 +101,7 @@ public String getCookieDomain() {
 	/**
 	 * Use the given path for cookies created by this generator.
 	 * The cookie is only visible to URLs in this path and below.
-	 * @see javax.servlet.http.Cookie#setPath
+	 * @see jakarta.servlet.http.Cookie#setPath
 	 */
 	public void setCookiePath(String cookiePath) {
 		this.cookiePath = cookiePath;
@@ -120,7 +119,7 @@ public String getCookiePath() {
 	 * Useful special value: -1 ... not persistent, deleted when client shuts down.
 	 * <p>Default is no specific maximum age at all, using the Servlet container's
 	 * default.
-	 * @see javax.servlet.http.Cookie#setMaxAge
+	 * @see jakarta.servlet.http.Cookie#setMaxAge
 	 */
 	public void setCookieMaxAge(@Nullable Integer cookieMaxAge) {
 		this.cookieMaxAge = cookieMaxAge;
@@ -139,7 +138,7 @@ public Integer getCookieMaxAge() {
 	 * such as HTTPS (SSL). This is an indication to the receiving browser,
 	 * not processed by the HTTP server itself.
 	 * <p>Default is "false".
-	 * @see javax.servlet.http.Cookie#setSecure
+	 * @see jakarta.servlet.http.Cookie#setSecure
 	 */
 	public void setCookieSecure(boolean cookieSecure) {
 		this.cookieSecure = cookieSecure;
@@ -156,7 +155,7 @@ public boolean isCookieSecure() {
 	/**
 	 * Set whether the cookie is supposed to be marked with the "HttpOnly" attribute.
 	 * <p>Default is "false".
-	 * @see javax.servlet.http.Cookie#setHttpOnly
+	 * @see jakarta.servlet.http.Cookie#setHttpOnly
 	 */
 	public void setCookieHttpOnly(boolean cookieHttpOnly) {
 		this.cookieHttpOnly = cookieHttpOnly;
diff --git a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
index 369904116fe2..348375146963 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
 
 /**
  * Servlet HttpSessionListener that automatically exposes the session mutex
@@ -39,7 +39,7 @@
  * @author Juergen Hoeller
  * @since 1.2.7
  * @see WebUtils#SESSION_MUTEX_ATTRIBUTE
- * @see WebUtils#getSessionMutex(javax.servlet.http.HttpSession)
+ * @see WebUtils#getSessionMutex(jakarta.servlet.http.HttpSession)
  * @see org.springframework.web.servlet.mvc.AbstractController#setSynchronizeOnSession
  */
 public class HttpSessionMutexListener implements HttpSessionListener {
diff --git a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
index d3afef75f980..cdf38031364a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
@@ -18,8 +18,8 @@
 
 import java.beans.Introspector;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 import org.springframework.beans.CachedIntrospectionResults;
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
index 1f8db8376beb..08fc49bbeacf 100644
--- a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
+++ b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.util;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java b/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java
index ffaefa75b4be..d0c07c9222a3 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.util;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.PropertyPlaceholderHelper;
diff --git a/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java b/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
index b757f3e59f81..19c2c7742c85 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
@@ -18,11 +18,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletMapping;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.MappingMatch;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.MappingMatch;
 
 import org.springframework.http.server.PathContainer;
 import org.springframework.http.server.RequestPath;
diff --git a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
index f1e206547b2a..d299c11de569 100644
--- a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.util;
 
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
 
 import org.springframework.util.Assert;
 
@@ -28,13 +28,13 @@
  * <p>
  * <ul>
  * <li>{@code page} will be transformed to
- * {@link javax.servlet.jsp.PageContext#PAGE_SCOPE PageContext.PAGE_SCOPE}
+ * {@link jakarta.servlet.jsp.PageContext#PAGE_SCOPE PageContext.PAGE_SCOPE}
  * <li>{@code request} will be transformed to
- * {@link javax.servlet.jsp.PageContext#REQUEST_SCOPE PageContext.REQUEST_SCOPE}
+ * {@link jakarta.servlet.jsp.PageContext#REQUEST_SCOPE PageContext.REQUEST_SCOPE}
  * <li>{@code session} will be transformed to
- * {@link javax.servlet.jsp.PageContext#SESSION_SCOPE PageContext.SESSION_SCOPE}
+ * {@link jakarta.servlet.jsp.PageContext#SESSION_SCOPE PageContext.SESSION_SCOPE}
  * <li>{@code application} will be transformed to
- * {@link javax.servlet.jsp.PageContext#APPLICATION_SCOPE PageContext.APPLICATION_SCOPE}
+ * {@link jakarta.servlet.jsp.PageContext#APPLICATION_SCOPE PageContext.APPLICATION_SCOPE}
  * </ul>
  *
  * @author Alef Arendsen
@@ -123,7 +123,7 @@ public static boolean hasAncestorOfType(Tag tag, Class<?> ancestorTagClass) {
 	 * or in the case of the {@link String}-typed arguments, is composed wholly
 	 * of whitespace; or if the supplied {@code ancestorTagClass} is not
 	 * type-assignable to the {@link Tag} class
-	 * @see #hasAncestorOfType(javax.servlet.jsp.tagext.Tag, Class)
+	 * @see #hasAncestorOfType(jakarta.servlet.jsp.tagext.Tag, Class)
 	 */
 	public static void assertHasAncestorOfType(Tag tag, Class<?> ancestorTagClass, String tagName,
 			String ancestorTagName) {
diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 663dbb7566c4..a17335391a36 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -21,12 +21,11 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletMapping;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.MappingMatch;
-
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.MappingMatch;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -51,7 +50,7 @@
  * @author Rossen Stoyanchev
  * @since 14.01.2004
  * @see #getLookupPathForRequest
- * @see javax.servlet.RequestDispatcher
+ * @see jakarta.servlet.RequestDispatcher
  */
 public class UrlPathHelper {
 
@@ -92,7 +91,7 @@ public class UrlPathHelper {
 	/**
 	 * Whether URL lookups should always use the full path within the current
 	 * web application context, i.e. within
-	 * {@link javax.servlet.ServletContext#getContextPath()}.
+	 * {@link jakarta.servlet.ServletContext#getContextPath()}.
 	 * <p>If set to {@literal false} the path within the current servlet mapping
 	 * is used instead if applicable (i.e. in the case of a prefix based Servlet
 	 * mapping such as "/myServlet/*").
@@ -118,7 +117,7 @@ public void setAlwaysUseFullPath(boolean alwaysUseFullPath) {
 	 * @see #getContextPath
 	 * @see #getRequestUri
 	 * @see WebUtils#DEFAULT_CHARACTER_ENCODING
-	 * @see javax.servlet.ServletRequest#getCharacterEncoding()
+	 * @see jakarta.servlet.ServletRequest#getCharacterEncoding()
 	 * @see java.net.URLDecoder#decode(String, String)
 	 */
 	public void setUrlDecode(boolean urlDecode) {
@@ -159,8 +158,8 @@ public boolean shouldRemoveSemicolonContent() {
 	 * {@code ServletRequest.setCharacterEncoding} method.
 	 * @param defaultEncoding the character encoding to use
 	 * @see #determineEncoding
-	 * @see javax.servlet.ServletRequest#getCharacterEncoding()
-	 * @see javax.servlet.ServletRequest#setCharacterEncoding(String)
+	 * @see jakarta.servlet.ServletRequest#getCharacterEncoding()
+	 * @see jakarta.servlet.ServletRequest#setCharacterEncoding(String)
 	 * @see WebUtils#DEFAULT_CHARACTER_ENCODING
 	 */
 	public void setDefaultEncoding(String defaultEncoding) {
@@ -558,7 +557,7 @@ private String decodeAndCleanUriString(HttpServletRequest request, String uri) {
 	 * @param source the String to decode
 	 * @return the decoded String
 	 * @see WebUtils#DEFAULT_CHARACTER_ENCODING
-	 * @see javax.servlet.ServletRequest#getCharacterEncoding
+	 * @see jakarta.servlet.ServletRequest#getCharacterEncoding
 	 * @see java.net.URLDecoder#decode(String, String)
 	 * @see java.net.URLDecoder#decode(String)
 	 */
@@ -591,7 +590,7 @@ private String decodeInternal(HttpServletRequest request, String source) {
 	 * falling back to the default encoding specified for this resolver.
 	 * @param request current HTTP request
 	 * @return the encoding for the request (never {@code null})
-	 * @see javax.servlet.ServletRequest#getCharacterEncoding()
+	 * @see jakarta.servlet.ServletRequest#getCharacterEncoding()
 	 * @see #setDefaultEncoding
 	 */
 	protected String determineEncoding(HttpServletRequest request) {
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
index bd340eea48ba..d96231b501c2 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.util;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 /**
  * Listener that sets a system property to the web application root directory.
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
index 8a0e76127ae8..7b4c471371ac 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
@@ -25,15 +25,15 @@
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestWrapper;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.ServletResponseWrapper;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
@@ -61,70 +61,70 @@ public abstract class WebUtils {
 	 * <p>If included via a {@code RequestDispatcher}, the current resource will see the
 	 * originating request. Its own request URI is exposed as a request attribute.
 	 */
-	public static final String INCLUDE_REQUEST_URI_ATTRIBUTE = "javax.servlet.include.request_uri";
+	public static final String INCLUDE_REQUEST_URI_ATTRIBUTE = "jakarta.servlet.include.request_uri";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for include context path.
 	 * <p>If included via a {@code RequestDispatcher}, the current resource will see the
 	 * originating context path. Its own context path is exposed as a request attribute.
 	 */
-	public static final String INCLUDE_CONTEXT_PATH_ATTRIBUTE = "javax.servlet.include.context_path";
+	public static final String INCLUDE_CONTEXT_PATH_ATTRIBUTE = "jakarta.servlet.include.context_path";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for include servlet path.
 	 * <p>If included via a {@code RequestDispatcher}, the current resource will see the
 	 * originating servlet path. Its own servlet path is exposed as a request attribute.
 	 */
-	public static final String INCLUDE_SERVLET_PATH_ATTRIBUTE = "javax.servlet.include.servlet_path";
+	public static final String INCLUDE_SERVLET_PATH_ATTRIBUTE = "jakarta.servlet.include.servlet_path";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for include path info.
 	 * <p>If included via a {@code RequestDispatcher}, the current resource will see the
 	 * originating path info. Its own path info is exposed as a request attribute.
 	 */
-	public static final String INCLUDE_PATH_INFO_ATTRIBUTE = "javax.servlet.include.path_info";
+	public static final String INCLUDE_PATH_INFO_ATTRIBUTE = "jakarta.servlet.include.path_info";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for include query string.
 	 * <p>If included via a {@code RequestDispatcher}, the current resource will see the
 	 * originating query string. Its own query string is exposed as a request attribute.
 	 */
-	public static final String INCLUDE_QUERY_STRING_ATTRIBUTE = "javax.servlet.include.query_string";
+	public static final String INCLUDE_QUERY_STRING_ATTRIBUTE = "jakarta.servlet.include.query_string";
 
 	/**
 	 * Standard Servlet 2.4+ spec request attribute for forward request URI.
 	 * <p>If forwarded to via a RequestDispatcher, the current resource will see its
 	 * own request URI. The originating request URI is exposed as a request attribute.
 	 */
-	public static final String FORWARD_REQUEST_URI_ATTRIBUTE = "javax.servlet.forward.request_uri";
+	public static final String FORWARD_REQUEST_URI_ATTRIBUTE = "jakarta.servlet.forward.request_uri";
 
 	/**
 	 * Standard Servlet 2.4+ spec request attribute for forward context path.
 	 * <p>If forwarded to via a RequestDispatcher, the current resource will see its
 	 * own context path. The originating context path is exposed as a request attribute.
 	 */
-	public static final String FORWARD_CONTEXT_PATH_ATTRIBUTE = "javax.servlet.forward.context_path";
+	public static final String FORWARD_CONTEXT_PATH_ATTRIBUTE = "jakarta.servlet.forward.context_path";
 
 	/**
 	 * Standard Servlet 2.4+ spec request attribute for forward servlet path.
 	 * <p>If forwarded to via a RequestDispatcher, the current resource will see its
 	 * own servlet path. The originating servlet path is exposed as a request attribute.
 	 */
-	public static final String FORWARD_SERVLET_PATH_ATTRIBUTE = "javax.servlet.forward.servlet_path";
+	public static final String FORWARD_SERVLET_PATH_ATTRIBUTE = "jakarta.servlet.forward.servlet_path";
 
 	/**
 	 * Standard Servlet 2.4+ spec request attribute for forward path info.
 	 * <p>If forwarded to via a RequestDispatcher, the current resource will see its
 	 * own path ingo. The originating path info is exposed as a request attribute.
 	 */
-	public static final String FORWARD_PATH_INFO_ATTRIBUTE = "javax.servlet.forward.path_info";
+	public static final String FORWARD_PATH_INFO_ATTRIBUTE = "jakarta.servlet.forward.path_info";
 
 	/**
 	 * Standard Servlet 2.4+ spec request attribute for forward query string.
 	 * <p>If forwarded to via a RequestDispatcher, the current resource will see its
 	 * own query string. The originating query string is exposed as a request attribute.
 	 */
-	public static final String FORWARD_QUERY_STRING_ATTRIBUTE = "javax.servlet.forward.query_string";
+	public static final String FORWARD_QUERY_STRING_ATTRIBUTE = "jakarta.servlet.forward.query_string";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for error page status code.
@@ -132,7 +132,7 @@ public abstract class WebUtils {
 	 * to them directly rather than through the servlet container's error page
 	 * resolution mechanism.
 	 */
-	public static final String ERROR_STATUS_CODE_ATTRIBUTE = "javax.servlet.error.status_code";
+	public static final String ERROR_STATUS_CODE_ATTRIBUTE = "jakarta.servlet.error.status_code";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for error page exception type.
@@ -140,7 +140,7 @@ public abstract class WebUtils {
 	 * to them directly rather than through the servlet container's error page
 	 * resolution mechanism.
 	 */
-	public static final String ERROR_EXCEPTION_TYPE_ATTRIBUTE = "javax.servlet.error.exception_type";
+	public static final String ERROR_EXCEPTION_TYPE_ATTRIBUTE = "jakarta.servlet.error.exception_type";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for error page message.
@@ -148,7 +148,7 @@ public abstract class WebUtils {
 	 * to them directly rather than through the servlet container's error page
 	 * resolution mechanism.
 	 */
-	public static final String ERROR_MESSAGE_ATTRIBUTE = "javax.servlet.error.message";
+	public static final String ERROR_MESSAGE_ATTRIBUTE = "jakarta.servlet.error.message";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for error page exception.
@@ -156,7 +156,7 @@ public abstract class WebUtils {
 	 * to them directly rather than through the servlet container's error page
 	 * resolution mechanism.
 	 */
-	public static final String ERROR_EXCEPTION_ATTRIBUTE = "javax.servlet.error.exception";
+	public static final String ERROR_EXCEPTION_ATTRIBUTE = "jakarta.servlet.error.exception";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for error page request URI.
@@ -164,7 +164,7 @@ public abstract class WebUtils {
 	 * to them directly rather than through the servlet container's error page
 	 * resolution mechanism.
 	 */
-	public static final String ERROR_REQUEST_URI_ATTRIBUTE = "javax.servlet.error.request_uri";
+	public static final String ERROR_REQUEST_URI_ATTRIBUTE = "jakarta.servlet.error.request_uri";
 
 	/**
 	 * Standard Servlet 2.3+ spec request attribute for error page servlet name.
@@ -172,7 +172,7 @@ public abstract class WebUtils {
 	 * to them directly rather than through the servlet container's error page
 	 * resolution mechanism.
 	 */
-	public static final String ERROR_SERVLET_NAME_ATTRIBUTE = "javax.servlet.error.servlet_name";
+	public static final String ERROR_SERVLET_NAME_ATTRIBUTE = "jakarta.servlet.error.servlet_name";
 
 	/**
 	 * Prefix of the charset clause in a content type String: ";charset=".
@@ -190,7 +190,7 @@ public abstract class WebUtils {
 	 * Standard Servlet spec context attribute that specifies a temporary
 	 * directory for the current web application, of type {@code java.io.File}.
 	 */
-	public static final String TEMP_DIR_CONTEXT_ATTRIBUTE = "javax.servlet.context.tempdir";
+	public static final String TEMP_DIR_CONTEXT_ATTRIBUTE = "jakarta.servlet.context.tempdir";
 
 	/**
 	 * HTML escape parameter at the servlet context level
@@ -331,7 +331,7 @@ public static File getTempDir(ServletContext servletContext) {
 	 * @param path the path within the web application
 	 * @return the corresponding real path
 	 * @throws FileNotFoundException if the path cannot be resolved to a resource
-	 * @see javax.servlet.ServletContext#getRealPath
+	 * @see jakarta.servlet.ServletContext#getRealPath
 	 */
 	public static String getRealPath(ServletContext servletContext, String path) throws FileNotFoundException {
 		Assert.notNull(servletContext, "ServletContext must not be null");
@@ -492,7 +492,7 @@ else if (response instanceof ServletResponseWrapper) {
 	/**
 	 * Determine whether the given request is an include request,
 	 * that is, not a top-level HTTP request coming in from the outside.
-	 * <p>Checks the presence of the "javax.servlet.include.request_uri"
+	 * <p>Checks the presence of the "jakarta.servlet.include.request_uri"
 	 * request attribute. Could check any request attribute that is only
 	 * present in an include request.
 	 * @param request current servlet request
@@ -503,18 +503,18 @@ public static boolean isIncludeRequest(ServletRequest request) {
 	}
 
 	/**
-	 * Expose the Servlet spec's error attributes as {@link javax.servlet.http.HttpServletRequest}
+	 * Expose the Servlet spec's error attributes as {@link jakarta.servlet.http.HttpServletRequest}
 	 * attributes under the keys defined in the Servlet 2.3 specification, for error pages that
 	 * are rendered directly rather than through the Servlet container's error page resolution:
-	 * {@code javax.servlet.error.status_code},
-	 * {@code javax.servlet.error.exception_type},
-	 * {@code javax.servlet.error.message},
-	 * {@code javax.servlet.error.exception},
-	 * {@code javax.servlet.error.request_uri},
-	 * {@code javax.servlet.error.servlet_name}.
+	 * {@code jakarta.servlet.error.status_code},
+	 * {@code jakarta.servlet.error.exception_type},
+	 * {@code jakarta.servlet.error.message},
+	 * {@code jakarta.servlet.error.exception},
+	 * {@code jakarta.servlet.error.request_uri},
+	 * {@code jakarta.servlet.error.servlet_name}.
 	 * <p>Does not override values if already present, to respect attribute values
 	 * that have been exposed explicitly before.
-	 * <p>Exposes status code 200 by default. Set the "javax.servlet.error.status_code"
+	 * <p>Exposes status code 200 by default. Set the "jakarta.servlet.error.status_code"
 	 * attribute explicitly (before or after) in order to expose a different status code.
 	 * @param request current servlet request
 	 * @param ex the exception encountered
@@ -546,14 +546,14 @@ private static void exposeRequestAttributeIfNotPresent(ServletRequest request, S
 	}
 
 	/**
-	 * Clear the Servlet spec's error attributes as {@link javax.servlet.http.HttpServletRequest}
+	 * Clear the Servlet spec's error attributes as {@link jakarta.servlet.http.HttpServletRequest}
 	 * attributes under the keys defined in the Servlet 2.3 specification:
-	 * {@code javax.servlet.error.status_code},
-	 * {@code javax.servlet.error.exception_type},
-	 * {@code javax.servlet.error.message},
-	 * {@code javax.servlet.error.exception},
-	 * {@code javax.servlet.error.request_uri},
-	 * {@code javax.servlet.error.servlet_name}.
+	 * {@code jakarta.servlet.error.status_code},
+	 * {@code jakarta.servlet.error.exception_type},
+	 * {@code jakarta.servlet.error.message},
+	 * {@code jakarta.servlet.error.exception},
+	 * {@code jakarta.servlet.error.request_uri},
+	 * {@code jakarta.servlet.error.servlet_name}.
 	 * @param request current servlet request
 	 */
 	public static void clearErrorRequestAttributes(HttpServletRequest request) {
@@ -683,9 +683,9 @@ else if (value != null) {
 	 * (if this is null or the empty string, all parameters will match)
 	 * @return map containing request parameters <b>without the prefix</b>,
 	 * containing either a String or a String array as values
-	 * @see javax.servlet.ServletRequest#getParameterNames
-	 * @see javax.servlet.ServletRequest#getParameterValues
-	 * @see javax.servlet.ServletRequest#getParameterMap
+	 * @see jakarta.servlet.ServletRequest#getParameterNames
+	 * @see jakarta.servlet.ServletRequest#getParameterValues
+	 * @see jakarta.servlet.ServletRequest#getParameterMap
 	 */
 	public static Map<String, Object> getParametersStartingWith(ServletRequest request, @Nullable String prefix) {
 		Assert.notNull(request, "Request must not be null");
diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java
index 17c057d6d6fb..a4b292f86af4 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java
@@ -180,9 +180,8 @@ public String getFilename() {
 		assertThat(value).isEqualTo("AaBbCc");
 	}
 
-	@Test // gh-24582
+	@Test  // gh-24582
 	public void writeMultipartRelated() {
-
 		MediaType mediaType = MediaType.parseMediaType("multipart/related;type=foo");
 
 		MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder();
@@ -297,9 +296,9 @@ static MultiValueMap<String, Part> parse(MockServerHttpResponse response, Map<St
 		MediaType contentType = response.getHeaders().getContentType();
 		assertThat(contentType.getParameter("boundary")).as("No boundary found").isNotNull();
 
-		// see if Synchronoss NIO Multipart can read what we wrote
-		SynchronossPartHttpMessageReader synchronossReader = new SynchronossPartHttpMessageReader();
-		MultipartHttpMessageReader reader = new MultipartHttpMessageReader(synchronossReader);
+		// see if we can read what we wrote
+		DefaultPartHttpMessageReader partReader = new DefaultPartHttpMessageReader();
+		MultipartHttpMessageReader reader = new MultipartHttpMessageReader(partReader);
 
 		MockServerHttpRequest request = MockServerHttpRequest.post("/")
 				.contentType(MediaType.parseMediaType(contentType.toString()))
diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
deleted file mode 100644
index 10dbdba63a78..000000000000
--- a/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
+++ /dev/null
@@ -1,237 +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.http.codec.multipart;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.channels.ReadableByteChannel;
-import java.time.Duration;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import org.junit.jupiter.api.Test;
-import org.reactivestreams.Subscription;
-import reactor.core.publisher.BaseSubscriber;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-import org.springframework.core.ResolvableType;
-import org.springframework.core.codec.DecodingException;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.core.testfixture.io.buffer.AbstractLeakCheckingTests;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.MultipartBodyBuilder;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.testfixture.http.client.reactive.MockClientHttpRequest;
-import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.core.ResolvableType.forClassWithGenerics;
-import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
-import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
-
-/**
- * Unit tests for {@link SynchronossPartHttpMessageReader}.
- *
- * @author Sebastien Deleuze
- * @author Rossen Stoyanchev
- * @author Brian Clozel
- */
-public class SynchronossPartHttpMessageReaderTests extends AbstractLeakCheckingTests {
-
-	private final MultipartHttpMessageReader reader =
-			new MultipartHttpMessageReader(new SynchronossPartHttpMessageReader());
-
-	private static final ResolvableType PARTS_ELEMENT_TYPE =
-			forClassWithGenerics(MultiValueMap.class, String.class, Part.class);
-
-
-	@Test
-	void canRead() {
-		assertThat(this.reader.canRead(PARTS_ELEMENT_TYPE, MediaType.MULTIPART_FORM_DATA)).isTrue();
-		assertThat(this.reader.canRead(PARTS_ELEMENT_TYPE, MediaType.MULTIPART_MIXED)).isTrue();
-		assertThat(this.reader.canRead(PARTS_ELEMENT_TYPE, MediaType.MULTIPART_RELATED)).isTrue();
-		assertThat(this.reader.canRead(PARTS_ELEMENT_TYPE, null)).isTrue();
-
-		assertThat(this.reader.canRead(
-				forClassWithGenerics(MultiValueMap.class, String.class, Object.class),
-				MediaType.MULTIPART_FORM_DATA)).isFalse();
-
-		assertThat(this.reader.canRead(
-				forClassWithGenerics(MultiValueMap.class, String.class, String.class),
-				MediaType.MULTIPART_FORM_DATA)).isFalse();
-
-		assertThat(this.reader.canRead(
-				forClassWithGenerics(Map.class, String.class, String.class),
-				MediaType.MULTIPART_FORM_DATA)).isFalse();
-
-		assertThat(this.reader.canRead(
-				forClassWithGenerics(MultiValueMap.class, String.class, Part.class),
-				MediaType.APPLICATION_FORM_URLENCODED)).isFalse();
-	}
-
-	@Test
-	void resolveParts() {
-		ServerHttpRequest request = generateMultipartRequest();
-		MultiValueMap<String, Part> parts = this.reader.readMono(PARTS_ELEMENT_TYPE, request, emptyMap()).block();
-
-		assertThat(parts).containsOnlyKeys("filePart", "textPart");
-
-		Part part = parts.getFirst("filePart");
-		assertThat(part).isInstanceOf(FilePart.class);
-		assertThat(part.name()).isEqualTo("filePart");
-		assertThat(((FilePart) part).filename()).isEqualTo("foo.txt");
-		DataBuffer buffer = DataBufferUtils.join(part.content()).block();
-		assertThat(buffer.toString(UTF_8)).isEqualTo("Lorem Ipsum.");
-		DataBufferUtils.release(buffer);
-
-		part = parts.getFirst("textPart");
-		assertThat(part).isInstanceOf(FormFieldPart.class);
-		assertThat(part.name()).isEqualTo("textPart");
-		assertThat(((FormFieldPart) part).value()).isEqualTo("sample-text");
-	}
-
-	@Test // SPR-16545
-	void transferTo() throws IOException {
-		ServerHttpRequest request = generateMultipartRequest();
-		MultiValueMap<String, Part> parts = this.reader.readMono(PARTS_ELEMENT_TYPE, request, emptyMap()).block();
-
-		assertThat(parts).isNotNull();
-		FilePart part = (FilePart) parts.getFirst("filePart");
-		assertThat(part).isNotNull();
-
-		File dest = File.createTempFile(part.filename(), "multipart");
-		part.transferTo(dest).block(Duration.ofSeconds(5));
-
-		assertThat(dest.exists()).isTrue();
-		assertThat(dest.length()).isEqualTo(12);
-		assertThat(dest.delete()).isTrue();
-	}
-
-	@Test
-	void bodyError() {
-		ServerHttpRequest request = generateErrorMultipartRequest();
-		StepVerifier.create(this.reader.readMono(PARTS_ELEMENT_TYPE, request, emptyMap())).verifyError();
-	}
-
-	@Test
-	void readPartsWithoutDemand() {
-		ServerHttpRequest request = generateMultipartRequest();
-		Mono<MultiValueMap<String, Part>> parts = this.reader.readMono(PARTS_ELEMENT_TYPE, request, emptyMap());
-		ZeroDemandSubscriber subscriber = new ZeroDemandSubscriber();
-		parts.subscribe(subscriber);
-		subscriber.cancel();
-	}
-
-	@Test
-	void gh23768() throws IOException {
-		ReadableByteChannel channel = new ClassPathResource("invalid.multipart", getClass()).readableChannel();
-		Flux<DataBuffer> body = DataBufferUtils.readByteChannel(() -> channel, this.bufferFactory, 1024);
-
-		MediaType contentType = new MediaType("multipart", "form-data",
-				singletonMap("boundary", "NbjrKgjbsaMLdnMxMfDpD6myWomYc0qNX0w"));
-		ServerHttpRequest request = MockServerHttpRequest.post("/")
-				.contentType(contentType)
-				.body(body);
-
-		Mono<MultiValueMap<String, Part>> parts = this.reader.readMono(PARTS_ELEMENT_TYPE, request, emptyMap());
-
-		StepVerifier.create(parts)
-				.assertNext(result -> assertThat(result).isEmpty())
-				.verifyComplete();
-	}
-
-	@Test
-	void readTooManyParts() {
-		testMultipartExceptions(reader -> reader.setMaxParts(1),
-				ex -> assertThat(ex)
-						.isInstanceOf(DecodingException.class)
-						.hasMessageStartingWith("Failure while parsing part[2]")
-						.hasRootCauseMessage("Too many parts: Part[2] but maxParts=1")
-		);
-	}
-
-	@Test
-	void readFilePartTooBig() {
-		testMultipartExceptions(reader -> reader.setMaxDiskUsagePerPart(5),
-				ex -> assertThat(ex)
-						.isInstanceOf(DecodingException.class)
-						.hasMessageStartingWith("Failure while parsing part[1]")
-						.hasRootCauseMessage("Part[1] exceeded the disk usage limit of 5 bytes")
-		);
-	}
-
-	@Test
-	void readPartHeadersTooBig() {
-		testMultipartExceptions(reader -> reader.setMaxInMemorySize(1),
-				ex -> assertThat(ex)
-						.isInstanceOf(DecodingException.class)
-						.hasMessageStartingWith("Failure while parsing part[1]")
-						.hasRootCauseMessage("Part[1] exceeded the in-memory limit of 1 bytes")
-		);
-	}
-
-	private void testMultipartExceptions(
-			Consumer<SynchronossPartHttpMessageReader> configurer, Consumer<Throwable> assertions) {
-
-		SynchronossPartHttpMessageReader reader = new SynchronossPartHttpMessageReader();
-		configurer.accept(reader);
-		MultipartHttpMessageReader multipartReader = new MultipartHttpMessageReader(reader);
-		StepVerifier.create(multipartReader.readMono(PARTS_ELEMENT_TYPE, generateMultipartRequest(), emptyMap()))
-				.consumeErrorWith(assertions)
-				.verify();
-	}
-
-	private ServerHttpRequest generateMultipartRequest() {
-		MultipartBodyBuilder partsBuilder = new MultipartBodyBuilder();
-		partsBuilder.part("filePart", new ClassPathResource("org/springframework/http/codec/multipart/foo.txt"));
-		partsBuilder.part("textPart", "sample-text");
-
-		MockClientHttpRequest outputMessage = new MockClientHttpRequest(HttpMethod.POST, "/");
-		new MultipartHttpMessageWriter()
-				.write(Mono.just(partsBuilder.build()), null, MediaType.MULTIPART_FORM_DATA, outputMessage, null)
-				.block(Duration.ofSeconds(5));
-		Flux<DataBuffer> requestBody = outputMessage.getBody()
-				.map(buffer -> this.bufferFactory.wrap(buffer.asByteBuffer()));
-		return MockServerHttpRequest.post("/")
-				.contentType(outputMessage.getHeaders().getContentType())
-				.body(requestBody);
-	}
-
-	private ServerHttpRequest generateErrorMultipartRequest() {
-		return MockServerHttpRequest.post("/")
-				.header(CONTENT_TYPE, MULTIPART_FORM_DATA.toString())
-				.body(Flux.just(this.bufferFactory.wrap("invalid content".getBytes())));
-	}
-
-	private static class ZeroDemandSubscriber extends BaseSubscriber<MultiValueMap<String, Part>> {
-
-		@Override
-		protected void hookOnSubscribe(Subscription subscription) {
-			// Just subscribe without requesting
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
index 0f01d8c47a9f..64acde269375 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
@@ -253,7 +253,7 @@ private Mono<DataBuffer> toDataBufferMono(String value) {
 	}
 
 
-	@javax.xml.bind.annotation.XmlType(name = "pojo")
+	@jakarta.xml.bind.annotation.XmlType(name = "pojo")
 	public static class TypePojo {
 
 		private String foo;
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlEncoderTests.java
index a32a3f727ebf..ab0f2ad8d634 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlEncoderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlEncoderTests.java
@@ -20,10 +20,9 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElement.java b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElement.java
index 7a2dae1aca4c..3d17b3416964 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElement.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElement.java
@@ -19,7 +19,7 @@
 /**
  * @author Arjen Poutsma
  */
-@javax.xml.bind.annotation.XmlRootElement
+@jakarta.xml.bind.annotation.XmlRootElement
 public class XmlRootElement {
 
 }
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithName.java b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithName.java
index 88de86671ac3..5fd82ef986ec 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithName.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithName.java
@@ -16,7 +16,7 @@
 
 package org.springframework.http.codec.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithNameAndNamespace.java b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithNameAndNamespace.java
index dfb765bd0981..3a89dd3e696a 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithNameAndNamespace.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlRootElementWithNameAndNamespace.java
@@ -16,7 +16,7 @@
 
 package org.springframework.http.codec.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlType.java b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlType.java
index cff0d9f45091..749f4c22e234 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlType.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlType.java
@@ -19,7 +19,7 @@
 /**
  * @author Arjen Poutsma
  */
-@javax.xml.bind.annotation.XmlType
+@jakarta.xml.bind.annotation.XmlType
 public class XmlType {
 
 }
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithName.java b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithName.java
index 60c42519a8db..744524da5949 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithName.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithName.java
@@ -16,7 +16,7 @@
 
 package org.springframework.http.codec.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithNameAndNamespace.java b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithNameAndNamespace.java
index f1ea796fbaa2..a299b84c4c77 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithNameAndNamespace.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/XmlTypeWithNameAndNamespace.java
@@ -16,7 +16,7 @@
 
 package org.springframework.http.codec.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java
index f3b3a59496b2..00c3767ca863 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/jaxb/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "namespace")
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "namespace")
 package org.springframework.http.codec.xml.jaxb;
diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
index 43bfe0552098..9f307b450353 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
@@ -29,11 +29,12 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUpload;
-import org.apache.commons.fileupload.RequestContext;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.apache.tomcat.util.http.fileupload.FileItemFactory;
+import org.apache.tomcat.util.http.fileupload.FileUpload;
+import org.apache.tomcat.util.http.fileupload.RequestContext;
+import org.apache.tomcat.util.http.fileupload.UploadContext;
+import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.ClassPathResource;
@@ -327,16 +328,17 @@ private void assertCannotWrite(MediaType mediaType) {
 	}
 
 
-	private static class MockHttpOutputMessageRequestContext implements RequestContext {
+	private static class MockHttpOutputMessageRequestContext implements UploadContext {
 
 		private final MockHttpOutputMessage outputMessage;
 
+		private final byte[] body;
 
 		private MockHttpOutputMessageRequestContext(MockHttpOutputMessage outputMessage) {
 			this.outputMessage = outputMessage;
+			this.body = this.outputMessage.getBodyAsBytes();
 		}
 
-
 		@Override
 		public String getCharacterEncoding() {
 			MediaType type = this.outputMessage.getHeaders().getContentType();
@@ -350,17 +352,17 @@ public String getContentType() {
 		}
 
 		@Override
-		@Deprecated
-		public int getContentLength() {
-			return this.outputMessage.getBodyAsBytes().length;
+		public InputStream getInputStream() throws IOException {
+			return new ByteArrayInputStream(body);
 		}
 
 		@Override
-		public InputStream getInputStream() throws IOException {
-			return new ByteArrayInputStream(this.outputMessage.getBodyAsBytes());
+		public long contentLength() {
+			return body.length;
 		}
 	}
 
+
 	public static class MyBean {
 
 		private String string;
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
index 7649e8415bd5..44e14ac57612 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
@@ -162,7 +162,7 @@ public void writeUTF16() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		String body = "H\u00e9llo W\u00f6rld";
 		this.converter.write(body, contentType, outputMessage);
-		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_16BE)).as("Invalid result").isEqualTo(body);
+		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_16BE)).as("Invalid result").isEqualTo("\"" + body + "\"");
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(contentType);
 	}
 
@@ -260,7 +260,7 @@ public void prefixJson() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		this.converter.setPrefixJson(true);
 		this.converter.writeInternal("foo", null, outputMessage);
-		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")]}', foo");
+		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")]}', \"foo\"");
 	}
 
 	@Test
@@ -268,7 +268,7 @@ public void prefixJsonCustom() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		this.converter.setJsonPrefix(")))");
 		this.converter.writeInternal("foo", null, outputMessage);
-		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")))foo");
+		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")))\"foo\"");
 	}
 
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
index 0b02ce6ae1f2..c3c176bea6ce 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
@@ -21,12 +21,12 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.stream.XMLInputFactory;
 
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
index cf5fa05d46cd..dc210e628d08 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
@@ -18,15 +18,14 @@
 
 import java.nio.charset.StandardCharsets;
 
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.diff.DifferenceEvaluator;
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java
index 44bbd00a296e..79d0158eae99 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ void handlingError(HttpServer httpServer) throws Exception {
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
 	}
 
-	@ParameterizedHttpServerTest // SPR-15560
+	@ParameterizedHttpServerTest  // SPR-15560
 	void emptyPathSegments(HttpServer httpServer) throws Exception {
 		startServer(httpServer);
 
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java
index ce7e1b14fbdc..0a95cdfdacaf 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java
@@ -136,7 +136,7 @@ static Stream<Arguments> headers() {
 			arguments("Netty", new NettyHeadersAdapter(new DefaultHttpHeaders())),
 			arguments("Tomcat", new TomcatHeadersAdapter(new MimeHeaders())),
 			arguments("Undertow", new UndertowHeadersAdapter(new HeaderMap())),
-			arguments("Jetty", new JettyHeadersAdapter(new HttpFields()))
+			arguments("Jetty", new JettyHeadersAdapter(HttpFields.build()))
 		);
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
index 7eca5ed6e14e..d88f32d41194 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
@@ -21,11 +21,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java
index d54f09f09d52..f53a7eb494a3 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java
@@ -18,12 +18,11 @@
 
 import java.util.List;
 
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Part;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
diff --git a/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java b/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java
index 4c252fffd347..5bd5599aa97f 100644
--- a/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java
@@ -18,9 +18,8 @@
 
 import java.util.EventListener;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
index c413f2ca4103..23613401695f 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package org.springframework.web.context.request;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
@@ -38,7 +37,7 @@ public class RequestAndSessionScopedBeanTests {
 
 	@Test
 	@SuppressWarnings("resource")
-	public void testPutBeanInRequest() throws Exception {
+	public void testPutBeanInRequest() {
 		String targetBeanName = "target";
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
@@ -73,7 +72,7 @@ public void testPutBeanInRequest() throws Exception {
 
 	@Test
 	@SuppressWarnings("resource")
-	public void testPutBeanInSession() throws Exception {
+	public void testPutBeanInSession() {
 		String targetBeanName = "target";
 		HttpServletRequest request = new MockHttpServletRequest();
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
index 4e4bdedb134c..84487b927d41 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.context.request;
 
-import javax.servlet.ServletRequestEvent;
-
+import jakarta.servlet.ServletRequestEvent;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.task.MockRunnable;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
index d71be10683a0..373df295887a 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
@@ -19,9 +19,8 @@
 import java.io.Serializable;
 import java.math.BigInteger;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
index db295dc5a997..42ab49c58380 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
@@ -19,13 +19,12 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
index 8315021b4b59..4f4a3a1d8f23 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.context.request;
 
-import javax.servlet.ServletContextEvent;
-
+import jakarta.servlet.ServletContextEvent;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.support.GenericBeanDefinition;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
index 6a71cf98582f..1d0ddfbe1b07 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
@@ -18,8 +18,7 @@
 
 import java.util.function.Consumer;
 
-import javax.servlet.AsyncEvent;
-
+import jakarta.servlet.AsyncEvent;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java
index 6ecb5fd2fd54..c9ff621c4d62 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java
@@ -19,8 +19,7 @@
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 
-import javax.servlet.AsyncEvent;
-
+import jakarta.servlet.AsyncEvent;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
index ccde83a39c4c..2a88cd9566b3 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
@@ -19,8 +19,7 @@
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
index e07100c00450..d3293e41c669 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
@@ -19,8 +19,7 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
-import javax.servlet.AsyncEvent;
-
+import jakarta.servlet.AsyncEvent;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java b/spring-web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java
index c8036faac907..85b7e70f0957 100644
--- a/spring-web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/support/Spr8510Tests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.context.support;
 
-import javax.servlet.ServletContextEvent;
-
+import jakarta.servlet.ServletContextEvent;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.ClassPathBeanDefinitionScanner;
diff --git a/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java b/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java
index c57aeffeadab..0212bada3e1c 100644
--- a/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/cors/DefaultCorsProcessorTests.java
@@ -18,8 +18,7 @@
 
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java
index 2a269ad5534b..9d1c940dc03b 100644
--- a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java
@@ -19,8 +19,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java
index 8ab956d66f43..41d3a4192eaa 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java
@@ -16,11 +16,10 @@
 
 package org.springframework.web.filter;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockFilterConfig;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
index fe9a21dd88a8..322a38997048 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
@@ -19,14 +19,13 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockFilterConfig;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java b/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java
index 576d0287d17b..c7f326ac5bbb 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java
@@ -17,8 +17,7 @@
 
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/CorsFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CorsFilterTests.java
index 35a72e528cb4..f3e13468d002 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/CorsFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/CorsFilterTests.java
@@ -19,9 +19,8 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
index 3454a81d4eb4..875169ca2524 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
@@ -18,14 +18,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.context.WebApplicationContext;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
index 35fa6df4c4f7..a96aee17ccf0 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java
@@ -19,14 +19,13 @@
 import java.io.IOException;
 import java.util.Enumeration;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java
index c35c86b60363..07a508247a31 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java
@@ -18,12 +18,11 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java
index 94024a67492e..f535af81640a 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java
@@ -18,13 +18,12 @@
 
 import java.io.IOException;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java
index dd23fd6ac278..f8e67ea7b1d1 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.filter;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
index c88b2e36c951..fdfe302fbdf4 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
@@ -18,11 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.context.request.RequestAttributes;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
index e3053bbb1b49..b7684a5a82fd 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
@@ -18,10 +18,9 @@
 
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.util.FileCopyUtils;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
index 1dccc8e02abc..445aa47e7bdc 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
@@ -18,9 +18,8 @@
 
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.util.FileCopyUtils;
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java
index 07a27a0cd62b..51904f646872 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingNavigationHandlerTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.jsf;
 
-import javax.faces.application.NavigationHandler;
-import javax.faces.context.FacesContext;
-
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.context.FacesContext;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
index f174615da966..733b51464e91 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
@@ -16,11 +16,10 @@
 
 package org.springframework.web.jsf;
 
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseEvent;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PhaseListener;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.ListableBeanFactory;
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
index 77ef2ad1e585..f72986433508 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
@@ -18,22 +18,22 @@
 
 import java.util.Iterator;
 
-import javax.faces.application.Application;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseStream;
-import javax.faces.context.ResponseWriter;
-import javax.faces.render.RenderKit;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.application.FacesMessage.Severity;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseStream;
+import jakarta.faces.context.ResponseWriter;
+import jakarta.faces.render.RenderKit;
 
 /**
  * Mock implementation of the {@code FacesContext} class to facilitate
  * standalone Action unit tests.
  *
  * @author Ulrik Sandberg
- * @see javax.faces.context.FacesContext
+ * @see jakarta.faces.context.FacesContext
  */
 public class MockFacesContext extends FacesContext {
 
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
index 39685816ff55..41aaf64ca973 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
@@ -16,10 +16,10 @@
 
 package org.springframework.web.jsf;
 
-import javax.faces.FacesException;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
+import jakarta.faces.FacesException;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseListener;
+import jakarta.faces.lifecycle.Lifecycle;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java b/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java
index a75c220fdf22..78d24a16170f 100644
--- a/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java
@@ -20,8 +20,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
 
-import javax.annotation.Priority;
-
+import jakarta.annotation.Priority;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeanUtils;
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
index 47b184f4881e..581e4fe2b129 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
@@ -18,8 +18,7 @@
 
 import java.lang.reflect.Method;
 
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
index 1a2ebcf81536..30fe752b58e6 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
@@ -21,9 +21,8 @@
 import java.net.BindException;
 import java.net.SocketException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.stereotype.Controller;
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
index 8bc0dcb26600..2c1693a6065d 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
@@ -19,8 +19,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.servlet.http.Part;
-
+import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
index 5ad7e894bb11..684d3d76ca43 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
@@ -21,8 +21,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.http.Part;
-
+import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
deleted file mode 100644
index e37bb54c025b..000000000000
--- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
+++ /dev/null
@@ -1,618 +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.web.multipart.commons;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileItemHeaders;
-import org.apache.commons.fileupload.FileUpload;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.MutablePropertyValues;
-import org.springframework.http.MediaType;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.ServletRequestDataBinder;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.support.ByteArrayMultipartFileEditor;
-import org.springframework.web.multipart.support.MultipartFilter;
-import org.springframework.web.multipart.support.StringMultipartFileEditor;
-import org.springframework.web.testfixture.servlet.MockFilterConfig;
-import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
-import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
-import org.springframework.web.testfixture.servlet.MockServletContext;
-import org.springframework.web.testfixture.servlet.PassThroughFilterChain;
-import org.springframework.web.util.WebUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Juergen Hoeller
- * @author Arjen Poutsma
- * @since 08.10.2003
- */
-public class CommonsMultipartResolverTests {
-
-	@Test
-	public void isMultipartWithDefaultSetting() {
-		CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-
-		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-		assertThat(resolver.isMultipart(request)).isFalse();
-
-		request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request = new MockHttpServletRequest("PUT", "/");
-		assertThat(resolver.isMultipart(request)).isFalse();
-
-		request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
-		assertThat(resolver.isMultipart(request)).isFalse();
-
-		request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
-		assertThat(resolver.isMultipart(request)).isFalse();
-
-		request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
-		assertThat(resolver.isMultipart(request)).isFalse();
-	}
-
-	@Test
-	public void isMultipartWithSupportedMethods() {
-		CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-		resolver.setSupportedMethods("POST", "PUT");
-
-		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-		assertThat(resolver.isMultipart(request)).isFalse();
-
-		request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request = new MockHttpServletRequest("PUT", "/");
-		assertThat(resolver.isMultipart(request)).isFalse();
-
-		request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-
-		request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
-		assertThat(resolver.isMultipart(request)).isTrue();
-	}
-
-	@Test
-	public void withApplicationContext() throws Exception {
-		doTestWithApplicationContext(false);
-	}
-
-	@Test
-	public void withApplicationContextAndLazyResolution() throws Exception {
-		doTestWithApplicationContext(true);
-	}
-
-	private void doTestWithApplicationContext(boolean lazy) throws Exception {
-		StaticWebApplicationContext wac = new StaticWebApplicationContext();
-		wac.setServletContext(new MockServletContext());
-		wac.getServletContext().setAttribute(WebUtils.TEMP_DIR_CONTEXT_ATTRIBUTE, new File("mytemp"));
-		wac.refresh();
-		MockCommonsMultipartResolver resolver = new MockCommonsMultipartResolver();
-		resolver.setMaxUploadSize(1000);
-		resolver.setMaxInMemorySize(100);
-		resolver.setDefaultEncoding("enc");
-		if (lazy) {
-			resolver.setResolveLazily(false);
-		}
-		resolver.setServletContext(wac.getServletContext());
-		assertThat(resolver.getFileUpload().getSizeMax()).isEqualTo(1000);
-		assertThat(resolver.getFileItemFactory().getSizeThreshold()).isEqualTo(100);
-		assertThat(resolver.getFileUpload().getHeaderEncoding()).isEqualTo("enc");
-		assertThat(resolver.getFileItemFactory().getRepository().getAbsolutePath().endsWith("mytemp")).isTrue();
-
-		MockHttpServletRequest originalRequest = new MockHttpServletRequest();
-		originalRequest.setMethod("POST");
-		originalRequest.setContentType("multipart/form-data");
-		originalRequest.addHeader("Content-type", "multipart/form-data");
-		originalRequest.addParameter("getField", "getValue");
-		assertThat(resolver.isMultipart(originalRequest)).isTrue();
-		MultipartHttpServletRequest request = resolver.resolveMultipart(originalRequest);
-
-		doTestParameters(request);
-
-		doTestFiles(request);
-
-		doTestBinding(resolver, originalRequest, request);
-
-		wac.close();
-	}
-
-	private void doTestParameters(MultipartHttpServletRequest request) {
-		Set<String> parameterNames = new HashSet<>();
-		Enumeration<String> parameterEnum = request.getParameterNames();
-		while (parameterEnum.hasMoreElements()) {
-			parameterNames.add(parameterEnum.nextElement());
-		}
-		assertThat(parameterNames.size()).isEqualTo(3);
-		assertThat(parameterNames.contains("field3")).isTrue();
-		assertThat(parameterNames.contains("field4")).isTrue();
-		assertThat(parameterNames.contains("getField")).isTrue();
-		assertThat(request.getParameter("field3")).isEqualTo("value3");
-		List<String> parameterValues = Arrays.asList(request.getParameterValues("field3"));
-		assertThat(parameterValues.size()).isEqualTo(1);
-		assertThat(parameterValues.contains("value3")).isTrue();
-		assertThat(request.getParameter("field4")).isEqualTo("value4");
-		parameterValues = Arrays.asList(request.getParameterValues("field4"));
-		assertThat(parameterValues.size()).isEqualTo(2);
-		assertThat(parameterValues.contains("value4")).isTrue();
-		assertThat(parameterValues.contains("value5")).isTrue();
-		assertThat(request.getParameter("field4")).isEqualTo("value4");
-		assertThat(request.getParameter("getField")).isEqualTo("getValue");
-
-		List<String> parameterMapKeys = new ArrayList<>();
-		List<Object> parameterMapValues = new ArrayList<>();
-		for (Object o : request.getParameterMap().keySet()) {
-			String key = (String) o;
-			parameterMapKeys.add(key);
-			parameterMapValues.add(request.getParameterMap().get(key));
-		}
-		assertThat(parameterMapKeys.size()).isEqualTo(3);
-		assertThat(parameterMapValues.size()).isEqualTo(3);
-		int field3Index = parameterMapKeys.indexOf("field3");
-		int field4Index = parameterMapKeys.indexOf("field4");
-		int getFieldIndex = parameterMapKeys.indexOf("getField");
-		assertThat(field3Index != -1).isTrue();
-		assertThat(field4Index != -1).isTrue();
-		assertThat(getFieldIndex != -1).isTrue();
-		parameterValues = Arrays.asList((String[]) parameterMapValues.get(field3Index));
-		assertThat(parameterValues.size()).isEqualTo(1);
-		assertThat(parameterValues.contains("value3")).isTrue();
-		parameterValues = Arrays.asList((String[]) parameterMapValues.get(field4Index));
-		assertThat(parameterValues.size()).isEqualTo(2);
-		assertThat(parameterValues.contains("value4")).isTrue();
-		assertThat(parameterValues.contains("value5")).isTrue();
-		parameterValues = Arrays.asList((String[]) parameterMapValues.get(getFieldIndex));
-		assertThat(parameterValues.size()).isEqualTo(1);
-		assertThat(parameterValues.contains("getValue")).isTrue();
-	}
-
-	private void doTestFiles(MultipartHttpServletRequest request) throws IOException {
-		Set<String> fileNames = new HashSet<>();
-		Iterator<String> fileIter = request.getFileNames();
-		while (fileIter.hasNext()) {
-			fileNames.add(fileIter.next());
-		}
-		assertThat(fileNames.size()).isEqualTo(3);
-		assertThat(fileNames.contains("field1")).isTrue();
-		assertThat(fileNames.contains("field2")).isTrue();
-		assertThat(fileNames.contains("field2x")).isTrue();
-		CommonsMultipartFile file1 = (CommonsMultipartFile) request.getFile("field1");
-		CommonsMultipartFile file2 = (CommonsMultipartFile) request.getFile("field2");
-		CommonsMultipartFile file2x = (CommonsMultipartFile) request.getFile("field2x");
-
-		Map<String, MultipartFile> fileMap = request.getFileMap();
-		assertThat(fileMap.size()).isEqualTo(3);
-		assertThat(fileMap.containsKey("field1")).isTrue();
-		assertThat(fileMap.containsKey("field2")).isTrue();
-		assertThat(fileMap.containsKey("field2x")).isTrue();
-		assertThat(fileMap.get("field1")).isEqualTo(file1);
-		assertThat(fileMap.get("field2")).isEqualTo(file2);
-		assertThat(fileMap.get("field2x")).isEqualTo(file2x);
-
-		MultiValueMap<String, MultipartFile> multiFileMap = request.getMultiFileMap();
-		assertThat(multiFileMap.size()).isEqualTo(3);
-		assertThat(multiFileMap.containsKey("field1")).isTrue();
-		assertThat(multiFileMap.containsKey("field2")).isTrue();
-		assertThat(multiFileMap.containsKey("field2x")).isTrue();
-		List<MultipartFile> field1Files = multiFileMap.get("field1");
-		assertThat(field1Files.size()).isEqualTo(2);
-		assertThat(field1Files.contains(file1)).isTrue();
-		assertThat(multiFileMap.getFirst("field1")).isEqualTo(file1);
-		assertThat(multiFileMap.getFirst("field2")).isEqualTo(file2);
-		assertThat(multiFileMap.getFirst("field2x")).isEqualTo(file2x);
-
-		assertThat(file1.getContentType()).isEqualTo("type1");
-		assertThat(file2.getContentType()).isEqualTo("type2");
-		assertThat(file2x.getContentType()).isEqualTo("type2");
-		assertThat(file1.getOriginalFilename()).isEqualTo("field1.txt");
-		assertThat(file2.getOriginalFilename()).isEqualTo("field2.txt");
-		assertThat(file2x.getOriginalFilename()).isEqualTo("field2x.txt");
-		assertThat(new String(file1.getBytes())).isEqualTo("text1");
-		assertThat(new String(file2.getBytes())).isEqualTo("text2");
-		assertThat(file1.getSize()).isEqualTo(5);
-		assertThat(file2.getSize()).isEqualTo(5);
-		boolean condition1 = file1.getInputStream() instanceof ByteArrayInputStream;
-		assertThat(condition1).isTrue();
-		boolean condition = file2.getInputStream() instanceof ByteArrayInputStream;
-		assertThat(condition).isTrue();
-		File transfer1 = new File("C:/transfer1");
-		file1.transferTo(transfer1);
-		File transfer2 = new File("C:/transfer2");
-		file2.transferTo(transfer2);
-		assertThat(((MockFileItem) file1.getFileItem()).writtenFile).isEqualTo(transfer1);
-		assertThat(((MockFileItem) file2.getFileItem()).writtenFile).isEqualTo(transfer2);
-
-	}
-
-	private void doTestBinding(MockCommonsMultipartResolver resolver, MockHttpServletRequest originalRequest,
-			MultipartHttpServletRequest request) throws UnsupportedEncodingException {
-
-		MultipartTestBean1 mtb1 = new MultipartTestBean1();
-		assertThat(mtb1.getField1()).isEqualTo(null);
-		assertThat(mtb1.getField2()).isEqualTo(null);
-		ServletRequestDataBinder binder = new ServletRequestDataBinder(mtb1, "mybean");
-		binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
-		binder.bind(request);
-		List<MultipartFile> file1List = request.getFiles("field1");
-		CommonsMultipartFile file1a = (CommonsMultipartFile) file1List.get(0);
-		CommonsMultipartFile file1b = (CommonsMultipartFile) file1List.get(1);
-		CommonsMultipartFile file2 = (CommonsMultipartFile) request.getFile("field2");
-		assertThat(mtb1.getField1()[0]).isEqualTo(file1a);
-		assertThat(mtb1.getField1()[1]).isEqualTo(file1b);
-		assertThat(new String(mtb1.getField2())).isEqualTo(new String(file2.getBytes()));
-
-		MultipartTestBean2 mtb2 = new MultipartTestBean2();
-		assertThat(mtb2.getField1()).isEqualTo(null);
-		assertThat(mtb2.getField2()).isEqualTo(null);
-		binder = new ServletRequestDataBinder(mtb2, "mybean");
-		binder.registerCustomEditor(String.class, "field1", new StringMultipartFileEditor());
-		binder.registerCustomEditor(String.class, "field2", new StringMultipartFileEditor("UTF-16"));
-		binder.bind(request);
-		assertThat(mtb2.getField1()[0]).isEqualTo(new String(file1a.getBytes()));
-		assertThat(mtb2.getField1()[1]).isEqualTo(new String(file1b.getBytes()));
-		assertThat(mtb2.getField2()).isEqualTo(new String(file2.getBytes(), "UTF-16"));
-
-		resolver.cleanupMultipart(request);
-		assertThat(((MockFileItem) file1a.getFileItem()).deleted).isTrue();
-		assertThat(((MockFileItem) file1b.getFileItem()).deleted).isTrue();
-		assertThat(((MockFileItem) file2.getFileItem()).deleted).isTrue();
-
-		resolver.setEmpty(true);
-		request = resolver.resolveMultipart(originalRequest);
-		binder.setBindEmptyMultipartFiles(false);
-		String firstBound = mtb2.getField2();
-		binder.bind(request);
-		assertThat(mtb2.getField2().isEmpty()).isFalse();
-		assertThat(mtb2.getField2()).isEqualTo(firstBound);
-
-		request = resolver.resolveMultipart(originalRequest);
-		binder.setBindEmptyMultipartFiles(true);
-		binder.bind(request);
-		assertThat(mtb2.getField2().isEmpty()).isTrue();
-	}
-
-	@Test
-	public void withServletContextAndFilter() throws Exception {
-		StaticWebApplicationContext wac = new StaticWebApplicationContext();
-		wac.setServletContext(new MockServletContext());
-		wac.registerSingleton("filterMultipartResolver", MockCommonsMultipartResolver.class, new MutablePropertyValues());
-		wac.getServletContext().setAttribute(WebUtils.TEMP_DIR_CONTEXT_ATTRIBUTE, new File("mytemp"));
-		wac.refresh();
-		wac.getServletContext().setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, wac);
-		CommonsMultipartResolver resolver = new CommonsMultipartResolver(wac.getServletContext());
-		assertThat(resolver.getFileItemFactory().getRepository().getAbsolutePath().endsWith("mytemp")).isTrue();
-
-		MockFilterConfig filterConfig = new MockFilterConfig(wac.getServletContext(), "filter");
-		filterConfig.addInitParameter("class", "notWritable");
-		filterConfig.addInitParameter("unknownParam", "someValue");
-		final MultipartFilter filter = new MultipartFilter();
-		filter.init(filterConfig);
-
-		final List<MultipartFile> files = new ArrayList<>();
-		final FilterChain filterChain = new FilterChain() {
-			@Override
-			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
-				MultipartHttpServletRequest request = (MultipartHttpServletRequest) servletRequest;
-				files.addAll(request.getFileMap().values());
-			}
-		};
-
-		FilterChain filterChain2 = new PassThroughFilterChain(filter, filterChain);
-
-		MockHttpServletRequest originalRequest = new MockHttpServletRequest();
-		MockHttpServletResponse response = new MockHttpServletResponse();
-		originalRequest.setMethod("POST");
-		originalRequest.setContentType("multipart/form-data");
-		originalRequest.addHeader("Content-type", "multipart/form-data");
-		filter.doFilter(originalRequest, response, filterChain2);
-
-		CommonsMultipartFile file1 = (CommonsMultipartFile) files.get(0);
-		CommonsMultipartFile file2 = (CommonsMultipartFile) files.get(1);
-		assertThat(((MockFileItem) file1.getFileItem()).deleted).isTrue();
-		assertThat(((MockFileItem) file2.getFileItem()).deleted).isTrue();
-	}
-
-	@Test
-	public void withServletContextAndFilterWithCustomBeanName() throws Exception {
-		StaticWebApplicationContext wac = new StaticWebApplicationContext();
-		wac.setServletContext(new MockServletContext());
-		wac.refresh();
-		wac.registerSingleton("myMultipartResolver", MockCommonsMultipartResolver.class, new MutablePropertyValues());
-		wac.getServletContext().setAttribute(WebUtils.TEMP_DIR_CONTEXT_ATTRIBUTE, new File("mytemp"));
-		wac.getServletContext().setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, wac);
-		CommonsMultipartResolver resolver = new CommonsMultipartResolver(wac.getServletContext());
-		assertThat(resolver.getFileItemFactory().getRepository().getAbsolutePath().endsWith("mytemp")).isTrue();
-
-		MockFilterConfig filterConfig = new MockFilterConfig(wac.getServletContext(), "filter");
-		filterConfig.addInitParameter("multipartResolverBeanName", "myMultipartResolver");
-
-		final List<MultipartFile> files = new ArrayList<>();
-		FilterChain filterChain = new FilterChain() {
-			@Override
-			public void doFilter(ServletRequest originalRequest, ServletResponse response) {
-				if (originalRequest instanceof MultipartHttpServletRequest) {
-					MultipartHttpServletRequest request = (MultipartHttpServletRequest) originalRequest;
-					files.addAll(request.getFileMap().values());
-				}
-			}
-		};
-
-		MultipartFilter filter = new MultipartFilter() {
-			private boolean invoked = false;
-			@Override
-			protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
-					FilterChain filterChain) throws ServletException, IOException {
-				super.doFilterInternal(request, response, filterChain);
-				super.doFilterInternal(request, response, filterChain);
-				if (invoked) {
-					throw new ServletException("Should not have been invoked twice");
-				}
-				invoked = true;
-			}
-		};
-		filter.init(filterConfig);
-
-		MockHttpServletRequest originalRequest = new MockHttpServletRequest();
-		originalRequest.setMethod("POST");
-		originalRequest.setContentType("multipart/form-data");
-		originalRequest.addHeader("Content-type", "multipart/form-data");
-		HttpServletResponse response = new MockHttpServletResponse();
-		filter.doFilter(originalRequest, response, filterChain);
-		CommonsMultipartFile file1 = (CommonsMultipartFile) files.get(0);
-		CommonsMultipartFile file2 = (CommonsMultipartFile) files.get(1);
-		assertThat(((MockFileItem) file1.getFileItem()).deleted).isTrue();
-		assertThat(((MockFileItem) file2.getFileItem()).deleted).isTrue();
-	}
-
-
-	public static class MockCommonsMultipartResolver extends CommonsMultipartResolver {
-
-		private boolean empty;
-
-		protected void setEmpty(boolean empty) {
-			this.empty = empty;
-		}
-
-		@Override
-		protected FileUpload newFileUpload(FileItemFactory fileItemFactory) {
-			return new ServletFileUpload() {
-				@Override
-				public List<FileItem> parseRequest(HttpServletRequest request) {
-					if (request instanceof MultipartHttpServletRequest) {
-						throw new IllegalStateException("Already a multipart request");
-					}
-					List<FileItem> fileItems = new ArrayList<>();
-					MockFileItem fileItem1 = new MockFileItem(
-						"field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1");
-					MockFileItem fileItem1x = new MockFileItem(
-						"field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1");
-					MockFileItem fileItem2 = new MockFileItem(
-						"field2", "type2", empty ? "" : "C:\\mypath/field2.txt", empty ? "" : "text2");
-					MockFileItem fileItem2x = new MockFileItem(
-						"field2x", "type2", empty ? "" : "C:/mypath\\field2x.txt", empty ? "" : "text2");
-					MockFileItem fileItem3 = new MockFileItem("field3", null, null, "value3");
-					MockFileItem fileItem4 = new MockFileItem("field4", "text/html; charset=iso-8859-1", null, "value4");
-					MockFileItem fileItem5 = new MockFileItem("field4", null, null, "value5");
-					fileItems.add(fileItem1);
-					fileItems.add(fileItem1x);
-					fileItems.add(fileItem2);
-					fileItems.add(fileItem2x);
-					fileItems.add(fileItem3);
-					fileItems.add(fileItem4);
-					fileItems.add(fileItem5);
-					return fileItems;
-				}
-			};
-		}
-	}
-
-
-	private static class MockFileItem implements FileItem {
-
-		private String fieldName;
-		private String contentType;
-		private String name;
-		private String value;
-
-		private File writtenFile;
-		private boolean deleted;
-
-		public MockFileItem(String fieldName, String contentType, String name, String value) {
-			this.fieldName = fieldName;
-			this.contentType = contentType;
-			this.name = name;
-			this.value = value;
-		}
-
-		@Override
-		public InputStream getInputStream() throws IOException {
-			return new ByteArrayInputStream(value.getBytes());
-		}
-
-		@Override
-		public String getContentType() {
-			return contentType;
-		}
-
-		@Override
-		public String getName() {
-			return name;
-		}
-
-		@Override
-		public boolean isInMemory() {
-			return true;
-		}
-
-		@Override
-		public long getSize() {
-			return value.length();
-		}
-
-		@Override
-		public byte[] get() {
-			return value.getBytes();
-		}
-
-		@Override
-		public String getString(String encoding) throws UnsupportedEncodingException {
-			return new String(get(), encoding);
-		}
-
-		@Override
-		public String getString() {
-			return value;
-		}
-
-		@Override
-		public void write(File file) throws Exception {
-			this.writtenFile = file;
-		}
-
-		@Override
-		public void delete() {
-			this.deleted = true;
-		}
-
-		@Override
-		public String getFieldName() {
-			return fieldName;
-		}
-
-		@Override
-		public void setFieldName(String s) {
-			this.fieldName = s;
-		}
-
-		@Override
-		public boolean isFormField() {
-			return (this.name == null);
-		}
-
-		@Override
-		public void setFormField(boolean b) {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public OutputStream getOutputStream() throws IOException {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public FileItemHeaders getHeaders() {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public void setHeaders(FileItemHeaders headers) {
-			throw new UnsupportedOperationException();
-		}
-	}
-
-
-	public class MultipartTestBean1 {
-
-		private MultipartFile[] field1;
-		private byte[] field2;
-
-		public void setField1(MultipartFile[] field1) {
-			this.field1 = field1;
-		}
-
-		public MultipartFile[] getField1() {
-			return field1;
-		}
-
-		public void setField2(byte[] field2) {
-			this.field2 = field2;
-		}
-
-		public byte[] getField2() {
-			return field2;
-		}
-	}
-
-
-	public class MultipartTestBean2 {
-
-		private String[] field1;
-		private String field2;
-
-		public void setField1(String[] field1) {
-			this.field1 = field1;
-		}
-
-		public String[] getField1() {
-			return field1;
-		}
-
-		public void setField2(String field2) {
-			this.field2 = field2;
-		}
-
-		public String getField2() {
-			return field2;
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
index b9c0e2ee90a7..28aebfa7e82c 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
@@ -19,9 +19,8 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java
index 6814bd55df70..b8ccbaaeeb91 100644
--- a/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java
@@ -15,8 +15,7 @@
  */
 package org.springframework.web.util;
 
-import javax.servlet.http.MappingMatch;
-
+import jakarta.servlet.http.MappingMatch;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.server.RequestPath;
diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
index 2306cdca78cf..bfcc8214445e 100644
--- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.web.util;
 
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
-
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
index 998af1c9eb16..3f1864566280 100644
--- a/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
@@ -21,8 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletInputStream.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletInputStream.java
index 7be60d7318d3..03e4c18f5507 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletInputStream.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletInputStream.java
@@ -19,13 +19,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
 
 import org.springframework.util.Assert;
 
 /**
- * Delegating implementation of {@link javax.servlet.ServletInputStream}.
+ * Delegating implementation of {@link jakarta.servlet.ServletInputStream}.
  *
  * <p>Used by {@link MockHttpServletRequest}; typically not directly
  * used for testing application controllers.
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletOutputStream.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletOutputStream.java
index 774f4bf672c3..e35f81d30f5f 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletOutputStream.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/DelegatingServletOutputStream.java
@@ -19,13 +19,13 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 
 import org.springframework.util.Assert;
 
 /**
- * Delegating implementation of {@link javax.servlet.ServletOutputStream}.
+ * Delegating implementation of {@link jakarta.servlet.ServletOutputStream}.
  *
  * <p>Used by {@link MockHttpServletResponse}; typically not directly
  * used for testing application controllers.
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockAsyncContext.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockAsyncContext.java
index 0391911be354..f01b2b7411e2 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockAsyncContext.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockAsyncContext.java
@@ -20,15 +20,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.lang.Nullable;
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockBodyContent.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockBodyContent.java
index 1d6a50611f24..5992baa04d60 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockBodyContent.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockBodyContent.java
@@ -21,14 +21,14 @@
 import java.io.StringReader;
 import java.io.Writer;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.BodyContent;
 
 import org.springframework.lang.Nullable;
 
 /**
- * Mock implementation of the {@link javax.servlet.jsp.tagext.BodyContent} class.
+ * Mock implementation of the {@link jakarta.servlet.jsp.tagext.BodyContent} class.
  * Only necessary for testing applications when testing custom JSP tags.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java
index 8f2e5eaa9756..c0305df35af4 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java
@@ -20,7 +20,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockExpressionEvaluator.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockExpressionEvaluator.java
deleted file mode 100644
index 3358798e7689..000000000000
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockExpressionEvaluator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- * 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.web.testfixture.servlet;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
-import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
-
-/**
- * Mock implementation of the JSP 2.0 {@link javax.servlet.jsp.el.ExpressionEvaluator}
- * interface, delegating to the Apache JSTL {@link ExpressionEvaluatorManager}.
- * Only necessary for testing applications when testing custom JSP tags.
- *
- * <p>Note that the Apache JSTL implementation (jstl.jar, standard.jar) has to be
- * available on the classpath to use this expression evaluator.
- *
- * @author Juergen Hoeller
- * @since 1.1.5
- * @see org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager
- */
-@SuppressWarnings("deprecation")
-public class MockExpressionEvaluator extends javax.servlet.jsp.el.ExpressionEvaluator {
-
-	private final PageContext pageContext;
-
-
-	/**
-	 * Create a new MockExpressionEvaluator for the given PageContext.
-	 * @param pageContext the JSP PageContext to run in
-	 */
-	public MockExpressionEvaluator(PageContext pageContext) {
-		this.pageContext = pageContext;
-	}
-
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public javax.servlet.jsp.el.Expression parseExpression(final String expression, final Class expectedType,
-			final javax.servlet.jsp.el.FunctionMapper functionMapper) throws javax.servlet.jsp.el.ELException {
-
-		return new javax.servlet.jsp.el.Expression() {
-			@Override
-			public Object evaluate(javax.servlet.jsp.el.VariableResolver variableResolver) throws javax.servlet.jsp.el.ELException {
-				return doEvaluate(expression, expectedType, functionMapper);
-			}
-		};
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Object evaluate(String expression, Class expectedType, javax.servlet.jsp.el.VariableResolver variableResolver,
-			javax.servlet.jsp.el.FunctionMapper functionMapper) throws javax.servlet.jsp.el.ELException {
-
-		return doEvaluate(expression, expectedType, functionMapper);
-	}
-
-	@SuppressWarnings("rawtypes")
-	protected Object doEvaluate(String expression, Class expectedType, javax.servlet.jsp.el.FunctionMapper functionMapper)
-			throws javax.servlet.jsp.el.ELException {
-
-		try {
-			return ExpressionEvaluatorManager.evaluate("JSP EL expression", expression, expectedType, this.pageContext);
-		}
-		catch (JspException ex) {
-			throw new javax.servlet.jsp.el.ELException("Parsing of JSP EL expression \"" + expression + "\" failed", ex);
-		}
-	}
-
-}
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterChain.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterChain.java
index 259fecf306a3..ed7b3d93dda0 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterChain.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterChain.java
@@ -22,20 +22,20 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.FilterChain} interface.
+ * Mock implementation of the {@link jakarta.servlet.FilterChain} interface.
  *
  * <p>A {@link MockFilterChain} can be configured with one or more filters and a
  * Servlet to invoke. The first time the chain is called, it invokes all filters
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterConfig.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterConfig.java
index 2cd954986c36..931f043df599 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterConfig.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterConfig.java
@@ -21,17 +21,17 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.FilterConfig} interface.
+ * Mock implementation of the {@link jakarta.servlet.FilterConfig} interface.
  *
  * <p>Used for testing the web framework; also useful for testing
- * custom {@link javax.servlet.Filter} implementations.
+ * custom {@link jakarta.servlet.Filter} implementations.
  *
  * @author Juergen Hoeller
  * @since 1.0.2
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletMapping.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletMapping.java
index 4b2ce3087f15..b24ed628e590 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletMapping.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletMapping.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.testfixture.servlet;
 
-import javax.servlet.http.HttpServletMapping;
-import javax.servlet.http.MappingMatch;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.MappingMatch;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
index d9023c3ca1ed..bcf9172d8f9c 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
@@ -43,21 +43,21 @@
 import java.util.TimeZone;
 import java.util.stream.Collectors;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletMapping;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -72,7 +72,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface.
+ * Mock implementation of the {@link jakarta.servlet.http.HttpServletRequest} interface.
  *
  * <p>The default, preferred {@link Locale} for the <em>server</em> mocked by this request
  * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale}
@@ -823,7 +823,7 @@ private void updateAcceptLanguageHeader() {
 	 * <p>In contrast to the Servlet specification, this mock implementation
 	 * does <strong>not</strong> take into consideration any locales
 	 * specified via the {@code Accept-Language} header.
-	 * @see javax.servlet.ServletRequest#getLocale()
+	 * @see jakarta.servlet.ServletRequest#getLocale()
 	 * @see #addPreferredLocale(Locale)
 	 * @see #setPreferredLocales(List)
 	 */
@@ -841,7 +841,7 @@ public Locale getLocale() {
 	 * <p>In contrast to the Servlet specification, this mock implementation
 	 * does <strong>not</strong> take into consideration any locales
 	 * specified via the {@code Accept-Language} header.
-	 * @see javax.servlet.ServletRequest#getLocales()
+	 * @see jakarta.servlet.ServletRequest#getLocales()
 	 * @see #addPreferredLocale(Locale)
 	 * @see #setPreferredLocales(List)
 	 */
@@ -864,7 +864,7 @@ public void setSecure(boolean secure) {
 	/**
 	 * Return {@code true} if the {@link #setSecure secure} flag has been set
 	 * to {@code true} or if the {@link #getScheme scheme} is {@code https}.
-	 * @see javax.servlet.ServletRequest#isSecure()
+	 * @see jakarta.servlet.ServletRequest#isSecure()
 	 */
 	@Override
 	public boolean isSecure() {
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
index 4a343c8344c7..00763fa97465 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -38,9 +38,9 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -51,7 +51,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface.
+ * Mock implementation of the {@link jakarta.servlet.http.HttpServletResponse} interface.
  *
  * <p>As of Spring Framework 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
@@ -383,7 +383,7 @@ public void reset() {
 
 	@Override
 	public void setLocale(@Nullable Locale locale) {
-		// Although the Javadoc for javax.servlet.ServletResponse.setLocale(Locale) does not
+		// Although the Javadoc for jakarta.servlet.ServletResponse.setLocale(Locale) does not
 		// state how a null value for the supplied Locale should be handled, both Tomcat and
 		// Jetty simply ignore a null value. So we do the same here.
 		if (locale == null) {
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java
index b8302c48c570..a33c7c9a2236 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java
@@ -25,17 +25,17 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.http.HttpSessionBindingListener;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.http.HttpSession} interface.
+ * Mock implementation of the {@link jakarta.servlet.http.HttpSession} interface.
  *
  * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
@@ -149,7 +149,7 @@ public int getMaxInactiveInterval() {
 	}
 
 	@Override
-	public javax.servlet.http.HttpSessionContext getSessionContext() {
+	public jakarta.servlet.http.HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException("getSessionContext");
 	}
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockJspWriter.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockJspWriter.java
index 03997d1076bd..467a220a3f13 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockJspWriter.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockJspWriter.java
@@ -20,13 +20,13 @@
 import java.io.PrintWriter;
 import java.io.Writer;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspWriter;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspWriter;
 
 import org.springframework.lang.Nullable;
 
 /**
- * Mock implementation of the {@link javax.servlet.jsp.JspWriter} class.
+ * Mock implementation of the {@link jakarta.servlet.jsp.JspWriter} class.
  * Only necessary for testing applications when testing custom JSP tags.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java
index c36eb3ac7bc0..88c51b9498db 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java
@@ -24,9 +24,9 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.Part;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
index 7ffc2d626319..f45973ef9d03 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,24 +24,24 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import javax.el.ELContext;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import jakarta.el.ELContext;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.jsp.PageContext} interface.
+ * Mock implementation of the {@link jakarta.servlet.jsp.PageContext} interface.
  * Only necessary for testing applications when testing custom JSP tags.
  *
  * <p>Note: Expects initialization via the constructor rather than via the
@@ -293,8 +293,9 @@ public JspWriter getOut() {
 
 	@Override
 	@Deprecated
-	public javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() {
-		return new MockExpressionEvaluator(this);
+	@Nullable
+	public jakarta.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator() {
+		return null;
 	}
 
 	@Override
@@ -306,7 +307,7 @@ public ELContext getELContext() {
 	@Override
 	@Deprecated
 	@Nullable
-	public javax.servlet.jsp.el.VariableResolver getVariableResolver() {
+	public jakarta.servlet.jsp.el.VariableResolver getVariableResolver() {
 		return null;
 	}
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPart.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPart.java
index 4079fd69c724..ac1ce65d0ef0 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPart.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPart.java
@@ -22,7 +22,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Part;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -30,7 +30,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of {@code javax.servlet.http.Part}.
+ * Mock implementation of {@code jakarta.servlet.http.Part}.
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockRequestDispatcher.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockRequestDispatcher.java
index 597f1730fff2..38379ac6ede6 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockRequestDispatcher.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockRequestDispatcher.java
@@ -16,18 +16,17 @@
 
 package org.springframework.web.testfixture.servlet;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.RequestDispatcher} interface.
+ * Mock implementation of the {@link jakarta.servlet.RequestDispatcher} interface.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletConfig.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletConfig.java
index 81fcc2421dbb..17f4541a1384 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletConfig.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletConfig.java
@@ -21,14 +21,14 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Mock implementation of the {@link javax.servlet.ServletConfig} interface.
+ * Mock implementation of the {@link jakarta.servlet.ServletConfig} interface.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java
index 978bdf09b053..b44a3b13283f 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java
@@ -31,17 +31,16 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -59,7 +58,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Mock implementation of the {@link javax.servlet.ServletContext} interface.
+ * Mock implementation of the {@link jakarta.servlet.ServletContext} interface.
  *
  * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
@@ -663,7 +662,7 @@ public <T extends Servlet> T createServlet(Class<T> c) throws ServletException {
 
 	/**
 	 * This method always returns {@code null}.
-	 * @see javax.servlet.ServletContext#getServletRegistration(java.lang.String)
+	 * @see jakarta.servlet.ServletContext#getServletRegistration(java.lang.String)
 	 */
 	@Override
 	@Nullable
@@ -673,7 +672,7 @@ public ServletRegistration getServletRegistration(String servletName) {
 
 	/**
 	 * This method always returns an {@linkplain Collections#emptyMap empty map}.
-	 * @see javax.servlet.ServletContext#getServletRegistrations()
+	 * @see jakarta.servlet.ServletContext#getServletRegistrations()
 	 */
 	@Override
 	public Map<String, ? extends ServletRegistration> getServletRegistrations() {
@@ -702,7 +701,7 @@ public <T extends Filter> T createFilter(Class<T> c) throws ServletException {
 
 	/**
 	 * This method always returns {@code null}.
-	 * @see javax.servlet.ServletContext#getFilterRegistration(java.lang.String)
+	 * @see jakarta.servlet.ServletContext#getFilterRegistration(java.lang.String)
 	 */
 	@Override
 	@Nullable
@@ -712,7 +711,7 @@ public FilterRegistration getFilterRegistration(String filterName) {
 
 	/**
 	 * This method always returns an {@linkplain Collections#emptyMap empty map}.
-	 * @see javax.servlet.ServletContext#getFilterRegistrations()
+	 * @see jakarta.servlet.ServletContext#getFilterRegistrations()
 	 */
 	@Override
 	public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockSessionCookieConfig.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockSessionCookieConfig.java
index c7f834508745..04f4a8ceabc4 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockSessionCookieConfig.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockSessionCookieConfig.java
@@ -16,16 +16,16 @@
 
 package org.springframework.web.testfixture.servlet;
 
-import javax.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionCookieConfig;
 
 import org.springframework.lang.Nullable;
 
 /**
- * Mock implementation of the {@link javax.servlet.SessionCookieConfig} interface.
+ * Mock implementation of the {@link jakarta.servlet.SessionCookieConfig} interface.
  *
  * @author Juergen Hoeller
  * @since 4.0
- * @see javax.servlet.ServletContext#getSessionCookieConfig()
+ * @see jakarta.servlet.ServletContext#getSessionCookieConfig()
  */
 public class MockSessionCookieConfig implements SessionCookieConfig {
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/PassThroughFilterChain.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/PassThroughFilterChain.java
index e3537156ac53..2100b0421b93 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/PassThroughFilterChain.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/PassThroughFilterChain.java
@@ -18,26 +18,26 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Implementation of the {@link javax.servlet.FilterConfig} interface which
+ * Implementation of the {@link jakarta.servlet.FilterConfig} interface which
  * simply passes the call through to a given Filter/FilterChain combination
  * (indicating the next Filter in the chain along with the FilterChain that it is
  * supposed to work on) or to a given Servlet (indicating the end of the chain).
  *
  * @author Juergen Hoeller
  * @since 2.0.3
- * @see javax.servlet.Filter
- * @see javax.servlet.Servlet
+ * @see jakarta.servlet.Filter
+ * @see jakarta.servlet.Servlet
  * @see MockFilterChain
  */
 public class PassThroughFilterChain implements FilterChain {
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java
index 59accabc9a29..87487adebc7c 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.testfixture.xml;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 /**
  * @author Sebastien Deleuze
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index b762e09c5cb6..464f3f8902c0 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -9,18 +9,19 @@ dependencies {
 	api("io.projectreactor:reactor-core")
 	optional(project(":spring-context"))
 	optional(project(":spring-context-support"))  // for FreeMarker support
-	optional("javax.servlet:javax.servlet-api")
-	optional("javax.websocket:javax.websocket-api")
+	optional("jakarta.servlet:jakarta.servlet-api")
+	optional("jakarta.websocket:jakarta.websocket-api")
 	optional("org.webjars:webjars-locator-core")
 	optional("org.freemarker:freemarker")
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile")
 	optional("io.projectreactor.netty:reactor-netty-http")
 	optional("org.apache.tomcat:tomcat-websocket")
-	optional("org.eclipse.jetty.websocket:websocket-server") {
-		exclude group: "javax.servlet", module: "javax.servlet"
+	optional("org.eclipse.jetty.websocket:websocket-jetty-server") {
+		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
-	optional("io.undertow:undertow-websockets-jsr")
+	optional("org.eclipse.jetty.websocket:websocket-jetty-client")
+	optional("io.undertow:undertow-websockets-jsr-jakartaee9")
 	optional("org.apache.httpcomponents:httpclient")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
@@ -29,10 +30,10 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-web")))
-	testImplementation("javax.xml.bind:jaxb-api")
+	testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
 	testImplementation("com.fasterxml:aalto-xml")
 	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("javax.validation:validation-api")
+	testImplementation("jakarta.validation:jakarta.validation-api")
 	testImplementation("io.reactivex.rxjava3:rxjava")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.undertow:undertow-core")
@@ -48,12 +49,11 @@ dependencies {
 	testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
 	testRuntimeOnly("org.jruby:jruby")
 	testRuntimeOnly("org.python:jython-standalone")
-	testRuntimeOnly("org.synchronoss.cloud:nio-multipart-parser")
 	testRuntimeOnly("org.webjars:underscorejs")
-	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("org.glassfish:jakarta.el")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
-	testRuntimeOnly("com.sun.activation:javax.activation")
+	testRuntimeOnly("com.sun.activation:jakarta.activation")
 }
 
 test {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
index 828ac8aa0889..1de7d9428e94 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
@@ -383,7 +383,7 @@ public ReactiveAdapterRegistry webFluxAdapterRegistry() {
 	public Validator webFluxValidator() {
 		Validator validator = getValidator();
 		if (validator == null) {
-			if (ClassUtils.isPresent("javax.validation.Validator", getClass().getClassLoader())) {
+			if (ClassUtils.isPresent("jakarta.validation.Validator", getClass().getClassLoader())) {
 				Class<?> clazz;
 				try {
 					String name = "org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean";
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java
index 230ed80958aa..b1c37b591dd6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java
@@ -51,7 +51,7 @@
  * constructor and then added to the model. Once created the attribute is
  * populated via data binding to the request (form data, query params).
  * Validation also may be applied if the argument is annotated with
- * {@code @javax.validation.Valid} or Spring's own
+ * {@code @jakarta.validation.Valid} or Spring's own
  * {@code @org.springframework.validation.annotation.Validated}.
  *
  * <p>When this handler is created with {@code useDefaultResolution=true}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolver.java
index c1bce52df999..2ec18252b64d 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyMethodArgumentResolver.java
@@ -34,7 +34,7 @@
  * body of the request through a compatible {@code HttpMessageReader}.
  *
  * <p>An {@code @RequestBody} method argument is also validated if it is
- * annotated with {@code @javax.validation.Valid} or
+ * annotated with {@code @jakarta.validation.Valid} or
  * {@link org.springframework.validation.annotation.Validated}. Validation
  * failure results in an {@link ServerWebInputException}.
  *
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
index 4ec3f0ecec3c..6905132b8673 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
@@ -296,7 +296,7 @@ protected Mono<Void> sendRedirect(String targetUrl, ServerWebExchange exchange)
 
 	/**
 	 * Whether the given targetUrl has a host that is a "foreign" system in which
-	 * case {@link javax.servlet.http.HttpServletResponse#encodeRedirectURL} will not be applied.
+	 * case {@link jakarta.servlet.http.HttpServletResponse#encodeRedirectURL} will not be applied.
 	 * This method returns {@code true} if the {@link #setHosts(String[])}
 	 * property is configured and the target URL has a host that does not match.
 	 * @param targetUrl the target redirect URL
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/Jetty10WebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/Jetty10WebSocketHandlerAdapter.java
deleted file mode 100644
index 5b88fab79771..000000000000
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/Jetty10WebSocketHandlerAdapter.java
+++ /dev/null
@@ -1,146 +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.web.reactive.socket.adapter;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.function.Function;
-
-import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
-import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.websocket.api.extensions.Frame;
-
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.web.reactive.socket.CloseStatus;
-import org.springframework.web.reactive.socket.WebSocketHandler;
-import org.springframework.web.reactive.socket.WebSocketMessage;
-import org.springframework.web.reactive.socket.WebSocketMessage.Type;
-import org.springframework.web.reactive.socket.WebSocketSession;
-
-/**
- * Identical to {@link JettyWebSocketHandlerAdapter}, only excluding the
- * {@code onWebSocketFrame} method, since the {@link Frame} argument has moved
- * to a different package in Jetty 10.
- *
- * @author Rossen Stoyanchev
- * @since 5.3.4
- */
-@WebSocket
-public class Jetty10WebSocketHandlerAdapter {
-
-	private final WebSocketHandler delegateHandler;
-
-	private final Function<Session, JettyWebSocketSession> sessionFactory;
-
-	@Nullable
-	private JettyWebSocketSession delegateSession;
-
-
-	public Jetty10WebSocketHandlerAdapter(WebSocketHandler handler,
-			Function<Session, JettyWebSocketSession> sessionFactory) {
-
-		Assert.notNull(handler, "WebSocketHandler is required");
-		Assert.notNull(sessionFactory, "'sessionFactory' is required");
-		this.delegateHandler = handler;
-		this.sessionFactory = sessionFactory;
-	}
-
-
-	@OnWebSocketConnect
-	public void onWebSocketConnect(Session session) {
-		this.delegateSession = this.sessionFactory.apply(session);
-		this.delegateHandler.handle(this.delegateSession)
-				.checkpoint(session.getUpgradeRequest().getRequestURI() + " [JettyWebSocketHandlerAdapter]")
-				.subscribe(this.delegateSession);
-	}
-
-	@OnWebSocketMessage
-	public void onWebSocketText(String message) {
-		if (this.delegateSession != null) {
-			WebSocketMessage webSocketMessage = toMessage(Type.TEXT, message);
-			this.delegateSession.handleMessage(webSocketMessage.getType(), webSocketMessage);
-		}
-	}
-
-	@OnWebSocketMessage
-	public void onWebSocketBinary(byte[] message, int offset, int length) {
-		if (this.delegateSession != null) {
-			ByteBuffer buffer = ByteBuffer.wrap(message, offset, length);
-			WebSocketMessage webSocketMessage = toMessage(Type.BINARY, buffer);
-			this.delegateSession.handleMessage(webSocketMessage.getType(), webSocketMessage);
-		}
-	}
-
-// TODO: onWebSocketFrame can't be declared without compiling against Jetty 10
-//   Jetty 10: org.eclipse.jetty.websocket.api.Frame
-//   Jetty  9: org.eclipse.jetty.websocket.api.extensions.Frame
-//
-// private static final ByteBuffer EMPTY_PAYLOAD = ByteBuffer.wrap(new byte[0]);
-//
-//	@OnWebSocketFrame
-//	public void onWebSocketFrame(Frame frame) {
-//		if (this.delegateSession != null) {
-//			if (OpCode.PONG == frame.getOpCode()) {
-//				ByteBuffer buffer = (frame.getPayload() != null ? frame.getPayload() : EMPTY_PAYLOAD);
-//				WebSocketMessage webSocketMessage = toMessage(Type.PONG, buffer);
-//				this.delegateSession.handleMessage(webSocketMessage.getType(), webSocketMessage);
-//			}
-//		}
-//	}
-
-	private <T> WebSocketMessage toMessage(Type type, T message) {
-		WebSocketSession session = this.delegateSession;
-		Assert.state(session != null, "Cannot create message without a session");
-		if (Type.TEXT.equals(type)) {
-			byte[] bytes = ((String) message).getBytes(StandardCharsets.UTF_8);
-			DataBuffer buffer = session.bufferFactory().wrap(bytes);
-			return new WebSocketMessage(Type.TEXT, buffer);
-		}
-		else if (Type.BINARY.equals(type)) {
-			DataBuffer buffer = session.bufferFactory().wrap((ByteBuffer) message);
-			return new WebSocketMessage(Type.BINARY, buffer);
-		}
-		else if (Type.PONG.equals(type)) {
-			DataBuffer buffer = session.bufferFactory().wrap((ByteBuffer) message);
-			return new WebSocketMessage(Type.PONG, buffer);
-		}
-		else {
-			throw new IllegalArgumentException("Unexpected message type: " + message);
-		}
-	}
-
-	@OnWebSocketClose
-	public void onWebSocketClose(int statusCode, String reason) {
-		if (this.delegateSession != null) {
-			this.delegateSession.handleClose(CloseStatus.create(statusCode, reason));
-		}
-	}
-
-	@OnWebSocketError
-	public void onWebSocketError(Throwable cause) {
-		if (this.delegateSession != null) {
-			this.delegateSession.handleError(cause);
-		}
-	}
-
-}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
index baa8e14537e3..79f750abd72b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.Function;
 
+import org.eclipse.jetty.websocket.api.Frame;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
@@ -27,8 +28,7 @@
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketFrame;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.websocket.api.extensions.Frame;
-import org.eclipse.jetty.websocket.common.OpCode;
+import org.eclipse.jetty.websocket.core.OpCode;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.lang.Nullable;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
index a503d9d76c5d..d4699ca32e0a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
@@ -20,11 +20,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.Function;
 
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.lang.Nullable;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
index 3679f36f0eb3..b08e4aca2cc5 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
@@ -20,12 +20,11 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
-
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
+import jakarta.websocket.Session;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
 
@@ -38,7 +37,7 @@
 
 /**
  * Spring {@link WebSocketSession} adapter for a standard Java (JSR 356)
- * {@link javax.websocket.Session}.
+ * {@link jakarta.websocket.Session}.
  *
  * @author Violeta Georgieva
  * @author Rossen Stoyanchev
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
index d06f87533ba8..f23bcd42d260 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
@@ -18,8 +18,7 @@
 
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
-import javax.websocket.Session;
-
+import jakarta.websocket.Session;
 import org.apache.tomcat.websocket.WsSession;
 import reactor.core.publisher.Sinks;
 
@@ -29,7 +28,7 @@
 
 /**
  * Spring {@link WebSocketSession} adapter for Tomcat's
- * {@link javax.websocket.Session}.
+ * {@link jakarta.websocket.Session}.
  *
  * @author Violeta Georgieva
  * @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
index 9bbeb08f845b..4c98f03937e2 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
@@ -17,29 +17,22 @@
 package org.springframework.web.reactive.socket.client;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.function.Function;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.UpgradeRequest;
-import org.eclipse.jetty.websocket.api.UpgradeResponse;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
-import org.eclipse.jetty.websocket.client.io.UpgradeListener;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
 
 import org.springframework.context.Lifecycle;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.reactive.socket.HandshakeInfo;
 import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.reactive.socket.adapter.ContextWebSocketHandler;
-import org.springframework.web.reactive.socket.adapter.Jetty10WebSocketHandlerAdapter;
 import org.springframework.web.reactive.socket.adapter.JettyWebSocketHandlerAdapter;
 import org.springframework.web.reactive.socket.adapter.JettyWebSocketSession;
 
@@ -54,37 +47,23 @@
  *
  * @author Violeta Georgieva
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 5.0
  */
 public class JettyWebSocketClient implements WebSocketClient, Lifecycle {
 
-	private static ClassLoader loader = JettyWebSocketClient.class.getClassLoader();
-
-	private static final boolean jetty10Present;
-
-	static {
-		jetty10Present = ClassUtils.isPresent(
-				"org.eclipse.jetty.websocket.client.JettyUpgradeListener", loader);
-	}
-
-
 	private static final Log logger = LogFactory.getLog(JettyWebSocketClient.class);
 
-
 	private final org.eclipse.jetty.websocket.client.WebSocketClient jettyClient;
 
 	private final boolean externallyManaged;
 
-	private final UpgradeHelper upgradeHelper =
-			(jetty10Present ? new Jetty10UpgradeHelper() : new Jetty9UpgradeHelper());
-
 
 	/**
 	 * Default constructor that creates and manages an instance of a Jetty
 	 * {@link org.eclipse.jetty.websocket.client.WebSocketClient WebSocketClient}.
 	 * The instance can be obtained with {@link #getJettyClient()} for further
 	 * configuration.
-	 *
 	 * <p><strong>Note: </strong> When this constructor is used {@link Lifecycle}
 	 * methods of this class are delegated to the Jetty {@code WebSocketClient}.
 	 */
@@ -96,7 +75,6 @@ public JettyWebSocketClient() {
 	/**
 	 * Constructor that accepts an existing instance of a Jetty
 	 * {@link org.eclipse.jetty.websocket.client.WebSocketClient WebSocketClient}.
-	 *
 	 * <p><strong>Note: </strong> Use of this constructor implies the Jetty
 	 * {@code WebSocketClient} is externally managed and hence {@link Lifecycle}
 	 * methods of this class are not delegated to it.
@@ -165,8 +143,13 @@ private Mono<Void> executeInternal(URI url, HttpHeaders headers, WebSocketHandle
 					url, ContextWebSocketHandler.decorate(handler, contextView), completionSink);
 			ClientUpgradeRequest request = new ClientUpgradeRequest();
 			request.setSubProtocols(handler.getSubProtocols());
-			return this.upgradeHelper.upgrade(
-					this.jettyClient, jettyHandler, url, request, headers, completionSink);
+			try {
+				this.jettyClient.connect(jettyHandler, url, request);
+				return completionSink.asMono();
+			}
+			catch (IOException ex) {
+				return Mono.error(ex);
+			}
 		});
 	}
 
@@ -175,9 +158,7 @@ private Object createHandler(URI url, WebSocketHandler handler, Sinks.Empty<Void
 			HandshakeInfo info = createHandshakeInfo(url, session);
 			return new JettyWebSocketSession(session, info, DefaultDataBufferFactory.sharedInstance, completion);
 		};
-		return (jetty10Present ?
-				new Jetty10WebSocketHandlerAdapter(handler, sessionFactory) :
-				new JettyWebSocketHandlerAdapter(handler, sessionFactory));
+		return new JettyWebSocketHandlerAdapter(handler, sessionFactory);
 	}
 
 	private HandshakeInfo createHandshakeInfo(URI url, Session jettySession) {
@@ -187,80 +168,4 @@ private HandshakeInfo createHandshakeInfo(URI url, Session jettySession) {
 		return new HandshakeInfo(url, headers, Mono.empty(), protocol);
 	}
 
-
-	/**
-	 * Encapsulate incompatible changes between Jetty 9.4 and 10.
-	 */
-	private interface UpgradeHelper {
-
-		Mono<Void> upgrade(org.eclipse.jetty.websocket.client.WebSocketClient jettyClient,
-				Object jettyHandler, URI url, ClientUpgradeRequest request, HttpHeaders headers,
-				Sinks.Empty<Void> completionSink);
-	}
-
-
-	private static class Jetty9UpgradeHelper implements UpgradeHelper {
-
-		@Override
-		public Mono<Void> upgrade(org.eclipse.jetty.websocket.client.WebSocketClient jettyClient,
-				Object jettyHandler, URI url, ClientUpgradeRequest request, HttpHeaders headers,
-				Sinks.Empty<Void> completionSink) {
-
-			try {
-				jettyClient.connect(jettyHandler, url, request, new DefaultUpgradeListener(headers));
-				return completionSink.asMono();
-			}
-			catch (IOException ex) {
-				return Mono.error(ex);
-			}
-		}
-	}
-
-	private static class DefaultUpgradeListener implements UpgradeListener {
-
-		private final HttpHeaders headers;
-
-
-		public DefaultUpgradeListener(HttpHeaders headers) {
-			this.headers = headers;
-		}
-
-		@Override
-		public void onHandshakeRequest(UpgradeRequest request) {
-			this.headers.forEach(request::setHeader);
-		}
-
-		@Override
-		public void onHandshakeResponse(UpgradeResponse response) {
-		}
-	}
-
-	private static class Jetty10UpgradeHelper implements UpgradeHelper {
-
-		// On Jetty 9 returns Future, on Jetty 10 returns CompletableFuture
-		private static final Method connectMethod;
-
-		static {
-			try {
-				Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.client.WebSocketClient");
-				connectMethod = type.getMethod("connect", Object.class, URI.class, ClientUpgradeRequest.class);
-			}
-			catch (ClassNotFoundException | NoSuchMethodException ex) {
-				throw new IllegalStateException("No compatible Jetty version found", ex);
-			}
-		}
-
-		@Override
-		public Mono<Void> upgrade(org.eclipse.jetty.websocket.client.WebSocketClient jettyClient,
-				Object jettyHandler, URI url, ClientUpgradeRequest request, HttpHeaders headers,
-				Sinks.Empty<Void> completionSink) {
-
-			// TODO: pass JettyUpgradeListener argument to set headers from HttpHeaders (like we do for Jetty 9)
-			//  which would require a JDK Proxy since it is new in Jetty 10
-
-			ReflectionUtils.invokeMethod(connectMethod, jettyClient, jettyHandler, url, request);
-			return completionSink.asMono();
-		}
-	}
-
 }
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
index 4bf98585a059..39b61505a191 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
@@ -20,14 +20,13 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ClientEndpointConfig.Configurator;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig.Configurator;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Mono;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
index 8310268db4a6..72c44fc496b8 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.reactive.socket.client;
 
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
 import org.apache.tomcat.websocket.WsWebSocketContainer;
 import reactor.core.publisher.Sinks;
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
index 9255dd6ea7f5..78d6bcb8b60f 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
@@ -70,8 +70,6 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
 
 	private static final boolean jettyPresent;
 
-	private static final boolean jetty10Present;
-
 	private static final boolean undertowPresent;
 
 	private static final boolean reactorNettyPresent;
@@ -79,8 +77,7 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
 	static {
 		ClassLoader loader = HandshakeWebSocketService.class.getClassLoader();
 		tomcatPresent = ClassUtils.isPresent("org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", loader);
-		jettyPresent = ClassUtils.isPresent("org.eclipse.jetty.websocket.server.WebSocketServerFactory", loader);
-		jetty10Present = ClassUtils.isPresent("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", loader);
+		jettyPresent = ClassUtils.isPresent("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", loader);
 		undertowPresent = ClassUtils.isPresent("io.undertow.websockets.WebSocketProtocolHandshakeHandler", loader);
 		reactorNettyPresent = ClassUtils.isPresent("reactor.netty.http.server.HttpServerResponse", loader);
 	}
@@ -122,9 +119,6 @@ private static RequestUpgradeStrategy initUpgradeStrategy() {
 		else if (jettyPresent) {
 			className = "JettyRequestUpgradeStrategy";
 		}
-		else if (jetty10Present) {
-			className = "Jetty10RequestUpgradeStrategy";
-		}
 		else if (undertowPresent) {
 			className = "UndertowRequestUpgradeStrategy";
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java
index 421b16d9630d..913f65cf76a6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java
@@ -21,16 +21,16 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.server.ServerEndpointConfig;
 
 import org.springframework.util.Assert;
 
 /**
- * Default implementation of {@link javax.websocket.server.ServerEndpointConfig}
+ * Default implementation of {@link jakarta.websocket.server.ServerEndpointConfig}
  * for use in {@code RequestUpgradeStrategy} implementations.
  *
  * @author Violeta Georgieva
@@ -48,7 +48,7 @@ class DefaultServerEndpointConfig extends ServerEndpointConfig.Configurator
 
 
 	/**
-	 * Constructor with a path and an {@code javax.websocket.Endpoint}.
+	 * Constructor with a path and an {@code jakarta.websocket.Endpoint}.
 	 * @param path the endpoint path
 	 * @param endpoint the endpoint instance
 	 */
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java
deleted file mode 100644
index cf5ab945817c..000000000000
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java
+++ /dev/null
@@ -1,158 +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.web.reactive.socket.server.upgrade;
-
-import java.lang.reflect.Method;
-import java.util.function.Supplier;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import reactor.core.publisher.Mono;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.target.EmptyTargetSource;
-import org.springframework.core.io.buffer.DataBufferFactory;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
-import org.springframework.http.server.reactive.ServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.web.reactive.socket.HandshakeInfo;
-import org.springframework.web.reactive.socket.WebSocketHandler;
-import org.springframework.web.reactive.socket.adapter.ContextWebSocketHandler;
-import org.springframework.web.reactive.socket.adapter.Jetty10WebSocketHandlerAdapter;
-import org.springframework.web.reactive.socket.adapter.JettyWebSocketSession;
-import org.springframework.web.reactive.socket.server.RequestUpgradeStrategy;
-import org.springframework.web.server.ServerWebExchange;
-
-/**
- * A {@link RequestUpgradeStrategy} for use with Jetty 10.
- *
- * @author Rossen Stoyanchev
- * @since 5.3.4
- */
-public class Jetty10RequestUpgradeStrategy implements RequestUpgradeStrategy {
-
-	private static final Class<?> webSocketCreatorClass;
-
-	private static final Method getContainerMethod;
-
-	private static final Method upgradeMethod;
-
-	private static final Method setAcceptedSubProtocol;
-
-	static {
-		ClassLoader loader = Jetty10RequestUpgradeStrategy.class.getClassLoader();
-		try {
-			webSocketCreatorClass = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketCreator");
-
-			Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer");
-			getContainerMethod = type.getMethod("getContainer", ServletContext.class);
-			Method upgrade = ReflectionUtils.findMethod(type, "upgrade", (Class<?>[]) null);
-			Assert.state(upgrade != null, "Upgrade method not found");
-			upgradeMethod = upgrade;
-
-			type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse");
-			setAcceptedSubProtocol = type.getMethod("setAcceptedSubProtocol", String.class);
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException("No compatible Jetty version found", ex);
-		}
-	}
-
-
-	@Override
-	public Mono<Void> upgrade(
-			ServerWebExchange exchange, WebSocketHandler handler,
-			@Nullable String subProtocol, Supplier<HandshakeInfo> handshakeInfoFactory) {
-
-		ServerHttpRequest request = exchange.getRequest();
-		ServerHttpResponse response = exchange.getResponse();
-
-		HttpServletRequest servletRequest = ServerHttpRequestDecorator.getNativeRequest(request);
-		HttpServletResponse servletResponse = ServerHttpResponseDecorator.getNativeResponse(response);
-		ServletContext servletContext = servletRequest.getServletContext();
-
-		HandshakeInfo handshakeInfo = handshakeInfoFactory.get();
-		DataBufferFactory factory = response.bufferFactory();
-
-		// Trigger WebFlux preCommit actions and upgrade
-		return exchange.getResponse().setComplete()
-				.then(Mono.deferContextual(contextView -> {
-					Jetty10WebSocketHandlerAdapter adapter = new Jetty10WebSocketHandlerAdapter(
-							ContextWebSocketHandler.decorate(handler, contextView),
-							session -> new JettyWebSocketSession(session, handshakeInfo, factory));
-
-					try {
-						Object creator = createJettyWebSocketCreator(adapter, subProtocol);
-						Object container = ReflectionUtils.invokeMethod(getContainerMethod, null, servletContext);
-						ReflectionUtils.invokeMethod(upgradeMethod, container, creator, servletRequest, servletResponse);
-					}
-					catch (Exception ex) {
-						return Mono.error(ex);
-					}
-					return Mono.empty();
-				}));
-	}
-
-	private static Object createJettyWebSocketCreator(
-			Jetty10WebSocketHandlerAdapter adapter, @Nullable String protocol) {
-
-		ProxyFactory factory = new ProxyFactory(EmptyTargetSource.INSTANCE);
-		factory.addInterface(webSocketCreatorClass);
-		factory.addAdvice(new WebSocketCreatorInterceptor(adapter, protocol));
-		return factory.getProxy();
-	}
-
-
-	/**
-	 * Proxy for a JettyWebSocketCreator to supply the WebSocket handler and set the sub-protocol.
-	 */
-	private static class WebSocketCreatorInterceptor implements MethodInterceptor {
-
-		private final Jetty10WebSocketHandlerAdapter adapter;
-
-		@Nullable
-		private final String protocol;
-
-
-		public WebSocketCreatorInterceptor(
-				Jetty10WebSocketHandlerAdapter adapter, @Nullable String protocol) {
-
-			this.adapter = adapter;
-			this.protocol = protocol;
-		}
-
-		@Nullable
-		@Override
-		public Object invoke(@NonNull MethodInvocation invocation) {
-			if (this.protocol != null) {
-				ReflectionUtils.invokeMethod(
-						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
-			}
-			return this.adapter;
-		}
-	}
-
-}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
index cad57bd59119..b230bb587e98 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
@@ -16,26 +16,27 @@
 
 package org.springframework.web.reactive.socket.server.upgrade;
 
-import java.io.IOException;
+import java.lang.reflect.Method;
 import java.util.function.Supplier;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.websocket.api.WebSocketPolicy;
-import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
 import reactor.core.publisher.Mono;
 
-import org.springframework.context.Lifecycle;
-import org.springframework.core.NamedThreadLocal;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.target.EmptyTargetSource;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
+import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.reactive.socket.HandshakeInfo;
 import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.reactive.socket.adapter.ContextWebSocketHandler;
@@ -45,102 +46,46 @@
 import org.springframework.web.server.ServerWebExchange;
 
 /**
- * A {@link RequestUpgradeStrategy} for use with Jetty.
+ * A {@link RequestUpgradeStrategy} for Jetty 11.
  *
- * @author Violeta Georgieva
  * @author Rossen Stoyanchev
- * @since 5.0
+ * @since 5.3.4
  */
-public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Lifecycle {
-
-	private static final ThreadLocal<WebSocketHandlerContainer> adapterHolder =
-			new NamedThreadLocal<>("JettyWebSocketHandlerAdapter");
-
-
-	@Nullable
-	private WebSocketPolicy webSocketPolicy;
-
-	@Nullable
-	private WebSocketServerFactory factory;
+public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
-	@Nullable
-	private volatile ServletContext servletContext;
+	private static final Class<?> webSocketCreatorClass;
 
-	private volatile boolean running;
+	private static final Method getContainerMethod;
 
-	private final Object lifecycleMonitor = new Object();
+	private static final Method upgradeMethod;
 
+	private static final Method setAcceptedSubProtocol;
 
-	/**
-	 * Configure a {@link WebSocketPolicy} to use to initialize
-	 * {@link WebSocketServerFactory}.
-	 * @param webSocketPolicy the WebSocket settings
-	 */
-	public void setWebSocketPolicy(WebSocketPolicy webSocketPolicy) {
-		this.webSocketPolicy = webSocketPolicy;
-	}
+	static {
+		// TODO: can switch to non-reflective implementation now
 
-	/**
-	 * Return the configured {@link WebSocketPolicy}, if any.
-	 */
-	@Nullable
-	public WebSocketPolicy getWebSocketPolicy() {
-		return this.webSocketPolicy;
-	}
+		ClassLoader loader = JettyRequestUpgradeStrategy.class.getClassLoader();
+		try {
+			webSocketCreatorClass = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketCreator");
 
+			Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer");
+			getContainerMethod = type.getMethod("getContainer", ServletContext.class);
+			Method upgrade = ReflectionUtils.findMethod(type, "upgrade", (Class<?>[]) null);
+			Assert.state(upgrade != null, "Upgrade method not found");
+			upgradeMethod = upgrade;
 
-	@Override
-	public void start() {
-		synchronized (this.lifecycleMonitor) {
-			ServletContext servletContext = this.servletContext;
-			if (!isRunning() && servletContext != null) {
-				try {
-					this.factory = (this.webSocketPolicy != null ?
-							new WebSocketServerFactory(servletContext, this.webSocketPolicy) :
-							new WebSocketServerFactory(servletContext));
-					this.factory.setCreator((request, response) -> {
-						WebSocketHandlerContainer container = adapterHolder.get();
-						String protocol = container.getProtocol();
-						if (protocol != null) {
-							response.setAcceptedSubProtocol(protocol);
-						}
-						return container.getAdapter();
-					});
-					this.factory.start();
-					this.running = true;
-				}
-				catch (Throwable ex) {
-					throw new IllegalStateException("Unable to start WebSocketServerFactory", ex);
-				}
-			}
+			type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse");
+			setAcceptedSubProtocol = type.getMethod("setAcceptedSubProtocol", String.class);
 		}
-	}
-
-	@Override
-	public void stop() {
-		synchronized (this.lifecycleMonitor) {
-			if (isRunning()) {
-				if (this.factory != null) {
-					try {
-						this.factory.stop();
-						this.running = false;
-					}
-					catch (Throwable ex) {
-						throw new IllegalStateException("Failed to stop WebSocketServerFactory", ex);
-					}
-				}
-			}
+		catch (Exception ex) {
+			throw new IllegalStateException("No compatible Jetty version found", ex);
 		}
 	}
 
-	@Override
-	public boolean isRunning() {
-		return this.running;
-	}
-
 
 	@Override
-	public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
+	public Mono<Void> upgrade(
+			ServerWebExchange exchange, WebSocketHandler handler,
 			@Nullable String subProtocol, Supplier<HandshakeInfo> handshakeInfoFactory) {
 
 		ServerHttpRequest request = exchange.getRequest();
@@ -148,16 +93,11 @@ public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
 
 		HttpServletRequest servletRequest = ServerHttpRequestDecorator.getNativeRequest(request);
 		HttpServletResponse servletResponse = ServerHttpResponseDecorator.getNativeResponse(response);
+		ServletContext servletContext = servletRequest.getServletContext();
 
 		HandshakeInfo handshakeInfo = handshakeInfoFactory.get();
 		DataBufferFactory factory = response.bufferFactory();
 
-		startLazily(servletRequest);
-
-		Assert.state(this.factory != null, "No WebSocketServerFactory available");
-		boolean isUpgrade = this.factory.isUpgradeRequest(servletRequest, servletResponse);
-		Assert.isTrue(isUpgrade, "Not a WebSocket handshake");
-
 		// Trigger WebFlux preCommit actions and upgrade
 		return exchange.getResponse().setComplete()
 				.then(Mono.deferContextual(contextView -> {
@@ -166,51 +106,53 @@ public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
 							session -> new JettyWebSocketSession(session, handshakeInfo, factory));
 
 					try {
-						adapterHolder.set(new WebSocketHandlerContainer(adapter, subProtocol));
-						this.factory.acceptWebSocket(servletRequest, servletResponse);
+						Object creator = createJettyWebSocketCreator(adapter, subProtocol);
+						Object container = ReflectionUtils.invokeMethod(getContainerMethod, null, servletContext);
+						ReflectionUtils.invokeMethod(upgradeMethod, container, creator, servletRequest, servletResponse);
 					}
-					catch (IOException ex) {
+					catch (Exception ex) {
 						return Mono.error(ex);
 					}
-					finally {
-						adapterHolder.remove();
-					}
 					return Mono.empty();
 				}));
 	}
 
-	private void startLazily(HttpServletRequest request) {
-		if (isRunning()) {
-			return;
-		}
-		synchronized (this.lifecycleMonitor) {
-			if (!isRunning()) {
-				this.servletContext = request.getServletContext();
-				start();
-			}
-		}
+	private static Object createJettyWebSocketCreator(
+			JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
+
+		ProxyFactory factory = new ProxyFactory(EmptyTargetSource.INSTANCE);
+		factory.addInterface(webSocketCreatorClass);
+		factory.addAdvice(new WebSocketCreatorInterceptor(adapter, protocol));
+		return factory.getProxy();
 	}
 
 
-	private static class WebSocketHandlerContainer {
+	/**
+	 * Proxy for a JettyWebSocketCreator to supply the WebSocket handler and set the sub-protocol.
+	 */
+	private static class WebSocketCreatorInterceptor implements MethodInterceptor {
 
 		private final JettyWebSocketHandlerAdapter adapter;
 
 		@Nullable
 		private final String protocol;
 
-		public WebSocketHandlerContainer(JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
+
+		public WebSocketCreatorInterceptor(
+				JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
+
 			this.adapter = adapter;
 			this.protocol = protocol;
 		}
 
-		public JettyWebSocketHandlerAdapter getAdapter() {
-			return this.adapter;
-		}
-
 		@Nullable
-		public String getProtocol() {
-			return this.protocol;
+		@Override
+		public Object invoke(@NonNull MethodInvocation invocation) {
+			if (this.protocol != null) {
+				ReflectionUtils.invokeMethod(
+						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
+			}
+			return this.adapter;
 		}
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
index f918410dd5ee..001f85cbca3a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
@@ -19,11 +19,10 @@
 import java.util.Collections;
 import java.util.function.Supplier;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.websocket.Endpoint;
-import javax.websocket.server.ServerContainer;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.server.ServerContainer;
 import org.apache.tomcat.websocket.server.WsServerContainer;
 import reactor.core.publisher.Mono;
 
@@ -51,7 +50,7 @@
  */
 public class TomcatRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
-	private static final String SERVER_CONTAINER_ATTR = "javax.websocket.server.ServerContainer";
+	private static final String SERVER_CONTAINER_ATTR = "jakarta.websocket.server.ServerContainer";
 
 
 	@Nullable
@@ -72,7 +71,7 @@ public class TomcatRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
 	/**
 	 * Exposes the underlying config option on
-	 * {@link javax.websocket.server.ServerContainer#setAsyncSendTimeout(long)}.
+	 * {@link jakarta.websocket.server.ServerContainer#setAsyncSendTimeout(long)}.
 	 */
 	public void setAsyncSendTimeout(Long timeoutInMillis) {
 		this.asyncSendTimeout = timeoutInMillis;
@@ -85,7 +84,7 @@ public Long getAsyncSendTimeout() {
 
 	/**
 	 * Exposes the underlying config option on
-	 * {@link javax.websocket.server.ServerContainer#setDefaultMaxSessionIdleTimeout(long)}.
+	 * {@link jakarta.websocket.server.ServerContainer#setDefaultMaxSessionIdleTimeout(long)}.
 	 */
 	public void setMaxSessionIdleTimeout(Long timeoutInMillis) {
 		this.maxSessionIdleTimeout = timeoutInMillis;
@@ -98,7 +97,7 @@ public Long getMaxSessionIdleTimeout() {
 
 	/**
 	 * Exposes the underlying config option on
-	 * {@link javax.websocket.server.ServerContainer#setDefaultMaxTextMessageBufferSize(int)}.
+	 * {@link jakarta.websocket.server.ServerContainer#setDefaultMaxTextMessageBufferSize(int)}.
 	 */
 	public void setMaxTextMessageBufferSize(Integer bufferSize) {
 		this.maxTextMessageBufferSize = bufferSize;
@@ -111,7 +110,7 @@ public Integer getMaxTextMessageBufferSize() {
 
 	/**
 	 * Exposes the underlying config option on
-	 * {@link javax.websocket.server.ServerContainer#setDefaultMaxBinaryMessageBufferSize(int)}.
+	 * {@link jakarta.websocket.server.ServerContainer#setDefaultMaxBinaryMessageBufferSize(int)}.
 	 */
 	public void setMaxBinaryMessageBufferSize(Integer bufferSize) {
 		this.maxBinaryMessageBufferSize = bufferSize;
@@ -163,7 +162,7 @@ private WsServerContainer getContainer(HttpServletRequest request) {
 		if (this.serverContainer == null) {
 			Object container = request.getServletContext().getAttribute(SERVER_CONTAINER_ATTR);
 			Assert.state(container instanceof WsServerContainer,
-					"ServletContext attribute 'javax.websocket.server.ServerContainer' not found.");
+					"ServletContext attribute 'jakarta.websocket.server.ServerContainer' not found.");
 			this.serverContainer = (WsServerContainer) container;
 			initServerContainer(this.serverContainer);
 		}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java
index 059b7779e740..57105eb973bb 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java
@@ -23,9 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlRootElement;
-
 import com.google.protobuf.Message;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.ApplicationContext;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
index bf1e58c2e5d5..63ab4782fe09 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,11 +51,11 @@
 import org.springframework.http.codec.FormHttpMessageReader;
 import org.springframework.http.codec.HttpMessageReader;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.multipart.DefaultPartHttpMessageReader;
 import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.http.codec.multipart.FormFieldPart;
 import org.springframework.http.codec.multipart.MultipartHttpMessageReader;
 import org.springframework.http.codec.multipart.Part;
-import org.springframework.http.codec.multipart.SynchronossPartHttpMessageReader;
 import org.springframework.http.codec.xml.Jaxb2XmlDecoder;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
@@ -89,7 +89,7 @@ public void createContext() {
 		messageReaders.add(new DecoderHttpMessageReader<>(new Jaxb2XmlDecoder()));
 		messageReaders.add(new DecoderHttpMessageReader<>(new Jackson2JsonDecoder()));
 		messageReaders.add(new FormHttpMessageReader());
-		SynchronossPartHttpMessageReader partReader = new SynchronossPartHttpMessageReader();
+		DefaultPartHttpMessageReader partReader = new DefaultPartHttpMessageReader();
 		messageReaders.add(partReader);
 		messageReaders.add(new MultipartHttpMessageReader(partReader));
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
index 7d06e637b6b6..9a5f73021663 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
@@ -27,12 +27,11 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
-import javax.xml.bind.annotation.XmlRootElement;
-
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java
index 514dd48d955f..0d6f7719426c 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java
@@ -21,9 +21,8 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import javax.validation.constraints.NotEmpty;
-
 import io.reactivex.rxjava3.core.Single;
+import jakarta.validation.constraints.NotEmpty;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
index 5472eca8f6b5..e97d9b03b432 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
@@ -23,14 +23,13 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index 99e70f68f622..cb8bd88e583f 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -9,14 +9,14 @@ dependencies {
 	api(project(":spring-core"))
 	api(project(":spring-expression"))
 	api(project(":spring-web"))
-	compileOnly("javax.servlet:javax.servlet-api")
+	compileOnly("jakarta.servlet:jakarta.servlet-api")
 	compileOnly("com.google.code.findbugs:findbugs")  // for groovy-templates
 	optional(project(":spring-context-support"))  // for FreeMarker support
 	optional(project(":spring-oxm"))
-	optional("javax.servlet.jsp:javax.servlet.jsp-api")
-	optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api")
-	optional("javax.el:javax.el-api")
-	optional("javax.xml.bind:jaxb-api")
+	optional("jakarta.servlet.jsp:jakarta.servlet.jsp-api")
+	optional("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api")
+	optional("jakarta.el:jakarta.el-api")
+	optional("jakarta.xml.bind:jakarta.xml.bind-api")
 	optional("org.webjars:webjars-locator-core")
 	optional("com.rometools:rome")
 	optional("com.github.librepdf:openpdf")
@@ -26,12 +26,6 @@ dependencies {
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
-	optional("org.apache.tiles:tiles-api")
-	optional("org.apache.tiles:tiles-core")
-	optional("org.apache.tiles:tiles-servlet")
-	optional("org.apache.tiles:tiles-jsp")
-	optional("org.apache.tiles:tiles-el")
-	optional("org.apache.tiles:tiles-extras")
 	optional("org.codehaus.groovy:groovy-templates")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
@@ -41,24 +35,22 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation(testFixtures(project(":spring-web")))
-	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("jakarta.servlet:jakarta.servlet-api")
 	testImplementation("org.eclipse.jetty:jetty-servlet") {
-		exclude group: "javax.servlet", module: "javax.servlet"
+		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
 	testImplementation("org.eclipse.jetty:jetty-server") {
-		exclude group: "javax.servlet", module: "javax.servlet"
+		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
 	testImplementation("org.apache.httpcomponents:httpclient")
-	testImplementation("commons-fileupload:commons-fileupload")
 	testImplementation("commons-io:commons-io")
-	testImplementation("joda-time:joda-time")
 	testImplementation("org.mozilla:rhino")
 	testImplementation("org.dom4j:dom4j")
 	testImplementation("jaxen:jaxen")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
 	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("javax.validation:validation-api")
+	testImplementation("jakarta.validation:jakarta.validation-api")
 	testImplementation("io.projectreactor:reactor-core")
 	testImplementation("io.reactivex.rxjava3:rxjava")
 	testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
@@ -66,8 +58,8 @@ dependencies {
 	testRuntimeOnly("org.jruby:jruby")
 	testRuntimeOnly("org.python:jython-standalone")
 	testRuntimeOnly("org.webjars:underscorejs")
-	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("org.glassfish:jakarta.el")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
-	testRuntimeOnly("com.sun.activation:javax.activation")
+	testRuntimeOnly("com.sun.activation:jakarta.activation")
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
index c3e1828e9f19..054a727baf24 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.method.HandlerMethod;
 
@@ -38,7 +38,7 @@
  * invokes {@code preHandle}, {@code postHandle}, and {@code afterCompletion}.
  * To distinguish between the initial request and the subsequent dispatch
  * after asynchronous handling completes, interceptors can check whether the
- * {@code javax.servlet.DispatcherType} of {@link javax.servlet.ServletRequest}
+ * {@code jakarta.servlet.DispatcherType} of {@link jakarta.servlet.ServletRequest}
  * is {@code "REQUEST"} or {@code "ASYNC"}.
  *
  * <p>Note that {@code HandlerInterceptor} implementations may need to do work
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 5be28f3e13e0..45ee3a9bc51c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -30,12 +30,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -1220,7 +1219,7 @@ else if (hasMultipartException(request)) {
 	}
 
 	/**
-	 * Check "javax.servlet.error.exception" attribute for a multipart exception.
+	 * Check "jakarta.servlet.error.exception" attribute for a multipart exception.
 	 */
 	private boolean hasMultipartException(HttpServletRequest request) {
 		Throwable error = (Throwable) request.getAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
index 2632d6710be3..921e1d8e7b00 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 40e1d1030e91..ea0f30431854 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -24,12 +24,12 @@
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.ApplicationContext;
@@ -443,7 +443,7 @@ public void setThreadContextInheritable(boolean threadContextInheritable) {
 	 * Set whether this servlet should dispatch an HTTP OPTIONS request to
 	 * the {@link #doService} method.
 	 * <p>Default in the {@code FrameworkServlet} is "false", applying
-	 * {@link javax.servlet.http.HttpServlet}'s default behavior (i.e.enumerating
+	 * {@link jakarta.servlet.http.HttpServlet}'s default behavior (i.e.enumerating
 	 * all standard HTTP request methods as a response to the OPTIONS request).
 	 * Note however that as of 4.3 the {@code DispatcherServlet} sets this
 	 * property to "true" by default due to its built-in support for OPTIONS.
@@ -462,7 +462,7 @@ public void setDispatchOptionsRequest(boolean dispatchOptionsRequest) {
 	/**
 	 * Set whether this servlet should dispatch an HTTP TRACE request to
 	 * the {@link #doService} method.
-	 * <p>Default is "false", applying {@link javax.servlet.http.HttpServlet}'s
+	 * <p>Default is "false", applying {@link jakarta.servlet.http.HttpServlet}'s
 	 * default behavior (i.e. reflecting the message received back to the client).
 	 * <p>Turn this flag on if you prefer TRACE requests to go through the
 	 * regular dispatching chain, just like other HTTP requests. This usually
@@ -1153,7 +1153,7 @@ private void publishRequestHandledEvent(HttpServletRequest request, HttpServletR
 	 * Can be overridden in subclasses.
 	 * @param request current HTTP request
 	 * @return the username, or {@code null} if none found
-	 * @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
+	 * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal()
 	 */
 	@Nullable
 	protected String getUsernameForRequest(HttpServletRequest request) {
@@ -1172,8 +1172,8 @@ protected String getUsernameForRequest(HttpServletRequest request) {
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @throws Exception in case of any kind of processing failure
-	 * @see javax.servlet.http.HttpServlet#doGet
-	 * @see javax.servlet.http.HttpServlet#doPost
+	 * @see jakarta.servlet.http.HttpServlet#doGet
+	 * @see jakarta.servlet.http.HttpServlet#doPost
 	 */
 	protected abstract void doService(HttpServletRequest request, HttpServletResponse response)
 			throws Exception;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
index cd43bdce5b15..a29e8bf0a142 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
index 3fef242dea13..e6f446bb7cdd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
index be69a0bf9368..76f5cb357712 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
@@ -21,9 +21,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
index 09f126c747ef..d904cb6d254f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.method.HandlerMethod;
@@ -70,7 +70,7 @@
  * @see org.springframework.web.servlet.handler.UserRoleAuthorizationInterceptor
  * @see org.springframework.web.servlet.i18n.LocaleChangeInterceptor
  * @see org.springframework.web.servlet.theme.ThemeChangeInterceptor
- * @see javax.servlet.Filter
+ * @see jakarta.servlet.Filter
  */
 public interface HandlerInterceptor {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
index 105250893728..0a64002f0181 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
index ccd87dba220a..1d4766cab344 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
@@ -20,10 +20,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -48,7 +47,7 @@
 import org.springframework.web.context.support.StandardServletEnvironment;
 
 /**
- * Simple extension of {@link javax.servlet.http.HttpServlet} which treats
+ * Simple extension of {@link jakarta.servlet.http.HttpServlet} which treats
  * its config parameters ({@code init-param} entries within the
  * {@code servlet} tag in {@code web.xml}) as bean properties.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleContextResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleContextResolver.java
index a51e6f4255fd..0140cf192ba2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleContextResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleContextResolver.java
@@ -18,8 +18,8 @@
 
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
index fd0c651f84a5..0a6e99c8ff99 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
@@ -18,8 +18,8 @@
 
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
index 63e337c61c2c..73f4ee3a9c0a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.util.Assert;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/NoHandlerFoundException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/NoHandlerFoundException.java
index e33c262f2c62..64413cd40961 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/NoHandlerFoundException.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/NoHandlerFoundException.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpHeaders;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
index 5206cc5c8cf7..df95379987ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
@@ -16,13 +16,13 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 
 /**
  * Strategy interface for translating an incoming
- * {@link javax.servlet.http.HttpServletRequest} into a
+ * {@link jakarta.servlet.http.HttpServletRequest} into a
  * logical view name when no view name is explicitly supplied.
  *
  * @author Rob Harrop
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
index 61bcfd83cdcf..f38dd8081ce3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
index f59cd054d369..3d8bb3c36973 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
@@ -18,8 +18,8 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
index 21d15bd89530..2684d24e5ea7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
@@ -178,9 +178,9 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 
 	static {
 		ClassLoader classLoader = AnnotationDrivenBeanDefinitionParser.class.getClassLoader();
-		javaxValidationPresent = ClassUtils.isPresent("javax.validation.Validator", classLoader);
+		javaxValidationPresent = ClassUtils.isPresent("jakarta.validation.Validator", classLoader);
 		romePresent = ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", classLoader);
-		jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder", classLoader);
+		jaxb2Present = ClassUtils.isPresent("jakarta.xml.bind.Binder", classLoader);
 		jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&
 						ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
 		jackson2XmlPresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper", classLoader);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
index fd7660f58c7b..8f08e691c8bf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@ public void init() {
 		registerBeanDefinitionParser("redirect-view-controller", new ViewControllerBeanDefinitionParser());
 		registerBeanDefinitionParser("status-controller", new ViewControllerBeanDefinitionParser());
 		registerBeanDefinitionParser("view-resolvers", new ViewResolversBeanDefinitionParser());
-		registerBeanDefinitionParser("tiles-configurer", new TilesConfigurerBeanDefinitionParser());
 		registerBeanDefinitionParser("freemarker-configurer", new FreeMarkerConfigurerBeanDefinitionParser());
 		registerBeanDefinitionParser("groovy-configurer", new GroovyMarkupConfigurerBeanDefinitionParser());
 		registerBeanDefinitionParser("script-template-configurer", new ScriptTemplateConfigurerBeanDefinitionParser());
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java
deleted file mode 100644
index 3c5aa27645b5..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.util.StringUtils;
-import org.springframework.util.xml.DomUtils;
-
-/**
- * Parse the <code>&lt;mvc:tiles-configurer&gt;</code> MVC namespace element and register
- * a corresponding {@code TilesConfigurer} bean.
- *
- * @author Rossen Stoyanchev
- * @author Juergen Hoeller
- * @since 4.1
- */
-public class TilesConfigurerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-	/**
-	 * The bean name used for the {@code TilesConfigurer}.
-	 */
-	public static final String BEAN_NAME = "mvcTilesConfigurer";
-
-
-	@Override
-	protected String getBeanClassName(Element element) {
-		return "org.springframework.web.servlet.view.tiles3.TilesConfigurer";
-	}
-
-	@Override
-	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-		return BEAN_NAME;
-	}
-
-	@Override
-	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		List<Element> childElements = DomUtils.getChildElementsByTagName(element, "definitions");
-		if (!childElements.isEmpty()) {
-			List<String> locations = new ArrayList<>(childElements.size());
-			for (Element childElement : childElements) {
-				locations.add(childElement.getAttribute("location"));
-			}
-			builder.addPropertyValue("definitions", StringUtils.toStringArray(locations));
-		}
-		if (element.hasAttribute("check-refresh")) {
-			builder.addPropertyValue("checkRefresh", element.getAttribute("check-refresh"));
-		}
-		if (element.hasAttribute("validate-definitions")) {
-			builder.addPropertyValue("validateDefinitions", element.getAttribute("validate-definitions"));
-		}
-		if (element.hasAttribute("definitions-factory")) {
-			builder.addPropertyValue("definitionsFactoryClass", element.getAttribute("definitions-factory"));
-		}
-		if (element.hasAttribute("preparer-factory")) {
-			builder.addPropertyValue("preparerFactoryClass", element.getAttribute("preparer-factory"));
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java
index d9693b2f3e08..421d7c182c61 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@
 import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 import org.springframework.web.servlet.view.script.ScriptTemplateViewResolver;
-import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 
 /**
  * Parse the {@code view-resolvers} MVC namespace element and register
@@ -92,10 +91,6 @@ public BeanDefinition parse(Element element, ParserContext context) {
 				resolverBeanDef.getPropertyValues().add("suffix", ".jsp");
 				addUrlBasedViewResolverProperties(resolverElement, resolverBeanDef);
 			}
-			else if ("tiles".equals(name)) {
-				resolverBeanDef = new RootBeanDefinition(TilesViewResolver.class);
-				addUrlBasedViewResolverProperties(resolverElement, resolverBeanDef);
-			}
 			else if ("freemarker".equals(name)) {
 				resolverBeanDef = new RootBeanDefinition(FreeMarkerViewResolver.class);
 				resolverBeanDef.getPropertyValues().add("suffix", ".ftl");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
index 6f5d1d3b3107..7e4d475aa8c1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.MediaTypeFactory;
@@ -102,7 +102,7 @@ public class ContentNegotiationConfigurer {
 
 
 	/**
-	 * Class constructor with {@link javax.servlet.ServletContext}.
+	 * Class constructor with {@link jakarta.servlet.ServletContext}.
 	 */
 	public ContentNegotiationConfigurer(@Nullable ServletContext servletContext) {
 		if (servletContext != null) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
index fff78a82c71b..752febb40824 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
@@ -18,7 +18,7 @@
 
 import java.util.Collections;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.core.Ordered;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
index ba710151595d..54ff13fc5627 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.context.ApplicationContext;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
index cf740c31690a..87c414d27792 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
@@ -40,8 +40,6 @@
 import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 import org.springframework.web.servlet.view.script.ScriptTemplateConfigurer;
 import org.springframework.web.servlet.view.script.ScriptTemplateViewResolver;
-import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
-import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 
 /**
  * Assist with the configuration of a chain of
@@ -165,22 +163,6 @@ public UrlBasedViewResolverRegistration jsp(String prefix, String suffix) {
 		return new UrlBasedViewResolverRegistration(resolver);
 	}
 
-	/**
-	 * Register Tiles 3.x view resolver.
-	 * <p><strong>Note</strong> that you must also configure Tiles by adding a
-	 * {@link org.springframework.web.servlet.view.tiles3.TilesConfigurer} bean.
-	 */
-	public UrlBasedViewResolverRegistration tiles() {
-		if (!checkBeanOfType(TilesConfigurer.class)) {
-			throw new BeanInitializationException("In addition to a Tiles view resolver " +
-					"there must also be a single TilesConfigurer bean in this web application context " +
-					"(or its parent).");
-		}
-		TilesRegistration registration = new TilesRegistration();
-		this.viewResolvers.add(registration.getViewResolver());
-		return registration;
-	}
-
 	/**
 	 * Register a FreeMarker view resolver with an empty default view name
 	 * prefix and a default suffix of ".ftl".
@@ -292,13 +274,6 @@ protected List<ViewResolver> getViewResolvers() {
 	}
 
 
-	private static class TilesRegistration extends UrlBasedViewResolverRegistration {
-
-		public TilesRegistration() {
-			super(new TilesViewResolver());
-		}
-	}
-
 	private static class FreeMarkerRegistration extends UrlBasedViewResolverRegistration {
 
 		public FreeMarkerRegistration() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
index e0e91bf8d323..7afe6a07a9b7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -23,7 +23,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanFactoryUtils;
@@ -218,14 +218,14 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 	static {
 		ClassLoader classLoader = WebMvcConfigurationSupport.class.getClassLoader();
 		romePresent = ClassUtils.isPresent("com.rometools.rome.feed.WireFeed", classLoader);
-		jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder", classLoader);
+		jaxb2Present = ClassUtils.isPresent("jakarta.xml.bind.Binder", classLoader);
 		jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&
 				ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
 		jackson2XmlPresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper", classLoader);
 		jackson2SmilePresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.smile.SmileFactory", classLoader);
 		jackson2CborPresent = ClassUtils.isPresent("com.fasterxml.jackson.dataformat.cbor.CBORFactory", classLoader);
 		gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader);
-		jsonbPresent = ClassUtils.isPresent("javax.json.bind.Jsonb", classLoader);
+		jsonbPresent = ClassUtils.isPresent("jakarta.json.bind.Jsonb", classLoader);
 		kotlinSerializationJsonPresent = ClassUtils.isPresent("kotlinx.serialization.json.Json", classLoader);
 	}
 
@@ -279,7 +279,7 @@ public final ApplicationContext getApplicationContext() {
 	}
 
 	/**
-	 * Set the {@link javax.servlet.ServletContext}, e.g. for resource handling,
+	 * Set the {@link jakarta.servlet.ServletContext}, e.g. for resource handling,
 	 * looking up file extensions, etc.
 	 */
 	@Override
@@ -288,7 +288,7 @@ public void setServletContext(@Nullable ServletContext servletContext) {
 	}
 
 	/**
-	 * Return the associated {@link javax.servlet.ServletContext}.
+	 * Return the associated {@link jakarta.servlet.ServletContext}.
 	 * @since 4.2
 	 */
 	@Nullable
@@ -774,7 +774,7 @@ protected void addFormatters(FormatterRegistry registry) {
 	public Validator mvcValidator() {
 		Validator validator = getValidator();
 		if (validator == null) {
-			if (ClassUtils.isPresent("javax.validation.Validator", getClass().getClassLoader())) {
+			if (ClassUtils.isPresent("jakarta.validation.Validator", getClass().getClassLoader())) {
 				Class<?> clazz;
 				try {
 					String className = "org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean";
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java
index d191c05c298a..a35571fdf222 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java
@@ -21,10 +21,10 @@
 import java.util.EnumSet;
 import java.util.Set;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultAsyncServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultAsyncServerResponse.java
index e720174b37ea..73e91e507ba9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultAsyncServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultAsyncServerResponse.java
@@ -25,11 +25,10 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.reactivestreams.Publisher;
 
 import org.springframework.core.ReactiveAdapter;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
index fedfe2d4a409..cf674214be4b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
@@ -30,12 +30,11 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultRenderingResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultRenderingResponseBuilder.java
index 8b6a4faa140f..db34f733cf5a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultRenderingResponseBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultRenderingResponseBuilder.java
@@ -23,9 +23,9 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.Conventions;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
index 26f76e7ca0ab..5d6b5ef0248f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
@@ -37,13 +37,13 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
index 9598c0180041..7dbca4417cbc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
@@ -33,13 +33,13 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java
index 8f9dbcde88cd..7cbb36ff99d3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java
@@ -26,9 +26,9 @@
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.CacheControl;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java
index e2bb1c543b24..56e033e747c7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java
@@ -22,7 +22,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.CacheControl;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ErrorHandlingServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ErrorHandlingServerResponse.java
index 9ae67ec10237..bce77dbe4c7e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ErrorHandlingServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ErrorHandlingServerResponse.java
@@ -22,10 +22,9 @@
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RenderingResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RenderingResponse.java
index 569ede13e66a..83e727067e1d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RenderingResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RenderingResponse.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
index 664d6a851dc1..b359806396bc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
@@ -35,12 +35,11 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
index 6bbb3a43391e..ec006e193ada 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
@@ -29,11 +29,11 @@
 import java.util.OptionalLong;
 import java.util.function.Consumer;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.buffer.DataBuffer;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
index 11efe5b02232..7e9fb25c0bc0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
@@ -30,11 +30,10 @@
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.reactivestreams.Publisher;
 
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java
index e078a66d110a..a3965a0a1cf5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/SseServerResponse.java
@@ -24,10 +24,10 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.CacheControl;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/HandlerFunctionAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/HandlerFunctionAdapter.java
index 67fac910b781..819c7e9e2104 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/HandlerFunctionAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/HandlerFunctionAdapter.java
@@ -18,10 +18,9 @@
 
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java
index 7597f0af686d..d0b96a7fb03b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
index e5e2db0b6a16..6af3b3cb2d52 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
@@ -18,9 +18,8 @@
 
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
index d3336710f0c4..f100a8ad33ae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
@@ -22,10 +22,9 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 
 import org.springframework.beans.BeansException;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
index 9f4ceb43a1f5..47acaf4bc526 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.handler;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.method.HandlerMethod;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
index 46f1707d1cfb..2073087a1508 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
@@ -32,8 +32,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanFactoryUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
index 2f7be313ca98..f244dfdada25 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
@@ -23,8 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
index a8e3b0ae3383..c5c25d694466 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
@@ -18,9 +18,9 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.convert.ConversionService;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
index 6ea1536297dd..cace2a641517 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
@@ -18,8 +18,8 @@
 
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.servlet.support.RequestContextUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
index 9732169bfd87..fbc49d5edbd8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
@@ -19,8 +19,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.Ordered;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
index 81d38fb3b8c7..76d90f320bb6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
@@ -27,8 +27,8 @@
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java
index 01e0961984e2..46977483ada3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java
@@ -18,8 +18,8 @@
 
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.server.PathContainer;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MatchableHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MatchableHandlerMapping.java
index 85ef3ec17da0..27ce57380c80 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MatchableHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MatchableHandlerMapping.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.handler;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.HandlerMapping;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java
index 4b7a906732bb..42028a912347 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.server.PathContainer;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
index 99d8027638e2..61645c5c8de5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.ModelAndView;
@@ -70,7 +70,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	/**
 	 * Set the mappings between exception class names and error view names.
 	 * The exception class name can be a substring, with no wildcard support at present.
-	 * A value of "ServletException" would match {@code javax.servlet.ServletException}
+	 * A value of "ServletException" would match {@code jakarta.servlet.ServletException}
 	 * and subclasses, for example.
 	 * <p><b>NB:</b> Consider carefully how
 	 * specific the pattern is, and whether to include package information (which isn't mandatory).
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
index 7cc9fcf9f0d3..165688844429 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet.handler;
 
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.HandlerAdapter;
@@ -47,8 +47,8 @@
  *
  * @author Juergen Hoeller
  * @since 1.1.5
- * @see javax.servlet.Servlet
- * @see javax.servlet.http.HttpServlet
+ * @see jakarta.servlet.Servlet
+ * @see jakarta.servlet.http.HttpServlet
  * @see SimpleServletPostProcessor
  * @see org.springframework.web.servlet.mvc.ServletWrappingController
  */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
index 589d8cf5f31c..bfab08397d3f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
@@ -19,10 +19,10 @@
 import java.util.Collections;
 import java.util.Enumeration;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanInitializationException;
@@ -34,7 +34,7 @@
 /**
  * {@link org.springframework.beans.factory.config.BeanPostProcessor}
  * that applies initialization and destruction callbacks to beans that
- * implement the {@link javax.servlet.Servlet} interface.
+ * implement the {@link jakarta.servlet.Servlet} interface.
  *
  * <p>After initialization of the bean instance, the Servlet {@code init}
  * method will be called with a ServletConfig that contains the bean name
@@ -61,8 +61,8 @@
  *
  * @author Juergen Hoeller
  * @since 1.1.5
- * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
- * @see javax.servlet.Servlet#destroy()
+ * @see jakarta.servlet.Servlet#init(jakarta.servlet.ServletConfig)
+ * @see jakarta.servlet.Servlet#destroy()
  * @see SimpleServletHandlerAdapter
  */
 public class SimpleServletPostProcessor implements
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
index a4a49ed09e52..90d1209c9ba4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
@@ -18,9 +18,9 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -31,7 +31,7 @@
  *
  * @author Juergen Hoeller
  * @since 20.06.2003
- * @see javax.servlet.http.HttpServletRequest#isUserInRole
+ * @see jakarta.servlet.http.HttpServletRequest#isUserInRole
  */
 public class UserRoleAuthorizationInterceptor implements HandlerInterceptor {
 
@@ -71,7 +71,7 @@ public final boolean preHandle(HttpServletRequest request, HttpServletResponse r
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param handler chosen handler to execute, for type and/or instance evaluation
-	 * @throws javax.servlet.ServletException if there is an internal error
+	 * @throws jakarta.servlet.ServletException if there is an internal error
 	 * @throws java.io.IOException in case of an I/O error when writing the response
 	 */
 	protected void handleNotAuthorized(HttpServletRequest request, HttpServletResponse response, Object handler)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
index e669344f086a..a3028dcb27d7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.handler;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleContextResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleContextResolver.java
index 786628f91ac9..98162f6fecbb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleContextResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleContextResolver.java
@@ -19,8 +19,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.SimpleLocaleContext;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
index e5c027e96831..8df4c6c51df4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
@@ -39,7 +39,7 @@
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
  * @since 27.02.2003
- * @see javax.servlet.http.HttpServletRequest#getLocale()
+ * @see jakarta.servlet.http.HttpServletRequest#getLocale()
  */
 public class AcceptHeaderLocaleResolver implements LocaleResolver {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
index 557bf7801e85..bf30ea4bc530 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
@@ -19,9 +19,9 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.SimpleLocaleContext;
@@ -333,7 +333,7 @@ protected String toLocaleValue(Locale locale) {
 	 * @param request the request to resolve the locale for
 	 * @return the default locale (never {@code null})
 	 * @see #setDefaultLocale
-	 * @see javax.servlet.http.HttpServletRequest#getLocale()
+	 * @see jakarta.servlet.http.HttpServletRequest#getLocale()
 	 */
 	protected Locale determineDefaultLocale(HttpServletRequest request) {
 		Locale defaultLocale = getDefaultLocale();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
index 60252cf4a047..ada77bdcd365 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
@@ -19,8 +19,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.TimeZoneAwareLocaleContext;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
index 8e64ea6ed932..6f118374a275 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
@@ -18,10 +18,9 @@
 
 import java.util.Locale;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
index 18572a08135d..7ae9042a09d0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
@@ -19,8 +19,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.TimeZoneAwareLocaleContext;
@@ -164,7 +164,7 @@ public void setLocaleContext(HttpServletRequest request, @Nullable HttpServletRe
 	 * @param request the request to resolve the locale for
 	 * @return the default locale (never {@code null})
 	 * @see #setDefaultLocale
-	 * @see javax.servlet.http.HttpServletRequest#getLocale()
+	 * @see jakarta.servlet.http.HttpServletRequest#getLocale()
 	 */
 	protected Locale determineDefaultLocale(HttpServletRequest request) {
 		Locale defaultLocale = getDefaultLocale();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
index 8c40056b8eab..12a42a7a4918 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
@@ -135,7 +135,7 @@ public AbstractController(boolean restrictDefaultSupportedMethods) {
 	 * different servlet containers; the only 100% safe way is a session mutex.
 	 * @see AbstractController#handleRequestInternal
 	 * @see org.springframework.web.util.HttpSessionMutexListener
-	 * @see org.springframework.web.util.WebUtils#getSessionMutex(javax.servlet.http.HttpSession)
+	 * @see org.springframework.web.util.WebUtils#getSessionMutex(jakarta.servlet.http.HttpSession)
 	 */
 	public final void setSynchronizeOnSession(boolean synchronizeOnSession) {
 		this.synchronizeOnSession = synchronizeOnSession;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
index ef8c34989685..768b8ad3f7c6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.util.Assert;
 import org.springframework.web.servlet.ModelAndView;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
index 4f59c52ca1b5..cc37288772d1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.ModelAndView;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
index 161750bc55dc..8fef024bce15 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.HttpRequestHandler;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
index a6cfdcf86a69..a35c825f2ebd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Supports last-modified HTTP requests to facilitate content caching.
@@ -39,7 +39,7 @@
  * annotated controller method, returning a
  * {@link org.springframework.http.ResponseEntity} with an "ETag" and/or
  * "Last-Modified" headers set.
- * @see javax.servlet.http.HttpServlet#getLastModified
+ * @see jakarta.servlet.http.HttpServlet#getLastModified
  * @see Controller
  * @see SimpleControllerHandlerAdapter
  * @see org.springframework.web.HttpRequestHandler
@@ -58,7 +58,7 @@ public interface LastModified {
 	 * @return the time the underlying resource was last modified, or -1
 	 * meaning that the content must always be regenerated
 	 * @see org.springframework.web.servlet.HandlerAdapter#getLastModified
-	 * @see javax.servlet.http.HttpServlet#getLastModified
+	 * @see jakarta.servlet.http.HttpServlet#getLastModified
 	 */
 	long getLastModified(HttpServletRequest request);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
index c447a70c164a..6cf029898ce2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
index 8e4f3dccc131..fe1d2fb81d1d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
@@ -16,11 +16,11 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.lang.Nullable;
@@ -157,9 +157,9 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @return {@code true} for include, {@code false} for forward
-	 * @see javax.servlet.RequestDispatcher#forward
-	 * @see javax.servlet.RequestDispatcher#include
-	 * @see javax.servlet.ServletResponse#isCommitted
+	 * @see jakarta.servlet.RequestDispatcher#forward
+	 * @see jakarta.servlet.RequestDispatcher#include
+	 * @see jakarta.servlet.ServletResponse#isCommitted
 	 * @see org.springframework.web.util.WebUtils#isIncludeRequest
 	 */
 	protected boolean useInclude(HttpServletRequest request, HttpServletResponse response) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
index bcac67c11cbc..673c110da121 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
@@ -19,11 +19,11 @@
 import java.util.Enumeration;
 import java.util.Properties;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.DisposableBean;
@@ -108,8 +108,8 @@ public ServletWrappingController() {
 
 	/**
 	 * Set the class of the servlet to wrap.
-	 * Needs to implement {@code javax.servlet.Servlet}.
-	 * @see javax.servlet.Servlet
+	 * Needs to implement {@code jakarta.servlet.Servlet}.
+	 * @see jakarta.servlet.Servlet
 	 */
 	public void setServletClass(Class<? extends Servlet> servletClass) {
 		this.servletClass = servletClass;
@@ -139,7 +139,7 @@ public void setBeanName(String name) {
 
 	/**
 	 * Initialize the wrapped Servlet instance.
-	 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+	 * @see jakarta.servlet.Servlet#init(jakarta.servlet.ServletConfig)
 	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
@@ -156,7 +156,7 @@ public void afterPropertiesSet() throws Exception {
 
 	/**
 	 * Invoke the wrapped Servlet instance.
-	 * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
+	 * @see jakarta.servlet.Servlet#service(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse)
 	 */
 	@Override
 	protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
@@ -170,7 +170,7 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 
 	/**
 	 * Destroy the wrapped Servlet instance.
-	 * @see javax.servlet.Servlet#destroy()
+	 * @see jakarta.servlet.Servlet#destroy()
 	 */
 	@Override
 	public void destroy() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
index 64372c665c60..a8acd760ec0f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.mvc;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.HandlerAdapter;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
index 4e2397d51d3d..fc026104af0a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
index 696be902b754..450ec25c9a81 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
@@ -21,10 +21,10 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.CacheControl;
 import org.springframework.http.server.PathContainer;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
index 6fd143c76d20..b2ae8bb1bf9c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
index 5acc07c3dc44..91e5c16cb32d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc.condition;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
index 5857fdc5eb56..07b91753cffa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
@@ -21,7 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
index 0efe0c849b3d..430fe9fbd4c2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.InvalidMediaTypeException;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
index e3f1773318ee..e2f78cac600c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
@@ -21,7 +21,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
index f06f363aa2c3..074ce921978a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
@@ -22,7 +22,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestCondition.java
index a89b4ed3cb6b..e7f4923065d8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestCondition.java
@@ -25,7 +25,7 @@
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.server.PathContainer;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index 9539415ae388..6bd5676e2b0f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.AntPathMatcher;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
index 7a6af2272599..b7e3aa4fed66 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
index d2eb27d2fa9c..cf399dcd1270 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc.condition;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
index 5ea41adce503..ebed0908cb8e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
index 4184239e4882..f00f2414a73f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
index 24ef3cb6573e..d12f14d02d82 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.mvc.method;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.Ordered;
 import org.springframework.lang.Nullable;
@@ -111,7 +111,7 @@ public final long getLastModified(HttpServletRequest request, Object handler) {
 	}
 
 	/**
-	 * Same contract as for {@link javax.servlet.http.HttpServlet#getLastModified(HttpServletRequest)}.
+	 * Same contract as for {@link jakarta.servlet.http.HttpServlet#getLastModified(HttpServletRequest)}.
 	 * @param request current HTTP request
 	 * @param handlerMethod handler method to use
 	 * @return the lastModified value for the given handler
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
index 79622c386169..99cd5fe89d0c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
index 8758e7cc76ac..d321a36ead1e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
@@ -26,8 +26,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
index 1dbc559e2ccf..b9bf4a176b19 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
@@ -29,8 +29,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -229,7 +228,7 @@ protected ServletServerHttpRequest createInputMessage(NativeWebRequest webReques
 
 	/**
 	 * Validate the binding target if applicable.
-	 * <p>The default implementation checks for {@code @javax.validation.Valid},
+	 * <p>The default implementation checks for {@code @jakarta.validation.Valid},
 	 * Spring's {@link org.springframework.validation.annotation.Validated},
 	 * and custom annotations whose name starts with "Valid".
 	 * @param binder the DataBinder to be used
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
index 158a33b9c918..bd18540925b9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
@@ -26,9 +26,9 @@
 import java.util.Locale;
 import java.util.Set;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
index 7be174e7a68b..83ae13af4eea 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
@@ -25,8 +25,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
index a0db1cac45a2..2708af1108fa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
index 6b9f0af70723..f498494a3a21 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
@@ -24,8 +24,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpHeadersReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpHeadersReturnValueHandler.java
index 9678ac2fe781..224d3a17a01d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpHeadersReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpHeadersReturnValueHandler.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
index 7c60bee6675a..a78fb6011a17 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
@@ -23,8 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolver.java
index dff70178eac6..23ebbd3f0d4c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolver.java
@@ -18,7 +18,7 @@
 
 import java.security.Principal;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestAttributeMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestAttributeMethodArgumentResolver.java
index 5845ee5cdcb9..9156c86f7277 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestAttributeMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestAttributeMethodArgumentResolver.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
index 6005b22e247b..59b056b47384 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
@@ -25,9 +25,9 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -528,7 +528,7 @@ public void setCacheSecondsForSessionAttributeHandlers(int cacheSecondsForSessio
 	 * same active logical session. However, this is not guaranteed across
 	 * different servlet containers; the only 100% safe way is a session mutex.
 	 * @see org.springframework.web.util.HttpSessionMutexListener
-	 * @see org.springframework.web.util.WebUtils#getSessionMutex(javax.servlet.http.HttpSession)
+	 * @see org.springframework.web.util.WebUtils#getSessionMutex(jakarta.servlet.http.HttpSession)
 	 */
 	public void setSynchronizeOnSession(boolean synchronizeOnSession) {
 		this.synchronizeOnSession = synchronizeOnSession;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
index 1da7ca1ed8b3..a5061118a976 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.core.annotation.AnnotatedElementUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
index e828239d7100..d32a396c4cfe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpInputMessage;
@@ -46,7 +46,7 @@
  * <ul>
  * <li>Annotated with @{@link RequestPart}
  * <li>Of type {@link MultipartFile} in conjunction with Spring's {@link MultipartResolver} abstraction
- * <li>Of type {@code javax.servlet.http.Part} in conjunction with Servlet 3.0 multipart requests
+ * <li>Of type {@code jakarta.servlet.http.Part} in conjunction with Servlet 3.0 multipart requests
  * </ul>
  *
  * <p>When a parameter is annotated with {@code @RequestPart}, the content of the part is
@@ -96,7 +96,7 @@ public RequestPartMethodArgumentResolver(List<HttpMessageConverter<?>> messageCo
 	 * <ul>
 	 * <li>annotated with {@code @RequestPart}
 	 * <li>of type {@link MultipartFile} unless annotated with {@code @RequestParam}
-	 * <li>of type {@code javax.servlet.http.Part} unless annotated with
+	 * <li>of type {@code jakarta.servlet.http.Part} unless annotated with
 	 * {@code @RequestParam}
 	 * </ul>
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
index 50e4fd56413b..0d8907f7c60a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
@@ -20,7 +20,7 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.Conventions;
 import org.springframework.core.MethodParameter;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java
index 6688fe5b5afa..f6550aed27c0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ReactiveAdapterRegistry;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
index f706afe2d4c6..2c96722b14ef 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
@@ -19,8 +19,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
index 97c66a581a32..e41c49ce0bf8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.MethodParameter;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index ae3473873dee..db5d7556cc10 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -22,8 +22,8 @@
 import java.lang.reflect.Type;
 import java.util.concurrent.Callable;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.MessageSource;
 import org.springframework.core.KotlinDetector;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
index 38cf420e141f..b7e7418e7714 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
@@ -19,7 +19,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionService;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
index 45ca54595efa..db80a70dfd13 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
@@ -24,10 +24,10 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.PushBuilder;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.PushBuilder;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpMethod;
@@ -73,7 +73,7 @@ public class ServletRequestMethodArgumentResolver implements HandlerMethodArgume
 
 	static {
 		try {
-			pushBuilder = ClassUtils.forName("javax.servlet.http.PushBuilder",
+			pushBuilder = ClassUtils.forName("jakarta.servlet.http.PushBuilder",
 					ServletRequestMethodArgumentResolver.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
index 3ee6d5b0274b..45e71a9081b9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
@@ -20,7 +20,7 @@
 import java.io.OutputStream;
 import java.io.Writer;
 
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SessionAttributeMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SessionAttributeMethodArgumentResolver.java
index 3f68273d965f..c5cce648c07b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SessionAttributeMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SessionAttributeMethodArgumentResolver.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBodyReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBodyReturnValueHandler.java
index 43472293e929..4cecd34e8af7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBodyReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBodyReturnValueHandler.java
@@ -19,8 +19,8 @@
 import java.io.OutputStream;
 import java.util.concurrent.Callable;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
index 928af577e709..34fdfce6570c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index 542f0ae8f87d..ce787c69cf4f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -19,9 +19,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -463,7 +462,7 @@ protected ModelAndView handleMethodArgumentNotValidException(MethodArgumentNotVa
 
 	/**
 	 * Handle the case where an {@linkplain RequestPart @RequestPart}, a {@link MultipartFile},
-	 * or a {@code javax.servlet.http.Part} argument is required but is missing.
+	 * or a {@code jakarta.servlet.http.Part} argument is required but is missing.
 	 * <p>By default, an HTTP 400 error is sent back to the client.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
@@ -544,12 +543,12 @@ protected ModelAndView handleAsyncRequestTimeoutException(AsyncRequestTimeoutExc
 
 	/**
 	 * Invoked to send a server error. Sets the status to 500 and also sets the
-	 * request attribute "javax.servlet.error.exception" to the Exception.
+	 * request attribute "jakarta.servlet.error.exception" to the Exception.
 	 */
 	protected void sendServerError(Exception ex, HttpServletRequest request, HttpServletResponse response)
 			throws IOException {
 
-		request.setAttribute("javax.servlet.error.exception", ex);
+		request.setAttribute("jakarta.servlet.error.exception", ex);
 		response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractResourceResolver.java
index 9f507232d19a..c4228ce0ed69 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractResourceResolver.java
@@ -18,8 +18,7 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
index 5f8facffd391..4c0d9b4d3bb4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
@@ -26,8 +26,7 @@
 import java.util.Collections;
 import java.util.Scanner;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java
index 762c84884150..882504fad0f5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceResolver.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceTransformer.java
index bea1c5fd9f21..2c220f04a8a9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceTransformer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CachingResourceTransformer.java
@@ -18,8 +18,7 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
index a590d61f687e..e27e2ac1dab6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
@@ -25,8 +25,7 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceResolverChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceResolverChain.java
index e2aeb9b2512d..d01e9c334411 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceResolverChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceResolverChain.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.ListIterator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceTransformerChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceTransformerChain.java
index 6ea4c4aaf719..340fbc550ec8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceTransformerChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultResourceTransformerChain.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.ListIterator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
index f1b59d090763..ab68bbe6c53a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
@@ -18,11 +18,11 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java
index 846938eea344..4d0a6af7338e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java
index f7b8542befae..e38cea0bf29a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java
@@ -23,7 +23,7 @@
 import java.net.URL;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
index 2b97ac60895f..34c782c52990 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index ed49cf3cd201..ace74e2dfb8d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -26,10 +26,9 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -303,7 +302,7 @@ public ContentNegotiationManager getContentNegotiationManager() {
 	 * response.
 	 * <p>Use of this method is typically not necessary since mappings are
 	 * otherwise determined via
-	 * {@link javax.servlet.ServletContext#getMimeType(String)} or via
+	 * {@link jakarta.servlet.ServletContext#getMimeType(String)} or via
 	 * {@link MediaTypeFactory#getMediaType(Resource)}.
 	 * @param mediaTypes media type mappings
 	 * @since 5.2.4
@@ -728,7 +727,7 @@ protected boolean isInvalidPath(String path) {
 	 * the following lookups based on the resource filename and its path
 	 * extension:
 	 * <ol>
-	 * <li>{@link javax.servlet.ServletContext#getMimeType(String)}
+	 * <li>{@link jakarta.servlet.ServletContext#getMimeType(String)}
 	 * <li>{@link #getMediaTypes()}
 	 * <li>{@link MediaTypeFactory#getMediaType(String)}
 	 * </ol>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolver.java
index 4d75d61be73b..f4417b9287c0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolver.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolverChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolverChain.java
index c7672a7d5eac..678164977e0c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolverChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceResolverChain.java
@@ -18,7 +18,7 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformer.java
index 31059fef795c..7decb81b5283 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformer.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerChain.java
index a1db04400230..a92e84260d90 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerChain.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java
index 3050727042a0..888cd74a08b1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java
@@ -18,7 +18,7 @@
 
 import java.util.Collections;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
index c193ad5794b9..da2e86a879b8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
@@ -18,15 +18,14 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
index c1f926cd86d9..7a2a6e2a67c6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -22,8 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -75,7 +74,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 
 	/**
 	 * Configure a {@code UrlPathHelper} to use in
-	 * {@link #getForRequestUrl(javax.servlet.http.HttpServletRequest, String)}
+	 * {@link #getForRequestUrl(jakarta.servlet.http.HttpServletRequest, String)}
 	 * in order to derive the lookup path for a target request URL path.
 	 */
 	public void setUrlPathHelper(UrlPathHelper urlPathHelper) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProviderExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProviderExposingInterceptor.java
index c83be5a76eba..c0b1fb902aa0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProviderExposingInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProviderExposingInterceptor.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.resource;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.util.Assert;
 import org.springframework.web.bind.ServletRequestBindingException;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
index d2041e5b6569..f4800afc4d24 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
index 6e0fca296a04..d7dbb15cd16a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
@@ -18,8 +18,7 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.webjars.WebJarAssetLocator;
 
 import org.springframework.core.io.Resource;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java
index 2ea14a032568..353c9d4a5805 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java
@@ -18,13 +18,13 @@
 
 import java.util.EnumSet;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.FilterRegistration.Dynamic;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.FilterRegistration.Dynamic;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.core.Conventions;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java
index d740a3c2cc65..10b46f1923ba 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java
@@ -22,9 +22,8 @@
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
index de381b70f48e..b02d169ea8d0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
@@ -20,16 +20,16 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.Config;
 
 import org.springframework.lang.Nullable;
 
 /**
  * JSP-aware (and JSTL-aware) subclass of RequestContext, allowing for
- * population of the context from a {@code javax.servlet.jsp.PageContext}.
+ * population of the context from a {@code jakarta.servlet.jsp.PageContext}.
  *
  * <p>This context will detect a JSTL locale attribute in page/request/session/application
  * scope, in addition to the fallback locale strategy provided by the base class.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
index 6ad2612b0177..84c7d1a3d39f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
@@ -20,11 +20,11 @@
 import java.util.ResourceBundle;
 import java.util.TimeZone;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.support.MessageSourceResourceBundle;
@@ -41,7 +41,7 @@
 public abstract class JstlUtils {
 
 	/**
-	 * Checks JSTL's "javax.servlet.jsp.jstl.fmt.localizationContext"
+	 * Checks JSTL's "jakarta.servlet.jsp.jstl.fmt.localizationContext"
 	 * context-param and creates a corresponding child message source,
 	 * with the provided Spring-defined MessageSource as parent.
 	 * @param servletContext the ServletContext we're running in
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
index 9907bce5a8f8..db97efc2bae6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
@@ -22,11 +22,11 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.jstl.core.Config;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceResolvable;
@@ -93,7 +93,7 @@ public class RequestContext {
 
 
 	protected static final boolean jstlPresent = ClassUtils.isPresent(
-			"javax.servlet.jsp.jstl.core.Config", RequestContext.class.getClassLoader());
+			"jakarta.servlet.jsp.jstl.core.Config", RequestContext.class.getClassLoader());
 
 	private HttpServletRequest request;
 
@@ -137,7 +137,7 @@ public class RequestContext {
 	 * Pass in a ServletContext to be able to fallback to the root WebApplicationContext.
 	 * @param request current HTTP request
 	 * @see org.springframework.web.servlet.DispatcherServlet
-	 * @see #RequestContext(javax.servlet.http.HttpServletRequest, javax.servlet.ServletContext)
+	 * @see #RequestContext(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.ServletContext)
 	 */
 	public RequestContext(HttpServletRequest request) {
 		this(request, null, null, null);
@@ -152,7 +152,7 @@ public RequestContext(HttpServletRequest request) {
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @see org.springframework.web.servlet.DispatcherServlet
-	 * @see #RequestContext(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext, Map)
+	 * @see #RequestContext(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.ServletContext, Map)
 	 */
 	public RequestContext(HttpServletRequest request, HttpServletResponse response) {
 		this(request, response, null, null);
@@ -183,7 +183,7 @@ public RequestContext(HttpServletRequest request, @Nullable ServletContext servl
 	 * @param model the model attributes for the current view (can be {@code null},
 	 * using the request attributes for Errors retrieval)
 	 * @see org.springframework.web.servlet.DispatcherServlet
-	 * @see #RequestContext(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext, Map)
+	 * @see #RequestContext(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.ServletContext, Map)
 	 */
 	public RequestContext(HttpServletRequest request, @Nullable Map<String, Object> model) {
 		this(request, null, null, model);
@@ -324,7 +324,7 @@ public TimeZone getTimeZone() {
 	 * <p>The default implementation checks for a JSTL locale attribute in request, session
 	 * or application scope; if not found, returns the {@code HttpServletRequest.getLocale()}.
 	 * @return the fallback locale (never {@code null})
-	 * @see javax.servlet.http.HttpServletRequest#getLocale()
+	 * @see jakarta.servlet.http.HttpServletRequest#getLocale()
 	 */
 	protected Locale getFallbackLocale() {
 		if (jstlPresent) {
@@ -533,7 +533,7 @@ public RequestDataValueProcessor getRequestDataValueProcessor() {
 	 * indicates the current web application. This is useful for building links
 	 * to other resources within the application.
 	 * <p>Delegates to the UrlPathHelper for decoding.
-	 * @see javax.servlet.http.HttpServletRequest#getContextPath
+	 * @see jakarta.servlet.http.HttpServletRequest#getContextPath
 	 * @see #getUrlPathHelper
 	 */
 	public String getContextPath() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
index 05f3e78f2eea..8f7e97acb1e1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
@@ -20,10 +20,10 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.TimeZoneAwareLocaleContext;
@@ -136,7 +136,7 @@ public static LocaleResolver getLocaleResolver(HttpServletRequest request) {
 	 * LocaleResolver bound to the request by the DispatcherServlet
 	 * (if available), falling back to the request's accept-header Locale.
 	 * <p>This method serves as a straightforward alternative to the standard
-	 * Servlet {@link javax.servlet.http.HttpServletRequest#getLocale()} method,
+	 * Servlet {@link jakarta.servlet.http.HttpServletRequest#getLocale()} method,
 	 * falling back to the latter if no more specific locale has been found.
 	 * <p>Consider using {@link org.springframework.context.i18n.LocaleContextHolder#getLocale()}
 	 * which will normally be populated with the same Locale.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
index 654d5996fcfc..dba327445530 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
index 900e224f195f..3c04f0be2736 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.support;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java
index d201b25b6e02..faf981da8728 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java
@@ -18,9 +18,9 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.FlashMap;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
index e6bb3a73a592..6da820e822e0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
@@ -24,9 +24,9 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.CacheControl;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentAware.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentAware.java
index 1d4401556fe0..6e00296c1b2d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentAware.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentAware.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspTagException;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentTag.java
index 682165916728..84ba71c1f7b8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentTag.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
index 5cc8a7659129..75042ea5105f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.validation.Errors;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
index dafdbd52b9d6..5268a3a9ce09 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
@@ -18,8 +18,8 @@
 
 import java.beans.PropertyEditor;
 
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
index 499619e8d961..d6c9e2e773d1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
@@ -18,7 +18,7 @@
 
 import java.beans.PropertyEditor;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
index 63daac01ffee..d759c7fcfa10 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
@@ -18,9 +18,9 @@
 
 import java.io.IOException;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyTag;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
index 165a9141f513..ea079a8be8ac 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.context.expression.EnvironmentAccessor;
@@ -102,7 +102,7 @@
 public class EvalTag extends HtmlEscapingAwareTag {
 
 	/**
-	 * {@link javax.servlet.jsp.PageContext} attribute for the
+	 * {@link jakarta.servlet.jsp.PageContext} attribute for the
 	 * page-level {@link EvaluationContext} instance.
 	 */
 	private static final String EVALUATION_CONTEXT_PAGE_ATTRIBUTE =
@@ -212,7 +212,7 @@ private static class JspPropertyAccessor implements PropertyAccessor {
 		private final PageContext pageContext;
 
 		@Nullable
-		private final javax.servlet.jsp.el.VariableResolver variableResolver;
+		private final jakarta.servlet.jsp.el.VariableResolver variableResolver;
 
 		public JspPropertyAccessor(PageContext pageContext) {
 			this.pageContext = pageContext;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
index 04d080538be1..0d4ba42e51f3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * The {@code <htmlEscape>} tag sets default HTML escape value for the current
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
index 09612a03e7e5..65a5e7275c85 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.util.HtmlUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
index ed240284af10..3c794e0f93ac 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
@@ -22,8 +22,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceResolvable;
@@ -227,7 +227,7 @@ public void setText(String text) {
 	 * Set PageContext attribute name under which to expose
 	 * a variable that contains the resolved message.
 	 * @see #setScope
-	 * @see javax.servlet.jsp.PageContext#setAttribute
+	 * @see jakarta.servlet.jsp.PageContext#setAttribute
 	 */
 	public void setVar(String var) {
 		this.var = var;
@@ -238,7 +238,7 @@ public void setVar(String var) {
 	 * Default is SCOPE_PAGE ("page").
 	 * @see #setVar
 	 * @see org.springframework.web.util.TagUtils#SCOPE_PAGE
-	 * @see javax.servlet.jsp.PageContext#setAttribute
+	 * @see jakarta.servlet.jsp.PageContext#setAttribute
 	 */
 	public void setScope(String scope) {
 		this.scope = scope;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
index c010c7bb8c0e..c8fe794798d0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
@@ -16,10 +16,10 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
 
 import org.springframework.beans.PropertyAccessor;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
index b0ca15a947e7..513ea6bae21d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
index ee730b82bab4..af503346e07c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
@@ -16,11 +16,10 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.tagext.TryCatchFinally;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspTagException;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TryCatchFinally;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -51,7 +50,7 @@
 public abstract class RequestContextAwareTag extends TagSupport implements TryCatchFinally {
 
 	/**
-	 * {@link javax.servlet.jsp.PageContext} attribute for the
+	 * {@link jakarta.servlet.jsp.PageContext} attribute for the
 	 * page-level {@link RequestContext} instance.
 	 */
 	public static final String REQUEST_CONTEXT_PAGE_ATTRIBUTE =
@@ -105,7 +104,7 @@ protected final RequestContext getRequestContext() {
 	 * @return same as TagSupport.doStartTag
 	 * @throws Exception any exception, any checked one other than
 	 * a JspException gets wrapped in a JspException by doStartTag
-	 * @see javax.servlet.jsp.tagext.TagSupport#doStartTag
+	 * @see jakarta.servlet.jsp.tagext.TagSupport#doStartTag
 	 */
 	protected abstract int doStartTagInternal() throws Exception;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
index 3957d3bfd3da..00083c879469 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
@@ -19,8 +19,8 @@
 import java.beans.PropertyEditor;
 import java.io.IOException;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.util.TagUtils;
@@ -114,7 +114,7 @@ public void setValue(Object value) {
 	 * Set PageContext attribute name under which to expose
 	 * a variable that contains the result of the transformation.
 	 * @see #setScope
-	 * @see javax.servlet.jsp.PageContext#setAttribute
+	 * @see jakarta.servlet.jsp.PageContext#setAttribute
 	 */
 	public void setVar(String var) {
 		this.var = var;
@@ -125,7 +125,7 @@ public void setVar(String var) {
 	 * Default is SCOPE_PAGE ("page").
 	 * @see #setVar
 	 * @see org.springframework.web.util.TagUtils#SCOPE_PAGE
-	 * @see javax.servlet.jsp.PageContext#setAttribute
+	 * @see jakarta.servlet.jsp.PageContext#setAttribute
 	 */
 	public void setScope(String scope) {
 		this.scope = scope;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 079b3214846f..8e30154bb0f7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -24,11 +24,11 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
index 5e40396a7c79..0c83f0d66252 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
index bfcb2c3fba86..00dcf90a6109 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
@@ -18,10 +18,10 @@
 
 import java.beans.PropertyEditor;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.beans.PropertyAccessor;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
index fb48d00cac46..f766ccf54d16 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
@@ -18,7 +18,7 @@
 
 import java.beans.PropertyEditor;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
@@ -32,8 +32,8 @@
  * actual tag rendering.
  *
  * <p>Subclasses (or test classes) can override the {@link #createTagWriter()} method to
- * redirect output to a {@link java.io.Writer} other than the {@link javax.servlet.jsp.JspWriter}
- * associated with the current {@link javax.servlet.jsp.PageContext}.
+ * redirect output to a {@link java.io.Writer} other than the {@link jakarta.servlet.jsp.JspWriter}
+ * associated with the current {@link jakarta.servlet.jsp.PageContext}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -69,8 +69,8 @@ protected final void writeOptionalAttribute(TagWriter tagWriter, String attribut
 
 	/**
 	 * Create the {@link TagWriter} which all output will be written to. By default,
-	 * the {@link TagWriter} writes its output to the {@link javax.servlet.jsp.JspWriter}
-	 * for the current {@link javax.servlet.jsp.PageContext}. Subclasses may choose to
+	 * the {@link TagWriter} writes its output to the {@link jakarta.servlet.jsp.JspWriter}
+	 * for the current {@link jakarta.servlet.jsp.PageContext}. Subclasses may choose to
 	 * change the {@link java.io.Writer} to which output is actually written.
 	 */
 	protected TagWriter createTagWriter() {
@@ -117,7 +117,7 @@ protected boolean isDefaultHtmlEscape() {
 
 	/**
 	 * Subclasses should implement this method to perform tag content rendering.
-	 * @return valid tag render instruction as per {@link javax.servlet.jsp.tagext.Tag#doStartTag()}.
+	 * @return valid tag render instruction as per {@link jakarta.servlet.jsp.tagext.Tag#doStartTag()}.
 	 */
 	protected abstract int writeTagContent(TagWriter tagWriter) throws JspException;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
index 0212d7a1de97..92528dcabf43 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
@@ -18,9 +18,9 @@
 
 import java.io.IOException;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyTag;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -62,7 +62,7 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
 	 * If {@link #shouldRender rendering}, flush any buffered
 	 * {@link BodyContent} or, if no {@link BodyContent} is supplied,
 	 * {@link #renderDefaultContent render the default content}.
-	 * @return a {@link javax.servlet.jsp.tagext.Tag#EVAL_PAGE} result
+	 * @return a {@link jakarta.servlet.jsp.tagext.Tag#EVAL_PAGE} result
 	 */
 	@Override
 	public int doEndTag() throws JspException {
@@ -122,21 +122,21 @@ protected boolean shouldRender() throws JspException {
 
 	/**
 	 * Called during {@link #writeTagContent} allowing subclasses to add any attributes to the
-	 * {@link javax.servlet.jsp.PageContext} as needed.
+	 * {@link jakarta.servlet.jsp.PageContext} as needed.
 	 */
 	protected void exposeAttributes() throws JspException {
 	}
 
 	/**
 	 * Called by {@link #doFinally} allowing subclasses to remove any attributes from the
-	 * {@link javax.servlet.jsp.PageContext} as needed.
+	 * {@link jakarta.servlet.jsp.PageContext} as needed.
 	 */
 	protected void removeAttributes() {
 	}
 
 	/**
 	 * The user customised the output of the error messages - flush the
-	 * buffered content into the main {@link javax.servlet.jsp.JspWriter}.
+	 * buffered content into the main {@link jakarta.servlet.jsp.JspWriter}.
 	 */
 	protected void flushBufferedBodyContent(BodyContent bodyContent) throws JspException {
 		try {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
index 1599694fd80e..11fd195246d2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
@@ -19,8 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.DynamicAttributes;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.DynamicAttributes;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
index 8549bea401ea..ce6a786bab1c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
index 8a02ecacb64a..340fe962f852 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
@@ -20,7 +20,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.PropertyAccessorFactory;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
index 84f2505bd83f..e0683cc64eb8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
index 53ece7b3c71d..805adeefb16a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
index f3b1d2a84854..7f5518a65788 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.web.bind.WebDataBinder;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
index a9693fd6baf6..ab7207a73a7e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.web.bind.WebDataBinder;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
index 106f359f9876..a1c1c978d66f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
@@ -20,9 +20,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTag;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
index 54d0c869f6f8..d4028073a188 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
@@ -19,12 +19,12 @@
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.beans.PropertyAccessor;
 import org.springframework.core.Conventions;
@@ -255,7 +255,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	private static final String MODEL_ATTRIBUTE = "modelAttribute";
 
 	/**
-	 * The name of the {@link javax.servlet.jsp.PageContext} attribute under which the
+	 * The name of the {@link jakarta.servlet.jsp.PageContext} attribute under which the
 	 * form object name is exposed.
 	 */
 	public static final String MODEL_ATTRIBUTE_VARIABLE_NAME =
@@ -537,9 +537,9 @@ protected boolean isMethodBrowserSupported(String method) {
 
 	/**
 	 * Writes the opening part of the block	'{@code form}' tag and exposes
-	 * the form object name in the {@link javax.servlet.jsp.PageContext}.
+	 * the form object name in the {@link jakarta.servlet.jsp.PageContext}.
 	 * @param tagWriter the {@link TagWriter} to which the form content is to be written
-	 * @return {@link javax.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE}
+	 * @return {@link jakarta.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE}
 	 */
 	@Override
 	protected int writeTagContent(TagWriter tagWriter) throws JspException {
@@ -684,7 +684,7 @@ private String processAction(String action) {
 
 	/**
 	 * Closes the '{@code form}' block tag and removes the form object name
-	 * from the {@link javax.servlet.jsp.PageContext}.
+	 * from the {@link jakarta.servlet.jsp.PageContext}.
 	 */
 	@Override
 	public int doEndTag() throws JspException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
index 48704bff8530..9e1de82fb95e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * The {@code <hidden>} tag renders an HTML 'input' tag with type 'hidden' using
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
index 0605bb10868d..91834aea14ec 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
index 6f8a91f1ec4c..018c098473bc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -222,7 +222,7 @@ protected String getFor() {
 	/**
 	 * Writes the opening '{@code label}' tag and forces a block tag so
 	 * that body content is written correctly.
-	 * @return {@link javax.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE}
+	 * @return {@link jakarta.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE}
 	 */
 	@Override
 	protected int writeTagContent(TagWriter tagWriter) throws JspException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
index b9eaa89b6664..3197706bc13e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyTag;
 
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.support.BindStatus;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
index 3e75186c2e38..433ac220ede1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.PropertyAccessorFactory;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
index 6e00a19d3985..6a8c8ca75600 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
index 5eb69eedfae4..ff958a4d2ed2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * The {@code <password>} tag renders an HTML 'input' tag with type 'password'
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
index cb11d8dc0141..13f7b5dc4c3d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 /**
  * The {@code <radiobutton>} tag renders an HTML 'input' tag with type 'radio'.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
index 96bb041c46e3..8c7d92b5e503 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
@@ -243,7 +243,7 @@
 public class SelectTag extends AbstractHtmlInputElementTag {
 
 	/**
-	 * The {@link javax.servlet.jsp.PageContext} attribute under
+	 * The {@link jakarta.servlet.jsp.PageContext} attribute under
 	 * which the bound value is exposed to inner {@link OptionTag OptionTags}.
 	 */
 	public static final String LIST_VALUE_PAGE_ATTRIBUTE =
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
index 24685e9826be..ff51344d1a1a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
 
 /**
  * Utility class for generating '{@code id}' attributes values for JSP tags. Given the
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
index 87cedb540223..5c147ea258da 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
@@ -21,8 +21,8 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
index ce6f700a7237..b8d5ae2501d3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
index a9ca3fc75fa4..19e5c26a89f3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet.theme;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
index 986d3972299a..02a588d9a062 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.theme;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
index 8a8faa76a766..d6270d123306 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.theme;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
index 152e9b19362e..81bb05a36987 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet.theme;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ThemeResolver;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
index b7f0ebfbcc20..d7bf2fa33762 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java
index 7a1a24cd7568..3d028668df10 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java
@@ -20,10 +20,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.web.servlet.support.RequestContext;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
index 5df004609b72..5f47cb303c6b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
@@ -27,9 +27,9 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.http.MediaType;
@@ -388,7 +388,7 @@ protected void prepareResponse(HttpServletRequest request, HttpServletResponse r
 	 * generating download content that requires temporary caching on the
 	 * client side, typically via the response OutputStream.
 	 * @see #prepareResponse
-	 * @see javax.servlet.http.HttpServletResponse#getOutputStream()
+	 * @see jakarta.servlet.http.HttpServletResponse#getOutputStream()
 	 */
 	protected boolean generatesDownloadContent() {
 		return false;
@@ -432,7 +432,7 @@ protected abstract void renderMergedOutputModel(
 	/**
 	 * Expose the model objects in the given map as request attributes.
 	 * Names will be taken from the model Map.
-	 * This method is suitable for all resources reachable by {@link javax.servlet.RequestDispatcher}.
+	 * This method is suitable for all resources reachable by {@link jakarta.servlet.RequestDispatcher}.
 	 * @param model a Map of model objects to expose
 	 * @param request current HTTP request
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
index 2d61e8a19105..3c1699a5abd4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
@@ -25,9 +25,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
index 9d9bc6811ccb..7f3bec996ecc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.view;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
index 6deab1ca3b48..f1d050135a63 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
@@ -18,10 +18,10 @@
 
 import java.util.Map;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -31,7 +31,7 @@
 /**
  * Wrapper for a JSP or other resource within the same web application.
  * Exposes model objects as request attributes and forwards the request to
- * the specified resource URL using a {@link javax.servlet.RequestDispatcher}.
+ * the specified resource URL using a {@link jakarta.servlet.RequestDispatcher}.
  *
  * <p>A URL for this view is supposed to specify a resource within the web
  * application, suitable for RequestDispatcher's {@code forward} or
@@ -57,9 +57,9 @@
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Rob Harrop
- * @see javax.servlet.RequestDispatcher#forward
- * @see javax.servlet.RequestDispatcher#include
- * @see javax.servlet.ServletResponse#flushBuffer
+ * @see jakarta.servlet.RequestDispatcher#forward
+ * @see jakarta.servlet.RequestDispatcher#include
+ * @see jakarta.servlet.ServletResponse#flushBuffer
  * @see InternalResourceViewResolver
  * @see JstlView
  */
@@ -102,9 +102,9 @@ public InternalResourceView(String url, boolean alwaysInclude) {
 	 * Specify whether to always include the view rather than forward to it.
 	 * <p>Default is "false". Switch this flag on to enforce the use of a
 	 * Servlet include, even if a forward would be possible.
-	 * @see javax.servlet.RequestDispatcher#forward
-	 * @see javax.servlet.RequestDispatcher#include
-	 * @see #useInclude(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 * @see jakarta.servlet.RequestDispatcher#forward
+	 * @see jakarta.servlet.RequestDispatcher#include
+	 * @see #useInclude(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)
 	 */
 	public void setAlwaysInclude(boolean alwaysInclude) {
 		this.alwaysInclude = alwaysInclude;
@@ -238,9 +238,9 @@ protected RequestDispatcher getRequestDispatcher(HttpServletRequest request, Str
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @return {@code true} for include, {@code false} for forward
-	 * @see javax.servlet.RequestDispatcher#forward
-	 * @see javax.servlet.RequestDispatcher#include
-	 * @see javax.servlet.ServletResponse#isCommitted
+	 * @see jakarta.servlet.RequestDispatcher#forward
+	 * @see jakarta.servlet.RequestDispatcher#include
+	 * @see jakarta.servlet.ServletResponse#isCommitted
 	 * @see org.springframework.web.util.WebUtils#isIncludeRequest
 	 */
 	protected boolean useInclude(HttpServletRequest request, HttpServletResponse response) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
index e89ba2dcff77..4404be51854d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
@@ -49,7 +49,7 @@
 public class InternalResourceViewResolver extends UrlBasedViewResolver {
 
 	private static final boolean jstlPresent = ClassUtils.isPresent(
-			"javax.servlet.jsp.jstl.core.Config", InternalResourceViewResolver.class.getClassLoader());
+			"jakarta.servlet.jsp.jstl.core.Config", InternalResourceViewResolver.class.getClassLoader());
 
 	@Nullable
 	private Boolean alwaysInclude;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
index c11eb4e6c94d..780f6f2b923a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.view;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.context.MessageSource;
 import org.springframework.lang.Nullable;
@@ -101,7 +101,7 @@ public JstlView(String url) {
 	 * @param url the URL to forward to
 	 * @param messageSource the MessageSource to expose to JSTL tags
 	 * (will be wrapped with a JSTL-aware MessageSource that is aware of JSTL's
-	 * {@code javax.servlet.jsp.jstl.fmt.localizationContext} context-param)
+	 * {@code jakarta.servlet.jsp.jstl.fmt.localizationContext} context-param)
 	 * @see JstlUtils#getJstlAwareMessageSource
 	 */
 	public JstlView(String url, MessageSource messageSource) {
@@ -112,7 +112,7 @@ public JstlView(String url, MessageSource messageSource) {
 
 	/**
 	 * Wraps the MessageSource with a JSTL-aware MessageSource that is aware
-	 * of JSTL's {@code javax.servlet.jsp.jstl.fmt.localizationContext}
+	 * of JSTL's {@code jakarta.servlet.jsp.jstl.fmt.localizationContext}
 	 * context-param.
 	 * @see JstlUtils#getJstlAwareMessageSource
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
index 6ecaffcf9652..a88401e65a92 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
@@ -27,8 +27,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpStatus;
@@ -81,7 +81,7 @@
  * @see #setContextRelative
  * @see #setHttp10Compatible
  * @see #setExposeModelAttributes
- * @see javax.servlet.http.HttpServletResponse#sendRedirect
+ * @see jakarta.servlet.http.HttpServletResponse#sendRedirect
  */
 public class RedirectView extends AbstractUrlBasedView implements SmartView {
 
@@ -178,7 +178,7 @@ public RedirectView(String url, boolean contextRelative, boolean http10Compatibl
 	 * <p>Default is "false": A URL that starts with a slash will be interpreted
 	 * as absolute, i.e. taken as-is. If "true", the context path will be
 	 * prepended to the URL in such a case.
-	 * @see javax.servlet.http.HttpServletRequest#getContextPath
+	 * @see jakarta.servlet.http.HttpServletRequest#getContextPath
 	 */
 	public void setContextRelative(boolean contextRelative) {
 		this.contextRelative = contextRelative;
@@ -193,7 +193,7 @@ public void setContextRelative(boolean contextRelative) {
 	 * <p>Many HTTP 1.1 clients treat 302 just like 303, not making any
 	 * difference. However, some clients depend on 303 when redirecting
 	 * after a POST request; turn this flag off in such a scenario.
-	 * @see javax.servlet.http.HttpServletResponse#sendRedirect
+	 * @see jakarta.servlet.http.HttpServletResponse#sendRedirect
 	 */
 	public void setHttp10Compatible(boolean http10Compatible) {
 		this.http10Compatible = http10Compatible;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
index d25f426d9e4e..d25a6ac05fa7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.ApplicationContext;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java
index 7b2441564f1a..5421c4b90022 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ViewResolverComposite.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java
index c21e03560e8f..356af133ef12 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfStamperView.java
@@ -20,11 +20,10 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfStamper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.util.Assert;
 import org.springframework.web.servlet.view.AbstractUrlBasedView;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
index 4a26d2ecdada..8cac515a6e48 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
@@ -20,13 +20,12 @@
 import java.io.OutputStream;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfWriter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.web.servlet.view.AbstractView;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java
index ab9ba67be3c9..9727fd3a352c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsView.java
@@ -19,10 +19,9 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxStreamingView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxStreamingView.java
index 1f6dccb1d5e3..9b120a1b6f1b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxStreamingView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxStreamingView.java
@@ -19,9 +19,8 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxView.java
index 78d8360bbe92..888a00d1be1a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractXlsxView.java
@@ -18,8 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
index 58e0893cd272..95a54eb0b4a0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
@@ -19,11 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.rometools.rome.feed.atom.Entry;
 import com.rometools.rome.feed.atom.Feed;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Abstract superclass for Atom Feed views, using the
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
index 6ea756645817..f976446a1b6f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
@@ -19,12 +19,11 @@
 import java.io.OutputStreamWriter;
 import java.util.Map;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.rometools.rome.feed.WireFeed;
 import com.rometools.rome.io.WireFeedOutput;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.view.AbstractView;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
index aef278f791ba..aa22a8768926 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
@@ -19,11 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.rometools.rome.feed.rss.Channel;
 import com.rometools.rome.feed.rss.Item;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.MediaType;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java
index 42b04cfa84f3..22c43eaed914 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.web.servlet.view.freemarker;
 
-import freemarker.ext.jsp.TaglibFactory;
 import freemarker.template.Configuration;
 
 /**
@@ -41,10 +40,4 @@ public interface FreeMarkerConfig {
 	 */
 	Configuration getConfiguration();
 
-	/**
-	 * Return the {@link TaglibFactory} used to enable JSP tags to be
-	 * accessed from FreeMarker templates.
-	 */
-	TaglibFactory getTaglibFactory();
-
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
index 0eb2e30f3bc7..9caac97a3398 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,8 @@
 import java.io.IOException;
 import java.util.List;
 
-import javax.servlet.ServletContext;
-
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.TemplateLoader;
-import freemarker.ext.jsp.TaglibFactory;
 import freemarker.template.Configuration;
 import freemarker.template.TemplateException;
 
@@ -32,7 +29,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.ui.freemarker.FreeMarkerConfigurationFactory;
 import org.springframework.util.Assert;
-import org.springframework.web.context.ServletContextAware;
 
 /**
  * JavaBean to configure FreeMarker for web usage, via the "configLocation"
@@ -78,14 +74,11 @@
  * @see FreeMarkerView
  */
 public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory
-		implements FreeMarkerConfig, InitializingBean, ResourceLoaderAware, ServletContextAware {
+		implements FreeMarkerConfig, InitializingBean, ResourceLoaderAware {
 
 	@Nullable
 	private Configuration configuration;
 
-	@Nullable
-	private TaglibFactory taglibFactory;
-
 
 	/**
 	 * Set a preconfigured Configuration to use for the FreeMarker web config, e.g. a
@@ -98,14 +91,6 @@ public void setConfiguration(Configuration configuration) {
 		this.configuration = configuration;
 	}
 
-	/**
-	 * Initialize the {@link TaglibFactory} for the given ServletContext.
-	 */
-	@Override
-	public void setServletContext(ServletContext servletContext) {
-		this.taglibFactory = new TaglibFactory(servletContext);
-	}
-
 
 	/**
 	 * Initialize FreeMarkerConfigurationFactory's Configuration
@@ -140,13 +125,4 @@ public Configuration getConfiguration() {
 		return this.configuration;
 	}
 
-	/**
-	 * Return the TaglibFactory object wrapped by this bean.
-	 */
-	@Override
-	public TaglibFactory getTaglibFactory() {
-		Assert.state(this.taglibFactory != null, "No TaglibFactory available");
-		return this.taglibFactory;
-	}
-
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
index faa25110ea3e..7d22d659eaa7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,39 +18,22 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import freemarker.core.ParseException;
-import freemarker.ext.jsp.TaglibFactory;
-import freemarker.ext.servlet.AllHttpScopesHashModel;
-import freemarker.ext.servlet.FreemarkerServlet;
-import freemarker.ext.servlet.HttpRequestHashModel;
-import freemarker.ext.servlet.HttpRequestParametersHashModel;
-import freemarker.ext.servlet.HttpSessionHashModel;
-import freemarker.ext.servlet.ServletContextHashModel;
 import freemarker.template.Configuration;
 import freemarker.template.DefaultObjectWrapperBuilder;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.SimpleHash;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.lang.Nullable;
@@ -95,12 +78,6 @@ public class FreeMarkerView extends AbstractTemplateView {
 	@Nullable
 	private Configuration configuration;
 
-	@Nullable
-	private TaglibFactory taglibFactory;
-
-	@Nullable
-	private ServletContextHashModel servletContextHashModel;
-
 
 	/**
 	 * Set the encoding of the FreeMarker template file. Default is determined
@@ -124,10 +101,6 @@ protected String getEncoding() {
 	 * Set the FreeMarker Configuration to be used by this view.
 	 * <p>If this is not set, the default lookup will occur: a single {@link FreeMarkerConfig}
 	 * is expected in the current web application context, with any bean name.
-	 * <strong>Note:</strong> using this method will cause a new instance of {@link TaglibFactory}
-	 * to created for every single {@link FreeMarkerView} instance. This can be quite expensive
-	 * in terms of memory and initial CPU usage. In production it is recommended that you use
-	 * a {@link FreeMarkerConfig} which exposes a single shared {@link TaglibFactory}.
 	 */
 	public void setConfiguration(@Nullable Configuration configuration) {
 		this.configuration = configuration;
@@ -164,23 +137,10 @@ protected Configuration obtainConfiguration() {
 	 */
 	@Override
 	protected void initServletContext(ServletContext servletContext) throws BeansException {
-		if (getConfiguration() != null) {
-			this.taglibFactory = new TaglibFactory(servletContext);
-		}
-		else {
+		if (getConfiguration() == null) {
 			FreeMarkerConfig config = autodetectConfiguration();
 			setConfiguration(config.getConfiguration());
-			this.taglibFactory = config.getTaglibFactory();
-		}
-
-		GenericServlet servlet = new GenericServletAdapter();
-		try {
-			servlet.init(new DelegatingServletConfig());
-		}
-		catch (ServletException ex) {
-			throw new BeanInitializationException("Initialization of GenericServlet adapter failed", ex);
 		}
-		this.servletContextHashModel = new ServletContextHashModel(servlet, getObjectWrapper());
 	}
 
 	/**
@@ -306,7 +266,7 @@ protected void doRender(Map<String, Object> model, HttpServletRequest request,
 
 	/**
 	 * Build a FreeMarker template model for the given model Map.
-	 * <p>The default implementation builds a {@link AllHttpScopesHashModel}.
+	 * <p>The default implementation builds a {@link SimpleHash}.
 	 * @param model the model to use for rendering
 	 * @param request current HTTP request
 	 * @param response current servlet response
@@ -315,33 +275,11 @@ protected void doRender(Map<String, Object> model, HttpServletRequest request,
 	protected SimpleHash buildTemplateModel(Map<String, Object> model, HttpServletRequest request,
 			HttpServletResponse response) {
 
-		AllHttpScopesHashModel fmModel = new AllHttpScopesHashModel(getObjectWrapper(), getServletContext(), request);
-		fmModel.put(FreemarkerServlet.KEY_JSP_TAGLIBS, this.taglibFactory);
-		fmModel.put(FreemarkerServlet.KEY_APPLICATION, this.servletContextHashModel);
-		fmModel.put(FreemarkerServlet.KEY_SESSION, buildSessionModel(request, response));
-		fmModel.put(FreemarkerServlet.KEY_REQUEST, new HttpRequestHashModel(request, response, getObjectWrapper()));
-		fmModel.put(FreemarkerServlet.KEY_REQUEST_PARAMETERS, new HttpRequestParametersHashModel(request));
+		SimpleHash fmModel = new SimpleHash(getObjectWrapper());
 		fmModel.putAll(model);
 		return fmModel;
 	}
 
-	/**
-	 * Build a FreeMarker {@link HttpSessionHashModel} for the given request,
-	 * detecting whether a session already exists and reacting accordingly.
-	 * @param request current HTTP request
-	 * @param response current servlet response
-	 * @return the FreeMarker HttpSessionHashModel
-	 */
-	private HttpSessionHashModel buildSessionModel(HttpServletRequest request, HttpServletResponse response) {
-		HttpSession session = request.getSession(false);
-		if (session != null) {
-			return new HttpSessionHashModel(session, getObjectWrapper());
-		}
-		else {
-			return new HttpSessionHashModel(null, request, response, getObjectWrapper());
-		}
-	}
-
 	/**
 	 * Retrieve the FreeMarker template for the given locale,
 	 * to be rendering by this view.
@@ -391,49 +329,4 @@ protected void processTemplate(Template template, SimpleHash model, HttpServletR
 		template.process(model, response.getWriter());
 	}
 
-
-	/**
-	 * Simple adapter class that extends {@link GenericServlet}.
-	 * Needed for JSP access in FreeMarker.
-	 */
-	@SuppressWarnings("serial")
-	private static class GenericServletAdapter extends GenericServlet {
-
-		@Override
-		public void service(ServletRequest servletRequest, ServletResponse servletResponse) {
-			// no-op
-		}
-	}
-
-
-	/**
-	 * Internal implementation of the {@link ServletConfig} interface,
-	 * to be passed to the servlet adapter.
-	 */
-	private class DelegatingServletConfig implements ServletConfig {
-
-		@Override
-		@Nullable
-		public String getServletName() {
-			return FreeMarkerView.this.getBeanName();
-		}
-
-		@Override
-		@Nullable
-		public ServletContext getServletContext() {
-			return FreeMarkerView.this.getServletContext();
-		}
-
-		@Override
-		@Nullable
-		public String getInitParameter(String paramName) {
-			return null;
-		}
-
-		@Override
-		public Enumeration<String> getInitParameterNames() {
-			return Collections.enumeration(Collections.emptySet());
-		}
-	}
-
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupView.java
index 8db7d12d53d9..e91c0f822033 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupView.java
@@ -21,11 +21,10 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import groovy.text.Template;
 import groovy.text.markup.MarkupTemplateEngine;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactoryUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
index 9d116dc8ca07..e85cea4415e6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
@@ -21,9 +21,6 @@
 import java.io.OutputStream;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.core.JsonEncoding;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -31,6 +28,8 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.ser.FilterProvider;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.converter.json.MappingJacksonValue;
 import org.springframework.lang.Nullable;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
index 1593a88ae410..57e627e89cb4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
@@ -32,9 +32,10 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.script.SimpleBindings;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactoryUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java
deleted file mode 100644
index f6fdb90aea64..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import org.apache.tiles.TilesException;
-import org.apache.tiles.preparer.ViewPreparer;
-import org.apache.tiles.preparer.factory.PreparerFactory;
-import org.apache.tiles.request.Request;
-
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-/**
- * Abstract implementation of the Tiles {@link org.apache.tiles.preparer.factory.PreparerFactory}
- * interface, obtaining the current Spring WebApplicationContext and delegating to
- * {@link #getPreparer(String, org.springframework.web.context.WebApplicationContext)}.
- *
- * @author Juergen Hoeller
- * @since 3.2
- * @see #getPreparer(String, org.springframework.web.context.WebApplicationContext)
- * @see SimpleSpringPreparerFactory
- * @see SpringBeanPreparerFactory
- */
-public abstract class AbstractSpringPreparerFactory implements PreparerFactory {
-
-	@Override
-	public ViewPreparer getPreparer(String name, Request context) {
-		WebApplicationContext webApplicationContext = (WebApplicationContext) context.getContext("request").get(
-				DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE);
-		if (webApplicationContext == null) {
-			webApplicationContext = (WebApplicationContext) context.getContext("application").get(
-					WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
-			if (webApplicationContext == null) {
-				throw new IllegalStateException("No WebApplicationContext found: no ContextLoaderListener registered?");
-			}
-		}
-		return getPreparer(name, webApplicationContext);
-	}
-
-	/**
-	 * Obtain a preparer instance for the given preparer name,
-	 * based on the given Spring WebApplicationContext.
-	 * @param name the name of the preparer
-	 * @param context the current Spring WebApplicationContext
-	 * @return the preparer instance
-	 * @throws TilesException in case of failure
-	 */
-	protected abstract ViewPreparer getPreparer(String name, WebApplicationContext context) throws TilesException;
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java
deleted file mode 100644
index 0ef018d51252..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SimpleSpringPreparerFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tiles.TilesException;
-import org.apache.tiles.preparer.PreparerException;
-import org.apache.tiles.preparer.ViewPreparer;
-import org.apache.tiles.preparer.factory.NoSuchPreparerException;
-
-import org.springframework.util.ClassUtils;
-import org.springframework.web.context.WebApplicationContext;
-
-/**
- * Tiles {@link org.apache.tiles.preparer.factory.PreparerFactory} implementation
- * that expects preparer class names and builds preparer instances for those,
- * creating them through the Spring ApplicationContext in order to apply
- * Spring container callbacks and configured Spring BeanPostProcessors.
- *
- * @author Juergen Hoeller
- * @since 3.2
- * @see SpringBeanPreparerFactory
- */
-public class SimpleSpringPreparerFactory extends AbstractSpringPreparerFactory {
-
-	/** Cache of shared ViewPreparer instances: bean name -> bean instance. */
-	private final Map<String, ViewPreparer> sharedPreparers = new ConcurrentHashMap<>(16);
-
-
-	@Override
-	protected ViewPreparer getPreparer(String name, WebApplicationContext context) throws TilesException {
-		// Quick check on the concurrent map first, with minimal locking.
-		ViewPreparer preparer = this.sharedPreparers.get(name);
-		if (preparer == null) {
-			synchronized (this.sharedPreparers) {
-				preparer = this.sharedPreparers.get(name);
-				if (preparer == null) {
-					try {
-						Class<?> beanClass = ClassUtils.forName(name, context.getClassLoader());
-						if (!ViewPreparer.class.isAssignableFrom(beanClass)) {
-							throw new PreparerException(
-									"Invalid preparer class [" + name + "]: does not implement ViewPreparer interface");
-						}
-						preparer = (ViewPreparer) context.getAutowireCapableBeanFactory().createBean(beanClass);
-						this.sharedPreparers.put(name, preparer);
-					}
-					catch (ClassNotFoundException ex) {
-						throw new NoSuchPreparerException("Preparer class [" + name + "] not found", ex);
-					}
-				}
-			}
-		}
-		return preparer;
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringBeanPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringBeanPreparerFactory.java
deleted file mode 100644
index 19e6cfec1ffd..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringBeanPreparerFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import org.apache.tiles.TilesException;
-import org.apache.tiles.preparer.ViewPreparer;
-
-import org.springframework.web.context.WebApplicationContext;
-
-/**
- * Tiles {@link org.apache.tiles.preparer.factory.PreparerFactory} implementation
- * that expects preparer bean names and obtains preparer beans from the
- * Spring ApplicationContext. The full bean creation process will be in
- * the control of the Spring application context in this case, allowing
- * for the use of scoped beans etc.
- *
- * @author Juergen Hoeller
- * @since 3.2
- * @see SimpleSpringPreparerFactory
- */
-public class SpringBeanPreparerFactory extends AbstractSpringPreparerFactory {
-
-	@Override
-	protected ViewPreparer getPreparer(String name, WebApplicationContext context) throws TilesException {
-		return context.getBean(name, ViewPreparer.class);
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringLocaleResolver.java
deleted file mode 100644
index 038d1ac71d66..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringLocaleResolver.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import java.util.Locale;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.tiles.locale.impl.DefaultLocaleResolver;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.servlet.NotAServletEnvironmentException;
-import org.apache.tiles.request.servlet.ServletUtil;
-
-import org.springframework.web.servlet.support.RequestContextUtils;
-
-/**
- * Tiles LocaleResolver adapter that delegates to a Spring
- * {@link org.springframework.web.servlet.LocaleResolver}, exposing the
- * DispatcherServlet-managed locale.
- *
- * <p>This adapter gets automatically registered by {@link TilesConfigurer}.
- *
- * @author Nicolas Le Bas
- * @since 3.2
- * @see org.apache.tiles.definition.UrlDefinitionsFactory#LOCALE_RESOLVER_IMPL_PROPERTY
- */
-public class SpringLocaleResolver extends DefaultLocaleResolver {
-
-	@Override
-	public Locale resolveLocale(Request request) {
-		try {
-			HttpServletRequest servletRequest = ServletUtil.getServletRequest(request).getRequest();
-			if (servletRequest != null) {
-				return RequestContextUtils.getLocale(servletRequest);
-			}
-		}
-		catch (NotAServletEnvironmentException ex) {
-			// ignore
-		}
-		return super.resolveLocale(request);
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
deleted file mode 100644
index ee23c042cd6c..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Locale;
-
-import javax.servlet.ServletContext;
-
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.locale.URLApplicationResource;
-import org.apache.tiles.request.servlet.ServletApplicationContext;
-
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.lang.Nullable;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.context.support.ServletContextResourcePatternResolver;
-
-/**
- * Spring-specific subclass of the Tiles ServletApplicationContext.
- *
- * @author Rossen Stoyanchev
- * @author Juergen Hoeller
- * @since 3.2
- */
-public class SpringWildcardServletTilesApplicationContext extends ServletApplicationContext {
-
-	private final ResourcePatternResolver resolver;
-
-
-	public SpringWildcardServletTilesApplicationContext(ServletContext servletContext) {
-		super(servletContext);
-		this.resolver = new ServletContextResourcePatternResolver(servletContext);
-	}
-
-
-	@Override
-	@Nullable
-	public ApplicationResource getResource(String localePath) {
-		Collection<ApplicationResource> urlSet = getResources(localePath);
-		if (!CollectionUtils.isEmpty(urlSet)) {
-			return urlSet.iterator().next();
-		}
-		return null;
-	}
-
-	@Override
-	@Nullable
-	public ApplicationResource getResource(ApplicationResource base, Locale locale) {
-		Collection<ApplicationResource> urlSet = getResources(base.getLocalePath(locale));
-		if (!CollectionUtils.isEmpty(urlSet)) {
-			return urlSet.iterator().next();
-		}
-		return null;
-	}
-
-	@Override
-	public Collection<ApplicationResource> getResources(String path) {
-		Resource[] resources;
-		try {
-			resources = this.resolver.getResources(path);
-		}
-		catch (IOException ex) {
-			((ServletContext) getContext()).log("Resource retrieval failed for path: " + path, ex);
-			return Collections.emptyList();
-		}
-		if (ObjectUtils.isEmpty(resources)) {
-			((ServletContext) getContext()).log("No resources found for path pattern: " + path);
-			return Collections.emptyList();
-		}
-
-		Collection<ApplicationResource> resourceList = new ArrayList<>(resources.length);
-		for (Resource resource : resources) {
-			try {
-				URL url = resource.getURL();
-				resourceList.add(new URLApplicationResource(url.toExternalForm(), url));
-			}
-			catch (IOException ex) {
-				// Shouldn't happen with the kind of resources we're using
-				throw new IllegalArgumentException("No URL for " + resource, ex);
-			}
-		}
-		return resourceList;
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
deleted file mode 100644
index dbbdf0f22e91..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.ResourceBundleELResolver;
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.JspFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.TilesException;
-import org.apache.tiles.definition.DefinitionsFactory;
-import org.apache.tiles.definition.DefinitionsReader;
-import org.apache.tiles.definition.dao.BaseLocaleUrlDefinitionDAO;
-import org.apache.tiles.definition.dao.CachingLocaleUrlDefinitionDAO;
-import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
-import org.apache.tiles.el.ELAttributeEvaluator;
-import org.apache.tiles.el.ScopeELResolver;
-import org.apache.tiles.el.TilesContextBeanELResolver;
-import org.apache.tiles.el.TilesContextELResolver;
-import org.apache.tiles.evaluator.AttributeEvaluator;
-import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
-import org.apache.tiles.evaluator.BasicAttributeEvaluatorFactory;
-import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
-import org.apache.tiles.extras.complete.CompleteAutoloadTilesContainerFactory;
-import org.apache.tiles.extras.complete.CompleteAutoloadTilesInitializer;
-import org.apache.tiles.factory.AbstractTilesContainerFactory;
-import org.apache.tiles.factory.BasicTilesContainerFactory;
-import org.apache.tiles.impl.mgmt.CachingTilesContainer;
-import org.apache.tiles.locale.LocaleResolver;
-import org.apache.tiles.preparer.factory.PreparerFactory;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationContextAware;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.startup.DefaultTilesInitializer;
-import org.apache.tiles.startup.TilesInitializer;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.PropertyAccessorFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.web.context.ServletContextAware;
-
-/**
- * Helper class to configure Tiles 3.x for the Spring Framework. See
- * <a href="https://tiles.apache.org">https://tiles.apache.org</a>
- * for more information about Tiles, which basically is a templating mechanism
- * for web applications using JSPs and other template engines.
- *
- * <p>The TilesConfigurer simply configures a TilesContainer using a set of files
- * containing definitions, to be accessed by {@link TilesView} instances. This is a
- * Spring-based alternative (for usage in Spring configuration) to the Tiles-provided
- * {@code ServletContextListener}
- * (e.g. {@link org.apache.tiles.extras.complete.CompleteAutoloadTilesListener}
- * for usage in {@code web.xml}.
- *
- * <p>TilesViews can be managed by any {@link org.springframework.web.servlet.ViewResolver}.
- * For simple convention-based view resolution, consider using {@link TilesViewResolver}.
- *
- * <p>A typical TilesConfigurer bean definition looks as follows:
- *
- * <pre class="code">
- * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
- *   &lt;property name="definitions">
- *     &lt;list>
- *       &lt;value>/WEB-INF/defs/general.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/widgets.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/administrator.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/customer.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/templates.xml&lt;/value>
- *     &lt;/list>
- *   &lt;/property>
- * &lt;/bean>
- * </pre>
- *
- * The values in the list are the actual Tiles XML files containing the definitions.
- * If the list is not specified, the default is {@code "/WEB-INF/tiles.xml"}.
- *
- * <p>Note that in Tiles 3 an underscore in the name of a file containing Tiles
- * definitions is used to indicate locale information, for example:
- *
- * <pre class="code">
- * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
- *   &lt;property name="definitions">
- *     &lt;list>
- *       &lt;value>/WEB-INF/defs/tiles.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/tiles_fr_FR.xml&lt;/value>
- *     &lt;/list>
- *   &lt;/property>
- * &lt;/bean>
- * </pre>
- *
- * @author mick semb wever
- * @author Rossen Stoyanchev
- * @author Juergen Hoeller
- * @since 3.2
- * @see TilesView
- * @see TilesViewResolver
- */
-public class TilesConfigurer implements ServletContextAware, InitializingBean, DisposableBean {
-
-	private static final boolean tilesElPresent =
-			ClassUtils.isPresent("org.apache.tiles.el.ELAttributeEvaluator", TilesConfigurer.class.getClassLoader());
-
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	@Nullable
-	private TilesInitializer tilesInitializer;
-
-	@Nullable
-	private String[] definitions;
-
-	private boolean checkRefresh = false;
-
-	private boolean validateDefinitions = true;
-
-	@Nullable
-	private Class<? extends DefinitionsFactory> definitionsFactoryClass;
-
-	@Nullable
-	private Class<? extends PreparerFactory> preparerFactoryClass;
-
-	private boolean useMutableTilesContainer = false;
-
-	@Nullable
-	private ServletContext servletContext;
-
-
-	/**
-	 * Configure Tiles using a custom TilesInitializer, typically specified as an inner bean.
-	 * <p>Default is a variant of {@link org.apache.tiles.startup.DefaultTilesInitializer},
-	 * respecting the "definitions", "preparerFactoryClass" etc properties on this configurer.
-	 * <p><b>NOTE: Specifying a custom TilesInitializer effectively disables all other bean
-	 * properties on this configurer.</b> The entire initialization procedure is then left
-	 * to the TilesInitializer as specified.
-	 */
-	public void setTilesInitializer(TilesInitializer tilesInitializer) {
-		this.tilesInitializer = tilesInitializer;
-	}
-
-	/**
-	 * Specify whether to apply Tiles 3.0's "complete-autoload" configuration.
-	 * <p>See {@link org.apache.tiles.extras.complete.CompleteAutoloadTilesContainerFactory}
-	 * for details on the complete-autoload mode.
-	 * <p><b>NOTE: Specifying the complete-autoload mode effectively disables all other bean
-	 * properties on this configurer.</b> The entire initialization procedure is then left
-	 * to {@link org.apache.tiles.extras.complete.CompleteAutoloadTilesInitializer}.
-	 * @see org.apache.tiles.extras.complete.CompleteAutoloadTilesContainerFactory
-	 * @see org.apache.tiles.extras.complete.CompleteAutoloadTilesInitializer
-	 */
-	public void setCompleteAutoload(boolean completeAutoload) {
-		if (completeAutoload) {
-			try {
-				this.tilesInitializer = new SpringCompleteAutoloadTilesInitializer();
-			}
-			catch (Throwable ex) {
-				throw new IllegalStateException("Tiles-Extras 3.0 not available", ex);
-			}
-		}
-		else {
-			this.tilesInitializer = null;
-		}
-	}
-
-	/**
-	 * Set the Tiles definitions, i.e. the list of files containing the definitions.
-	 * Default is "/WEB-INF/tiles.xml".
-	 */
-	public void setDefinitions(String... definitions) {
-		this.definitions = definitions;
-	}
-
-	/**
-	 * Set whether to check Tiles definition files for a refresh at runtime.
-	 * Default is "false".
-	 */
-	public void setCheckRefresh(boolean checkRefresh) {
-		this.checkRefresh = checkRefresh;
-	}
-
-	/**
-	 * Set whether to validate the Tiles XML definitions. Default is "true".
-	 */
-	public void setValidateDefinitions(boolean validateDefinitions) {
-		this.validateDefinitions = validateDefinitions;
-	}
-
-	/**
-	 * Set the {@link org.apache.tiles.definition.DefinitionsFactory} implementation to use.
-	 * Default is {@link org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory},
-	 * operating on definition resource URLs.
-	 * <p>Specify a custom DefinitionsFactory, e.g. a UrlDefinitionsFactory subclass,
-	 * to customize the creation of Tiles Definition objects. Note that such a
-	 * DefinitionsFactory has to be able to handle {@link java.net.URL} source objects,
-	 * unless you configure a different TilesContainerFactory.
-	 */
-	public void setDefinitionsFactoryClass(Class<? extends DefinitionsFactory> definitionsFactoryClass) {
-		this.definitionsFactoryClass = definitionsFactoryClass;
-	}
-
-	/**
-	 * Set the {@link org.apache.tiles.preparer.factory.PreparerFactory} implementation to use.
-	 * Default is {@link org.apache.tiles.preparer.factory.BasicPreparerFactory}, creating
-	 * shared instances for specified preparer classes.
-	 * <p>Specify {@link SimpleSpringPreparerFactory} to autowire
-	 * {@link org.apache.tiles.preparer.ViewPreparer} instances based on specified
-	 * preparer classes, applying Spring's container callbacks as well as applying
-	 * configured Spring BeanPostProcessors. If Spring's context-wide annotation-config
-	 * has been activated, annotations in ViewPreparer classes will be automatically
-	 * detected and applied.
-	 * <p>Specify {@link SpringBeanPreparerFactory} to operate on specified preparer
-	 * <i>names</i> instead of classes, obtaining the corresponding Spring bean from
-	 * the DispatcherServlet's application context. The full bean creation process
-	 * will be in the control of the Spring application context in this case,
-	 * allowing for the use of scoped beans etc. Note that you need to define one
-	 * Spring bean definition per preparer name (as used in your Tiles definitions).
-	 * @see SimpleSpringPreparerFactory
-	 * @see SpringBeanPreparerFactory
-	 */
-	public void setPreparerFactoryClass(Class<? extends PreparerFactory> preparerFactoryClass) {
-		this.preparerFactoryClass = preparerFactoryClass;
-	}
-
-	/**
-	 * Set whether to use a MutableTilesContainer (typically the CachingTilesContainer
-	 * implementation) for this application. Default is "false".
-	 * @see org.apache.tiles.mgmt.MutableTilesContainer
-	 * @see org.apache.tiles.impl.mgmt.CachingTilesContainer
-	 */
-	public void setUseMutableTilesContainer(boolean useMutableTilesContainer) {
-		this.useMutableTilesContainer = useMutableTilesContainer;
-	}
-
-	@Override
-	public void setServletContext(ServletContext servletContext) {
-		this.servletContext = servletContext;
-	}
-
-	/**
-	 * Creates and exposes a TilesContainer for this web application,
-	 * delegating to the TilesInitializer.
-	 * @throws TilesException in case of setup failure
-	 */
-	@Override
-	public void afterPropertiesSet() throws TilesException {
-		Assert.state(this.servletContext != null, "No ServletContext available");
-		ApplicationContext preliminaryContext = new SpringWildcardServletTilesApplicationContext(this.servletContext);
-		if (this.tilesInitializer == null) {
-			this.tilesInitializer = new SpringTilesInitializer();
-		}
-		this.tilesInitializer.initialize(preliminaryContext);
-	}
-
-	/**
-	 * Removes the TilesContainer from this web application.
-	 * @throws TilesException in case of cleanup failure
-	 */
-	@Override
-	public void destroy() throws TilesException {
-		if (this.tilesInitializer != null) {
-			this.tilesInitializer.destroy();
-		}
-	}
-
-
-	private class SpringTilesInitializer extends DefaultTilesInitializer {
-
-		@Override
-		protected AbstractTilesContainerFactory createContainerFactory(ApplicationContext context) {
-			return new SpringTilesContainerFactory();
-		}
-	}
-
-
-	private class SpringTilesContainerFactory extends BasicTilesContainerFactory {
-
-		@Override
-		protected TilesContainer createDecoratedContainer(TilesContainer originalContainer, ApplicationContext context) {
-			return (useMutableTilesContainer ? new CachingTilesContainer(originalContainer) : originalContainer);
-		}
-
-		@Override
-		protected List<ApplicationResource> getSources(ApplicationContext applicationContext) {
-			if (definitions != null) {
-				List<ApplicationResource> result = new ArrayList<>();
-				for (String definition : definitions) {
-					Collection<ApplicationResource> resources = applicationContext.getResources(definition);
-					if (resources != null) {
-						result.addAll(resources);
-					}
-				}
-				return result;
-			}
-			else {
-				return super.getSources(applicationContext);
-			}
-		}
-
-		@Override
-		protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(ApplicationContext applicationContext,
-				LocaleResolver resolver) {
-			BaseLocaleUrlDefinitionDAO dao = super.instantiateLocaleDefinitionDao(applicationContext, resolver);
-			if (checkRefresh && dao instanceof CachingLocaleUrlDefinitionDAO) {
-				((CachingLocaleUrlDefinitionDAO) dao).setCheckRefresh(true);
-			}
-			return dao;
-		}
-
-		@Override
-		protected DefinitionsReader createDefinitionsReader(ApplicationContext context) {
-			DigesterDefinitionsReader reader = (DigesterDefinitionsReader) super.createDefinitionsReader(context);
-			reader.setValidating(validateDefinitions);
-			return reader;
-		}
-
-		@Override
-		protected DefinitionsFactory createDefinitionsFactory(ApplicationContext applicationContext,
-				LocaleResolver resolver) {
-
-			if (definitionsFactoryClass != null) {
-				DefinitionsFactory factory = BeanUtils.instantiateClass(definitionsFactoryClass);
-				if (factory instanceof ApplicationContextAware) {
-					((ApplicationContextAware) factory).setApplicationContext(applicationContext);
-				}
-				BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(factory);
-				if (bw.isWritableProperty("localeResolver")) {
-					bw.setPropertyValue("localeResolver", resolver);
-				}
-				if (bw.isWritableProperty("definitionDAO")) {
-					bw.setPropertyValue("definitionDAO", createLocaleDefinitionDao(applicationContext, resolver));
-				}
-				return factory;
-			}
-			else {
-				return super.createDefinitionsFactory(applicationContext, resolver);
-			}
-		}
-
-		@Override
-		protected PreparerFactory createPreparerFactory(ApplicationContext context) {
-			if (preparerFactoryClass != null) {
-				return BeanUtils.instantiateClass(preparerFactoryClass);
-			}
-			else {
-				return super.createPreparerFactory(context);
-			}
-		}
-
-		@Override
-		protected LocaleResolver createLocaleResolver(ApplicationContext context) {
-			return new SpringLocaleResolver();
-		}
-
-		@Override
-		protected AttributeEvaluatorFactory createAttributeEvaluatorFactory(ApplicationContext context,
-				LocaleResolver resolver) {
-			AttributeEvaluator evaluator;
-			if (tilesElPresent && JspFactory.getDefaultFactory() != null) {
-				evaluator = new TilesElActivator().createEvaluator();
-			}
-			else {
-				evaluator = new DirectAttributeEvaluator();
-			}
-			return new BasicAttributeEvaluatorFactory(evaluator);
-		}
-	}
-
-
-	private static class SpringCompleteAutoloadTilesInitializer extends CompleteAutoloadTilesInitializer {
-
-		@Override
-		protected AbstractTilesContainerFactory createContainerFactory(ApplicationContext context) {
-			return new SpringCompleteAutoloadTilesContainerFactory();
-		}
-	}
-
-
-	private static class SpringCompleteAutoloadTilesContainerFactory extends CompleteAutoloadTilesContainerFactory {
-
-		@Override
-		protected LocaleResolver createLocaleResolver(ApplicationContext applicationContext) {
-			return new SpringLocaleResolver();
-		}
-	}
-
-
-	private class TilesElActivator {
-
-		public AttributeEvaluator createEvaluator() {
-			ELAttributeEvaluator evaluator = new ELAttributeEvaluator();
-			evaluator.setExpressionFactory(
-					JspFactory.getDefaultFactory().getJspApplicationContext(servletContext).getExpressionFactory());
-			evaluator.setResolver(new CompositeELResolverImpl());
-			return evaluator;
-		}
-	}
-
-
-	private static class CompositeELResolverImpl extends CompositeELResolver {
-
-		public CompositeELResolverImpl() {
-			add(new ScopeELResolver());
-			add(new TilesContextELResolver(new TilesContextBeanELResolver()));
-			add(new TilesContextBeanELResolver());
-			add(new ArrayELResolver(false));
-			add(new ListELResolver(false));
-			add(new MapELResolver(false));
-			add(new ResourceBundleELResolver());
-			add(new BeanELResolver(false));
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesView.java
deleted file mode 100644
index 93238075da6f..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesView.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.renderer.DefinitionRenderer;
-import org.apache.tiles.request.AbstractRequest;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.Renderer;
-import org.apache.tiles.request.servlet.ServletRequest;
-import org.apache.tiles.request.servlet.ServletUtil;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.support.JstlUtils;
-import org.springframework.web.servlet.support.RequestContext;
-import org.springframework.web.servlet.support.RequestContextUtils;
-import org.springframework.web.servlet.view.AbstractUrlBasedView;
-
-/**
- * {@link org.springframework.web.servlet.View} implementation that renders
- * through the Tiles Request API. The "url" property is interpreted as name of a
- * Tiles definition.
- *
- * @author Nicolas Le Bas
- * @author mick semb wever
- * @author Rossen Stoyanchev
- * @author Sebastien Deleuze
- * @since 3.2
- */
-public class TilesView extends AbstractUrlBasedView {
-
-	@Nullable
-	private Renderer renderer;
-
-	private boolean exposeJstlAttributes = true;
-
-	private boolean alwaysInclude = false;
-
-	@Nullable
-	private ApplicationContext applicationContext;
-
-
-	/**
-	 * Set the {@link Renderer} to use.
-	 * If not set, by default {@link DefinitionRenderer} is used.
-	 */
-	public void setRenderer(Renderer renderer) {
-		this.renderer = renderer;
-	}
-
-	/**
-	 * Whether to expose JSTL attributes. By default set to {@code true}.
-	 * @see JstlUtils#exposeLocalizationContext(RequestContext)
-	 */
-	protected void setExposeJstlAttributes(boolean exposeJstlAttributes) {
-		this.exposeJstlAttributes = exposeJstlAttributes;
-	}
-
-	/**
-	 * Specify whether to always include the view rather than forward to it.
-	 * <p>Default is "false". Switch this flag on to enforce the use of a
-	 * Servlet include, even if a forward would be possible.
-	 * @since 4.1.2
-	 * @see TilesViewResolver#setAlwaysInclude
-	 */
-	public void setAlwaysInclude(boolean alwaysInclude) {
-		this.alwaysInclude = alwaysInclude;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		super.afterPropertiesSet();
-
-		ServletContext servletContext = getServletContext();
-		Assert.state(servletContext != null, "No ServletContext");
-		this.applicationContext = ServletUtil.getApplicationContext(servletContext);
-
-		if (this.renderer == null) {
-			TilesContainer container = TilesAccess.getContainer(this.applicationContext);
-			this.renderer = new DefinitionRenderer(container);
-		}
-	}
-
-
-	@Override
-	public boolean checkResource(final Locale locale) throws Exception {
-		Assert.state(this.renderer != null, "No Renderer set");
-
-		HttpServletRequest servletRequest = null;
-		RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-		if (requestAttributes instanceof ServletRequestAttributes) {
-			servletRequest = ((ServletRequestAttributes) requestAttributes).getRequest();
-		}
-
-		Request request = new ServletRequest(this.applicationContext, servletRequest, null) {
-			@Override
-			public Locale getRequestLocale() {
-				return locale;
-			}
-		};
-
-		return this.renderer.isRenderable(getUrl(), request);
-	}
-
-	@Override
-	protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-
-		Assert.state(this.renderer != null, "No Renderer set");
-
-		exposeModelAsRequestAttributes(model, request);
-		if (this.exposeJstlAttributes) {
-			JstlUtils.exposeLocalizationContext(new RequestContext(request, getServletContext()));
-		}
-		if (this.alwaysInclude) {
-			request.setAttribute(AbstractRequest.FORCE_INCLUDE_ATTRIBUTE_NAME, true);
-		}
-
-		Request tilesRequest = createTilesRequest(request, response);
-		this.renderer.render(getUrl(), tilesRequest);
-	}
-
-	/**
-	 * Create a Tiles {@link Request}.
-	 * <p>This implementation creates a {@link ServletRequest}.
-	 * @param request the current request
-	 * @param response the current response
-	 * @return the Tiles request
-	 */
-	protected Request createTilesRequest(final HttpServletRequest request, HttpServletResponse response) {
-		return new ServletRequest(this.applicationContext, request, response) {
-			@Override
-			public Locale getRequestLocale() {
-				return RequestContextUtils.getLocale(request);
-			}
-		};
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java
deleted file mode 100644
index 33ba0451417a..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import org.apache.tiles.request.render.Renderer;
-
-import org.springframework.lang.Nullable;
-import org.springframework.web.servlet.view.AbstractUrlBasedView;
-import org.springframework.web.servlet.view.UrlBasedViewResolver;
-
-/**
- * Convenience subclass of {@link UrlBasedViewResolver} that supports
- * {@link TilesView} (i.e. Tiles definitions) and custom subclasses of it.
- *
- * @author Nicolas Le Bas
- * @author Rossen Stoyanchev
- * @author Juergen Hoeller
- * @author Sebastien Deleuze
- * @since 3.2
- */
-public class TilesViewResolver extends UrlBasedViewResolver {
-
-	@Nullable
-	private Renderer renderer;
-
-	@Nullable
-	private Boolean alwaysInclude;
-
-
-	/**
-	 * This resolver requires {@link TilesView}.
-	 */
-	public TilesViewResolver() {
-		setViewClass(requiredViewClass());
-	}
-
-
-	/**
-	 * Set the {@link Renderer} to use. If not specified, a default
-	 * {@link org.apache.tiles.renderer.DefinitionRenderer} will be used.
-	 * @see TilesView#setRenderer(Renderer)
-	 */
-	public void setRenderer(Renderer renderer) {
-		this.renderer = renderer;
-	}
-
-	/**
-	 * Specify whether to always include the view rather than forward to it.
-	 * <p>Default is "false". Switch this flag on to enforce the use of a
-	 * Servlet include, even if a forward would be possible.
-	 * @since 4.1.2
-	 * @see TilesView#setAlwaysInclude
-	 */
-	public void setAlwaysInclude(Boolean alwaysInclude) {
-		this.alwaysInclude = alwaysInclude;
-	}
-
-
-	@Override
-	protected Class<?> requiredViewClass() {
-		return TilesView.class;
-	}
-
-	@Override
-	protected AbstractUrlBasedView instantiateView() {
-		return (getViewClass() == TilesView.class ? new TilesView() : super.instantiateView());
-	}
-
-	@Override
-	protected TilesView buildView(String viewName) throws Exception {
-		TilesView view = (TilesView) super.buildView(viewName);
-		if (this.renderer != null) {
-			view.setRenderer(this.renderer);
-		}
-		if (this.alwaysInclude != null) {
-			view.setAlwaysInclude(this.alwaysInclude);
-		}
-		return view;
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
deleted file mode 100644
index ca03c5e3c470..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Support classes for the integration of
- * <a href="https://tiles.apache.org">Tiles 3</a>
- * (the standalone version of Tiles) as Spring web view technology.
- * Contains a View implementation for Tiles definitions.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.web.servlet.view.tiles3;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
index bf0e0641ca6c..36b7f04cbdf2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
@@ -19,11 +19,12 @@
 import java.io.ByteArrayOutputStream;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.JAXBElement;
 import javax.xml.transform.stream.StreamResult;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.xml.bind.JAXBElement;
+
 import org.springframework.lang.Nullable;
 import org.springframework.oxm.Marshaller;
 import org.springframework.util.Assert;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
index e0383c5e3227..1d3c29b9395e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Result;
@@ -39,6 +37,8 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
index c0364d28c12f..49bac9fb9ffc 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
@@ -251,7 +251,7 @@
 
 	As of 5.0 this executor is also used when a controller returns a reactive type that does streaming
 	(e.g. "text/event-stream" or "application/x-ndjson") for the blocking writes to the
-	"javax.servlet.ServletOutputStream".
+	"jakarta.servlet.ServletOutputStream".
 
 								]]></xsd:documentation>
 								<xsd:appinfo>
@@ -1041,15 +1041,6 @@
 							]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-					<xsd:element name="tiles" type="urlViewResolverType">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Register a TilesViewResolver based on Tiles 3.x.
-	To configure Tiles you must also add a top-level <mvc:tiles-configurer> element
-	or declare a TilesConfigurer bean.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
 					<xsd:element name="freemarker" type="urlViewResolverType">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
@@ -1118,62 +1109,6 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="tiles-configurer">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	Configure Tiles 3.x by registering a TilesConfigurer bean.
-	This is a shortcut alternative to declaring a TilesConfigurer bean directly.
-			]]></xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="definitions" minOccurs="0" maxOccurs="unbounded">
-					<xsd:complexType>
-						<xsd:attribute name="location" type="xsd:string" use="required">
-							<xsd:annotation>
-								<xsd:documentation><![CDATA[
-	The location of a file containing Tiles definitions (or a Spring resource pattern).
-	If no Tiles definitions are registered, then "/WEB-INF/tiles.xml" is expected to exists.
-								]]></xsd:documentation>
-							</xsd:annotation>
-						</xsd:attribute>
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:sequence>
-			<xsd:attribute name="check-refresh" type="xsd:boolean">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Whether to check Tiles definition files for a refresh at runtime.
-	Default is "false".
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="validate-definitions" type="xsd:boolean">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Whether to validate the Tiles XML definitions. Default is "true".
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="definitions-factory" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	The Tiles DefinitionsFactory class to use. Default is Tiles' default.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="preparer-factory" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	The Tiles PreparerFactory class to use. Default is Tiles' default.
-	Consider "org.springframework.web.servlet.view.tiles3.SimpleSpringPreparerFactory" or
-	"org.springframework.web.servlet.view.tiles3.SpringBeanPreparerFactory" (see javadoc).
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
 	<xsd:element name="freemarker-configurer">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index 961ec8bd5e70..23242634ea99 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -19,10 +19,9 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeansException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
index f389a27b2b32..b7dd85d21ead 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletConfig;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
index 0633664fc0f6..3e7c41724500 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java
index 3c0da8755174..0bba426369de 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareProcessorTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.context;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.context.support.ServletContextAwareProcessor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
index aa6de67cdf8a..861e5155e4fe 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
@@ -18,8 +18,7 @@
 
 import java.util.Locale;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeansException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
index 25880b6c1305..3026bc8ac13b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
@@ -18,11 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.HttpRequestHandler;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
index 9c00d1950050..e5e17a67edb1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
@@ -22,13 +22,13 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
index adbae39e5fe7..6a22d2f8c99b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
@@ -21,15 +21,14 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
index b6579b960ba4..6bb65863e53a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
@@ -19,9 +19,9 @@
 import java.io.IOException;
 import java.util.Locale;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
index 1a1c4fcff38f..05a9745896ac 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,15 +32,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import javax.servlet.RequestDispatcher;
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory;
-import org.joda.time.LocalDate;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.validation.constraints.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -140,9 +137,6 @@
 import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 import org.springframework.web.servlet.view.script.ScriptTemplateConfigurer;
 import org.springframework.web.servlet.view.script.ScriptTemplateViewResolver;
-import org.springframework.web.servlet.view.tiles3.SpringBeanPreparerFactory;
-import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
-import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
 import org.springframework.web.testfixture.servlet.MockRequestDispatcher;
@@ -252,7 +246,7 @@ public void testDefaultConfig() throws Exception {
 
 		adapter.handle(request, response, handlerMethod);
 		assertThat(handler.recordedValidationError).isTrue();
-		assertThat(handler.date).isEqualTo(LocalDate.parse("2009-10-31").toDate());
+		assertThat(handler.date).isInSameDayAs("2009-10-31");
 		assertThat(handler.percent).isEqualTo(Double.valueOf(0.9999));
 
 		CompositeUriComponentsContributor uriComponentsContributor = this.appContext.getBean(
@@ -789,7 +783,7 @@ public void testViewResolution() throws Exception {
 
 		ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
 		assertThat(compositeResolver).isNotNull();
-		assertThat(compositeResolver.getViewResolvers().size()).as("Actual: " + compositeResolver.getViewResolvers()).isEqualTo(8);
+		assertThat(compositeResolver.getViewResolvers().size()).as("Actual: " + compositeResolver.getViewResolvers()).isEqualTo(7);
 		assertThat(compositeResolver.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE);
 
 		List<ViewResolver> resolvers = compositeResolver.getViewResolvers();
@@ -800,9 +794,7 @@ public void testViewResolution() throws Exception {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(resolver);
 		assertThat(accessor.getPropertyValue("viewClass")).isEqualTo(InternalResourceView.class);
 
-		assertThat(resolvers.get(2).getClass()).isEqualTo(TilesViewResolver.class);
-
-		resolver = resolvers.get(3);
+		resolver = resolvers.get(2);
 		assertThat(resolver).isInstanceOf(FreeMarkerViewResolver.class);
 		accessor = new DirectFieldAccessor(resolver);
 		assertThat(accessor.getPropertyValue("prefix")).isEqualTo("freemarker-");
@@ -810,34 +802,22 @@ public void testViewResolution() throws Exception {
 		assertThat((String[]) accessor.getPropertyValue("viewNames")).isEqualTo(new String[] {"my*", "*Report"});
 		assertThat(accessor.getPropertyValue("cacheLimit")).isEqualTo(1024);
 
-		resolver = resolvers.get(4);
+		resolver = resolvers.get(3);
 		assertThat(resolver).isInstanceOf(GroovyMarkupViewResolver.class);
 		accessor = new DirectFieldAccessor(resolver);
 		assertThat(accessor.getPropertyValue("prefix")).isEqualTo("");
 		assertThat(accessor.getPropertyValue("suffix")).isEqualTo(".tpl");
 		assertThat(accessor.getPropertyValue("cacheLimit")).isEqualTo(1024);
 
-		resolver = resolvers.get(5);
+		resolver = resolvers.get(4);
 		assertThat(resolver).isInstanceOf(ScriptTemplateViewResolver.class);
 		accessor = new DirectFieldAccessor(resolver);
 		assertThat(accessor.getPropertyValue("prefix")).isEqualTo("");
 		assertThat(accessor.getPropertyValue("suffix")).isEqualTo("");
 		assertThat(accessor.getPropertyValue("cacheLimit")).isEqualTo(1024);
 
+		assertThat(resolvers.get(5).getClass()).isEqualTo(InternalResourceViewResolver.class);
 		assertThat(resolvers.get(6).getClass()).isEqualTo(InternalResourceViewResolver.class);
-		assertThat(resolvers.get(7).getClass()).isEqualTo(InternalResourceViewResolver.class);
-
-		TilesConfigurer tilesConfigurer = appContext.getBean(TilesConfigurer.class);
-		assertThat(tilesConfigurer).isNotNull();
-		String[] definitions = {
-				"/org/springframework/web/servlet/resource/tiles/tiles1.xml",
-				"/org/springframework/web/servlet/resource/tiles/tiles2.xml"
-		};
-		accessor = new DirectFieldAccessor(tilesConfigurer);
-		assertThat((String[]) accessor.getPropertyValue("definitions")).isEqualTo(definitions);
-		assertThat((boolean) accessor.getPropertyValue("checkRefresh")).isTrue();
-		assertThat(accessor.getPropertyValue("definitionsFactoryClass")).isEqualTo(UnresolvingLocaleDefinitionsFactory.class);
-		assertThat(accessor.getPropertyValue("preparerFactoryClass")).isEqualTo(SpringBeanPreparerFactory.class);
 
 		FreeMarkerConfigurer freeMarkerConfigurer = appContext.getBean(FreeMarkerConfigurer.class);
 		assertThat(freeMarkerConfigurer).isNotNull();
@@ -874,7 +854,7 @@ public void testViewResolutionWithContentNegotiation() throws Exception {
 		List<ViewResolver> resolvers = compositeResolver.getViewResolvers();
 		assertThat(resolvers.get(0).getClass()).isEqualTo(ContentNegotiatingViewResolver.class);
 		ContentNegotiatingViewResolver cnvr = (ContentNegotiatingViewResolver) resolvers.get(0);
-		assertThat(cnvr.getViewResolvers().size()).isEqualTo(6);
+		assertThat(cnvr.getViewResolvers().size()).isEqualTo(5);
 		assertThat(cnvr.getDefaultViews().size()).isEqualTo(1);
 		assertThat(cnvr.isUseNotAcceptableStatusCode()).isTrue();
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java
index 1566076324e1..169ca70a4f50 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurerTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.config.annotation;
 
-import javax.servlet.RequestDispatcher;
-
+import jakarta.servlet.RequestDispatcher;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
index e87be4ebe254..bdae7e1b78d6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,7 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.Bean;
@@ -33,7 +32,6 @@
 import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
-import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
 import org.springframework.web.testfixture.servlet.MockServletConfig;
@@ -56,12 +54,6 @@ public void freemarker() throws Exception {
 		assertThat(response.getContentAsString()).isEqualTo("<html><body>Hello World!</body></html>");
 	}
 
-	@Test
-	public void tiles() throws Exception {
-		MockHttpServletResponse response = runTest(TilesWebConfig.class);
-		assertThat(response.getForwardedUrl()).isEqualTo("/WEB-INF/index.jsp");
-	}
-
 	@Test
 	public void groovyMarkup() throws Exception {
 		MockHttpServletResponse response = runTest(GroovyMarkupWebConfig.class);
@@ -75,13 +67,6 @@ public void freemarkerInvalidConfig() throws Exception {
 			.withMessageContaining("In addition to a FreeMarker view resolver ");
 	}
 
-	@Test
-	public void tilesInvalidConfig() throws Exception {
-		assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
-				runTest(InvalidTilesWebConfig.class))
-			.withMessageContaining("In addition to a Tiles view resolver ");
-	}
-
 	@Test
 	public void groovyMarkupInvalidConfig() throws Exception {
 		assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
@@ -151,22 +136,6 @@ public FreeMarkerConfigurer freeMarkerConfigurer() {
 		}
 	}
 
-	@Configuration
-	static class TilesWebConfig extends AbstractWebConfig {
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.tiles();
-		}
-
-		@Bean
-		public TilesConfigurer tilesConfigurer() {
-			TilesConfigurer configurer = new TilesConfigurer();
-			configurer.setDefinitions("/WEB-INF/tiles.xml");
-			return configurer;
-		}
-	}
-
 	@Configuration
 	static class GroovyMarkupWebConfig extends AbstractWebConfig {
 
@@ -192,15 +161,6 @@ public void configureViewResolvers(ViewResolverRegistry registry) {
 		}
 	}
 
-	@Configuration
-	static class InvalidTilesWebConfig extends WebMvcConfigurationSupport {
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			registry.tiles();
-		}
-	}
-
 	@Configuration
 	static class InvalidGroovyMarkupWebConfig extends WebMvcConfigurationSupport {
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java
index e3373b829232..4986338605cd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,6 @@
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 import org.springframework.web.servlet.view.script.ScriptTemplateConfigurer;
 import org.springframework.web.servlet.view.script.ScriptTemplateViewResolver;
-import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
-import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 import org.springframework.web.servlet.view.xml.MarshallingView;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -57,7 +55,6 @@ public class ViewResolverRegistryTests {
 	public void setup() {
 		StaticWebApplicationContext context = new StaticWebApplicationContext();
 		context.registerSingleton("freeMarkerConfigurer", FreeMarkerConfigurer.class);
-		context.registerSingleton("tilesConfigurer", TilesConfigurer.class);
 		context.registerSingleton("groovyMarkupConfigurer", GroovyMarkupConfigurer.class);
 		context.registerSingleton("scriptTemplateConfigurer", ScriptTemplateConfigurer.class);
 
@@ -131,12 +128,6 @@ public void jspMultipleResolvers() {
 		assertThat(this.registry.getViewResolvers().get(1).getClass()).isEqualTo(InternalResourceViewResolver.class);
 	}
 
-	@Test
-	public void tiles() {
-		this.registry.tiles();
-		checkAndGetResolver(TilesViewResolver.class);
-	}
-
 	@Test
 	public void freeMarker() {
 		this.registry.freeMarker().prefix("/").suffix(".fmt").cache(false);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
index dad6504f9a1c..c53cc812bf4f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,14 @@
 
 package org.springframework.web.servlet.config.annotation;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.joda.time.DateTime;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.DirectFieldAccessor;
@@ -437,7 +436,7 @@ public void handle() {
 
 		@RequestMapping("/foo/{id}/bar/{date}")
 		public HttpEntity<Void> methodWithTwoPathVariables(@PathVariable Integer id,
-				@DateTimeFormat(iso = ISO.DATE) @PathVariable DateTime date) {
+				@DateTimeFormat(iso = ISO.DATE) @PathVariable Date date) {
 			return null;
 		}
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
index 0d7553bb80d1..00969fbb85c1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
@@ -25,9 +25,8 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.ParameterizedTypeReference;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
index 56fec0a442b5..6ffb5da58a8f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
@@ -23,8 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestBuilderTests.java
index 254f84c67ab3..e1de828a5327 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestBuilderTests.java
@@ -21,9 +21,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpMethod;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java
index 07233b27ecec..4a5a19d276fa 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java
@@ -32,9 +32,8 @@
 import java.util.Optional;
 import java.util.OptionalLong;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.Part;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.Part;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
index 23621b73197c..d70ffb3a8e81 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
@@ -27,8 +27,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
index ccefb80b4519..a5cfa327b7d8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
@@ -23,8 +23,7 @@
 import java.util.Collections;
 import java.util.EnumSet;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
index 650790d502a4..5e166b87f35f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.handler;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java
index 68e6dc066e02..3c4fa750f4f4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java
@@ -19,8 +19,8 @@
 import java.util.Collections;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingIntrospectorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingIntrospectorTests.java
index 745d642b5ad4..d020753e799e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingIntrospectorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingIntrospectorTests.java
@@ -21,8 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java
index 7273780514ec..62b3a895d3a0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMappingTests.java
@@ -21,8 +21,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.Arguments;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java
index d610c30215cf..ccda745f7935 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java
@@ -23,8 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java
index d404c32346ab..5bff705f31fe 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java
@@ -20,9 +20,8 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.util.PathMatcher;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
index 0b284c947346..7f8d8e8f5d20 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
@@ -19,8 +19,7 @@
 import java.util.Collections;
 import java.util.Properties;
 
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java
index c7bd35954a47..90374faf6e14 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java
@@ -20,8 +20,7 @@
 import java.util.Collections;
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
index 185ca9d3f695..bb2846759d41 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
@@ -19,9 +19,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.i18n.LocaleContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java
index d9f1cc612385..cd702850ea1d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/SessionLocaleResolverTests.java
@@ -18,8 +18,7 @@
 
 import java.util.Locale;
 
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.HttpSession;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
index a5983b9e5579..7da7119b54bd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
@@ -18,15 +18,14 @@
 
 import java.util.Properties;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.context.support.StaticWebApplicationContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java
index d2718fc76900..3fbdadb0533f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java
@@ -19,8 +19,7 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.Pointcut;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java
index a7ab53498d51..a1de84fb2c83 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java
@@ -19,8 +19,7 @@
 import java.io.IOException;
 import java.io.Writer;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/CompositeRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/CompositeRequestConditionTests.java
index fbc5b58b5c85..9258f9cb9e96 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/CompositeRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/CompositeRequestConditionTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.mvc.condition;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestConditionTests.java
index 52071bd97aae..089664828569 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestConditionTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.mvc.condition;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
index 5150c0325bb1..41cda092523c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
@@ -18,8 +18,7 @@
 
 import java.util.Collections;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
index fc1d77166acb..15244e1baa25 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
@@ -20,8 +20,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java
index 786df9c16a0a..6aa86cbfa907 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolderTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.mvc.condition;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
index c0dbd0a62422..7cb38ac95a1b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
@@ -18,9 +18,8 @@
 
 import java.util.Collections;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
index 32277c53bee5..fb36283ffa6b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
@@ -25,8 +25,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
index 11a435d25d9c..4df25abdf9d9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
@@ -21,8 +21,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java
index 7ec195b1e3d5..a3f3082b9d7a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java
@@ -19,9 +19,8 @@
 import java.lang.reflect.Method;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
index c9cfaf7ec417..3d99f5a4f1a8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.AfterEach;
 
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
index f4fa67d7ce8a..8a4fbb7f93b5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
@@ -25,8 +25,7 @@
 import java.util.Properties;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.beans.DirectFieldAccessor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
index a46de7c7b80a..5351a27e3cf9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
@@ -30,8 +30,7 @@
 import java.util.Date;
 import java.util.Set;
 
-import javax.servlet.FilterChain;
-
+import jakarta.servlet.FilterChain;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
index f870aca3ca01..ebcbc87f7cdb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
@@ -22,12 +22,11 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
index 99abb24debdf..bce9d4f1a6be 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.joda.time.DateTime;
-import org.joda.time.format.ISODateTimeFormat;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -202,11 +200,10 @@ public void fromMethodNameTypeLevelPathVariable() {
 
 	@Test
 	public void fromMethodNameTwoPathVariables() {
-		DateTime now = DateTime.now();
 		UriComponents uriComponents = fromMethodName(
-				ControllerWithMethods.class, "methodWithTwoPathVariables", 1, now).build();
+				ControllerWithMethods.class, "methodWithTwoPathVariables", 1, "2009-10-31").build();
 
-		assertThat(uriComponents.getPath()).isEqualTo("/something/1/foo/" + ISODateTimeFormat.date().print(now));
+		assertThat(uriComponents.getPath()).isEqualTo("/something/1/foo/2009-10-31");
 	}
 
 	@Test
@@ -549,7 +546,7 @@ HttpEntity<Void> methodWithPathVariable(@PathVariable String id) {
 
 		@RequestMapping("/{id}/foo/{date}")
 		HttpEntity<Void> methodWithTwoPathVariables(
-				@PathVariable Integer id, @DateTimeFormat(iso = ISO.DATE) @PathVariable DateTime date) {
+				@PathVariable Integer id, @DateTimeFormat(iso = ISO.DATE) @PathVariable Date date) {
 			return null;
 		}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolverTests.java
index c32813c40cc2..cb32bf088bf5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PrincipalMethodArgumentResolverTests.java
@@ -23,8 +23,7 @@
 import java.lang.reflect.Method;
 import java.security.Principal;
 
-import javax.servlet.ServletRequest;
-
+import jakarta.servlet.ServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
index 29a75dcdbe93..9d3a147ac32b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
@@ -35,11 +35,10 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
index 8e69fc631faa..4370f9a471e5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.MultipartConfigElement;
-
+import jakarta.servlet.MultipartConfigElement;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
@@ -61,7 +60,6 @@
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.multipart.support.StandardServletMultipartResolver;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -93,16 +91,8 @@ public static void startServer() throws Exception {
 
 		ServletContextHandler handler = new ServletContextHandler();
 		handler.setContextPath("/");
-
-		Class<?> config = CommonsMultipartResolverTestConfig.class;
-		ServletHolder commonsResolverServlet = new ServletHolder(DispatcherServlet.class);
-		commonsResolverServlet.setInitParameter("contextConfigLocation", config.getName());
-		commonsResolverServlet.setInitParameter("contextClass", AnnotationConfigWebApplicationContext.class.getName());
-		handler.addServlet(commonsResolverServlet, "/commons-resolver/*");
-
-		config = StandardMultipartResolverTestConfig.class;
 		ServletHolder standardResolverServlet = new ServletHolder(DispatcherServlet.class);
-		standardResolverServlet.setInitParameter("contextConfigLocation", config.getName());
+		standardResolverServlet.setInitParameter("contextConfigLocation", StandardMultipartResolverTestConfig.class.getName());
 		standardResolverServlet.setInitParameter("contextClass", AnnotationConfigWebApplicationContext.class.getName());
 		standardResolverServlet.getRegistration().setMultipartConfig(new MultipartConfigElement(""));
 		handler.addServlet(standardResolverServlet, "/standard-resolver/*");
@@ -141,12 +131,6 @@ public void setup() {
 	}
 
 
-	@Test
-	public void commonsMultipartResolver() throws Exception {
-		testCreate(baseUrl + "/commons-resolver/test", "Jason");
-		testCreate(baseUrl + "/commons-resolver/test", "Arjen");
-	}
-
 	@Test
 	public void standardMultipartResolver() throws Exception {
 		testCreate(baseUrl + "/standard-resolver/test", "Jason");
@@ -207,17 +191,6 @@ public RequestPartTestController controller() {
 	}
 
 
-	@Configuration
-	@SuppressWarnings("unused")
-	static class CommonsMultipartResolverTestConfig extends RequestPartTestConfig {
-
-		@Bean
-		public MultipartResolver multipartResolver() {
-			return new CommonsMultipartResolver();
-		}
-	}
-
-
 	@Configuration
 	@SuppressWarnings("unused")
 	static class StandardMultipartResolverTestConfig extends RequestPartTestConfig {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
index 9cf34618a62e..e97e807c058b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
@@ -23,10 +23,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.servlet.http.Part;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
+import jakarta.servlet.http.Part;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java
index b805e00a499d..e4cae1627c44 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java
@@ -23,9 +23,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
index e5fa5c684733..dfc40e2807c0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
@@ -21,8 +21,7 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.ConversionNotSupportedException;
@@ -287,7 +286,7 @@ private ResponseEntity<Object> testException(Exception ex) {
 
 			// SPR-9653
 			if (HttpStatus.INTERNAL_SERVER_ERROR.equals(responseEntity.getStatusCode())) {
-				assertThat(this.servletRequest.getAttribute("javax.servlet.error.exception")).isSameAs(ex);
+				assertThat(this.servletRequest.getAttribute("jakarta.servlet.error.exception")).isSameAs(ex);
 			}
 
 			this.defaultExceptionResolver.resolveException(this.servletRequest, this.servletResponse, null, ex);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
index 6957bdfc828e..8f07c7071f8e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
@@ -49,18 +49,17 @@
 import java.util.UUID;
 import java.util.stream.Stream;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
index 8b34cccd5a2a..80507cad758b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
@@ -18,8 +18,7 @@
 
 import java.lang.reflect.Method;
 
-import javax.servlet.http.Cookie;
-
+import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
index d26e4cc0c1fe..ba386fce36b8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
@@ -24,9 +24,8 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
index aacbd3e00820..b6f8dc0027ca 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
@@ -28,10 +28,9 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.PushBuilder;
-
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.PushBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
index e467caa94d88..b0ed4c8b9879 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
@@ -20,8 +20,7 @@
 import java.io.Writer;
 import java.lang.reflect.Method;
 
-import javax.servlet.ServletResponse;
-
+import jakarta.servlet.ServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
index 9944159df7f6..464fad986b34 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
@@ -27,8 +27,8 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
index e2574d4224c2..ed98ab46efa9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
@@ -216,7 +216,7 @@ public void handleConversionNotSupportedException() throws Exception {
 		assertThat(response.getStatus()).as("Invalid status code").isEqualTo(500);
 
 		// SPR-9653
-		assertThat(request.getAttribute("javax.servlet.error.exception")).isSameAs(ex);
+		assertThat(request.getAttribute("jakarta.servlet.error.exception")).isSameAs(ex);
 	}
 
 	@Test  // SPR-14669
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
index 4b12502b8e58..8d7057058d9c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
@@ -20,8 +20,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerIntegrationTests.java
index a55bd6f8434e..85a8644bb11d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerIntegrationTests.java
@@ -21,8 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Stream;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
index 6ced3a30d33e..e7f87759cdbf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -22,8 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java
index 0e6da211e4ec..77af33758411 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java
@@ -19,8 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
index 0e7ba7745869..941edbadb9df 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
@@ -20,11 +20,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java
index 18c6b229d919..82e8e6f18fe6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.web.servlet.resource;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java
index 1a9fbae7f41c..0c65d74038ef 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java
@@ -19,8 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
index aded6595300c..9339486bd374 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
@@ -22,15 +22,14 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration.Dynamic;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration.Dynamic;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java
index 1035e5720253..15bf12019e83 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java
@@ -20,10 +20,9 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.context.WebApplicationContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
index 2867d42ce4ee..46be451297ef 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
@@ -23,9 +23,8 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.assertj.core.api.ObjectAssert;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
index 59443780c583..49502b0ad9bb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.FilterRegistration.Dynamic;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.FilterRegistration.Dynamic;
 
 class MockFilterRegistration implements Dynamic {
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java
index e696ae945e74..46be1eab5a4c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java
@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletSecurityElement;
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletSecurityElement;
 
 class MockServletRegistration implements ServletRegistration.Dynamic {
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
index e64f832e4bc4..fec70f740893 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class RequestDataValueProcessorWrapper implements RequestDataValueProcessor {
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
index fa0c94566242..66b518a2e8e1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.support;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ArgumentTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ArgumentTagTests.java
index af2c4795d5b4..35b5bd152f52 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ArgumentTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ArgumentTagTests.java
@@ -16,11 +16,10 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index 24a9942e3499..932c2dac82db 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
@@ -23,10 +23,9 @@
 import java.util.Date;
 import java.util.Set;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.propertyeditors.CustomDateEditor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
index e1657060bfd9..6af1562e568c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
@@ -21,8 +21,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
index 7f8f57aa5f82..36ed82289bf4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
@@ -16,11 +16,10 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTag;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockServletContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
index 03698a7c57fb..10feee616127 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
@@ -19,12 +19,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.MessageSourceResolvable;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
index 8ff108a6fb17..ea6f4e20cf6c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
@@ -16,11 +16,10 @@
 
 package org.springframework.web.servlet.tags;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
index 2704a5582716..f7311c4c17e6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
@@ -19,12 +19,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.MessageSourceResolvable;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
index 1b84cd220408..faabcbc0857e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
@@ -21,10 +21,9 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
index 50f254a42fba..75c418270bf2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
 
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
index ee6f02fa693c..63cc5683921e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
@@ -21,9 +21,8 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
 import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.validation.BindingResult;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
index 02a4fe580040..98ca668dfa01 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
@@ -18,8 +18,7 @@
 
 import java.io.Writer;
 
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.TestBean;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index 39e1bb710b9a..9b38741aa2e6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -25,9 +25,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
index c7455c7f859d..170d1cf36e40 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
@@ -29,9 +29,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
index e6c72fccce73..0ae564baf1ff 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
@@ -20,12 +20,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTag;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.TestBean;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
index 11fc024163cc..46c84f5d4b30 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
@@ -18,9 +18,8 @@
 
 import java.util.Collections;
 
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.servlet.support.RequestDataValueProcessor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
index e323aff62bba..39a6cf13eeb9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.TestBean;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index 59def204ee51..39da1b05c3f9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -18,9 +18,8 @@
 
 import java.io.Writer;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.TestBean;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
index 5f4ee4c83e0b..4f7c25d891b4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.TestBean;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
index d3783cf3e1fd..1b3fe831d7ae 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
@@ -16,9 +16,8 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.tagext.BodyTag;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.CustomEnum;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
index a94bee41a7d7..608a62595e10 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
@@ -22,9 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.jsp.tagext.BodyTag;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
index 48479f6bebf9..a8e87811b901 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
@@ -24,10 +24,9 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.tagext.BodyTag;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.Node;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
index 2c2858648d5a..64c1484371c1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
@@ -18,9 +18,8 @@
 
 import java.io.Writer;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index ac40da641332..d856021dfa53 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -20,9 +20,8 @@
 import java.io.StringReader;
 import java.util.Collections;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
index 50bbf2c2ec63..49d2daf22297 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
@@ -27,9 +27,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.Node;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index bade64bf142e..9fb65efea400 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -29,9 +29,8 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java
index 153b9df5760e..1f8b8037cd97 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagIdGeneratorTests.java
@@ -18,8 +18,7 @@
 
 import java.util.stream.IntStream;
 
-import javax.servlet.jsp.PageContext;
-
+import jakarta.servlet.jsp.PageContext;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.testfixture.servlet.MockPageContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
index f5f06f49a0d7..cb08134dd721 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import javax.servlet.jsp.tagext.Tag;
-
+import jakarta.servlet.jsp.tagext.Tag;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.TestBean;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
index b7a8bec1336c..29c69d17568a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
@@ -21,10 +21,9 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.ApplicationContextException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java
index cd2bc87d09f5..6f0c1cf8cdb9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/DummyMacroRequestContext.java
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.web.servlet.support.BindStatus;
 import org.springframework.web.servlet.support.RequestContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
index d731b51c4df7..b1f492d0b08c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
@@ -20,8 +20,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.servlet.View;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
index 3e6efbb07e4d..8fc296bf057d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
@@ -20,9 +20,8 @@
 import java.util.Map;
 import java.util.MissingResourceException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
index 25c5a590c82c..4e5c93087a71 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
@@ -22,14 +22,13 @@
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.jstl.core.Config;
-import javax.servlet.jsp.jstl.fmt.LocalizationContext;
-
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.jstl.fmt.LocalizationContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java
index 4f9d0aee5295..a7febf995d04 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/XlsViewTests.java
@@ -20,9 +20,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTests.java
index 842d7e449de1..f6725f99f8b4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTests.java
@@ -21,12 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.rometools.rome.feed.atom.Content;
 import com.rometools.rome.feed.atom.Entry;
 import com.rometools.rome.feed.atom.Feed;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.testfixture.xml.XmlContent;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
index 5ab862e01717..7389774ccb28 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
@@ -21,12 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.rometools.rome.feed.rss.Channel;
 import com.rometools.rome.feed.rss.Description;
 import com.rometools.rome.feed.rss.Item;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.testfixture.xml.XmlContent;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
index 6db737d433a4..e04675deb9ec 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-
 import freemarker.template.Configuration;
 import freemarker.template.SimpleHash;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -71,7 +70,7 @@ public class FreeMarkerMacroTests {
 
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	public void setup() throws Exception {
 		ServletContext sc = new MockServletContext();
 		wac = new StaticWebApplicationContext();
 		wac.setServletContext(sc);
@@ -79,7 +78,6 @@ public void setUp() throws Exception {
 		// final Template expectedTemplate = new Template();
 		fc = new FreeMarkerConfigurer();
 		fc.setTemplateLoaderPaths("classpath:/", "file://" + System.getProperty("java.io.tmpdir"));
-		fc.setServletContext(sc);
 		fc.afterPropertiesSet();
 
 		wac.getDefaultListableBeanFactory().registerSingleton("freeMarkerConfigurer", fc);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
index d9fd65dce96b..779ae6c0c0e9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,11 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
-
-import freemarker.ext.servlet.AllHttpScopesHashModel;
 import freemarker.template.Configuration;
+import freemarker.template.SimpleHash;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.ApplicationContextException;
@@ -92,7 +91,6 @@ public void validTemplateName() throws Exception {
 		Map<String, FreeMarkerConfig> configs = new HashMap<>();
 		FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
 		configurer.setConfiguration(new TestConfiguration());
-		configurer.setServletContext(sc);
 		configs.put("configurer", configurer);
 		given(wac.getBeansOfType(FreeMarkerConfig.class, true, false)).willReturn(configs);
 		given(wac.getServletContext()).willReturn(sc);
@@ -123,7 +121,6 @@ public void keepExistingContentType() throws Exception {
 		Map<String, FreeMarkerConfig> configs = new HashMap<>();
 		FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
 		configurer.setConfiguration(new TestConfiguration());
-		configurer.setServletContext(sc);
 		configs.put("configurer", configurer);
 		given(wac.getBeansOfType(FreeMarkerConfig.class, true, false)).willReturn(configs);
 		given(wac.getServletContext()).willReturn(sc);
@@ -151,7 +148,6 @@ public void freeMarkerViewResolver() throws Exception {
 
 		FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
 		configurer.setConfiguration(new TestConfiguration());
-		configurer.setServletContext(sc);
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.setServletContext(sc);
@@ -191,9 +187,8 @@ public Template getTemplate(String name, final Locale locale) throws IOException
 					@Override
 					public void process(Object model, Writer writer) throws TemplateException, IOException {
 						assertThat(locale).isEqualTo(Locale.US);
-						boolean condition = model instanceof AllHttpScopesHashModel;
-						assertThat(condition).isTrue();
-						AllHttpScopesHashModel fmModel = (AllHttpScopesHashModel) model;
+						assertThat(model instanceof SimpleHash).isTrue();
+						SimpleHash fmModel = (SimpleHash) model;
 						assertThat(fmModel.get("myattr").toString()).isEqualTo("myvalue");
 					}
 				};
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java
index 95df6be1a9d4..4e588a5de037 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/groovy/GroovyMarkupViewTests.java
@@ -21,12 +21,11 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
 import groovy.text.Template;
 import groovy.text.TemplateEngine;
 import groovy.text.markup.MarkupTemplateEngine;
 import groovy.text.markup.TemplateConfiguration;
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java
index 0ff0cede97f7..46854fde9958 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JRubyScriptTemplateTests.java
@@ -19,8 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java
index 28777a89de90..468a5e66d6fb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/JythonScriptTemplateTests.java
@@ -19,8 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java
index f6ef3ac7c21f..a977f0ef8b43 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/KotlinScriptTemplateTests.java
@@ -20,8 +20,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java
index 72f56d47a902..e0ddf1813978 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/NashornScriptTemplateTests.java
@@ -19,8 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java
deleted file mode 100644
index 68296951f8ae..000000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.impl.BasicTilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.servlet.ServletRequest;
-import org.apache.tiles.request.servlet.ServletUtil;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
-import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
-import org.springframework.web.testfixture.servlet.MockServletContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Test fixture for {@link TilesConfigurer}.
- *
- * @author Nicolas Le Bas
- */
-public class TilesConfigurerTests {
-
-	@Test
-	public void simpleBootstrap() {
-		MockServletContext servletContext = new MockServletContext();
-
-		TilesConfigurer tc = new TilesConfigurer();
-		tc.setDefinitions("/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml");
-		tc.setCheckRefresh(true);
-		tc.setServletContext(servletContext);
-		tc.afterPropertiesSet();
-
-		ApplicationContext tilesContext = ServletUtil.getApplicationContext(servletContext);
-
-		BasicTilesContainer container = (BasicTilesContainer) TilesAccess.getContainer(tilesContext);
-		Request requestContext = new ServletRequest(container.getApplicationContext(),
-				new MockHttpServletRequest(), new MockHttpServletResponse());
-		assertThat(container.getDefinitionsFactory().getDefinition("test", requestContext)).isNotNull();
-
-		tc.destroy();
-	}
-
-
-	@Configuration
-	public static class AppConfig {
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java
deleted file mode 100644
index 11515bc2215d..000000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import java.util.Locale;
-
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.Renderer;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.testfixture.servlet.MockServletContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Test fixture for {@link TilesViewResolver}.
- *
- * @author mick semb wever
- */
-public class TilesViewResolverTests {
-
-	private TilesViewResolver viewResolver;
-
-	private Renderer renderer;
-
-
-	@BeforeEach
-	public void setUp() {
-		StaticWebApplicationContext wac = new StaticWebApplicationContext();
-		wac.setServletContext(new MockServletContext());
-		wac.refresh();
-
-		this.renderer = mock(Renderer.class);
-
-		this.viewResolver = new TilesViewResolver();
-		this.viewResolver.setRenderer(this.renderer);
-		this.viewResolver.setApplicationContext(wac);
-	}
-
-	@Test
-	public void testResolve() throws Exception {
-		given(this.renderer.isRenderable(eq("/template.test"), isA(Request.class))).willReturn(true);
-		given(this.renderer.isRenderable(eq("/nonexistent.test"), isA(Request.class))).willReturn(false);
-
-		boolean condition = this.viewResolver.resolveViewName("/template.test", Locale.ITALY) instanceof TilesView;
-		assertThat(condition).isTrue();
-		assertThat(this.viewResolver.resolveViewName("/nonexistent.test", Locale.ITALY)).isNull();
-
-		verify(this.renderer).isRenderable(eq("/template.test"), isA(Request.class));
-		verify(this.renderer).isRenderable(eq("/nonexistent.test"), isA(Request.class));
-	}
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java
deleted file mode 100644
index 90cb4d6171d7..000000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.view.tiles3;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tiles.request.AbstractRequest;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.Renderer;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
-import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
-import org.springframework.web.testfixture.servlet.MockServletContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Test fixture for {@link TilesView}.
- *
- * @author mick semb wever
- * @author Sebastien Deleuze
- */
-public class TilesViewTests {
-
-	private static final String VIEW_PATH = "template.test";
-
-	private TilesView view;
-
-	private Renderer renderer;
-
-	private MockHttpServletRequest request;
-
-	private MockHttpServletResponse response;
-
-
-	@BeforeEach
-	public void setUp() throws Exception {
-		MockServletContext servletContext = new MockServletContext();
-		StaticWebApplicationContext wac = new StaticWebApplicationContext();
-		wac.setServletContext(servletContext);
-		wac.refresh();
-
-		request = new MockHttpServletRequest();
-		request.setAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE, wac);
-
-		response = new MockHttpServletResponse();
-
-		renderer = mock(Renderer.class);
-
-		view = new TilesView();
-		view.setServletContext(servletContext);
-		view.setRenderer(renderer);
-		view.setUrl(VIEW_PATH);
-		view.afterPropertiesSet();
-	}
-
-	@Test
-	public void render() throws Exception {
-		Map<String, Object> model = new HashMap<>();
-		model.put("modelAttribute", "modelValue");
-		view.render(model, request, response);
-		assertThat(request.getAttribute("modelAttribute")).isEqualTo("modelValue");
-		verify(renderer).render(eq(VIEW_PATH), isA(Request.class));
-	}
-
-	@Test
-	public void alwaysIncludeDefaults() throws Exception {
-		view.render(new HashMap<>(), request, response);
-		assertThat(request.getAttribute(AbstractRequest.FORCE_INCLUDE_ATTRIBUTE_NAME)).isNull();
-	}
-
-	@Test
-	public void alwaysIncludeEnabled() throws Exception {
-		view.setAlwaysInclude(true);
-		view.render(new HashMap<>(), request, response);
-		assertThat((boolean) (Boolean) request.getAttribute(AbstractRequest.FORCE_INCLUDE_ATTRIBUTE_NAME)).isTrue();
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
index 8a03c1028ca7..ae596f28875d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
@@ -20,10 +20,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 import javax.xml.transform.stream.StreamResult;
 
+import jakarta.xml.bind.JAXBElement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
index f431f55292b2..45380a25d34c 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
@@ -3,7 +3,7 @@
 
 <beans>
 
-	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
+	<bean id="multipartResolver" class="org.springframework.web.multipart.support.StandardServletMultipartResolver"/>
 
 	<bean id="servletContextAwareBean" class="org.springframework.web.context.ServletContextAwareBean"/>
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
index 7f8d0f86d32a..b633c802fb66 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
@@ -21,16 +21,11 @@
 		</mvc:content-negotiation>
 		<mvc:bean-name/>
 		<mvc:jsp/>
-		<mvc:tiles/>
 		<mvc:freemarker/>
 		<mvc:groovy/>
 		<mvc:script-template/>
 	</mvc:view-resolvers>
 
-	<mvc:tiles-configurer check-refresh="true">
-		<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml"/>
-	</mvc:tiles-configurer>
-
 	<mvc:freemarker-configurer>
 		<mvc:template-loader-path location="/org/springframework/web/servlet/view"/>
 	</mvc:freemarker-configurer>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
index 0bb48e815799..32f0c092a1c9 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
@@ -8,7 +8,6 @@
 	<mvc:view-resolvers>
 		<mvc:bean-name/>
 		<mvc:jsp view-class="org.springframework.web.servlet.view.InternalResourceView"/>
-		<mvc:tiles/>
 		<mvc:freemarker prefix="freemarker-" suffix=".freemarker" view-names="my*,*Report"/>
 		<mvc:groovy/>
 		<mvc:script-template/>
@@ -18,13 +17,6 @@
 
 	<bean id="customResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"/>
 
-	<mvc:tiles-configurer check-refresh="true" validate-definitions="true"
-			definitions-factory="org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory"
-			preparer-factory="org.springframework.web.servlet.view.tiles3.SpringBeanPreparerFactory">
-		<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml"/>
-		<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles2.xml"/>
-	</mvc:tiles-configurer>
-
 	<mvc:freemarker-configurer>
 		<mvc:template-loader-path location="/"/>
 		<mvc:template-loader-path location="/test"/>
diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle
index 4ffe0ef667bd..fe4f65250fff 100644
--- a/spring-websocket/spring-websocket.gradle
+++ b/spring-websocket/spring-websocket.gradle
@@ -6,20 +6,20 @@ dependencies {
 	api(project(":spring-web"))
 	optional(project(":spring-messaging"))
 	optional(project(":spring-webmvc"))
-	optional("javax.servlet:javax.servlet-api")
-	optional("javax.websocket:javax.websocket-api")
+	optional("jakarta.servlet:jakarta.servlet-api")
+	optional("jakarta.websocket:jakarta.websocket-api")
 	optional("org.apache.tomcat:tomcat-websocket")
 	optional("org.glassfish.tyrus:tyrus-container-servlet")
 	optional("org.eclipse.jetty:jetty-webapp") {
-		exclude group: "javax.servlet", module: "javax.servlet"
+		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
-	optional("org.eclipse.jetty.websocket:websocket-server") {
-		exclude group: "javax.servlet", module: "javax.servlet"
+	optional("org.eclipse.jetty.websocket:websocket-jetty-server") {
+		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
-	optional("org.eclipse.jetty.websocket:websocket-client")
+	optional("org.eclipse.jetty.websocket:websocket-jetty-client")
 	optional("org.eclipse.jetty:jetty-client")
-	optional("io.undertow:undertow-servlet")
-	optional("io.undertow:undertow-websockets-jsr")
+	optional("io.undertow:undertow-servlet-jakartaee9")
+	optional("io.undertow:undertow-websockets-jsr-jakartaee9")
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-web")))
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/Jetty10WebSocketHandlerAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/Jetty10WebSocketHandlerAdapter.java
deleted file mode 100644
index c6a4c9f19cda..000000000000
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/Jetty10WebSocketHandlerAdapter.java
+++ /dev/null
@@ -1,137 +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.web.socket.adapter.jetty;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
-import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
-import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.websocket.api.extensions.Frame;
-
-import org.springframework.util.Assert;
-import org.springframework.web.socket.BinaryMessage;
-import org.springframework.web.socket.CloseStatus;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.handler.ExceptionWebSocketHandlerDecorator;
-
-/**
- * Identical to {@link JettyWebSocketHandlerAdapter}, only excluding the
- * {@code onWebSocketFrame} method, since the {@link Frame} argument has moved
- * to a different package in Jetty 10.
- *
- * @author Rossen Stoyanchev
- * @since 5.3.4
- */
-@WebSocket
-public class Jetty10WebSocketHandlerAdapter {
-
-	private static final Log logger = LogFactory.getLog(Jetty10WebSocketHandlerAdapter.class);
-
-
-	private final WebSocketHandler webSocketHandler;
-
-	private final JettyWebSocketSession wsSession;
-
-
-	public Jetty10WebSocketHandlerAdapter(WebSocketHandler webSocketHandler, JettyWebSocketSession wsSession) {
-		Assert.notNull(webSocketHandler, "WebSocketHandler must not be null");
-		Assert.notNull(wsSession, "WebSocketSession must not be null");
-		this.webSocketHandler = webSocketHandler;
-		this.wsSession = wsSession;
-	}
-
-
-	@OnWebSocketConnect
-	public void onWebSocketConnect(Session session) {
-		try {
-			this.wsSession.initializeNativeSession(session);
-			this.webSocketHandler.afterConnectionEstablished(this.wsSession);
-		}
-		catch (Exception ex) {
-			ExceptionWebSocketHandlerDecorator.tryCloseWithError(this.wsSession, ex, logger);
-		}
-	}
-
-	@OnWebSocketMessage
-	public void onWebSocketText(String payload) {
-		TextMessage message = new TextMessage(payload);
-		try {
-			this.webSocketHandler.handleMessage(this.wsSession, message);
-		}
-		catch (Exception ex) {
-			ExceptionWebSocketHandlerDecorator.tryCloseWithError(this.wsSession, ex, logger);
-		}
-	}
-
-	@OnWebSocketMessage
-	public void onWebSocketBinary(byte[] payload, int offset, int length) {
-		BinaryMessage message = new BinaryMessage(payload, offset, length, true);
-		try {
-			this.webSocketHandler.handleMessage(this.wsSession, message);
-		}
-		catch (Exception ex) {
-			ExceptionWebSocketHandlerDecorator.tryCloseWithError(this.wsSession, ex, logger);
-		}
-	}
-
-// TODO: onWebSocketFrame can't be declared without compiling against Jetty 10
-//   Jetty 10: org.eclipse.jetty.websocket.api.Frame
-//   Jetty  9: org.eclipse.jetty.websocket.api.extensions.Frame
-
-//	@OnWebSocketFrame
-//	public void onWebSocketFrame(Frame frame) {
-//		if (OpCode.PONG == frame.getOpCode()) {
-//			ByteBuffer payload = frame.getPayload() != null ? frame.getPayload() : EMPTY_PAYLOAD;
-//			PongMessage message = new PongMessage(payload);
-//			try {
-//				this.webSocketHandler.handleMessage(this.wsSession, message);
-//			}
-//			catch (Exception ex) {
-//				ExceptionWebSocketHandlerDecorator.tryCloseWithError(this.wsSession, ex, logger);
-//			}
-//		}
-//	}
-
-	@OnWebSocketClose
-	public void onWebSocketClose(int statusCode, String reason) {
-		CloseStatus closeStatus = new CloseStatus(statusCode, reason);
-		try {
-			this.webSocketHandler.afterConnectionClosed(this.wsSession, closeStatus);
-		}
-		catch (Exception ex) {
-			if (logger.isWarnEnabled()) {
-				logger.warn("Unhandled exception after connection closed for " + this, ex);
-			}
-		}
-	}
-
-	@OnWebSocketError
-	public void onWebSocketError(Throwable cause) {
-		try {
-			this.webSocketHandler.handleTransportError(this.wsSession, cause);
-		}
-		catch (Exception ex) {
-			ExceptionWebSocketHandlerDecorator.tryCloseWithError(this.wsSession, ex, logger);
-		}
-	}
-
-}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java
index 0c414a6b11eb..47b821cd53b2 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.eclipse.jetty.websocket.api.Frame;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
@@ -27,8 +28,7 @@
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketFrame;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
 import org.eclipse.jetty.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.websocket.api.extensions.Frame;
-import org.eclipse.jetty.websocket.common.OpCode;
+import org.eclipse.jetty.websocket.core.OpCode;
 
 import org.springframework.util.Assert;
 import org.springframework.web.socket.BinaryMessage;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
index 48b87417bbff..37a22a36eaa2 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
@@ -17,9 +17,7 @@
 package org.springframework.web.socket.adapter.jetty;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.net.URI;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -27,16 +25,14 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.RemoteEndpoint;
 import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.socket.BinaryMessage;
 import org.springframework.web.socket.CloseStatus;
 import org.springframework.web.socket.PingMessage;
@@ -57,12 +53,6 @@
  */
 public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
 
-	private static final ClassLoader loader = JettyWebSocketSession.class.getClassLoader();
-
-	private static final boolean jetty10Present = ClassUtils.isPresent(
-			"org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", loader);
-
-
 	private final String id;
 
 	@Nullable
@@ -80,8 +70,6 @@ public class JettyWebSocketSession extends AbstractWebSocketSession<Session> {
 	@Nullable
 	private Principal user;
 
-	private final SessionHelper sessionHelper;
-
 
 	/**
 	 * Create a new {@link JettyWebSocketSession} instance.
@@ -102,7 +90,6 @@ public JettyWebSocketSession(Map<String, Object> attributes, @Nullable Principal
 		super(attributes);
 		this.id = idGenerator.generateId().toString();
 		this.user = user;
-		this.sessionHelper = (jetty10Present ? new Jetty10SessionHelper() : new Jetty9SessionHelper());
 	}
 
 
@@ -144,13 +131,13 @@ public Principal getPrincipal() {
 	@Override
 	public InetSocketAddress getLocalAddress() {
 		checkNativeSessionInitialized();
-		return this.sessionHelper.getLocalAddress(getNativeSession());
+		return (InetSocketAddress) getNativeSession().getLocalAddress();
 	}
 
 	@Override
 	public InetSocketAddress getRemoteAddress() {
 		checkNativeSessionInitialized();
-		return this.sessionHelper.getRemoteAddress(getNativeSession());
+		return (InetSocketAddress) getNativeSession().getRemoteAddress();
 	}
 
 	/**
@@ -164,7 +151,7 @@ public void setTextMessageSizeLimit(int messageSizeLimit) {
 	@Override
 	public int getTextMessageSizeLimit() {
 		checkNativeSessionInitialized();
-		return this.sessionHelper.getTextMessageSizeLimit(getNativeSession());
+		return (int) getNativeSession().getMaxTextMessageSize();
 	}
 
 	/**
@@ -178,7 +165,7 @@ public void setBinaryMessageSizeLimit(int messageSizeLimit) {
 	@Override
 	public int getBinaryMessageSizeLimit() {
 		checkNativeSessionInitialized();
-		return this.sessionHelper.getBinaryMessageSizeLimit(getNativeSession());
+		return (int) getNativeSession().getMaxBinaryMessageSize();
 	}
 
 	@Override
@@ -201,13 +188,25 @@ public void initializeNativeSession(Session session) {
 		this.headers = HttpHeaders.readOnlyHttpHeaders(headers);
 
 		this.acceptedProtocol = session.getUpgradeResponse().getAcceptedSubProtocol();
-		this.extensions = this.sessionHelper.getExtensions(session);
+		this.extensions = getExtensions(session);
 
 		if (this.user == null) {
 			this.user = session.getUpgradeRequest().getUserPrincipal();
 		}
 	}
 
+	private List<WebSocketExtension> getExtensions(Session session) {
+		List<ExtensionConfig> configs = session.getUpgradeResponse().getExtensions();
+		if (!CollectionUtils.isEmpty(configs)) {
+			List<WebSocketExtension> result = new ArrayList<>(configs.size());
+			for (ExtensionConfig config : configs) {
+				result.add(new WebSocketExtension(config.getName(), config.getParameters()));
+			}
+			return Collections.unmodifiableList(result);
+		}
+		return Collections.emptyList();
+	}
+
 
 	@Override
 	protected void sendTextMessage(TextMessage message) throws IOException {
@@ -238,127 +237,4 @@ protected void closeInternal(CloseStatus status) throws IOException {
 		getNativeSession().close(status.getCode(), status.getReason());
 	}
 
-
-	/**
-	 * Encapsulate incompatible changes between Jetty 9.4 and 10.
-	 */
-	private interface SessionHelper {
-
-		List<WebSocketExtension> getExtensions(Session session);
-
-		int getTextMessageSizeLimit(Session session);
-
-		int getBinaryMessageSizeLimit(Session session);
-
-		InetSocketAddress getRemoteAddress(Session session);
-
-		InetSocketAddress getLocalAddress(Session session);
-
-	}
-
-
-	private static class Jetty9SessionHelper implements SessionHelper {
-
-		@Override
-		public List<WebSocketExtension> getExtensions(Session session) {
-			List<ExtensionConfig> configs = session.getUpgradeResponse().getExtensions();
-			if (!CollectionUtils.isEmpty(configs)) {
-				List<WebSocketExtension> result = new ArrayList<>(configs.size());
-				for (ExtensionConfig config : configs) {
-					result.add(new WebSocketExtension(config.getName(), config.getParameters()));
-				}
-				return Collections.unmodifiableList(result);
-			}
-			return Collections.emptyList();
-		}
-
-		@Override
-		public int getTextMessageSizeLimit(Session session) {
-			return session.getPolicy().getMaxTextMessageSize();
-		}
-
-		@Override
-		public int getBinaryMessageSizeLimit(Session session) {
-			return session.getPolicy().getMaxBinaryMessageSize();
-		}
-
-		@Override
-		public InetSocketAddress getRemoteAddress(Session session) {
-			return session.getRemoteAddress();
-		}
-
-		@Override
-		public InetSocketAddress getLocalAddress(Session session) {
-			return session.getLocalAddress();
-		}
-	}
-
-
-	private static class Jetty10SessionHelper implements SessionHelper {
-
-		private static final Method getTextMessageSizeLimitMethod;
-
-		private static final Method getBinaryMessageSizeLimitMethod;
-
-		private static final Method getRemoteAddressMethod;
-
-		private static final Method getLocalAddressMethod;
-
-		static {
-			try {
-				Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.api.Session");
-				getTextMessageSizeLimitMethod = type.getMethod("getMaxTextMessageSize");
-				getBinaryMessageSizeLimitMethod = type.getMethod("getMaxBinaryMessageSize");
-				getRemoteAddressMethod = type.getMethod("getRemoteAddress");
-				getLocalAddressMethod = type.getMethod("getLocalAddress");
-			}
-			catch (ClassNotFoundException | NoSuchMethodException ex) {
-				throw new IllegalStateException("No compatible Jetty version found", ex);
-			}
-		}
-
-		// TODO: Extension info can't be accessed without compiling against Jetty 10
-		//   Jetty 10: org.eclipse.jetty.websocket.api.ExtensionConfig
-		//   Jetty  9: org.eclipse.jetty.websocket.api.extensions.ExtensionConfig
-
-		@Override
-		public List<WebSocketExtension> getExtensions(Session session) {
-			return Collections.emptyList();
-		}
-
-		// TODO: WebSocketPolicy can't be accessed without compiling against Jetty 10 (class -> interface)
-
-		@Override
-		@SuppressWarnings("ConstantConditions")
-		public int getTextMessageSizeLimit(Session session) {
-			long result = (long) ReflectionUtils.invokeMethod(getTextMessageSizeLimitMethod, session.getPolicy());
-			Assert.state(result <= Integer.MAX_VALUE, "textMessageSizeLimit is larger than Integer.MAX_VALUE");
-			return (int) result;
-		}
-
-		@Override
-		@SuppressWarnings("ConstantConditions")
-		public int getBinaryMessageSizeLimit(Session session) {
-			long result = (long) ReflectionUtils.invokeMethod(getBinaryMessageSizeLimitMethod, session.getPolicy());
-			Assert.state(result <= Integer.MAX_VALUE, "binaryMessageSizeLimit is larger than Integer.MAX_VALUE");
-			return (int) result;
-		}
-
-		@Override
-		@SuppressWarnings("ConstantConditions")
-		public InetSocketAddress getRemoteAddress(Session session) {
-			SocketAddress address = (SocketAddress) ReflectionUtils.invokeMethod(getRemoteAddressMethod, session);
-			Assert.isInstanceOf(InetSocketAddress.class, address);
-			return (InetSocketAddress) address;
-		}
-
-		@Override
-		@SuppressWarnings("ConstantConditions")
-		public InetSocketAddress getLocalAddress(Session session) {
-			SocketAddress address = (SocketAddress) ReflectionUtils.invokeMethod(getLocalAddressMethod, session);
-			Assert.isInstanceOf(InetSocketAddress.class, address);
-			return (InetSocketAddress) address;
-		}
-	}
-
 }
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/WebSocketToJettyExtensionConfigAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/WebSocketToJettyExtensionConfigAdapter.java
index 1adc61cc4d6c..b941c267122f 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/WebSocketToJettyExtensionConfigAdapter.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/WebSocketToJettyExtensionConfigAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 package org.springframework.web.socket.adapter.jetty;
 
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
+import org.eclipse.jetty.websocket.common.JettyExtensionConfig;
 
 import org.springframework.web.socket.WebSocketExtension;
 
@@ -27,7 +28,7 @@
  * @author Rossen Stoyanchev
  * @since 4.0
  */
-public class WebSocketToJettyExtensionConfigAdapter extends ExtensionConfig {
+public class WebSocketToJettyExtensionConfigAdapter extends JettyExtensionConfig {
 
 	public WebSocketToJettyExtensionConfigAdapter(WebSocketExtension extension) {
 		super(extension.getName());
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
index 05e1a4b75c0d..489891d11a5f 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
@@ -18,11 +18,11 @@
 
 import java.nio.ByteBuffer;
 
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +38,8 @@
 import org.springframework.web.context.ContextLoader;
 
 /**
- * Base class that can be used to implement a standard {@link javax.websocket.Encoder}
- * and/or {@link javax.websocket.Decoder}. It provides encode and decode method
+ * Base class that can be used to implement a standard {@link jakarta.websocket.Encoder}
+ * and/or {@link jakarta.websocket.Decoder}. It provides encode and decode method
  * implementations that delegate to a Spring {@link ConversionService}.
  *
  * <p>By default, this class looks up a {@link ConversionService} registered in the
@@ -50,7 +50,7 @@
  * {@link #getConversionService()} method to provide an alternative lookup strategy.
  *
  * <p>Subclasses can extend this class and should also implement one or
- * both of {@link javax.websocket.Encoder} and {@link javax.websocket.Decoder}.
+ * both of {@link jakarta.websocket.Encoder} and {@link jakarta.websocket.Decoder}.
  * For convenience {@link ConvertingEncoderDecoderSupport.BinaryEncoder},
  * {@link ConvertingEncoderDecoderSupport.BinaryDecoder},
  * {@link ConvertingEncoderDecoderSupport.TextEncoder} and
@@ -80,8 +80,8 @@ public abstract class ConvertingEncoderDecoderSupport<T, M> {
 
 	/**
 	 * Called to initialize the encoder/decoder.
-	 * @see javax.websocket.Encoder#init(EndpointConfig)
-	 * @see javax.websocket.Decoder#init(EndpointConfig)
+	 * @see jakarta.websocket.Encoder#init(EndpointConfig)
+	 * @see jakarta.websocket.Decoder#init(EndpointConfig)
 	 */
 	public void init(EndpointConfig config) {
 		ApplicationContext applicationContext = getApplicationContext();
@@ -94,8 +94,8 @@ public void init(EndpointConfig config) {
 
 	/**
 	 * Called to destroy the encoder/decoder.
-	 * @see javax.websocket.Encoder#destroy()
-	 * @see javax.websocket.Decoder#destroy()
+	 * @see jakarta.websocket.Encoder#destroy()
+	 * @see jakarta.websocket.Decoder#destroy()
 	 */
 	public void destroy() {
 	}
@@ -158,8 +158,8 @@ private Class<?>[] resolveTypeArguments() {
 
 	/**
 	 * Encode an object to a message.
-	 * @see javax.websocket.Encoder.Text#encode(Object)
-	 * @see javax.websocket.Encoder.Binary#encode(Object)
+	 * @see jakarta.websocket.Encoder.Text#encode(Object)
+	 * @see jakarta.websocket.Encoder.Binary#encode(Object)
 	 */
 	@SuppressWarnings("unchecked")
 	@Nullable
@@ -175,8 +175,8 @@ public M encode(T object) throws EncodeException {
 	/**
 	 * Determine if a given message can be decoded.
 	 * @see #decode(Object)
-	 * @see javax.websocket.Decoder.Text#willDecode(String)
-	 * @see javax.websocket.Decoder.Binary#willDecode(ByteBuffer)
+	 * @see jakarta.websocket.Decoder.Text#willDecode(String)
+	 * @see jakarta.websocket.Decoder.Binary#willDecode(ByteBuffer)
 	 */
 	public boolean willDecode(M bytes) {
 		return getConversionService().canConvert(getType(), getMessageType());
@@ -184,8 +184,8 @@ public boolean willDecode(M bytes) {
 
 	/**
 	 * Decode the message into an object.
-	 * @see javax.websocket.Decoder.Text#decode(String)
-	 * @see javax.websocket.Decoder.Binary#decode(ByteBuffer)
+	 * @see jakarta.websocket.Decoder.Text#decode(String)
+	 * @see jakarta.websocket.Decoder.Binary#decode(ByteBuffer)
 	 */
 	@SuppressWarnings("unchecked")
 	@Nullable
@@ -208,7 +208,7 @@ public T decode(M message) throws DecodeException {
 
 
 	/**
-	 * A binary {@link javax.websocket.Encoder.Binary javax.websocket.Encoder} that delegates
+	 * A binary {@link jakarta.websocket.Encoder.Binary jakarta.websocket.Encoder} that delegates
 	 * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details.
 	 * @param <T> the type that this Encoder can convert to
 	 */
@@ -218,7 +218,7 @@ public abstract static class BinaryEncoder<T> extends ConvertingEncoderDecoderSu
 
 
 	/**
-	 * A binary {@link javax.websocket.Encoder.Binary javax.websocket.Encoder} that delegates
+	 * A binary {@link jakarta.websocket.Encoder.Binary jakarta.websocket.Encoder} that delegates
 	 * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details.
 	 * @param <T> the type that this Decoder can convert from
 	 */
@@ -228,7 +228,7 @@ public abstract static class BinaryDecoder<T> extends ConvertingEncoderDecoderSu
 
 
 	/**
-	 * A text {@link javax.websocket.Encoder.Text javax.websocket.Encoder} that delegates
+	 * A text {@link jakarta.websocket.Encoder.Text jakarta.websocket.Encoder} that delegates
 	 * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for
 	 * details.
 	 * @param <T> the type that this Encoder can convert to
@@ -239,7 +239,7 @@ public abstract static class TextEncoder<T> extends ConvertingEncoderDecoderSupp
 
 
 	/**
-	 * A Text {@link javax.websocket.Encoder.Text javax.websocket.Encoder} that delegates
+	 * A Text {@link jakarta.websocket.Encoder.Text jakarta.websocket.Encoder} that delegates
 	 * to Spring's conversion service. See {@link ConvertingEncoderDecoderSupport} for details.
 	 * @param <T> the type that this Decoder can convert from
 	 */
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java
index d2908e6aff87..8f81d48bd680 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java
@@ -20,14 +20,14 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.websocket.Extension;
+import jakarta.websocket.Extension;
 
 import org.springframework.util.LinkedCaseInsensitiveMap;
 import org.springframework.web.socket.WebSocketExtension;
 
 /**
  * A sub-class of {@link org.springframework.web.socket.WebSocketExtension} that
- * can be constructed from an {@link javax.websocket.Extension}.
+ * can be constructed from an {@link jakarta.websocket.Extension}.
  *
  * @author Rossen Stoyanchev
  * @since 4.0
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapter.java
index 2cdea2d1a041..27a794caa886 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapter.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapter.java
@@ -18,11 +18,10 @@
 
 import java.nio.ByteBuffer;
 
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -58,7 +57,7 @@ public StandardWebSocketHandlerAdapter(WebSocketHandler handler, StandardWebSock
 
 
 	@Override
-	public void onOpen(final javax.websocket.Session session, EndpointConfig config) {
+	public void onOpen(final jakarta.websocket.Session session, EndpointConfig config) {
 		this.wsSession.initializeNativeSession(session);
 
 		// The following inner classes need to remain since lambdas would not retain their
@@ -93,9 +92,9 @@ public void onMessage(ByteBuffer message) {
 			});
 		}
 
-		session.addMessageHandler(new MessageHandler.Whole<javax.websocket.PongMessage>() {
+		session.addMessageHandler(new MessageHandler.Whole<jakarta.websocket.PongMessage>() {
 			@Override
-			public void onMessage(javax.websocket.PongMessage message) {
+			public void onMessage(jakarta.websocket.PongMessage message) {
 				handlePongMessage(session, message.getApplicationData());
 			}
 		});
@@ -108,7 +107,7 @@ public void onMessage(javax.websocket.PongMessage message) {
 		}
 	}
 
-	private void handleTextMessage(javax.websocket.Session session, String payload, boolean isLast) {
+	private void handleTextMessage(jakarta.websocket.Session session, String payload, boolean isLast) {
 		TextMessage textMessage = new TextMessage(payload, isLast);
 		try {
 			this.handler.handleMessage(this.wsSession, textMessage);
@@ -118,7 +117,7 @@ private void handleTextMessage(javax.websocket.Session session, String payload,
 		}
 	}
 
-	private void handleBinaryMessage(javax.websocket.Session session, ByteBuffer payload, boolean isLast) {
+	private void handleBinaryMessage(jakarta.websocket.Session session, ByteBuffer payload, boolean isLast) {
 		BinaryMessage binaryMessage = new BinaryMessage(payload, isLast);
 		try {
 			this.handler.handleMessage(this.wsSession, binaryMessage);
@@ -128,7 +127,7 @@ private void handleBinaryMessage(javax.websocket.Session session, ByteBuffer pay
 		}
 	}
 
-	private void handlePongMessage(javax.websocket.Session session, ByteBuffer payload) {
+	private void handlePongMessage(jakarta.websocket.Session session, ByteBuffer payload) {
 		PongMessage pongMessage = new PongMessage(payload);
 		try {
 			this.handler.handleMessage(this.wsSession, pongMessage);
@@ -139,7 +138,7 @@ private void handlePongMessage(javax.websocket.Session session, ByteBuffer paylo
 	}
 
 	@Override
-	public void onClose(javax.websocket.Session session, CloseReason reason) {
+	public void onClose(jakarta.websocket.Session session, CloseReason reason) {
 		CloseStatus closeStatus = new CloseStatus(reason.getCloseCode().getCode(), reason.getReasonPhrase());
 		try {
 			this.handler.afterConnectionClosed(this.wsSession, closeStatus);
@@ -152,7 +151,7 @@ public void onClose(javax.websocket.Session session, CloseReason reason) {
 	}
 
 	@Override
-	public void onError(javax.websocket.Session session, Throwable exception) {
+	public void onError(jakarta.websocket.Session session, Throwable exception) {
 		try {
 			this.handler.handleTransportError(this.wsSession, exception);
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java
index d1a0672b956f..0252927f45ed 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java
@@ -25,10 +25,10 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.Extension;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Session;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/WebSocketToStandardExtensionAdapter.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/WebSocketToStandardExtensionAdapter.java
index d9d78897c601..c3bc04b974bd 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/WebSocketToStandardExtensionAdapter.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/WebSocketToStandardExtensionAdapter.java
@@ -19,13 +19,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.websocket.Extension;
+import jakarta.websocket.Extension;
 
 import org.springframework.web.socket.WebSocketExtension;
 
 /**
  * Adapt an instance of {@link org.springframework.web.socket.WebSocketExtension} to
- * the {@link javax.websocket.Extension} interface.
+ * the {@link jakarta.websocket.Extension} interface.
  *
  * @author Rossen Stoyanchev
  * @since 4.0
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
index 982bbfa61e44..b70b3f22afba 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
@@ -16,8 +16,6 @@
 
 package org.springframework.web.socket.client.jetty;
 
-import java.io.IOException;
-import java.lang.reflect.Method;
 import java.net.URI;
 import java.security.Principal;
 import java.util.List;
@@ -36,14 +34,11 @@
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureTask;
 import org.springframework.web.socket.WebSocketExtension;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.adapter.jetty.Jetty10WebSocketHandlerAdapter;
 import org.springframework.web.socket.adapter.jetty.JettyWebSocketHandlerAdapter;
 import org.springframework.web.socket.adapter.jetty.JettyWebSocketSession;
 import org.springframework.web.socket.adapter.jetty.WebSocketToJettyExtensionConfigAdapter;
@@ -61,36 +56,16 @@
  * WebSocketConnectionManager} instead to auto-start a WebSocket connection.
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 4.0
  */
 public class JettyWebSocketClient extends AbstractWebSocketClient implements Lifecycle {
 
-	private static ClassLoader loader = JettyWebSocketClient.class.getClassLoader();
-
-	private static final boolean jetty10Present;
-
-	private static final Method setHeadersMethod;
-
-	static {
-		jetty10Present = ClassUtils.isPresent(
-				"org.eclipse.jetty.websocket.client.JettyUpgradeListener", loader);
-		try {
-			setHeadersMethod = ClientUpgradeRequest.class.getMethod("setHeaders", Map.class);
-		}
-		catch (NoSuchMethodException ex) {
-			throw new IllegalStateException("No compatible Jetty version found", ex);
-		}
-	}
-
-
 	private final org.eclipse.jetty.websocket.client.WebSocketClient client;
 
 	@Nullable
 	private AsyncListenableTaskExecutor taskExecutor = new SimpleAsyncTaskExecutor();
 
-	private final UpgradeHelper upgradeHelper =
-			(jetty10Present ? new Jetty10UpgradeHelper() : new Jetty9UpgradeHelper());
-
 
 	/**
 	 * Default constructor that creates an instance of
@@ -170,19 +145,18 @@ public ListenableFuture<WebSocketSession> doHandshakeInternal(WebSocketHandler w
 		final ClientUpgradeRequest request = new ClientUpgradeRequest();
 		request.setSubProtocols(protocols);
 
-		for (WebSocketExtension e : extensions) {
-			request.addExtensions(new WebSocketToJettyExtensionConfigAdapter(e));
+		for (WebSocketExtension extension : extensions) {
+			request.addExtensions(new WebSocketToJettyExtensionConfigAdapter(extension));
 		}
 
-		// Jetty  9: setHeaders declared in UpgradeRequestAdapter base class
-		// Jetty 10: setHeaders declared in ClientUpgradeRequest
-		ReflectionUtils.invokeMethod(setHeadersMethod, request, headers);
+		request.setHeaders(headers);
 
 		Principal user = getUser();
 		JettyWebSocketSession wsSession = new JettyWebSocketSession(attributes, user);
 
 		Callable<WebSocketSession> connectTask = () -> {
-			Future<Session> future = this.upgradeHelper.connect(this.client, uri, request, wsHandler, wsSession);
+			JettyWebSocketHandlerAdapter adapter = new JettyWebSocketHandlerAdapter(wsHandler, wsSession);
+			Future<Session> future = this.client.connect(adapter, uri, request);
 			future.get(this.client.getConnectTimeout() + 2000, TimeUnit.MILLISECONDS);
 			return wsSession;
 		};
@@ -206,55 +180,4 @@ protected Principal getUser() {
 		return null;
 	}
 
-
-	/**
-	 * Encapsulate incompatible changes between Jetty 9.4 and 10.
-	 */
-	private interface UpgradeHelper {
-
-		Future<Session> connect(WebSocketClient client, URI url, ClientUpgradeRequest request,
-				WebSocketHandler handler, JettyWebSocketSession session) throws IOException;
-	}
-
-
-	private static class Jetty9UpgradeHelper implements UpgradeHelper {
-
-		@Override
-		public Future<Session> connect(WebSocketClient client, URI url, ClientUpgradeRequest request,
-				WebSocketHandler handler, JettyWebSocketSession session) throws IOException {
-
-			JettyWebSocketHandlerAdapter adapter = new JettyWebSocketHandlerAdapter(handler, session);
-			return client.connect(adapter, url, request);
-		}
-	}
-
-
-	private static class Jetty10UpgradeHelper implements UpgradeHelper {
-
-		// On Jetty 9 returns Future, on Jetty 10 returns CompletableFuture
-		private static final Method connectMethod;
-
-		static {
-			try {
-				Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.client.WebSocketClient");
-				connectMethod = type.getMethod("connect", Object.class, URI.class, ClientUpgradeRequest.class);
-			}
-			catch (ClassNotFoundException | NoSuchMethodException ex) {
-				throw new IllegalStateException("No compatible Jetty version found", ex);
-			}
-		}
-
-		@Override
-		@SuppressWarnings({"ConstantConditions", "unchecked"})
-		public Future<Session> connect(WebSocketClient client, URI url, ClientUpgradeRequest request,
-				WebSocketHandler handler, JettyWebSocketSession session) {
-
-			Jetty10WebSocketHandlerAdapter adapter = new Jetty10WebSocketHandlerAdapter(handler, session);
-
-			// TODO: pass JettyUpgradeListener argument to set headers from HttpHeaders (like we do for Jetty 9)
-			//  which would require a JDK Proxy since it is new in Jetty 10
-			return (Future<Session>) ReflectionUtils.invokeMethod(connectMethod, client, adapter, url, request);
-		}
-	}
-
 }
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java
index fcb568e49040..7347791e1ade 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.socket.client.standard;
 
-import javax.websocket.ContainerProvider;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -32,7 +32,7 @@
 
 /**
  * A WebSocket connection manager that is given a URI, a
- * {@link javax.websocket.ClientEndpoint}-annotated endpoint, connects to a
+ * {@link jakarta.websocket.ClientEndpoint}-annotated endpoint, connects to a
  * WebSocket server through the {@link #start()} and {@link #stop()} methods.
  * If {@link #setAutoStartup(boolean)} is set to {@code true} this will be
  * done automatically when the Spring ApplicationContext is refreshed.
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java
index 1fa1ed777c42..c58fb951e971 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java
@@ -19,15 +19,15 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ClientEndpointConfig.Configurator;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig.Configurator;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
index e942cb839240..3661300815f3 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
@@ -27,13 +27,13 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ClientEndpointConfig.Configurator;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig.Configurator;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.WebSocketContainer;
 
 import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/WebSocketContainerFactoryBean.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/WebSocketContainerFactoryBean.java
index 8c8591b2e0d8..66bb8ade6315 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/WebSocketContainerFactoryBean.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/WebSocketContainerFactoryBean.java
@@ -16,13 +16,13 @@
 
 package org.springframework.web.socket.client.standard;
 
-import javax.websocket.ContainerProvider;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.WebSocketContainer;
 
 import org.springframework.beans.factory.FactoryBean;
 
 /**
- * A FactoryBean for creating and configuring a {@link javax.websocket.WebSocketContainer}
+ * A FactoryBean for creating and configuring a {@link jakarta.websocket.WebSocketContainer}
  * through Spring XML configuration. In Java configuration, ignore this class and use
  * {@code ContainerProvider.getWebSocketContainer()} instead.
  *
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
index a0828f3f37bc..1c9fd553eef3 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
@@ -127,8 +127,8 @@ class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser {
 		jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) &&
 				ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
 		gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader);
-		jsonbPresent = ClassUtils.isPresent("javax.json.bind.Jsonb", classLoader);
-		javaxValidationPresent = ClassUtils.isPresent("javax.validation.Validator", classLoader);
+		jsonbPresent = ClassUtils.isPresent("jakarta.json.bind.Jsonb", classLoader);
+		javaxValidationPresent = ClassUtils.isPresent("jakarta.validation.Validator", classLoader);
 	}
 
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java
deleted file mode 100644
index 1ba175654779..000000000000
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java
+++ /dev/null
@@ -1,167 +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.web.socket.server.jetty;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.security.Principal;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.target.EmptyTargetSource;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.http.server.ServletServerHttpRequest;
-import org.springframework.http.server.ServletServerHttpResponse;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.web.socket.WebSocketExtension;
-import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.adapter.jetty.Jetty10WebSocketHandlerAdapter;
-import org.springframework.web.socket.adapter.jetty.JettyWebSocketSession;
-import org.springframework.web.socket.server.HandshakeFailureException;
-import org.springframework.web.socket.server.RequestUpgradeStrategy;
-
-/**
- * A {@link RequestUpgradeStrategy} for Jetty 10.
- *
- * @author Rossen Stoyanchev
- * @since 5.3.4
- */
-public class Jetty10RequestUpgradeStrategy implements RequestUpgradeStrategy {
-
-	private static final String[] SUPPORTED_VERSIONS = new String[] { String.valueOf(13) };
-
-	private static final Class<?> webSocketCreatorClass;
-
-	private static final Method getContainerMethod;
-
-	private static final Method upgradeMethod;
-
-	private static final Method setAcceptedSubProtocol;
-
-	static {
-		ClassLoader loader = Jetty10RequestUpgradeStrategy.class.getClassLoader();
-		try {
-			webSocketCreatorClass = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketCreator");
-
-			Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer");
-			getContainerMethod = type.getMethod("getContainer", ServletContext.class);
-			Method upgrade = ReflectionUtils.findMethod(type, "upgrade", (Class<?>[]) null);
-			Assert.state(upgrade != null, "Upgrade method not found");
-			upgradeMethod = upgrade;
-
-			type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse");
-			setAcceptedSubProtocol = type.getMethod("setAcceptedSubProtocol", String.class);
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException("No compatible Jetty version found", ex);
-		}
-	}
-
-
-	@Override
-	public String[] getSupportedVersions() {
-		return SUPPORTED_VERSIONS;
-	}
-
-	@Override
-	public List<WebSocketExtension> getSupportedExtensions(ServerHttpRequest request) {
-		return Collections.emptyList();
-	}
-
-
-	@Override
-	public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
-			@Nullable String selectedProtocol, List<WebSocketExtension> selectedExtensions,
-			@Nullable Principal user, WebSocketHandler handler, Map<String, Object> attributes)
-			throws HandshakeFailureException {
-
-		Assert.isInstanceOf(ServletServerHttpRequest.class, request, "ServletServerHttpRequest required");
-		HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
-		ServletContext servletContext = servletRequest.getServletContext();
-
-		Assert.isInstanceOf(ServletServerHttpResponse.class, response, "ServletServerHttpResponse required");
-		HttpServletResponse servletResponse = ((ServletServerHttpResponse) response).getServletResponse();
-
-		JettyWebSocketSession session = new JettyWebSocketSession(attributes, user);
-		Jetty10WebSocketHandlerAdapter handlerAdapter = new Jetty10WebSocketHandlerAdapter(handler, session);
-
-		try {
-			Object creator = createJettyWebSocketCreator(handlerAdapter, selectedProtocol);
-			Object container = ReflectionUtils.invokeMethod(getContainerMethod, null, servletContext);
-			ReflectionUtils.invokeMethod(upgradeMethod, container, creator, servletRequest, servletResponse);
-		}
-		catch (UndeclaredThrowableException ex) {
-			throw new HandshakeFailureException("Failed to upgrade", ex.getUndeclaredThrowable());
-		}
-		catch (Exception ex) {
-			throw new HandshakeFailureException("Failed to upgrade", ex);
-		}
-	}
-
-	private static Object createJettyWebSocketCreator(
-			Jetty10WebSocketHandlerAdapter adapter, @Nullable String protocol) {
-
-		ProxyFactory factory = new ProxyFactory(EmptyTargetSource.INSTANCE);
-		factory.addInterface(webSocketCreatorClass);
-		factory.addAdvice(new WebSocketCreatorInterceptor(adapter, protocol));
-		return factory.getProxy();
-	}
-
-
-	/**
-	 * Proxy for a JettyWebSocketCreator to supply the WebSocket handler and set the sub-protocol.
-	 */
-	private static class WebSocketCreatorInterceptor implements MethodInterceptor {
-
-		private final Jetty10WebSocketHandlerAdapter adapter;
-
-		@Nullable
-		private final String protocol;
-
-
-		public WebSocketCreatorInterceptor(
-				Jetty10WebSocketHandlerAdapter adapter, @Nullable String protocol) {
-
-			this.adapter = adapter;
-			this.protocol = protocol;
-		}
-
-		@Nullable
-		@Override
-		public Object invoke(@NonNull MethodInvocation invocation) {
-			if (this.protocol != null) {
-				ReflectionUtils.invokeMethod(
-						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
-			}
-			return this.adapter;
-		}
-	}
-
-}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
index b733141f39a5..946f061af37d 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
@@ -16,268 +16,149 @@
 
 package org.springframework.web.socket.server.jetty;
 
-import java.io.IOException;
 import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.security.Principal;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
 
-import org.eclipse.jetty.websocket.api.WebSocketPolicy;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
-import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
-
-import org.springframework.context.Lifecycle;
-import org.springframework.core.NamedThreadLocal;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.target.EmptyTargetSource;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpResponse;
+import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.socket.WebSocketExtension;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.adapter.jetty.JettyWebSocketHandlerAdapter;
 import org.springframework.web.socket.adapter.jetty.JettyWebSocketSession;
-import org.springframework.web.socket.adapter.jetty.WebSocketToJettyExtensionConfigAdapter;
 import org.springframework.web.socket.server.HandshakeFailureException;
 import org.springframework.web.socket.server.RequestUpgradeStrategy;
 
 /**
- * A {@link RequestUpgradeStrategy} for use with Jetty 9.4. Based on Jetty's
- * internal {@code org.eclipse.jetty.websocket.server.WebSocketHandler} class.
+ * A {@link RequestUpgradeStrategy} for Jetty 11.
  *
- * @author Phillip Webb
  * @author Rossen Stoyanchev
- * @author Brian Clozel
- * @author Juergen Hoeller
- * @since 4.0
+ * @since 5.3.4
  */
-public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, ServletContextAware, Lifecycle {
-
-	private static final ThreadLocal<WebSocketHandlerContainer> containerHolder =
-			new NamedThreadLocal<>("WebSocketHandlerContainer");
+public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
-	@Nullable
-	private WebSocketPolicy policy;
+	private static final String[] SUPPORTED_VERSIONS = new String[] { String.valueOf(13) };
 
-	@Nullable
-	private volatile WebSocketServerFactory factory;
+	private static final Class<?> webSocketCreatorClass;
 
-	@Nullable
-	private ServletContext servletContext;
+	private static final Method getContainerMethod;
 
-	private volatile boolean running;
+	private static final Method upgradeMethod;
 
-	@Nullable
-	private volatile List<WebSocketExtension> supportedExtensions;
+	private static final Method setAcceptedSubProtocol;
 
+	static {
+		// TODO: can switch to non-reflective implementation now
 
-	/**
-	 * Default constructor that creates {@link WebSocketServerFactory} through
-	 * its default constructor thus using a default {@link WebSocketPolicy}.
-	 */
-	public JettyRequestUpgradeStrategy() {
-		this.policy = WebSocketPolicy.newServerPolicy();
-	}
-
-	/**
-	 * A constructor accepting a {@link WebSocketPolicy} to be used when
-	 * creating the {@link WebSocketServerFactory} instance.
-	 * @param policy the policy to use
-	 * @since 4.3.5
-	 */
-	public JettyRequestUpgradeStrategy(WebSocketPolicy policy) {
-		Assert.notNull(policy, "WebSocketPolicy must not be null");
-		this.policy = policy;
-	}
-
-	/**
-	 * A constructor accepting a {@link WebSocketServerFactory}.
-	 * @param factory the pre-configured factory to use
-	 */
-	public JettyRequestUpgradeStrategy(WebSocketServerFactory factory) {
-		Assert.notNull(factory, "WebSocketServerFactory must not be null");
-		this.factory = factory;
-	}
-
+		ClassLoader loader = JettyRequestUpgradeStrategy.class.getClassLoader();
+		try {
+			webSocketCreatorClass = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketCreator");
 
-	@Override
-	public void setServletContext(ServletContext servletContext) {
-		this.servletContext = servletContext;
-	}
+			Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer");
+			getContainerMethod = type.getMethod("getContainer", ServletContext.class);
+			Method upgrade = ReflectionUtils.findMethod(type, "upgrade", (Class<?>[]) null);
+			Assert.state(upgrade != null, "Upgrade method not found");
+			upgradeMethod = upgrade;
 
-	@Override
-	public void start() {
-		if (!isRunning()) {
-			this.running = true;
-			try {
-				WebSocketServerFactory factory = this.factory;
-				if (factory == null) {
-					Assert.state(this.servletContext != null, "No ServletContext set");
-					factory = new WebSocketServerFactory(this.servletContext, this.policy);
-					this.factory = factory;
-				}
-				factory.setCreator((request, response) -> {
-					WebSocketHandlerContainer container = containerHolder.get();
-					Assert.state(container != null, "Expected WebSocketHandlerContainer");
-					response.setAcceptedSubProtocol(container.getSelectedProtocol());
-					response.setExtensions(container.getExtensionConfigs());
-					return container.getHandler();
-				});
-				factory.start();
-			}
-			catch (Throwable ex) {
-				throw new IllegalStateException("Unable to start Jetty WebSocketServerFactory", ex);
-			}
+			type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse");
+			setAcceptedSubProtocol = type.getMethod("setAcceptedSubProtocol", String.class);
 		}
-	}
-
-	@Override
-	public void stop() {
-		if (isRunning()) {
-			this.running = false;
-			WebSocketServerFactory factory = this.factory;
-			if (factory != null) {
-				try {
-					factory.stop();
-				}
-				catch (Throwable ex) {
-					throw new IllegalStateException("Unable to stop Jetty WebSocketServerFactory", ex);
-				}
-			}
+		catch (Exception ex) {
+			throw new IllegalStateException("No compatible Jetty version found", ex);
 		}
 	}
 
-	@Override
-	public boolean isRunning() {
-		return this.running;
-	}
-
 
 	@Override
 	public String[] getSupportedVersions() {
-		return new String[] { String.valueOf(13) };
+		return SUPPORTED_VERSIONS;
 	}
 
 	@Override
 	public List<WebSocketExtension> getSupportedExtensions(ServerHttpRequest request) {
-		List<WebSocketExtension> extensions = this.supportedExtensions;
-		if (extensions == null) {
-			extensions = buildWebSocketExtensions();
-			this.supportedExtensions = extensions;
-		}
-		return extensions;
-	}
-
-	private List<WebSocketExtension> buildWebSocketExtensions() {
-		Set<String> names = getExtensionNames();
-		List<WebSocketExtension> result = new ArrayList<>(names.size());
-		for (String name : names) {
-			result.add(new WebSocketExtension(name));
-		}
-		return result;
+		return Collections.emptyList();
 	}
 
-	@SuppressWarnings({"unchecked", "deprecation"})
-	private Set<String> getExtensionNames() {
-		WebSocketServerFactory factory = this.factory;
-		Assert.state(factory != null, "No WebSocketServerFactory available");
-		try {
-			return factory.getAvailableExtensionNames();
-		}
-		catch (IncompatibleClassChangeError ex) {
-			// Fallback for versions prior to 9.4.21:
-			// 9.4.20.v20190813: ExtensionFactory (abstract class -> interface)
-			// 9.4.21.v20190926: ExtensionFactory (interface -> abstract class) + deprecated
-			Class<?> clazz = org.eclipse.jetty.websocket.api.extensions.ExtensionFactory.class;
-			Method method = ClassUtils.getMethod(clazz, "getExtensionNames");
-			Set<String> result = (Set<String>) ReflectionUtils.invokeMethod(method, factory.getExtensionFactory());
-			return (result != null ? result : Collections.emptySet());
-		}
-	}
 
 	@Override
 	public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
-			@Nullable String selectedProtocol, List<WebSocketExtension> selectedExtensions, @Nullable Principal user,
-			WebSocketHandler wsHandler, Map<String, Object> attributes) throws HandshakeFailureException {
+			@Nullable String selectedProtocol, List<WebSocketExtension> selectedExtensions,
+			@Nullable Principal user, WebSocketHandler handler, Map<String, Object> attributes)
+			throws HandshakeFailureException {
 
 		Assert.isInstanceOf(ServletServerHttpRequest.class, request, "ServletServerHttpRequest required");
 		HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
+		ServletContext servletContext = servletRequest.getServletContext();
 
 		Assert.isInstanceOf(ServletServerHttpResponse.class, response, "ServletServerHttpResponse required");
 		HttpServletResponse servletResponse = ((ServletServerHttpResponse) response).getServletResponse();
 
-		WebSocketServerFactory factory = this.factory;
-		Assert.state(factory != null, "No WebSocketServerFactory available");
-		Assert.isTrue(factory.isUpgradeRequest(servletRequest, servletResponse), "Not a WebSocket handshake");
-
 		JettyWebSocketSession session = new JettyWebSocketSession(attributes, user);
-		JettyWebSocketHandlerAdapter handlerAdapter = new JettyWebSocketHandlerAdapter(wsHandler, session);
-
-		WebSocketHandlerContainer container =
-				new WebSocketHandlerContainer(handlerAdapter, selectedProtocol, selectedExtensions);
+		JettyWebSocketHandlerAdapter handlerAdapter = new JettyWebSocketHandlerAdapter(handler, session);
 
 		try {
-			containerHolder.set(container);
-			factory.acceptWebSocket(servletRequest, servletResponse);
+			Object creator = createJettyWebSocketCreator(handlerAdapter, selectedProtocol);
+			Object container = ReflectionUtils.invokeMethod(getContainerMethod, null, servletContext);
+			ReflectionUtils.invokeMethod(upgradeMethod, container, creator, servletRequest, servletResponse);
 		}
-		catch (IOException ex) {
-			throw new HandshakeFailureException(
-					"Response update failed during upgrade to WebSocket: " + request.getURI(), ex);
+		catch (UndeclaredThrowableException ex) {
+			throw new HandshakeFailureException("Failed to upgrade", ex.getUndeclaredThrowable());
 		}
-		finally {
-			containerHolder.remove();
+		catch (Exception ex) {
+			throw new HandshakeFailureException("Failed to upgrade", ex);
 		}
 	}
 
+	private static Object createJettyWebSocketCreator(
+			JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
 
-	private static class WebSocketHandlerContainer {
-
-		private final JettyWebSocketHandlerAdapter handler;
+		ProxyFactory factory = new ProxyFactory(EmptyTargetSource.INSTANCE);
+		factory.addInterface(webSocketCreatorClass);
+		factory.addAdvice(new WebSocketCreatorInterceptor(adapter, protocol));
+		return factory.getProxy();
+	}
 
-		@Nullable
-		private final String selectedProtocol;
 
-		private final List<ExtensionConfig> extensionConfigs;
+	/**
+	 * Proxy for a JettyWebSocketCreator to supply the WebSocket handler and set the sub-protocol.
+	 */
+	private static class WebSocketCreatorInterceptor implements MethodInterceptor {
 
-		public WebSocketHandlerContainer(JettyWebSocketHandlerAdapter handler,
-				@Nullable String protocol, List<WebSocketExtension> extensions) {
+		private final JettyWebSocketHandlerAdapter adapter;
 
-			this.handler = handler;
-			this.selectedProtocol = protocol;
-			if (CollectionUtils.isEmpty(extensions)) {
-				this.extensionConfigs = new ArrayList<>(0);
-			}
-			else {
-				this.extensionConfigs = new ArrayList<>(extensions.size());
-				for (WebSocketExtension extension : extensions) {
-					this.extensionConfigs.add(new WebSocketToJettyExtensionConfigAdapter(extension));
-				}
-			}
-		}
+		@Nullable
+		private final String protocol;
 
-		public JettyWebSocketHandlerAdapter getHandler() {
-			return this.handler;
+		public WebSocketCreatorInterceptor(JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
+			this.adapter = adapter;
+			this.protocol = protocol;
 		}
 
 		@Nullable
-		public String getSelectedProtocol() {
-			return this.selectedProtocol;
-		}
-
-		public List<ExtensionConfig> getExtensionConfigs() {
-			return this.extensionConfigs;
+		@Override
+		public Object invoke(@NonNull MethodInvocation invocation) {
+			if (this.protocol != null) {
+				ReflectionUtils.invokeMethod(
+						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
+			}
+			return this.adapter;
 		}
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java
index 0528da269e1e..e19318ad2967 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java
@@ -22,14 +22,13 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerContainer;
-
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerContainer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -66,9 +65,9 @@ public abstract class AbstractStandardUpgradeStrategy implements RequestUpgradeS
 
 	protected ServerContainer getContainer(HttpServletRequest request) {
 		ServletContext servletContext = request.getServletContext();
-		String attrName = "javax.websocket.server.ServerContainer";
+		String attrName = "jakarta.websocket.server.ServerContainer";
 		ServerContainer container = (ServerContainer) servletContext.getAttribute(attrName);
-		Assert.notNull(container, "No 'javax.websocket.server.ServerContainer' ServletContext attribute. " +
+		Assert.notNull(container, "No 'jakarta.websocket.server.ServerContainer' ServletContext attribute. " +
 				"Are you running in a Servlet container that supports JSR-356?");
 		return container;
 	}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java
index b6406ac82b44..3a9f7b0561f5 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java
@@ -25,15 +25,14 @@
 import java.util.List;
 import java.util.Random;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.WebSocketContainer;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.WebSocketContainer;
 import org.glassfish.tyrus.core.ComponentProviderService;
 import org.glassfish.tyrus.core.RequestContext;
 import org.glassfish.tyrus.core.TyrusEndpointWrapper;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/GlassFishRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/GlassFishRequestUpgradeStrategy.java
index 8fc03354f9e7..07ca46500e1b 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/GlassFishRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/GlassFishRequestUpgradeStrategy.java
@@ -19,10 +19,9 @@
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.glassfish.tyrus.core.TyrusUpgradeResponse;
 import org.glassfish.tyrus.core.Utils;
 import org.glassfish.tyrus.servlet.TyrusHttpUpgradeHandler;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointExporter.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointExporter.java
index acbce32b8d30..efd7c756f84f 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointExporter.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointExporter.java
@@ -22,11 +22,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.SmartInitializingSingleton;
@@ -36,7 +36,7 @@
 import org.springframework.web.context.support.WebApplicationObjectSupport;
 
 /**
- * Detects beans of type {@link javax.websocket.server.ServerEndpointConfig} and registers
+ * Detects beans of type {@link jakarta.websocket.server.ServerEndpointConfig} and registers
  * with the standard Java WebSocket runtime. Also detects beans annotated with
  * {@link ServerEndpoint} and registers them as well. Although not required, it is likely
  * annotated endpoints should have their {@code configurator} property set to
@@ -93,7 +93,7 @@ protected ServerContainer getServerContainer() {
 	protected void initServletContext(ServletContext servletContext) {
 		if (this.serverContainer == null) {
 			this.serverContainer =
-					(ServerContainer) servletContext.getAttribute("javax.websocket.server.ServerContainer");
+					(ServerContainer) servletContext.getAttribute("jakarta.websocket.server.ServerContainer");
 		}
 	}
 
@@ -104,7 +104,7 @@ protected boolean isContextRequired() {
 
 	@Override
 	public void afterPropertiesSet() {
-		Assert.state(getServerContainer() != null, "javax.websocket.server.ServerContainer not available");
+		Assert.state(getServerContainer() != null, "jakarta.websocket.server.ServerContainer not available");
 	}
 
 	@Override
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java
index 78b138ff5097..bc42f3dc883d 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java
@@ -21,13 +21,13 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -36,17 +36,17 @@
 import org.springframework.web.socket.handler.BeanCreatingHandlerProvider;
 
 /**
- * An implementation of {@link javax.websocket.server.ServerEndpointConfig} for use in
+ * An implementation of {@link jakarta.websocket.server.ServerEndpointConfig} for use in
  * Spring-based applications. A {@link ServerEndpointRegistration} bean is detected by
  * {@link ServerEndpointExporter} and registered with a Java WebSocket runtime at startup.
  *
- * <p>Class constructors accept a singleton {@link javax.websocket.Endpoint} instance
+ * <p>Class constructors accept a singleton {@link jakarta.websocket.Endpoint} instance
  * or an Endpoint specified by type {@link Class}. When specified by type, the endpoint
  * will be instantiated and initialized through the Spring ApplicationContext before
  * each client WebSocket connection.
  *
  * <p>This class also extends
- * {@link javax.websocket.server.ServerEndpointConfig.Configurator} to make it easier
+ * {@link jakarta.websocket.server.ServerEndpointConfig.Configurator} to make it easier
  * to override methods for customizing the handshake process.
  *
  * @author Rossen Stoyanchev
@@ -78,7 +78,7 @@ public class ServerEndpointRegistration extends ServerEndpointConfig.Configurato
 
 	/**
 	 * Create a new {@link ServerEndpointRegistration} instance from an
-	 * {@code javax.websocket.Endpoint} instance.
+	 * {@code jakarta.websocket.Endpoint} instance.
 	 * @param path the endpoint path
 	 * @param endpoint the endpoint instance
 	 */
@@ -92,7 +92,7 @@ public ServerEndpointRegistration(String path, Endpoint endpoint) {
 
 	/**
 	 * Create a new {@link ServerEndpointRegistration} instance from an
-	 * {@code javax.websocket.Endpoint} class.
+	 * {@code jakarta.websocket.Endpoint} class.
 	 * @param path the endpoint path
 	 * @param endpointClass the endpoint class
 	 */
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServletServerContainerFactoryBean.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServletServerContainerFactoryBean.java
index 122402714371..7831250fb678 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServletServerContainerFactoryBean.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServletServerContainerFactoryBean.java
@@ -16,9 +16,9 @@
 
 package org.springframework.web.socket.server.standard;
 
-import javax.servlet.ServletContext;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerContainer;
+import jakarta.servlet.ServletContext;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerContainer;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -27,9 +27,9 @@
 import org.springframework.web.context.ServletContextAware;
 
 /**
- * A {@link FactoryBean} for configuring {@link javax.websocket.server.ServerContainer}.
+ * A {@link FactoryBean} for configuring {@link jakarta.websocket.server.ServerContainer}.
  * Since there is usually only one {@code ServerContainer} instance accessible under a
- * well-known {@code javax.servlet.ServletContext} attribute, simply declaring this
+ * well-known {@code jakarta.servlet.ServletContext} attribute, simply declaring this
  * FactoryBean and using its setters allows for configuring the {@code ServerContainer}
  * through Spring configuration.
  *
@@ -111,11 +111,11 @@ public void setServletContext(ServletContext servletContext) {
 	@Override
 	public void afterPropertiesSet() {
 		Assert.state(this.servletContext != null,
-				"A ServletContext is required to access the javax.websocket.server.ServerContainer instance");
+				"A ServletContext is required to access the jakarta.websocket.server.ServerContainer instance");
 		this.serverContainer = (ServerContainer) this.servletContext.getAttribute(
-				"javax.websocket.server.ServerContainer");
+				"jakarta.websocket.server.ServerContainer");
 		Assert.state(this.serverContainer != null,
-				"Attribute 'javax.websocket.server.ServerContainer' not found in ServletContext");
+				"Attribute 'jakarta.websocket.server.ServerContainer' not found in ServletContext");
 
 		if (this.asyncSendTimeout != null) {
 			this.serverContainer.setAsyncSendTimeout(this.asyncSendTimeout);
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/SpringConfigurator.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/SpringConfigurator.java
index 712b978b09d3..a27654b86504 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/SpringConfigurator.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/SpringConfigurator.java
@@ -20,9 +20,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig.Configurator;
-
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig.Configurator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -35,7 +34,7 @@
 import org.springframework.web.context.WebApplicationContext;
 
 /**
- * A {@link javax.websocket.server.ServerEndpointConfig.Configurator} for initializing
+ * A {@link jakarta.websocket.server.ServerEndpointConfig.Configurator} for initializing
  * {@link ServerEndpoint}-annotated classes through Spring.
  *
  * <p>
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java
index c3c6a191609d..37c194dfb410 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java
@@ -21,12 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
 import org.apache.tomcat.websocket.server.WsServerContainer;
 
 import org.springframework.http.server.ServerHttpRequest;
@@ -38,10 +37,10 @@
  * A WebSocket {@code RequestUpgradeStrategy} for Apache Tomcat. Compatible with
  * all versions of Tomcat that support JSR-356, i.e. Tomcat 7.0.47+ and higher.
  *
- * <p>To modify properties of the underlying {@link javax.websocket.server.ServerContainer}
+ * <p>To modify properties of the underlying {@link jakarta.websocket.server.ServerContainer}
  * you can use {@link ServletServerContainerFactoryBean} in XML configuration or,
  * when using Java configuration, access the container instance through the
- * "javax.websocket.server.ServerContainer" ServletContext attribute.
+ * "jakarta.websocket.server.ServerContainer" ServletContext attribute.
  *
  * @author Rossen Stoyanchev
  * @since 4.0
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java
index 96ac372042f9..4ee43f18e509 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java
@@ -21,14 +21,13 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-
 import io.undertow.websockets.core.WebSocketVersion;
 import io.undertow.websockets.jsr.ServerWebSocketContainer;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java
index cf04f519c9d2..8174297a5c46 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebLogicRequestUpgradeStrategy.java
@@ -20,14 +20,13 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.glassfish.tyrus.core.TyrusUpgradeResponse;
 import org.glassfish.tyrus.core.Utils;
 import org.glassfish.tyrus.spi.Connection;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java
index 62990dfe6820..6a69ec0769f2 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java
@@ -21,12 +21,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Extension;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java
index 8ca56429a4e8..efc771a7ed8f 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java
@@ -67,7 +67,6 @@
  * @see org.springframework.web.socket.server.standard.TomcatRequestUpgradeStrategy
  * @see org.springframework.web.socket.server.standard.UndertowRequestUpgradeStrategy
  * @see org.springframework.web.socket.server.standard.GlassFishRequestUpgradeStrategy
- * @see org.springframework.web.socket.server.standard.WebLogicRequestUpgradeStrategy
  */
 public abstract class AbstractHandshakeHandler implements HandshakeHandler, Lifecycle {
 
@@ -75,8 +74,6 @@ public abstract class AbstractHandshakeHandler implements HandshakeHandler, Life
 
 	private static final boolean jettyWsPresent;
 
-	private static final boolean jetty10WsPresent;
-
 	private static final boolean undertowWsPresent;
 
 	private static final boolean glassfishWsPresent;
@@ -89,10 +86,8 @@ public abstract class AbstractHandshakeHandler implements HandshakeHandler, Life
 		ClassLoader classLoader = AbstractHandshakeHandler.class.getClassLoader();
 		tomcatWsPresent = ClassUtils.isPresent(
 				"org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader);
-		jetty10WsPresent = ClassUtils.isPresent(
-				"org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader);
 		jettyWsPresent = ClassUtils.isPresent(
-				"org.eclipse.jetty.websocket.server.WebSocketServerFactory", classLoader);
+				"org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer", classLoader);
 		undertowWsPresent = ClassUtils.isPresent(
 				"io.undertow.websockets.jsr.ServerWebSocketContainer", classLoader);
 		glassfishWsPresent = ClassUtils.isPresent(
@@ -140,9 +135,6 @@ private static RequestUpgradeStrategy initRequestUpgradeStrategy() {
 		else if (jettyWsPresent) {
 			className = "org.springframework.web.socket.server.jetty.JettyRequestUpgradeStrategy";
 		}
-		else if (jetty10WsPresent) {
-			className = "org.springframework.web.socket.server.jetty.Jetty10RequestUpgradeStrategy";
-		}
 		else if (undertowWsPresent) {
 			className = "org.springframework.web.socket.server.standard.UndertowRequestUpgradeStrategy";
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java
index 7cd06ac757a3..a3701fc09974 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.socket.server.support;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.socket.server.RequestUpgradeStrategy;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java
index 1f18ff4b9046..ba020c32fe82 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java
@@ -21,7 +21,7 @@
 import java.util.Enumeration;
 import java.util.Map;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
@@ -128,7 +128,7 @@ public boolean isCopyHttpSessionId() {
 	/**
 	 * Whether to allow the HTTP session to be created while accessing it.
 	 * <p>By default set to {@code false}.
-	 * @see javax.servlet.http.HttpServletRequest#getSession(boolean)
+	 * @see jakarta.servlet.http.HttpServletRequest#getSession(boolean)
 	 */
 	public void setCreateSession(boolean createSession) {
 		this.createSession = createSession;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java
index 47a66b62999d..a6d5bfb7f915 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHandlerMapping.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.socket.server.support;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.context.Lifecycle;
 import org.springframework.context.SmartLifecycle;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
index 15c2a9ef3e30..997c547b4470 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
@@ -22,11 +22,10 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java
index 772e6c0295de..df046d197e63 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.util.StringContentProvider;
+import org.eclipse.jetty.client.util.StringRequestContent;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpMethod;
 
@@ -142,7 +142,7 @@ protected ResponseEntity<String> executeRequest(URI url, HttpMethod method,
 		Request httpRequest = this.httpClient.newRequest(url).method(method);
 		addHttpHeaders(httpRequest, headers);
 		if (body != null) {
-			httpRequest.content(new StringContentProvider(body));
+			httpRequest.body(new StringRequestContent(body));
 		}
 		ContentResponse response;
 		try {
@@ -160,10 +160,12 @@ protected ResponseEntity<String> executeRequest(URI url, HttpMethod method,
 
 
 	private static void addHttpHeaders(Request request, HttpHeaders headers) {
-		headers.forEach((key, values) -> {
-			for (String value : values) {
-				request.header(key, value);
-			}
+		request.headers(fields -> {
+			headers.forEach((key, values) -> {
+				for (String value : values) {
+					fields.add(key, value);
+				}
+			});
 		});
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
index e3a941937107..e1c6ba116fee 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -27,8 +27,7 @@
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/SockJsHttpRequestHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/SockJsHttpRequestHandler.java
index 67f1da304a7b..555f8f8903e7 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/SockJsHttpRequestHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/SockJsHttpRequestHandler.java
@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.Lifecycle;
 import org.springframework.http.server.ServerHttpRequest;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java
index 3409eb15dafe..8a33978475ed 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java
@@ -21,8 +21,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java
index 77e7bbe2f0c9..8f58315f80af 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.context.Lifecycle;
 import org.springframework.http.server.ServerHttpRequest;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
index a3d492ecf564..ce9786bc7585 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
@@ -26,7 +26,7 @@
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.ServerHttpAsyncRequestControl;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java
index ec9f90bfccaf..588608f10d77 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
index bec8dda74440..abe8c4d09591 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
@@ -18,10 +18,9 @@
 
 import java.util.EnumSet;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletContext;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
index 78ca7714ac40..12e5b54fa484 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
@@ -19,9 +19,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.ServletContext;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletContext;
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
index 589282256552..914450bec2e2 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
@@ -19,12 +19,6 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
 import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
 import io.undertow.servlet.api.DeploymentInfo;
@@ -34,6 +28,11 @@
 import io.undertow.servlet.api.InstanceHandle;
 import io.undertow.servlet.api.ServletInfo;
 import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import org.xnio.OptionMap;
 import org.xnio.Xnio;
 
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketTestServer.java
index 6b131e5573cb..92c4c3f3d8c2 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketTestServer.java
@@ -16,8 +16,8 @@
 
 package org.springframework.web.socket;
 
-import javax.servlet.Filter;
-import javax.servlet.ServletContext;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.web.context.WebApplicationContext;
 
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java
index 440dd412d216..486cb4a07c6f 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java
@@ -18,11 +18,10 @@
 
 import java.nio.ByteBuffer;
 
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java
index 03a817c1cbfd..a2f3501d122f 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java
@@ -18,11 +18,10 @@
 
 import java.net.URI;
 
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
-
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java
index a16948cb4b1c..100c6b2e654d 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java
@@ -19,8 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.websocket.Session;
-
+import jakarta.websocket.Session;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java
index 212b92ae8916..2a4faef0aa09 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java
@@ -16,36 +16,14 @@
 
 package org.springframework.web.socket.client.jetty;
 
-import java.net.URI;
-import java.util.Arrays;
-
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
-import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.WebSocketHttpHeaders;
-import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.adapter.jetty.JettyWebSocketHandlerAdapter;
-import org.springframework.web.socket.adapter.jetty.JettyWebSocketSession;
-import org.springframework.web.socket.handler.TextWebSocketHandler;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * Tests for {@link JettyWebSocketClient}.
+ *
  * @author Rossen Stoyanchev
  */
 public class JettyWebSocketClientTests {
 
+	/* TODO: complete upgrade to Jetty 11
 	private JettyWebSocketClient client;
 
 	private TestJettyWebSocketServer server;
@@ -113,12 +91,12 @@ public TestJettyWebSocketServer(final WebSocketHandler webSocketHandler) {
 			connector.setPort(0);
 
 			this.server.addConnector(connector);
-			this.server.setHandler(new org.eclipse.jetty.websocket.server.WebSocketHandler() {
+			this.server.setHandler(new WebSocketUpgradeHandler() {
 				@Override
-				public void configure(WebSocketServletFactory factory) {
-					factory.setCreator(new WebSocketCreator() {
+				public void configure(JettyWebSocketServletFactory factory) {
+					factory.setCreator(new JettyWebSocketCreator() {
 						@Override
-						public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) {
+						public Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp) {
 							if (!CollectionUtils.isEmpty(req.getSubProtocols())) {
 								resp.setAcceptedSubProtocol(req.getSubProtocols().get(0));
 							}
@@ -142,5 +120,6 @@ public int getPort() {
 			return ((ServerConnector) this.server.getConnectors()[0]).getLocalPort();
 		}
 	}
+	*/
 
 }
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java
index 99c34eec0e7a..6246a681e825 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java
@@ -22,10 +22,9 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.Endpoint;
-import javax.websocket.WebSocketContainer;
-
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.WebSocketContainer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java
index 13cc9f4e6cad..f170340f693f 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java
@@ -16,13 +16,12 @@
 
 package org.springframework.web.socket.server.standard;
 
-import javax.servlet.ServletContext;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-
+import jakarta.servlet.ServletContext;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -56,7 +55,7 @@ public void setup() {
 		this.serverContainer = mock(ServerContainer.class);
 
 		this.servletContext = new MockServletContext();
-		this.servletContext.setAttribute("javax.websocket.server.ServerContainer", this.serverContainer);
+		this.servletContext.setAttribute("jakarta.websocket.server.ServerContainer", this.serverContainer);
 
 		this.webAppContext = new AnnotationConfigWebApplicationContext();
 		this.webAppContext.register(Config.class);
@@ -129,7 +128,7 @@ public void addServerEndpointConfigBeanWithExplicitServletContext() throws Excep
 	public void addServerEndpointConfigBeanWithExplicitServerContainer() throws Exception {
 		ServerEndpointRegistration endpointRegistration = new ServerEndpointRegistration("/dummy", new DummyEndpoint());
 		this.webAppContext.getBeanFactory().registerSingleton("dummyEndpoint", endpointRegistration);
-		this.servletContext.removeAttribute("javax.websocket.server.ServerContainer");
+		this.servletContext.removeAttribute("jakarta.websocket.server.ServerContainer");
 
 		this.exporter.setServerContainer(this.serverContainer);
 		this.exporter.setApplicationContext(this.webAppContext);
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java
index 04f3740e5fce..64571a2dfd75 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java
@@ -16,10 +16,9 @@
 
 package org.springframework.web.socket.server.standard;
 
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
-
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java
index ba77896f0a54..48f25ce7d828 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java
@@ -16,8 +16,7 @@
 
 package org.springframework.web.socket.server.standard;
 
-import javax.websocket.server.ServerEndpoint;
-
+import jakarta.websocket.server.ServerEndpoint;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java
index 77adaca9f8df..618e0441a92c 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandlerTests.java
@@ -20,8 +20,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-
+import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.server.ServerHttpRequest;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
index 5c6cbd0a627f..042ff8d15335 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
@@ -29,15 +29,14 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.AfterEach;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java
index 16106bdccc85..39f9a619f1ad 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java
@@ -20,9 +20,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

From 5eac8555d9b115b40d6de6b2c8f935ffc35864de Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 17 Sep 2021 11:50:54 +0200
Subject: [PATCH 110/735] Temporarily exclude failing Jetty 11 tests

See gh-27424
---
 build.gradle | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build.gradle b/build.gradle
index c6cdde1364e8..b96029abf6cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -299,6 +299,18 @@ configure([rootProject] + javaProjects) { project ->
 	test {
 		useJUnitPlatform()
 		include(["**/*Tests.class", "**/*Test.class"])
+		// TODO Enable excluded tests (https://github.com/spring-projects/spring-framework/issues/27424)
+		filter {
+			excludeTestsMatching("*ErrorHandlerIntegrationTests")
+			excludeTestsMatching("*RequestPartIntegrationTests")
+			excludeTestsMatching("*WebSocketConfigurationTests")
+			excludeTestsMatching("*WebSocketHandshakeTests")
+			excludeTestsMatching("*StompWebSocketIntegrationTests")
+			excludeTestsMatching("*RequestMappingIntegrationTests")
+			excludeTestsMatching("*CrossOriginAnnotationIntegrationTests")
+			excludeTestsMatching("*NestedRouteIntegrationTests")
+			excludeTestsMatching("*WebSocketIntegrationTests")
+		}
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
 		systemProperty("io.netty.leakDetection.level", "paranoid")

From 0d6cc122744df002e35f0788eab28bbd492c46ed Mon Sep 17 00:00:00 2001
From: Koy <koy@ko8e24.top>
Date: Thu, 16 Sep 2021 16:13:29 +0800
Subject: [PATCH 111/735] Fix collectionToDelimitedString failure for null
 elements.

Prior to this commit, calling `StringUtils#collectionToDelimitedString`
would fail with an NPE if the collection contains null elements.

This commit ensures that null elements are converted as `"null"` in the
resulting String without failure.

See gh-27419
---
 .../src/main/java/org/springframework/util/StringUtils.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 80a996d481fb..269257fd6024 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -1301,7 +1301,7 @@ public static String collectionToDelimitedString(
 
 		int totalLength = coll.size() * (prefix.length() + suffix.length()) + (coll.size() - 1) * delim.length();
 		for (Object element : coll) {
-			totalLength += element.toString().length();
+			totalLength += String.valueOf(element).length();
 		}
 
 		StringBuilder sb = new StringBuilder(totalLength);

From a50537fbaf3f6067071de5bcafa6052d1ac564fd Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Fri, 17 Sep 2021 15:15:51 +0200
Subject: [PATCH 112/735] Polish "Fix collectionToDelimitedString failure for
 null elements."

Fixes gh-27419
---
 .../java/org/springframework/util/StringUtilsTests.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index 2aae6260dd0e..2b46f73a56aa 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -17,6 +17,7 @@
 package org.springframework.util;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Locale;
 import java.util.Properties;
 
@@ -777,4 +778,9 @@ void splitWithEmptyStringOrNull() {
 		assertThat(StringUtils.split(null, null)).isNull();
 	}
 
+	@Test
+	void collectionToDelimitedStringWithNullValuesShouldNotFail() {
+		assertThat(StringUtils.collectionToCommaDelimitedString(Collections.singletonList(null))).isEqualTo("null");
+	}
+
 }

From b732ff349509d2b174978c71fe522ee6aa6b57a8 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2021 12:50:10 +0100
Subject: [PATCH 113/735] Ensure mutable headers for Jetty WebFlux request

In Jetty 10, request headers are immutable, see
https://github.com/eclipse/jetty.project/pull/4777, but we need to
remove/hide forwarded headers when they have been used.

See gh-27424
---
 .../server/reactive/JettyHeadersAdapter.java  | 41 +++++--------------
 .../reactive/JettyHttpHandlerAdapter.java     |  4 +-
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java
index b8d73163cea6..3e6700cf4eb8 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHeadersAdapter.java
@@ -44,10 +44,10 @@
  */
 class JettyHeadersAdapter implements MultiValueMap<String, String> {
 
-	private final HttpFields headers;
+	private final HttpFields.Mutable headers;
 
 
-	JettyHeadersAdapter(HttpFields headers) {
+	JettyHeadersAdapter(HttpFields.Mutable headers) {
 		this.headers = headers;
 	}
 
@@ -59,10 +59,7 @@ public String getFirst(String key) {
 
 	@Override
 	public void add(String key, @Nullable String value) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
-			throw new IllegalStateException("Immutable headers");
-		}
-		((HttpFields.Mutable) this.headers).add(key, value);
+		this.headers.add(key, value);
 	}
 
 	@Override
@@ -77,10 +74,7 @@ public void addAll(MultiValueMap<String, String> values) {
 
 	@Override
 	public void set(String key, @Nullable String value) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
-			throw new IllegalStateException("Immutable headers");
-		}
-		((HttpFields.Mutable) this.headers).put(key, value);
+		this.headers.put(key, value);
 	}
 
 	@Override
@@ -133,23 +127,17 @@ public List<String> get(Object key) {
 	@Nullable
 	@Override
 	public List<String> put(String key, List<String> value) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
-			throw new IllegalStateException("Immutable headers");
-		}
 		List<String> oldValues = get(key);
-		((HttpFields.Mutable) this.headers).put(key, value);
+		this.headers.put(key, value);
 		return oldValues;
 	}
 
 	@Nullable
 	@Override
 	public List<String> remove(Object key) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
-			throw new IllegalStateException("Immutable headers");
-		}
 		if (key instanceof String) {
 			List<String> oldValues = get(key);
-			((HttpFields.Mutable) this.headers).remove((String) key);
+			this.headers.remove((String) key);
 			return oldValues;
 		}
 		return null;
@@ -162,10 +150,7 @@ public void putAll(Map<? extends String, ? extends List<String>> map) {
 
 	@Override
 	public void clear() {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
-			throw new IllegalStateException("Immutable headers");
-		}
-		((HttpFields.Mutable) this.headers).clear();
+		this.headers.clear();
 	}
 
 	@Override
@@ -181,7 +166,7 @@ public Collection<List<String>> values() {
 
 	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
-		return new AbstractSet<Entry<String, List<String>>>() {
+		return new AbstractSet<>() {
 			@Override
 			public Iterator<Entry<String, List<String>>> iterator() {
 				return new EntryIterator();
@@ -237,11 +222,8 @@ public List<String> getValue() {
 
 		@Override
 		public List<String> setValue(List<String> value) {
-			if (!(headers instanceof HttpFields.Mutable)) {
-				throw new IllegalStateException("Immutable headers");
-			}
 			List<String> previousValues = headers.getValuesList(this.key);
-			((HttpFields.Mutable) headers).put(this.key, value);
+			headers.put(this.key, value);
 			return previousValues;
 		}
 	}
@@ -285,16 +267,13 @@ public String next() {
 
 		@Override
 		public void remove() {
-			if (!(headers instanceof HttpFields.Mutable)) {
-				throw new IllegalStateException("Immutable headers");
-			}
 			if (this.currentName == null) {
 				throw new IllegalStateException("No current Header in iterator");
 			}
 			if (!headers.contains(this.currentName)) {
 				throw new IllegalStateException("Header not present: " + this.currentName);
 			}
-			((HttpFields.Mutable) headers).remove(this.currentName);
+			headers.remove(this.currentName);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
index 8f5f23be086a..8c1615e6d281 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
@@ -84,7 +84,7 @@ private static final class JettyServerHttpRequest extends ServletServerHttpReque
 
 		private static MultiValueMap<String, String> createHeaders(HttpServletRequest servletRequest) {
 			Request request = getRequest(servletRequest);
-			HttpFields fields = request.getMetaData().getFields();
+			HttpFields.Mutable fields = HttpFields.build(request.getHttpFields());
 			return new JettyHeadersAdapter(fields);
 		}
 
@@ -116,7 +116,7 @@ private static final class JettyServerHttpResponse extends ServletServerHttpResp
 
 		private static HttpHeaders createHeaders(HttpServletResponse servletResponse) {
 			Response response = getResponse(servletResponse);
-			HttpFields fields = response.getHttpFields();
+			HttpFields.Mutable fields = response.getHttpFields();
 			return new HttpHeaders(new JettyHeadersAdapter(fields));
 		}
 

From 48875dc44fc019350a3b02bd9d04ade583021523 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2021 14:36:10 +0100
Subject: [PATCH 114/735] Fix Jetty WebSocket test failures

See gh-27424
---
 .../jetty/JettyRequestUpgradeStrategy.java    | 86 +++----------------
 .../web/socket/JettyWebSocketTestServer.java  |  2 +
 2 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
index 946f061af37d..34e6b89f01a5 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
@@ -16,7 +16,6 @@
 
 package org.springframework.web.socket.server.jetty;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.security.Principal;
 import java.util.Collections;
@@ -26,19 +25,15 @@
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
+import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;
+import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
 
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.target.EmptyTargetSource;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpResponse;
-import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.socket.WebSocketExtension;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.adapter.jetty.JettyWebSocketHandlerAdapter;
@@ -56,35 +51,6 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
 	private static final String[] SUPPORTED_VERSIONS = new String[] { String.valueOf(13) };
 
-	private static final Class<?> webSocketCreatorClass;
-
-	private static final Method getContainerMethod;
-
-	private static final Method upgradeMethod;
-
-	private static final Method setAcceptedSubProtocol;
-
-	static {
-		// TODO: can switch to non-reflective implementation now
-
-		ClassLoader loader = JettyRequestUpgradeStrategy.class.getClassLoader();
-		try {
-			webSocketCreatorClass = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketCreator");
-
-			Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer");
-			getContainerMethod = type.getMethod("getContainer", ServletContext.class);
-			Method upgrade = ReflectionUtils.findMethod(type, "upgrade", (Class<?>[]) null);
-			Assert.state(upgrade != null, "Upgrade method not found");
-			upgradeMethod = upgrade;
-
-			type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse");
-			setAcceptedSubProtocol = type.getMethod("setAcceptedSubProtocol", String.class);
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException("No compatible Jetty version found", ex);
-		}
-	}
-
 
 	@Override
 	public String[] getSupportedVersions() {
@@ -113,10 +79,17 @@ public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
 		JettyWebSocketSession session = new JettyWebSocketSession(attributes, user);
 		JettyWebSocketHandlerAdapter handlerAdapter = new JettyWebSocketHandlerAdapter(handler, session);
 
+		JettyWebSocketCreator webSocketCreator = (upgradeRequest, upgradeResponse) -> {
+			if (selectedProtocol != null) {
+				upgradeResponse.setAcceptedSubProtocol(selectedProtocol);
+			}
+			return handlerAdapter;
+		};
+
+		JettyWebSocketServerContainer container = JettyWebSocketServerContainer.getContainer(servletContext);
+
 		try {
-			Object creator = createJettyWebSocketCreator(handlerAdapter, selectedProtocol);
-			Object container = ReflectionUtils.invokeMethod(getContainerMethod, null, servletContext);
-			ReflectionUtils.invokeMethod(upgradeMethod, container, creator, servletRequest, servletResponse);
+			container.upgrade(webSocketCreator, servletRequest, servletResponse);
 		}
 		catch (UndeclaredThrowableException ex) {
 			throw new HandshakeFailureException("Failed to upgrade", ex.getUndeclaredThrowable());
@@ -126,40 +99,5 @@ public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
 		}
 	}
 
-	private static Object createJettyWebSocketCreator(
-			JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
-
-		ProxyFactory factory = new ProxyFactory(EmptyTargetSource.INSTANCE);
-		factory.addInterface(webSocketCreatorClass);
-		factory.addAdvice(new WebSocketCreatorInterceptor(adapter, protocol));
-		return factory.getProxy();
-	}
-
-
-	/**
-	 * Proxy for a JettyWebSocketCreator to supply the WebSocket handler and set the sub-protocol.
-	 */
-	private static class WebSocketCreatorInterceptor implements MethodInterceptor {
-
-		private final JettyWebSocketHandlerAdapter adapter;
-
-		@Nullable
-		private final String protocol;
-
-		public WebSocketCreatorInterceptor(JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
-			this.adapter = adapter;
-			this.protocol = protocol;
-		}
-
-		@Nullable
-		@Override
-		public Object invoke(@NonNull MethodInvocation invocation) {
-			if (this.protocol != null) {
-				ReflectionUtils.invokeMethod(
-						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
-			}
-			return this.adapter;
-		}
-	}
 
 }
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
index abe8c4d09591..67a677177948 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
@@ -27,6 +27,7 @@
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
@@ -57,6 +58,7 @@ public void deployConfig(WebApplicationContext wac, Filter... filters) {
 		ServletHolder servletHolder = new ServletHolder(new DispatcherServlet(wac));
 		this.contextHandler = new ServletContextHandler();
 		this.contextHandler.addServlet(servletHolder, "/");
+		this.contextHandler.addServletContainerInitializer(new JettyWebSocketServletContainerInitializer());
 		for (Filter filter : filters) {
 			this.contextHandler.addFilter(new FilterHolder(filter), "/*", getDispatcherTypes());
 		}

From 513cc1576e5860b5bd953351850cabd1a0d6e385 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2021 12:51:51 +0100
Subject: [PATCH 115/735] Fix Jetty WebSocket test failures for WebFlux

See gh-27424
---
 spring-web/spring-web.gradle                  |  1 +
 .../reactive/bootstrap/JettyHttpServer.java   |  4 +-
 .../socket/client/JettyWebSocketClient.java   |  1 +
 .../upgrade/JettyRequestUpgradeStrategy.java  | 95 +++----------------
 4 files changed, 19 insertions(+), 82 deletions(-)

diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index f0e341db5d0a..f066790df20c 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -82,4 +82,5 @@ dependencies {
 	testFixturesImplementation("org.bouncycastle:bcpkix-jdk15on") {
 		because("needed by Netty's SelfSignedCertificate on JDK 15+")
 	}
+	testFixturesImplementation("org.eclipse.jetty.websocket:websocket-jetty-server")
 }
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java
index 93f828bc3ddf..8b307134acfb 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 
 import org.springframework.http.server.reactive.JettyHttpHandlerAdapter;
 import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
@@ -45,6 +46,7 @@ protected void initServer() throws Exception {
 
 		this.contextHandler = new ServletContextHandler(this.jettyServer, "", false, false);
 		this.contextHandler.addServlet(servletHolder, "/");
+		this.contextHandler.addServletContainerInitializer(new JettyWebSocketServletContainerInitializer());
 		this.contextHandler.start();
 
 		ServerConnector connector = new ServerConnector(this.jettyServer);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
index 4c98f03937e2..b95b7728bcf1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
@@ -142,6 +142,7 @@ private Mono<Void> executeInternal(URI url, HttpHeaders headers, WebSocketHandle
 			Object jettyHandler = createHandler(
 					url, ContextWebSocketHandler.decorate(handler, contextView), completionSink);
 			ClientUpgradeRequest request = new ClientUpgradeRequest();
+			request.setHeaders(headers);
 			request.setSubProtocols(handler.getSubProtocols());
 			try {
 				this.jettyClient.connect(jettyHandler, url, request);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
index b230bb587e98..c95782934866 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
@@ -16,27 +16,21 @@
 
 package org.springframework.web.reactive.socket.server.upgrade;
 
-import java.lang.reflect.Method;
 import java.util.function.Supplier;
 
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
+import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;
+import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
 import reactor.core.publisher.Mono;
 
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.aop.target.EmptyTargetSource;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
-import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.reactive.socket.HandshakeInfo;
 import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.reactive.socket.adapter.ContextWebSocketHandler;
@@ -53,36 +47,6 @@
  */
 public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy {
 
-	private static final Class<?> webSocketCreatorClass;
-
-	private static final Method getContainerMethod;
-
-	private static final Method upgradeMethod;
-
-	private static final Method setAcceptedSubProtocol;
-
-	static {
-		// TODO: can switch to non-reflective implementation now
-
-		ClassLoader loader = JettyRequestUpgradeStrategy.class.getClassLoader();
-		try {
-			webSocketCreatorClass = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketCreator");
-
-			Class<?> type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer");
-			getContainerMethod = type.getMethod("getContainer", ServletContext.class);
-			Method upgrade = ReflectionUtils.findMethod(type, "upgrade", (Class<?>[]) null);
-			Assert.state(upgrade != null, "Upgrade method not found");
-			upgradeMethod = upgrade;
-
-			type = loader.loadClass("org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse");
-			setAcceptedSubProtocol = type.getMethod("setAcceptedSubProtocol", String.class);
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException("No compatible Jetty version found", ex);
-		}
-	}
-
-
 	@Override
 	public Mono<Void> upgrade(
 			ServerWebExchange exchange, WebSocketHandler handler,
@@ -98,62 +62,31 @@ public Mono<Void> upgrade(
 		HandshakeInfo handshakeInfo = handshakeInfoFactory.get();
 		DataBufferFactory factory = response.bufferFactory();
 
-		// Trigger WebFlux preCommit actions and upgrade
+		// Trigger WebFlux preCommit actions before upgrade
 		return exchange.getResponse().setComplete()
 				.then(Mono.deferContextual(contextView -> {
 					JettyWebSocketHandlerAdapter adapter = new JettyWebSocketHandlerAdapter(
 							ContextWebSocketHandler.decorate(handler, contextView),
 							session -> new JettyWebSocketSession(session, handshakeInfo, factory));
 
+					JettyWebSocketCreator webSocketCreator = (upgradeRequest, upgradeResponse) -> {
+						if (subProtocol != null) {
+							upgradeResponse.setAcceptedSubProtocol(subProtocol);
+						}
+						return adapter;
+					};
+
+					JettyWebSocketServerContainer container = JettyWebSocketServerContainer.getContainer(servletContext);
+
 					try {
-						Object creator = createJettyWebSocketCreator(adapter, subProtocol);
-						Object container = ReflectionUtils.invokeMethod(getContainerMethod, null, servletContext);
-						ReflectionUtils.invokeMethod(upgradeMethod, container, creator, servletRequest, servletResponse);
+						container.upgrade(webSocketCreator, servletRequest, servletResponse);
 					}
 					catch (Exception ex) {
 						return Mono.error(ex);
 					}
+
 					return Mono.empty();
 				}));
 	}
 
-	private static Object createJettyWebSocketCreator(
-			JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
-
-		ProxyFactory factory = new ProxyFactory(EmptyTargetSource.INSTANCE);
-		factory.addInterface(webSocketCreatorClass);
-		factory.addAdvice(new WebSocketCreatorInterceptor(adapter, protocol));
-		return factory.getProxy();
-	}
-
-
-	/**
-	 * Proxy for a JettyWebSocketCreator to supply the WebSocket handler and set the sub-protocol.
-	 */
-	private static class WebSocketCreatorInterceptor implements MethodInterceptor {
-
-		private final JettyWebSocketHandlerAdapter adapter;
-
-		@Nullable
-		private final String protocol;
-
-
-		public WebSocketCreatorInterceptor(
-				JettyWebSocketHandlerAdapter adapter, @Nullable String protocol) {
-
-			this.adapter = adapter;
-			this.protocol = protocol;
-		}
-
-		@Nullable
-		@Override
-		public Object invoke(@NonNull MethodInvocation invocation) {
-			if (this.protocol != null) {
-				ReflectionUtils.invokeMethod(
-						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
-			}
-			return this.adapter;
-		}
-	}
-
 }

From 853ab5d67b3336ae73ad962da7a60b19cc455667 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2021 12:52:41 +0100
Subject: [PATCH 116/735] Fix Jetty 10+ test failure related to empty path
 handling

See gh-27424
---
 .../server/reactive/ErrorHandlerIntegrationTests.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java
index 79d0158eae99..f91779cba1be 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java
@@ -27,6 +27,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
+import org.springframework.web.testfixture.http.server.reactive.bootstrap.JettyHttpServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -80,7 +81,14 @@ void emptyPathSegments(HttpServer httpServer) throws Exception {
 		URI url = new URI("http://localhost:" + port + "//");
 		ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
 
-		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		// Jetty 10+ rejects empty path segments, see https://github.com/eclipse/jetty.project/issues/6302,
+		// but an application can apply CompactPathRule via RewriteHandler:
+		// https://www.eclipse.org/jetty/documentation/jetty-11/programming_guide.php
+
+		HttpStatus expectedStatus =
+				(httpServer instanceof JettyHttpServer ? HttpStatus.BAD_REQUEST : HttpStatus.OK);
+
+		assertThat(response.getStatusCode()).isEqualTo(expectedStatus);
 	}
 
 

From 8b5f5d9f653d0656787e285065f5bdd66fc9427e Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2021 14:37:45 +0100
Subject: [PATCH 117/735] Fix multipart request test with Jetty server

See gh-27424
---
 .../annotation/RequestPartIntegrationTests.java   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
index 4370f9a471e5..dd45fd080139 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
@@ -139,17 +139,16 @@ public void standardMultipartResolver() throws Exception {
 
 	@Test  // SPR-13319
 	public void standardMultipartResolverWithEncodedFileName() throws Exception {
-		byte[] boundary = MimeTypeUtils.generateMultipartBoundary();
-		String boundaryText = new String(boundary, "US-ASCII");
+		String boundaryText = MimeTypeUtils.generateMultipartBoundaryString();
 		Map<String, String> params = Collections.singletonMap("boundary", boundaryText);
 
 		String content =
-				"--" + boundaryText + "\n" +
-				"Content-Disposition: form-data; name=\"file\"; filename*=\"utf-8''%C3%A9l%C3%A8ve.txt\"\n" +
-				"Content-Type: text/plain\n" +
-				"Content-Length: 7\n" +
-				"\n" +
-				"content\n" +
+				"--" + boundaryText + "\r\n" +
+				"Content-Disposition: form-data; name=\"file\"; filename*=\"utf-8''%C3%A9l%C3%A8ve.txt\"\r\n" +
+				"Content-Type: text/plain\r\n" +
+				"Content-Length: 7\r\n" +
+				"\r\n" +
+				"content\r\n" +
 				"--" + boundaryText + "--";
 
 		RequestEntity<byte[]> requestEntity =

From 01426481ea0287a7f2cf889493919031dcd41b14 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2021 14:38:13 +0100
Subject: [PATCH 118/735] Enforce timeout in WebFlux multipart tests

---
 .../function/MultipartIntegrationTests.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
index a1f28b1b63fe..76c8b51bf46b 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.Map;
 
 import reactor.core.publisher.Mono;
@@ -72,7 +73,8 @@ void multipartData(HttpServer httpServer) throws Exception {
 		StepVerifier
 				.create(result)
 				.consumeNextWith(entity -> assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK))
-				.verifyComplete();
+				.expectComplete()
+				.verify(Duration.ofSeconds(5));
 	}
 
 	@ParameterizedHttpServerTest
@@ -89,7 +91,8 @@ void parts(HttpServer httpServer) throws Exception {
 		StepVerifier
 				.create(result)
 				.consumeNextWith(entity -> assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK))
-				.verifyComplete();
+				.expectComplete()
+				.verify(Duration.ofSeconds(5));
 	}
 
 	@ParameterizedHttpServerTest
@@ -119,7 +122,8 @@ void transferTo(HttpServer httpServer) throws Exception {
 						fail("IOException", ex);
 					}
 				})
-				.verifyComplete();
+				.expectComplete()
+				.verify(Duration.ofSeconds(5));
 	}
 
 	private MultiValueMap<String, HttpEntity<?>> generateBody() {
@@ -193,8 +197,7 @@ private Mono<Path> createTempFile() {
 				catch (IOException ex) {
 					return Mono.error(ex);
 				}
-			})
-					.subscribeOn(Schedulers.boundedElastic());
+			}).subscribeOn(Schedulers.boundedElastic());
 		}
 
 	}

From 958eb0f964ddef1ff1440fd10c5cb850f6ee96db Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 17 Sep 2021 14:54:09 +0100
Subject: [PATCH 119/735] Revert temporary exclusion of failing Jetty 11 tests

Closes gh-27424

This reverts commit 5eac8555d9b115b40d6de6b2c8f935ffc35864de.
---
 build.gradle | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index b96029abf6cb..c6cdde1364e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -299,18 +299,6 @@ configure([rootProject] + javaProjects) { project ->
 	test {
 		useJUnitPlatform()
 		include(["**/*Tests.class", "**/*Test.class"])
-		// TODO Enable excluded tests (https://github.com/spring-projects/spring-framework/issues/27424)
-		filter {
-			excludeTestsMatching("*ErrorHandlerIntegrationTests")
-			excludeTestsMatching("*RequestPartIntegrationTests")
-			excludeTestsMatching("*WebSocketConfigurationTests")
-			excludeTestsMatching("*WebSocketHandshakeTests")
-			excludeTestsMatching("*StompWebSocketIntegrationTests")
-			excludeTestsMatching("*RequestMappingIntegrationTests")
-			excludeTestsMatching("*CrossOriginAnnotationIntegrationTests")
-			excludeTestsMatching("*NestedRouteIntegrationTests")
-			excludeTestsMatching("*WebSocketIntegrationTests")
-		}
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
 		systemProperty("io.netty.leakDetection.level", "paranoid")

From 0b552a3534e080ca842c7f08a9950233ce56e72e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 15 Sep 2021 14:15:59 +0200
Subject: [PATCH 120/735] Migrate to TestNG Engine for the JUnit Platform in
 spring-test

Prior to this commit, we had configured separate test tasks for JUnit
and TestNG. In addition, we configured a standard `test` task that
depended on the `junit` and `testNG` tasks, and we had an additional
`aggregateTestReports` task that aggregated the reports from the JUnit
and TestNG test tasks.

Thanks to the introduction of the "TestNG Engine for the JUnit
Platform", this commit simplifies our Gradle build in the spring-test
module by running JUnit 4, JUnit Jupiter, and TestNG tests on the JUnit
Platform in a single Gradle `test` task.

See gh-27406
---
 build.gradle                   |  1 +
 spring-test/spring-test.gradle | 34 +++++++---------------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8a3207ccc859..e59131307316 100644
--- a/build.gradle
+++ b/build.gradle
@@ -188,6 +188,7 @@ configure(allprojects) { project ->
 				exclude group: "junit", name: "junit"
 			}
 			dependency "org.testng:testng:7.4.0"
+			dependency "org.junit.support:testng-engine:1.0.1"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
 			dependency "org.assertj:assertj-core:3.20.2"
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 365ce7d316f9..026507a0281b 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -77,43 +77,23 @@ dependencies {
 	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
 		exclude group: "junit", module: "junit"
 	}
+	testRuntimeOnly("org.junit.support:testng-engine")
 	testRuntimeOnly("org.glassfish:javax.el")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
 
-task junit(type: Test) {
-	description = "Runs JUnit 4 and JUnit Jupiter tests."
+test {
+	description = "Runs JUnit 4, JUnit Jupiter, and TestNG tests."
 	useJUnitPlatform {
+		includeEngines "junit-vintage", "junit-jupiter", "testng"
 		excludeTags "failing-test-case"
 	}
+	// We use `include` instead of `filter.includeTestsMatching`, since
+	// the latter results in some tests being executed/reported
+	// multiple times.
 	include(["**/*Tests.class", "**/*Test.class"])
-	exclude(["**/testng/**/*.*"])
 	systemProperty("testGroups", project.properties.get("testGroups"))
 	// Java Util Logging for the JUnit Platform.
 	// systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 }
-
-task testNG(type: Test) {
-	description = "Runs TestNG tests."
-	useTestNG()
-	include(["**/testng/**/*Tests.class", "**/testng/**/*Test.class"])
-	systemProperty("testGroups", project.properties.get("testGroups"))
-	// Show STD_OUT & STD_ERR of the test JVM(s) on the console:
-	// testLogging.showStandardStreams = true
-	// forkEvery 1
-}
-
-test {
-	description = "Runs all tests."
-	dependsOn junit, testNG
-	exclude(["**/*.*"])
-}
-
-task aggregateTestReports(type: TestReport) {
-	description = "Aggregates JUnit and TestNG test reports."
-	destinationDir = test.reports.html.outputLocation.get().getAsFile()
-	reportOn junit, testNG
-}
-
-check.dependsOn aggregateTestReports

From e29867b96e835a53d0222ad666273b5e93c800a6 Mon Sep 17 00:00:00 2001
From: Marc Philipp <marc@gradle.com>
Date: Wed, 15 Sep 2021 16:08:36 +0200
Subject: [PATCH 121/735] Exclude TestCase classes in spring-test build

When not excluded, TestNG will pick up nested TestCase classes and run
them.

This commit therefore filters out `*TestCase` test classes from the
build since these are not intended to be executed with the build.

See gh-27406
---
 spring-test/spring-test.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 026507a0281b..0bc316636a7a 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -93,6 +93,7 @@ test {
 	// the latter results in some tests being executed/reported
 	// multiple times.
 	include(["**/*Tests.class", "**/*Test.class"])
+	filter.excludeTestsMatching("*TestCase")
 	systemProperty("testGroups", project.properties.get("testGroups"))
 	// Java Util Logging for the JUnit Platform.
 	// systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")

From e439d6f64da2d616f2c6345444b1c7dd5640801b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 20 Sep 2021 14:54:25 +0200
Subject: [PATCH 122/735] Upgrade to AssertJ 3.21.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e59131307316..33b6227dabb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -191,7 +191,7 @@ configure(allprojects) { project ->
 			dependency "org.junit.support:testng-engine:1.0.1"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.20.2"
+			dependency "org.assertj:assertj-core:3.21.0"
 			dependencySet(group: 'org.xmlunit', version: '2.8.2') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {

From 3beb07427817069d405f22729c4f0c35b67f7948 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 21 Sep 2021 09:13:06 +0200
Subject: [PATCH 123/735] Remove support for RxJava 1.x

Also removes unnecessary flowPublisherPresent check on JDK 9+, depending on Reactor presence for its JDK Flow adapter instead.

Closes gh-27443
---
 build.gradle                                  |  2 -
 spring-core/spring-core.gradle                |  2 -
 .../core/ReactiveAdapterRegistry.java         | 66 ++++---------------
 .../core/ReactiveAdapterRegistryTests.java    | 64 +-----------------
 4 files changed, 13 insertions(+), 121 deletions(-)

diff --git a/build.gradle b/build.gradle
index b02938e84c90..42f5225e9b92 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,8 +64,6 @@ configure(allprojects) { project ->
 				entry 'groovy-xml'
 			}
 
-			dependency "io.reactivex:rxjava:1.3.8"
-			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
 			dependency "io.smallrye.reactive:mutiny:1.0.0"
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index de0f6a756e08..43ab833ddfe3 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -44,8 +44,6 @@ dependencies {
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("io.projectreactor:reactor-core")
-	optional("io.reactivex:rxjava")
-	optional("io.reactivex:rxjava-reactive-streams")
 	optional("io.reactivex.rxjava2:rxjava")
 	optional("io.reactivex.rxjava3:rxjava")
 	optional("io.smallrye.reactive:mutiny")
diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index 5010538b6f67..37fc922b5b59 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -32,7 +32,6 @@
 import reactor.blockhound.integration.BlockHoundIntegration;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import rx.RxReactiveStreams;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
@@ -44,15 +43,12 @@
  * {@code Observable}, and others.
  *
  * <p>By default, depending on classpath availability, adapters are registered
- * for Reactor, RxJava 2/3, or RxJava 1 (+ RxJava Reactive Streams bridge),
- * {@link CompletableFuture}, Java 9+ {@code Flow.Publisher}, and Kotlin
- * Coroutines' {@code Deferred} and {@code Flow}.
- *
- * <p><strong>Note:</strong> As of Spring Framework 5.3, support for RxJava 1.x
- * is deprecated in favor of RxJava 2 and 3.
+ * for Reactor, RxJava 2/3, {@link CompletableFuture}, {@code Flow.Publisher},
+ * and Kotlin Coroutines' {@code Deferred} and {@code Flow}.
  *
  * @author Rossen Stoyanchev
  * @author Sebastien Deleuze
+ * @author Juergen Hoeller
  * @since 5.0
  */
 public class ReactiveAdapterRegistry {
@@ -62,14 +58,10 @@ public class ReactiveAdapterRegistry {
 
 	private static final boolean reactorPresent;
 
-	private static final boolean rxjava1Present;
-
 	private static final boolean rxjava2Present;
 
 	private static final boolean rxjava3Present;
 
-	private static final boolean flowPublisherPresent;
-
 	private static final boolean kotlinCoroutinesPresent;
 
 	private static final boolean mutinyPresent;
@@ -77,11 +69,8 @@ public class ReactiveAdapterRegistry {
 	static {
 		ClassLoader classLoader = ReactiveAdapterRegistry.class.getClassLoader();
 		reactorPresent = ClassUtils.isPresent("reactor.core.publisher.Flux", classLoader);
-		rxjava1Present = ClassUtils.isPresent("rx.Observable", classLoader) &&
-				ClassUtils.isPresent("rx.RxReactiveStreams", classLoader);
 		rxjava2Present = ClassUtils.isPresent("io.reactivex.Flowable", classLoader);
 		rxjava3Present = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", classLoader);
-		flowPublisherPresent = ClassUtils.isPresent("java.util.concurrent.Flow.Publisher", classLoader);
 		kotlinCoroutinesPresent = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", classLoader);
 		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Multi", classLoader);
 	}
@@ -97,29 +86,17 @@ public ReactiveAdapterRegistry() {
 		// Reactor
 		if (reactorPresent) {
 			new ReactorRegistrar().registerAdapters(this);
+			new ReactorJdkFlowAdapterRegistrar().registerAdapter(this);
 		}
 
-		// RxJava1 (deprecated)
-		if (rxjava1Present) {
-			new RxJava1Registrar().registerAdapters(this);
-		}
-
-		// RxJava2
+		// RxJava
 		if (rxjava2Present) {
 			new RxJava2Registrar().registerAdapters(this);
 		}
-		// RxJava3
 		if (rxjava3Present) {
 			new RxJava3Registrar().registerAdapters(this);
 		}
 
-		// Java 9+ Flow.Publisher
-		if (flowPublisherPresent) {
-			new ReactorJdkFlowAdapterRegistrar().registerAdapter(this);
-		}
-		// If not present, do nothing for the time being...
-		// We can fall back on "reactive-streams-flow-bridge" (once released)
-
 		// Kotlin Coroutines
 		if (reactorPresent && kotlinCoroutinesPresent) {
 			new CoroutinesRegistrar().registerAdapters(this);
@@ -253,23 +230,14 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 	}
 
 
-	private static class RxJava1Registrar {
+	private static class ReactorJdkFlowAdapterRegistrar {
 
-		void registerAdapters(ReactiveAdapterRegistry registry) {
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.multiValue(rx.Observable.class, rx.Observable::empty),
-					source -> RxReactiveStreams.toPublisher((rx.Observable<?>) source),
-					RxReactiveStreams::toObservable
-			);
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.singleRequiredValue(rx.Single.class),
-					source -> RxReactiveStreams.toPublisher((rx.Single<?>) source),
-					RxReactiveStreams::toSingle
-			);
+		void registerAdapter(ReactiveAdapterRegistry registry) {
+			Flow.Publisher<?> emptyFlow = JdkFlowAdapter.publisherToFlowPublisher(Flux.empty());
 			registry.registerReactiveType(
-					ReactiveTypeDescriptor.noValue(rx.Completable.class, rx.Completable::complete),
-					source -> RxReactiveStreams.toPublisher((rx.Completable) source),
-					RxReactiveStreams::toCompletable
+					ReactiveTypeDescriptor.multiValue(Flow.Publisher.class, () -> emptyFlow),
+					source -> JdkFlowAdapter.flowPublisherToFlux((Flow.Publisher<?>) source),
+					JdkFlowAdapter::publisherToFlowPublisher
 			);
 		}
 	}
@@ -347,18 +315,6 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 		}
 	}
 
-	private static class ReactorJdkFlowAdapterRegistrar {
-
-		void registerAdapter(ReactiveAdapterRegistry registry) {
-			Flow.Publisher<?> emptyFlow = JdkFlowAdapter.publisherToFlowPublisher(Flux.empty());
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.multiValue(Flow.Publisher.class, () -> emptyFlow),
-					source -> JdkFlowAdapter.flowPublisherToFlux((Flow.Publisher<?>) source),
-					JdkFlowAdapter::publisherToFlowPublisher
-			);
-		}
-	}
-
 
 	/**
 	 * ReactiveAdapter variant that wraps adapted Publishers as {@link Flux} or
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index 579e1a463afc..ea73cfbd7be0 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
 
 /**
  * Unit tests for {@link ReactiveAdapterRegistry}.
+ *
  * @author Rossen Stoyanchev
  */
 @SuppressWarnings("unchecked")
@@ -117,67 +118,6 @@ void fromCompletableFuture() {
 		}
 	}
 
-	@Nested
-	class RxJava1 {
-
-		@Test
-		void defaultAdapterRegistrations() {
-			assertThat(getAdapter(rx.Observable.class)).isNotNull();
-			assertThat(getAdapter(rx.Single.class)).isNotNull();
-			assertThat(getAdapter(rx.Completable.class)).isNotNull();
-		}
-
-		@Test
-		void toObservable() {
-			List<Integer> sequence = Arrays.asList(1, 2, 3);
-			Publisher<Integer> source = Flux.fromIterable(sequence);
-			Object target = getAdapter(rx.Observable.class).fromPublisher(source);
-			assertThat(target instanceof rx.Observable).isTrue();
-			assertThat(((rx.Observable<?>) target).toList().toBlocking().first()).isEqualTo(sequence);
-		}
-
-		@Test
-		void toSingle() {
-			Publisher<Integer> source = Flux.fromArray(new Integer[] {1});
-			Object target = getAdapter(rx.Single.class).fromPublisher(source);
-			assertThat(target instanceof rx.Single).isTrue();
-			assertThat(((rx.Single<Integer>) target).toBlocking().value()).isEqualTo(Integer.valueOf(1));
-		}
-
-		@Test
-		void toCompletable() {
-			Publisher<Integer> source = Flux.fromArray(new Integer[] {1, 2, 3});
-			Object target = getAdapter(rx.Completable.class).fromPublisher(source);
-			assertThat(target instanceof rx.Completable).isTrue();
-			assertThat(((rx.Completable) target).get()).isNull();
-		}
-
-		@Test
-		void fromObservable() {
-			List<Integer> sequence = Arrays.asList(1, 2, 3);
-			Object source = rx.Observable.from(sequence);
-			Object target = getAdapter(rx.Observable.class).toPublisher(source);
-			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
-		}
-
-		@Test
-		void fromSingle() {
-			Object source = rx.Single.just(1);
-			Object target = getAdapter(rx.Single.class).toPublisher(source);
-			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
-		}
-
-		@Test
-		void fromCompletable() {
-			Object source = rx.Completable.complete();
-			Object target = getAdapter(rx.Completable.class).toPublisher(source);
-			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(ONE_SECOND);
-		}
-	}
-
 	@Nested
 	class RxJava2 {
 

From 40c51efee806fbb36de4f3337d76c36cb31aac65 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 10:33:25 +0200
Subject: [PATCH 124/735] Introduce @Suite for TestNG tests

In order to allow developers to execute TestNG tests in Eclipse IDE
without installing the TestNG plugin for Eclipse, this commit introduces
a JUnit Platform @Suite class that can be executed within the IDE.

See gh-27407
---
 .../test/context/testng/TestNGTestSuite.java  | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/TestNGTestSuite.java

diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TestNGTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/testng/TestNGTestSuite.java
new file mode 100644
index 000000000000..4e63b116cd72
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/TestNGTestSuite.java
@@ -0,0 +1,46 @@
+/*
+ * 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.test.context.testng;
+
+import org.junit.platform.suite.api.IncludeEngines;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+/**
+ * JUnit Platform based test suite for tests written in TestNG that involve the
+ * Spring TestContext Framework.
+ *
+ * <p><strong>This suite is only intended to be used manually within an IDE.</strong>
+ *
+ * <h3>Logging Configuration</h3>
+ *
+ * <p>In order for our log4j2 configuration to be used in an IDE, you must set the
+ * following system property before running any tests &mdash; for example, in
+ * <em>Run Configurations</em> in Eclipse.
+ *
+ * <pre style="code">
+ * -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
+ * </pre>
+ *
+ * @author Sam Brannen
+ * @since 5.3.11
+ */
+@Suite
+@IncludeEngines("testng")
+@SelectPackages("org.springframework.test.context.testng")
+class TestNGTestSuite {
+}

From 28496059bca970fddf5591a3dba8533166b4aaf3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 10:35:34 +0200
Subject: [PATCH 125/735] Make TestNG test methods public due to bug in TestNG
 TestEngine

This commit makes all test methods in our TestNG test classes public
due to the following bug in the TestNG engine for the JUnit Platform.

https://github.com/junit-team/testng-engine/issues/16

See gh-27407
---
 ...AnnotationConfigTestNGSpringContextTests.java |  2 +-
 ...figTransactionalTestNGSpringContextTests.java |  4 ++--
 ...eteTransactionalTestNGSpringContextTests.java | 16 ++++++++--------
 .../TestNGApplicationEventsIntegrationTests.java |  4 ++--
 ...tExecutionListenerTestNGIntegrationTests.java |  4 ++--
 .../testng/web/TestNGSpringContextWebTests.java  |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTestNGSpringContextTests.java
index f36352cc9ffe..f334fb4f110e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTestNGSpringContextTests.java
@@ -48,7 +48,7 @@ public class AnnotationConfigTestNGSpringContextTests extends AbstractTestNGSpri
 	Pet pet;
 
 	@Test
-	void autowiringFromConfigClass() {
+	public void autowiringFromConfigClass() {
 		assertThat(employee).as("The employee should have been autowired.").isNotNull();
 		assertThat(employee.getName()).isEqualTo("John Smith");
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
index eadcee96e89f..9b324b42d72f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
@@ -112,7 +112,7 @@ void afterClass() {
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void autowiringFromConfigClass() {
+	public void autowiringFromConfigClass() {
 		assertThat(employee).as("The employee should have been autowired.").isNotNull();
 		assertThat(employee.getName()).isEqualTo("John Smith");
 
@@ -136,7 +136,7 @@ void setUp() throws Exception {
 	}
 
 	@Test
-	void modifyTestDataWithinTransaction() {
+	public void modifyTestDataWithinTransaction() {
 		assertThatTransaction().isActive();
 		assertAddPerson(JANE);
 		assertAddPerson(SUE);
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
index 3da61007d1ee..f80cc68867aa 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
@@ -151,7 +151,7 @@ void afterTransaction() {
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void verifyBeanNameSet() {
+	public void verifyBeanNameSet() {
 		assertThatTransaction().isNotActive();
 		assertThat(this.beanName)
 			.as("The bean name of this test instance should have been set to the fully qualified class name due to BeanNameAware semantics.")
@@ -160,7 +160,7 @@ void verifyBeanNameSet() {
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void verifyApplicationContextSet() {
+	public void verifyApplicationContextSet() {
 		assertThatTransaction().isNotActive();
 		assertThat(super.applicationContext)
 			.as("The application context should have been set due to ApplicationContextAware semantics.")
@@ -171,7 +171,7 @@ void verifyApplicationContextSet() {
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void verifyBeanInitialized() {
+	public void verifyBeanInitialized() {
 		assertThatTransaction().isNotActive();
 		assertThat(beanInitialized)
 			.as("This test instance should have been initialized due to InitializingBean semantics.")
@@ -180,7 +180,7 @@ void verifyBeanInitialized() {
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void verifyAnnotationAutowiredFields() {
+	public void verifyAnnotationAutowiredFields() {
 		assertThatTransaction().isNotActive();
 		assertThat(nonrequiredLong).as("The nonrequiredLong field should NOT have been autowired.").isNull();
 		assertThat(pet).as("The pet field should have been autowired.").isNotNull();
@@ -189,7 +189,7 @@ void verifyAnnotationAutowiredFields() {
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void verifyAnnotationAutowiredMethods() {
+	public void verifyAnnotationAutowiredMethods() {
 		assertThatTransaction().isNotActive();
 		assertThat(employee).as("The setEmployee() method should have been autowired.").isNotNull();
 		assertThat(employee.getName()).as("employee's name.").isEqualTo("John Smith");
@@ -197,20 +197,20 @@ void verifyAnnotationAutowiredMethods() {
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void verifyResourceAnnotationInjectedFields() {
+	public void verifyResourceAnnotationInjectedFields() {
 		assertThatTransaction().isNotActive();
 		assertThat(foo).as("The foo field should have been injected via @Resource.").isEqualTo("Foo");
 	}
 
 	@Test
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	void verifyResourceAnnotationInjectedMethods() {
+	public void verifyResourceAnnotationInjectedMethods() {
 		assertThatTransaction().isNotActive();
 		assertThat(bar).as("The setBar() method should have been injected via @Resource.").isEqualTo("Bar");
 	}
 
 	@Test
-	void modifyTestDataWithinTransaction() {
+	public void modifyTestDataWithinTransaction() {
 		assertThatTransaction().isActive();
 		assertAddPerson(JANE);
 		assertAddPerson(SUE);
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsIntegrationTests.java
index e7f32e5ebc35..67748d840947 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/event/TestNGApplicationEventsIntegrationTests.java
@@ -72,12 +72,12 @@ void beforeEach() {
 	}
 
 	@Test
-	void test1() {
+	public void test1() {
 		assertTestExpectations("test1");
 	}
 
 	@Test
-	void test2() {
+	public void test2() {
 		assertTestExpectations("test2");
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java
index 9141c93f2e7c..6602f00caf4d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java
@@ -57,7 +57,7 @@ static class Config {
 	 * @see #ensureMocksAreReinjectedBetweenTests_2
 	 */
 	@Test
-	void ensureMocksAreReinjectedBetweenTests_1() {
+	public void ensureMocksAreReinjectedBetweenTests_1() {
 		assertInjectedServletRequestEqualsRequestInRequestContextHolder();
 	}
 
@@ -67,7 +67,7 @@ void ensureMocksAreReinjectedBetweenTests_1() {
 	 * @see #ensureMocksAreReinjectedBetweenTests_1
 	 */
 	@Test
-	void ensureMocksAreReinjectedBetweenTests_2() {
+	public void ensureMocksAreReinjectedBetweenTests_2() {
 		assertInjectedServletRequestEqualsRequestInRequestContextHolder();
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
index 14bead449f18..1ca10f399ba0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
@@ -89,7 +89,7 @@ public void setServletContext(ServletContext servletContext) {
 	}
 
 	@Test
-	void basicWacFeatures() throws Exception {
+	public void basicWacFeatures() throws Exception {
 		assertThat(wac.getServletContext()).as("ServletContext should be set in the WAC.").isNotNull();
 
 		assertThat(servletContext).as("ServletContext should have been set via ServletContextAware.").isNotNull();
@@ -114,7 +114,7 @@ void basicWacFeatures() throws Exception {
 	}
 
 	@Test
-	void fooEnigmaAutowired() {
+	public void fooEnigmaAutowired() {
 		assertThat(foo).isEqualTo("enigma");
 	}
 

From 070d087dbcc96360887fc6e97064c3cd2480881d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 11:30:30 +0200
Subject: [PATCH 126/735] Reinstate -Werror for Groovy compilation

This commit partially reverts cf2429b0f0ce2a5278bdc2556663caf6cf0b0cae
in order to reinstate -Werror for Groovy compilation in spring-beans.

The `decorating` field in GroovyDynamicElementReader has been changed
from boolean to Boolean in order to avoid the JDK 17 deprecation warning
for use of `new Boolean(false)` which the Groovy compiler apparently
uses behind the scenes when compiling Groovy source code.
---
 spring-beans/spring-beans.gradle                               | 3 +--
 .../beans/factory/groovy/GroovyDynamicElementReader.groovy     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index 9c4d0af79e1a..3c5d34179e77 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -23,8 +23,7 @@ sourceSets {
 }
 
 compileGroovy {
-	// Groovy generates Java code with "new Boolean" usage which is deprecated on JDK 17
-	// options.compilerArgs += "-Werror"
+	options.compilerArgs += "-Werror"
 }
 
 // This module also builds Kotlin code and the compileKotlin task naturally depends on
diff --git a/spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy b/spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy
index d0171216948b..8157450773b4 100644
--- a/spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy
+++ b/spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy
@@ -40,7 +40,7 @@ class GroovyDynamicElementReader extends GroovyObjectSupport {
 
 	private final GroovyBeanDefinitionWrapper beanDefinition
 
-	protected final boolean decorating;
+	protected final Boolean decorating;
 
 	private boolean callAfterInvocation = true
 

From a37dde9a1cdc0fcd1151def147f1b02651af9928 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 12:09:05 +0200
Subject: [PATCH 127/735] Revise Eclipse/STS Project Import Guide based on
 status quo

See gh-27407
---
 gradle/ide.gradle      |  4 ----
 import-into-eclipse.md | 38 ++++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

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

From 65c1eac11531bc3ee32f580b6c1ff5fa189444b1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 12:16:06 +0200
Subject: [PATCH 128/735] Fix formatting in Eclipse/STS Project Import Guide

See gh-27407
---
 import-into-eclipse.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/import-into-eclipse.md b/import-into-eclipse.md
index c09eef05a592..00dc11a4a87e 100644
--- a/import-into-eclipse.md
+++ b/import-into-eclipse.md
@@ -24,7 +24,7 @@ _When instructed to execute `./gradlew` from the command line, be sure to execut
 1. Optionally install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) if you need to execute Kotlin-based tests or develop Kotlin extensions.
 1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project. The AspectJ Development Tools available in the Eclipse Marketplace have been tested with these instructions using STS 4.5 (Eclipse 4.14).
 1. Optionally install the [TestNG plugin](https://testng.org/doc/eclipse.html) in Eclipse if you need to execute individual TestNG test classes or tests in the `spring-test` module.
-  - As an alternative to installing the TestNG plugin, you can execute the `org.springframework.test.context.testng.TestNGTestSuite` class as a "JUnit 5" test class in Eclipse.
+   - As an alternative to installing the TestNG plugin, you can execute the `org.springframework.test.context.testng.TestNGTestSuite` class as a "JUnit 5" test class in Eclipse.
 1. Build `spring-oxm` from the command line with `./gradlew :spring-oxm:check`.
 1. To apply Spring Framework specific settings, run `./gradlew cleanEclipse eclipse` from the command line.
 1. Import all projects into Eclipse (File &#8594; Import &#8594; Gradle &#8594; Existing Gradle Project &#8594; Navigate to the locally cloned `spring-framework` directory &#8594; Select Finish).

From b0dceb484acf1c190421519a47463c7c59268d1a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 12:37:51 +0200
Subject: [PATCH 129/735] Remove Eclipse Web Tools Platform (WTP) configuration

Since the team no longer needs the ability to treat Eclipse projects as
WTP modules, this commit removes the obsolete custom WTP configuration
for importing projects into Eclipse IDE.

See gh-27407
---
 gradle/ide.gradle                             | 26 +++----------------
 src/eclipse/org.eclipse.wst.common.component  |  6 -----
 ....eclipse.wst.common.project.facet.core.xml |  7 -----
 3 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 src/eclipse/org.eclipse.wst.common.component
 delete mode 100644 src/eclipse/org.eclipse.wst.common.project.facet.core.xml

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 1dddd7d63c09..d5215f2875f2 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -69,38 +69,20 @@ eclipse.classpath.file.whenMerged {
 	}
 }
 
-// Allow projects to be used as WTP modules
-eclipse.project.natures 'org.eclipse.wst.common.project.facet.core.nature'
-
 // Include project specific settings
 task eclipseSettings(type: Copy) {
 	from rootProject.files(
-		'src/eclipse/org.eclipse.jdt.ui.prefs',
-		'src/eclipse/org.eclipse.wst.common.project.facet.core.xml')
-	into project.file('.settings/')
-	outputs.upToDateWhen { false }
-}
-
-task eclipseJdtSettings(type: Copy) {
-	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
-	into project.file('.settings/')
-	outputs.upToDateWhen { false }
-}
-
-task eclipseWstComponentSettings(type: Copy) {
-	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
+		'src/eclipse/org.eclipse.jdt.core.prefs',
+		'src/eclipse/org.eclipse.jdt.ui.prefs')
 	into project.file('.settings/')
-	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
 task cleanEclipseSettings(type: Delete) {
 	delete project.file('.settings/org.eclipse.jdt.core.prefs')
 	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
-	delete project.file('.settings/org.eclipse.wst.common.component')
-	delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
 }
 
-tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings)
-tasks['eclipseJdt'].dependsOn(eclipseJdtSettings)
+tasks['eclipse'].dependsOn(eclipseSettings)
+tasks['eclipseJdt'].dependsOn(eclipseSettings)
 tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)
diff --git a/src/eclipse/org.eclipse.wst.common.component b/src/eclipse/org.eclipse.wst.common.component
deleted file mode 100644
index ce05d97c85ee..000000000000
--- a/src/eclipse/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="${deployname}">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>
diff --git a/src/eclipse/org.eclipse.wst.common.project.facet.core.xml b/src/eclipse/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 78e8ebb782bd..000000000000
--- a/src/eclipse/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.utility"/>
-  <fixed facet="java"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.8"/>
-</faceted-project>

From 34abc8f5779e227e52ac6a7c9711564bc7a2bb14 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 13:04:29 +0200
Subject: [PATCH 130/735] The Kotlin plugin is no longer required for
 development in Eclipse

As documented, it's only required if you with to run Kotlin tests or
develop Kotlin extensions.

See gh-27407
---
 import-into-eclipse.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/import-into-eclipse.md b/import-into-eclipse.md
index 00dc11a4a87e..c1833bc13a22 100644
--- a/import-into-eclipse.md
+++ b/import-into-eclipse.md
@@ -3,7 +3,7 @@
 This document will guide you through the process of importing the Spring Framework
 projects into Eclipse or the Spring Tool Suite (_STS_). It is recommended that you
 have a recent version of Eclipse. As a bare minimum you will need Eclipse with full Java
-8 support, Eclipse Buildship, the Kotlin plugin, and the Groovy plugin.
+8 support, Eclipse Buildship, and the Groovy plugin.
 
 The following instructions have been tested against [STS](https://spring.io/tools) 4.12.0
 ([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-4120-changelog))

From 09a1b87d37d074ee1ed96bf6a71ccab44018db0b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 21 Sep 2021 14:23:02 +0200
Subject: [PATCH 131/735] About notes about AJDT and Kotlin not supported in
 Eclipse 4.21

See gh-27407
---
 import-into-eclipse.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/import-into-eclipse.md b/import-into-eclipse.md
index c1833bc13a22..fc3d36a8854b 100644
--- a/import-into-eclipse.md
+++ b/import-into-eclipse.md
@@ -22,7 +22,9 @@ _When instructed to execute `./gradlew` from the command line, be sure to execut
 1. Ensure that the _Forbidden reference (access rule)_ in Eclipse is set to `Info`
 (Preferences &#8594; Java &#8594; Compiler &#8594; Errors/Warnings &#8594; Deprecated and restricted API &#8594; Forbidden reference (access rule)).
 1. Optionally install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) if you need to execute Kotlin-based tests or develop Kotlin extensions.
-1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project. The AspectJ Development Tools available in the Eclipse Marketplace have been tested with these instructions using STS 4.5 (Eclipse 4.14).
+   - **NOTE**: As of September 21, 2021, it appears that the Kotlin Plugin for Eclipse does not yet work with Eclipse 4.21.
+1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project.
+   - **NOTE**: As of September 21, 2021, it appears that the AspectJ Development Tools do not yet work with Eclipse 4.21.
 1. Optionally install the [TestNG plugin](https://testng.org/doc/eclipse.html) in Eclipse if you need to execute individual TestNG test classes or tests in the `spring-test` module.
    - As an alternative to installing the TestNG plugin, you can execute the `org.springframework.test.context.testng.TestNGTestSuite` class as a "JUnit 5" test class in Eclipse.
 1. Build `spring-oxm` from the command line with `./gradlew :spring-oxm:check`.

From 774583dfa7dba5c3440c4a1341809ab2f3a88780 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 21 Sep 2021 17:07:42 +0200
Subject: [PATCH 132/735] Retain support for legacy
 PostConstruct/PreDestroy/Inject variants

Also removes JAX-WS support from CommonAnnotationBeanPostProcessor.

Closes gh-27444
See gh-27422
---
 build.gradle                                  |   1 -
 .../AutowiredAnnotationBeanPostProcessor.java |  26 +++-
 ...nitDestroyAnnotationBeanPostProcessor.java |   8 +-
 spring-context/spring-context.gradle          |   5 +-
 .../annotation/AnnotationConfigUtils.java     |  48 ++++--
 .../CommonAnnotationBeanPostProcessor.java    | 147 ++----------------
 .../ClassPathBeanDefinitionScannerTests.java  |  40 ++---
 7 files changed, 92 insertions(+), 183 deletions(-)

diff --git a/build.gradle b/build.gradle
index 42f5225e9b92..ac8e4863252b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -230,7 +230,6 @@ configure(allprojects) { project ->
 			dependency "jakarta.validation:jakarta.validation-api:3.0.0"
 			dependency "jakarta.websocket:jakarta.websocket-api:2.0.0"
 			dependency "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
-			dependency "jakarta.xml.ws:jakarta.xml.ws-api:3.0.1"
 
 			dependency "com.sun.activation:jakarta.activation:2.0.1"
 			dependency "com.sun.mail:jakarta.mail:2.0.1"
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index fdbf93539128..d5c753e72912 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -75,8 +75,10 @@
  * by default, Spring's {@link Autowired @Autowired} and {@link Value @Value}
  * annotations.
  *
- * <p>Also supports JSR-330's {@link jakarta.inject.Inject @Inject} annotation,
+ * <p>Also supports the common {@link jakarta.inject.Inject @Inject} annotation,
  * if available, as a direct alternative to Spring's own {@code @Autowired}.
+ * Additionally, it retains support for the {@code javax.inject.Inject} variant
+ * dating back to the original JSR-330 specification (as known from Java EE 6-8).
  *
  * <h3>Autowired Constructors</h3>
  * <p>Only one constructor of any given bean class may declare this annotation with
@@ -154,20 +156,30 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 	/**
 	 * Create a new {@code AutowiredAnnotationBeanPostProcessor} for Spring's
 	 * standard {@link Autowired @Autowired} and {@link Value @Value} annotations.
-	 * <p>Also supports JSR-330's {@link jakarta.inject.Inject @Inject} annotation,
-	 * if available.
+	 * <p>Also supports the common {@link jakarta.inject.Inject @Inject} annotation,
+	 * if available, as well as the original {@code javax.inject.Inject} variant.
 	 */
 	@SuppressWarnings("unchecked")
 	public AutowiredAnnotationBeanPostProcessor() {
 		this.autowiredAnnotationTypes.add(Autowired.class);
 		this.autowiredAnnotationTypes.add(Value.class);
+
 		try {
 			this.autowiredAnnotationTypes.add((Class<? extends Annotation>)
 					ClassUtils.forName("jakarta.inject.Inject", AutowiredAnnotationBeanPostProcessor.class.getClassLoader()));
-			logger.trace("JSR-330 'jakarta.inject.Inject' annotation found and supported for autowiring");
+			logger.trace("'jakarta.inject.Inject' annotation found and supported for autowiring");
+		}
+		catch (ClassNotFoundException ex) {
+			// jakarta.inject API not available - simply skip.
+		}
+
+		try {
+			this.autowiredAnnotationTypes.add((Class<? extends Annotation>)
+					ClassUtils.forName("javax.inject.Inject", AutowiredAnnotationBeanPostProcessor.class.getClassLoader()));
+			logger.trace("'javax.inject.Inject' annotation found and supported for autowiring");
 		}
 		catch (ClassNotFoundException ex) {
-			// JSR-330 API not available - simply skip.
+			// javax.inject API not available - simply skip.
 		}
 	}
 
@@ -177,7 +189,7 @@ public AutowiredAnnotationBeanPostProcessor() {
 	 * setter methods, and arbitrary config methods.
 	 * <p>The default autowired annotation types are the Spring-provided
 	 * {@link Autowired @Autowired} and {@link Value @Value} annotations as well
-	 * as JSR-330's {@link jakarta.inject.Inject @Inject} annotation, if available.
+	 * as the common {@code @Inject} annotation, if available.
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation type to indicate that a member is supposed
 	 * to be autowired.
@@ -193,7 +205,7 @@ public void setAutowiredAnnotationType(Class<? extends Annotation> autowiredAnno
 	 * setter methods, and arbitrary config methods.
 	 * <p>The default autowired annotation types are the Spring-provided
 	 * {@link Autowired @Autowired} and {@link Value @Value} annotations as well
-	 * as JSR-330's {@link jakarta.inject.Inject @Inject} annotation, if available.
+	 * as the common {@code @Inject} annotation, if available.
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation types to indicate that a member is supposed
 	 * to be autowired.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
index 6316848a5a77..2f1bd7763b2c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@
  * init method and destroy method, respectively.
  *
  * <p>Spring's {@link org.springframework.context.annotation.CommonAnnotationBeanPostProcessor}
- * supports the JSR-250 {@link jakarta.annotation.PostConstruct} and {@link jakarta.annotation.PreDestroy}
+ * supports the {@link jakarta.annotation.PostConstruct} and {@link jakarta.annotation.PreDestroy}
  * annotations out of the box, as init annotation and destroy annotation, respectively.
  * Furthermore, it also supports the {@link jakarta.annotation.Resource} annotation
  * for annotation-driven injection of named beans.
@@ -117,7 +117,7 @@ public boolean hasDestroyMethods() {
 	 * methods to call after configuration of a bean.
 	 * <p>Any custom annotation can be used, since there are no required
 	 * annotation attributes. There is no default, although a typical choice
-	 * is the JSR-250 {@link jakarta.annotation.PostConstruct} annotation.
+	 * is the {@link jakarta.annotation.PostConstruct} annotation.
 	 */
 	public void setInitAnnotationType(Class<? extends Annotation> initAnnotationType) {
 		this.initAnnotationType = initAnnotationType;
@@ -128,7 +128,7 @@ public void setInitAnnotationType(Class<? extends Annotation> initAnnotationType
 	 * methods to call when the context is shutting down.
 	 * <p>Any custom annotation can be used, since there are no required
 	 * annotation attributes. There is no default, although a typical choice
-	 * is the JSR-250 {@link jakarta.annotation.PreDestroy} annotation.
+	 * is the {@link jakarta.annotation.PreDestroy} annotation.
 	 */
 	public void setDestroyAnnotationType(Class<? extends Annotation> destroyAnnotationType) {
 		this.destroyAnnotationType = destroyAnnotationType;
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 9e4cf72ca954..f7bb843fcc17 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -14,9 +14,8 @@ dependencies {
 	optional("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api")
 	optional("jakarta.inject:jakarta.inject-api")
 	optional("jakarta.interceptor:jakarta.interceptor-api")
-	optional("javax.money:money-api")
 	optional("jakarta.validation:jakarta.validation-api")
-	optional("jakarta.xml.ws:jakarta.xml.ws-api")
+	optional("javax.money:money-api")
 	optional("org.aspectj:aspectjweaver")
 	optional("org.codehaus.groovy:groovy")
 	optional("org.apache-extras.beanshell:bsh")
@@ -32,8 +31,8 @@ dependencies {
 	testImplementation("org.codehaus.groovy:groovy-test")
 	testImplementation("org.codehaus.groovy:groovy-xml")
 	testImplementation("org.apache.commons:commons-pool2")
-	testImplementation("jakarta.inject:jakarta.inject-tck")
 	testImplementation("org.awaitility:awaitility")
+	testImplementation("jakarta.inject:jakarta.inject-tck")
 	testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
 	testRuntimeOnly("org.glassfish:jakarta.el")
 	// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
index 9c253124eea9..20ed51eff6da 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
+import org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -91,11 +92,17 @@ public abstract class AnnotationConfigUtils {
 			"org.springframework.context.annotation.internalRequiredAnnotationProcessor";
 
 	/**
-	 * The bean name of the internally managed JSR-250 annotation processor.
+	 * The bean name of the internally managed common annotation processor.
 	 */
 	public static final String COMMON_ANNOTATION_PROCESSOR_BEAN_NAME =
 			"org.springframework.context.annotation.internalCommonAnnotationProcessor";
 
+	/**
+	 * The bean name of the internally managed JSR-250 annotation processor.
+	 */
+	private static final String JSR250_ANNOTATION_PROCESSOR_BEAN_NAME =
+			"org.springframework.context.annotation.internalJsr250AnnotationProcessor";
+
 	/**
 	 * The bean name of the internally managed JPA annotation processor.
 	 */
@@ -117,16 +124,18 @@ public abstract class AnnotationConfigUtils {
 	public static final String EVENT_LISTENER_FACTORY_BEAN_NAME =
 			"org.springframework.context.event.internalEventListenerFactory";
 
-	private static final boolean jsr250Present;
 
-	private static final boolean jpaPresent;
+	private static final ClassLoader classLoader = AnnotationConfigUtils.class.getClassLoader();
 
-	static {
-		ClassLoader classLoader = AnnotationConfigUtils.class.getClassLoader();
-		jsr250Present = ClassUtils.isPresent("jakarta.annotation.Resource", classLoader);
-		jpaPresent = ClassUtils.isPresent("jakarta.persistence.EntityManagerFactory", classLoader) &&
-				ClassUtils.isPresent(PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME, classLoader);
-	}
+	private static final boolean jakartaAnnotationsPresent =
+			ClassUtils.isPresent("jakarta.annotation.PostConstruct", classLoader);
+
+	private static final boolean jsr250Present =
+			ClassUtils.isPresent("javax.annotation.PostConstruct", classLoader);
+
+	private static final boolean jpaPresent =
+			ClassUtils.isPresent("jakarta.persistence.EntityManagerFactory", classLoader) &&
+					ClassUtils.isPresent(PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME, classLoader);
 
 
 	/**
@@ -172,13 +181,28 @@ public static Set<BeanDefinitionHolder> registerAnnotationConfigProcessors(
 			beanDefs.add(registerPostProcessor(registry, def, AUTOWIRED_ANNOTATION_PROCESSOR_BEAN_NAME));
 		}
 
-		// Check for JSR-250 support, and if present add the CommonAnnotationBeanPostProcessor.
-		if (jsr250Present && !registry.containsBeanDefinition(COMMON_ANNOTATION_PROCESSOR_BEAN_NAME)) {
+		// Check for Jakarta Annotations support, and if present add the CommonAnnotationBeanPostProcessor.
+		if (jakartaAnnotationsPresent && !registry.containsBeanDefinition(COMMON_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition(CommonAnnotationBeanPostProcessor.class);
 			def.setSource(source);
 			beanDefs.add(registerPostProcessor(registry, def, COMMON_ANNOTATION_PROCESSOR_BEAN_NAME));
 		}
 
+		// Check for JSR-250 support, and if present add an InitDestroyAnnotationBeanPostProcessor
+		// for the javax variant of PostConstruct/PreDestroy.
+		if (jsr250Present && !registry.containsBeanDefinition(JSR250_ANNOTATION_PROCESSOR_BEAN_NAME)) {
+			try {
+				RootBeanDefinition def = new RootBeanDefinition(InitDestroyAnnotationBeanPostProcessor.class);
+				def.getPropertyValues().add("initAnnotationType", classLoader.loadClass("javax.annotation.PostConstruct"));
+				def.getPropertyValues().add("destroyAnnotationType", classLoader.loadClass("javax.annotation.PreDestroy"));
+				def.setSource(source);
+				beanDefs.add(registerPostProcessor(registry, def, JSR250_ANNOTATION_PROCESSOR_BEAN_NAME));
+			}
+			catch (ClassNotFoundException ex) {
+				// Failed to load javax variants of the annotation types -> ignore.
+			}
+		}
+
 		// Check for JPA support, and if present add the PersistenceAnnotationBeanPostProcessor.
 		if (jpaPresent && !registry.containsBeanDefinition(PERSISTENCE_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition();
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index 75b7d08afec6..3bd70bc53cb6 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,10 @@
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -37,15 +34,10 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.xml.namespace.QName;
-
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJB;
-import jakarta.xml.ws.Service;
-import jakarta.xml.ws.WebServiceClient;
-import jakarta.xml.ws.WebServiceRef;
 
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.ProxyFactory;
@@ -77,10 +69,9 @@
 
 /**
  * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
- * that supports common Java annotations out of the box, in particular the JSR-250
+ * that supports common Java annotations out of the box, in particular the common
  * annotations in the {@code jakarta.annotation} package. These common Java
- * annotations are supported in many Jakarta EE technologies (e.g. JSF 1.2),
- * as well as in Java 6's JAX-WS.
+ * annotations are supported in many Jakarta EE technologies (e.g. JSF and JAX-RS).
  *
  * <p>This post-processor includes support for the {@link jakarta.annotation.PostConstruct}
  * and {@link jakarta.annotation.PreDestroy} annotations - as init annotation
@@ -95,12 +86,8 @@
  * and default names as well. The target beans can be simple POJOs, with no special
  * requirements other than the type having to match.
  *
- * <p>The JAX-WS {@link javax.xml.ws.WebServiceRef} annotation is supported too,
- * analogous to {@link jakarta.annotation.Resource} but with the capability of creating
- * specific JAX-WS service endpoints. This may either point to an explicitly defined
- * resource by name or operate on a locally specified JAX-WS service class. Finally,
- * this post-processor also supports the EJB 3 {@link jakarta.ejb.EJB} annotation,
- * analogous to {@link jakarta.annotation.Resource} as well, with the capability to
+ * <p>This post-processor also supports the EJB 3 {@link jakarta.ejb.EJB} annotation,
+ * analogous to {@link jakarta.annotation.Resource}, with the capability to
  * specify both a local bean name and a global JNDI name for fallback retrieval.
  * The target beans can be plain POJOs as well as EJB 3 Session Beans in this case.
  *
@@ -143,22 +130,15 @@
 public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBeanPostProcessor
 		implements InstantiationAwareBeanPostProcessor, BeanFactoryAware, Serializable {
 
-	@Nullable
-	private static final Class<? extends Annotation> webServiceRefClass;
+	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = new LinkedHashSet<>(4);
 
 	@Nullable
 	private static final Class<? extends Annotation> ejbClass;
 
-	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = new LinkedHashSet<>(4);
-
 	static {
-		webServiceRefClass = loadAnnotationType("javax.xml.ws.WebServiceRef");
-		ejbClass = loadAnnotationType("jakarta.ejb.EJB");
-
 		resourceAnnotationTypes.add(Resource.class);
-		if (webServiceRefClass != null) {
-			resourceAnnotationTypes.add(webServiceRefClass);
-		}
+
+		ejbClass = loadAnnotationType("jakarta.ejb.EJB");
 		if (ejbClass != null) {
 			resourceAnnotationTypes.add(ejbClass);
 		}
@@ -195,15 +175,11 @@ public CommonAnnotationBeanPostProcessor() {
 		setOrder(Ordered.LOWEST_PRECEDENCE - 3);
 		setInitAnnotationType(PostConstruct.class);
 		setDestroyAnnotationType(PreDestroy.class);
-		ignoreResourceType("javax.xml.ws.WebServiceContext");
 	}
 
 
 	/**
-	 * Ignore the given resource type when resolving {@code @Resource}
-	 * annotations.
-	 * <p>By default, the {@code javax.xml.ws.WebServiceContext} interface
-	 * will be ignored, since it will be resolved by the JAX-WS runtime.
+	 * Ignore the given resource type when resolving {@code @Resource} annotations.
 	 * @param resourceType the resource type to ignore
 	 */
 	public void ignoreResourceType(String resourceType) {
@@ -361,13 +337,7 @@ private InjectionMetadata buildResourceMetadata(final Class<?> clazz) {
 			final List<InjectionMetadata.InjectedElement> currElements = new ArrayList<>();
 
 			ReflectionUtils.doWithLocalFields(targetClass, field -> {
-				if (webServiceRefClass != null && field.isAnnotationPresent(webServiceRefClass)) {
-					if (Modifier.isStatic(field.getModifiers())) {
-						throw new IllegalStateException("@WebServiceRef annotation is not supported on static fields");
-					}
-					currElements.add(new WebServiceRefElement(field, field, null));
-				}
-				else if (ejbClass != null && field.isAnnotationPresent(ejbClass)) {
+				if (ejbClass != null && field.isAnnotationPresent(ejbClass)) {
 					if (Modifier.isStatic(field.getModifiers())) {
 						throw new IllegalStateException("@EJB annotation is not supported on static fields");
 					}
@@ -389,17 +359,7 @@ else if (field.isAnnotationPresent(Resource.class)) {
 					return;
 				}
 				if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
-					if (webServiceRefClass != null && bridgedMethod.isAnnotationPresent(webServiceRefClass)) {
-						if (Modifier.isStatic(method.getModifiers())) {
-							throw new IllegalStateException("@WebServiceRef annotation is not supported on static methods");
-						}
-						if (method.getParameterCount() != 1) {
-							throw new IllegalStateException("@WebServiceRef annotation requires a single-arg method: " + method);
-						}
-						PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
-						currElements.add(new WebServiceRefElement(method, bridgedMethod, pd));
-					}
-					else if (ejbClass != null && bridgedMethod.isAnnotationPresent(ejbClass)) {
+					if (ejbClass != null && bridgedMethod.isAnnotationPresent(ejbClass)) {
 						if (Modifier.isStatic(method.getModifiers())) {
 							throw new IllegalStateException("@EJB annotation is not supported on static methods");
 						}
@@ -649,91 +609,6 @@ protected Object getResourceToInject(Object target, @Nullable String requestingB
 	}
 
 
-	/**
-	 * Class representing injection information about an annotated field
-	 * or setter method, supporting the @WebServiceRef annotation.
-	 */
-	private class WebServiceRefElement extends LookupElement {
-
-		private final Class<?> elementType;
-
-		private final String wsdlLocation;
-
-		public WebServiceRefElement(Member member, AnnotatedElement ae, @Nullable PropertyDescriptor pd) {
-			super(member, pd);
-			WebServiceRef resource = ae.getAnnotation(WebServiceRef.class);
-			String resourceName = resource.name();
-			Class<?> resourceType = resource.type();
-			this.isDefaultName = !StringUtils.hasLength(resourceName);
-			if (this.isDefaultName) {
-				resourceName = this.member.getName();
-				if (this.member instanceof Method && resourceName.startsWith("set") && resourceName.length() > 3) {
-					resourceName = Introspector.decapitalize(resourceName.substring(3));
-				}
-			}
-			if (Object.class != resourceType) {
-				checkResourceType(resourceType);
-			}
-			else {
-				// No resource type specified... check field/method.
-				resourceType = getResourceType();
-			}
-			this.name = resourceName;
-			this.elementType = resourceType;
-			if (Service.class.isAssignableFrom(resourceType)) {
-				this.lookupType = resourceType;
-			}
-			else {
-				this.lookupType = resource.value();
-			}
-			this.mappedName = resource.mappedName();
-			this.wsdlLocation = resource.wsdlLocation();
-		}
-
-		@Override
-		protected Object getResourceToInject(Object target, @Nullable String requestingBeanName) {
-			Service service;
-			try {
-				service = (Service) getResource(this, requestingBeanName);
-			}
-			catch (NoSuchBeanDefinitionException notFound) {
-				// Service to be created through generated class.
-				if (Service.class == this.lookupType) {
-					throw new IllegalStateException("No resource with name '" + this.name + "' found in context, " +
-							"and no specific JAX-WS Service subclass specified. The typical solution is to either specify " +
-							"a LocalJaxWsServiceFactoryBean with the given name or to specify the (generated) Service " +
-							"subclass as @WebServiceRef(...) value.");
-				}
-				if (StringUtils.hasLength(this.wsdlLocation)) {
-					try {
-						Constructor<?> ctor = this.lookupType.getConstructor(URL.class, QName.class);
-						WebServiceClient clientAnn = this.lookupType.getAnnotation(WebServiceClient.class);
-						if (clientAnn == null) {
-							throw new IllegalStateException("JAX-WS Service class [" + this.lookupType.getName() +
-									"] does not carry a WebServiceClient annotation");
-						}
-						service = (Service) BeanUtils.instantiateClass(ctor,
-								new URL(this.wsdlLocation), new QName(clientAnn.targetNamespace(), clientAnn.name()));
-					}
-					catch (NoSuchMethodException ex) {
-						throw new IllegalStateException("JAX-WS Service class [" + this.lookupType.getName() +
-								"] does not have a (URL, QName) constructor. Cannot apply specified WSDL location [" +
-								this.wsdlLocation + "].");
-					}
-					catch (MalformedURLException ex) {
-						throw new IllegalArgumentException(
-								"Specified WSDL location [" + this.wsdlLocation + "] isn't a valid URL");
-					}
-				}
-				else {
-					service = (Service) BeanUtils.instantiateClass(this.lookupType);
-				}
-			}
-			return service.getPort(this.elementType);
-		}
-	}
-
-
 	/**
 	 * Class representing injection information about an annotated field
 	 * or setter method, supporting the @EJB annotation.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
index cfb389e6a464..99f604181d5e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public void testSimpleScanWithDefaultFiltersAndPostProcessors() {
 		GenericApplicationContext context = new GenericApplicationContext();
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		int beanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(beanCount).isEqualTo(12);
+		assertThat(beanCount).isGreaterThanOrEqualTo(12);
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("fooServiceImpl")).isTrue();
 		assertThat(context.containsBean("stubFooDao")).isTrue();
@@ -110,7 +110,7 @@ public void testDoubleScan() {
 
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		int beanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(beanCount).isEqualTo(12);
+		assertThat(beanCount).isGreaterThanOrEqualTo(12);
 
 		ClassPathBeanDefinitionScanner scanner2 = new ClassPathBeanDefinitionScanner(context) {
 			@Override
@@ -138,7 +138,7 @@ public void testWithIndex() {
 
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		int beanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(beanCount).isEqualTo(12);
+		assertThat(beanCount).isGreaterThanOrEqualTo(12);
 
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("fooServiceImpl")).isTrue();
@@ -157,7 +157,7 @@ public void testDoubleScanWithIndex() {
 
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		int beanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(beanCount).isEqualTo(12);
+		assertThat(beanCount).isGreaterThanOrEqualTo(12);
 
 		ClassPathBeanDefinitionScanner scanner2 = new ClassPathBeanDefinitionScanner(context) {
 			@Override
@@ -182,7 +182,7 @@ public void testSimpleScanWithDefaultFiltersAndNoPostProcessors() {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		scanner.setIncludeAnnotationConfig(false);
 		int beanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(beanCount).isEqualTo(7);
+		assertThat(beanCount).isGreaterThanOrEqualTo(7);
 
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("fooServiceImpl")).isTrue();
@@ -222,7 +222,7 @@ public void testSimpleScanWithDefaultFiltersAndOverriddenEqualNamedBean() {
 		scanner.setIncludeAnnotationConfig(false);
 		int scannedBeanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(scannedBeanCount).isEqualTo(6);
+		assertThat(scannedBeanCount).isGreaterThanOrEqualTo(6);
 		assertThat(context.getBeanDefinitionCount()).isEqualTo((initialBeanCount + scannedBeanCount));
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("fooServiceImpl")).isTrue();
@@ -242,7 +242,7 @@ public void testSimpleScanWithDefaultFiltersAndOverriddenCompatibleNamedBean() {
 		scanner.setIncludeAnnotationConfig(false);
 		int scannedBeanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(scannedBeanCount).isEqualTo(6);
+		assertThat(scannedBeanCount).isGreaterThanOrEqualTo(6);
 		assertThat(context.getBeanDefinitionCount()).isEqualTo((initialBeanCount + scannedBeanCount));
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("fooServiceImpl")).isTrue();
@@ -281,7 +281,7 @@ public void testCustomIncludeFilterWithoutDefaultsButIncludingPostProcessors() {
 		scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class));
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(6);
+		assertThat(beanCount).isGreaterThanOrEqualTo(6);
 		assertThat(context.containsBean("messageBean")).isTrue();
 		assertThat(context.containsBean(AnnotationConfigUtils.AUTOWIRED_ANNOTATION_PROCESSOR_BEAN_NAME)).isTrue();
 		assertThat(context.containsBean(AnnotationConfigUtils.COMMON_ANNOTATION_PROCESSOR_BEAN_NAME)).isTrue();
@@ -296,7 +296,7 @@ public void testCustomIncludeFilterWithoutDefaultsAndNoPostProcessors() {
 		scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class));
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(6);
+		assertThat(beanCount).isGreaterThanOrEqualTo(6);
 		assertThat(context.containsBean("messageBean")).isTrue();
 		assertThat(context.containsBean("serviceInvocationCounter")).isFalse();
 		assertThat(context.containsBean("fooServiceImpl")).isFalse();
@@ -316,7 +316,7 @@ public void testCustomIncludeFilterAndDefaults() {
 		scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class));
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(13);
+		assertThat(beanCount).isGreaterThanOrEqualTo(13);
 		assertThat(context.containsBean("messageBean")).isTrue();
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("fooServiceImpl")).isTrue();
@@ -336,7 +336,7 @@ public void testCustomAnnotationExcludeFilterAndDefaults() {
 		scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class));
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(11);
+		assertThat(beanCount).isGreaterThanOrEqualTo(11);
 		assertThat(context.containsBean("serviceInvocationCounter")).isFalse();
 		assertThat(context.containsBean("fooServiceImpl")).isTrue();
 		assertThat(context.containsBean("stubFooDao")).isTrue();
@@ -354,7 +354,7 @@ public void testCustomAssignableTypeExcludeFilterAndDefaults() {
 		scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class));
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(11);
+		assertThat(beanCount).isGreaterThanOrEqualTo(11);
 		assertThat(context.containsBean("fooServiceImpl")).isFalse();
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("stubFooDao")).isTrue();
@@ -374,7 +374,7 @@ public void testCustomAssignableTypeExcludeFilterAndDefaultsWithoutPostProcessor
 		scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class));
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(6);
+		assertThat(beanCount).isGreaterThanOrEqualTo(6);
 		assertThat(context.containsBean("fooServiceImpl")).isFalse();
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
 		assertThat(context.containsBean("stubFooDao")).isTrue();
@@ -392,7 +392,7 @@ public void testMultipleCustomExcludeFiltersAndDefaults() {
 		scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class));
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(10);
+		assertThat(beanCount).isGreaterThanOrEqualTo(10);
 		assertThat(context.containsBean("fooServiceImpl")).isFalse();
 		assertThat(context.containsBean("serviceInvocationCounter")).isFalse();
 		assertThat(context.containsBean("stubFooDao")).isTrue();
@@ -411,7 +411,7 @@ public void testCustomBeanNameGenerator() {
 		scanner.setBeanNameGenerator(new TestBeanNameGenerator());
 		int beanCount = scanner.scan(BASE_PACKAGE);
 
-		assertThat(beanCount).isEqualTo(12);
+		assertThat(beanCount).isGreaterThanOrEqualTo(12);
 		assertThat(context.containsBean("fooServiceImpl")).isFalse();
 		assertThat(context.containsBean("fooService")).isTrue();
 		assertThat(context.containsBean("serviceInvocationCounter")).isTrue();
@@ -431,7 +431,7 @@ public void testMultipleBasePackagesWithDefaultsOnly() {
 		GenericApplicationContext multiPackageContext = new GenericApplicationContext();
 		ClassPathBeanDefinitionScanner multiPackageScanner = new ClassPathBeanDefinitionScanner(multiPackageContext);
 		int singlePackageBeanCount = singlePackageScanner.scan(BASE_PACKAGE);
-		assertThat(singlePackageBeanCount).isEqualTo(12);
+		assertThat(singlePackageBeanCount).isGreaterThanOrEqualTo(12);
 		multiPackageScanner.scan(BASE_PACKAGE, "org.springframework.dao.annotation");
 		// assertTrue(multiPackageBeanCount > singlePackageBeanCount);
 	}
@@ -442,7 +442,7 @@ public void testMultipleScanCalls() {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		int initialBeanCount = context.getBeanDefinitionCount();
 		int scannedBeanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(scannedBeanCount).isEqualTo(12);
+		assertThat(scannedBeanCount).isGreaterThanOrEqualTo(12);
 		assertThat((context.getBeanDefinitionCount() - initialBeanCount)).isEqualTo(scannedBeanCount);
 		int addedBeanCount = scanner.scan("org.springframework.aop.aspectj.annotation");
 		assertThat(context.getBeanDefinitionCount()).isEqualTo((initialBeanCount + scannedBeanCount + addedBeanCount));
@@ -455,7 +455,7 @@ public void testBeanAutowiredWithAnnotationConfigEnabled() {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		scanner.setBeanNameGenerator(new TestBeanNameGenerator());
 		int beanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(beanCount).isEqualTo(12);
+		assertThat(beanCount).isGreaterThanOrEqualTo(12);
 		context.refresh();
 
 		FooServiceImpl fooService = context.getBean("fooService", FooServiceImpl.class);
@@ -485,7 +485,7 @@ public void testBeanNotAutowiredWithAnnotationConfigDisabled() {
 		scanner.setIncludeAnnotationConfig(false);
 		scanner.setBeanNameGenerator(new TestBeanNameGenerator());
 		int beanCount = scanner.scan(BASE_PACKAGE);
-		assertThat(beanCount).isEqualTo(7);
+		assertThat(beanCount).isGreaterThanOrEqualTo(7);
 		context.refresh();
 
 		try {

From eabe946a5385b690228c1141bad3fc131ac7f1b3 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 21 Sep 2021 17:41:56 +0200
Subject: [PATCH 133/735] Skip readStream optimization for compatibility with
 misbehaving InputStreams

Closes gh-27429
---
 .../src/main/java/org/springframework/asm/ClassReader.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/ClassReader.java b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
index d53564c2a9a8..e5c2113993ff 100644
--- a/spring-core/src/main/java/org/springframework/asm/ClassReader.java
+++ b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
@@ -324,7 +324,9 @@ private static byte[] readStream(final InputStream inputStream, final boolean cl
       }
       outputStream.flush();
       if (readCount == 1) {
-        return data;
+        // SPRING PATCH: some misbehaving InputStreams return -1 but still write to buffer (gh-27429)
+        // return data;
+        // END OF PATCH
       }
       return outputStream.toByteArray();
     } finally {

From 49d003857d1dc98e5f1fa0274e9e5eb6b09a2f78 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 21 Sep 2021 17:42:19 +0200
Subject: [PATCH 134/735] Skip CGLIB class validation in case of optimize flag

Closes gh-27439
---
 .../springframework/aop/framework/CglibAopProxy.java   |  4 ++--
 .../org/springframework/aop/framework/ProxyConfig.java | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
index e2b822816dbf..43d747f90cee 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -237,7 +237,7 @@ protected Enhancer createEnhancer() {
 	 * validates it if not.
 	 */
 	private void validateClassIfNecessary(Class<?> proxySuperClass, @Nullable ClassLoader proxyClassLoader) {
-		if (logger.isWarnEnabled()) {
+		if (!this.advised.isOptimize() && logger.isInfoEnabled()) {
 			synchronized (validatedClasses) {
 				if (!validatedClasses.containsKey(proxySuperClass)) {
 					doValidateClass(proxySuperClass, proxyClassLoader,
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
index 38665cafbc61..3b6010f8f58c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,11 +73,9 @@ public boolean isProxyTargetClass() {
 	 * The exact meaning of "aggressive optimizations" will differ
 	 * between proxies, but there is usually some tradeoff.
 	 * Default is "false".
-	 * <p>For example, optimization will usually mean that advice changes won't
-	 * take effect after a proxy has been created. For this reason, optimization
-	 * is disabled by default. An optimize value of "true" may be ignored
-	 * if other settings preclude optimization: for example, if "exposeProxy"
-	 * is set to "true" and that's not compatible with the optimization.
+	 * <p>With Spring's current proxy options, this flag effectively
+	 * enforces CGLIB proxies (similar to {@link #setProxyTargetClass})
+	 * but without any class validation checks (for final methods etc).
 	 */
 	public void setOptimize(boolean optimize) {
 		this.optimize = optimize;

From 0dc5d2794fa6716f26c228a8cef8aa60a8d4a4ae Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 21 Sep 2021 17:42:50 +0200
Subject: [PATCH 135/735] Avoid early ConversionService determination in
 StandardBeanExpressionResolver

Closes gh-27446
---
 .../StandardBeanExpressionResolver.java       | 11 +++++-----
 .../spel/support/StandardTypeConverter.java   | 22 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java b/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
index c2a0235d1972..b58795014b98 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.springframework.beans.factory.config.BeanExpressionContext;
 import org.springframework.beans.factory.config.BeanExpressionResolver;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.ParserContext;
@@ -156,10 +157,10 @@ public Object evaluate(@Nullable String value, BeanExpressionContext evalContext
 				sec.addPropertyAccessor(new EnvironmentAccessor());
 				sec.setBeanResolver(new BeanFactoryResolver(evalContext.getBeanFactory()));
 				sec.setTypeLocator(new StandardTypeLocator(evalContext.getBeanFactory().getBeanClassLoader()));
-				ConversionService conversionService = evalContext.getBeanFactory().getConversionService();
-				if (conversionService != null) {
-					sec.setTypeConverter(new StandardTypeConverter(conversionService));
-				}
+				sec.setTypeConverter(new StandardTypeConverter(() -> {
+					ConversionService cs = evalContext.getBeanFactory().getConversionService();
+					return (cs != null ? cs : DefaultConversionService.getSharedInstance());
+				}));
 				customizeEvaluationContext(sec);
 				this.evaluationCache.put(evalContext, sec);
 			}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
index 8d1a25028874..eeb1c09397db 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.expression.spel.support;
 
+import java.util.function.Supplier;
+
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
@@ -37,7 +39,7 @@
  */
 public class StandardTypeConverter implements TypeConverter {
 
-	private final ConversionService conversionService;
+	private final Supplier<ConversionService> conversionService;
 
 
 	/**
@@ -45,7 +47,7 @@ public class StandardTypeConverter implements TypeConverter {
 	 * @see DefaultConversionService#getSharedInstance()
 	 */
 	public StandardTypeConverter() {
-		this.conversionService = DefaultConversionService.getSharedInstance();
+		this.conversionService = DefaultConversionService::getSharedInstance;
 	}
 
 	/**
@@ -54,20 +56,30 @@ public StandardTypeConverter() {
 	 */
 	public StandardTypeConverter(ConversionService conversionService) {
 		Assert.notNull(conversionService, "ConversionService must not be null");
+		this.conversionService = () -> conversionService;
+	}
+
+	/**
+	 * Create a StandardTypeConverter for the given ConversionService.
+	 * @param conversionService a Supplier for the ConversionService to delegate to
+	 * @since 5.3.11
+	 */
+	public StandardTypeConverter(Supplier<ConversionService> conversionService) {
+		Assert.notNull(conversionService, "Supplier must not be null");
 		this.conversionService = conversionService;
 	}
 
 
 	@Override
 	public boolean canConvert(@Nullable TypeDescriptor sourceType, TypeDescriptor targetType) {
-		return this.conversionService.canConvert(sourceType, targetType);
+		return this.conversionService.get().canConvert(sourceType, targetType);
 	}
 
 	@Override
 	@Nullable
 	public Object convertValue(@Nullable Object value, @Nullable TypeDescriptor sourceType, TypeDescriptor targetType) {
 		try {
-			return this.conversionService.convert(value, sourceType, targetType);
+			return this.conversionService.get().convert(value, sourceType, targetType);
 		}
 		catch (ConversionException ex) {
 			throw new SpelEvaluationException(ex, SpelMessage.TYPE_CONVERSION_ERROR,

From 1f8c233dfcef62781467cbb58a774933208f94cf Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 21 Sep 2021 17:43:03 +0200
Subject: [PATCH 136/735] Polishing

---
 spring-context/spring-context.gradle          |  2 +-
 ...nClassPostConstructAndAutowiringTests.java |  5 +-
 .../core/ReactiveAdapterRegistry.java         | 72 +++++++++----------
 3 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 221e0f12fe1a..fe3faea9f9e6 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -34,8 +34,8 @@ dependencies {
 	testImplementation("org.codehaus.groovy:groovy-test")
 	testImplementation("org.codehaus.groovy:groovy-xml")
 	testImplementation("org.apache.commons:commons-pool2")
-	testImplementation("javax.inject:javax.inject-tck")
 	testImplementation("org.awaitility:awaitility")
+	testImplementation("javax.inject:javax.inject-tck")
 	testRuntimeOnly("javax.xml.bind:jaxb-api")
 	testRuntimeOnly("org.glassfish:javax.el")
 	// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
index 0aaf4c00a069..420de4c5bda6 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 /**
  * Tests cornering the issue reported in SPR-8080. If the product of a @Bean method
  * was @Autowired into a configuration class while at the same time the declaring
@@ -34,7 +33,7 @@
  * 'currently in creation' status of the autowired bean and result in creating multiple
  * instances of the given @Bean, violating container scoping / singleton semantics.
  *
- * This is resolved through no longer relying on 'currently in creation' status, but
+ * <p>This is resolved through no longer relying on 'currently in creation' status, but
  * rather on a thread local that informs the enhanced bean method implementation whether
  * the factory is the caller or not.
  *
diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index cfeaffcaf734..cbed55a289c4 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -77,11 +77,11 @@ public class ReactiveAdapterRegistry {
 	static {
 		ClassLoader classLoader = ReactiveAdapterRegistry.class.getClassLoader();
 		reactorPresent = ClassUtils.isPresent("reactor.core.publisher.Flux", classLoader);
+		flowPublisherPresent = ClassUtils.isPresent("java.util.concurrent.Flow.Publisher", classLoader);
 		rxjava1Present = ClassUtils.isPresent("rx.Observable", classLoader) &&
 				ClassUtils.isPresent("rx.RxReactiveStreams", classLoader);
 		rxjava2Present = ClassUtils.isPresent("io.reactivex.Flowable", classLoader);
 		rxjava3Present = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", classLoader);
-		flowPublisherPresent = ClassUtils.isPresent("java.util.concurrent.Flow.Publisher", classLoader);
 		kotlinCoroutinesPresent = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", classLoader);
 		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Multi", classLoader);
 	}
@@ -97,13 +97,16 @@ public ReactiveAdapterRegistry() {
 		// Reactor
 		if (reactorPresent) {
 			new ReactorRegistrar().registerAdapters(this);
+			if (flowPublisherPresent) {
+				// Java 9+ Flow.Publisher
+				new ReactorJdkFlowAdapterRegistrar().registerAdapter(this);
+			}
 		}
 
 		// RxJava1 (deprecated)
 		if (rxjava1Present) {
 			new RxJava1Registrar().registerAdapters(this);
 		}
-
 		// RxJava2
 		if (rxjava2Present) {
 			new RxJava2Registrar().registerAdapters(this);
@@ -113,13 +116,6 @@ public ReactiveAdapterRegistry() {
 			new RxJava3Registrar().registerAdapters(this);
 		}
 
-		// Java 9+ Flow.Publisher
-		if (flowPublisherPresent) {
-			new ReactorJdkFlowAdapterRegistrar().registerAdapter(this);
-		}
-		// If not present, do nothing for the time being...
-		// We can fall back on "reactive-streams-flow-bridge" (once released)
-
 		// Kotlin Coroutines
 		if (reactorPresent && kotlinCoroutinesPresent) {
 			new CoroutinesRegistrar().registerAdapters(this);
@@ -253,6 +249,35 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 	}
 
 
+	private static class ReactorJdkFlowAdapterRegistrar {
+
+		void registerAdapter(ReactiveAdapterRegistry registry) {
+			// Reflectively access optional JDK 9+ API (for runtime compatibility with JDK 8)
+
+			try {
+				String publisherName = "java.util.concurrent.Flow.Publisher";
+				Class<?> publisherClass = ClassUtils.forName(publisherName, getClass().getClassLoader());
+
+				String adapterName = "reactor.adapter.JdkFlowAdapter";
+				Class<?> flowAdapterClass = ClassUtils.forName(adapterName,  getClass().getClassLoader());
+
+				Method toFluxMethod = flowAdapterClass.getMethod("flowPublisherToFlux", publisherClass);
+				Method toFlowMethod = flowAdapterClass.getMethod("publisherToFlowPublisher", Publisher.class);
+				Object emptyFlow = ReflectionUtils.invokeMethod(toFlowMethod, null, Flux.empty());
+
+				registry.registerReactiveType(
+						ReactiveTypeDescriptor.multiValue(publisherClass, () -> emptyFlow),
+						source -> (Publisher<?>) ReflectionUtils.invokeMethod(toFluxMethod, null, source),
+						publisher -> ReflectionUtils.invokeMethod(toFlowMethod, null, publisher)
+				);
+			}
+			catch (Throwable ex) {
+				// Ignore
+			}
+		}
+	}
+
+
 	private static class RxJava1Registrar {
 
 		void registerAdapters(ReactiveAdapterRegistry registry) {
@@ -307,6 +332,7 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 		}
 	}
 
+
 	private static class RxJava3Registrar {
 
 		void registerAdapters(ReactiveAdapterRegistry registry) {
@@ -347,34 +373,6 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 		}
 	}
 
-	private static class ReactorJdkFlowAdapterRegistrar {
-
-		void registerAdapter(ReactiveAdapterRegistry registry) {
-			// TODO: remove reflection when build requires JDK 9+
-
-			try {
-				String publisherName = "java.util.concurrent.Flow.Publisher";
-				Class<?> publisherClass = ClassUtils.forName(publisherName, getClass().getClassLoader());
-
-				String adapterName = "reactor.adapter.JdkFlowAdapter";
-				Class<?> flowAdapterClass = ClassUtils.forName(adapterName,  getClass().getClassLoader());
-
-				Method toFluxMethod = flowAdapterClass.getMethod("flowPublisherToFlux", publisherClass);
-				Method toFlowMethod = flowAdapterClass.getMethod("publisherToFlowPublisher", Publisher.class);
-				Object emptyFlow = ReflectionUtils.invokeMethod(toFlowMethod, null, Flux.empty());
-
-				registry.registerReactiveType(
-						ReactiveTypeDescriptor.multiValue(publisherClass, () -> emptyFlow),
-						source -> (Publisher<?>) ReflectionUtils.invokeMethod(toFluxMethod, null, source),
-						publisher -> ReflectionUtils.invokeMethod(toFlowMethod, null, publisher)
-				);
-			}
-			catch (Throwable ex) {
-				// Ignore
-			}
-		}
-	}
-
 
 	/**
 	 * ReactiveAdapter variant that wraps adapted Publishers as {@link Flux} or

From b808b53bcc4633f0622c7038df310b04e34bfe7b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 22 Sep 2021 16:06:58 +0200
Subject: [PATCH 137/735] Remove unnecessary cast in ContentRequestMatchers

---
 .../test/web/client/match/ContentRequestMatchers.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index 0ce6350a5da6..7762bb279323 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -240,7 +240,7 @@ private RequestMatcher multipartData(MultiValueMap<String, ?> expectedMap, boole
 					}
 					if (expected instanceof byte[]) {
 						assertTrue("Multipart is not a file", actual instanceof byte[]);
-						assertEquals("Multipart content", expected, (byte[]) actual);
+						assertEquals("Multipart content", expected, actual);
 					}
 					else if (expected instanceof String) {
 						assertTrue("Multipart is not a String", actual instanceof String);

From a247b83cd9c9aefd3c329d493c5ce7cd11d0cdfa Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 22 Sep 2021 16:22:27 +0200
Subject: [PATCH 138/735] Ensure projects can be imported into Eclipse IDE with
 JDK 17

Prior to this commit, the Spring Framework projects could not be
imported into Eclipse IDE when using JDK 17 to build the projects.

The primary obstacle is the fact that Eclipse enforces a strict
"no split packages between the unnamed module and a system module" rule
when building with a "modular JDK" (such as JDK 17).

Resources:

- https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928
- https://bugs.openjdk.java.net/browse/JDK-8215739
- http://mail.openjdk.java.net/pipermail/jigsaw-dev/2018-December/014077.html
- https://stackoverflow.com/questions/51094274/eclipse-cant-find-xml-related-classes-after-switching-build-path-to-jdk-10/53824670#53824670

Since the bug (JDK-8215739) has not been fixed in OpenJDK, the strict
"no split packages" rule does not apply to the Java compiler used in
Spring Framework's Gradle build or the compiler in IntelliJ IDEA. Hence,
this issue only arrises when building the framework in Eclipse IDE.

This commit addresses this issue in the following affected projects.

- spring-oxm: removal of the dependency on XPP3 which publishes
    javax.xml.namespace.QName as part of the JAR. The QName type is
    also published by the java.xml JDK 17 system module. To make the
    tests pass, we have switched to using the DomDriver instead of the
    XppDriver in our XStream tests.

- spring-test: HtmlUnit has a transitive dependency on xml-apis which
    publishes several packages also published by java.xml JDK 17 system
    module. Thus, we have explicitly excluded the transitive dependency
    on xml-apis for our `optional` configuration.

See gh-27407
---
 gradle/ide.gradle                                 |  4 ++--
 import-into-eclipse.md                            |  6 +++++-
 spring-oxm/spring-oxm.gradle                      |  1 -
 .../oxm/xstream/XStreamMarshallerTests.java       | 15 +++++++++------
 .../oxm/xstream/XStreamUnmarshallerTests.java     |  3 +++
 spring-test/spring-test.gradle                    |  9 +++++++++
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index d5215f2875f2..9d3db1023813 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -4,8 +4,8 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
 apply plugin: 'eclipse'
 
 eclipse.jdt {
-	sourceCompatibility = 1.8
-	targetCompatibility = 1.8
+	sourceCompatibility = 17
+	targetCompatibility = 17
 }
 
 // Replace classpath entries with project dependencies (GRADLE-1116)
diff --git a/import-into-eclipse.md b/import-into-eclipse.md
index fc3d36a8854b..1ab36c1fcfd3 100644
--- a/import-into-eclipse.md
+++ b/import-into-eclipse.md
@@ -3,7 +3,7 @@
 This document will guide you through the process of importing the Spring Framework
 projects into Eclipse or the Spring Tool Suite (_STS_). It is recommended that you
 have a recent version of Eclipse. As a bare minimum you will need Eclipse with full Java
-8 support, Eclipse Buildship, and the Groovy plugin.
+17 support, Eclipse Buildship, and the Groovy plugin.
 
 The following instructions have been tested against [STS](https://spring.io/tools) 4.12.0
 ([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-4120-changelog))
@@ -12,6 +12,10 @@ The instructions should work with the latest Eclipse distribution as long as you
 [Buildship](https://marketplace.eclipse.org/content/buildship-gradle-integration). Note
 that STS 4 comes with Buildship preinstalled.
 
+If you are using Eclipse 4.21, you will need to install
+[Java 17 Support for Eclipse 2021-09 (4.21)](https://marketplace.eclipse.org/content/java-17-support-eclipse-2021-09-421)
+from the Eclipse Marketplace.
+
 ## Steps
 
 _When instructed to execute `./gradlew` from the command line, be sure to execute it within your locally cloned `spring-framework` working directory._
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index bce9c1517691..0778059690c2 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -22,7 +22,6 @@ dependencies {
 	optional("com.thoughtworks.xstream:xstream")
 	testImplementation(project(":spring-context"))
 	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation("org.ogce:xpp3")
 	testImplementation("org.codehaus.jettison:jettison") {
 		exclude group: "stax", module: "stax-api"
 	}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index 304d3fcc771b..ece6236ecd75 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -43,6 +43,8 @@
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JsonWriter;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -84,6 +86,7 @@ void createMarshaller() {
 		marshaller = new XStreamMarshaller();
 		marshaller.setTypePermissions(AnyTypePermission.ANY);
 		marshaller.setAliases(Collections.singletonMap("flight", Flight.class.getName()));
+		marshaller.setStreamDriver(new DomDriver("UTF-8", new XmlFriendlyNameCoder()));
 		flight.setFlightNumber(42L);
 	}
 
@@ -139,7 +142,7 @@ void marshalStreamResultWriter() throws Exception {
 		StringWriter writer = new StringWriter();
 		StreamResult result = new StreamResult(writer);
 		marshaller.marshal(flight, result);
-		assertThat(XmlContent.from(writer)).isSimilarTo(EXPECTED_STRING);
+		assertThat(XmlContent.from(writer)).isSimilarToIgnoringWhitespace(EXPECTED_STRING);
 	}
 
 	@Test
@@ -148,7 +151,7 @@ void marshalStreamResultOutputStream() throws Exception {
 		StreamResult result = new StreamResult(os);
 		marshaller.marshal(flight, result);
 		String s = os.toString("UTF-8");
-		assertThat(XmlContent.of(s)).isSimilarTo(EXPECTED_STRING);
+		assertThat(XmlContent.of(s)).isSimilarToIgnoringWhitespace(EXPECTED_STRING);
 	}
 
 	@Test
@@ -254,7 +257,7 @@ void aliasesByTypeStringClassMap() throws Exception {
 
 		Writer writer = new StringWriter();
 		marshaller.marshal(flight, new StreamResult(writer));
-		assertThat(XmlContent.from(writer)).isSimilarTo(EXPECTED_STRING);
+		assertThat(XmlContent.from(writer)).isSimilarToIgnoringWhitespace(EXPECTED_STRING);
 	}
 
 	@Test
@@ -267,7 +270,7 @@ void aliasesByTypeStringStringMap() throws Exception {
 
 		Writer writer = new StringWriter();
 		marshaller.marshal(flight, new StreamResult(writer));
-		assertThat(XmlContent.from(writer)).isSimilarTo(EXPECTED_STRING);
+		assertThat(XmlContent.from(writer)).isSimilarToIgnoringWhitespace(EXPECTED_STRING);
 	}
 
 	@Test
@@ -276,7 +279,7 @@ void fieldAliases() throws Exception {
 		Writer writer = new StringWriter();
 		marshaller.marshal(flight, new StreamResult(writer));
 		String expected = "<flight><flightNo>42</flightNo></flight>";
-		assertThat(XmlContent.from(writer)).isSimilarTo(expected);
+		assertThat(XmlContent.from(writer)).isSimilarToIgnoringWhitespace(expected);
 	}
 
 	@Test
@@ -351,7 +354,7 @@ void annotatedMarshalStreamResultWriter() throws Exception {
 		flight.setFlightNumber(42);
 		marshaller.marshal(flight, result);
 		String expected = "<flight><number>42</number></flight>";
-		assertThat(XmlContent.from(writer)).isSimilarTo(expected);
+		assertThat(XmlContent.from(writer)).isSimilarToIgnoringWhitespace(expected);
 	}
 
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
index 7c87eda2253b..9d8d61b7bea6 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
@@ -30,6 +30,8 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
+import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -55,6 +57,7 @@ public class XStreamUnmarshallerTests {
 	public void createUnmarshaller() {
 		unmarshaller = new XStreamMarshaller();
 		unmarshaller.setTypePermissions(AnyTypePermission.ANY);
+		unmarshaller.setStreamDriver(new DomDriver("UTF-8", new XmlFriendlyNameCoder()));
 		Map<String, Class<?>> aliases = new HashMap<>();
 		aliases.put("flight", Flight.class);
 		unmarshaller.setAliases(aliases);
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index ea64eb6f2764..1cb742f451a9 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -79,6 +79,15 @@ dependencies {
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
 
+// Prevent xml-apis from being used so that the corresponding XML APIs from
+// the JDK's `java.xml` module are used instead. This allows spring-test to
+// build in Eclipse IDE which fails to compile if there is a split package
+// between a JDK system module and the unnamed module (for JARs on the
+// classpath).
+configurations.optional {
+	exclude group: "xml-apis", module: "xml-apis"
+}
+
 test {
 	description = "Runs JUnit 4, JUnit Jupiter, and TestNG tests."
 	useJUnitPlatform {

From 134c0e29167e3d80b7cc3e94ac39691f08e2cc07 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 22 Sep 2021 22:08:38 +0200
Subject: [PATCH 139/735] Upgrade to JUnit 5.8.1

Closes gh-27450
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 33b6227dabb0..81193a9f2f1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ configure(allprojects) { project ->
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
-			mavenBom "org.junit:junit-bom:5.8.0"
+			mavenBom "org.junit:junit-bom:5.8.1"
 		}
 		dependencies {
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
@@ -384,7 +384,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.8.0/api/",
+			"https://junit.org/junit5/docs/5.8.1/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"

From 66b15efa215ee5b1cd060825681e366cb437e4ba Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Thu, 23 Sep 2021 13:57:39 +0200
Subject: [PATCH 140/735] Upgrade CI image to JDK 17+35

---
 ci/images/get-jdk-url.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index 48072fd2f9e2..a3babd3ae7d4 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -3,7 +3,7 @@ set -e
 
 case "$1" in
 	java17)
-		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk17-2021-09-15-08-15-beta/OpenJDK17-jdk_x64_linux_hotspot_2021-09-15-08-15.tar.gz"
+		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz"
 	;;
   *)
 		echo $"Unknown java version"

From f9d63e7bb1acaa4c752ab73a53513c08e3817021 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 23 Sep 2021 15:53:54 +0200
Subject: [PATCH 141/735] BeanUtils.getResolvableConstructor falls back to
 single non-public constructor

Closes gh-27437
---
 .../org/springframework/beans/BeanUtils.java  | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 8ddd6ff74467..f7708247d786 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -226,32 +226,46 @@ public static <T> T instantiateClass(Constructor<T> ctor, Object... args) throws
 	}
 
 	/**
-	 * Return a resolvable constructor for the provided class, either a primary constructor
-	 * or single public constructor or simply a default constructor. Callers have to be
-	 * prepared to resolve arguments for the returned constructor's parameters, if any.
+	 * Return a resolvable constructor for the provided class, either a primary or single
+	 * public constructor with arguments, or a single non-public constructor with arguments,
+	 * or simply a default constructor. Callers have to be prepared to resolve arguments
+	 * for the returned constructor's parameters, if any.
 	 * @param clazz the class to check
+	 * @throws IllegalStateException in case of no unique constructor found at all
 	 * @since 5.3
 	 * @see #findPrimaryConstructor
 	 */
 	@SuppressWarnings("unchecked")
 	public static <T> Constructor<T> getResolvableConstructor(Class<T> clazz) {
 		Constructor<T> ctor = findPrimaryConstructor(clazz);
-		if (ctor == null) {
-			Constructor<?>[] ctors = clazz.getConstructors();
+		if (ctor != null) {
+			return ctor;
+		}
+
+		Constructor<?>[] ctors = clazz.getConstructors();
+		if (ctors.length == 1) {
+			// A single public constructor
+			return (Constructor<T>) ctors[0];
+		}
+		else if (ctors.length == 0){
+			ctors = clazz.getDeclaredConstructors();
 			if (ctors.length == 1) {
-				ctor = (Constructor<T>) ctors[0];
+				// A single non-public constructor, e.g. from a non-public record type
+				return (Constructor<T>) ctors[0];
 			}
-			else {
-				try {
-					ctor = clazz.getDeclaredConstructor();
-				}
-				catch (NoSuchMethodException ex) {
-					throw new IllegalStateException("No primary or single public constructor found for " +
-							clazz + " - and no default constructor found either");
-				}
+		}
+		else {
+			// Several public constructors -> let's take the default constructor
+			try {
+				return clazz.getDeclaredConstructor();
+			}
+			catch (NoSuchMethodException ex) {
+				// Giving up...
 			}
 		}
-		return ctor;
+
+		// No unique constructor at all
+		throw new IllegalStateException("No primary or single unique constructor found for " + clazz);
 	}
 
 	/**

From 58898de5429c43ae676a7643fcd20d684af1c9ec Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 23 Sep 2021 15:54:40 +0200
Subject: [PATCH 142/735] Provide accessors for externallyManagedConfigMembers
 and Init/DestroyMethods

Closes gh-27449
---
 .../factory/support/RootBeanDefinition.java   | 63 +++++++++++++++++--
 1 file changed, 59 insertions(+), 4 deletions(-)

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

From 5cbc972a0de195ebb09645f65a1dea8fb85880c9 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 23 Sep 2021 15:56:06 +0200
Subject: [PATCH 143/735] Log rejected listener container tasks at warn level

Closes gh-27451
---
 .../jms/listener/AbstractJmsListeningContainer.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
index b7e1734bb99f..a9061e162fc5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -582,13 +582,13 @@ protected void doRescheduleTask(Object task) {
 	/**
 	 * Log a task that has been rejected by {@link #doRescheduleTask}.
 	 * <p>The default implementation simply logs a corresponding message
-	 * at debug level.
+	 * at warn level.
 	 * @param task the rejected task object
 	 * @param ex the exception thrown from {@link #doRescheduleTask}
 	 */
 	protected void logRejectedTask(Object task, RuntimeException ex) {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Listener container task [" + task + "] has been rejected and paused: " + ex);
+		if (logger.isWarnEnabled()) {
+			logger.warn("Listener container task [" + task + "] has been rejected and paused: " + ex);
 		}
 	}
 

From 208fafa4a3b358519eb2005868dee437e28df22a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 23 Sep 2021 15:56:49 +0200
Subject: [PATCH 144/735] Fix contract violations in
 ConcurrentReferenceHashMap's EntrySet/Iterator

Closes gh-27454
---
 .../util/ConcurrentReferenceHashMap.java      |  3 ++-
 .../util/ConcurrentReferenceHashMapTests.java | 25 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java b/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
index f3af11b50a97..3291ca6e079a 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
@@ -858,7 +858,7 @@ public boolean contains(@Nullable Object o) {
 				Reference<K, V> ref = ConcurrentReferenceHashMap.this.getReference(entry.getKey(), Restructure.NEVER);
 				Entry<K, V> otherEntry = (ref != null ? ref.get() : null);
 				if (otherEntry != null) {
-					return ObjectUtils.nullSafeEquals(otherEntry.getValue(), otherEntry.getValue());
+					return ObjectUtils.nullSafeEquals(entry.getValue(), otherEntry.getValue());
 				}
 			}
 			return false;
@@ -966,6 +966,7 @@ private void moveToNextSegment() {
 		public void remove() {
 			Assert.state(this.last != null, "No element to remove");
 			ConcurrentReferenceHashMap.this.remove(this.last.getKey());
+			this.last = null;
 		}
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
index b8ddb11aa0c8..e50168ee4e9e 100644
--- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,11 +41,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
 /**
  * Tests for {@link ConcurrentReferenceHashMap}.
  *
  * @author Phillip Webb
+ * @author Juergen Hoeller
  */
 class ConcurrentReferenceHashMapTests {
 
@@ -466,6 +468,7 @@ void shouldRemoveViaEntrySet() {
 		iterator.next();
 		iterator.next();
 		iterator.remove();
+		assertThatIllegalStateException().isThrownBy(iterator::remove);
 		iterator.next();
 		assertThat(iterator.hasNext()).isFalse();
 		assertThat(this.map).hasSize(2);
@@ -486,6 +489,26 @@ void shouldSetViaEntrySet() {
 		assertThat(this.map.get(2)).isEqualTo("2b");
 	}
 
+	@Test
+	void containsViaEntrySet() {
+		this.map.put(1, "1");
+		this.map.put(2, "2");
+		this.map.put(3, "3");
+		Set<Map.Entry<Integer, String>> entrySet = this.map.entrySet();
+		Set<Map.Entry<Integer, String>> copy = new HashMap<>(this.map).entrySet();
+		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isTrue());
+		this.map.put(1, "A");
+		this.map.put(2, "B");
+		this.map.put(3, "C");
+		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isFalse());
+		this.map.put(1, "1");
+		this.map.put(2, "2");
+		this.map.put(3, "3");
+		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isTrue());
+		entrySet.clear();
+		copy.forEach(entry -> assertThat(entrySet.contains(entry)).isFalse());
+	}
+
 	@Test
 	@Disabled("Intended for use during development only")
 	void shouldBeFasterThanSynchronizedMap() throws InterruptedException {

From e29cfa350106d8811072159748e41a4ef0d0b697 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 23 Sep 2021 15:57:43 +0200
Subject: [PATCH 145/735] Polishing

---
 spring-core/spring-core.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index a6e5e309b073..e4c568f84b13 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -50,21 +50,21 @@ dependencies {
 	optional("io.reactivex.rxjava3:rxjava")
 	optional("io.smallrye.reactive:mutiny")
 	optional("io.netty:netty-buffer")
-	testImplementation("io.projectreactor:reactor-test")
-	testImplementation("com.google.code.findbugs:jsr305")
 	testImplementation("javax.annotation:javax.annotation-api")
 	testImplementation("javax.xml.bind:jaxb-api")
+	testImplementation("com.google.code.findbugs:jsr305")
 	testImplementation("com.fasterxml.woodstox:woodstox-core")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
+	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.projectreactor.tools:blockhound")
-	testFixturesImplementation("io.projectreactor:reactor-test")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
 	testFixturesImplementation("org.junit.platform:junit-platform-launcher")
 	testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.junit.jupiter:junit-jupiter-params")
 	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.xmlunit:xmlunit-assertj")
+	testFixturesImplementation("io.projectreactor:reactor-test")
 }
 
 jar {
@@ -92,7 +92,7 @@ jar {
 }
 
 test {
-	// Make sure the classes dir is used on the test classpath (required by ResourceTests)
-	// When test fixtures are involved, the JAR is used by default
+	// Make sure the classes dir is used on the test classpath (required by ResourceTests).
+	// When test fixtures are involved, the JAR is used by default.
 	classpath = sourceSets.main.output.classesDirs + classpath - files(jar.archiveFile)
 }

From f440fb8bafc1277c8a6f85851179d1a7985a83dc Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 23 Sep 2021 16:13:20 +0200
Subject: [PATCH 146/735] Unit tests for record binding

See gh-27437
---
 .../jdbc/core/AbstractRowMapperTests.java     |   2 +-
 .../jdbc/core/DataClassRowMapperTests.java    |  24 +++
 ...nnotationControllerHandlerMethodTests.java | 181 ++++++++++--------
 3 files changed, 128 insertions(+), 79 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
index 601bbdfd7a1d..633e86c4c281 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
@@ -89,7 +89,7 @@ protected void verifyPerson(ConstructorPerson person) {
 		verifyPersonViaBeanWrapper(person);
 	}
 
-	private void verifyPersonViaBeanWrapper(Object person) {
+	protected void verifyPersonViaBeanWrapper(Object person) {
 		BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(person);
 		assertThat(bw.getPropertyValue("name")).isEqualTo("Bubba");
 		assertThat(bw.getPropertyValue("age")).isEqualTo(22L);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java
index 48b0f7f03134..b9fb7ad44df4 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java
@@ -79,4 +79,28 @@ public void testStaticQueryWithDataClassAndSetters() throws Exception {
 		mock.verifyClosed();
 	}
 
+	@Test
+	public void testStaticQueryWithDataRecord() throws Exception {
+		Mock mock = new Mock();
+		List<RecordPerson> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
+				new DataClassRowMapper<>(RecordPerson.class));
+		assertThat(result.size()).isEqualTo(1);
+		verifyPerson(result.get(0));
+
+		mock.verifyClosed();
+	}
+
+	protected void verifyPerson(RecordPerson person) {
+		assertThat(person.name()).isEqualTo("Bubba");
+		assertThat(person.age()).isEqualTo(22L);
+		assertThat(person.birth_date()).usingComparator(Date::compareTo).isEqualTo(new java.util.Date(1221222L));
+		assertThat(person.balance()).isEqualTo(new BigDecimal("1234.56"));
+		verifyPersonViaBeanWrapper(person);
+	}
+
+
+	static record RecordPerson(String name, long age, Date birth_date, BigDecimal balance) {
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
index 8f07c7071f8e..46f4d2577311 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
@@ -2202,6 +2202,19 @@ void dataClassBindingWithLocalDate(boolean usePathPatterns) throws Exception {
 		assertThat(response.getContentAsString()).isEqualTo("2010-01-01");
 	}
 
+	@PathPatternsParameterizedTest
+	void dataRecordBinding(boolean usePathPatterns) throws Exception {
+		initDispatcherServlet(DataRecordController.class, usePathPatterns);
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bind");
+		request.addParameter("param1", "value1");
+		request.addParameter("param2", "true");
+		request.addParameter("param3", "3");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		getServlet().service(request, response);
+		assertThat(response.getContentAsString()).isEqualTo("value1-true-3");
+	}
+
 	@Test
 	void routerFunction() throws ServletException, IOException {
 		GenericWebApplicationContext wac = new GenericWebApplicationContext();
@@ -2397,7 +2410,7 @@ public void nonEmptyParameterListHandler(HttpServletResponse response) {
 	@Controller
 	@RequestMapping("/myPage")
 	@SessionAttributes(names = { "object1", "object2" })
-	public static class MySessionAttributesController {
+	static class MySessionAttributesController {
 
 		@RequestMapping(method = RequestMethod.GET)
 		public String get(Model model) {
@@ -2417,7 +2430,7 @@ public String post(@ModelAttribute("object1") Object object1) {
 	@RequestMapping("/myPage")
 	@SessionAttributes({"object1", "object2"})
 	@Controller
-	public interface MySessionAttributesControllerIfc {
+	interface MySessionAttributesControllerIfc {
 
 		@RequestMapping(method = RequestMethod.GET)
 		String get(Model model);
@@ -2426,7 +2439,7 @@ public interface MySessionAttributesControllerIfc {
 		String post(@ModelAttribute("object1") Object object1);
 	}
 
-	public static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc {
+	static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc {
 
 		@Override
 		public String get(Model model) {
@@ -2444,7 +2457,7 @@ public String post(@ModelAttribute("object1") Object object1) {
 
 	@RequestMapping("/myPage")
 	@SessionAttributes({"object1", "object2"})
-	public interface MyParameterizedControllerIfc<T> {
+	interface MyParameterizedControllerIfc<T> {
 
 		@ModelAttribute("testBeanList")
 		List<TestBean> getTestBeans();
@@ -2453,14 +2466,14 @@ public interface MyParameterizedControllerIfc<T> {
 		String get(Model model);
 	}
 
-	public interface MyEditableParameterizedControllerIfc<T> extends MyParameterizedControllerIfc<T> {
+	interface MyEditableParameterizedControllerIfc<T> extends MyParameterizedControllerIfc<T> {
 
 		@RequestMapping(method = RequestMethod.POST)
 		String post(@ModelAttribute("object1") T object);
 	}
 
 	@Controller
-	public static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc<TestBean> {
+	static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc<TestBean> {
 
 		@Override
 		public List<TestBean> getTestBeans() {
@@ -2485,7 +2498,7 @@ public String post(TestBean object) {
 	}
 
 	@Controller
-	public static class MyParameterizedControllerImplWithOverriddenMappings
+	static class MyParameterizedControllerImplWithOverriddenMappings
 			implements MyEditableParameterizedControllerIfc<TestBean> {
 
 		@Override
@@ -2514,7 +2527,7 @@ public String post(@ModelAttribute("object1") TestBean object1) {
 	}
 
 	@Controller
-	public static class MyFormController {
+	static class MyFormController {
 
 		@ModelAttribute("testBeanList")
 		public List<TestBean> getTestBeans() {
@@ -2536,7 +2549,7 @@ public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult e
 		}
 	}
 
-	public static class ValidTestBean extends TestBean {
+	static class ValidTestBean extends TestBean {
 
 		@NotNull
 		private String validCountry;
@@ -2551,7 +2564,7 @@ public String getValidCountry() {
 	}
 
 	@Controller
-	public static class MyModelFormController {
+	static class MyModelFormController {
 
 		@ModelAttribute
 		public List<TestBean> getTestBeans() {
@@ -2572,7 +2585,7 @@ public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult e
 	}
 
 	@Controller
-	public static class LateBindingFormController {
+	static class LateBindingFormController {
 
 		@ModelAttribute("testBeanList")
 		public List<TestBean> getTestBeans(@ModelAttribute(name="myCommand", binding=false) TestBean tb) {
@@ -2915,7 +2928,7 @@ public void render(@Nullable Map model, HttpServletRequest request, HttpServletR
 		}
 	}
 
-	public static class ModelExposingViewResolver implements ViewResolver {
+	static class ModelExposingViewResolver implements ViewResolver {
 
 		@Override
 		public View resolveViewName(String viewName, Locale locale) {
@@ -2926,7 +2939,7 @@ public View resolveViewName(String viewName, Locale locale) {
 		}
 	}
 
-	public static class ParentController {
+	static class ParentController {
 
 		@RequestMapping(method = RequestMethod.GET)
 		public void doGet(HttpServletRequest req, HttpServletResponse resp) {
@@ -2935,7 +2948,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
 
 	@Controller
 	@RequestMapping("/child/test")
-	public static class ChildController extends ParentController {
+	static class ChildController extends ParentController {
 
 		@RequestMapping(method = RequestMethod.GET)
 		public void doGet(HttpServletRequest req, HttpServletResponse resp, @RequestParam("childId") String id) {
@@ -2969,7 +2982,7 @@ public void get(Writer writer) throws IOException {
 	}
 
 	@MyControllerAnnotation
-	public static class CustomAnnotationController {
+	static class CustomAnnotationController {
 
 		@RequestMapping("/myPath.do")
 		public void myHandle() {
@@ -2977,7 +2990,7 @@ public void myHandle() {
 	}
 
 	@Controller
-	public static class RequiredParamController {
+	static class RequiredParamController {
 
 		@RequestMapping("/myPath.do")
 		public void myHandle(@RequestParam(value = "id", required = true) int id,
@@ -2986,7 +2999,7 @@ public void myHandle(@RequestParam(value = "id", required = true) int id,
 	}
 
 	@Controller
-	public static class OptionalParamController {
+	static class OptionalParamController {
 
 		@RequestMapping("/myPath.do")
 		public void myHandle(@RequestParam(required = false) String id,
@@ -2998,7 +3011,7 @@ public void myHandle(@RequestParam(required = false) String id,
 	}
 
 	@Controller
-	public static class DefaultValueParamController {
+	static class DefaultValueParamController {
 
 		@RequestMapping("/myPath.do")
 		public void myHandle(@RequestParam(value = "id", defaultValue = "foo") String id,
@@ -3010,7 +3023,7 @@ public void myHandle(@RequestParam(value = "id", defaultValue = "foo") String id
 	}
 
 	@Controller
-	public static class DefaultExpressionValueParamController {
+	static class DefaultExpressionValueParamController {
 
 		@RequestMapping("/myPath.do")
 		public void myHandle(@RequestParam(value = "id", defaultValue = "${myKey}") String id,
@@ -3022,7 +3035,7 @@ public void myHandle(@RequestParam(value = "id", defaultValue = "${myKey}") Stri
 	}
 
 	@Controller
-	public static class NestedSetController {
+	static class NestedSetController {
 
 		@RequestMapping("/myPath.do")
 		public void myHandle(GenericBean<?> gb, HttpServletResponse response) throws Exception {
@@ -3031,7 +3044,7 @@ public void myHandle(GenericBean<?> gb, HttpServletResponse response) throws Exc
 		}
 	}
 
-	public static class TestBeanConverter implements Converter<String, ITestBean> {
+	static class TestBeanConverter implements Converter<String, ITestBean> {
 
 		@Override
 		public ITestBean convert(String source) {
@@ -3040,14 +3053,14 @@ public ITestBean convert(String source) {
 	}
 
 	@Controller
-	public static class PathVariableWithCustomConverterController {
+	static class PathVariableWithCustomConverterController {
 
 		@RequestMapping("/myPath/{id}")
 		public void myHandle(@PathVariable("id") ITestBean bean) throws Exception {
 		}
 	}
 
-	public static class AnnotatedExceptionRaisingConverter implements Converter<String, ITestBean> {
+	static class AnnotatedExceptionRaisingConverter implements Converter<String, ITestBean> {
 
 		@Override
 		public ITestBean convert(String source) {
@@ -3061,7 +3074,7 @@ private static class NotFoundException extends RuntimeException {
 	}
 
 	@Controller
-	public static class MethodNotAllowedController {
+	static class MethodNotAllowedController {
 
 		@RequestMapping(value = "/myPath.do", method = RequestMethod.DELETE)
 		public void delete() {
@@ -3093,7 +3106,7 @@ public void get() {
 	}
 
 	@Controller
-	public static class PathOrderingController {
+	static class PathOrderingController {
 
 		@RequestMapping(value = {"/dir/myPath1.do", "/*/*.do"})
 		public void method1(Writer writer) throws IOException {
@@ -3107,7 +3120,7 @@ public void method2(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class RequestResponseBodyController {
+	static class RequestResponseBodyController {
 
 		@RequestMapping(value = "/something", method = RequestMethod.PUT)
 		@ResponseBody
@@ -3123,7 +3136,7 @@ public String handlePartialUpdate(@RequestBody String content) throws IOExceptio
 	}
 
 	@Controller
-	public static class RequestResponseBodyProducesController {
+	static class RequestResponseBodyProducesController {
 
 		@RequestMapping(value = "/something", method = RequestMethod.PUT, produces = "text/plain")
 		@ResponseBody
@@ -3133,7 +3146,7 @@ public String handle(@RequestBody String body) throws IOException {
 	}
 
 	@Controller
-	public static class ResponseBodyVoidController {
+	static class ResponseBodyVoidController {
 
 		@RequestMapping("/something")
 		@ResponseBody
@@ -3142,7 +3155,7 @@ public void handle() throws IOException {
 	}
 
 	@Controller
-	public static class RequestBodyArgMismatchController {
+	static class RequestBodyArgMismatchController {
 
 		@RequestMapping(value = "/something", method = RequestMethod.PUT)
 		public void handle(@RequestBody A a) throws IOException {
@@ -3150,14 +3163,14 @@ public void handle(@RequestBody A a) throws IOException {
 	}
 
 	@XmlRootElement
-	public static class A {
+	static class A {
 	}
 
 	@XmlRootElement
-	public static class B {
+	static class B {
 	}
 
-	public static class NotReadableMessageConverter implements HttpMessageConverter<Object> {
+	static class NotReadableMessageConverter implements HttpMessageConverter<Object> {
 
 		@Override
 		public boolean canRead(Class<?> clazz, @Nullable MediaType mediaType) {
@@ -3185,7 +3198,7 @@ public void write(Object o, @Nullable MediaType contentType, HttpOutputMessage o
 		}
 	}
 
-	public static class SimpleMessageConverter implements HttpMessageConverter<Object> {
+	static class SimpleMessageConverter implements HttpMessageConverter<Object> {
 
 		private final List<MediaType> supportedMediaTypes;
 
@@ -3223,7 +3236,7 @@ public void write(Object o, @Nullable MediaType contentType, HttpOutputMessage o
 	}
 
 	@Controller
-	public static class ContentTypeHeadersController {
+	static class ContentTypeHeadersController {
 
 		@RequestMapping(value = "/something", headers = "content-type=application/pdf")
 		public void handlePdf(Writer writer) throws IOException {
@@ -3237,7 +3250,7 @@ public void handleHtml(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class ConsumesController {
+	static class ConsumesController {
 
 		@RequestMapping(value = "/something", consumes = "application/pdf")
 		public void handlePdf(Writer writer) throws IOException {
@@ -3251,7 +3264,7 @@ public void handleHtml(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class NegatedContentTypeHeadersController {
+	static class NegatedContentTypeHeadersController {
 
 		@RequestMapping(value = "/something", headers = "content-type=application/pdf")
 		public void handlePdf(Writer writer) throws IOException {
@@ -3266,7 +3279,7 @@ public void handleNonPdf(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class AcceptHeadersController {
+	static class AcceptHeadersController {
 
 		@RequestMapping(value = "/something", headers = "accept=text/html")
 		public void handleHtml(Writer writer) throws IOException {
@@ -3280,7 +3293,7 @@ public void handleXml(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class ProducesController {
+	static class ProducesController {
 
 		@GetMapping(path = "/something", produces = "text/html")
 		public void handleHtml(Writer writer) throws IOException {
@@ -3304,7 +3317,7 @@ public ResponseEntity<Map<String, String>> handle(IllegalArgumentException ex) {
 	}
 
 	@Controller
-	public static class ResponseStatusController {
+	static class ResponseStatusController {
 
 		@RequestMapping("/something")
 		@ResponseStatus(code = HttpStatus.CREATED, reason = "It's alive!")
@@ -3314,7 +3327,7 @@ public void handle(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class ModelAndViewResolverController {
+	static class ModelAndViewResolverController {
 
 		@RequestMapping("/")
 		public MySpecialArg handle() {
@@ -3322,7 +3335,7 @@ public MySpecialArg handle() {
 		}
 	}
 
-	public static class MyModelAndViewResolver implements ModelAndViewResolver {
+	static class MyModelAndViewResolver implements ModelAndViewResolver {
 
 		@Override
 		public ModelAndView resolveModelAndView(Method handlerMethod, Class<?> handlerType, Object returnValue,
@@ -3376,7 +3389,7 @@ public void patternMatch(Writer writer) throws IOException {
 
 	@Controller
 	@RequestMapping("/test*")
-	public static class BindingCookieValueController {
+	static class BindingCookieValueController {
 
 		@InitBinder
 		public void initBinder(WebDataBinder binder) {
@@ -3393,16 +3406,16 @@ public void handle(@CookieValue("date") Date date, Writer writer) throws IOExcep
 		}
 	}
 
-	public interface TestController<T> {
+	interface TestController<T> {
 
 		ModelAndView method(T object);
 	}
 
-	public static class MyEntity {
+	static class MyEntity {
 	}
 
 	@Controller
-	public static class TestControllerImpl implements TestController<MyEntity> {
+	static class TestControllerImpl implements TestController<MyEntity> {
 
 		@Override
 		@RequestMapping("/method")
@@ -3413,7 +3426,7 @@ public ModelAndView method(MyEntity object) {
 
 	@RestController
 	@RequestMapping(path = ApiConstants.ARTICLES_PATH)
-	public static class ArticleController implements ApiConstants, ResourceEndpoint<Article, ArticlePredicate> {
+	static class ArticleController implements ApiConstants, ResourceEndpoint<Article, ArticlePredicate> {
 
 		@Override
 		@GetMapping(params = "page")
@@ -3435,14 +3448,14 @@ interface ApiConstants {
 		String ARTICLES_PATH = API_V1 + "/articles";
 	}
 
-	public interface ResourceEndpoint<E extends Entity, P extends EntityPredicate<?>> {
+	interface ResourceEndpoint<E extends Entity, P extends EntityPredicate<?>> {
 
 		Collection<E> find(String pageable, P predicate) throws IOException;
 
 		List<E> find(boolean sort, P predicate) throws IOException;
 	}
 
-	public static abstract class Entity {
+	static abstract class Entity {
 
 		public UUID id;
 
@@ -3451,7 +3464,7 @@ public static abstract class Entity {
 		public Instant createdDate;
 	}
 
-	public static class Article extends Entity {
+	static class Article extends Entity {
 
 		public String slug;
 
@@ -3460,7 +3473,7 @@ public static class Article extends Entity {
 		public String content;
 	}
 
-	public static abstract class EntityPredicate<E extends Entity> {
+	static abstract class EntityPredicate<E extends Entity> {
 
 		public String createdBy;
 
@@ -3475,7 +3488,7 @@ public boolean accept(E entity) {
 		}
 	}
 
-	public static class ArticlePredicate extends EntityPredicate<Article> {
+	static class ArticlePredicate extends EntityPredicate<Article> {
 
 		public String query;
 
@@ -3486,7 +3499,7 @@ public boolean accept(Article entity) {
 	}
 
 	@Controller
-	public static class RequestParamMapController {
+	static class RequestParamMapController {
 
 		@RequestMapping("/map")
 		public void map(@RequestParam Map<String, String> params, Writer writer) throws IOException {
@@ -3521,7 +3534,7 @@ public void multiValueMap(@RequestParam MultiValueMap<String, String> params, Wr
 	}
 
 	@Controller
-	public static class RequestHeaderMapController {
+	static class RequestHeaderMapController {
 
 		@RequestMapping("/map")
 		public void map(@RequestHeader Map<String, String> headers, Writer writer) throws IOException {
@@ -3564,14 +3577,14 @@ public void httpHeaders(@RequestHeader HttpHeaders headers, Writer writer) throw
 	}
 
 	@Controller
-	public interface IMyController {
+	interface IMyController {
 
 		@RequestMapping("/handle")
 		void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException;
 	}
 
 	@Controller
-	public static class IMyControllerImpl implements IMyController {
+	static class IMyControllerImpl implements IMyController {
 
 		@Override
 		public void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException {
@@ -3579,14 +3592,14 @@ public void handle(Writer writer, @RequestParam(value="p", required=false) Strin
 		}
 	}
 
-	public static abstract class MyAbstractController {
+	static abstract class MyAbstractController {
 
 		@RequestMapping("/handle")
 		public abstract void handle(Writer writer) throws IOException;
 	}
 
 	@Controller
-	public static class MyAbstractControllerImpl extends MyAbstractController {
+	static class MyAbstractControllerImpl extends MyAbstractController {
 
 		@Override
 		public void handle(Writer writer) throws IOException {
@@ -3595,7 +3608,7 @@ public void handle(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class TrailingSlashController  {
+	static class TrailingSlashController  {
 
 		@RequestMapping(value = "/", method = RequestMethod.GET)
 		public void root(Writer writer) throws IOException {
@@ -3609,7 +3622,7 @@ public void templatePath(Writer writer) throws IOException {
 	}
 
 	@Controller
-	public static class ResponseEntityController {
+	static class ResponseEntityController {
 
 		@PostMapping("/foo")
 		public ResponseEntity<String> foo(HttpEntity<byte[]> requestEntity) throws Exception {
@@ -3666,7 +3679,7 @@ public void setName(String name) {
 	}
 
 	@Controller
-	public static class CustomMapEditorController {
+	static class CustomMapEditorController {
 
 		@InitBinder
 		public void initBinder(WebDataBinder binder) {
@@ -3681,7 +3694,7 @@ public void handle(@RequestParam("map") Map map, Writer writer) throws IOExcepti
 		}
 	}
 
-	public static class CustomMapEditor extends PropertyEditorSupport {
+	static class CustomMapEditor extends PropertyEditorSupport {
 
 		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
@@ -3695,7 +3708,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Controller
-	public static class MultipartController {
+	static class MultipartController {
 
 		@InitBinder
 		public void initBinder(WebDataBinder binder) {
@@ -3716,7 +3729,7 @@ public void processMultipart(@RequestParam("content") String[] content, HttpServ
 	}
 
 	@Controller
-	public static class CsvController {
+	static class CsvController {
 
 		@RequestMapping("/singleInteger")
 		public void processCsv(@RequestParam("content") Integer content, HttpServletResponse response) throws IOException {
@@ -3840,7 +3853,7 @@ public HttpHeaders createNoHeader() {
 	}
 
 	@RestController
-	public static class TextRestController {
+	static class TextRestController {
 
 		@RequestMapping(path = "/a1", method = RequestMethod.GET)
 		public String a1(@RequestBody String body) {
@@ -3864,7 +3877,7 @@ public String a4(@RequestBody String body) {
 	}
 
 	@Controller
-	public static class ModelAndViewController {
+	static class ModelAndViewController {
 
 		@RequestMapping("/path")
 		public ModelAndView methodWithHttpStatus(MyEntity object) {
@@ -3886,7 +3899,7 @@ private static class TestException extends Exception {
 		}
 	}
 
-	public static class DataClass {
+	static class DataClass {
 
 		@NotNull
 		private final String param1;
@@ -3921,7 +3934,7 @@ public int getParam3() {
 	}
 
 	@RestController
-	public static class DataClassController {
+	static class DataClassController {
 
 		@RequestMapping("/bind")
 		public String handle(DataClass data) {
@@ -3930,7 +3943,7 @@ public String handle(DataClass data) {
 	}
 
 	@RestController
-	public static class PathVariableDataClassController {
+	static class PathVariableDataClassController {
 
 		@RequestMapping("/bind/{param2}")
 		public String handle(DataClass data) {
@@ -3939,7 +3952,7 @@ public String handle(DataClass data) {
 	}
 
 	@RestController
-	public static class ValidatedDataClassController {
+	static class ValidatedDataClassController {
 
 		@InitBinder
 		public void initBinder(WebDataBinder binder) {
@@ -3960,7 +3973,7 @@ public BindStatusView handle(@Valid DataClass data, BindingResult result) {
 		}
 	}
 
-	public static class BindStatusView extends AbstractView {
+	static class BindStatusView extends AbstractView {
 
 		private final String content;
 
@@ -3980,7 +3993,7 @@ protected void renderMergedOutputModel(
 		}
 	}
 
-	public static class MultipartFileDataClass {
+	static class MultipartFileDataClass {
 
 		@NotNull
 		public final MultipartFile param1;
@@ -4003,7 +4016,7 @@ public void setParam3(int param3) {
 	}
 
 	@RestController
-	public static class MultipartFileDataClassController {
+	static class MultipartFileDataClassController {
 
 		@RequestMapping("/bind")
 		public String handle(MultipartFileDataClass data) throws IOException {
@@ -4012,7 +4025,7 @@ public String handle(MultipartFileDataClass data) throws IOException {
 		}
 	}
 
-	public static class ServletPartDataClass {
+	static class ServletPartDataClass {
 
 		@NotNull
 		public final Part param1;
@@ -4035,7 +4048,7 @@ public void setParam3(int param3) {
 	}
 
 	@RestController
-	public static class ServletPartDataClassController {
+	static class ServletPartDataClassController {
 
 		@RequestMapping("/bind")
 		public String handle(ServletPartDataClass data) throws IOException {
@@ -4045,7 +4058,7 @@ public String handle(ServletPartDataClass data) throws IOException {
 	}
 
 	@RestController
-	public static class NullableDataClassController {
+	static class NullableDataClassController {
 
 		@RequestMapping("/bind")
 		public String handle(@Nullable DataClass data, BindingResult result) {
@@ -4060,7 +4073,7 @@ public String handle(@Nullable DataClass data, BindingResult result) {
 	}
 
 	@RestController
-	public static class OptionalDataClassController {
+	static class OptionalDataClassController {
 
 		@RequestMapping("/bind")
 		public String handle(Optional<DataClass> optionalData, BindingResult result) {
@@ -4074,7 +4087,7 @@ public String handle(Optional<DataClass> optionalData, BindingResult result) {
 		}
 	}
 
-	public static class DateClass {
+	static class DateClass {
 
 		@DateTimeFormat(pattern = "yyyy-MM-dd")
 		public LocalDate date;
@@ -4085,7 +4098,7 @@ public DateClass(LocalDate date) {
 	}
 
 	@RestController
-	public static class DateClassController {
+	static class DateClassController {
 
 		@InitBinder
 		public void initBinder(WebDataBinder binder) {
@@ -4107,4 +4120,16 @@ public String handle(DateClass data, BindingResult result) {
 		}
 	}
 
+	static record DataRecord(String param1, boolean param2, int param3) {
+	}
+
+	@RestController
+	static class DataRecordController {
+
+		@RequestMapping("/bind")
+		public String handle(DataRecord data) {
+			return data.param1 + "-" + data.param2 + "-" + data.param3;
+		}
+	}
+
 }

From 93f8706dd335f03d0bbb044f25c23e71a6a7d81d Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 24 Sep 2021 15:57:15 +0100
Subject: [PATCH 147/735] Update docs for ControllerAdvice

In 5.3 it became possible to handle exceptions from any handler through
ExceptionHandler's in a ControllerAdvice class, but this is not
mentioned in the docs

See gh-22619, gh-27338
---
 src/docs/asciidoc/web/webmvc.adoc | 40 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index d12b6ab923e8..b49666303e98 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -4021,27 +4021,25 @@ necessary methods, and declare it as a Spring bean.
 === Controller Advice
 [.small]#<<web-reactive.adoc#webflux-ann-controller-advice, WebFlux>>#
 
-Typically `@ExceptionHandler`, `@InitBinder`, and `@ModelAttribute` methods apply within
-the `@Controller` class (or class hierarchy) in which they are declared. If you want such
-methods to apply more globally (across controllers), you can declare them in a class
-annotated with `@ControllerAdvice` or `@RestControllerAdvice`.
-
-`@ControllerAdvice` is annotated with `@Component`, which means such classes can be
-registered as Spring beans through <<core.adoc#beans-java-instantiating-container-scan,
-component scanning>>. `@RestControllerAdvice` is a composed annotation that is annotated
-with both `@ControllerAdvice` and `@ResponseBody`, which essentially means
-`@ExceptionHandler` methods are rendered to the response body through message conversion
-(versus view resolution or template rendering).
-
-On startup, the infrastructure classes for `@RequestMapping` and `@ExceptionHandler`
-methods detect Spring beans annotated with `@ControllerAdvice` and then apply their
-methods at runtime. Global `@ExceptionHandler` methods (from a `@ControllerAdvice`) are
-applied _after_ local ones (from the `@Controller`). By contrast, global `@ModelAttribute`
-and `@InitBinder` methods are applied _before_ local ones.
-
-By default, `@ControllerAdvice` methods apply to every request (that is, all controllers),
-but you can narrow that down to a subset of controllers by using attributes on the
-annotation, as the following example shows:
+`@ExceptionHandler`, `@InitBinder`, and `@ModelAttribute` methods apply only to the
+`@Controller` class, or class hierarchy, in which they are declared. If, instead, they
+are declared in an `@ControllerAdvice` or `@RestControllerAdvice` class, then they apply
+to any controller. Moreover, as of 5.3, `@ExceptionHandler` methods in `@ControllerAdvice`
+can be used to handle exceptions from any `@Controller` or any other handler.
+
+`@ControllerAdvice` is meta-annotated with `@Component` and therefore can be registered as
+a Spring bean through <<core.adoc#beans-java-instantiating-container-scan,
+component scanning>>. `@RestControllerAdvice` is meta-annotated with `@ControllerAdvice`
+and `@ResponseBody`, and that means `@ExceptionHandler` methods will have their return
+value rendered via response body message conversion, rather than via HTML views.
+
+On startup, `RequestMappingHandlerMapping` and `ExceptionHandlerExceptionResolver` detect
+controller advice beans and apply them at runtime. Global `@ExceptionHandler` methods,
+from an `@ControllerAdvice`, are applied _after_ local ones, from the `@Controller`.
+By contrast, global `@ModelAttribute` and `@InitBinder` methods are applied _before_ local ones.
+
+The `@ControllerAdvice` annotation has attributes that let you narrow the set of controllers
+and handlers that they apply to. For example:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java

From 50f20162934c1d3282615dce6696e3b56141f7ac Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Fri, 24 Sep 2021 16:33:51 -0700
Subject: [PATCH 148/735] Fix timezone specific failing test

Update `MvcNamespaceTests` so that the asserted time is in UTC.
---
 .../springframework/web/servlet/config/MvcNamespaceTests.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
index 05a9745896ac..60406a002623 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -246,7 +246,7 @@ public void testDefaultConfig() throws Exception {
 
 		adapter.handle(request, response, handlerMethod);
 		assertThat(handler.recordedValidationError).isTrue();
-		assertThat(handler.date).isInSameDayAs("2009-10-31");
+		assertThat(handler.date).isInSameDayAs("2009-10-31T00:00:00+00:00");
 		assertThat(handler.percent).isEqualTo(Double.valueOf(0.9999));
 
 		CompositeUriComponentsContributor uriComponentsContributor = this.appContext.getBean(

From 30efa4d478d6673ecfc735bef1ce65decadf4e77 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 25 Sep 2021 15:06:39 +0200
Subject: [PATCH 149/735] Change default driver in XStreamMarshaller from
 XppDriver to DomDriver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As explained in commit a247b83cd9c9aefd3c329d493c5ce7cd11d0cdfa, the
XppDriver from XStream relies on the XPP3 library which publishes
javax.xml.namespace.QName as part of its JAR. The QName type is also
published by the java.xml system module in modular JREs (i.e., Java 9
or higher).

This results in a split package between the unnamed module and the
java.xml system module, which the Java Language Specification defines
as illegal (see §6.5.5.2 and §7.4.3).

Most Java compilers do not currently enforce this rule; however, the
Eclipse compiler does. This makes it impossible to use spring-oxm out
of the box in the Eclipse IDE. In addition, if bug JDK-8215739 is fixed
in future versions of other JDK implementations, this rule will affect
any users using spring-oxm with those JDKs.

This commit therefore switches the default driver in XStreamMarshaller
from XppDriver to DomDriver. Users can naturally switch back to the
XppDriver if they wish, since the driver is configurable.

Closes gh-27464
---
 .../oxm/xstream/XStreamMarshaller.java                | 11 ++++++++---
 .../oxm/xstream/XStreamMarshallerTests.java           |  3 ---
 .../oxm/xstream/XStreamUnmarshallerTests.java         |  3 ---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index ccb10d27c172..342f9a41edac 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -52,6 +52,7 @@
 import com.thoughtworks.xstream.io.StreamException;
 import com.thoughtworks.xstream.io.naming.NameCoder;
 import com.thoughtworks.xstream.io.xml.CompactWriter;
+import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.io.xml.DomReader;
 import com.thoughtworks.xstream.io.xml.DomWriter;
 import com.thoughtworks.xstream.io.xml.QNameMap;
@@ -59,7 +60,6 @@
 import com.thoughtworks.xstream.io.xml.StaxReader;
 import com.thoughtworks.xstream.io.xml.StaxWriter;
 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
-import com.thoughtworks.xstream.io.xml.XppDriver;
 import com.thoughtworks.xstream.mapper.CannotResolveClassException;
 import com.thoughtworks.xstream.mapper.Mapper;
 import com.thoughtworks.xstream.mapper.MapperWrapper;
@@ -112,6 +112,11 @@
  * Note that {@link XStream} construction has been reworked in 4.0, with the
  * stream driver and the class loader getting passed into XStream itself now.
  *
+ * <p>As of Spring Framework 6.0, the default {@link HierarchicalStreamDriver} is
+ * a {@link DomDriver} that uses the configured {@linkplain #setEncoding(String)
+ * encoding} and {@link #setNameCoder(NameCoder) NameCoder}. The driver can be
+ * changed via {@link #setStreamDriver(HierarchicalStreamDriver)}.
+ *
  * @author Peter Meijer
  * @author Arjen Poutsma
  * @author Juergen Hoeller
@@ -205,7 +210,7 @@ public void setReflectionProvider(ReflectionProvider reflectionProvider) {
 	}
 
 	/**
-	 * Set a XStream {@link HierarchicalStreamDriver} to be used for readers and writers.
+	 * Set an XStream {@link HierarchicalStreamDriver} to be used for readers and writers.
 	 * <p>As of Spring 4.0, this stream driver will also be passed to the {@link XStream}
 	 * constructor and therefore used by streaming-related native API methods themselves.
 	 */
@@ -216,7 +221,7 @@ public void setStreamDriver(HierarchicalStreamDriver streamDriver) {
 
 	private HierarchicalStreamDriver getDefaultDriver() {
 		if (this.defaultDriver == null) {
-			this.defaultDriver = new XppDriver();
+			this.defaultDriver = new DomDriver(this.encoding, this.nameCoder);
 		}
 		return this.defaultDriver;
 	}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index ece6236ecd75..b408c6611be3 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -43,8 +43,6 @@
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JsonWriter;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -86,7 +84,6 @@ void createMarshaller() {
 		marshaller = new XStreamMarshaller();
 		marshaller.setTypePermissions(AnyTypePermission.ANY);
 		marshaller.setAliases(Collections.singletonMap("flight", Flight.class.getName()));
-		marshaller.setStreamDriver(new DomDriver("UTF-8", new XmlFriendlyNameCoder()));
 		flight.setFlightNumber(42L);
 	}
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
index 9d8d61b7bea6..7c87eda2253b 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
@@ -30,8 +30,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -57,7 +55,6 @@ public class XStreamUnmarshallerTests {
 	public void createUnmarshaller() {
 		unmarshaller = new XStreamMarshaller();
 		unmarshaller.setTypePermissions(AnyTypePermission.ANY);
-		unmarshaller.setStreamDriver(new DomDriver("UTF-8", new XmlFriendlyNameCoder()));
 		Map<String, Class<?>> aliases = new HashMap<>();
 		aliases.put("flight", Flight.class);
 		unmarshaller.setAliases(aliases);

From e6112344d20b9a744ca44073cc1331a0a9e691b4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 27 Sep 2021 13:01:32 +0200
Subject: [PATCH 150/735] Remove support for RxJava 2.x as well

Includes realignment of Reactor adapter registration.

Closes gh-27443
---
 build.gradle                                  |   1 -
 spring-core/spring-core.gradle                |   1 -
 .../core/ReactiveAdapterRegistry.java         | 141 ++++++------------
 .../core/ReactiveAdapterRegistryTests.java    | 124 +++------------
 src/docs/asciidoc/web-reactive.adoc           |  12 +-
 5 files changed, 65 insertions(+), 214 deletions(-)

diff --git a/build.gradle b/build.gradle
index 48b3bebced7c..7a0565cc6456 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,6 @@ configure(allprojects) { project ->
 				entry 'groovy-xml'
 			}
 
-			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
 			dependency "io.smallrye.reactive:mutiny:1.0.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index 1999580d0c14..79dd105c9e0b 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -44,7 +44,6 @@ dependencies {
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("io.projectreactor:reactor-core")
-	optional("io.reactivex.rxjava2:rxjava")
 	optional("io.reactivex.rxjava3:rxjava")
 	optional("io.smallrye.reactive:mutiny")
 	optional("io.netty:netty-buffer")
diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index 1b62cc5655a7..b63831462153 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -58,8 +58,6 @@ public class ReactiveAdapterRegistry {
 
 	private static final boolean reactorPresent;
 
-	private static final boolean rxjava2Present;
-
 	private static final boolean rxjava3Present;
 
 	private static final boolean kotlinCoroutinesPresent;
@@ -69,7 +67,6 @@ public class ReactiveAdapterRegistry {
 	static {
 		ClassLoader classLoader = ReactiveAdapterRegistry.class.getClassLoader();
 		reactorPresent = ClassUtils.isPresent("reactor.core.publisher.Flux", classLoader);
-		rxjava2Present = ClassUtils.isPresent("io.reactivex.Flowable", classLoader);
 		rxjava3Present = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", classLoader);
 		kotlinCoroutinesPresent = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", classLoader);
 		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Multi", classLoader);
@@ -86,13 +83,9 @@ public ReactiveAdapterRegistry() {
 		// Reactor
 		if (reactorPresent) {
 			new ReactorRegistrar().registerAdapters(this);
-			new ReactorJdkFlowAdapterRegistrar().registerAdapter(this);
 		}
 
 		// RxJava
-		if (rxjava2Present) {
-			new RxJava2Registrar().registerAdapters(this);
-		}
 		if (rxjava3Present) {
 			new RxJava3Registrar().registerAdapters(this);
 		}
@@ -200,16 +193,40 @@ public static ReactiveAdapterRegistry getSharedInstance() {
 	}
 
 
+	/**
+	 * ReactiveAdapter variant that wraps adapted Publishers as {@link Flux} or
+	 * {@link Mono} depending on {@link ReactiveTypeDescriptor#isMultiValue()}.
+	 * This is important in places where only the stream and stream element type
+	 * information is available like encoders and decoders.
+	 */
+	private static class ReactorAdapter extends ReactiveAdapter {
+
+		ReactorAdapter(ReactiveTypeDescriptor descriptor,
+				Function<Object, Publisher<?>> toPublisherFunction,
+				Function<Publisher<?>, Object> fromPublisherFunction) {
+
+			super(descriptor, toPublisherFunction, fromPublisherFunction);
+		}
+
+		@Override
+		public <T> Publisher<T> toPublisher(@Nullable Object source) {
+			Publisher<T> publisher = super.toPublisher(source);
+			return (isMultiValue() ? Flux.from(publisher) : Mono.from(publisher));
+		}
+	}
+
+
 	private static class ReactorRegistrar {
 
+		private static final Flow.Publisher<?> EMPTY_FLOW = JdkFlowAdapter.publisherToFlowPublisher(Flux.empty());
+
 		void registerAdapters(ReactiveAdapterRegistry registry) {
 			// Register Flux and Mono before Publisher...
 
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleOptionalValue(Mono.class, Mono::empty),
 					source -> (Mono<?>) source,
-					Mono::from
-			);
+					Mono::from);
 
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(Flux.class, Flux::empty),
@@ -224,54 +241,20 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.nonDeferredAsyncValue(CompletionStage.class, EmptyCompletableFuture::new),
 					source -> Mono.fromCompletionStage((CompletionStage<?>) source),
-					source -> Mono.from(source).toFuture()
-			);
-		}
-	}
-
+					source -> Mono.from(source).toFuture());
 
-	private static class ReactorJdkFlowAdapterRegistrar {
-
-		void registerAdapter(ReactiveAdapterRegistry registry) {
-			Flow.Publisher<?> emptyFlow = JdkFlowAdapter.publisherToFlowPublisher(Flux.empty());
 			registry.registerReactiveType(
-					ReactiveTypeDescriptor.multiValue(Flow.Publisher.class, () -> emptyFlow),
+					ReactiveTypeDescriptor.multiValue(Flow.Publisher.class, () -> EMPTY_FLOW),
 					source -> JdkFlowAdapter.flowPublisherToFlux((Flow.Publisher<?>) source),
-					JdkFlowAdapter::publisherToFlowPublisher
-			);
+					JdkFlowAdapter::publisherToFlowPublisher);
 		}
 	}
 
 
-	private static class RxJava2Registrar {
+	private static class EmptyCompletableFuture<T> extends CompletableFuture<T> {
 
-		void registerAdapters(ReactiveAdapterRegistry registry) {
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.multiValue(io.reactivex.Flowable.class, io.reactivex.Flowable::empty),
-					source -> (io.reactivex.Flowable<?>) source,
-					io.reactivex.Flowable::fromPublisher
-			);
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.multiValue(io.reactivex.Observable.class, io.reactivex.Observable::empty),
-					source -> ((io.reactivex.Observable<?>) source).toFlowable(io.reactivex.BackpressureStrategy.BUFFER),
-					io.reactivex.Observable::fromPublisher
-			);
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.singleRequiredValue(io.reactivex.Single.class),
-					source -> ((io.reactivex.Single<?>) source).toFlowable(),
-					io.reactivex.Single::fromPublisher
-			);
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.singleOptionalValue(io.reactivex.Maybe.class, io.reactivex.Maybe::empty),
-					source -> ((io.reactivex.Maybe<?>) source).toFlowable(),
-					source -> io.reactivex.Flowable.fromPublisher(source)
-							.toObservable().singleElement()
-			);
-			registry.registerReactiveType(
-					ReactiveTypeDescriptor.noValue(io.reactivex.Completable.class, io.reactivex.Completable::complete),
-					source -> ((io.reactivex.Completable) source).toFlowable(),
-					io.reactivex.Completable::fromPublisher
-			);
+		EmptyCompletableFuture() {
+			complete(null);
 		}
 	}
 
@@ -284,66 +267,34 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 							io.reactivex.rxjava3.core.Flowable.class,
 							io.reactivex.rxjava3.core.Flowable::empty),
 					source -> (io.reactivex.rxjava3.core.Flowable<?>) source,
-					io.reactivex.rxjava3.core.Flowable::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Flowable::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(
 							io.reactivex.rxjava3.core.Observable.class,
 							io.reactivex.rxjava3.core.Observable::empty),
 					source -> ((io.reactivex.rxjava3.core.Observable<?>) source).toFlowable(
 							io.reactivex.rxjava3.core.BackpressureStrategy.BUFFER),
-					io.reactivex.rxjava3.core.Observable::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Observable::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleRequiredValue(io.reactivex.rxjava3.core.Single.class),
 					source -> ((io.reactivex.rxjava3.core.Single<?>) source).toFlowable(),
-					io.reactivex.rxjava3.core.Single::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Single::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleOptionalValue(
 							io.reactivex.rxjava3.core.Maybe.class,
 							io.reactivex.rxjava3.core.Maybe::empty),
 					source -> ((io.reactivex.rxjava3.core.Maybe<?>) source).toFlowable(),
-					io.reactivex.rxjava3.core.Maybe::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Maybe::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.noValue(
 							io.reactivex.rxjava3.core.Completable.class,
 							io.reactivex.rxjava3.core.Completable::complete),
 					source -> ((io.reactivex.rxjava3.core.Completable) source).toFlowable(),
-					io.reactivex.rxjava3.core.Completable::fromPublisher
-			);
-		}
-	}
-
-
-	/**
-	 * ReactiveAdapter variant that wraps adapted Publishers as {@link Flux} or
-	 * {@link Mono} depending on {@link ReactiveTypeDescriptor#isMultiValue()}.
-	 * This is important in places where only the stream and stream element type
-	 * information is available like encoders and decoders.
-	 */
-	private static class ReactorAdapter extends ReactiveAdapter {
-
-		ReactorAdapter(ReactiveTypeDescriptor descriptor,
-				Function<Object, Publisher<?>> toPublisherFunction,
-				Function<Publisher<?>, Object> fromPublisherFunction) {
-
-			super(descriptor, toPublisherFunction, fromPublisherFunction);
-		}
-
-		@Override
-		public <T> Publisher<T> toPublisher(@Nullable Object source) {
-			Publisher<T> publisher = super.toPublisher(source);
-			return (isMultiValue() ? Flux.from(publisher) : Mono.from(publisher));
-		}
-	}
-
-
-	private static class EmptyCompletableFuture<T> extends CompletableFuture<T> {
-
-		EmptyCompletableFuture() {
-			complete(null);
+					io.reactivex.rxjava3.core.Completable::fromPublisher);
 		}
 	}
 
@@ -361,8 +312,7 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(kotlinx.coroutines.flow.Flow.class, kotlinx.coroutines.flow.FlowKt::emptyFlow),
 					source -> kotlinx.coroutines.reactor.ReactorFlowKt.asFlux((kotlinx.coroutines.flow.Flow<?>) source),
-					kotlinx.coroutines.reactive.ReactiveFlowKt::asFlow
-			);
+					kotlinx.coroutines.reactive.ReactiveFlowKt::asFlow);
 		}
 	}
 
@@ -375,16 +325,14 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 							io.smallrye.mutiny.Uni.class,
 							() -> io.smallrye.mutiny.Uni.createFrom().nothing()),
 					uni -> ((io.smallrye.mutiny.Uni<?>) uni).convert().toPublisher(),
-					publisher -> io.smallrye.mutiny.Uni.createFrom().publisher(publisher)
-			);
+					publisher -> io.smallrye.mutiny.Uni.createFrom().publisher(publisher));
 
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(
 							io.smallrye.mutiny.Multi.class,
 							() -> io.smallrye.mutiny.Multi.createFrom().empty()),
 					multi -> (io.smallrye.mutiny.Multi<?>) multi,
-					publisher -> io.smallrye.mutiny.Multi.createFrom().publisher(publisher)
-			);
+					publisher -> io.smallrye.mutiny.Multi.createFrom().publisher(publisher));
 		}
 	}
 
@@ -402,7 +350,6 @@ public static class SpringCoreBlockHoundIntegration implements BlockHoundIntegra
 
 		@Override
 		public void applyTo(BlockHound.Builder builder) {
-
 			// Avoid hard references potentially anywhere in spring-core (no need for structural dependency)
 
 			builder.allowBlockingCallsInside(
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index ea73cfbd7be0..8dff68cfe0a3 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -43,16 +43,13 @@ class ReactiveAdapterRegistryTests {
 
 	private static final Duration ONE_SECOND = Duration.ofSeconds(1);
 
-
 	private final ReactiveAdapterRegistry registry = ReactiveAdapterRegistry.getSharedInstance();
 
 
 	@Test
 	void getAdapterForReactiveSubType() {
-
 		ReactiveAdapter adapter1 = getAdapter(Flux.class);
 		ReactiveAdapter adapter2 = getAdapter(ExtendedFlux.class);
-
 		assertThat(adapter2).isSameAs(adapter1);
 
 		this.registry.registerReactiveType(
@@ -61,17 +58,32 @@ void getAdapterForReactiveSubType() {
 				ExtendedFlux::from);
 
 		ReactiveAdapter adapter3 = getAdapter(ExtendedFlux.class);
-
 		assertThat(adapter3).isNotNull();
 		assertThat(adapter3).isNotSameAs(adapter1);
 	}
 
+
+	private ReactiveAdapter getAdapter(Class<?> reactiveType) {
+		ReactiveAdapter adapter = this.registry.getAdapter(reactiveType);
+		assertThat(adapter).isNotNull();
+		return adapter;
+	}
+
+
+	private static class ExtendedFlux<T> extends Flux<T> {
+
+		@Override
+		public void subscribe(CoreSubscriber<? super T> actual) {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+
 	@Nested
 	class Reactor {
 
 		@Test
 		void defaultAdapterRegistrations() {
-
 			// Reactor
 			assertThat(getAdapter(Mono.class)).isNotNull();
 			assertThat(getAdapter(Flux.class)).isNotNull();
@@ -118,95 +130,12 @@ void fromCompletableFuture() {
 		}
 	}
 
-	@Nested
-	class RxJava2 {
-
-		@Test
-		void defaultAdapterRegistrations() {
-
-			// RxJava 2
-			assertThat(getAdapter(io.reactivex.Flowable.class)).isNotNull();
-			assertThat(getAdapter(io.reactivex.Observable.class)).isNotNull();
-			assertThat(getAdapter(io.reactivex.Single.class)).isNotNull();
-			assertThat(getAdapter(io.reactivex.Maybe.class)).isNotNull();
-			assertThat(getAdapter(io.reactivex.Completable.class)).isNotNull();
-		}
-
-		@Test
-		void toFlowable() {
-			List<Integer> sequence = Arrays.asList(1, 2, 3);
-			Publisher<Integer> source = Flux.fromIterable(sequence);
-			Object target = getAdapter(io.reactivex.Flowable.class).fromPublisher(source);
-			assertThat(target instanceof io.reactivex.Flowable).isTrue();
-			assertThat(((io.reactivex.Flowable<?>) target).toList().blockingGet()).isEqualTo(sequence);
-		}
-
-		@Test
-		void toObservable() {
-			List<Integer> sequence = Arrays.asList(1, 2, 3);
-			Publisher<Integer> source = Flux.fromIterable(sequence);
-			Object target = getAdapter(io.reactivex.Observable.class).fromPublisher(source);
-			assertThat(target instanceof io.reactivex.Observable).isTrue();
-			assertThat(((io.reactivex.Observable<?>) target).toList().blockingGet()).isEqualTo(sequence);
-		}
-
-		@Test
-		void toSingle() {
-			Publisher<Integer> source = Flux.fromArray(new Integer[] {1});
-			Object target = getAdapter(io.reactivex.Single.class).fromPublisher(source);
-			assertThat(target instanceof io.reactivex.Single).isTrue();
-			assertThat(((io.reactivex.Single<Integer>) target).blockingGet()).isEqualTo(Integer.valueOf(1));
-		}
-
-		@Test
-		void toCompletable() {
-			Publisher<Integer> source = Flux.fromArray(new Integer[] {1, 2, 3});
-			Object target = getAdapter(io.reactivex.Completable.class).fromPublisher(source);
-			assertThat(target instanceof io.reactivex.Completable).isTrue();
-			((io.reactivex.Completable) target).blockingAwait();
-		}
-
-		@Test
-		void fromFlowable() {
-			List<Integer> sequence = Arrays.asList(1, 2, 3);
-			Object source = io.reactivex.Flowable.fromIterable(sequence);
-			Object target = getAdapter(io.reactivex.Flowable.class).toPublisher(source);
-			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
-		}
-
-		@Test
-		void fromObservable() {
-			List<Integer> sequence = Arrays.asList(1, 2, 3);
-			Object source = io.reactivex.Observable.fromIterable(sequence);
-			Object target = getAdapter(io.reactivex.Observable.class).toPublisher(source);
-			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
-		}
-
-		@Test
-		void fromSingle() {
-			Object source = io.reactivex.Single.just(1);
-			Object target = getAdapter(io.reactivex.Single.class).toPublisher(source);
-			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
-		}
-
-		@Test
-		void fromCompletable() {
-			Object source = io.reactivex.Completable.complete();
-			Object target = getAdapter(io.reactivex.Completable.class).toPublisher(source);
-			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(ONE_SECOND);
-		}
-	}
 
 	@Nested
 	class RxJava3 {
 
 		@Test
 		void defaultAdapterRegistrations() {
-
 			// RxJava 3
 			assertThat(getAdapter(io.reactivex.rxjava3.core.Flowable.class)).isNotNull();
 			assertThat(getAdapter(io.reactivex.rxjava3.core.Observable.class)).isNotNull();
@@ -284,12 +213,12 @@ void fromCompletable() {
 		}
 	}
 
+
 	@Nested
 	class Kotlin {
 
 		@Test
 		void defaultAdapterRegistrations() {
-
 			// Coroutines
 			assertThat(getAdapter(Deferred.class)).isNotNull();
 		}
@@ -302,6 +231,7 @@ void deferred() {
 		}
 	}
 
+
 	@Nested
 	class Mutiny {
 
@@ -344,22 +274,6 @@ void fromMulti() {
 			assertThat(target).isInstanceOf(Flux.class);
 			assertThat(((Flux<Integer>) target).blockLast(ONE_SECOND)).isEqualTo(Integer.valueOf(3));
 		}
-
-	}
-
-	private ReactiveAdapter getAdapter(Class<?> reactiveType) {
-		ReactiveAdapter adapter = this.registry.getAdapter(reactiveType);
-		assertThat(adapter).isNotNull();
-		return adapter;
-	}
-
-
-	private static class ExtendedFlux<T> extends Flux<T> {
-
-		@Override
-		public void subscribe(CoreSubscriber<? super T> actual) {
-			throw new UnsupportedOperationException();
-		}
 	}
 
 }
diff --git a/src/docs/asciidoc/web-reactive.adoc b/src/docs/asciidoc/web-reactive.adoc
index 5609f0ba5361..c6bf754011f1 100644
--- a/src/docs/asciidoc/web-reactive.adoc
+++ b/src/docs/asciidoc/web-reactive.adoc
@@ -34,8 +34,6 @@ discussion of mock objects.
 response objects to provide support for testing WebFlux applications without an HTTP
 server. You can use the `WebTestClient` for end-to-end integration tests, too.
 
-
-
 include::rsocket.adoc[leveloffset=+1]
 
 
@@ -55,14 +53,8 @@ For annotated controllers, WebFlux transparently adapts to the reactive library
 the application. This is done with the help of the
 {api-spring-framework}/core/ReactiveAdapterRegistry.html[`ReactiveAdapterRegistry`], which
 provides pluggable support for reactive library and other asynchronous types. The registry
-has built-in support for RxJava 2/3, RxJava 1 (via RxJava Reactive Streams bridge), and
-`CompletableFuture`, but you can register others, too.
-
-[NOTE]
-====
-As of Spring Framework 5.3, support for RxJava 1 is deprecated.
-====
-
+has built-in support for RxJava 3, Kotlin coroutines and SmallRye Mutiny, but you can
+register others, too.
 
 For functional APIs (such as <<webflux-fn>>, the `WebClient`, and others), the general rules
 for WebFlux APIs apply -- `Flux` and `Mono` as return values and a Reactive Streams

From 9ff0d717f2b0c56ff78701d62c88c1cc82cdce1a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 27 Sep 2021 16:52:11 +0200
Subject: [PATCH 151/735] Restore lenient fallback in case of several
 non-public constructors

See gh-27437
---
 .../java/org/springframework/beans/BeanUtils.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index f7708247d786..9483d18871f5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -254,14 +254,13 @@ else if (ctors.length == 0){
 				return (Constructor<T>) ctors[0];
 			}
 		}
-		else {
-			// Several public constructors -> let's take the default constructor
-			try {
-				return clazz.getDeclaredConstructor();
-			}
-			catch (NoSuchMethodException ex) {
-				// Giving up...
-			}
+
+		// Several constructors -> let's try to take the default constructor
+		try {
+			return clazz.getDeclaredConstructor();
+		}
+		catch (NoSuchMethodException ex) {
+			// Giving up...
 		}
 
 		// No unique constructor at all

From b0c424b37645c79447216e28b85a3da496bb11b5 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 27 Sep 2021 16:56:28 +0200
Subject: [PATCH 152/735] Deprecate RxJava 2 in favor of RxJava 3

Closes gh-27474
---
 .../core/ReactiveAdapterRegistry.java         | 143 ++++++++----------
 .../core/ReactiveAdapterRegistryTests.java    |  49 +++---
 src/docs/asciidoc/web-reactive.adoc           |  22 ++-
 3 files changed, 99 insertions(+), 115 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index cbed55a289c4..0193dff6c256 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -44,12 +44,11 @@
  * {@code Observable}, and others.
  *
  * <p>By default, depending on classpath availability, adapters are registered
- * for Reactor, RxJava 2/3, or RxJava 1 (+ RxJava Reactive Streams bridge),
- * {@link CompletableFuture}, Java 9+ {@code Flow.Publisher}, and Kotlin
- * Coroutines' {@code Deferred} and {@code Flow}.
+ * for Reactor, RxJava 3, {@link CompletableFuture}, {@code Flow.Publisher},
+ * and Kotlin Coroutines' {@code Deferred} and {@code Flow}.
  *
- * <p><strong>Note:</strong> As of Spring Framework 5.3, support for RxJava 1.x
- * is deprecated in favor of RxJava 2 and 3.
+ * <p><strong>Note:</strong> As of Spring Framework 5.3.11, support for
+ * RxJava 1.x and 2.x is deprecated in favor of RxJava 3.
  *
  * @author Rossen Stoyanchev
  * @author Sebastien Deleuze
@@ -103,15 +102,13 @@ public ReactiveAdapterRegistry() {
 			}
 		}
 
-		// RxJava1 (deprecated)
+		// RxJava
 		if (rxjava1Present) {
 			new RxJava1Registrar().registerAdapters(this);
 		}
-		// RxJava2
 		if (rxjava2Present) {
 			new RxJava2Registrar().registerAdapters(this);
 		}
-		// RxJava3
 		if (rxjava3Present) {
 			new RxJava3Registrar().registerAdapters(this);
 		}
@@ -219,6 +216,29 @@ public static ReactiveAdapterRegistry getSharedInstance() {
 	}
 
 
+	/**
+	 * ReactiveAdapter variant that wraps adapted Publishers as {@link Flux} or
+	 * {@link Mono} depending on {@link ReactiveTypeDescriptor#isMultiValue()}.
+	 * This is important in places where only the stream and stream element type
+	 * information is available like encoders and decoders.
+	 */
+	private static class ReactorAdapter extends ReactiveAdapter {
+
+		ReactorAdapter(ReactiveTypeDescriptor descriptor,
+				Function<Object, Publisher<?>> toPublisherFunction,
+				Function<Publisher<?>, Object> fromPublisherFunction) {
+
+			super(descriptor, toPublisherFunction, fromPublisherFunction);
+		}
+
+		@Override
+		public <T> Publisher<T> toPublisher(@Nullable Object source) {
+			Publisher<T> publisher = super.toPublisher(source);
+			return (isMultiValue() ? Flux.from(publisher) : Mono.from(publisher));
+		}
+	}
+
+
 	private static class ReactorRegistrar {
 
 		void registerAdapters(ReactiveAdapterRegistry registry) {
@@ -227,8 +247,7 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleOptionalValue(Mono.class, Mono::empty),
 					source -> (Mono<?>) source,
-					Mono::from
-			);
+					Mono::from);
 
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(Flux.class, Flux::empty),
@@ -243,8 +262,15 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.nonDeferredAsyncValue(CompletionStage.class, EmptyCompletableFuture::new),
 					source -> Mono.fromCompletionStage((CompletionStage<?>) source),
-					source -> Mono.from(source).toFuture()
-			);
+					source -> Mono.from(source).toFuture());
+		}
+	}
+
+
+	private static class EmptyCompletableFuture<T> extends CompletableFuture<T> {
+
+		EmptyCompletableFuture() {
+			complete(null);
 		}
 	}
 
@@ -268,8 +294,7 @@ void registerAdapter(ReactiveAdapterRegistry registry) {
 				registry.registerReactiveType(
 						ReactiveTypeDescriptor.multiValue(publisherClass, () -> emptyFlow),
 						source -> (Publisher<?>) ReflectionUtils.invokeMethod(toFluxMethod, null, source),
-						publisher -> ReflectionUtils.invokeMethod(toFlowMethod, null, publisher)
-				);
+						publisher -> ReflectionUtils.invokeMethod(toFlowMethod, null, publisher));
 			}
 			catch (Throwable ex) {
 				// Ignore
@@ -284,18 +309,17 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(rx.Observable.class, rx.Observable::empty),
 					source -> RxReactiveStreams.toPublisher((rx.Observable<?>) source),
-					RxReactiveStreams::toObservable
-			);
+					RxReactiveStreams::toObservable);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleRequiredValue(rx.Single.class),
 					source -> RxReactiveStreams.toPublisher((rx.Single<?>) source),
-					RxReactiveStreams::toSingle
-			);
+					RxReactiveStreams::toSingle);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.noValue(rx.Completable.class, rx.Completable::complete),
 					source -> RxReactiveStreams.toPublisher((rx.Completable) source),
-					RxReactiveStreams::toCompletable
-			);
+					RxReactiveStreams::toCompletable);
 		}
 	}
 
@@ -306,29 +330,28 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(io.reactivex.Flowable.class, io.reactivex.Flowable::empty),
 					source -> (io.reactivex.Flowable<?>) source,
-					io.reactivex.Flowable::fromPublisher
-			);
+					io.reactivex.Flowable::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(io.reactivex.Observable.class, io.reactivex.Observable::empty),
 					source -> ((io.reactivex.Observable<?>) source).toFlowable(io.reactivex.BackpressureStrategy.BUFFER),
-					io.reactivex.Observable::fromPublisher
-			);
+					io.reactivex.Observable::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleRequiredValue(io.reactivex.Single.class),
 					source -> ((io.reactivex.Single<?>) source).toFlowable(),
-					io.reactivex.Single::fromPublisher
-			);
+					io.reactivex.Single::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleOptionalValue(io.reactivex.Maybe.class, io.reactivex.Maybe::empty),
 					source -> ((io.reactivex.Maybe<?>) source).toFlowable(),
 					source -> io.reactivex.Flowable.fromPublisher(source)
-							.toObservable().singleElement()
-			);
+							.toObservable().singleElement());
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.noValue(io.reactivex.Completable.class, io.reactivex.Completable::complete),
 					source -> ((io.reactivex.Completable) source).toFlowable(),
-					io.reactivex.Completable::fromPublisher
-			);
+					io.reactivex.Completable::fromPublisher);
 		}
 	}
 
@@ -341,66 +364,34 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 							io.reactivex.rxjava3.core.Flowable.class,
 							io.reactivex.rxjava3.core.Flowable::empty),
 					source -> (io.reactivex.rxjava3.core.Flowable<?>) source,
-					io.reactivex.rxjava3.core.Flowable::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Flowable::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(
 							io.reactivex.rxjava3.core.Observable.class,
 							io.reactivex.rxjava3.core.Observable::empty),
 					source -> ((io.reactivex.rxjava3.core.Observable<?>) source).toFlowable(
 							io.reactivex.rxjava3.core.BackpressureStrategy.BUFFER),
-					io.reactivex.rxjava3.core.Observable::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Observable::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleRequiredValue(io.reactivex.rxjava3.core.Single.class),
 					source -> ((io.reactivex.rxjava3.core.Single<?>) source).toFlowable(),
-					io.reactivex.rxjava3.core.Single::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Single::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.singleOptionalValue(
 							io.reactivex.rxjava3.core.Maybe.class,
 							io.reactivex.rxjava3.core.Maybe::empty),
 					source -> ((io.reactivex.rxjava3.core.Maybe<?>) source).toFlowable(),
-					io.reactivex.rxjava3.core.Maybe::fromPublisher
-			);
+					io.reactivex.rxjava3.core.Maybe::fromPublisher);
+
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.noValue(
 							io.reactivex.rxjava3.core.Completable.class,
 							io.reactivex.rxjava3.core.Completable::complete),
 					source -> ((io.reactivex.rxjava3.core.Completable) source).toFlowable(),
-					io.reactivex.rxjava3.core.Completable::fromPublisher
-			);
-		}
-	}
-
-
-	/**
-	 * ReactiveAdapter variant that wraps adapted Publishers as {@link Flux} or
-	 * {@link Mono} depending on {@link ReactiveTypeDescriptor#isMultiValue()}.
-	 * This is important in places where only the stream and stream element type
-	 * information is available like encoders and decoders.
-	 */
-	private static class ReactorAdapter extends ReactiveAdapter {
-
-		ReactorAdapter(ReactiveTypeDescriptor descriptor,
-				Function<Object, Publisher<?>> toPublisherFunction,
-				Function<Publisher<?>, Object> fromPublisherFunction) {
-
-			super(descriptor, toPublisherFunction, fromPublisherFunction);
-		}
-
-		@Override
-		public <T> Publisher<T> toPublisher(@Nullable Object source) {
-			Publisher<T> publisher = super.toPublisher(source);
-			return (isMultiValue() ? Flux.from(publisher) : Mono.from(publisher));
-		}
-	}
-
-
-	private static class EmptyCompletableFuture<T> extends CompletableFuture<T> {
-
-		EmptyCompletableFuture() {
-			complete(null);
+					io.reactivex.rxjava3.core.Completable::fromPublisher);
 		}
 	}
 
@@ -418,8 +409,7 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(kotlinx.coroutines.flow.Flow.class, kotlinx.coroutines.flow.FlowKt::emptyFlow),
 					source -> kotlinx.coroutines.reactor.ReactorFlowKt.asFlux((kotlinx.coroutines.flow.Flow<?>) source),
-					kotlinx.coroutines.reactive.ReactiveFlowKt::asFlow
-			);
+					kotlinx.coroutines.reactive.ReactiveFlowKt::asFlow);
 		}
 	}
 
@@ -432,16 +422,14 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 							io.smallrye.mutiny.Uni.class,
 							() -> io.smallrye.mutiny.Uni.createFrom().nothing()),
 					uni -> ((io.smallrye.mutiny.Uni<?>) uni).convert().toPublisher(),
-					publisher -> io.smallrye.mutiny.Uni.createFrom().publisher(publisher)
-			);
+					publisher -> io.smallrye.mutiny.Uni.createFrom().publisher(publisher));
 
 			registry.registerReactiveType(
 					ReactiveTypeDescriptor.multiValue(
 							io.smallrye.mutiny.Multi.class,
 							() -> io.smallrye.mutiny.Multi.createFrom().empty()),
 					multi -> (io.smallrye.mutiny.Multi<?>) multi,
-					publisher -> io.smallrye.mutiny.Multi.createFrom().publisher(publisher)
-			);
+					publisher -> io.smallrye.mutiny.Multi.createFrom().publisher(publisher));
 		}
 	}
 
@@ -459,7 +447,6 @@ public static class SpringCoreBlockHoundIntegration implements BlockHoundIntegra
 
 		@Override
 		public void applyTo(BlockHound.Builder builder) {
-
 			// Avoid hard references potentially anywhere in spring-core (no need for structural dependency)
 
 			builder.allowBlockingCallsInside(
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index 579e1a463afc..25269a4c40fa 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
 
 /**
  * Unit tests for {@link ReactiveAdapterRegistry}.
+ *
  * @author Rossen Stoyanchev
  */
 @SuppressWarnings("unchecked")
@@ -42,16 +43,13 @@ class ReactiveAdapterRegistryTests {
 
 	private static final Duration ONE_SECOND = Duration.ofSeconds(1);
 
-
 	private final ReactiveAdapterRegistry registry = ReactiveAdapterRegistry.getSharedInstance();
 
 
 	@Test
 	void getAdapterForReactiveSubType() {
-
 		ReactiveAdapter adapter1 = getAdapter(Flux.class);
 		ReactiveAdapter adapter2 = getAdapter(ExtendedFlux.class);
-
 		assertThat(adapter2).isSameAs(adapter1);
 
 		this.registry.registerReactiveType(
@@ -60,17 +58,32 @@ void getAdapterForReactiveSubType() {
 				ExtendedFlux::from);
 
 		ReactiveAdapter adapter3 = getAdapter(ExtendedFlux.class);
-
 		assertThat(adapter3).isNotNull();
 		assertThat(adapter3).isNotSameAs(adapter1);
 	}
 
+
+	private ReactiveAdapter getAdapter(Class<?> reactiveType) {
+		ReactiveAdapter adapter = this.registry.getAdapter(reactiveType);
+		assertThat(adapter).isNotNull();
+		return adapter;
+	}
+
+
+	private static class ExtendedFlux<T> extends Flux<T> {
+
+		@Override
+		public void subscribe(CoreSubscriber<? super T> actual) {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+
 	@Nested
 	class Reactor {
 
 		@Test
 		void defaultAdapterRegistrations() {
-
 			// Reactor
 			assertThat(getAdapter(Mono.class)).isNotNull();
 			assertThat(getAdapter(Flux.class)).isNotNull();
@@ -117,6 +130,7 @@ void fromCompletableFuture() {
 		}
 	}
 
+
 	@Nested
 	class RxJava1 {
 
@@ -178,12 +192,12 @@ void fromCompletable() {
 		}
 	}
 
+
 	@Nested
 	class RxJava2 {
 
 		@Test
 		void defaultAdapterRegistrations() {
-
 			// RxJava 2
 			assertThat(getAdapter(io.reactivex.Flowable.class)).isNotNull();
 			assertThat(getAdapter(io.reactivex.Observable.class)).isNotNull();
@@ -261,12 +275,12 @@ void fromCompletable() {
 		}
 	}
 
+
 	@Nested
 	class RxJava3 {
 
 		@Test
 		void defaultAdapterRegistrations() {
-
 			// RxJava 3
 			assertThat(getAdapter(io.reactivex.rxjava3.core.Flowable.class)).isNotNull();
 			assertThat(getAdapter(io.reactivex.rxjava3.core.Observable.class)).isNotNull();
@@ -344,12 +358,12 @@ void fromCompletable() {
 		}
 	}
 
+
 	@Nested
 	class Kotlin {
 
 		@Test
 		void defaultAdapterRegistrations() {
-
 			// Coroutines
 			assertThat(getAdapter(Deferred.class)).isNotNull();
 		}
@@ -362,6 +376,7 @@ void deferred() {
 		}
 	}
 
+
 	@Nested
 	class Mutiny {
 
@@ -404,22 +419,6 @@ void fromMulti() {
 			assertThat(target).isInstanceOf(Flux.class);
 			assertThat(((Flux<Integer>) target).blockLast(ONE_SECOND)).isEqualTo(Integer.valueOf(3));
 		}
-
-	}
-
-	private ReactiveAdapter getAdapter(Class<?> reactiveType) {
-		ReactiveAdapter adapter = this.registry.getAdapter(reactiveType);
-		assertThat(adapter).isNotNull();
-		return adapter;
-	}
-
-
-	private static class ExtendedFlux<T> extends Flux<T> {
-
-		@Override
-		public void subscribe(CoreSubscriber<? super T> actual) {
-			throw new UnsupportedOperationException();
-		}
 	}
 
 }
diff --git a/src/docs/asciidoc/web-reactive.adoc b/src/docs/asciidoc/web-reactive.adoc
index 5609f0ba5361..00d358f97d36 100644
--- a/src/docs/asciidoc/web-reactive.adoc
+++ b/src/docs/asciidoc/web-reactive.adoc
@@ -34,8 +34,6 @@ discussion of mock objects.
 response objects to provide support for testing WebFlux applications without an HTTP
 server. You can use the `WebTestClient` for end-to-end integration tests, too.
 
-
-
 include::rsocket.adoc[leveloffset=+1]
 
 
@@ -51,21 +49,21 @@ it helps to express cardinality -- for example, whether a single or multiple asy
 values are expected, and that can be essential for making decisions (for example, when
 encoding or decoding HTTP messages).
 
-For annotated controllers, WebFlux transparently adapts to the reactive library chosen by
-the application. This is done with the help of the
-{api-spring-framework}/core/ReactiveAdapterRegistry.html[`ReactiveAdapterRegistry`], which
-provides pluggable support for reactive library and other asynchronous types. The registry
-has built-in support for RxJava 2/3, RxJava 1 (via RxJava Reactive Streams bridge), and
-`CompletableFuture`, but you can register others, too.
+For annotated controllers, WebFlux transparently adapts to the reactive library chosen
+by the application. This is done with the help of the
+{api-spring-framework}/core/ReactiveAdapterRegistry.html[`ReactiveAdapterRegistry`]
+which provides pluggable support for reactive library and other asynchronous types.
+The registry has built-in support for RxJava 3, Kotlin coroutines and SmallRye Mutiny,
+but you can register other third-party adapters as well.
 
 [NOTE]
 ====
-As of Spring Framework 5.3, support for RxJava 1 is deprecated.
+As of Spring Framework 5.3.11, support for RxJava 1 and 2 is deprecated, following
+RxJava's own EOL advice and the upgrade recommendation towards RxJava 3.
 ====
 
-
-For functional APIs (such as <<webflux-fn>>, the `WebClient`, and others), the general rules
-for WebFlux APIs apply -- `Flux` and `Mono` as return values and a Reactive Streams
+For functional APIs (such as <<webflux-fn>>, the `WebClient`, and others), the general
+rules for WebFlux APIs apply -- `Flux` and `Mono` as return values and a Reactive Streams
 `Publisher` as input. When a `Publisher`, whether custom or from another reactive library,
 is provided, it can be treated only as a stream with unknown semantics (0..N). If, however,
 the semantics are known, you can wrap it with `Flux` or `Mono.from(Publisher)` instead

From 211f0bbf885a3d291f45c4a10db6cc5c0243b14f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 27 Sep 2021 16:57:54 +0200
Subject: [PATCH 153/735] Fix invalid characters in source files

Closes gh-27475
---
 .../beans/factory/support/AbstractBeanFactory.java         | 4 ++--
 .../java/org/springframework/expression/BeanResolver.java  | 6 +++---
 .../org/springframework/expression/TypeComparator.java     | 7 ++++---
 .../springframework/expression/spel/ast/BeanReference.java | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index 562c00fd55f1..e36cef415730 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -361,7 +361,7 @@ else if (mbd.isPrototype()) {
 				else {
 					String scopeName = mbd.getScope();
 					if (!StringUtils.hasLength(scopeName)) {
-						throw new IllegalStateException("No scope name defined for bean ´" + beanName + "'");
+						throw new IllegalStateException("No scope name defined for bean '" + beanName + "'");
 					}
 					Scope scope = this.scopes.get(scopeName);
 					if (scope == null) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
index eabeb9f495b5..7530c36f6ee3 100644
--- a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 /**
  * A bean resolver can be registered with the evaluation context and will kick in
  * for bean references: {@code @myBeanName} and {@code &myBeanName} expressions.
- * The <tt>&</tt> variant syntax allows access to the factory bean where relevant.
+ * The {@code &} variant syntax allows access to the factory bean where relevant.
  *
  * @author Andy Clement
  * @since 3.0.3
@@ -28,7 +28,7 @@ public interface BeanResolver {
 
 	/**
 	 * Look up a bean by the given name and return a corresponding instance for it.
-	 * For attempting access to a factory bean, the name needs a <tt>&</tt> prefix.
+	 * For attempting access to a factory bean, the name needs a {@code &} prefix.
 	 * @param context the current evaluation context
 	 * @param beanName the name of the bean to look up
 	 * @return an object representing the bean
diff --git a/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
index 7696cd7f6dcb..88d07d39fb8e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,10 +40,11 @@ public interface TypeComparator {
 	 * Compare two given objects.
 	 * @param firstObject the first object
 	 * @param secondObject the second object
-	 * @return 0 if they are equal, <0 if the first is smaller than the second,
-	 * or >0 if the first is larger than the second
+	 * @return 0 if they are equal, a negative integer if the first is smaller than
+	 * the second, or a positive integer if the first is larger than the second
 	 * @throws EvaluationException if a problem occurs during comparison
 	 * (or if they are not comparable in the first place)
+	 * @see Comparable#compareTo
 	 */
 	int compare(@Nullable Object firstObject, @Nullable Object secondObject) throws EvaluationException;
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
index 6e128dae6119..5f1d2adeb315 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
@@ -25,8 +25,8 @@
 import org.springframework.expression.spel.SpelMessage;
 
 /**
- * Represents a bean reference to a type, for example <tt>@foo</tt> or <tt>@'foo.bar'</tt>.
- * For a FactoryBean the syntax <tt>&foo</tt> can be used to access the factory itself.
+ * Represents a bean reference to a type, for example {@code @foo} or {@code @'foo.bar'}.
+ * For a FactoryBean the syntax {@code &foo} can be used to access the factory itself.
  *
  * @author Andy Clement
  */

From d8e18f56e1e0e9395bcac437cb39c0454dcf56da Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 27 Sep 2021 17:01:18 +0200
Subject: [PATCH 154/735] Upgrade to Protobuf 3.18, Rome 1.16, BlockHound
 1.0.6, Caffeine 2.9.2, Groovy 3.0.9, Tomcat 9.0.53

---
 build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 81193a9f2f1d..7ce2cb25d185 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,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.9') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
@@ -69,7 +69,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
 			dependency "io.smallrye.reactive:mutiny:1.0.0"
-			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
+			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
 			dependency "com.fasterxml:aalto-xml:1.3.0"
@@ -77,7 +77,7 @@ configure(allprojects) { project ->
 				exclude group: "stax", name: "stax-api"
 			}
 			dependency "com.google.code.gson:gson:2.8.8"
-			dependency "com.google.protobuf:protobuf-java-util:3.17.3"
+			dependency "com.google.protobuf:protobuf-java-util:3.18.0"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
 			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
 				exclude group: "xpp3", name: "xpp3_min"
@@ -95,9 +95,9 @@ configure(allprojects) { project ->
 			dependency "org.yaml:snakeyaml:1.29"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.9.1"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.9.2"
 			dependency "com.github.librepdf:openpdf:1.3.26"
-			dependency "com.rometools:rome:1.15.0"
+			dependency "com.rometools:rome:1.16.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"
@@ -128,14 +128,14 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.52') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.53') {
 				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.52') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.53') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}

From 119c78b1c98364b244aaa9e082660b8d559a6c52 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 27 Sep 2021 17:11:12 +0200
Subject: [PATCH 155/735] Skip flaky StopWatch time assertions

---
 .../src/test/java/org/springframework/util/StopWatchTests.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
index 792c2f546aab..83eb5adbec63 100644
--- a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
@@ -97,6 +97,8 @@ void validUsage() throws Exception {
 		assertThat(stopWatch.currentTaskName()).isEqualTo(name2);
 		stopWatch.stop();
 		assertThat(stopWatch.isRunning()).isFalse();
+
+		/* Flaky StopWatch time assertions...
 		assertThat(stopWatch.getLastTaskTimeNanos())
 			.as("last task time in nanoseconds for task #2")
 			.isGreaterThanOrEqualTo(millisToNanos(duration2))
@@ -109,6 +111,7 @@ void validUsage() throws Exception {
 			.as("total time in seconds for task #2")
 			.isGreaterThanOrEqualTo((duration1 + duration2 - fudgeFactor) / 1000.0)
 			.isLessThanOrEqualTo((duration1 + duration2 + fudgeFactor) / 1000.0);
+		*/
 
 		assertThat(stopWatch.getTaskCount()).isEqualTo(2);
 		assertThat(stopWatch.prettyPrint()).contains(name1, name2);

From d4839921776c92de5b78d455ed78d8f86298f2b3 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 27 Sep 2021 18:30:09 +0200
Subject: [PATCH 156/735] Upgrade to Caffeine 3.0.4 and Vavr 0.10.4

Includes removal of unused Hessian dependency.
---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a98d4bff62d7..14fc6abb2138 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,6 @@ configure(allprojects) { project ->
 			dependency "io.smallrye.reactive:mutiny:1.0.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 
-			dependency "com.caucho:hessian:4.0.63"
 			dependency "com.fasterxml:aalto-xml:1.3.0"
 			dependency("com.fasterxml.woodstox:woodstox-core:6.2.6") {
 				exclude group: "stax", name: "stax-api"
@@ -88,11 +87,11 @@ configure(allprojects) { project ->
 			dependency "org.yaml:snakeyaml:1.29"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.9.2"
+			dependency "com.github.ben-manes.caffeine:caffeine:3.0.4"
 			dependency "com.github.librepdf:openpdf:1.3.26"
 			dependency "com.rometools:rome:1.16.0"
 			dependency "commons-io:commons-io:2.5"
-			dependency "io.vavr:vavr:0.10.3"
+			dependency "io.vavr:vavr:0.10.4"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
 			dependencySet(group: 'org.apache.activemq', version: '5.16.2') {
 				entry 'activemq-broker'

From 2567b2094962e7f779a6e85ca1af2a727a521107 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 28 Sep 2021 10:28:19 +0200
Subject: [PATCH 157/735] Upgrade to spring-javaformat 0.0.28 and downgrade to
 Checkstyle 8.41

In order to be able to use text blocks and other new Java language
features, we are upgrading to a recent version of Checkstyle.

The latest version of spring-javaformat-checkstyle (0.0.28) is built
against Checkstyle 8.32 which does not include support for language
features such as text blocks. Support for text blocks was added in
Checkstyle 8.36.

In addition, there is a binary compatibility issue between
spring-javaformat-checkstyle 0.0.28 and Checkstyle 8.42. Thus we cannot
use Checkstyle 8.42 or higher.

In this commit, we therefore upgrade to spring-javaformat-checkstyle
0.0.28 and downgrade to Checkstyle 8.41.

This change is being applied to `5.3.x` as well as `main` in order to
benefit from the enhanced checking provided in more recent versions of
Checkstyle.

Closes gh-27481
---
 build.gradle                                     |  5 +++--
 .../aop/support/ControlFlowPointcut.java         |  4 ++--
 .../aop/support/ClassUtilsTests.java             |  8 +++++---
 .../factory/aspectj/ConfigurableObject.java      |  6 +++---
 .../aspectj/ClassWithPrivateAnnotatedMember.java |  2 ++
 .../ClassWithProtectedAnnotatedMember.java       |  2 ++
 .../security/support/CustomCallbackBean.java     |  4 +++-
 .../support/security/support/DestroyBean.java    |  4 +++-
 .../support/security/support/FactoryBean.java    |  4 +++-
 .../support/security/support/InitBean.java       |  4 +++-
 .../support/security/support/PropertyBean.java   |  4 +++-
 .../beans/testfixture/beans/DummyBean.java       |  4 +++-
 .../format/FormatterRegistrar.java               |  3 ++-
 .../scheduling/support/CronExpression.java       |  1 -
 .../aspectj/ImplicitJPArgumentMatchingTests.java |  1 +
 ...InvalidConfigurationClassDefinitionTests.java |  1 +
 .../core/codec/StringDecoderBenchmark.java       |  3 ++-
 .../core/annotation/TypeMappedAnnotation.java    |  2 +-
 .../core/codec/DecodingException.java            |  1 +
 .../core/codec/EncodingException.java            |  1 +
 .../core/env/AbstractEnvironment.java            | 16 ++++++++--------
 .../core/io/buffer/DataBufferLimitException.java |  3 ++-
 .../core/io/buffer/LimitedDataBufferList.java    |  3 ++-
 .../SpringCoreBlockHoundIntegrationTests.java    |  3 ++-
 .../io/buffer/LimitedDataBufferListTests.java    |  3 ++-
 .../MonoToListenableFutureAdapterTests.java      |  3 ++-
 .../spel/DefaultComparatorUnitTests.java         | 15 ++++++++-------
 .../spel/StandardTypeLocatorTests.java           | 11 ++++++-----
 .../spel/testdata/PersonInOtherPackage.java      |  5 +++--
 .../jdbc/core/CallableStatementCallback.java     |  3 +--
 .../jms/core/support/JmsGatewaySupportTests.java |  9 +++++----
 .../reactive/MessageMappingMessageHandler.java   |  1 -
 .../reactive/PayloadMethodArgumentResolver.java  |  2 --
 .../messaging/rsocket/MetadataEncoder.java       |  1 +
 .../messaging/rsocket/MetadataExtractor.java     |  1 +
 .../rsocket/RSocketConnectorConfigurer.java      |  1 +
 .../RSocketFrameTypeMessageCondition.java        |  1 +
 .../support/RSocketMessageHandler.java           |  1 -
 .../stomp/StompBrokerRelayMessageHandler.java    |  4 ++--
 .../simp/stomp/StompConversionException.java     |  1 +
 .../simp/stomp/StompReactorNettyCodec.java       |  1 +
 .../simp/stomp/StompTcpConnectionHandler.java    |  1 +
 .../simp/user/DestinationUserNameProvider.java   |  1 +
 .../messaging/tcp/reactor/ReactorNettyCodec.java |  1 +
 .../handler/annotation/MessagingPredicates.java  |  1 +
 .../MessageMappingMessageHandlerTests.java       |  1 +
 .../PayloadMethodArgumentResolverTests.java      |  1 +
 .../invocation/TestExceptionResolver.java        |  1 +
 .../EncoderMethodReturnValueHandlerTests.java    |  1 +
 .../TestEncoderMethodReturnValueHandler.java     |  2 ++
 .../rsocket/DefaultMetadataExtractorTests.java   |  1 +
 .../rsocket/LeakAwareNettyDataBufferFactory.java |  1 +
 .../messaging/rsocket/MetadataEncoderTests.java  |  1 +
 .../messaging/rsocket/PayloadUtilsTests.java     |  1 +
 .../support/RSocketMessageHandlerTests.java      |  1 +
 .../client/reactive/MockClientHttpRequest.java   |  1 -
 .../test/context/support/PropertyProvider.java   |  1 -
 .../context/support/TestConstructorUtils.java    |  7 -------
 .../testng/AbstractTestNGSpringContextTests.java |  1 -
 .../context/util/TestContextResourceUtils.java   |  1 -
 .../web/client/RequestExpectationManager.java    |  1 -
 .../server/MockServerClientHttpResponse.java     |  1 +
 .../test/web/reactive/server/WebTestClient.java  |  1 -
 .../test/web/servlet/ResultActions.java          |  3 ---
 .../test/web/servlet/ResultHandler.java          |  1 -
 .../test/web/servlet/SmartRequestBuilder.java    |  1 -
 .../client/AbstractMockMvcServerSpec.java        |  1 +
 .../client/ApplicationContextMockMvcSpec.java    |  1 +
 .../web/servlet/client/MockMvcHttpConnector.java |  1 +
 .../web/servlet/client/MockMvcWebTestClient.java |  3 +--
 .../servlet/client/StandaloneMockMvcSpec.java    |  1 +
 .../test/web/client/samples/SampleTests.java     |  1 +
 .../server/ApplicationContextSpecTests.java      |  1 +
 .../reactive/server/CookieAssertionTests.java    |  1 +
 .../server/DefaultRouterFunctionSpecTests.java   |  1 +
 .../web/reactive/server/MockServerSpecTests.java |  1 +
 .../web/reactive/server/MockServerTests.java     |  1 +
 .../server/samples/ExchangeMutatorTests.java     |  1 +
 .../samples/GlobalEntityResultConsumerTests.java |  1 +
 .../test/web/reactive/server/samples/Person.java |  1 +
 .../result/HeaderResultMatchersTests.java        |  1 +
 .../samples/client/standalone/AsyncTests.java    |  1 +
 .../standalone/ReactiveReturnTypeTests.java      |  1 +
 .../client/standalone/RequestParameterTests.java |  1 +
 .../samples/client/standalone/SseTests.java      |  1 +
 .../standalone/ReactiveReturnTypeTests.java      |  1 +
 .../standalone/RequestParameterTests.java        |  1 +
 .../SimpleBufferingAsyncClientHttpRequest.java   |  4 ++--
 .../client/reactive/JettyResourceFactory.java    |  2 +-
 .../codec/multipart/MultipartWriterSupport.java  |  1 +
 .../http/codec/protobuf/ProtobufDecoder.java     |  5 ++---
 .../springframework/http/server/RequestPath.java |  1 +
 .../reactive/ServerHttpResponseDecorator.java    |  1 +
 .../web/bind/MissingRequestValueException.java   |  1 +
 .../web/client/DefaultResponseErrorHandler.java  |  1 -
 .../web/client/RestOperations.java               |  1 -
 .../request/AsyncWebRequestInterceptor.java      |  2 +-
 .../web/cors/reactive/CorsUtils.java             |  1 -
 .../cors/reactive/PreFlightRequestWebFilter.java |  1 +
 .../filter/RelativeRedirectResponseWrapper.java  |  1 +
 .../web/filter/ServletRequestPathFilter.java     |  1 +
 .../web/server/ServerWebExchangeDecorator.java   |  1 +
 .../web/util/ServletRequestPathUtils.java        |  6 +++---
 .../org/springframework/web/util/WebUtils.java   |  1 -
 .../web/util/pattern/PathPatternParser.java      |  2 --
 .../reactive/ReactorResourceFactoryTests.java    |  1 +
 .../codec/CancelWithoutDemandCodecTests.java     |  1 +
 .../codec/ResourceHttpMessageReaderTests.java    |  1 +
 .../multipart/PartHttpMessageWriterTests.java    |  1 +
 .../http/server/DefaultRequestPathTests.java     |  1 +
 .../reactive/HttpHeadResponseDecoratorTests.java |  1 +
 .../web/cors/reactive/CorsWebFilterTests.java    |  2 +-
 .../ContentCachingResponseWrapperTests.java      |  1 +
 .../web/method/HandlerTypePredicateTests.java    |  1 +
 .../session/CookieWebSessionIdResolverTests.java |  1 +
 .../session/HeaderWebSessionIdResolverTests.java |  1 +
 .../web/util/ServletRequestPathUtilsTests.java   |  1 +
 .../server/MockServerWebExchange.java            |  1 +
 .../accept/ParameterContentTypeResolver.java     |  1 +
 .../config/ResourceHandlerRegistration.java      | 12 +++++-------
 .../function/client/ExchangeFilterFunction.java  |  1 -
 .../function/client/ExchangeFunction.java        |  1 -
 .../function/server/RequestPredicates.java       | 12 ++++++------
 .../reactive/function/server/ServerResponse.java |  1 -
 .../resource/ResourceTransformerSupport.java     |  1 -
 .../annotation/ArgumentResolverConfigurer.java   |  1 +
 .../annotation/SessionAttributesHandler.java     |  1 +
 .../web/reactive/result/view/Rendering.java      |  2 --
 .../result/view/RequestDataValueProcessor.java   |  1 +
 .../web/reactive/socket/WebSocketHandler.java    |  7 +++----
 .../web/reactive/socket/WebSocketMessage.java    |  1 +
 .../web/reactive/socket/WebSocketSession.java    |  1 +
 .../socket/adapter/ContextWebSocketHandler.java  |  1 +
 .../reactive/socket/client/WebSocketClient.java  |  1 +
 .../server/support/WebSocketHandlerAdapter.java  |  1 +
 .../ParameterContentTypeResolverTests.java       |  1 +
 ...RequestedContentTypeResolverBuilderTests.java |  1 +
 .../config/ViewResolverRegistryTests.java        |  1 +
 .../handler/CorsUrlHandlerMappingTests.java      |  1 +
 .../resource/PathResourceResolverTests.java      |  1 +
 ...xVariablesMapMethodArgumentResolverTests.java |  1 +
 ...trixVariablesMethodArgumentResolverTests.java |  1 +
 .../WebSessionMethodArgumentResolverTests.java   |  1 +
 .../reactive/result/view/ZeroDemandResponse.java |  1 +
 .../WebSocketUpgradeHandlerPredicateTests.java   |  1 +
 .../ReactorNettyRequestUpgradeStrategyTests.java |  1 +
 .../servlet/function/DefaultServerRequest.java   |  1 +
 .../web/servlet/function/RequestPredicates.java  | 12 ++++++------
 .../web/servlet/function/ServerRequest.java      |  1 -
 .../web/servlet/function/ServerResponse.java     |  2 --
 .../PathPatternMatchableHandlerMapping.java      |  1 +
 .../annotation/MvcUriComponentsBuilder.java      |  2 --
 .../method/annotation/StreamingResponseBody.java |  1 +
 .../servlet/handler/MappedInterceptorTests.java  |  1 +
 .../servlet/handler/PathPatternsTestUtils.java   |  1 +
 .../mvc/method/annotation/SseEmitterTests.java   |  1 +
 .../resource/PathResourceResolverTests.java      |  1 +
 .../ResourceTransformerSupportTests.java         |  1 +
 .../resource/ResourceUrlEncodingFilterTests.java |  1 +
 .../resource/VersionResourceResolverTests.java   |  1 +
 .../servlet/support/MockFilterRegistration.java  |  1 +
 .../support/WebContentGeneratorTests.java        |  1 +
 .../view/tiles3/TilesViewResolverTests.java      |  4 +++-
 .../web/servlet/view/tiles3/TilesViewTests.java  |  3 ++-
 .../StompWebSocketEndpointRegistration.java      |  1 -
 .../annotation/WebSocketHandlerRegistration.java |  1 -
 .../support/OriginHandshakeInterceptor.java      |  1 -
 .../sockjs/support/AbstractSockJsService.java    |  1 -
 .../socket/handler/BlockingWebSocketSession.java |  1 +
 .../OrderedMessageSendingIntegrationTests.java   |  1 +
 .../StompSubProtocolErrorHandlerTests.java       |  1 +
 .../support/WebSocketHandlerMappingTests.java    |  1 +
 src/checkstyle/checkstyle.xml                    |  2 --
 173 files changed, 221 insertions(+), 138 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ce2cb25d185..ba209903d9b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.45.1"
+		toolVersion = "8.41"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
@@ -362,7 +362,8 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.15")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.28")
+		checkstyle("com.puppycrawl.tools:checkstyle:8.41")
 	}
 
 	ext.javadocLinks = [
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
index 6adeea047758..1c4dd8bf43fa 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + methodName;
+		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + this.methodName;
 	}
 
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
index 6eac64eb77b8..f1fffbdf9cb4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.aop.support;
 
 import org.junit.jupiter.api.Test;
@@ -29,10 +30,10 @@
  * @author Rob Harrop
  * @author Rick Evans
  */
-public class ClassUtilsTests {
+class ClassUtilsTests {
 
 	@Test
-	public void getShortNameForCglibClass() {
+	void getShortNameForCglibClass() {
 		TestBean tb = new TestBean();
 		ProxyFactory pf = new ProxyFactory();
 		pf.setTarget(tb);
@@ -41,4 +42,5 @@ public void getShortNameForCglibClass() {
 		String className = ClassUtils.getShortName(proxy.getClass());
 		assertThat(className).as("Class name did not match").isEqualTo("TestBean");
 	}
+
 }
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
index c670dfc06927..02e0d6391fb4 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.aspectj;
 
 /**
- * Marker interface for domain object that need DI through aspects.
+ * Marker interface for domain objects that need DI through aspects.
  *
  * @author Ramnivas Laddad
  * @since 2.5
  */
 public interface ConfigurableObject {
-
 }
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
index 7d5b2e6d8376..d0d824c1db73 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
@@ -29,4 +30,5 @@ public void doSomething() {
 
 	@Transactional
 	private void doInTransaction() {}
+
 }
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
index 359eab233cb0..12c5db965d87 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
@@ -29,4 +30,5 @@ public void doSomething() {
 
 	@Transactional
 	protected void doInTransaction() {}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
index 4874306e6e12..5f46a7b57b60 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -27,4 +28,5 @@ public void init() {
 	public void destroy() {
 		System.setProperty("security.destroy", "true");
 	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
index 67005abf7836..4ec5a23a5b9d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 import org.springframework.beans.factory.DisposableBean;
@@ -26,4 +27,5 @@ public class DestroyBean implements DisposableBean {
 	public void destroy() throws Exception {
 		System.setProperty("security.destroy", "true");
 	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
index 4f7fb62e5be2..71258d70f04b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -33,4 +34,5 @@ public Object makeInstance() {
 		System.getProperties();
 		return new Object();
 	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
index 3693bb9d749e..b079dae5cb2d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 import org.springframework.beans.factory.InitializingBean;
@@ -26,4 +27,5 @@ public class InitBean implements InitializingBean {
 	public void afterPropertiesSet() throws Exception {
 		System.getProperties();
 	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
index 51933137f0da..d9091163f5d0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -27,4 +28,5 @@ public void setSecurityProperty(Object property) {
 	public void setProperty(Object property) {
 
 	}
+
 }
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java
index cac5cced1c8a..82f40bae28ab 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.testfixture.beans;
 
 /**
@@ -65,4 +66,5 @@ public int getAge() {
 	public TestBean getSpouse() {
 		return spouse;
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
index 84c1fba83338..dc4bc542dbbb 100644
--- a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.format;
 
 import org.springframework.core.convert.converter.Converter;
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java
index f3845847a3ce..e2e6687055e3 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java
@@ -171,7 +171,6 @@ private CronExpression(
 	 * <li>{@code "@daily"} (or {@code "@midnight"}) to run once a day, i.e. {@code "0 0 0 * * *"},</li>
 	 * <li>{@code "@hourly"} to run once an hour, i.e. {@code "0 0 * * * *"}.</li>
 	 * </ul>
-	 *
 	 * @param expression the expression string to parse
 	 * @return the parsed {@code CronExpression} object
 	 * @throws IllegalArgumentException in the expression does not conform to
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
index 7e3b0e761a3c..1ed5f07faf39 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.aop.aspectj;
 
 import org.aspectj.lang.ProceedingJoinPoint;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
index d2114d8c345e..2885637b0605 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.context.annotation;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-core/src/jmh/java/org/springframework/core/codec/StringDecoderBenchmark.java b/spring-core/src/jmh/java/org/springframework/core/codec/StringDecoderBenchmark.java
index cbf36d01ad10..8badd54f6f8d 100644
--- a/spring-core/src/jmh/java/org/springframework/core/codec/StringDecoderBenchmark.java
+++ b/spring-core/src/jmh/java/org/springframework/core/codec/StringDecoderBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.codec;
 
 import java.nio.charset.Charset;
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
index ede74c09baf7..06aa93d7d5a3 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
@@ -573,7 +573,7 @@ private ClassLoader getClassLoader() {
 		}
 		if (this.source != null) {
 			if (this.source instanceof Class) {
-				return ((Class<?>) source).getClassLoader();
+				return ((Class<?>) this.source).getClassLoader();
 			}
 			if (this.source instanceof Member) {
 				((Member) this.source).getDeclaringClass().getClassLoader();
diff --git a/spring-core/src/main/java/org/springframework/core/codec/DecodingException.java b/spring-core/src/main/java/org/springframework/core/codec/DecodingException.java
index f2ec58abffcb..c825f08e8a38 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/DecodingException.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/DecodingException.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.codec;
 
 import org.springframework.lang.Nullable;
diff --git a/spring-core/src/main/java/org/springframework/core/codec/EncodingException.java b/spring-core/src/main/java/org/springframework/core/codec/EncodingException.java
index 015c01344fcc..7d9f7a1a1b12 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/EncodingException.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/EncodingException.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.codec;
 
 import org.springframework.lang.Nullable;
diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index 5fa9aa45d2c8..d4027e16f367 100644
--- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -138,7 +138,6 @@ protected AbstractEnvironment(MutablePropertySources propertySources) {
 		customizePropertySources(propertySources);
 	}
 
-
 	/**
 	 * Factory method used to create the {@link ConfigurablePropertyResolver}
 	 * instance used by the Environment.
@@ -168,6 +167,7 @@ protected final ConfigurablePropertyResolver getPropertyResolver() {
 	 * sources using {@link MutablePropertySources#addLast(PropertySource)} such that
 	 * further subclasses may call {@code super.customizePropertySources()} with
 	 * predictable results. For example:
+	 *
 	 * <pre class="code">
 	 * public class Level1Environment extends AbstractEnvironment {
 	 *     &#064;Override
@@ -187,11 +187,13 @@ protected final ConfigurablePropertyResolver getPropertyResolver() {
 	 *     }
 	 * }
 	 * </pre>
-	 * In this arrangement, properties will be resolved against sources A, B, C, D in that
+	 *
+	 * <p>In this arrangement, properties will be resolved against sources A, B, C, D in that
 	 * order. That is to say that property source "A" has precedence over property source
 	 * "D". If the {@code Level2Environment} subclass wished to give property sources C
 	 * and D higher precedence than A and B, it could simply call
 	 * {@code super.customizePropertySources} after, rather than before adding its own:
+	 *
 	 * <pre class="code">
 	 * public class Level2Environment extends Level1Environment {
 	 *     &#064;Override
@@ -202,25 +204,24 @@ protected final ConfigurablePropertyResolver getPropertyResolver() {
 	 *     }
 	 * }
 	 * </pre>
-	 * The search order is now C, D, A, B as desired.
 	 *
-	 * <p>Beyond these recommendations, subclasses may use any of the {@code add&#42;},
+	 * <p>The search order is now C, D, A, B as desired.
+	 * <p>Beyond these recommendations, subclasses may use any of the {@code add*},
 	 * {@code remove}, or {@code replace} methods exposed by {@link MutablePropertySources}
 	 * in order to create the exact arrangement of property sources desired.
-	 *
 	 * <p>The base implementation registers no property sources.
-	 *
 	 * <p>Note that clients of any {@link ConfigurableEnvironment} may further customize
 	 * property sources via the {@link #getPropertySources()} accessor, typically within
 	 * an {@link org.springframework.context.ApplicationContextInitializer
 	 * ApplicationContextInitializer}. For example:
+	 *
 	 * <pre class="code">
 	 * ConfigurableEnvironment env = new StandardEnvironment();
 	 * env.getPropertySources().addLast(new PropertySourceX(...));
 	 * </pre>
 	 *
 	 * <h2>A warning about instance variable access</h2>
-	 * Instance variables declared in subclasses and having default initial values should
+	 * <p>Instance variables declared in subclasses and having default initial values should
 	 * <em>not</em> be accessed from within this method. Due to Java object creation
 	 * lifecycle constraints, any initial value will not yet be assigned when this
 	 * callback is invoked by the {@link #AbstractEnvironment()} constructor, which may
@@ -229,7 +230,6 @@ protected final ConfigurablePropertyResolver getPropertyResolver() {
 	 * property source manipulation and instance variable access directly within the
 	 * subclass constructor. Note that <em>assigning</em> values to instance variables is
 	 * not problematic; it is only attempting to read default values that must be avoided.
-	 *
 	 * @see MutablePropertySources
 	 * @see PropertySourcesPropertyResolver
 	 * @see org.springframework.context.ApplicationContextInitializer
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java
index c03839056bb3..709e21e6abfa 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.io.buffer;
 
 /**
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/LimitedDataBufferList.java b/spring-core/src/main/java/org/springframework/core/io/buffer/LimitedDataBufferList.java
index d95e426d3852..62fa289e7c37 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/LimitedDataBufferList.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/LimitedDataBufferList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.io.buffer;
 
 import java.util.ArrayList;
diff --git a/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java b/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
index f2245eff20dd..ea4b7fbbd552 100644
--- a/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
+++ b/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core;
 
 import java.lang.reflect.Method;
diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/LimitedDataBufferListTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/LimitedDataBufferListTests.java
index 971cd1212061..20a48616b82b 100644
--- a/spring-core/src/test/java/org/springframework/core/io/buffer/LimitedDataBufferListTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/buffer/LimitedDataBufferListTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.io.buffer;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java
index bea1a0dac0f5..e40e8aa79e24 100644
--- a/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java
+++ b/spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.util.concurrent;
 
 import java.time.Duration;
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
index edc88bdebeb8..eeb23b4d4152 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.expression.spel;
 
 import java.math.BigDecimal;
@@ -31,10 +32,10 @@
  * @author Andy Clement
  * @author Giovanni Dall'Oglio Risso
  */
-public class DefaultComparatorUnitTests {
+class DefaultComparatorUnitTests {
 
 	@Test
-	public void testPrimitives() throws EvaluationException {
+	void testPrimitives() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		// primitive int
 		assertThat(comparator.compare(1, 2) < 0).isTrue();
@@ -63,7 +64,7 @@ public void testPrimitives() throws EvaluationException {
 	}
 
 	@Test
-	public void testNonPrimitiveNumbers() throws EvaluationException {
+	void testNonPrimitiveNumbers() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 
 		BigDecimal bdOne = new BigDecimal("1");
@@ -92,7 +93,7 @@ public void testNonPrimitiveNumbers() throws EvaluationException {
 	}
 
 	@Test
-	public void testNulls() throws EvaluationException {
+	void testNulls() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		assertThat(comparator.compare(null,"abc")<0).isTrue();
 		assertThat(comparator.compare(null,null)==0).isTrue();
@@ -100,7 +101,7 @@ public void testNulls() throws EvaluationException {
 	}
 
 	@Test
-	public void testObjects() throws EvaluationException {
+	void testObjects() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		assertThat(comparator.compare("a","a")==0).isTrue();
 		assertThat(comparator.compare("a","b")<0).isTrue();
@@ -108,7 +109,7 @@ public void testObjects() throws EvaluationException {
 	}
 
 	@Test
-	public void testCanCompare() throws EvaluationException {
+	void testCanCompare() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		assertThat(comparator.canCompare(null,1)).isTrue();
 		assertThat(comparator.canCompare(1,null)).isTrue();
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
index a41ac5691ac8..bdd022d80c77 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.expression.spel;
 
 import java.util.List;
@@ -26,14 +27,14 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
- * Unit tests for type comparison
+ * Unit tests for type comparison.
  *
  * @author Andy Clement
  */
-public class StandardTypeLocatorTests {
+class StandardTypeLocatorTests {
 
 	@Test
-	public void testImports() throws EvaluationException {
+	void testImports() throws EvaluationException {
 		StandardTypeLocator locator = new StandardTypeLocator();
 		assertThat(locator.findType("java.lang.Integer")).isEqualTo(Integer.class);
 		assertThat(locator.findType("java.lang.String")).isEqualTo(String.class);
@@ -45,7 +46,7 @@ public void testImports() throws EvaluationException {
 
 		assertThat(locator.findType("Boolean")).isEqualTo(Boolean.class);
 		// currently does not know about java.util by default
-//		assertEquals(java.util.List.class,locator.findType("List"));
+		// assertEquals(java.util.List.class,locator.findType("List"));
 
 		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
 				locator.findType("URL"))
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java b/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java
index 4c1371d53a70..68eae427e8ec 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-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.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.expression.spel.testdata;
 
 /**
- *
  * @author Andy Clement
  * @since 4.1.2
  */
@@ -35,4 +35,5 @@ public int getAge() {
 	public void setAge(int age) {
 		this.age = age;
 	}
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
index 0ec86ab44d9b..7fb2ad7f0aca 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,6 @@ public interface CallableStatementCallback<T> {
 	 * a domain object or a collection of domain objects. A thrown RuntimeException
 	 * is treated as application exception: it gets propagated to the caller of
 	 * the template.
-	 *
 	 * @param cs active JDBC CallableStatement
 	 * @return a result object, or {@code null} if none
 	 * @throws SQLException if thrown by a JDBC method, to be auto-converted
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index b4b7d3ab4452..ac1064ed071f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.jms.core.support;
 
 import java.util.ArrayList;
@@ -31,10 +32,10 @@
  * @author Mark Pollack
  * @since 24.9.2004
  */
-public class JmsGatewaySupportTests {
+class JmsGatewaySupportTests {
 
 	@Test
-	public void testJmsGatewaySupportWithConnectionFactory() throws Exception {
+	void testJmsGatewaySupportWithConnectionFactory() throws Exception {
 		ConnectionFactory mockConnectionFactory = mock(ConnectionFactory.class);
 		final List<String> test = new ArrayList<>(1);
 		JmsGatewaySupport gateway = new JmsGatewaySupport() {
@@ -51,7 +52,7 @@ protected void initGateway() {
 	}
 
 	@Test
-	public void testJmsGatewaySupportWithJmsTemplate() throws Exception {
+	void testJmsGatewaySupportWithJmsTemplate() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		final List<String> test = new ArrayList<>(1);
 		JmsGatewaySupport gateway = new JmsGatewaySupport() {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java
index d8d3e55f19c3..0804bff2d0a1 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java
@@ -208,7 +208,6 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
 	 *     // delegate all methods
 	 * }
 	 * </pre>
-	 *
 	 * @param bean the bean to check for {@code @MessageExceptionHandler} methods
 	 * @since 5.3.5
 	 */
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java
index c36a99ba97a4..3e3c930f05e5 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java
@@ -146,11 +146,9 @@ public boolean supportsParameter(MethodParameter parameter) {
 	 * {@code @javax.validation.Valid} or
 	 * {@link org.springframework.validation.annotation.Validated}. Validation
 	 * failure results in an {@link MethodArgumentNotValidException}.
-	 *
 	 * @param parameter the target method argument that we are decoding to
 	 * @param message the message from which the content was extracted
 	 * @return a Mono with the result of argument resolution
-	 *
 	 * @see #extractContent(MethodParameter, Message)
 	 * @see #getMimeType(Message)
 	 */
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
index 7e22c01882e4..24fde3c2d988 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.ArrayList;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataExtractor.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataExtractor.java
index 37c4b47c961a..34088b282874 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataExtractor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataExtractor.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.Map;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketConnectorConfigurer.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketConnectorConfigurer.java
index f2247642485c..11768122c9a5 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketConnectorConfigurer.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketConnectorConfigurer.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import io.rsocket.core.RSocketConnector;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
index 71dcee0940b9..b8e1f303e8d8 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket.annotation.support;
 
 import java.util.Arrays;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
index 27c6ee47e0bb..4bcd5c0f4ef5 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
@@ -471,7 +471,6 @@ private boolean isDataMimeTypeSupported(MimeType dataMimeType) {
 	 * for more advanced scenarios, e.g. discovering handlers through a custom
 	 * stereotype annotation, consider declaring {@code RSocketMessageHandler}
 	 * as a bean, and then obtain the responder from it.
-	 *
 	 * @param strategies the strategies to set on the created
 	 * {@code RSocketMessageHandler}
 	 * @param candidateHandlers a list of Objects and/or Classes with annotated
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
index c95f208b338b..f756b0b1f9ea 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -797,7 +797,7 @@ protected boolean shouldSendHeartbeatForIgnoredMessage() {
 		 * @since 5.3
 		 */
 		void updateClientSendMessageCount(long now) {
-			if (this.clientSendMessageCount != null && this.clientSendInterval > (now - clientSendMessageTimestamp)) {
+			if (this.clientSendMessageCount != null && this.clientSendInterval > (now - this.clientSendMessageTimestamp)) {
 				this.clientSendMessageCount.set(0);
 				this.clientSendMessageTimestamp = now;
 			}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompConversionException.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompConversionException.java
index c5226b4fcbc9..e839400cca8a 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompConversionException.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompConversionException.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.stomp;
 
 import org.springframework.core.NestedRuntimeException;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java
index f8dc36022711..3c84cd0cdb57 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.stomp;
 
 import java.nio.ByteBuffer;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompTcpConnectionHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompTcpConnectionHandler.java
index 098f985cb303..03c124296650 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompTcpConnectionHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompTcpConnectionHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.stomp;
 
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DestinationUserNameProvider.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DestinationUserNameProvider.java
index 53dfe75eeb07..4971e7df6205 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DestinationUserNameProvider.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DestinationUserNameProvider.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.user;
 
 /**
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyCodec.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyCodec.java
index 4df0e33225ac..49c2fbc10715 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyCodec.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyCodec.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.tcp.reactor;
 
 import java.util.Collection;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/MessagingPredicates.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/MessagingPredicates.java
index 8abde0e13258..1c3c826fb0c4 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/MessagingPredicates.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/MessagingPredicates.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation;
 
 import java.util.function.Predicate;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java
index 947412ba2c67..fe4c46e742bf 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation.reactive;
 
 import java.time.Duration;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java
index 58d7200fac8a..b0c7df33aeca 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation.reactive;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java
index d044ffed283b..bf30e67416e6 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation;
 
 import java.lang.reflect.Method;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/EncoderMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/EncoderMethodReturnValueHandlerTests.java
index 4c6b122280d6..bc79a0a88962 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/EncoderMethodReturnValueHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/EncoderMethodReturnValueHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.util.Collections;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/TestEncoderMethodReturnValueHandler.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/TestEncoderMethodReturnValueHandler.java
index e16ee6ea706e..c10a936c014d 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/TestEncoderMethodReturnValueHandler.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/TestEncoderMethodReturnValueHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.util.List;
@@ -65,4 +66,5 @@ protected Mono<Void> handleNoContent(MethodParameter returnType, Message<?> mess
 		this.encodedContent = Flux.empty();
 		return Mono.empty();
 	}
+
 }
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultMetadataExtractorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultMetadataExtractorTests.java
index 66061ec9c2ff..1c3cd882f5d1 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultMetadataExtractorTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultMetadataExtractorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/LeakAwareNettyDataBufferFactory.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/LeakAwareNettyDataBufferFactory.java
index 1f2e9271fa94..23c0f020b2ba 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/LeakAwareNettyDataBufferFactory.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/LeakAwareNettyDataBufferFactory.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.time.Duration;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/MetadataEncoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/MetadataEncoderTests.java
index d2b9445ba18a..eaea5c2b429a 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/MetadataEncoderTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/MetadataEncoderTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.time.Duration;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/PayloadUtilsTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/PayloadUtilsTests.java
index 73b1d45779b5..8346fab1b43b 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/PayloadUtilsTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/PayloadUtilsTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandlerTests.java
index c7d0a80a1d87..2c00e831b126 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket.annotation.support;
 
 import java.util.Arrays;
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java
index 873dab64dd0e..3291de25fb74 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java
@@ -79,7 +79,6 @@ public MockClientHttpRequest(HttpMethod httpMethod, URI url) {
 	 * <p>The default write handler consumes and caches the request body so it
 	 * may be accessed subsequently, e.g. in test assertions. Use this property
 	 * when the request body is an infinite stream.
-	 *
 	 * @param writeHandler the write handler to use returning {@code Mono<Void>}
 	 * when the body has been "written" (i.e. consumed).
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/PropertyProvider.java b/spring-test/src/main/java/org/springframework/test/context/support/PropertyProvider.java
index 3878ecbde0de..564ed078a936 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/PropertyProvider.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/PropertyProvider.java
@@ -32,7 +32,6 @@ public interface PropertyProvider {
 
 	/**
 	 * Get the value of the named property.
-	 *
 	 * @param name the name of the property to retrieve
 	 * @return the value of the property or {@code null} if not found
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/TestConstructorUtils.java b/spring-test/src/main/java/org/springframework/test/context/support/TestConstructorUtils.java
index df82bef780fa..9c59804ef0b9 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/TestConstructorUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/TestConstructorUtils.java
@@ -44,10 +44,8 @@ private TestConstructorUtils() {
 	/**
 	 * Determine if the supplied executable for the given test class is an
 	 * autowirable constructor.
-	 *
 	 * <p>This method delegates to {@link #isAutowirableConstructor(Executable, Class, PropertyProvider)}
 	 * will a value of {@code null} for the fallback {@link PropertyProvider}.
-	 *
 	 * @param executable an executable for the test class
 	 * @param testClass the test class
 	 * @return {@code true} if the executable is an autowirable constructor
@@ -60,10 +58,8 @@ public static boolean isAutowirableConstructor(Executable executable, Class<?> t
 	/**
 	 * Determine if the supplied constructor for the given test class is
 	 * autowirable.
-	 *
 	 * <p>This method delegates to {@link #isAutowirableConstructor(Constructor, Class, PropertyProvider)}
 	 * will a value of {@code null} for the fallback {@link PropertyProvider}.
-	 *
 	 * @param constructor a constructor for the test class
 	 * @param testClass the test class
 	 * @return {@code true} if the constructor is autowirable
@@ -76,10 +72,8 @@ public static boolean isAutowirableConstructor(Constructor<?> constructor, Class
 	/**
 	 * Determine if the supplied executable for the given test class is an
 	 * autowirable constructor.
-	 *
 	 * <p>This method delegates to {@link #isAutowirableConstructor(Constructor, Class, PropertyProvider)}
 	 * if the supplied executable is a constructor and otherwise returns {@code false}.
-	 *
 	 * @param executable an executable for the test class
 	 * @param testClass the test class
 	 * @param fallbackPropertyProvider fallback property provider used to look up
@@ -114,7 +108,6 @@ public static boolean isAutowirableConstructor(Executable executable, Class<?> t
 	 * {@link PropertyProvider} (see
 	 * {@link TestConstructor#TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME}).</li>
 	 * </ol>
-	 *
 	 * @param constructor a constructor for the test class
 	 * @param testClass the test class
 	 * @param fallbackPropertyProvider fallback property provider used to look up
diff --git a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
index 4581b1d00990..6b45deb821ad 100644
--- a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
@@ -203,7 +203,6 @@ public void run(IHookCallBack callBack, ITestResult testResult) {
 	 * Delegates to the configured {@link TestContextManager} to
 	 * {@linkplain TestContextManager#afterTestMethod(Object, Method, Throwable)
 	 * post-process} the test method after the actual test has executed.
-	 *
 	 * @param testMethod the test method which has just been executed on the
 	 * test instance
 	 * @throws Exception allows all exceptions to propagate
diff --git a/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java b/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
index aeda69be0207..632e7a90432f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
@@ -52,7 +52,6 @@ public abstract class TestContextResourceUtils {
 
 	/**
 	 * Convert the supplied paths to classpath resource paths.
-	 *
 	 * <p>Delegates to {@link #convertToClasspathResourcePaths(Class, boolean, String...)}
 	 * with {@code false} supplied for the {@code preservePlaceholders} flag.
 	 * @param clazz the class with which the paths are associated
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java b/spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java
index 734a6073904a..35a8c68c7778 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java
@@ -42,7 +42,6 @@ public interface RequestExpectationManager {
 	 * used to add more expectations and define a response.
 	 * <p>This is a delegate for
 	 * {@link MockRestServiceServer#expect(ExpectedCount, RequestMatcher)}.
-	 *
 	 * @param requestMatcher a request expectation
 	 * @return for setting up further expectations and define a response
 	 * @see MockRestServiceServer#expect(RequestMatcher)
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/MockServerClientHttpResponse.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/MockServerClientHttpResponse.java
index 8fe12d926596..e836cfdaccc1 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/MockServerClientHttpResponse.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/MockServerClientHttpResponse.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import org.springframework.http.client.reactive.ClientHttpResponse;
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 84adf85013c5..878a901c2267 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -862,7 +862,6 @@ interface ResponseSpec {
 		/**
 		 * Exit the chained flow in order to consume the response body
 		 * externally, e.g. via {@link reactor.test.StepVerifier}.
-		 *
 		 * <p>Note that when {@code Void.class} is passed in, the response body
 		 * is consumed and released. If no content is expected, then consider
 		 * using {@code .expectBody().isEmpty()} instead which asserts that
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index f4fd6da14b58..3b99f1b5d0e1 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -47,7 +47,6 @@ public interface ResultActions {
 	 *   .andExpect(content().contentType(MediaType.APPLICATION_JSON))
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
-	 *
 	 * @see #andExpectAll(ResultMatcher...)
 	 */
 	ResultActions andExpect(ResultMatcher matcher) throws Exception;
@@ -78,7 +77,6 @@ public interface ResultActions {
 	 *       jsonPath("$.person.name").value("Jason")
 	 *   );
 	 * </pre>
-	 *
 	 * @since 5.3.10
 	 * @see #andExpect(ResultMatcher)
 	 */
@@ -105,7 +103,6 @@ default ResultActions andExpectAll(ResultMatcher... matchers) throws Exception {
 
 	/**
 	 * Return the result of the executed request for direct access to the results.
-	 *
 	 * @return the result of the request
 	 */
 	MvcResult andReturn();
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
index e5559f5724ce..04724d661687 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
@@ -49,7 +49,6 @@ public interface ResultHandler {
 
 	/**
 	 * Perform an action on the given result.
-	 *
 	 * @param result the result of the executed request
 	 * @throws Exception if a failure occurs
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/SmartRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/SmartRequestBuilder.java
index 648115851b96..13e57d2e9f77 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/SmartRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/SmartRequestBuilder.java
@@ -31,7 +31,6 @@ public interface SmartRequestBuilder extends RequestBuilder {
 	/**
 	 * Apply request post processing. Typically that means invoking one or more
 	 * {@link org.springframework.test.web.servlet.request.RequestPostProcessor org.springframework.test.web.servlet.request.RequestPostProcessors}.
-	 *
 	 * @param request the request to initialize
 	 * @return the request to use, either the one passed in or a wrapped one
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
index cf1b2d60fe8a..37e419381154 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import javax.servlet.Filter;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockMvcSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockMvcSpec.java
index 1c6c3577798d..ba555792e979 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockMvcSpec.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockMvcSpec.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java
index 705e89432b7c..ba6b040b10ea 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import java.io.StringWriter;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
index a59879f795d4..1ace31756746 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import java.util.function.Supplier;
@@ -112,7 +113,6 @@ static WebTestClient.Builder bindTo(MockMvc mockMvc) {
 	/**
 	 * This method can be used to apply further assertions on a given
 	 * {@link ExchangeResult} based the state of the server response.
-	 *
 	 * <p>Normally {@link WebTestClient} is used to assert the client response
 	 * including HTTP status, headers, and body. That is all that is available
 	 * when making a live request over HTTP. However when the server is
@@ -134,7 +134,6 @@ static WebTestClient.Builder bindTo(MockMvc mockMvc) {
 	 * 		.andExpect(flash().attributeCount(1))
 	 * 		.andExpect(flash().attribute("message", "success!"));
 	 * </pre>
-	 *
 	 * <p>Note: this method works only if the {@link WebTestClient} used to
 	 * perform the request was initialized through one of bind method in this
 	 * class, and therefore requests are handled by {@link MockMvc}.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpec.java
index 63cdee1d5d84..d935bd8b1b40 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpec.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpec.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import java.util.function.Supplier;
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
index 7488fc94e54f..5198c95025c9 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.samples;
 
 import java.io.IOException;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java
index 99e5e6a07496..617c9b12aeae 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java
index 70a823302fb8..0e105afd9387 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import java.net.URI;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java
index b81d3d3ca3d8..514f81a33eef 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java
index 1e47439fb959..5f2fa3fd5bbb 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java
index 2b42028b2bc5..7b423d92c8c1 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import java.util.Arrays;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java
index f8fc1ea89c10..d5dbbd597ce9 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
 import java.security.Principal;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java
index 8404c9ed7ea3..24bf92ecbb31 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
index 23c2115e1d76..802144a810a4 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
index 496e9e7834b8..75c20a1d0b58 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.result;
 
 import java.time.ZoneId;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java
index 77259b29648e..674dc80fa06d 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java
index 9229ef6839d6..7a3974262723 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import java.time.Duration;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java
index d21e283e0190..bb9f0efd4085 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java
index a22cd2a1b86a..bb3ab30c322e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java
index 12d72f1a2e64..065ea0fe882a 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.standalone;
 
 import java.time.Duration;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
index ff67744cc395..584af36911c2 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.standalone;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
index c2cdaae97ea1..ec2672534d11 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ protected ListenableFuture<ClientHttpResponse> executeInternal(
 			if (getMethod() == HttpMethod.DELETE && bufferedOutput.length == 0) {
 				this.connection.setDoOutput(false);
 			}
-			if (this.connection.getDoOutput() && outputStreaming) {
+			if (this.connection.getDoOutput() && this.outputStreaming) {
 				this.connection.setFixedLengthStreamingMode(bufferedOutput.length);
 			}
 			this.connection.connect();
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyResourceFactory.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyResourceFactory.java
index b31e86ae1ea6..415cdfcdbb7d 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyResourceFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyResourceFactory.java
@@ -132,7 +132,7 @@ public void afterPropertiesSet() throws Exception {
 		if (this.byteBufferPool == null) {
 			this.byteBufferPool = new MappedByteBufferPool(2048,
 					this.executor instanceof ThreadPool.SizedThreadPool
-							? ((ThreadPool.SizedThreadPool) executor).getMaxThreads() / 2
+							? ((ThreadPool.SizedThreadPool) this.executor).getMaxThreads() / 2
 							: ProcessorUtils.availableProcessors() * 2);
 		}
 		if (this.scheduler == null) {
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartWriterSupport.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartWriterSupport.java
index 3a086287b130..fe0e97c3b2bc 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartWriterSupport.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartWriterSupport.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.codec.multipart;
 
 import java.nio.charset.Charset;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java
index 2ba3a8da94c7..4804dcf1f4f5 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -265,7 +265,6 @@ public Iterable<? extends Message> apply(DataBuffer input) {
 		 * Parse message size as a varint from the input stream, updating {@code messageBytesToRead} and
 		 * {@code offset} fields if needed to allow processing of upcoming chunks.
 		 * Inspired from {@link CodedInputStream#readRawVarint32(int, java.io.InputStream)}
-		 *
 		 * @return {code true} when the message size is parsed successfully, {code false} when the message size is
 		 * truncated
 		 * @see <a href="https://developers.google.com/protocol-buffers/docs/encoding#varints">Base 128 Varints</a>
@@ -290,7 +289,7 @@ private boolean readMessageSize(DataBuffer input) {
 						return false;
 					}
 					final int b = input.read();
-					this.messageBytesToRead |= (b & 0x7f) << offset;
+					this.messageBytesToRead |= (b & 0x7f) << this.offset;
 					if ((b & 0x80) == 0) {
 						this.offset = 0;
 						return true;
diff --git a/spring-web/src/main/java/org/springframework/http/server/RequestPath.java b/spring-web/src/main/java/org/springframework/http/server/RequestPath.java
index cdca6a784614..6b748da1d43a 100644
--- a/spring-web/src/main/java/org/springframework/http/server/RequestPath.java
+++ b/spring-web/src/main/java/org/springframework/http/server/RequestPath.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.server;
 
 import java.net.URI;
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java
index 125a7bb7d65b..79a6c0c8bd44 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.server.reactive;
 
 import java.util.function.Supplier;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/MissingRequestValueException.java b/spring-web/src/main/java/org/springframework/web/bind/MissingRequestValueException.java
index 1de083e3a8b5..de873b0adf81 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/MissingRequestValueException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/MissingRequestValueException.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.bind;
 
 /**
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index 8200adb1682f..31355571c685 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -169,7 +169,6 @@ private String getErrorMessage(
 	 * {@link HttpClientErrorException#create} for errors in the 4xx range, to
 	 * {@link HttpServerErrorException#create} for errors in the 5xx range,
 	 * or otherwise raises {@link UnknownHttpStatusCodeException}.
-	 *
 	 * @since 5.0
 	 * @see HttpClientErrorException#create
 	 * @see HttpServerErrorException#create
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
index e799385bd249..b7997534e5e5 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
@@ -448,7 +448,6 @@ <T> T patchForObject(URI url, @Nullable Object request, Class<T> responseType)
 	/**
 	 * Delete the resources at the specified URI.
 	 * <p>URI Template variables are expanded using the given map.
-	 *
 	 * @param url the URL
 	 * @param uriVariables the variables to expand the template
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/AsyncWebRequestInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/AsyncWebRequestInterceptor.java
index 8e02e8650134..7582388b12b0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/AsyncWebRequestInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/AsyncWebRequestInterceptor.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.context.request;
 
 /**
@@ -41,7 +42,6 @@ public interface AsyncWebRequestInterceptor extends WebRequestInterceptor{
 	/**
 	 * Called instead of {@code postHandle} and {@code afterCompletion}, when the
 	 * handler started handling the request concurrently.
-	 *
 	 * @param request the current request
 	 */
 	void afterConcurrentHandlingStarted(WebRequest request);
diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java
index a9f52082a5fe..1d78ed9aab0c 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java
@@ -63,7 +63,6 @@ public static boolean isPreFlightRequest(ServerHttpRequest request) {
 	 * {@code "Forwarded"} and {@code "X-Forwarded-*"} headers that specify the
 	 * client-originated address. Consider using the {@code ForwardedHeaderFilter}
 	 * to extract and use, or to discard such headers.
-	 *
 	 * @return {@code true} if the request is a same-origin one, {@code false} in case
 	 * of a cross-origin request
 	 * @deprecated as of 5.2, same-origin checks are performed directly by {@link #isCorsRequest}
diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/PreFlightRequestWebFilter.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/PreFlightRequestWebFilter.java
index 1b9f6adf42bd..7c04c565d343 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/reactive/PreFlightRequestWebFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/PreFlightRequestWebFilter.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.cors.reactive;
 
 import reactor.core.publisher.Mono;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java
index baf4ab53ce9b..d532c6251321 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.filter;
 
 import javax.servlet.http.HttpServletResponse;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java
index cc9e85015f47..a6dc490af03d 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ServletRequestPathFilter.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.filter;
 
 import java.io.IOException;
diff --git a/spring-web/src/main/java/org/springframework/web/server/ServerWebExchangeDecorator.java b/spring-web/src/main/java/org/springframework/web/server/ServerWebExchangeDecorator.java
index 87a27156052a..0559a5681792 100644
--- a/spring-web/src/main/java/org/springframework/web/server/ServerWebExchangeDecorator.java
+++ b/spring-web/src/main/java/org/springframework/web/server/ServerWebExchangeDecorator.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server;
 
 import java.security.Principal;
diff --git a/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java b/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
index b757f3e59f81..1c4455dbbe99 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.util;
 
 import java.nio.charset.StandardCharsets;
@@ -53,11 +54,10 @@ public abstract class ServletRequestPathUtils {
 	 * {@link RequestPath} and save it in the request attribute
 	 * {@link #PATH_ATTRIBUTE} for subsequent use with
 	 * {@link org.springframework.web.util.pattern.PathPattern parsed patterns}.
-	 * The returned {@code RequestPath} will have both the contextPath and any
+	 * <p>The returned {@code RequestPath} will have both the contextPath and any
 	 * servletPath prefix omitted from the {@link RequestPath#pathWithinApplication()
 	 * pathWithinApplication} it exposes.
-	 *
-	 * <p>This method is typically called by the {@code DispatcherServlet} to
+	 * <p>This method is typically called by the {@code DispatcherServlet} to determine
 	 * if any {@code HandlerMapping} indicates that it uses parsed patterns.
 	 * After that the pre-parsed and cached {@code RequestPath} can be accessed
 	 * through {@link #getParsedRequestPath(ServletRequest)}.
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
index 8a0e76127ae8..6e64f214863d 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
@@ -757,7 +757,6 @@ public static MultiValueMap<String, String> parseMatrixVariables(String matrixVa
 	 * {@code "Forwarded"} and {@code "X-Forwarded-*"} headers that specify the
 	 * client-originated address. Consider using the {@code ForwardedHeaderFilter}
 	 * to extract and use, or to discard such headers.
-	 *
 	 * @return {@code true} if the request origin is valid, {@code false} otherwise
 	 * @since 4.1.5
 	 * @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
index 7843a05b7521..12488ffa4be9 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPatternParser.java
@@ -44,12 +44,10 @@ public class PathPatternParser {
 	/**
 	 * Whether a {@link PathPattern} produced by this parser should
 	 * automatically match request paths with a trailing slash.
-	 *
 	 * <p>If set to {@code true} a {@code PathPattern} without a trailing slash
 	 * will also match request paths with a trailing slash. If set to
 	 * {@code false} a {@code PathPattern} will only match request paths with
 	 * a trailing slash.
-	 *
 	 * <p>The default is {@code true}.
 	 */
 	public void setMatchOptionalTrailingSeparator(boolean matchOptionalTrailingSeparator) {
diff --git a/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java
index 1924e319f026..d85b08194558 100644
--- a/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.client.reactive;
 
 import java.time.Duration;
diff --git a/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java b/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java
index 2935e9fa2337..8fad5f68ede9 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/CancelWithoutDemandCodecTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.codec;
 
 import java.time.Duration;
diff --git a/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageReaderTests.java
index 151eae3288d0..fad3a3c095a9 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageReaderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/ResourceHttpMessageReaderTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.codec;
 
 import java.io.IOException;
diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java
index c519b83d827a..6fe88f458b1c 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.codec.multipart;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-web/src/test/java/org/springframework/http/server/DefaultRequestPathTests.java b/spring-web/src/test/java/org/springframework/http/server/DefaultRequestPathTests.java
index 3fa688017169..71a4bacd4f7c 100644
--- a/spring-web/src/test/java/org/springframework/http/server/DefaultRequestPathTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/DefaultRequestPathTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.server;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java
index 479bc3fc1116..182016ecea6e 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.server.reactive;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java
index 2a269ad5534b..dc8069cdbb68 100644
--- a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.web.cors.reactive;
 
+package org.springframework.web.cors.reactive;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java b/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java
index 576d0287d17b..464198916a07 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.filter;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-web/src/test/java/org/springframework/web/method/HandlerTypePredicateTests.java b/spring-web/src/test/java/org/springframework/web/method/HandlerTypePredicateTests.java
index 144bb4e36fd3..c43e77377514 100644
--- a/spring-web/src/test/java/org/springframework/web/method/HandlerTypePredicateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/HandlerTypePredicateTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.method;
 
 import java.util.function.Predicate;
diff --git a/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java b/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java
index 71d950c736ce..68fdb229cd03 100644
--- a/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server.session;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java b/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java
index a787356f6ff1..e2209af98263 100644
--- a/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.server.session;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java
index 6814bd55df70..0e84f13ee8f6 100644
--- a/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/ServletRequestPathUtilsTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.util;
 
 import javax.servlet.http.MappingMatch;
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/MockServerWebExchange.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/MockServerWebExchange.java
index 000eadd6a244..82635bd18133 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/MockServerWebExchange.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/server/MockServerWebExchange.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.testfixture.server;
 
 import reactor.core.publisher.Mono;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java
index 12bd6b408238..d0ac319ec086 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.accept;
 
 import java.util.ArrayList;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
index 45556ce4c0fc..8ee0e87eafb1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
@@ -75,15 +75,13 @@ public ResourceHandlerRegistration(ResourceLoader resourceLoader, String... path
 
 	/**
 	 * Add one or more resource locations from which to serve static content.
-	 * Each location must point to a valid directory. Multiple locations may
+	 * <p>Each location must point to a valid directory. Multiple locations may
 	 * be specified as a comma-separated list, and the locations will be checked
 	 * for a given resource in the order specified.
-	 *
-	 * <p>For example, {{@code "/"},
-	 * {@code "classpath:/META-INF/public-web-resources/"}} allows resources to
-	 * be served both from the web application root and from any JAR on the
-	 * classpath that contains a {@code /META-INF/public-web-resources/} directory,
-	 * with resources in the web application root taking precedence.
+	 * <p>For example, {@code "/", "classpath:/META-INF/public-web-resources/"}
+	 * allows resources to be served both from the web application root and from
+	 * any JAR on the classpath that contains a {@code /META-INF/public-web-resources/}
+	 * directory, with resources in the web application root taking precedence.
 	 * @return the same {@link ResourceHandlerRegistration} instance, for
 	 * chained method invocation
 	 */
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java
index d11bc4eabca9..7203b38e9a34 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java
@@ -45,7 +45,6 @@ public interface ExchangeFilterFunction {
 	 * always consume its content or otherwise propagate it downstream for
 	 * further handling, for example by the {@link WebClient}. Please, see the
 	 * reference documentation for more details on this.
-	 *
 	 * @param request the current request
 	 * @param next the next exchange function in the chain
 	 * @return the filtered response
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
index 6d35b6594cc5..fddb3389c56a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
@@ -50,7 +50,6 @@ public interface ExchangeFunction {
 	 * propagate it downstream for further handling, for example by the
 	 * {@link WebClient}. Please, see the reference documentation for more
 	 * details on this.
-	 *
 	 * @param request the request to exchange
 	 * @return the delayed response
 	 */
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
index 6b72b545d934..d2c68f6760fe 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -796,10 +796,10 @@ public void accept(Visitor visitor) {
 		@Override
 		public void changeParser(PathPatternParser parser) {
 			if (this.left instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) left).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
 			}
 			if (this.right instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) right).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
 			}
 		}
 
@@ -841,7 +841,7 @@ public void accept(Visitor visitor) {
 		@Override
 		public void changeParser(PathPatternParser parser) {
 			if (this.delegate instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) delegate).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.delegate).changeParser(parser);
 			}
 		}
 
@@ -908,10 +908,10 @@ public void accept(Visitor visitor) {
 		@Override
 		public void changeParser(PathPatternParser parser) {
 			if (this.left instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) left).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
 			}
 			if (this.right instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) right).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
 			}
 		}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
index 9395f4287a67..51c654fd653c 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
@@ -265,7 +265,6 @@ interface HeadersBuilder<B extends HeadersBuilder<B>> {
 		/**
 		 * Set the set of allowed {@link HttpMethod HTTP methods}, as specified
 		 * by the {@code Allow} header.
-		 *
 		 * @param allowedMethods the allowed methods
 		 * @return this builder
 		 * @see HttpHeaders#setAllow(Set)
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
index 628e12fe90f7..e9f34b874751 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
@@ -89,7 +89,6 @@ protected Mono<String> resolveUrlPath(String resourcePath, ServerWebExchange exc
 	 * Transform the given relative request path to an absolute path,
 	 * taking the path of the given request as a point of reference.
 	 * The resulting path is also cleaned from sequences like "path/..".
-	 *
 	 * @param path the relative path to transform
 	 * @param exchange the current exchange
 	 * @return the absolute request path for the given resource path
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ArgumentResolverConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ArgumentResolverConfigurer.java
index b7b3ee6fd160..749b0a780114 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ArgumentResolverConfigurer.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ArgumentResolverConfigurer.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.util.ArrayList;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java
index 9acbe85ec0ff..2ecc6881b4cc 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.util.Collections;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/Rendering.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/Rendering.java
index 2376f97ee163..9bd56f965bab 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/Rendering.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/Rendering.java
@@ -149,7 +149,6 @@ interface RedirectBuilder extends Builder<RedirectBuilder> {
 		 * Whether to the provided redirect URL should be prepended with the
 		 * application context path (if any).
 		 * <p>By default this is set to {@code true}.
-		 *
 		 * @see RedirectView#setContextRelative(boolean)
 		 */
 		RedirectBuilder contextRelative(boolean contextRelative);
@@ -158,7 +157,6 @@ interface RedirectBuilder extends Builder<RedirectBuilder> {
 		 * Whether to append the query string of the current URL to the target
 		 * redirect URL or not.
 		 * <p>By default this is set to {@code false}.
-		 *
 		 * @see RedirectView#setPropagateQuery(boolean)
 		 */
 		RedirectBuilder propagateQuery(boolean propagate);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java
index c3b084b7b0f1..fee25884cddf 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.view;
 
 import java.util.Map;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
index 85e7b232af49..616931ebda3d 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
  *
  * <pre class="code">
  * class ExampleHandler implements WebSocketHandler {
-
+ *
  * 	&#064;Override
  * 	public Mono&lt;Void&gt; handle(WebSocketSession session) {
  *
@@ -63,7 +63,7 @@
  *
  * <pre class="code">
  * class ExampleHandler implements WebSocketHandler {
-
+ *
  * 	&#064;Override
  * 	public Mono&lt;Void&gt; handle(WebSocketSession session) {
  *
@@ -110,7 +110,6 @@ default List<String> getSubProtocols() {
 	 *
 	 * <p>See the class-level doc and the reference manual for more details and
 	 * examples of how to handle the session.
-	 *
 	 * @param session the session to handle
 	 * @return indicates when application handling of the session is complete,
 	 * which should reflect the completion of the inbound message stream
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
index 7d2d3d8136a4..32175f160b54 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.socket;
 
 import java.nio.charset.Charset;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java
index b3e3053ab4dd..d0113770e2e8 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.socket;
 
 import java.util.Map;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ContextWebSocketHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ContextWebSocketHandler.java
index 816dc147bd57..f58af98ff1bc 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ContextWebSocketHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ContextWebSocketHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.socket.adapter;
 
 import java.util.List;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java
index ce561705a6d3..19de63694ee7 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.socket.client;
 
 import java.net.URI;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
index a2b01c6afd08..a988a2e23647 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.socket.server.support;
 
 import reactor.core.publisher.Mono;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java
index 70f8a8e7741d..0df725357b80 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.accept;
 
 import java.util.Collections;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilderTests.java
index 2020bc23686d..f4b7dc36fab5 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilderTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.accept;
 
 import java.util.Collections;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java
index 93a93eb99071..1f69cb33f35f 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.config;
 
 import java.util.List;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java
index 7f10816c408e..7616980a4bbc 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.handler;
 
 import java.util.Collections;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
index 8ec93d52e369..b9da1c45c623 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.resource;
 
 import java.io.IOException;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java
index 1b41388d1307..a6dfd8554b80 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.time.Duration;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMethodArgumentResolverTests.java
index ac1e9aaade4b..419ed2eab766 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMethodArgumentResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMethodArgumentResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.time.Duration;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java
index c304f5c36e34..1914b8c41da8 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method.annotation;
 
 import io.reactivex.rxjava3.core.Single;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ZeroDemandResponse.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ZeroDemandResponse.java
index 59b3c9460281..d0bd3bd6b511 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ZeroDemandResponse.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ZeroDemandResponse.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.view;
 
 import java.util.function.Supplier;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java
index 2e06acd07232..e0b98eb40226 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.socket.server.support;
 
 import java.util.Collections;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java
index 409dc06b20d1..b397f22a25bc 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.socket.server.upgrade;
 
 import org.junit.jupiter.api.Test;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
index 26f76e7ca0ab..6b0a5a45666a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.function;
 
 import java.io.IOException;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
index 664d6a851dc1..febe35bb1fd6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -794,10 +794,10 @@ public void accept(Visitor visitor) {
 		@Override
 		public void changeParser(PathPatternParser parser) {
 			if (this.left instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) left).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
 			}
 			if (this.right instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) right).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
 			}
 		}
 
@@ -839,7 +839,7 @@ public void accept(Visitor visitor) {
 		@Override
 		public void changeParser(PathPatternParser parser) {
 			if (this.delegate instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) delegate).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.delegate).changeParser(parser);
 			}
 		}
 
@@ -906,10 +906,10 @@ public void accept(Visitor visitor) {
 		@Override
 		public void changeParser(PathPatternParser parser) {
 			if (this.left instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) left).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
 			}
 			if (this.right instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) right).changeParser(parser);
+				((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
 			}
 		}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
index 6bbb3a43391e..d8f2f2d013c1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
@@ -85,7 +85,6 @@ default HttpMethod method() {
 	/**
 	 * Get a {@code UriBuilderComponents} from the URI associated with this
 	 * {@code ServerRequest}.
-	 *
 	 * @return a URI builder
 	 */
 	UriBuilder uriBuilder();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
index 11efe5b02232..2c1479ca70f3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
@@ -367,7 +367,6 @@ interface HeadersBuilder<B extends HeadersBuilder<B>> {
 		/**
 		 * Set the set of allowed {@link HttpMethod HTTP methods}, as specified
 		 * by the {@code Allow} header.
-		 *
 		 * @param allowedMethods the allowed methods
 		 * @return this builder
 		 * @see HttpHeaders#setAllow(Set)
@@ -492,7 +491,6 @@ interface BodyBuilder extends HeadersBuilder<BodyBuilder> {
 		/**
 		 * Set the body of the response to the given {@code Object} and return it. The parameter
 		 * {@code bodyType} is used to capture the generic type.
-		 *
 		 * @param body the body of the response
 		 * @param bodyType the type of the body, used to capture the generic type
 		 * @return the built response
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java
index 4b7a906732bb..91a3c43908a7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/PathPatternMatchableHandlerMapping.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.handler;
 
 import java.util.Map;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
index 7c60bee6675a..f6b2bf26c68a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
@@ -353,7 +353,6 @@ public static UriComponentsBuilder fromMethodCall(UriComponentsBuilder builder,
 	 * </pre>
 	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
 	 * and "X-Forwarded-*" headers if found. See class-level docs.
-	 *
 	 * @param controllerType the target controller
 	 */
 	public static <T> T on(Class<T> controllerType) {
@@ -423,7 +422,6 @@ public static <T> T controller(Class<T> controllerType) {
 	 *
 	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
 	 * and "X-Forwarded-*" headers if found. See class-level docs.
-	 *
 	 * @param mappingName the mapping name
 	 * @return a builder to prepare the URI String
 	 * @throws IllegalArgumentException if the mapping name is not found or
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBody.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBody.java
index 830269f5d6a7..eb307b4a62ab 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBody.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/StreamingResponseBody.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.mvc.method.annotation;
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java
index d404c32346ab..799969a25e8d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.handler;
 
 import java.util.Comparator;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsTestUtils.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsTestUtils.java
index cf034fd1608a..04291a3c9ded 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsTestUtils.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsTestUtils.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.handler;
 
 import java.util.function.Consumer;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java
index 6b6e35d4f3e1..47844e7e00ec 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.mvc.method.annotation;
 
 import java.io.IOException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java
index a4a931900747..c67b360b0c75 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.resource;
 
 import java.io.IOException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java
index 0e6da211e4ec..0f3215838d6e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.resource;
 
 import java.util.ArrayList;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
index 0e7ba7745869..bcec3b51ed18 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.resource;
 
 import java.io.IOException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java
index dde2a6f8e3c9..740548a336ab 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.resource;
 
 import java.util.ArrayList;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
index 59443780c583..273197f0b8a2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.support;
 
 import java.util.Collection;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/WebContentGeneratorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/WebContentGeneratorTests.java
index bcfe10c061a3..531d5ebdb800 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/WebContentGeneratorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/WebContentGeneratorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.support;
 
 import java.util.Arrays;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java
index 11515bc2215d..6e3349887428 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.view.tiles3;
 
 import java.util.Locale;
@@ -69,4 +70,5 @@ public void testResolve() throws Exception {
 		verify(this.renderer).isRenderable(eq("/template.test"), isA(Request.class));
 		verify(this.renderer).isRenderable(eq("/nonexistent.test"), isA(Request.class));
 	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java
index 90cb4d6171d7..c588e3a06aa7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.view.tiles3;
 
 import java.util.HashMap;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/StompWebSocketEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/StompWebSocketEndpointRegistration.java
index e00ecdb924e5..c28ba61ea278 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/StompWebSocketEndpointRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/StompWebSocketEndpointRegistration.java
@@ -61,7 +61,6 @@ public interface StompWebSocketEndpointRegistration {
 	 * that do not allow to check request origin (Iframe based transports) are
 	 * disabled. As a consequence, IE 6 to 9 are not supported when origins are
 	 * restricted.
-	 *
 	 * @since 4.1.2
 	 * @see #setAllowedOriginPatterns(String...)
 	 * @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistration.java
index cf145dd71ae0..19ed6bfacb77 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistration.java
@@ -63,7 +63,6 @@ public interface WebSocketHandlerRegistration {
 	 * that do not allow to check request origin (Iframe based transports) are
 	 * disabled. As a consequence, IE 6 to 9 are not supported when origins are
 	 * restricted.
-	 *
 	 * @since 4.1.2
 	 * @see #setAllowedOriginPatterns(String...)
 	 * @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java
index 245e43340709..5e3cc4d8dda3 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java
@@ -82,7 +82,6 @@ public OriginHandshakeInterceptor(Collection<String> allowedOrigins) {
 	 * that do not allow to check request origin (Iframe based transports) are
 	 * disabled. As a consequence, IE 6 to 9 are not supported when origins are
 	 * restricted.
-	 *
 	 * @see #setAllowedOriginPatterns(Collection)
 	 * @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
 	 */
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
index e3a941937107..84502556bd65 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -325,7 +325,6 @@ public boolean shouldSuppressCors() {
 	 * that do not allow to check request origin (Iframe based transports) are
 	 * disabled. As a consequence, IE 6 to 9 are not supported when origins are
 	 * restricted.
-	 *
 	 * @since 4.1.2
 	 * @see #setAllowedOriginPatterns(Collection)
 	 * @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/handler/BlockingWebSocketSession.java b/spring-websocket/src/test/java/org/springframework/web/socket/handler/BlockingWebSocketSession.java
index 6e592719becb..793d5bfe47ef 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/handler/BlockingWebSocketSession.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/handler/BlockingWebSocketSession.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.socket.handler;
 
 import java.io.IOException;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/OrderedMessageSendingIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/OrderedMessageSendingIntegrationTests.java
index 5f8cf79331f9..0db9c71debae 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/OrderedMessageSendingIntegrationTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/OrderedMessageSendingIntegrationTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.socket.messaging;
 
 import java.nio.charset.StandardCharsets;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandlerTests.java
index b204b03b5d87..66526090f8bc 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandlerTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.socket.messaging;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java
index b5ec3cdfdbd9..30e9aab5be4b 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/WebSocketHandlerMappingTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.socket.server.support;
 
 import java.util.Collections;
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 96d98fb239a7..6358bc47e753 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -144,9 +144,7 @@
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
 			<property name="allowMissingParamTags" value="true"/>
-			<property name="allowMissingThrowsTags" value="true"/>
 			<property name="allowMissingReturnTag" value="true"/>
-			<property name="allowMissingJavadoc" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
 			<property name="scope" value="public"/>

From bfdc99ab799f652f33379bf8cc50d0cc5d08fd8a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 28 Sep 2021 11:43:40 +0200
Subject: [PATCH 158/735] Fix Javadoc errors

See gh-27480
---
 .../autoproxy/BeanNameAutoProxyCreator.java   |  2 +-
 .../groovy/GroovyBeanDefinitionReader.java    | 10 +--
 .../context/annotation/Configuration.java     | 10 +--
 .../annotation/EnableAspectJAutoProxy.java    |  4 +-
 .../GenericGroovyApplicationContext.java      | 12 +--
 ...ReloadableResourceBundleMessageSource.java |  4 +-
 .../DefaultFormattingConversionService.java   |  4 +-
 .../springframework/validation/Validator.java |  6 +-
 .../core/env/CommandLinePropertySource.java   |  6 +-
 .../env/JOptCommandLinePropertySource.java    |  4 +-
 .../env/SimpleCommandLinePropertySource.java  |  4 +-
 .../jms/annotation/EnableJms.java             |  8 +-
 .../handler/AbstractMessageCondition.java     |  4 +-
 .../orm/hibernate5/HibernateOperations.java   |  8 +-
 .../org/springframework/http/HttpStatus.java  |  6 +-
 .../json/Jackson2ObjectMapperBuilder.java     |  2 +-
 .../json/Jackson2ObjectMapperFactoryBean.java | 84 +++++++++----------
 .../springframework/web/util/HtmlUtils.java   | 22 ++---
 .../springframework/web/util/UriTemplate.java |  6 +-
 .../springframework/web/util/UriUtils.java    |  6 +-
 .../condition/CompositeRequestCondition.java  |  4 +-
 .../condition/HeadersRequestCondition.java    |  4 +-
 .../condition/ParamsRequestCondition.java     |  4 +-
 .../condition/CompositeRequestCondition.java  |  4 +-
 .../condition/HeadersRequestCondition.java    |  4 +-
 .../mvc/condition/ParamsRequestCondition.java |  4 +-
 .../annotation/MvcUriComponentsBuilder.java   |  2 +-
 .../web/servlet/tags/UrlTag.java              |  2 +-
 28 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
index 8c49d4ff7d28..297ab0cd1f63 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
@@ -61,7 +61,7 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
 	 * FactoryBean will get proxied. This default behavior applies as of Spring 2.0.
 	 * If you intend to proxy a FactoryBean instance itself (a rare use case, but
 	 * Spring 1.2's default behavior), specify the bean name of the FactoryBean
-	 * including the factory-bean prefix "&": e.g. "&myFactoryBean".
+	 * including the factory-bean prefix "&amp;": e.g. "&amp;myFactoryBean".
 	 * @see org.springframework.beans.factory.FactoryBean
 	 * @see org.springframework.beans.factory.BeanFactory#FACTORY_BEAN_PREFIX
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
index da1ebc58c5fd..9ef7aa3799f3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
@@ -75,18 +75,18 @@
  *
  * def reader = new GroovyBeanDefinitionReader(myApplicationContext)
  * reader.beans {
- *     dataSource(BasicDataSource) {                  // <--- invokeMethod
+ *     dataSource(BasicDataSource) {                  // &lt;--- invokeMethod
  *         driverClassName = "org.hsqldb.jdbcDriver"
  *         url = "jdbc:hsqldb:mem:grailsDB"
- *         username = "sa"                            // <-- setProperty
+ *         username = "sa"                            // &lt;-- setProperty
  *         password = ""
  *         settings = [mynew:"setting"]
  *     }
  *     sessionFactory(SessionFactory) {
- *         dataSource = dataSource                    // <-- getProperty for retrieving references
+ *         dataSource = dataSource                    // &lt;-- getProperty for retrieving references
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean ->         // <-- setProperty with closure for nested bean
+ *         nestedBean = { AnotherBean bean -&gt;         // &lt;-- setProperty with closure for nested bean
  *             dataSource = dataSource
  *         }
  *     }
@@ -113,7 +113,7 @@
  *         dataSource = dataSource
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean ->
+ *         nestedBean = { AnotherBean bean -&gt;
  *             dataSource = dataSource
  *         }
  *     }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
index 725999d89c82..39856654f907 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -129,7 +129,7 @@
  * &#064;Configuration
  * public class AppConfig {
  *
- *     &#064Autowired Environment env;
+ *     &#064;Autowired Environment env;
  *
  *     &#064;Bean
  *     public MyBean myBean() {
@@ -149,7 +149,7 @@
  * &#064;PropertySource("classpath:/com/acme/app.properties")
  * public class AppConfig {
  *
- *     &#064Inject Environment env;
+ *     &#064;Inject Environment env;
  *
  *     &#064;Bean
  *     public MyBean myBean() {
@@ -170,7 +170,7 @@
  * &#064;PropertySource("classpath:/com/acme/app.properties")
  * public class AppConfig {
  *
- *     &#064Value("${bean.name}") String beanName;
+ *     &#064;Value("${bean.name}") String beanName;
  *
  *     &#064;Bean
  *     public MyBean myBean() {
@@ -297,7 +297,7 @@
  * &#064;ImportResource("classpath:/com/acme/database-config.xml")
  * public class AppConfig {
  *
- *     &#064Inject DataSource dataSource; // from XML
+ *     &#064;Inject DataSource dataSource; // from XML
  *
  *     &#064;Bean
  *     public MyBean myBean() {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java b/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java
index 8e2646340668..62cb6404c493 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@
  * &#064;EnableAspectJAutoProxy
  * public class AppConfig {
  *
- *     // no explicit &#064Bean definitions required
+ *     // no explicit &#064;Bean definitions required
  * }</pre>
  *
  * <b>Note: {@code @EnableAspectJAutoProxy} applies to its local application context only,
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java
index 8e1f74ba45d8..4f4c07017347 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,18 +46,18 @@
  *
  * def context = new GenericGroovyApplicationContext()
  * context.reader.beans {
- *     dataSource(BasicDataSource) {                  // <--- invokeMethod
+ *     dataSource(BasicDataSource) {                  // &lt;--- invokeMethod
  *         driverClassName = "org.hsqldb.jdbcDriver"
  *         url = "jdbc:hsqldb:mem:grailsDB"
- *         username = "sa"                            // <-- setProperty
+ *         username = "sa"                            // &lt;-- setProperty
  *         password = ""
  *         settings = [mynew:"setting"]
  *     }
  *     sessionFactory(SessionFactory) {
- *         dataSource = dataSource                    // <-- getProperty for retrieving references
+ *         dataSource = dataSource                    // &lt;-- getProperty for retrieving references
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean ->         // <-- setProperty with closure for nested bean
+ *         nestedBean = { AnotherBean bean -&gt;         // &lt;-- setProperty with closure for nested bean
  *             dataSource = dataSource
  *         }
  *     }
@@ -84,7 +84,7 @@
  *         dataSource = dataSource
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean ->
+ *         nestedBean = { AnotherBean bean -&gt;
  *             dataSource = dataSource
  *         }
  *     }
diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
index e7f78f83f647..6b6ff96af18e 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -229,7 +229,7 @@ protected MessageFormat resolveCode(String code, Locale locale) {
 	 * for a Locale, after merging all specified resource bundles.
 	 * Either fetches the holder from the cache or freshly loads it.
 	 * <p>Only used when caching resource bundle contents forever, i.e.
-	 * with cacheSeconds < 0. Therefore, merged properties are always
+	 * with cacheSeconds &lt; 0. Therefore, merged properties are always
 	 * cached forever.
 	 */
 	protected PropertiesHolder getMergedProperties(Locale locale) {
diff --git a/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
index 805a9828c4c5..3ffbba9ef09b 100644
--- a/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
+++ b/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
@@ -37,7 +37,7 @@
  * as {@code DefaultConversionService} exposes its own
  * {@link DefaultConversionService#addDefaultConverters addDefaultConverters} method.
  *
- * <p>Automatically registers formatters for JSR-354 Money & Currency, JSR-310 Date-Time
+ * <p>Automatically registers formatters for JSR-354 Money &amp; Currency, JSR-310 Date-Time
  * and/or Joda-Time 2.x, depending on the presence of the corresponding API on the classpath.
  *
  * @author Chris Beams
@@ -100,7 +100,7 @@ public DefaultFormattingConversionService(
 
 	/**
 	 * Add formatters appropriate for most environments: including number formatters,
-	 * JSR-354 Money & Currency formatters, JSR-310 Date-Time and/or Joda-Time formatters,
+	 * JSR-354 Money &amp; Currency formatters, JSR-310 Date-Time and/or Joda-Time formatters,
 	 * depending on the presence of the corresponding API on the classpath.
 	 * @param formatterRegistry the service to register default formatters with
 	 */
diff --git a/spring-context/src/main/java/org/springframework/validation/Validator.java b/spring-context/src/main/java/org/springframework/validation/Validator.java
index d95b054872b4..b67b6d5d8b77 100644
--- a/spring-context/src/main/java/org/springframework/validation/Validator.java
+++ b/spring-context/src/main/java/org/springframework/validation/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
  * wholly of whitespace), and that any password that is present is
  * at least {@code 'MINIMUM_PASSWORD_LENGTH'} characters in length.
  *
- * <pre class="code"> public class UserLoginValidator implements Validator {
+ * <pre class="code">public class UserLoginValidator implements Validator {
  *
  *    private static final int MINIMUM_PASSWORD_LENGTH = 6;
  *
@@ -46,7 +46,7 @@
  *       ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "field.required");
  *       UserLogin login = (UserLogin) target;
  *       if (login.getPassword() != null
- *             && login.getPassword().trim().length() < MINIMUM_PASSWORD_LENGTH) {
+ *             &amp;&amp; login.getPassword().trim().length() &lt; MINIMUM_PASSWORD_LENGTH) {
  *          errors.rejectValue("password", "field.min.length",
  *                new Object[]{Integer.valueOf(MINIMUM_PASSWORD_LENGTH)},
  *                "The password must be at least [" + MINIMUM_PASSWORD_LENGTH + "] characters in length.");
diff --git a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
index 321629954d4b..a7ee178a3e41 100644
--- a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@
  * evaluate true:
  *
  * <pre class="code">
- * CommandLinePropertySource<?> ps = ...
+ * CommandLinePropertySource&lt;?&gt; ps = ...
  * assert ps.containsProperty("o1") == true;
  * assert ps.containsProperty("o2") == true;
  * assert ps.containsProperty("o3") == false;
@@ -149,7 +149,7 @@
  * will evaluate true:
  *
  * <pre class="code">
- * CommandLinePropertySource<?> ps = ...
+ * CommandLinePropertySource&lt;?&gt; ps = ...
  * assert ps.containsProperty("o1") == true;
  * assert ps.containsProperty("o2") == true;
  * assert ps.containsProperty("nonOptionArgs") == true;
diff --git a/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
index 64f67e3321b4..22353e098951 100644
--- a/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
  *     parser.accepts("option1");
  *     parser.accepts("option2").withRequiredArg();
  *     OptionSet options = parser.parse(args);
- *     PropertySource<?> ps = new JOptCommandLinePropertySource(options);
+ *     PropertySource&lt;?&gt; ps = new JOptCommandLinePropertySource(options);
  *     // ...
  * }</pre>
  *
diff --git a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
index a4a25397ac9f..c4f34a13e504 100644
--- a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@
  * <h3>Typical usage</h3>
  * <pre class="code">
  * public static void main(String[] args) {
- *     PropertySource<?> ps = new SimpleCommandLinePropertySource(args);
+ *     PropertySource&lt;?&gt; ps = new SimpleCommandLinePropertySource(args);
  *     // ...
  * }</pre>
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java b/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
index 79c4a3bca051..e4d97367d1ff 100644
--- a/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
+++ b/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@
  *     }
  *
  *     &#064;Bean
- *     public JmsListenerContainerFactory<?> myJmsListenerContainerFactory() {
+ *     public JmsListenerContainerFactory&lt;?&gt; myJmsListenerContainerFactory() {
  *         // factory settings
  *     }
  *
@@ -184,7 +184,7 @@
  *     }
  *
  *     &#064;Bean
- *     public JmsListenerEndpointRegistry<?> myJmsListenerEndpointRegistry() {
+ *     public JmsListenerEndpointRegistry&lt;?&gt; myJmsListenerEndpointRegistry() {
  *         // registry configuration
  *     }
  *
@@ -246,7 +246,7 @@
  *     }
  *
  *     &#064;Bean
- *     public JmsListenerContainerFactory<?> anotherJmsListenerContainerFactory() {
+ *     public JmsListenerContainerFactory&lt;?&gt; anotherJmsListenerContainerFactory() {
  *         // ...
  *     }
  *
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
index 835020e90f61..93bb26fcac18 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public String toString() {
 
 	/**
 	 * The notation to use when printing discrete items of content.
-	 * For example " || " for URL patterns or " && " for param expressions.
+	 * For example " || " for URL patterns or " &amp;&amp; " for param expressions.
 	 */
 	protected abstract String getToStringInfix();
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateOperations.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateOperations.java
index fe2fd028b3c7..0bd481af29f9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -606,7 +606,7 @@ public interface HibernateOperations {
 	 * @param firstResult the index of the first result object to be retrieved
 	 * (numbered from 0)
 	 * @param maxResults the maximum number of result objects to retrieve
-	 * (or <=0 for no limit)
+	 * (or &lt;=0 for no limit)
 	 * @return a {@link List} containing 0 or more persistent instances
 	 * @throws DataAccessException in case of Hibernate errors
 	 * @see DetachedCriteria#getExecutableCriteria(org.hibernate.Session)
@@ -643,7 +643,7 @@ public interface HibernateOperations {
 	 * @param firstResult the index of the first result object to be retrieved
 	 * (numbered from 0)
 	 * @param maxResults the maximum number of result objects to retrieve
-	 * (or <=0 for no limit)
+	 * (or &lt;=0 for no limit)
 	 * @return a {@link List} containing 0 or more persistent instances
 	 * @throws DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.criterion.Example#create(Object)
@@ -660,7 +660,7 @@ public interface HibernateOperations {
 	 * @param firstResult the index of the first result object to be retrieved
 	 * (numbered from 0)
 	 * @param maxResults the maximum number of result objects to retrieve
-	 * (or <=0 for no limit)
+	 * (or &lt;=0 for no limit)
 	 * @return a {@link List} containing 0 or more persistent instances
 	 * @throws DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.criterion.Example#create(Object)
diff --git a/spring-web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
index a02e5e1680a8..f6a9911d1ab5 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -285,21 +285,21 @@ public enum HttpStatus {
 	I_AM_A_TEAPOT(418, Series.CLIENT_ERROR, "I'm a teapot"),
 	/**
 	 * @deprecated See
-	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt">
+	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff{@literal &}url2=draft-ietf-webdav-protocol-06.txt">
 	 *     WebDAV Draft Changes</a>
 	 */
 	@Deprecated
 	INSUFFICIENT_SPACE_ON_RESOURCE(419, Series.CLIENT_ERROR, "Insufficient Space On Resource"),
 	/**
 	 * @deprecated See
-	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt">
+	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff{@literal &}url2=draft-ietf-webdav-protocol-06.txt">
 	 *     WebDAV Draft Changes</a>
 	 */
 	@Deprecated
 	METHOD_FAILURE(420, Series.CLIENT_ERROR, "Method Failure"),
 	/**
 	 * @deprecated
-	 * See <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt">
+	 * See <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff{@literal &}url2=draft-ietf-webdav-protocol-06.txt">
 	 *     WebDAV Draft Changes</a>
 	 */
 	@Deprecated
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
index 415113ff0596..bdd1e577283a 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -83,7 +83,7 @@
  * <li><a href="https://github.com/FasterXML/jackson-datatype-jdk8">jackson-datatype-jdk8</a>:
  * support for other Java 8 types like {@link java.util.Optional}</li>
  * <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>:
- * support for Java 8 Date & Time API types</li>
+ * support for Java 8 Date &amp; Time API types</li>
  * <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>:
  * support for Joda-Time types</li>
  * <li><a href="https://github.com/FasterXML/jackson-module-kotlin">jackson-module-kotlin</a>:
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
index 57d3e63e184f..376e6b277372 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,54 +62,54 @@
  * <p>Example usage with
  * {@link MappingJackson2HttpMessageConverter}:
  *
- * <pre class="code">
- * &lt;bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
- *   &lt;property name="objectMapper">
- *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * <pre class="code">{@code
+ * <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
+ *   <property name="objectMapper">
+ *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:autoDetectFields="false"
  *       p:autoDetectGettersSetters="false"
  *       p:annotationIntrospector-ref="jaxbAnnotationIntrospector" />
- *   &lt;/property>
- * &lt;/bean>
- * </pre>
+ *   </property>
+ * </bean>
+ * }</pre>
  *
  * <p>Example usage with MappingJackson2JsonView:
  *
- * <pre class="code">
- * &lt;bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
- *   &lt;property name="objectMapper">
- *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * <pre class="code">{@code
+ * <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
+ *   <property name="objectMapper">
+ *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:failOnEmptyBeans="false"
  *       p:indentOutput="true">
- *       &lt;property name="serializers">
- *         &lt;array>
- *           &lt;bean class="org.mycompany.MyCustomSerializer" />
- *         &lt;/array>
- *       &lt;/property>
- *     &lt;/bean>
- *   &lt;/property>
- * &lt;/bean>
- * </pre>
+ *       <property name="serializers">
+ *         <array>
+ *           <bean class="org.mycompany.MyCustomSerializer" />
+ *         </array>
+ *       </property>
+ *     </bean>
+ *   </property>
+ * </bean>
+ * }</pre>
  *
  * <p>In case there are no specific setters provided (for some rarely used options),
  * you can still use the more general methods  {@link #setFeaturesToEnable} and
  * {@link #setFeaturesToDisable}.
  *
- * <pre class="code">
- * &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   &lt;property name="featuresToEnable">
- *     &lt;array>
- *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/>
- *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
- *     &lt;/array>
- *   &lt;/property>
- *   &lt;property name="featuresToDisable">
- *     &lt;array>
- *       &lt;util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/>
- *     &lt;/array>
- *   &lt;/property>
- * &lt;/bean>
- * </pre>
+ * <pre class="code">{@code
+ * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
+ *   <property name="featuresToEnable">
+ *     <array>
+ *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/>
+ *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
+ *     </array>
+ *   </property>
+ *   <property name="featuresToDisable">
+ *     <array>
+ *       <util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/>
+ *     </array>
+ *   </property>
+ * </bean>
+ * }</pre>
  *
  * <p>It also automatically registers the following well-known modules if they are
  * detected on the classpath:
@@ -119,7 +119,7 @@
  * <li><a href="https://github.com/FasterXML/jackson-datatype-jdk8">jackson-datatype-jdk8</a>:
  * support for other Java 8 types like {@link java.util.Optional}</li>
  * <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>:
- * support for Java 8 Date & Time API types</li>
+ * support for Java 8 Date &amp; Time API types</li>
  * <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>:
  * support for Joda-Time types</li>
  * <li><a href="https://github.com/FasterXML/jackson-module-kotlin">jackson-module-kotlin</a>:
@@ -129,11 +129,11 @@
  * <p>In case you want to configure Jackson's {@link ObjectMapper} with a custom {@link Module},
  * you can register one or more such Modules by class name via {@link #setModulesToInstall}:
  *
- * <pre class="code">
- * &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   &lt;property name="modulesToInstall" value="myapp.jackson.MySampleModule,myapp.jackson.MyOtherModule"/>
- * &lt;/bean
- * </pre>
+ * <pre class="code">{@code
+ * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
+ *   <property name="modulesToInstall" value="myapp.jackson.MySampleModule,myapp.jackson.MyOtherModule"/>
+ * </bean
+ * }</pre>
  *
  * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
index 3cac0b07bbe2..07a200dc2011 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public abstract class HtmlUtils {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * <p>Handles complete character set defined in HTML 4.01 recommendation.
+	 * <p>Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * <p>Escapes all special characters to their corresponding
 	 * entity reference (e.g. {@code &lt;}).
 	 * <p>Reference:
@@ -65,7 +65,7 @@ public static String htmlEscape(String input) {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * <p>Handles complete character set defined in HTML 4.01 recommendation.
+	 * <p>Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * <p>Escapes all special characters to their corresponding
 	 * entity reference (e.g. {@code &lt;}) at least as required by the
 	 * specified encoding. In other words, if a special character does
@@ -98,9 +98,9 @@ public static String htmlEscape(String input, String encoding) {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * <p>Handles complete character set defined in HTML 4.01 recommendation.
+	 * <p>Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * <p>Escapes all special characters to their corresponding numeric
-	 * reference in decimal format (&#<i>Decimal</i>;).
+	 * reference in decimal format (&amp;#<i>Decimal</i>;).
 	 * <p>Reference:
 	 * <a href="https://www.w3.org/TR/html4/sgml/entities.html">
 	 * https://www.w3.org/TR/html4/sgml/entities.html
@@ -114,9 +114,9 @@ public static String htmlEscapeDecimal(String input) {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * <p>Handles complete character set defined in HTML 4.01 recommendation.
+	 * <p>Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * <p>Escapes all special characters to their corresponding numeric
-	 * reference in decimal format (&#<i>Decimal</i>;) at least as required by the
+	 * reference in decimal format (&amp;#<i>Decimal</i>;) at least as required by the
 	 * specified encoding. In other words, if a special character does
 	 * not have to be escaped for the given encoding, it may not be.
 	 * <p>Reference:
@@ -148,9 +148,9 @@ public static String htmlEscapeDecimal(String input, String encoding) {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * <p>Handles complete character set defined in HTML 4.01 recommendation.
+	 * <p>Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * <p>Escapes all special characters to their corresponding numeric
-	 * reference in hex format (&#x<i>Hex</i>;).
+	 * reference in hex format (&amp;#x<i>Hex</i>;).
 	 * <p>Reference:
 	 * <a href="https://www.w3.org/TR/html4/sgml/entities.html">
 	 * https://www.w3.org/TR/html4/sgml/entities.html
@@ -164,9 +164,9 @@ public static String htmlEscapeHex(String input) {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * <p>Handles complete character set defined in HTML 4.01 recommendation.
+	 * <p>Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * <p>Escapes all special characters to their corresponding numeric
-	 * reference in hex format (&#x<i>Hex</i>;) at least as required by the
+	 * reference in hex format (&amp;#x<i>Hex</i>;) at least as required by the
 	 * specified encoding. In other words, if a special character does
 	 * not have to be escaped for the given encoding, it may not be.
 	 * <p>Reference:
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 1abf615c8b85..770c6ad7498e 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public List<String> getVariableNames() {
 	 * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 	 * Map&lt;String, String&gt; uriVariables = new HashMap&lt;String, String&gt;();
 	 * uriVariables.put("booking", "42");
-	 * uriVariables.put("hotel", "Rest & Relax");
+	 * uriVariables.put("hotel", "Rest &amp; Relax");
 	 * System.out.println(template.expand(uriVariables));
 	 * </pre>
 	 * will print: <blockquote>{@code https://example.com/hotels/Rest%20%26%20Relax/bookings/42}</blockquote>
@@ -113,7 +113,7 @@ public URI expand(Map<String, ?> uriVariables) {
 	 * <p>Example:
 	 * <pre class="code">
 	 * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
-	 * System.out.println(template.expand("Rest & Relax", 42));
+	 * System.out.println(template.expand("Rest &amp; Relax", 42));
 	 * </pre>
 	 * will print: <blockquote>{@code https://example.com/hotels/Rest%20%26%20Relax/bookings/42}</blockquote>
 	 * @param uriVariableValues the array of URI variables
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
index 4697b3affc61..a67be402e567 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
@@ -246,15 +246,15 @@ public static String encodeQueryParam(String queryParam, Charset charset) {
 	 * Encode the query parameters from the given {@code MultiValueMap} with UTF-8.
 	 * <p>This can be used with {@link UriComponentsBuilder#queryParams(MultiValueMap)}
 	 * when building a URI from an already encoded template.
-	 * <pre class="code">
-	 * MultiValueMap&lt;String, String&gt; params = new LinkedMultiValueMap<>(2);
+	 * <pre class="code">{@code
+	 * MultiValueMap<String, String> params = new LinkedMultiValueMap<>(2);
 	 * // add to params...
 	 *
 	 * ServletUriComponentsBuilder.fromCurrentRequest()
 	 *         .queryParams(UriUtils.encodeQueryParams(params))
 	 *         .build(true)
 	 *         .toUriString();
-	 * </pre>
+	 * }</pre>
 	 * @param params the parameters to encode
 	 * @return a new {@code MultiValueMap} with the encoded names and values
 	 * @since 5.2.3
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
index 003f47caa240..afaf28433e75 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
 /**
  * Implements the {@link RequestCondition} contract by delegating to multiple
- * {@code RequestCondition} types and using a logical conjunction (' && ') to
+ * {@code RequestCondition} types and using a logical conjunction ({@code ' && '}) to
  * ensure all conditions match a given request.
  *
  * <p>When {@code CompositeRequestCondition} instances are combined or compared
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
index 229b610b8449..8a785dcb0ff5 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.springframework.web.server.ServerWebExchange;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set of header expressions with syntax defined in {@link RequestMapping#headers()}.
  *
  * <p>Expressions passed to the constructor with header names 'Accept' or
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
index 9b1bc9f904ea..81ff4416ef95 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 import org.springframework.web.server.ServerWebExchange;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set parameter expressions with syntax defined in {@link RequestMapping#params()}.
  *
  * @author Rossen Stoyanchev
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
index 5857fdc5eb56..d2bf8da0ac27 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 
 /**
  * Implements the {@link RequestCondition} contract by delegating to multiple
- * {@code RequestCondition} types and using a logical conjunction (' && ') to
+ * {@code RequestCondition} types and using a logical conjunction ({@code ' && '}) to
  * ensure all conditions match a given request.
  *
  * <p>When {@code CompositeRequestCondition} instances are combined or compared
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
index e3f1773318ee..2f7fac423f40 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 import org.springframework.web.cors.CorsUtils;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set of header expressions with syntax defined in {@link RequestMapping#headers()}.
  *
  * <p>Expressions passed to the constructor with header names 'Accept' or
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
index f06f363aa2c3..ead4ec3d0495 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set parameter expressions with syntax defined in {@link RequestMapping#params()}.
  *
  * @author Arjen Poutsma
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
index f6b2bf26c68a..db1ca29c5c4d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
@@ -413,7 +413,7 @@ public static <T> T controller(Class<T> controllerType) {
 	 * A JSP can prepare a URL to the controller method as follows:
 	 *
 	 * <pre class="code">
-	 * <%@ taglib uri="http://www.springframework.org/tags" prefix="s" %>
+	 * &lt;%@ taglib uri="http://www.springframework.org/tags" prefix="s" %&gt;
 	 *
 	 * &lt;a href="${s:mvcUrl('PC#getPerson').arg(0,"123").build()}"&gt;Get Person&lt;/a&gt;
 	 * </pre>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 079b3214846f..9b0043b3639b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -313,7 +313,7 @@ String createUrl() throws JspException {
 	 * @param usedParams set of parameter names that have been applied as
 	 * template params
 	 * @param includeQueryStringDelimiter true if the query string should start
-	 * with a '?' instead of '&'
+	 * with a '?' instead of '&amp;'
 	 * @return the query string
 	 */
 	protected String createQueryString(List<Param> params, Set<String> usedParams, boolean includeQueryStringDelimiter)

From 93efb20a53365fea87cf3ef422f06959fcf9c313 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 28 Sep 2021 13:34:33 +0200
Subject: [PATCH 159/735] Fix broken links in Javadoc

This commit removes several links that were broken due to the removal
of various APIs in 6.0.

See gh-27480
---
 .../concurrent/ConcurrentMapCacheManager.java |   5 +-
 .../scheduling/SchedulingAwareRunnable.java   |   9 +-
 .../scheduling/SchedulingTaskExecutor.java    |   5 +-
 .../core/ConfigurableObjectInputStream.java   |   8 +-
 .../springframework/core/io/VfsResource.java  |   3 +-
 .../org/springframework/core/io/VfsUtils.java |   7 +-
 .../core/task/SimpleAsyncTaskExecutor.java    |   3 +-
 .../DefaultMessageListenerContainer.java      |  10 +-
 .../SimpleMessageListenerContainer.java       |   3 +-
 .../support/converter/MessageConverter.java   |   4 +-
 .../GenericMessageEndpointManager.java        | 126 +++++++++---------
 .../support/LocalConnectionFactoryBean.java   |   8 +-
 .../json/Jackson2ObjectMapperFactoryBean.java |  80 ++++++-----
 .../web/HttpRequestHandler.java               |  10 +-
 .../support/HttpRequestHandlerServlet.java    |   9 +-
 .../web/multipart/MultipartFile.java          |   3 -
 .../MultipartHttpServletRequest.java          |   3 +-
 .../web/multipart/MultipartResolver.java      |   7 +-
 .../AbstractMultipartHttpServletRequest.java  |   6 +-
 .../DefaultMultipartHttpServletRequest.java   |   4 +-
 .../StandardServletMultipartResolver.java     |  19 +--
 .../web/servlet/DispatcherServlet.java        |   7 +-
 .../ViewResolversBeanDefinitionParser.java    |   5 +-
 .../WebSphereRequestUpgradeStrategy.java      |   4 +-
 24 files changed, 150 insertions(+), 198 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
index aea913288d8b..8a29d1fd2900 100644
--- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,8 +38,7 @@
  * <p>Note: This is by no means a sophisticated CacheManager; it comes with no
  * cache configuration options. However, it may be useful for testing or simple
  * caching scenarios. For advanced local caching needs, consider
- * {@link org.springframework.cache.jcache.JCacheCacheManager},
- * {@link org.springframework.cache.ehcache.EhCacheCacheManager},
+ * {@link org.springframework.cache.jcache.JCacheCacheManager} or
  * {@link org.springframework.cache.caffeine.CaffeineCacheManager}.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
index d6de8c160aa1..09a54d2f44d3 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,22 +17,17 @@
 package org.springframework.scheduling;
 
 /**
- * Extension of the Runnable interface, adding special callbacks
+ * Extension of the {@link Runnable} interface, adding special callbacks
  * for long-running operations.
  *
- * <p>This interface closely corresponds to the CommonJ Work interface,
- * but is kept separate to avoid a required CommonJ dependency.
- *
  * <p>Scheduling-capable TaskExecutors are encouraged to check a submitted
  * Runnable, detecting whether this interface is implemented and reacting
  * as appropriately as they are able to.
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see commonj.work.Work
  * @see org.springframework.core.task.TaskExecutor
  * @see SchedulingTaskExecutor
- * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
  */
 public interface SchedulingAwareRunnable extends Runnable {
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
index 2f1dd004aeb3..7f7d497eb1bb 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
  *
  * <p>Note: {@link SchedulingTaskExecutor} implementations are encouraged to also
  * implement the {@link org.springframework.core.task.AsyncListenableTaskExecutor}
- * interface. This is not required due to the dependency on Spring 4.0's new
+ * interface. This is not required due to the dependency on Spring 4.0's
  * {@link org.springframework.util.concurrent.ListenableFuture} interface,
  * which would make it impossible for third-party executor implementations
  * to remain compatible with both Spring 4.0 and Spring 3.x.
@@ -37,7 +37,6 @@
  * @since 2.0
  * @see SchedulingAwareRunnable
  * @see org.springframework.core.task.TaskExecutor
- * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
  */
 public interface SchedulingTaskExecutor extends AsyncTaskExecutor {
 
diff --git a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
index 52c11eeddf2b..eb845e47977d 100644
--- a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
+++ b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +26,12 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * Special ObjectInputStream subclass that resolves class names
- * against a specific ClassLoader. Serves as base class for
- * {@link org.springframework.remoting.rmi.CodebaseAwareObjectInputStream}.
+ * Special {@link ObjectInputStream} subclass that resolves class names
+ * against a specific {@link ClassLoader}.
  *
  * @author Juergen Hoeller
  * @since 2.5.5
+ * @see org.springframework.core.serializer.DefaultDeserializer
  */
 public class ConfigurableObjectInputStream extends ObjectInputStream {
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/VfsResource.java b/spring-core/src/main/java/org/springframework/core/io/VfsResource.java
index 6751d60e699b..5caf8c5ff0e0 100644
--- a/spring-core/src/main/java/org/springframework/core/io/VfsResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/VfsResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
  * @author Costin Leau
  * @author Sam Brannen
  * @since 3.0
- * @see org.jboss.vfs.VirtualFile
  */
 public class VfsResource extends AbstractResource {
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
index c2e3c3537a71..1dad62fb18b0 100644
--- a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,9 @@
  * (package {@code org.jboss.vfs}) and is in particular compatible with
  * JBoss AS 7 and WildFly 8+.
  *
- * <p>Thanks go to Marius Bogoevici for the initial patch.
- * <b>Note:</b> This is an internal class and should not be used outside the framework.
+ * <p>Thanks go to Marius Bogoevici for the initial implementation.
+ *
+ * <p><b>Note:</b> This is an internal class and should not be used outside the framework.
  *
  * @author Costin Leau
  * @author Juergen Hoeller
diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
index fe0104f58982..035e87317758 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@
  * @see #setConcurrencyLimit
  * @see SyncTaskExecutor
  * @see org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
- * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
  */
 @SuppressWarnings("serial")
 public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
index 41fc11034f65..4f2435ff5c74 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -62,11 +62,10 @@
  * abstraction. By default, the specified number of invoker tasks will be created
  * on startup, according to the {@link #setConcurrentConsumers "concurrentConsumers"}
  * setting. Specify an alternative {@code TaskExecutor} to integrate with an existing
- * thread pool facility (such as a Jakarta EE server's), for example using a
- * {@link org.springframework.scheduling.commonj.WorkManagerTaskExecutor CommonJ WorkManager}.
- * With a native JMS setup, each of those listener threads is going to use a
- * cached JMS {@code Session} and {@code MessageConsumer} (only refreshed in case
- * of failure), using the JMS provider's resources as efficiently as possible.
+ * thread pool facility (such as a Jakarta EE server's). With a native JMS setup,
+ * each of those listener threads is going to use a cached JMS {@code Session} and
+ * {@code MessageConsumer} (only refreshed in case of failure), using the JMS provider's
+ * resources as efficiently as possible.
  *
  * <p>Message reception and listener execution can automatically be wrapped
  * in transactions by passing a Spring
@@ -224,7 +223,6 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 	 * will occupy a number of threads for its entire lifetime.
 	 * @see #setConcurrentConsumers
 	 * @see org.springframework.core.task.SimpleAsyncTaskExecutor
-	 * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
 	 */
 	public void setTaskExecutor(Executor taskExecutor) {
 		this.taskExecutor = taskExecutor;
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
index b45de7781a6f..12e4eba04543 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -177,7 +177,6 @@ public void setConcurrentConsumers(int concurrentConsumers) {
 	 * {@link jakarta.jms.MessageListener} will work fine, in general.
 	 * @see #setConcurrentConsumers
 	 * @see org.springframework.core.task.SimpleAsyncTaskExecutor
-	 * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
 	 */
 	public void setTaskExecutor(Executor taskExecutor) {
 		this.taskExecutor = taskExecutor;
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
index 433123d19535..23b1bdb2e8a2 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,6 @@
  * @since 1.1
  * @see org.springframework.jms.core.JmsTemplate#setMessageConverter
  * @see org.springframework.jms.listener.adapter.MessageListenerAdapter#setMessageConverter
- * @see org.springframework.jms.remoting.JmsInvokerClientInterceptor#setMessageConverter
- * @see org.springframework.jms.remoting.JmsInvokerServiceExporter#setMessageConverter
  */
 public interface MessageConverter {
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
index 090c2a20a52e..97e0369ef17d 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,21 +39,22 @@
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointManager"&gt;
- * 	 &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
- * 	 &lt;property name="messageEndpointFactory"&gt;
- *     &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
- *       &lt;property name="messageListener" ref="messageListener"/&gt;
- *     &lt;/bean&gt;
- * 	 &lt;/property&gt;
- * 	 &lt;property name="activationSpec"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
- *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
+ *  &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
+ *  &lt;property name="messageEndpointFactory"&gt;
+ *    &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
+ *      &lt;property name="messageListener" ref="messageListener"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="activationSpec"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
+ *      &lt;property name="destination" value="myQueue"/&gt;
+ *      &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
- * In this example, Spring's own {@link GenericMessageEndpointFactory} is used
+ * <p>In this example, Spring's own {@link GenericMessageEndpointFactory} is used
  * to point to a standard message listener object that happens to be supported
  * by the specified target ResourceAdapter: in this case, a JMS
  * {@link jakarta.jms.MessageListener} object as supported by the ActiveMQ
@@ -61,37 +62,38 @@
  *
  * <pre class="code">
  * &lt;bean id="messageListener" class="com.myorg.messaging.myMessageListener"&gt;
- *   ...
- * &lt;/bean&gt;</pre>
+ *   &lt;!-- ... --&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
- * The target ResourceAdapter may be configured as a local Spring bean as well
+ * <p>The target ResourceAdapter may be configured as a local Spring bean as well
  * (the typical case) or obtained from JNDI (e.g. on WebLogic). For the
  * example above, a local ResourceAdapter bean could be defined as follows
  * (matching the "resourceAdapter" bean reference above):
  *
  * <pre class="code">
  * &lt;bean id="resourceAdapter" class="org.springframework.jca.support.ResourceAdapterFactoryBean"&gt;
- *   &lt;property name="resourceAdapter"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQResourceAdapter"&gt;
- *       &lt;property name="serverUrl" value="tcp://localhost:61616"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- *   &lt;property name="workManager"&gt;
- *     &lt;bean class="org.springframework.jca.work.SimpleTaskWorkManager"/&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
+ *  &lt;property name="resourceAdapter"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQResourceAdapter"&gt;
+ *      &lt;property name="serverUrl" value="tcp://localhost:61616"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="workManager"&gt;
+ *    &lt;bean class="..."/&gt;
+ *  &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
- * For a different target resource, the configuration would simply point to a
+ * <p>For a different target resource, the configuration would simply point to a
  * different ResourceAdapter and a different ActivationSpec object (which are
  * both specific to the resource provider), and possibly a different message
  * listener (e.g. a CCI {@link jakarta.resource.cci.MessageListener} for a
  * resource adapter which is based on the JCA Common Client Interface).
  *
  * <p>The asynchronous execution strategy can be customized through the
- * "workManager" property on the ResourceAdapterFactoryBean (as shown above).
- * Check out {@link org.springframework.jca.work.SimpleTaskWorkManager}'s
- * javadoc for its configuration options; alternatively, any other
- * JCA-compliant WorkManager can be used (e.g. Geronimo's).
+ * "workManager" property on the ResourceAdapterFactoryBean as shown above,
+ * where {@code <bean class="..."/>} should be replaced with configuration for
+ * any JCA-compliant {@code WorkManager}.
  *
  * <p>Transactional execution is a responsibility of the concrete message endpoint,
  * as built by the specified MessageEndpointFactory. {@link GenericMessageEndpointFactory}
@@ -101,43 +103,45 @@
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointManager"&gt;
- * 	 &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
- * 	 &lt;property name="messageEndpointFactory"&gt;
- *     &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
- *       &lt;property name="messageListener" ref="messageListener"/&gt;
- *       &lt;property name="transactionManager" ref="transactionManager"/&gt;
- *     &lt;/bean&gt;
- * 	 &lt;/property&gt;
- * 	 &lt;property name="activationSpec"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
- *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
+ *  &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
+ *  &lt;property name="messageEndpointFactory"&gt;
+ *    &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
+ *      &lt;property name="messageListener" ref="messageListener"/&gt;
+ *      &lt;property name="transactionManager" ref="transactionManager"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="activationSpec"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
+ *      &lt;property name="destination" value="myQueue"/&gt;
+ *      &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
  * &lt;/bean&gt;
  *
- * &lt;bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/&gt;</pre>
+ * &lt;bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/&gt;
+ * </pre>
  *
- * Alternatively, check out your resource provider's ActivationSpec object,
+ * <p>Alternatively, check out your resource provider's ActivationSpec object,
  * which should support local transactions through a provider-specific config flag,
  * e.g. ActiveMQActivationSpec's "useRAManagedTransaction" bean property.
  *
  * <pre class="code">
  * &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointManager"&gt;
- * 	 &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
- * 	 &lt;property name="messageEndpointFactory"&gt;
- *     &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
- *       &lt;property name="messageListener" ref="messageListener"/&gt;
- *     &lt;/bean&gt;
- * 	 &lt;/property&gt;
- * 	 &lt;property name="activationSpec"&gt;
- *     &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
- *       &lt;property name="destination" value="myQueue"/&gt;
- *       &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
- *       &lt;property name="useRAManagedTransaction" value="true"/&gt;
- *     &lt;/bean&gt;
- *   &lt;/property&gt;
- * &lt;/bean&gt;</pre>
+ *  &lt;property name="resourceAdapter" ref="resourceAdapter"/&gt;
+ *  &lt;property name="messageEndpointFactory"&gt;
+ *    &lt;bean class="org.springframework.jca.endpoint.GenericMessageEndpointFactory"&gt;
+ *      &lt;property name="messageListener" ref="messageListener"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ *  &lt;property name="activationSpec"&gt;
+ *    &lt;bean class="org.apache.activemq.ra.ActiveMQActivationSpec"&gt;
+ *      &lt;property name="destination" value="myQueue"/&gt;
+ *      &lt;property name="destinationType" value="jakarta.jms.Queue"/&gt;
+ *      &lt;property name="useRAManagedTransaction" value="true"/&gt;
+ *    &lt;/bean&gt;
+ *  &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
index fe49bafdf5e8..2a514d2a32f3 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,9 +57,8 @@
  * order to make the connector interact with an XA transaction coordinator.
  * Alternatively, simply use the native local transaction facilities of the
  * exposed API (e.g. CCI local transactions), or use a corresponding
- * implementation of Spring's PlatformTransactionManager SPI
- * (e.g. {@link org.springframework.jca.cci.connection.CciLocalTransactionManager})
- * to drive local transactions.
+ * implementation of Spring's PlatformTransactionManager SPI to drive local
+ * transactions.
  *
  * @author Juergen Hoeller
  * @since 1.2
@@ -67,7 +66,6 @@
  * @see #setConnectionManager
  * @see jakarta.resource.cci.ConnectionFactory
  * @see jakarta.resource.cci.Connection#getLocalTransaction
- * @see org.springframework.jca.cci.connection.CciLocalTransactionManager
  */
 public class LocalConnectionFactoryBean implements FactoryBean<Object>, InitializingBean {
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
index 08f89e9ac798..adc81d96b164 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -62,54 +62,51 @@
  * <p>Example usage with
  * {@link MappingJackson2HttpMessageConverter}:
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
- *   <property name="objectMapper">
- *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * <pre class="code">
+ * &lt;bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"&gt;
+ *   &lt;property name="objectMapper"&gt;
+ *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:autoDetectFields="false"
  *       p:autoDetectGettersSetters="false"
- *       p:annotationIntrospector-ref="jaxbAnnotationIntrospector" />
- *   </property>
- * </bean>
- * }</pre>
+ *       p:annotationIntrospector-ref="jaxbAnnotationIntrospector" /&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>Example usage with MappingJackson2JsonView:
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
- *   <property name="objectMapper">
- *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * <pre class="code">
+ * &lt;bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView"&gt;
+ *   &lt;property name="objectMapper"&gt;
+ *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:failOnEmptyBeans="false"
- *       p:indentOutput="true">
- *       <property name="serializers">
- *         <array>
- *           <bean class="org.mycompany.MyCustomSerializer" />
- *         </array>
- *       </property>
- *     </bean>
- *   </property>
- * </bean>
- * }</pre>
+ *       p:indentOutput="true"&gt;
+ *       &lt;property name="serializers"&gt;
+ *         &lt;array&gt;
+ *           &lt;bean class="org.mycompany.MyCustomSerializer" /&gt;
+ *         &lt;/array&gt;
+ *       &lt;/property&gt;
+ *     &lt;/bean&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>In case there are no specific setters provided (for some rarely used options),
  * you can still use the more general methods  {@link #setFeaturesToEnable} and
  * {@link #setFeaturesToDisable}.
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   <property name="featuresToEnable">
- *     <array>
- *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/>
- *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
- *     </array>
- *   </property>
- *   <property name="featuresToDisable">
- *     <array>
- *       <util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/>
- *     </array>
- *   </property>
- * </bean>
- * }</pre>
+ * <pre class="code">
+ * &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"&gt;
+ *   &lt;property name="featuresToEnable"&gt;
+ *     &lt;array&gt;
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/&gt;
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/&gt;
+ *     &lt;/array&gt;
+ *   &lt;/property&gt;
+ *   &lt;property name="featuresToDisable"&gt;
+ *     &lt;array&gt;
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/&gt;
+ *     &lt;/array&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>It also automatically registers the following well-known modules if they are
  * detected on the classpath:
@@ -127,11 +124,10 @@
  * <p>In case you want to configure Jackson's {@link ObjectMapper} with a custom {@link Module},
  * you can register one or more such Modules by class name via {@link #setModulesToInstall}:
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   <property name="modulesToInstall" value="myapp.jackson.MySampleModule,myapp.jackson.MyOtherModule"/>
- * </bean
- * }</pre>
+ * <pre class="code">
+ * &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"&gt;
+ *   &lt;property name="modulesToInstall" value="myapp.jackson.MySampleModule,myapp.jackson.MyOtherModule"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
index 542e60809448..94b155c3c3d4 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,12 +49,6 @@
  * return value gives a clearer signature to callers other than the
  * DispatcherServlet, indicating that there will never be a view to render.
  *
- * <p>As of Spring 2.0, Spring's HTTP-based remote exporters, such as
- * {@link org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter}
- * and {@link org.springframework.remoting.caucho.HessianServiceExporter},
- * implement this interface rather than the more extensive Controller interface,
- * for minimal dependencies on Spring-specific web infrastructure.
- *
  * <p>Note that HttpRequestHandlers may optionally implement the
  * {@link org.springframework.web.servlet.mvc.LastModified} interface,
  * just like Controllers can, <i>provided that they run within Spring's
@@ -71,8 +65,6 @@
  * @see org.springframework.web.servlet.mvc.Controller
  * @see org.springframework.web.servlet.mvc.LastModified
  * @see org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter
- * @see org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter
- * @see org.springframework.remoting.caucho.HessianServiceExporter
  */
 @FunctionalInterface
 public interface HttpRequestHandler {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
index a97b402c36ab..958559b6d622 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,13 +36,6 @@
  * in Spring's root web application context. The target bean name must match the
  * HttpRequestHandlerServlet servlet-name as defined in {@code web.xml}.
  *
- * <p>This can for example be used to expose a single Spring remote exporter,
- * such as {@link org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter}
- * or {@link org.springframework.remoting.caucho.HessianServiceExporter},
- * per HttpRequestHandlerServlet definition. This is a minimal alternative
- * to defining remote exporters as beans in a DispatcherServlet context
- * (with advanced mapping and interception facilities being available there).
- *
  * @author Juergen Hoeller
  * @since 2.0
  * @see org.springframework.web.HttpRequestHandler
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
index 725bbfc0dc80..25790e5f3d1e 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
@@ -61,8 +61,6 @@ public interface MultipartFile extends InputStreamSource {
 	 * this one one somewhere for reference, if necessary.
 	 * @return the original filename, or the empty String if no file has been chosen
 	 * in the multipart form, or {@code null} if not defined or not available
-	 * @see org.apache.commons.fileupload.FileItem#getName()
-	 * @see org.springframework.web.multipart.commons.CommonsMultipartFile#setPreserveFilename
 	 * @see <a href="https://tools.ietf.org/html/rfc7578#section-4.2">RFC 7578, Section 4.2</a>
 	 * @see <a href="https://owasp.org/www-community/vulnerabilities/Unrestricted_File_Upload">Unrestricted File Upload</a>
 	 */
@@ -133,7 +131,6 @@ default Resource getResource() {
 	 * @throws IOException in case of reading or writing errors
 	 * @throws IllegalStateException if the file has already been moved
 	 * in the filesystem and is not available anymore for another transfer
-	 * @see org.apache.commons.fileupload.FileItem#write(File)
 	 * @see jakarta.servlet.http.Part#write(String)
 	 */
 	void transferTo(File dest) throws IOException, IllegalStateException;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
index 692dd710d22a..0fa6a8b726fa 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
@@ -25,7 +25,8 @@
 /**
  * Provides additional methods for dealing with multipart content within a
  * servlet request, allowing to access uploaded files.
- * Implementations also need to override the standard
+ *
+ * <p>Implementations also need to override the standard
  * {@link jakarta.servlet.ServletRequest} methods for parameter access, making
  * multipart parameters available.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
index cd18292d2606..a9c79dfbb82b 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,8 @@
  * Implementations are typically usable both within an application context
  * and standalone.
  *
- * <p>There are two concrete implementations included in Spring, as of Spring 3.1:
+ * <p>Spring provides the following concrete implementation:
  * <ul>
- * <li>{@link org.springframework.web.multipart.commons.CommonsMultipartResolver}
- * for Apache Commons FileUpload
  * <li>{@link org.springframework.web.multipart.support.StandardServletMultipartResolver}
  * for the Servlet 3.0+ Part API
  * </ul>
@@ -77,7 +75,6 @@
  * @since 29.09.2003
  * @see MultipartHttpServletRequest
  * @see MultipartFile
- * @see org.springframework.web.multipart.commons.CommonsMultipartResolver
  * @see org.springframework.web.multipart.support.ByteArrayMultipartFileEditor
  * @see org.springframework.web.multipart.support.StringMultipartFileEditor
  * @see org.springframework.web.servlet.DispatcherServlet
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
index 8504b96816c9..fb705a9445e3 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,8 @@
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 /**
- * Abstract base implementation of the MultipartHttpServletRequest interface.
- * Provides management of pre-generated MultipartFile instances.
+ * Abstract base implementation of the {@link MultipartHttpServletRequest} interface.
+ * <p>Provides management of pre-generated {@link MultipartFile} instances.
  *
  * @author Juergen Hoeller
  * @author Arjen Poutsma
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
index 3a7859e56159..3ac4ddeed77d 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,6 @@
  * {@link org.springframework.web.multipart.MultipartHttpServletRequest}
  * interface. Provides management of pre-generated parameter values.
  *
- * <p>Used by {@link org.springframework.web.multipart.commons.CommonsMultipartResolver}.
- *
  * @author Trevor D. Cook
  * @author Juergen Hoeller
  * @author Arjen Poutsma
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
index 3a29473a4afb..b09dac0ba20a 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
@@ -34,11 +34,8 @@
  *
  * <p>This resolver variant uses your Servlet container's multipart parser as-is,
  * potentially exposing the application to container implementation differences.
- * See {@link org.springframework.web.multipart.commons.CommonsMultipartResolver}
- * for an alternative implementation using a local Commons FileUpload library
- * within the application, providing maximum portability across Servlet containers.
  * Also, see this resolver's configuration option for
- * {@link #setStrictServletCompliance strict Servlet compliance}, narrowing the
+ * {@linkplain #setStrictServletCompliance strict Servlet compliance}, narrowing the
  * applicability of Spring's {@link MultipartHttpServletRequest} to form data only.
  *
  * <p><b>Note:</b> In order to use Servlet 3.0 based multipart parsing,
@@ -52,21 +49,19 @@
  *
  * <pre class="code">
  * public class AppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
- *	 // ...
- *	 &#064;Override
- *	 protected void customizeRegistration(ServletRegistration.Dynamic registration) {
+ *   // ...
+ *   &#064;Override
+ *   protected void customizeRegistration(ServletRegistration.Dynamic registration) {
  *     // Optionally also set maxFileSize, maxRequestSize, fileSizeThreshold
  *     registration.setMultipartConfig(new MultipartConfigElement("/tmp"));
  *   }
- * }
- * </pre>
+ * }</pre>
  *
  * @author Juergen Hoeller
  * @since 3.1
  * @see #setResolveLazily
  * @see #setStrictServletCompliance
  * @see HttpServletRequest#getParts()
- * @see org.springframework.web.multipart.commons.CommonsMultipartResolver
  */
 public class StandardServletMultipartResolver implements MultipartResolver {
 
@@ -99,10 +94,6 @@ public void setResolveLazily(boolean resolveLazily) {
 	 * switch this flag to "true": Only "multipart/form-data" requests will be
 	 * wrapped with a {@link MultipartHttpServletRequest} then; other kinds of
 	 * requests will be left as-is, allowing for custom processing in user code.
-	 * <p>Note that Commons FileUpload and therefore
-	 * {@link org.springframework.web.multipart.commons.CommonsMultipartResolver}
-	 * supports any "multipart/" request type. However, it restricts processing
-	 * to POST requests which standard Servlet multipart parsers might not do.
 	 * @since 5.3.9
 	 */
 	public void setStrictServletCompliance(boolean strictServletCompliance) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 45ee3a9bc51c..de87a28f4785 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -117,10 +117,9 @@
  * {@link org.springframework.web.servlet.view.DefaultRequestToViewNameTranslator}.
  *
  * <li>The dispatcher's strategy for resolving multipart requests is determined by a
- * {@link org.springframework.web.multipart.MultipartResolver} implementation.
- * Implementations for Apache Commons FileUpload and Servlet 3 are included; the typical
- * choice is {@link org.springframework.web.multipart.commons.CommonsMultipartResolver}.
- * The MultipartResolver bean name is "multipartResolver"; default is none.
+ * {@link org.springframework.web.multipart.MultipartResolver} implementation. An
+ * implementation for Servlet 3 is included. The MultipartResolver bean name is
+ * "multipartResolver"; default is none.
  *
  * <li>Its locale resolution strategy is determined by a {@link LocaleResolver}.
  * Out-of-the-box implementations work via HTTP accept header, cookie, or session.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java
index 421d7c182c61..e6cd60308c8f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java
@@ -39,7 +39,7 @@
 import org.springframework.web.servlet.view.script.ScriptTemplateViewResolver;
 
 /**
- * Parse the {@code view-resolvers} MVC namespace element and register
+ * Parses the {@code view-resolvers} MVC namespace element and registers
  * {@link org.springframework.web.servlet.ViewResolver} bean definitions.
  *
  * <p>All registered resolvers are wrapped in a single (composite) ViewResolver
@@ -49,13 +49,12 @@
  * <p>When content negotiation is enabled the order property is set to highest priority
  * instead with the ContentNegotiatingViewResolver encapsulating all other registered
  * view resolver instances. That way the resolvers registered through the MVC namespace
- * form self-encapsulated resolver chain.
+ * form a self-encapsulated resolver chain.
  *
  * @author Sivaprasad Valluru
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
  * @since 4.1
- * @see TilesConfigurerBeanDefinitionParser
  * @see FreeMarkerConfigurerBeanDefinitionParser
  * @see GroovyMarkupConfigurerBeanDefinitionParser
  * @see ScriptTemplateConfigurerBeanDefinitionParser
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java
index 6a69ec0769f2..24014d476775 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/WebSphereRequestUpgradeStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
 /**
  * WebSphere support for upgrading an {@link HttpServletRequest} during a
  * WebSocket handshake. To modify properties of the underlying
- * {@link javax.websocket.server.ServerContainer} you can use
+ * {@link jakarta.websocket.server.ServerContainer} you can use
  * {@link ServletServerContainerFactoryBean} in XML configuration or, when using
  * Java configuration, access the container instance through the
  * "javax.websocket.server.ServerContainer" ServletContext attribute.

From 85bdea6f47ed3654b12d696b6936671d7e6b5a2d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 28 Sep 2021 13:41:25 +0200
Subject: [PATCH 160/735] Fix code formatting in Javadoc

See gh-27480
---
 .../json/Jackson2ObjectMapperFactoryBean.java | 82 +++++++++----------
 1 file changed, 38 insertions(+), 44 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
index 376e6b277372..adc81d96b164 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -62,54 +62,51 @@
  * <p>Example usage with
  * {@link MappingJackson2HttpMessageConverter}:
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
- *   <property name="objectMapper">
- *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * <pre class="code">
+ * &lt;bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"&gt;
+ *   &lt;property name="objectMapper"&gt;
+ *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:autoDetectFields="false"
  *       p:autoDetectGettersSetters="false"
- *       p:annotationIntrospector-ref="jaxbAnnotationIntrospector" />
- *   </property>
- * </bean>
- * }</pre>
+ *       p:annotationIntrospector-ref="jaxbAnnotationIntrospector" /&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>Example usage with MappingJackson2JsonView:
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
- *   <property name="objectMapper">
- *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * <pre class="code">
+ * &lt;bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView"&gt;
+ *   &lt;property name="objectMapper"&gt;
+ *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:failOnEmptyBeans="false"
- *       p:indentOutput="true">
- *       <property name="serializers">
- *         <array>
- *           <bean class="org.mycompany.MyCustomSerializer" />
- *         </array>
- *       </property>
- *     </bean>
- *   </property>
- * </bean>
- * }</pre>
+ *       p:indentOutput="true"&gt;
+ *       &lt;property name="serializers"&gt;
+ *         &lt;array&gt;
+ *           &lt;bean class="org.mycompany.MyCustomSerializer" /&gt;
+ *         &lt;/array&gt;
+ *       &lt;/property&gt;
+ *     &lt;/bean&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>In case there are no specific setters provided (for some rarely used options),
  * you can still use the more general methods  {@link #setFeaturesToEnable} and
  * {@link #setFeaturesToDisable}.
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   <property name="featuresToEnable">
- *     <array>
- *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/>
- *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
- *     </array>
- *   </property>
- *   <property name="featuresToDisable">
- *     <array>
- *       <util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/>
- *     </array>
- *   </property>
- * </bean>
- * }</pre>
+ * <pre class="code">
+ * &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"&gt;
+ *   &lt;property name="featuresToEnable"&gt;
+ *     &lt;array&gt;
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/&gt;
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/&gt;
+ *     &lt;/array&gt;
+ *   &lt;/property&gt;
+ *   &lt;property name="featuresToDisable"&gt;
+ *     &lt;array&gt;
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/&gt;
+ *     &lt;/array&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>It also automatically registers the following well-known modules if they are
  * detected on the classpath:
@@ -120,8 +117,6 @@
  * support for other Java 8 types like {@link java.util.Optional}</li>
  * <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>:
  * support for Java 8 Date &amp; Time API types</li>
- * <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>:
- * support for Joda-Time types</li>
  * <li><a href="https://github.com/FasterXML/jackson-module-kotlin">jackson-module-kotlin</a>:
  * support for Kotlin classes and data classes</li>
  * </ul>
@@ -129,11 +124,10 @@
  * <p>In case you want to configure Jackson's {@link ObjectMapper} with a custom {@link Module},
  * you can register one or more such Modules by class name via {@link #setModulesToInstall}:
  *
- * <pre class="code">{@code
- * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   <property name="modulesToInstall" value="myapp.jackson.MySampleModule,myapp.jackson.MyOtherModule"/>
- * </bean
- * }</pre>
+ * <pre class="code">
+ * &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"&gt;
+ *   &lt;property name="modulesToInstall" value="myapp.jackson.MySampleModule,myapp.jackson.MyOtherModule"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *

From 08bce08018596d4e46ba01d1899062428d7b2c7e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 28 Sep 2021 14:20:31 +0200
Subject: [PATCH 161/735] Use text blocks with JUnit Jupiter 5.8.1

See gh-27450
---
 ...duledAnnotationBeanPostProcessorTests.java | 94 +++++++++----------
 .../springframework/util/ClassUtilsTests.java | 36 +++----
 .../IntegerToEnumConverterFactoryTests.java   | 10 +-
 .../sockjs/client/SockJsUrlInfoTests.java     | 32 +++----
 4 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
index 04a08b00e64c..9aaf52c881f3 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -90,11 +90,11 @@ void closeContextAfterTest() {
 	}
 
 	@ParameterizedTest
-	@CsvSource({
-		"FixedDelay, 5000",
-		"FixedDelayInSeconds, 5000",
-		"FixedDelayInMinutes, 180000"
-	})
+	@CsvSource(textBlock = """
+		FixedDelay, 5_000
+		FixedDelayInSeconds, 5_000
+		FixedDelayInMinutes, 180_000
+	""")
 	void fixedDelayTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
@@ -123,11 +123,11 @@ void fixedDelayTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 	}
 
 	@ParameterizedTest
-	@CsvSource({
-		"FixedRate, 3000",
-		"FixedRateInSeconds, 5000",
-		"FixedRateInMinutes, 180000"
-	})
+	@CsvSource(textBlock = """
+		FixedRate, 3_000
+		FixedRateInSeconds, 5_000
+		FixedRateInMinutes, 180_000
+	""")
 	void fixedRateTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
@@ -158,11 +158,11 @@ void fixedRateTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 	}
 
 	@ParameterizedTest
-	@CsvSource({
-		"FixedRateWithInitialDelay, 1000, 3000",
-		"FixedRateWithInitialDelayInSeconds, 5000, 3000",
-		"FixedRateWithInitialDelayInMinutes, 60000, 180000"
-	})
+	@CsvSource(textBlock = """
+		FixedRateWithInitialDelay, 1_000, 3_000
+		FixedRateWithInitialDelayInSeconds, 5_000, 3_000
+		FixedRateWithInitialDelayInMinutes, 60_000, 180_000
+	""")
 	void fixedRateTaskWithInitialDelay(@NameToClass Class<?> beanClass, long expectedInitialDelay, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
@@ -252,15 +252,15 @@ private void severalFixedRates(StaticApplicationContext context,
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
 		assertThat(task1.getInitialDelay()).isEqualTo(0);
-		assertThat(task1.getInterval()).isEqualTo(4000L);
+		assertThat(task1.getInterval()).isEqualTo(4_000L);
 		IntervalTask task2 = fixedRateTasks.get(1);
 		ScheduledMethodRunnable runnable2 = (ScheduledMethodRunnable) task2.getRunnable();
 		targetObject = runnable2.getTarget();
 		targetMethod = runnable2.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task2.getInitialDelay()).isEqualTo(2000L);
-		assertThat(task2.getInterval()).isEqualTo(4000L);
+		assertThat(task2.getInitialDelay()).isEqualTo(2_000L);
+		assertThat(task2.getInterval()).isEqualTo(4_000L);
 	}
 
 	@Test
@@ -407,7 +407,7 @@ void metaAnnotationWithFixedRate() {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("checkForUpdates");
-		assertThat(task.getInterval()).isEqualTo(5000L);
+		assertThat(task.getInterval()).isEqualTo(5_000L);
 	}
 
 	@Test
@@ -434,8 +434,8 @@ void composedAnnotationWithInitialDelayAndFixedRate() {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("checkForUpdates");
-		assertThat(task.getInterval()).isEqualTo(5000L);
-		assertThat(task.getInitialDelay()).isEqualTo(1000L);
+		assertThat(task.getInterval()).isEqualTo(5_000L);
+		assertThat(task.getInitialDelay()).isEqualTo(1_000L);
 	}
 
 	@Test
@@ -517,12 +517,12 @@ void propertyPlaceholderWithInactiveCron() {
 	}
 
 	@ParameterizedTest
-	@CsvSource({
-		"PropertyPlaceholderWithFixedDelay, 5000, 1000, 5000, 1000",
-		"PropertyPlaceholderWithFixedDelay, PT5S, PT1S, 5000, 1000",
-		"PropertyPlaceholderWithFixedDelayInSeconds, 5000, 1000, 5000000, 1000000",
-		"PropertyPlaceholderWithFixedDelayInSeconds, PT5S, PT1S, 5000, 1000"
-	})
+	@CsvSource(textBlock = """
+		PropertyPlaceholderWithFixedDelay, 5000, 1000, 5_000, 1_000
+		PropertyPlaceholderWithFixedDelay, PT5S, PT1S, 5_000, 1_000
+		PropertyPlaceholderWithFixedDelayInSeconds, 5000, 1000, 5_000_000, 1_000_000
+		PropertyPlaceholderWithFixedDelayInSeconds, PT5S, PT1S, 5_000, 1_000
+	""")
 	void propertyPlaceholderWithFixedDelay(@NameToClass Class<?> beanClass, String fixedDelay, String initialDelay,
 			long expectedInterval, long expectedInitialDelay) {
 
@@ -561,12 +561,12 @@ void propertyPlaceholderWithFixedDelay(@NameToClass Class<?> beanClass, String f
 	}
 
 	@ParameterizedTest
-	@CsvSource({
-		"PropertyPlaceholderWithFixedRate, 3000, 1000, 3000, 1000",
-		"PropertyPlaceholderWithFixedRate, PT3S, PT1S, 3000, 1000",
-		"PropertyPlaceholderWithFixedRateInSeconds, 3000, 1000, 3000000, 1000000",
-		"PropertyPlaceholderWithFixedRateInSeconds, PT3S, PT1S, 3000, 1000"
-	})
+	@CsvSource(textBlock = """
+		PropertyPlaceholderWithFixedRate, 3000, 1000, 3_000, 1_000
+		PropertyPlaceholderWithFixedRate, PT3S, PT1S, 3_000, 1_000
+		PropertyPlaceholderWithFixedRateInSeconds, 3000, 1000, 3_000_000, 1_000_000
+		PropertyPlaceholderWithFixedRateInSeconds, PT3S, PT1S, 3_000, 1_000
+	""")
 	void propertyPlaceholderWithFixedRate(@NameToClass Class<?> beanClass, String fixedRate, String initialDelay,
 			long expectedInterval, long expectedInitialDelay) {
 
@@ -728,7 +728,7 @@ void nonEmptyParamList() {
 
 	static class FixedDelay {
 
-		@Scheduled(fixedDelay = 5000)
+		@Scheduled(fixedDelay = 5_000)
 		void fixedDelay() {
 		}
 	}
@@ -750,7 +750,7 @@ void fixedDelay() {
 
 	static class FixedRate {
 
-		@Scheduled(fixedRate = 3000)
+		@Scheduled(fixedRate = 3_000)
 		void fixedRate() {
 		}
 	}
@@ -772,7 +772,7 @@ void fixedRate() {
 
 	static class FixedRateWithInitialDelay {
 
-		@Scheduled(fixedRate = 3000, initialDelay = 1000)
+		@Scheduled(fixedRate = 3_000, initialDelay = 1_000)
 		void fixedRate() {
 		}
 	}
@@ -794,7 +794,7 @@ void fixedRate() {
 
 	static class SeveralFixedRatesWithSchedulesContainerAnnotationTestBean {
 
-		@Schedules({@Scheduled(fixedRate = 4000), @Scheduled(fixedRate = 4000, initialDelay = 2000)})
+		@Schedules({@Scheduled(fixedRate = 4_000), @Scheduled(fixedRate = 4_000, initialDelay = 2_000)})
 		void fixedRate() {
 		}
 	}
@@ -802,8 +802,8 @@ void fixedRate() {
 
 	static class SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean {
 
-		@Scheduled(fixedRate = 4000)
-		@Scheduled(fixedRate = 4000, initialDelay = 2000)
+		@Scheduled(fixedRate = 4_000)
+		@Scheduled(fixedRate = 4_000, initialDelay = 2_000)
 		void fixedRate() {
 		}
 
@@ -819,8 +819,8 @@ static SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean nestedProxy() {
 
 	static class FixedRatesBaseBean {
 
-		@Scheduled(fixedRate = 4000)
-		@Scheduled(fixedRate = 4000, initialDelay = 2000)
+		@Scheduled(fixedRate = 4_000)
+		@Scheduled(fixedRate = 4_000, initialDelay = 2_000)
 		void fixedRate() {
 		}
 	}
@@ -832,8 +832,8 @@ static class FixedRatesSubBean extends FixedRatesBaseBean {
 
 	interface FixedRatesDefaultMethod {
 
-		@Scheduled(fixedRate = 4000)
-		@Scheduled(fixedRate = 4000, initialDelay = 2000)
+		@Scheduled(fixedRate = 4_000)
+		@Scheduled(fixedRate = 4_000, initialDelay = 2_000)
 		default void fixedRate() {
 		}
 	}
@@ -916,13 +916,13 @@ void invalid() {
 
 	static class NonEmptyParamListTestBean {
 
-		@Scheduled(fixedRate = 3000)
+		@Scheduled(fixedRate = 3_000)
 		void invalid(String oops) {
 		}
 	}
 
 
-	@Scheduled(fixedRate = 5000)
+	@Scheduled(fixedRate = 5_000)
 	@Target(ElementType.METHOD)
 	@Retention(RetentionPolicy.RUNTIME)
 	private @interface EveryFiveSeconds {
@@ -934,7 +934,7 @@ void invalid(String oops) {
 	private @interface Hourly {
 	}
 
-	@Scheduled(initialDelay = 1000)
+	@Scheduled(initialDelay = 1_000)
 	@Retention(RetentionPolicy.RUNTIME)
 	private @interface WaitASec {
 
@@ -956,7 +956,7 @@ void checkForUpdates() {
 
 	static class ComposedAnnotationFixedRateTestBean {
 
-		@WaitASec(fixedRate = 5000)
+		@WaitASec(fixedRate = 5_000)
 		void checkForUpdates() {
 		}
 	}
diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
index b8ddd8c4ca75..1719e2effdf4 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -155,24 +155,24 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
 	}
 
 	@ParameterizedTest
-	@CsvSource({
-		"boolean, boolean",
-		"byte, byte",
-		"char, char",
-		"short, short",
-		"int, int",
-		"long, long",
-		"float, float",
-		"double, double",
-		"[Z, boolean[]",
-		"[B, byte[]",
-		"[C, char[]",
-		"[S, short[]",
-		"[I, int[]",
-		"[J, long[]",
-		"[F, float[]",
-		"[D, double[]"
-	})
+	@CsvSource(textBlock = """
+		boolean, boolean
+		byte, byte
+		char, char
+		short, short
+		int, int
+		long, long
+		float, float
+		double, double
+		[Z, boolean[]
+		[B, byte[]
+		[C, char[]
+		[S, short[]
+		[I, int[]
+		[J, long[]
+		[F, float[]
+		[D, double[]
+	""")
 	void resolvePrimitiveClassName(String input, Class<?> output) {
 		assertThat(ClassUtils.resolvePrimitiveClassName(input)).isEqualTo(output);
 	}
diff --git a/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java b/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java
index b9f48251e95b..3e470ea32bc7 100644
--- a/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/core/convert/support/IntegerToEnumConverterFactoryTests.java
@@ -37,11 +37,11 @@ class IntegerToEnumConverterFactoryTests {
 
 
 	@ParameterizedTest
-	@CsvSource({
-		"0, RED",
-		"1, BLUE",
-		"2, GREEN"
-	})
+	@CsvSource(textBlock = """
+		0, RED
+		1, BLUE
+		2, GREEN
+	""")
 	void convertsIntegerToEnum(int index, Color color) {
 		assertThat(converter.convert(index)).isEqualTo(color);
 	}
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java
index 4e63e808cbf8..49fd50b027e9 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java
@@ -48,28 +48,28 @@ void sessionId() throws Exception {
 	}
 
 	@ParameterizedTest
-	@CsvSource( {
-		"http, http",
-		"https, https",
-		"ws, http",
-		"wss, https",
-	})
+	@CsvSource(textBlock = """
+		http, http
+		https, https
+		ws, http
+		wss, https
+	""")
 	void infoUrl(String scheme, String expectedScheme) throws Exception {
 		SockJsUrlInfo info = new SockJsUrlInfo(new URI(scheme + "://example.com"));
 		assertThat(info.getInfoUrl()).isEqualTo(new URI(expectedScheme + "://example.com/info"));
 	}
 
 	@ParameterizedTest
-	@CsvSource( {
-		"http, http, XHR_STREAMING",
-		"http, ws, WEBSOCKET",
-		"https, https, XHR_STREAMING",
-		"https, wss, WEBSOCKET",
-		"ws, http, XHR_STREAMING",
-		"ws, ws, WEBSOCKET",
-		"wss, https, XHR_STREAMING",
-		"wss, wss, WEBSOCKET"
-	})
+	@CsvSource(textBlock = """
+		http, http, XHR_STREAMING
+		http, ws, WEBSOCKET
+		https, https, XHR_STREAMING
+		https, wss, WEBSOCKET
+		ws, http, XHR_STREAMING
+		ws, ws, WEBSOCKET
+		wss, https, XHR_STREAMING
+		wss, wss, WEBSOCKET
+	""")
 	void transportUrl(String scheme, String expectedScheme, TransportType transportType) throws Exception {
 		SockJsUrlInfo info = new SockJsUrlInfo(new URI(scheme + "://example.com"));
 		String serverId = info.getServerId();

From 3be2b32e21ad91b94346a1b9f8cf58fb3ea48ced Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Tue, 28 Sep 2021 14:56:39 +0200
Subject: [PATCH 162/735] Remove only leading space for SSE data

Prior to this commit, all white space was trimmed from Server Sent Event
data. After this commit, only a leading space is removed (if present).

Closes gh-27473
---
 .../codec/ServerSentEventHttpMessageReader.java    |  8 +++++++-
 .../ServerSentEventHttpMessageReaderTests.java     | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
index 035d8b4c73e9..d21ec4fe6196 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
@@ -147,7 +147,13 @@ private Object buildEvent(List<String> lines, ResolvableType valueType, boolean
 		for (String line : lines) {
 			if (line.startsWith("data:")) {
 				data = (data != null ? data : new StringBuilder());
-				data.append(line.substring(5).trim()).append('\n');
+				if (line.charAt(5) != ' ') {
+					data.append(line, 5, line.length());
+				}
+				else {
+					data.append(line, 6, line.length());
+				}
+				data.append('\n');
 			}
 			if (shouldWrap) {
 				if (line.startsWith("id:")) {
diff --git a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
index 22b77fd693de..82602a526ebd 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
@@ -138,6 +138,20 @@ public void readString() {
 				.verify();
 	}
 
+	@Test
+	public void trimWhitespace() {
+		MockServerHttpRequest request = MockServerHttpRequest.post("/")
+				.body(Mono.just(stringBuffer("data: \tfoo \ndata:bar\t\n\n")));
+
+		Flux<String> data = reader.read(ResolvableType.forClass(String.class),
+				request, Collections.emptyMap()).cast(String.class);
+
+		StepVerifier.create(data)
+				.expectNext("\tfoo \nbar\t")
+				.expectComplete()
+				.verify();
+	}
+
 	@Test
 	public void readPojo() {
 		MockServerHttpRequest request = MockServerHttpRequest.post("/")

From 2feedb98ccaad01d9c75073604a9c90956a33afb Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 28 Sep 2021 18:15:00 +0200
Subject: [PATCH 163/735] Remove lineSeparator LF requirement (accept
 LF/CR/CRLF by default)

See gh-27481
---
 src/checkstyle/checkstyle.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 6358bc47e753..2d8a043623c0 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -13,9 +13,7 @@
 		<property name="headerCopyrightPattern" value="20\d\d-20\d\d"/>
 		<property name="packageInfoHeaderType" value="none"/>
 	</module>
-	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-		<property name="lineSeparator" value="lf"/>
-	</module>
+	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck"/>
 
 	<!-- TreeWalker Checks -->
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">

From 86b010a6b2270d0fb3ff4017ca3e52eb100534d5 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 28 Sep 2021 18:15:22 +0200
Subject: [PATCH 164/735] Defensive reference to JNDI API for JDK 9+ (optional
 `java.naming` module)

Closes gh-27483
---
 .../CommonAnnotationBeanPostProcessor.java    | 43 ++++++++++++++-----
 .../support/StandardServletEnvironment.java   |  9 +++-
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index d9acb722b08d..8a3ca5a9f889 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,22 +146,27 @@
 public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBeanPostProcessor
 		implements InstantiationAwareBeanPostProcessor, BeanFactoryAware, Serializable {
 
+	// Defensive reference to JNDI API for JDK 9+ (optional java.naming module)
+	private static final boolean jndiPresent = ClassUtils.isPresent(
+			"javax.naming.InitialContext", CommonAnnotationBeanPostProcessor.class.getClassLoader());
+
+	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = new LinkedHashSet<>(4);
+
 	@Nullable
 	private static final Class<? extends Annotation> webServiceRefClass;
 
 	@Nullable
 	private static final Class<? extends Annotation> ejbClass;
 
-	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = new LinkedHashSet<>(4);
-
 	static {
-		webServiceRefClass = loadAnnotationType("javax.xml.ws.WebServiceRef");
-		ejbClass = loadAnnotationType("javax.ejb.EJB");
-
 		resourceAnnotationTypes.add(Resource.class);
+
+		webServiceRefClass = loadAnnotationType("javax.xml.ws.WebServiceRef");
 		if (webServiceRefClass != null) {
 			resourceAnnotationTypes.add(webServiceRefClass);
 		}
+
+		ejbClass = loadAnnotationType("javax.ejb.EJB");
 		if (ejbClass != null) {
 			resourceAnnotationTypes.add(ejbClass);
 		}
@@ -174,7 +179,8 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 
 	private boolean alwaysUseJndiLookup = false;
 
-	private transient BeanFactory jndiFactory = new SimpleJndiBeanFactory();
+	@Nullable
+	private transient BeanFactory jndiFactory;
 
 	@Nullable
 	private transient BeanFactory resourceFactory;
@@ -199,6 +205,11 @@ public CommonAnnotationBeanPostProcessor() {
 		setInitAnnotationType(PostConstruct.class);
 		setDestroyAnnotationType(PreDestroy.class);
 		ignoreResourceType("javax.xml.ws.WebServiceContext");
+
+		// java.naming module present on JDK 9+?
+		if (jndiPresent) {
+			this.jndiFactory = new SimpleJndiBeanFactory();
+		}
 	}
 
 
@@ -464,6 +475,7 @@ public Object getTarget() {
 			public void releaseTarget(Object target) {
 			}
 		};
+
 		ProxyFactory pf = new ProxyFactory();
 		pf.setTargetSource(ts);
 		if (element.lookupType.isInterface()) {
@@ -484,12 +496,23 @@ public void releaseTarget(Object target) {
 	protected Object getResource(LookupElement element, @Nullable String requestingBeanName)
 			throws NoSuchBeanDefinitionException {
 
+		// JNDI lookup to perform?
+		String jndiName = null;
 		if (StringUtils.hasLength(element.mappedName)) {
-			return this.jndiFactory.getBean(element.mappedName, element.lookupType);
+			jndiName = element.mappedName;
+		}
+		else if (this.alwaysUseJndiLookup) {
+			jndiName = element.name;
 		}
-		if (this.alwaysUseJndiLookup) {
-			return this.jndiFactory.getBean(element.name, element.lookupType);
+		if (jndiName != null) {
+			if (this.jndiFactory == null) {
+				throw new NoSuchBeanDefinitionException(element.lookupType,
+						"No JNDI factory configured - specify the 'jndiFactory' property");
+			}
+			return this.jndiFactory.getBean(jndiName, element.lookupType);
 		}
+
+		// Regular resource autowiring
 		if (this.resourceFactory == null) {
 			throw new NoSuchBeanDefinitionException(element.lookupType,
 					"No resource factory configured - specify the 'resourceFactory' property");
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
index 3ec9b92be64a..4d49afb974af 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
@@ -27,6 +27,7 @@
 import org.springframework.jndi.JndiLocatorDelegate;
 import org.springframework.jndi.JndiPropertySource;
 import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
 import org.springframework.web.context.ConfigurableWebEnvironment;
 
 /**
@@ -39,6 +40,7 @@
  * documentation for details.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  * @see StandardEnvironment
  */
@@ -54,6 +56,11 @@ public class StandardServletEnvironment extends StandardEnvironment implements C
 	public static final String JNDI_PROPERTY_SOURCE_NAME = "jndiProperties";
 
 
+	// Defensive reference to JNDI API for JDK 9+ (optional java.naming module)
+	private static final boolean jndiPresent = ClassUtils.isPresent(
+			"javax.naming.InitialContext", StandardServletEnvironment.class.getClassLoader());
+
+
 	/**
 	 * Create a new {@code StandardServletEnvironment} instance.
 	 */
@@ -100,7 +107,7 @@ protected StandardServletEnvironment(MutablePropertySources propertySources) {
 	protected void customizePropertySources(MutablePropertySources propertySources) {
 		propertySources.addLast(new StubPropertySource(SERVLET_CONFIG_PROPERTY_SOURCE_NAME));
 		propertySources.addLast(new StubPropertySource(SERVLET_CONTEXT_PROPERTY_SOURCE_NAME));
-		if (JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable()) {
+		if (jndiPresent && JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable()) {
 			propertySources.addLast(new JndiPropertySource(JNDI_PROPERTY_SOURCE_NAME));
 		}
 		super.customizePropertySources(propertySources);

From 040445612f157827e7ee199c2d6af55cbd2497bc Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 28 Sep 2021 18:15:56 +0200
Subject: [PATCH 165/735] Polishing

---
 .../org/springframework/core/env/AbstractEnvironment.java | 3 +++
 .../org/springframework/core/env/StandardEnvironment.java | 7 +++++--
 .../main/java/org/apache/commons/logging/LogAdapter.java  | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index d4027e16f367..85968d699a89 100644
--- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -48,6 +48,7 @@
  *
  * @author Chris Beams
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 3.1
  * @see ConfigurableEnvironment
  * @see StandardEnvironment
@@ -129,6 +130,7 @@ public AbstractEnvironment() {
 	 * {@link #customizePropertySources(MutablePropertySources)} during
 	 * construction to allow subclasses to contribute or manipulate
 	 * {@link PropertySource} instances as appropriate.
+	 * @param propertySources property sources to use
 	 * @since 5.3.4
 	 * @see #customizePropertySources(MutablePropertySources)
 	 */
@@ -138,6 +140,7 @@ protected AbstractEnvironment(MutablePropertySources propertySources) {
 		customizePropertySources(propertySources);
 	}
 
+
 	/**
 	 * Factory method used to create the {@link ConfigurablePropertyResolver}
 	 * instance used by the Environment.
diff --git a/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
index b228de56bb2c..9d2a2eb6b886 100644
--- a/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
@@ -46,6 +46,7 @@
  * variable names.
  *
  * @author Chris Beams
+ * @author Phillip Webb
  * @since 3.1
  * @see ConfigurableEnvironment
  * @see SystemEnvironmentPropertySource
@@ -61,13 +62,15 @@ public class StandardEnvironment extends AbstractEnvironment {
 
 
 	/**
-	 * Create a new {@code StandardEnvironment} instance.
+	 * Create a new {@code StandardEnvironment} instance with a default
+	 * {@link MutablePropertySources} instance.
 	 */
 	public StandardEnvironment() {
 	}
 
 	/**
-	 * Create a new {@code StandardEnvironment} instance with a specific {@link MutablePropertySources} instance.
+	 * Create a new {@code StandardEnvironment} instance with a specific
+	 * {@link MutablePropertySources} instance.
 	 * @param propertySources property sources to use
 	 * @since 5.3.4
 	 */
diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
index c918ee7c2df0..cc5bed06ea93 100644
--- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
+++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -278,7 +278,7 @@ private static class Slf4jLog<T extends Logger> implements Log, Serializable {
 
 		protected final String name;
 
-		protected transient T logger;
+		protected final transient T logger;
 
 		public Slf4jLog(T logger) {
 			this.name = logger.getName();
@@ -500,9 +500,9 @@ protected Object readResolve() {
 	@SuppressWarnings("serial")
 	private static class JavaUtilLog implements Log, Serializable {
 
-		private String name;
+		private final String name;
 
-		private transient java.util.logging.Logger logger;
+		private final transient java.util.logging.Logger logger;
 
 		public JavaUtilLog(String name) {
 			this.name = name;

From f32f04d841012b04ed34923f62f783f095284402 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 28 Sep 2021 19:02:44 +0200
Subject: [PATCH 166/735] Code cleanup on new baseline

---
 .../ParameterResolutionDelegate.java          | 46 ++-----------------
 .../CommonAnnotationBeanPostProcessor.java    |  4 +-
 .../apache/commons/logging/LogAdapter.java    |  5 +-
 3 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java
index fc212da6c6b3..5f5d1a9d82fc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Parameter;
 
@@ -30,7 +29,6 @@
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 
 /**
  * Public delegate for resolving autowirable parameters on externally managed
@@ -81,10 +79,9 @@ private ParameterResolutionDelegate() {
 	 */
 	public static boolean isAutowirable(Parameter parameter, int parameterIndex) {
 		Assert.notNull(parameter, "Parameter must not be null");
-		AnnotatedElement annotatedParameter = getEffectiveAnnotatedParameter(parameter, parameterIndex);
-		return (AnnotatedElementUtils.hasAnnotation(annotatedParameter, Autowired.class) ||
-				AnnotatedElementUtils.hasAnnotation(annotatedParameter, Qualifier.class) ||
-				AnnotatedElementUtils.hasAnnotation(annotatedParameter, Value.class));
+		return (AnnotatedElementUtils.hasAnnotation(parameter, Autowired.class) ||
+				AnnotatedElementUtils.hasAnnotation(parameter, Qualifier.class) ||
+				AnnotatedElementUtils.hasAnnotation(parameter, Value.class));
 	}
 
 	/**
@@ -125,8 +122,7 @@ public static Object resolveDependency(
 		Assert.notNull(containingClass, "Containing class must not be null");
 		Assert.notNull(beanFactory, "AutowireCapableBeanFactory must not be null");
 
-		AnnotatedElement annotatedParameter = getEffectiveAnnotatedParameter(parameter, parameterIndex);
-		Autowired autowired = AnnotatedElementUtils.findMergedAnnotation(annotatedParameter, Autowired.class);
+		Autowired autowired = AnnotatedElementUtils.findMergedAnnotation(parameter, Autowired.class);
 		boolean required = (autowired == null || autowired.required());
 
 		MethodParameter methodParameter = SynthesizingMethodParameter.forExecutable(
@@ -136,36 +132,4 @@ public static Object resolveDependency(
 		return beanFactory.resolveDependency(descriptor, null);
 	}
 
-	/**
-	 * Due to a bug in {@code javac} on JDK versions prior to JDK 9, looking up
-	 * annotations directly on a {@link Parameter} will fail for inner class
-	 * constructors.
-	 * <h4>Bug in javac in JDK &lt; 9</h4>
-	 * <p>The parameter annotations array in the compiled byte code excludes an entry
-	 * for the implicit <em>enclosing instance</em> parameter for an inner class
-	 * constructor.
-	 * <h4>Workaround</h4>
-	 * <p>This method provides a workaround for this off-by-one error by allowing the
-	 * caller to access annotations on the preceding {@link Parameter} object (i.e.,
-	 * {@code index - 1}). If the supplied {@code index} is zero, this method returns
-	 * an empty {@code AnnotatedElement}.
-	 * <h4>WARNING</h4>
-	 * <p>The {@code AnnotatedElement} returned by this method should never be cast and
-	 * treated as a {@code Parameter} since the metadata (e.g., {@link Parameter#getName()},
-	 * {@link Parameter#getType()}, etc.) will not match those for the declared parameter
-	 * at the given index in an inner class constructor.
-	 * @return the supplied {@code parameter} or the <em>effective</em> {@code Parameter}
-	 * if the aforementioned bug is in effect
-	 */
-	private static AnnotatedElement getEffectiveAnnotatedParameter(Parameter parameter, int index) {
-		Executable executable = parameter.getDeclaringExecutable();
-		if (executable instanceof Constructor && ClassUtils.isInnerClass(executable.getDeclaringClass()) &&
-				executable.getParameterAnnotations().length == executable.getParameterCount() - 1) {
-			// Bug in javac in JDK <9: annotation array excludes enclosing instance parameter
-			// for inner classes, so access it with the actual parameter index lowered by 1
-			return (index == 0 ? EMPTY_ANNOTATED_ELEMENT : executable.getParameters()[index - 1]);
-		}
-		return parameter;
-	}
-
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index c3ded8c56fa6..c3efdfbed261 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -227,7 +227,7 @@ public void setAlwaysUseJndiLookup(boolean alwaysUseJndiLookup) {
 
 	/**
 	 * Specify the factory for objects to be injected into {@code @Resource} /
-	 * {@code @WebServiceRef} / {@code @EJB} annotated fields and setter methods,
+	 * {@code @EJB} annotated fields and setter methods,
 	 * <b>for {@code mappedName} attributes that point directly into JNDI</b>.
 	 * This factory will also be used if "alwaysUseJndiLookup" is set to "true" in order
 	 * to enforce JNDI lookups even for {@code name} attributes and default names.
@@ -243,7 +243,7 @@ public void setJndiFactory(BeanFactory jndiFactory) {
 
 	/**
 	 * Specify the factory for objects to be injected into {@code @Resource} /
-	 * {@code @WebServiceRef} / {@code @EJB} annotated fields and setter methods,
+	 * {@code @EJB} annotated fields and setter methods,
 	 * <b>for {@code name} attributes and default names</b>.
 	 * <p>The default is the BeanFactory that this post-processor is defined in,
 	 * if any, looking up resource names as Spring bean names. Specify the resource
diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
index 5639cc0f6d06..09ae22efe052 100644
--- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
+++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
@@ -681,7 +681,6 @@ else if (found) {
 			setSourceMethodName(sourceMethodName);
 		}
 
-		@SuppressWarnings("deprecation")
 		protected Object writeReplace() {
 			LogRecord serialized = new LogRecord(getLevel(), getMessage());
 			serialized.setLoggerName(getLoggerName());
@@ -691,8 +690,8 @@ protected Object writeReplace() {
 			serialized.setSourceMethodName(getSourceMethodName());
 			serialized.setSequenceNumber(getSequenceNumber());
 			serialized.setParameters(getParameters());
-			serialized.setThreadID(getThreadID());
-			serialized.setMillis(getMillis());
+			serialized.setLongThreadID(getLongThreadID());
+			serialized.setInstant(getInstant());
 			serialized.setThrown(getThrown());
 			return serialized;
 		}

From ac5dc698e2f0f6f758983f1af3039eea627ef54d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 28 Sep 2021 19:10:09 +0200
Subject: [PATCH 167/735] Update/remove outdated JPA and Hibernate version
 references

Closes gh-27487
---
 .../hibernate5/LocalSessionFactoryBean.java   | 24 ++++++++-----------
 .../LocalSessionFactoryBuilder.java           |  9 ++++---
 .../orm/hibernate5/SpringBeanContainer.java   | 12 +++++-----
 .../orm/jpa/DefaultJpaDialect.java            |  4 +---
 .../orm/jpa/EntityManagerFactoryUtils.java    |  4 ++--
 .../springframework/orm/jpa/JpaDialect.java   |  4 ++--
 ...ocalContainerEntityManagerFactoryBean.java |  6 +----
 .../jpa/LocalEntityManagerFactoryBean.java    |  6 +----
 .../DefaultPersistenceUnitManager.java        |  4 +---
 .../jpa/vendor/AbstractJpaVendorAdapter.java  |  4 ++--
 .../orm/jpa/vendor/HibernateJpaDialect.java   |  4 ++--
 .../jpa/vendor/HibernateJpaVendorAdapter.java |  5 ++--
 12 files changed, 34 insertions(+), 52 deletions(-)

diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java
index eb8fc4acfebf..7dc063b2a52e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,21 +51,20 @@
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
 
 /**
  * {@link FactoryBean} that creates a Hibernate {@link SessionFactory}. This is the usual
  * way to set up a shared Hibernate SessionFactory in a Spring application context; the
  * SessionFactory can then be passed to data access objects via dependency injection.
  *
- * <p>Compatible with Hibernate 5.2/5.3/5.4, as of Spring 5.3.
+ * <p>Compatible with Hibernate 5.5/5.6, as of Spring 6.0.
  * This Hibernate-specific {@code LocalSessionFactoryBean} can be an immediate alternative
- * to {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean} for common
- * JPA purposes: In particular with Hibernate 5.3/5.4, the Hibernate {@code SessionFactory}
- * will natively expose the JPA {@code EntityManagerFactory} interface as well, and
- * Hibernate {@code BeanContainer} integration will be registered out of the box.
- * In combination with {@link HibernateTransactionManager}, this naturally allows for
- * mixing JPA access code with native Hibernate access code within the same transaction.
+ * to {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean} for
+ * common JPA purposes: The Hibernate {@code SessionFactory} will natively expose the JPA
+ * {@code EntityManagerFactory} interface as well, and Hibernate {@code BeanContainer}
+ * integration will be registered out of the box. In combination with
+ * {@link HibernateTransactionManager}, this naturally allows for mixing JPA access code
+ * with native Hibernate access code within the same transaction.
  *
  * @author Juergen Hoeller
  * @since 4.2
@@ -469,17 +468,14 @@ public ResourceLoader getResourceLoader() {
 	/**
 	 * Accept the containing {@link BeanFactory}, registering corresponding Hibernate
 	 * {@link org.hibernate.resource.beans.container.spi.BeanContainer} integration for
-	 * it if possible. This requires a Spring {@link ConfigurableListableBeanFactory}
-	 * and Hibernate 5.3 or higher on the classpath.
+	 * it if possible. This requires a Spring {@link ConfigurableListableBeanFactory}.
 	 * @since 5.1
 	 * @see SpringBeanContainer
 	 * @see LocalSessionFactoryBuilder#setBeanContainer
 	 */
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
-		if (beanFactory instanceof ConfigurableListableBeanFactory &&
-				ClassUtils.isPresent("org.hibernate.resource.beans.container.spi.BeanContainer",
-						getClass().getClassLoader())) {
+		if (beanFactory instanceof ConfigurableListableBeanFactory) {
 			this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
 		}
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
index 5fac7741cd22..0ddf08bb8683 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,12 +77,12 @@
  * Typically combined with {@link HibernateTransactionManager} for declarative
  * transactions against the {@code SessionFactory} and its JDBC {@code DataSource}.
  *
- * <p>Compatible with Hibernate 5.2/5.3/5.4, as of Spring 5.3.
+ * <p>Compatible with Hibernate 5.5/5.6, as of Spring 6.0.
  * This Hibernate-specific factory builder can also be a convenient way to set up
  * a JPA {@code EntityManagerFactory} since the Hibernate {@code SessionFactory}
  * natively exposes the JPA {@code EntityManagerFactory} interface as well now.
  *
- * <p>This builder supports Hibernate 5.3/5.4 {@code BeanContainer} integration,
+ * <p>This builder supports Hibernate {@code BeanContainer} integration,
  * {@link MetadataSources} from custom {@link BootstrapServiceRegistryBuilder}
  * setup, as well as other advanced Hibernate configuration options beyond the
  * standard JPA bootstrap contract.
@@ -221,8 +221,7 @@ else if (jtaTransactionManager instanceof TransactionManager) {
 	/**
 	 * Set a Hibernate {@link org.hibernate.resource.beans.container.spi.BeanContainer}
 	 * for the given Spring {@link ConfigurableListableBeanFactory}.
-	 * <p>Note: Bean container integration requires Hibernate 5.3 or higher.
-	 * It enables autowiring of Hibernate attribute converters and entity listeners.
+	 * <p>This enables autowiring of Hibernate attribute converters and entity listeners.
 	 * @since 5.1
 	 * @see SpringBeanContainer
 	 * @see AvailableSettings#BEAN_CONTAINER
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
index 92064f2a4cb6..6f0d4c8b5f4e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 /**
- * Spring's implementation of Hibernate 5.3's {@link BeanContainer} SPI,
+ * Spring's implementation of Hibernate's {@link BeanContainer} SPI,
  * delegating to a Spring {@link ConfigurableListableBeanFactory}.
  *
  * <p>Auto-configured by {@link LocalSessionFactoryBean#setBeanFactory},
@@ -62,10 +62,10 @@
  * </pre>
  *
  * Please note that Spring's {@link LocalSessionFactoryBean} is an immediate alternative
- * to {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean} for common
- * JPA purposes: In particular with Hibernate 5.3/5.4, the Hibernate {@code SessionFactory}
- * will natively expose the JPA {@code EntityManagerFactory} interface as well, and
- * Hibernate {@code BeanContainer} integration will be registered out of the box.
+ * to {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean} for
+ * common JPA purposes: The Hibernate {@code SessionFactory} will natively expose the JPA
+ * {@code EntityManagerFactory} interface as well, and Hibernate {@code BeanContainer}
+ * integration will be registered out of the box.
  *
  * @author Juergen Hoeller
  * @since 5.1
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
index d78a2f79948b..f562fa03e249 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,6 @@
  * <p>Simply begins a standard JPA transaction in {@link #beginTransaction} and
  * performs standard exception translation through {@link EntityManagerFactoryUtils}.
  *
- * <p><b>NOTE: Spring's JPA support requires JPA 2.1 or higher, as of Spring 5.0.</b>
- *
  * @author Juergen Hoeller
  * @since 2.0
  * @see JpaTransactionManager#setJpaDialect
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
index 2bf679271249..ceb470a9ea04 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -333,7 +333,7 @@ private static void cleanupTransaction(@Nullable Object transactionData, EntityM
 
 	/**
 	 * Apply the current transaction timeout, if any, to the given JPA Query object.
-	 * <p>This method sets the JPA 2.0 query hint "jakarta.persistence.query.timeout" accordingly.
+	 * <p>This method sets the JPA query hint "jakarta.persistence.query.timeout" accordingly.
 	 * @param query the JPA Query object
 	 * @param emf the JPA EntityManagerFactory that the Query was created for
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
index b2c172b453f2..9d519dfbfde7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.springframework.transaction.TransactionException;
 
 /**
- * SPI strategy that encapsulates certain functionality that standard JPA 2.1 does
+ * SPI strategy that encapsulates certain functionality that standard JPA 3.0 does
  * not offer, such as access to the underlying JDBC Connection. This strategy is
  * mainly intended for standalone usage of a JPA provider; most of its functionality
  * is not relevant when running with JTA transactions.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
index 3ec01ff8d847..a77d4f0b1a59 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,10 +70,6 @@
  * plus the {@link EntityManagerFactoryInfo} interface which exposes additional
  * metadata as assembled by this FactoryBean.
  *
- * <p><b>NOTE: Spring's JPA support requires JPA 2.1 or higher, as of Spring 5.0.</b>
- * JPA 1.0/2.0 based applications are still supported; however, a JPA 2.1 compliant
- * persistence provider is needed at runtime.
- *
  * @author Juergen Hoeller
  * @author Rod Johnson
  * @since 2.0
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
index 10e528cee583..68e740057854 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,10 +52,6 @@
  * to the JPA provider, consider using Spring's more powerful
  * {@link LocalContainerEntityManagerFactoryBean} instead.
  *
- * <p><b>NOTE: Spring's JPA support requires JPA 2.1 or higher, as of Spring 5.0.</b>
- * JPA 1.0/2.0 based applications are still supported; however, a JPA 2.1 compliant
- * persistence provider is needed at runtime.
- *
  * @author Juergen Hoeller
  * @author Rod Johnson
  * @since 2.0
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
index c16527b6153d..7d51f1bfa293 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,8 +77,6 @@
  * DataSource names are by default interpreted as JNDI names, and no load time weaving
  * is available (which requires weaving to be turned off in the persistence provider).
  *
- * <p><b>NOTE: Spring's JPA support requires JPA 2.1 or higher, as of Spring 5.0.</b>
- *
  * @author Juergen Hoeller
  * @author Stephane Nicoll
  * @since 2.0
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
index 8e6d0101f564..baa3a34b255d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ protected String getDatabasePlatform() {
 	 * <p>Note that the exact semantics of this flag depend on the underlying
 	 * persistence provider. For any more advanced needs, specify the appropriate
 	 * vendor-specific settings as "jpaProperties".
-	 * <p><b>NOTE: Do not set this flag to 'true' while also setting JPA 2.1's
+	 * <p><b>NOTE: Do not set this flag to 'true' while also setting JPA's
 	 * {@code jakarta.persistence.schema-generation.database.action} property.</b>
 	 * These two schema generation mechanisms - standard JPA versus provider-native -
 	 * are mutually exclusive, e.g. with Hibernate 5.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
index 327f887f08ff..a87bf44b6519 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@
 
 /**
  * {@link org.springframework.orm.jpa.JpaDialect} implementation for
- * Hibernate EntityManager. Developed against Hibernate 5.2/5.3/5.4.
+ * Hibernate EntityManager.
  *
  * @author Juergen Hoeller
  * @author Costin Leau
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index 5807200a9c2a..67d86d87e0bb 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,8 +44,7 @@
 
 /**
  * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Hibernate
- * EntityManager. Developed and tested against Hibernate 5.3 and 5.4;
- * backwards-compatible with Hibernate 5.2 at runtime on a best-effort basis.
+ * EntityManager.
  *
  * <p>Exposes Hibernate's persistence provider and Hibernate's Session as extended
  * EntityManager interface, and adapts {@link AbstractJpaVendorAdapter}'s common

From 3ad796e91374f5b0475bdbe93f444c975cb30cab Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 29 Sep 2021 09:56:29 +0200
Subject: [PATCH 168/735] Keep getEffectiveAnnotatedParameter for user code
 compiled with javac 8

---
 .../ParameterResolutionDelegate.java          | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java
index 5f5d1a9d82fc..f8f7b0dce6f4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/ParameterResolutionDelegate.java
@@ -18,6 +18,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Parameter;
 
@@ -29,6 +30,7 @@
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * Public delegate for resolving autowirable parameters on externally managed
@@ -79,9 +81,10 @@ private ParameterResolutionDelegate() {
 	 */
 	public static boolean isAutowirable(Parameter parameter, int parameterIndex) {
 		Assert.notNull(parameter, "Parameter must not be null");
-		return (AnnotatedElementUtils.hasAnnotation(parameter, Autowired.class) ||
-				AnnotatedElementUtils.hasAnnotation(parameter, Qualifier.class) ||
-				AnnotatedElementUtils.hasAnnotation(parameter, Value.class));
+		AnnotatedElement annotatedParameter = getEffectiveAnnotatedParameter(parameter, parameterIndex);
+		return (AnnotatedElementUtils.hasAnnotation(annotatedParameter, Autowired.class) ||
+				AnnotatedElementUtils.hasAnnotation(annotatedParameter, Qualifier.class) ||
+				AnnotatedElementUtils.hasAnnotation(annotatedParameter, Value.class));
 	}
 
 	/**
@@ -122,7 +125,8 @@ public static Object resolveDependency(
 		Assert.notNull(containingClass, "Containing class must not be null");
 		Assert.notNull(beanFactory, "AutowireCapableBeanFactory must not be null");
 
-		Autowired autowired = AnnotatedElementUtils.findMergedAnnotation(parameter, Autowired.class);
+		AnnotatedElement annotatedParameter = getEffectiveAnnotatedParameter(parameter, parameterIndex);
+		Autowired autowired = AnnotatedElementUtils.findMergedAnnotation(annotatedParameter, Autowired.class);
 		boolean required = (autowired == null || autowired.required());
 
 		MethodParameter methodParameter = SynthesizingMethodParameter.forExecutable(
@@ -132,4 +136,38 @@ public static Object resolveDependency(
 		return beanFactory.resolveDependency(descriptor, null);
 	}
 
+	/**
+	 * Due to a bug in {@code javac} on JDK versions prior to JDK 9, looking up
+	 * annotations directly on a {@link Parameter} will fail for inner class
+	 * constructors.
+	 * <p>Note: Since Spring 6 may still encounter user code compiled with
+	 * {@code javac 8}, this workaround is kept in place for the time being.
+	 * <h4>Bug in javac in JDK &lt; 9</h4>
+	 * <p>The parameter annotations array in the compiled byte code excludes an entry
+	 * for the implicit <em>enclosing instance</em> parameter for an inner class
+	 * constructor.
+	 * <h4>Workaround</h4>
+	 * <p>This method provides a workaround for this off-by-one error by allowing the
+	 * caller to access annotations on the preceding {@link Parameter} object (i.e.,
+	 * {@code index - 1}). If the supplied {@code index} is zero, this method returns
+	 * an empty {@code AnnotatedElement}.
+	 * <h4>WARNING</h4>
+	 * <p>The {@code AnnotatedElement} returned by this method should never be cast and
+	 * treated as a {@code Parameter} since the metadata (e.g., {@link Parameter#getName()},
+	 * {@link Parameter#getType()}, etc.) will not match those for the declared parameter
+	 * at the given index in an inner class constructor.
+	 * @return the supplied {@code parameter} or the <em>effective</em> {@code Parameter}
+	 * if the aforementioned bug is in effect
+	 */
+	private static AnnotatedElement getEffectiveAnnotatedParameter(Parameter parameter, int index) {
+		Executable executable = parameter.getDeclaringExecutable();
+		if (executable instanceof Constructor && ClassUtils.isInnerClass(executable.getDeclaringClass()) &&
+				executable.getParameterAnnotations().length == executable.getParameterCount() - 1) {
+			// Bug in javac in JDK <9: annotation array excludes enclosing instance parameter
+			// for inner classes, so access it with the actual parameter index lowered by 1
+			return (index == 0 ? EMPTY_ANNOTATED_ELEMENT : executable.getParameters()[index - 1]);
+		}
+		return parameter;
+	}
+
 }

From 96e4d3a53079f373de16b2754d1a5eee32d9ee2c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 29 Sep 2021 14:02:37 +0200
Subject: [PATCH 169/735] Fail Gradle build for Javadoc warnings

In order to catch Javadoc errors in the build, we now enable the
`Xwerror` flag for the `javadoc` tool. In addition, we now use
`Xdoclint:syntax` instead of `Xdoclint:none` in order to validate
syntax within our Javadoc.

This commit fixes all resulting Javadoc errors and warnings.

This commit also upgrades to Undertow 2.2.12.Final and fixes the
artifact names for exclusions for the Servlet and annotations APIs.

The incorrect exclusion of the Servlet API resulted in the Servlet API
being on the classpath twice for the javadoc task, which resulted in the
following warnings in previous builds.

javadoc: warning - Multiple sources of package comments found for package "javax.servlet"
javadoc: warning - Multiple sources of package comments found for package "javax.servlet.http"
javadoc: warning - Multiple sources of package comments found for package "javax.servlet.descriptor"
javadoc: warning - Multiple sources of package comments found for package "javax.servlet.annotation"

Closes gh-27480
---
 build.gradle                                  |  7 ++-
 gradle/docs.gradle                            |  5 ++-
 .../target/QuickTargetSourceCreator.java      |  8 ++--
 .../org/springframework/beans/BeanUtils.java  |  2 +-
 .../beans/PropertyAccessorUtils.java          |  4 +-
 .../factory/config/MethodInvokingBean.java    | 14 +++---
 .../config/MethodInvokingFactoryBean.java     | 24 +++++-----
 .../config/ServiceLocatorFactoryBean.java     | 44 +++++++++----------
 .../beans/factory/config/YamlProcessor.java   |  2 +-
 .../AbstractAutowireCapableBeanFactory.java   |  4 +-
 .../factory/xml/DefaultDocumentLoader.java    |  2 +-
 .../factory/xml/PluggableSchemaResolver.java  |  6 +--
 .../mail/javamail/MimeMessageHelper.java      |  8 ++--
 .../AnnotationBeanNameGenerator.java          |  2 +-
 ...ReloadableResourceBundleMessageSource.java |  2 +-
 .../rmi/JndiRmiClientInterceptor.java         |  2 +-
 .../remoting/rmi/JndiRmiProxyFactoryBean.java |  2 +-
 .../remoting/rmi/JndiRmiServiceExporter.java  |  2 +-
 .../support/ResourceBundleThemeSource.java    |  2 +-
 .../springframework/validation/Errors.java    |  4 +-
 .../org/springframework/core/Constants.java   |  8 ++--
 .../core/SmartClassLoader.java                |  1 -
 .../core/io/FileSystemResource.java           |  8 ++--
 .../springframework/core/io/PathResource.java |  6 +--
 .../springframework/util/AntPathMatcher.java  | 16 +++----
 .../java/org/springframework/util/Assert.java |  2 +-
 .../springframework/util/MethodInvoker.java   |  2 +-
 .../org/springframework/util/PathMatcher.java |  2 +-
 .../org/springframework/util/StringUtils.java |  6 +--
 .../util/comparator/InvertibleComparator.java |  4 +-
 .../LazyConnectionDataSourceProxy.java        |  4 +-
 .../UserCredentialsDataSourceAdapter.java     |  2 +-
 ...erCredentialsConnectionFactoryAdapter.java |  2 +-
 .../DefaultJmsActivationSpecFactory.java      |  4 +-
 .../endpoint/JmsMessageEndpointManager.java   |  2 +-
 .../MessageMappingMessageHandler.java         |  2 +-
 .../support/RSocketMessageHandler.java        |  2 +-
 .../orm/hibernate5/SpringBeanContainer.java   |  2 +-
 .../r2dbc/core/DatabaseClient.java            | 10 ++---
 .../r2dbc/core/ExecuteFunction.java           |  2 +-
 .../AbstractRequestExpectationManager.java    |  2 +-
 .../reactive/server/FluxExchangeResult.java   |  2 +-
 .../web/reactive/server/WebTestClient.java    | 10 ++---
 ...onnectionSpecConnectionFactoryAdapter.java |  2 +-
 .../TransactionProxyFactoryBean.java          |  2 +-
 .../http/ContentDisposition.java              | 11 +++--
 .../org/springframework/http/HttpStatus.java  |  6 +--
 .../client/ClientHttpRequestInterceptor.java  |  6 +--
 .../http/codec/xml/XmlEventDecoder.java       |  2 +-
 .../ObjectToStringHttpMessageConverter.java   | 10 ++---
 .../feed/AtomFeedHttpMessageConverter.java    |  2 +-
 .../feed/RssChannelHttpMessageConverter.java  |  2 +-
 .../SimpleHttpServerJaxWsServiceExporter.java |  2 +-
 .../jaxws/SimpleJaxWsServiceExporter.java     |  2 +-
 .../SpringServletContainerInitializer.java    |  4 +-
 .../web/WebApplicationInitializer.java        | 10 ++---
 .../web/jsf/el/SpringBeanFacesELResolver.java | 28 ++++++------
 .../WebApplicationContextFacesELResolver.java |  6 +--
 .../web/server/ServerWebExchange.java         |  2 +-
 .../web/util/UrlPathHelper.java               | 10 ++---
 .../function/client/ExchangeFunction.java     |  2 +-
 .../reactive/function/client/WebClient.java   |  8 ++--
 .../function/server/RouterFunctions.java      | 18 ++++----
 .../function/server/ServerRequest.java        |  6 +--
 .../result/view/UrlBasedViewResolver.java     |  2 +-
 .../web/reactive/socket/WebSocketHandler.java | 10 ++---
 .../web/servlet/DispatcherServlet.java        |  2 +-
 .../web/servlet/ModelAndView.java             |  2 +-
 .../web/servlet/function/RouterFunctions.java | 18 ++++----
 .../web/servlet/function/ServerRequest.java   |  6 +--
 .../web/servlet/function/ServerResponse.java  |  8 ++--
 .../DefaultHandlerExceptionResolver.java      |  1 -
 .../servlet/support/WebContentGenerator.java  |  2 +-
 .../servlet/view/InternalResourceView.java    |  2 +-
 .../web/servlet/view/JstlView.java            |  2 +-
 .../servlet/view/UrlBasedViewResolver.java    | 12 ++---
 .../view/feed/AbstractAtomFeedView.java       |  2 +-
 .../servlet/view/feed/AbstractFeedView.java   |  2 +-
 .../view/feed/AbstractRssFeedView.java        |  2 +-
 .../view/freemarker/FreeMarkerConfigurer.java |  2 +-
 .../servlet/view/tiles3/TilesConfigurer.java  | 38 ++++++++--------
 81 files changed, 251 insertions(+), 250 deletions(-)

diff --git a/build.gradle b/build.gradle
index ba209903d9b2..86379dd04b7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -139,14 +139,14 @@ configure(allprojects) { project ->
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.10.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.12.Final') {
 				entry 'undertow-core'
 				entry('undertow-websockets-jsr') {
 					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
 				}
 				entry('undertow-servlet') {
-					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec"
-					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec"
+					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
+					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec"
 				}
 			}
 
@@ -371,7 +371,6 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
-			"https://glassfish.java.net/nonav/docs/v3/api/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://tiles.apache.org/tiles-request/apidocs/",
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index bfb26d152b9c..b0a356be9207 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -46,8 +46,9 @@ task api(type: Javadoc) {
 		stylesheetFile = file("src/docs/api/stylesheet.css")
 		splitIndex = true
 		links(project.ext.javadocLinks)
-		addStringOption('Xdoclint:none', '-quiet')
-		if(JavaVersion.current().isJava9Compatible()) {
+		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
+		addBooleanOption('Xwerror', true) // fail build on Javadoc warnings
+		if (JavaVersion.current().isJava9Compatible()) {
 			addBooleanOption('html5', true)
 		}
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
index a6a741e0f879..f7df6c30249b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
@@ -25,9 +25,11 @@
 /**
  * Convenient TargetSourceCreator using bean name prefixes to create one of three
  * well-known TargetSource types:
- * <li>: CommonsPool2TargetSource
- * <li>% ThreadLocalTargetSource
- * <li>! PrototypeTargetSource
+ * <ul>
+ * <li>: CommonsPool2TargetSource</li>
+ * <li>% ThreadLocalTargetSource</li>
+ * <li>! PrototypeTargetSource</li>
+ * </ul>
  *
  * @author Rod Johnson
  * @author Stephane Nicoll
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 9483d18871f5..3a2b3f0b03ae 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -540,7 +540,7 @@ public static PropertyDescriptor findPropertyForMethod(Method method, Class<?> c
 
 	/**
 	 * Find a JavaBeans PropertyEditor following the 'Editor' suffix convention
-	 * (e.g. "mypackage.MyDomainClass" -> "mypackage.MyDomainClassEditor").
+	 * (e.g. "mypackage.MyDomainClass" &rarr; "mypackage.MyDomainClassEditor").
 	 * <p>Compatible to the standard JavaBeans convention as implemented by
 	 * {@link java.beans.PropertyEditorManager} but isolated from the latter's
 	 * registered default editors for primitive types.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
index 55f50e5a275c..564194e2f0aa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
@@ -134,8 +134,8 @@ public static boolean matchesProperty(String registeredPath, String propertyPath
 	/**
 	 * Determine the canonical name for the given property path.
 	 * Removes surrounding quotes from map keys:<br>
-	 * {@code map['key']} -> {@code map[key]}<br>
-	 * {@code map["key"]} -> {@code map[key]}
+	 * {@code map['key']} &rarr; {@code map[key]}<br>
+	 * {@code map["key"]} &rarr; {@code map[key]}
 	 * @param propertyName the bean property path
 	 * @return the canonical representation of the property path
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java
index 1374c4105e98..57fa7ab222c0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java
@@ -47,17 +47,17 @@
  * which uses this class to call a static initialization method:
  *
  * <pre class="code">
- * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean">
- *   &lt;property name="staticMethod" value="com.whatever.MyClass.init"/>
- * &lt;/bean></pre>
+ * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean"&gt;
+ *   &lt;property name="staticMethod" value="com.whatever.MyClass.init"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>An example of calling an instance method to start some server bean:
  *
  * <pre class="code">
- * &lt;bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean">
- *   &lt;property name="targetObject" ref="myServer"/>
- *   &lt;property name="targetMethod" value="start"/>
- * &lt;/bean></pre>
+ * &lt;bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean"&gt;
+ *   &lt;property name="targetObject" ref="myServer"/&gt;
+ *   &lt;property name="targetMethod" value="start"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * @author Juergen Hoeller
  * @since 4.0.3
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
index 86a6be985645..3ff39d81e5e3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
@@ -56,24 +56,24 @@
  * which uses this class to call a static factory method:
  *
  * <pre class="code">
- * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   &lt;property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/>
- * &lt;/bean></pre>
+ * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
+ *   &lt;property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * <p>An example of calling a static method then an instance method to get at a
  * Java system property. Somewhat verbose, but it works.
  *
  * <pre class="code">
- * &lt;bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   &lt;property name="targetClass" value="java.lang.System"/>
- *   &lt;property name="targetMethod" value="getProperties"/>
- * &lt;/bean>
+ * &lt;bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
+ *   &lt;property name="targetClass" value="java.lang.System"/&gt;
+ *   &lt;property name="targetMethod" value="getProperties"/&gt;
+ * &lt;/bean&gt;
  *
- * &lt;bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   &lt;property name="targetObject" ref="sysProps"/>
- *   &lt;property name="targetMethod" value="getProperty"/>
- *   &lt;property name="arguments" value="java.version"/>
- * &lt;/bean></pre>
+ * &lt;bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
+ *   &lt;property name="targetObject" ref="sysProps"/&gt;
+ *   &lt;property name="targetMethod" value="getProperty"/&gt;
+ *   &lt;property name="arguments" value="java.version"/&gt;
+ * &lt;/bean&gt;</pre>
  *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
index e0ee01e6e3d7..272e97f5b74f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
@@ -83,22 +83,22 @@
  * <p>A sample config in an XML-based
  * {@link org.springframework.beans.factory.BeanFactory} might look as follows:
  *
- * <pre class="code">&lt;beans>
+ * <pre class="code">&lt;beans&gt;
  *
- *   &lt;!-- Prototype bean since we have state -->
- *   &lt;bean id="myService" class="a.b.c.MyService" singleton="false"/>
+ *   &lt;!-- Prototype bean since we have state --&gt;
+ *   &lt;bean id="myService" class="a.b.c.MyService" singleton="false"/&gt;
  *
- *   &lt;!-- will lookup the above 'myService' bean by *TYPE* -->
+ *   &lt;!-- will lookup the above 'myService' bean by *TYPE* --&gt;
  *   &lt;bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
- *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
- *   &lt;/bean>
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean"&gt;
+ *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *   &lt;bean id="clientBean" class="a.b.c.MyClientBean">
- *     &lt;property name="myServiceFactory" ref="myServiceFactory"/>
- *   &lt;/bean>
+ *   &lt;bean id="clientBean" class="a.b.c.MyClientBean"&gt;
+ *     &lt;property name="myServiceFactory" ref="myServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *&lt;/beans></pre>
+ *&lt;/beans&gt;</pre>
  *
  * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:
@@ -135,22 +135,22 @@
  * <p>A sample config in an XML-based
  * {@link org.springframework.beans.factory.BeanFactory} might look as follows:
  *
- * <pre class="code">&lt;beans>
+ * <pre class="code">&lt;beans&gt;
  *
- *   &lt;!-- Prototype beans since we have state (both extend MyService) -->
- *   &lt;bean id="specialService" class="a.b.c.SpecialService" singleton="false"/>
- *   &lt;bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/>
+ *   &lt;!-- Prototype beans since we have state (both extend MyService) --&gt;
+ *   &lt;bean id="specialService" class="a.b.c.SpecialService" singleton="false"/&gt;
+ *   &lt;bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/&gt;
  *
  *   &lt;bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
- *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
- *   &lt;/bean>
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean"&gt;
+ *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *   &lt;bean id="clientBean" class="a.b.c.MyClientBean">
- *     &lt;property name="myServiceFactory" ref="myServiceFactory"/>
- *   &lt;/bean>
+ *   &lt;bean id="clientBean" class="a.b.c.MyClientBean"&gt;
+ *     &lt;property name="myServiceFactory" ref="myServiceFactory"/&gt;
+ *   &lt;/bean&gt;
  *
- *&lt;/beans></pre>
+ *&lt;/beans&gt;</pre>
  *
  * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
index e34d7c25ce83..7949003c68bd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
@@ -86,7 +86,7 @@ public abstract class YamlProcessor {
 	 * </pre>
 	 * when mapped with
 	 * <pre class="code">
-	 * setDocumentMatchers(properties ->
+	 * setDocumentMatchers(properties -&gt;
 	 *     ("prod".equals(properties.getProperty("environment")) ? MatchStatus.FOUND : MatchStatus.NOT_FOUND));
 	 * </pre>
 	 * would end up as
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index 02b27fe30443..e3908a2a7c30 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -1342,7 +1342,7 @@ protected BeanWrapper instantiateBean(String beanName, RootBeanDefinition mbd) {
 	 * @param beanName the name of the bean
 	 * @param mbd the bean definition for the bean
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or {@code null} if none (-> use constructor argument values from bean definition)
+	 * or {@code null} if none (implying the use of constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 * @see #getBean(String, Object[])
 	 */
@@ -1363,7 +1363,7 @@ protected BeanWrapper instantiateUsingFactoryMethod(
 	 * @param mbd the bean definition for the bean
 	 * @param ctors the chosen candidate constructors
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or {@code null} if none (-> use constructor argument values from bean definition)
+	 * or {@code null} if none (implying the use of constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 */
 	protected BeanWrapper autowireConstructor(
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
index a443e7b1d669..08b1d16f2778 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
@@ -39,7 +39,7 @@
  * when starting your JVM. For example, to use the Oracle {@link DocumentBuilder},
  * you might start your application like as follows:
  *
- * <pre code="class">java -Djavax.xml.parsers.DocumentBuilderFactory=oracle.xml.jaxp.JXDocumentBuilderFactory MyMainClass</pre>
+ * <pre class="code">java -Djavax.xml.parsers.DocumentBuilderFactory=oracle.xml.jaxp.JXDocumentBuilderFactory MyMainClass</pre>
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
index 3b1bff1febc3..82d632302d52 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
@@ -71,13 +71,13 @@ public class PluggableSchemaResolver implements EntityResolver {
 
 	private final String schemaMappingsLocation;
 
-	/** Stores the mapping of schema URL -> local schema path. */
+	/** Stores the mapping of schema URL &rarr; local schema path. */
 	@Nullable
 	private volatile Map<String, String> schemaMappings;
 
 
 	/**
-	 * Loads the schema URL -> schema file location mappings using the default
+	 * Loads the schema URL &rarr; schema file location mappings using the default
 	 * mapping file pattern "META-INF/spring.schemas".
 	 * @param classLoader the ClassLoader to use for loading
 	 * (can be {@code null}) to use the default ClassLoader)
@@ -89,7 +89,7 @@ public PluggableSchemaResolver(@Nullable ClassLoader classLoader) {
 	}
 
 	/**
-	 * Loads the schema URL -> schema file location mappings using the given
+	 * Loads the schema URL &rarr; schema file location mappings using the given
 	 * mapping file pattern.
 	 * @param classLoader the ClassLoader to use for loading
 	 * (can be {@code null}) to use the default ClassLoader)
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index f795390fa24d..1eff5cebfaa9 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -896,7 +896,7 @@ private void setHtmlTextToMimePart(MimePart mimePart, String text) throws Messag
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param dataSource the {@code javax.activation.DataSource} to take
 	 * the content from, determining the InputStream and the content type
@@ -923,7 +923,7 @@ public void addInline(String contentId, DataSource dataSource) throws MessagingE
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param file the File resource to take the content from
 	 * @throws MessagingException in case of errors
@@ -950,7 +950,7 @@ public void addInline(String contentId, File file) throws MessagingException {
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param resource the resource to take the content from
 	 * @throws MessagingException in case of errors
@@ -976,7 +976,7 @@ public void addInline(String contentId, Resource resource) throws MessagingExcep
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@code setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param inputStreamSource the resource to take the content from
 	 * @param contentType the content type to use for the element
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index a589a92335ac..4beee8680642 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -156,7 +156,7 @@ protected String buildDefaultBeanName(BeanDefinition definition, BeanDefinitionR
 	/**
 	 * Derive a default bean name from the given bean definition.
 	 * <p>The default implementation simply builds a decapitalized version
-	 * of the short class name: e.g. "mypackage.MyJdbcDao" -> "myJdbcDao".
+	 * of the short class name: e.g. "mypackage.MyJdbcDao" &rarr; "myJdbcDao".
 	 * <p>Note that inner classes will thus have names of the form
 	 * "outerClassName.InnerClassName", which because of the period in the
 	 * name may be an issue if you are autowiring by name.
diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
index 6b6ff96af18e..1a93dd38d087 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
@@ -315,7 +315,7 @@ protected List<String> calculateAllFilenames(String basename, Locale locale) {
 	/**
 	 * Calculate the filenames for the given bundle basename and Locale,
 	 * appending language code, country code, and variant code.
-	 * E.g.: basename "messages", Locale "de_AT_oo" -> "messages_de_AT_OO",
+	 * <p>For example, basename "messages", Locale "de_AT_oo" &rarr; "messages_de_AT_OO",
 	 * "messages_de_AT", "messages_de".
 	 * <p>Follows the rules defined by {@link java.util.Locale#toString()}.
 	 * @param basename the basename of the bundle
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
index d90dd6a1a347..e883ff294954 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
@@ -56,7 +56,7 @@
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props>
+ * 	 &lt;props&gt;
  *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
  *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
  *	 &lt;/props&gt;
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
index a9d33d8973b6..48feb108a00f 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
@@ -43,7 +43,7 @@
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props>
+ * 	 &lt;props&gt;
  *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
  *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
  *	 &lt;/props&gt;
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
index 49b2db295ae8..60543f6b1873 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
@@ -52,7 +52,7 @@
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props>
+ * 	 &lt;props&gt;
  *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
  *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
  *	 &lt;/props&gt;
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
index 0e5ba7e9a85b..fe68fc0fc8cd 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
@@ -87,7 +87,7 @@ public ThemeSource getParentThemeSource() {
 	/**
 	 * Set the prefix that gets applied to the ResourceBundle basenames,
 	 * i.e. the theme names.
-	 * E.g.: basenamePrefix="test.", themeName="theme" -> basename="test.theme".
+	 * E.g.: basenamePrefix="test.", themeName="theme" &rarr; basename="test.theme".
 	 * <p>Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",
diff --git a/spring-context/src/main/java/org/springframework/validation/Errors.java b/spring-context/src/main/java/org/springframework/validation/Errors.java
index ebaa9460bf12..45ae5d7b57af 100644
--- a/spring-context/src/main/java/org/springframework/validation/Errors.java
+++ b/spring-context/src/main/java/org/springframework/validation/Errors.java
@@ -83,8 +83,8 @@ public interface Errors {
 	 * {@code pushNestedPath(String)} call.
 	 * <p>Using the nested path stack allows to set temporary nested paths
 	 * for subobjects without having to worry about a temporary path holder.
-	 * <p>For example: current path "spouse.", pushNestedPath("child") ->
-	 * result path "spouse.child."; popNestedPath() -> "spouse." again.
+	 * <p>For example: current path "spouse.", pushNestedPath("child") &rarr;
+	 * result path "spouse.child."; popNestedPath() &rarr; "spouse." again.
 	 * @param subPath the sub path to push onto the nested path stack
 	 * @see #popNestedPath
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java
index 8e91d511c10c..f94b1842bb68 100644
--- a/spring-core/src/main/java/org/springframework/core/Constants.java
+++ b/spring-core/src/main/java/org/springframework/core/Constants.java
@@ -310,10 +310,10 @@ public String toCodeForSuffix(Object value, @Nullable String nameSuffix) throws
 	 * Convert the given bean property name to a constant name prefix.
 	 * <p>Uses a common naming idiom: turning all lower case characters to
 	 * upper case, and prepending upper case characters with an underscore.
-	 * <p>Example: "imageSize" -> "IMAGE_SIZE"<br>
-	 * Example: "imagesize" -> "IMAGESIZE".<br>
-	 * Example: "ImageSize" -> "_IMAGE_SIZE".<br>
-	 * Example: "IMAGESIZE" -> "_I_M_A_G_E_S_I_Z_E"
+	 * <p>Example: "imageSize" &rarr; "IMAGE_SIZE"<br>
+	 * Example: "imagesize" &rarr; "IMAGESIZE".<br>
+	 * Example: "ImageSize" &rarr; "_IMAGE_SIZE".<br>
+	 * Example: "IMAGESIZE" &rarr; "_I_M_A_G_E_S_I_Z_E"
 	 * @param propertyName the name of the bean property
 	 * @return the corresponding constant name prefix
 	 * @see #getValuesForProperty
diff --git a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
index e6a39c149ec4..964c791a8e00 100644
--- a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
@@ -91,7 +91,6 @@ default ClassLoader getOriginalClassLoader() {
 	 * not being possible (thrown by the default implementation in this interface)
 	 * @since 5.3.4
 	 * @see ClassLoader#defineClass(String, byte[], int, int, ProtectionDomain)
-	 * @see java.lang.invoke.MethodHandles.Lookup#defineClass(byte[])
 	 */
 	default Class<?> publicDefineClass(String name, byte[] b, @Nullable ProtectionDomain protectionDomain) {
 		throw new UnsupportedOperationException();
diff --git a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
index d0f7d392e802..feb2f9067da3 100644
--- a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
@@ -70,9 +70,9 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * <p>Note: When building relative resources via {@link #createRelative},
 	 * it makes a difference whether the specified resource base path here
 	 * ends with a slash or not. In the case of "C:/dir1/", relative paths
-	 * will be built underneath that root: e.g. relative path "dir2" ->
+	 * will be built underneath that root: e.g. relative path "dir2" &rarr;
 	 * "C:/dir1/dir2". In the case of "C:/dir1", relative paths will apply
-	 * at the same directory level: relative path "dir2" -> "C:/dir2".
+	 * at the same directory level: relative path "dir2" &rarr; "C:/dir2".
 	 * @param path a file path
 	 * @see #FileSystemResource(Path)
 	 */
@@ -87,7 +87,7 @@ public FileSystemResource(String path) {
 	 * Create a new {@code FileSystemResource} from a {@link File} handle.
 	 * <p>Note: When building relative resources via {@link #createRelative},
 	 * the relative path will apply <i>at the same directory level</i>:
-	 * e.g. new File("C:/dir1"), relative path "dir2" -> "C:/dir2"!
+	 * e.g. new File("C:/dir1"), relative path "dir2" &rarr; "C:/dir2"!
 	 * If you prefer to have relative paths built underneath the given root directory,
 	 * use the {@link #FileSystemResource(String) constructor with a file path}
 	 * to append a trailing slash to the root path: "C:/dir1/", which indicates
@@ -111,7 +111,7 @@ public FileSystemResource(File file) {
 	 * path cleaning and {@link #createRelative(String)} handling.
 	 * <p>Note: When building relative resources via {@link #createRelative},
 	 * the relative path will apply <i>at the same directory level</i>:
-	 * e.g. Paths.get("C:/dir1"), relative path "dir2" -> "C:/dir2"!
+	 * e.g. Paths.get("C:/dir1"), relative path "dir2" &rarr; "C:/dir2"!
 	 * If you prefer to have relative paths built underneath the given root directory,
 	 * use the {@link #FileSystemResource(String) constructor with a file path}
 	 * to append a trailing slash to the root path: "C:/dir1/", which indicates
diff --git a/spring-core/src/main/java/org/springframework/core/io/PathResource.java b/spring-core/src/main/java/org/springframework/core/io/PathResource.java
index bd334cc51856..6412f001a2b4 100644
--- a/spring-core/src/main/java/org/springframework/core/io/PathResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/PathResource.java
@@ -64,7 +64,7 @@ public class PathResource extends AbstractResource implements WritableResource {
 	 * Create a new PathResource from a Path handle.
 	 * <p>Note: Unlike {@link FileSystemResource}, when building relative resources
 	 * via {@link #createRelative}, the relative path will be built <i>underneath</i>
-	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" -> "C:/dir1/dir2"!
+	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" &rarr; "C:/dir1/dir2"!
 	 * @param path a Path handle
 	 */
 	public PathResource(Path path) {
@@ -76,7 +76,7 @@ public PathResource(Path path) {
 	 * Create a new PathResource from a Path handle.
 	 * <p>Note: Unlike {@link FileSystemResource}, when building relative resources
 	 * via {@link #createRelative}, the relative path will be built <i>underneath</i>
-	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" -> "C:/dir1/dir2"!
+	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" &rarr; "C:/dir1/dir2"!
 	 * @param path a path
 	 * @see java.nio.file.Paths#get(String, String...)
 	 */
@@ -89,7 +89,7 @@ public PathResource(String path) {
 	 * Create a new PathResource from a Path handle.
 	 * <p>Note: Unlike {@link FileSystemResource}, when building relative resources
 	 * via {@link #createRelative}, the relative path will be built <i>underneath</i>
-	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" -> "C:/dir1/dir2"!
+	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" &rarr; "C:/dir1/dir2"!
 	 * @param uri a path URI
 	 * @see java.nio.file.Paths#get(URI)
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
index 59087313ea58..997925613649 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -475,14 +475,14 @@ protected AntPathStringMatcher getStringMatcher(String pattern) {
 
 	/**
 	 * Given a pattern and a full path, determine the pattern-mapped part. <p>For example: <ul>
-	 * <li>'{@code /docs/cvs/commit.html}' and '{@code /docs/cvs/commit.html} -> ''</li>
-	 * <li>'{@code /docs/*}' and '{@code /docs/cvs/commit} -> '{@code cvs/commit}'</li>
-	 * <li>'{@code /docs/cvs/*.html}' and '{@code /docs/cvs/commit.html} -> '{@code commit.html}'</li>
-	 * <li>'{@code /docs/**}' and '{@code /docs/cvs/commit} -> '{@code cvs/commit}'</li>
-	 * <li>'{@code /docs/**\/*.html}' and '{@code /docs/cvs/commit.html} -> '{@code cvs/commit.html}'</li>
-	 * <li>'{@code /*.html}' and '{@code /docs/cvs/commit.html} -> '{@code docs/cvs/commit.html}'</li>
-	 * <li>'{@code *.html}' and '{@code /docs/cvs/commit.html} -> '{@code /docs/cvs/commit.html}'</li>
-	 * <li>'{@code *}' and '{@code /docs/cvs/commit.html} -> '{@code /docs/cvs/commit.html}'</li> </ul>
+	 * <li>'{@code /docs/cvs/commit.html}' and '{@code /docs/cvs/commit.html} &rarr; ''</li>
+	 * <li>'{@code /docs/*}' and '{@code /docs/cvs/commit} &rarr; '{@code cvs/commit}'</li>
+	 * <li>'{@code /docs/cvs/*.html}' and '{@code /docs/cvs/commit.html} &rarr; '{@code commit.html}'</li>
+	 * <li>'{@code /docs/**}' and '{@code /docs/cvs/commit} &rarr; '{@code cvs/commit}'</li>
+	 * <li>'{@code /docs/**\/*.html}' and '{@code /docs/cvs/commit.html} &rarr; '{@code cvs/commit.html}'</li>
+	 * <li>'{@code /*.html}' and '{@code /docs/cvs/commit.html} &rarr; '{@code docs/cvs/commit.html}'</li>
+	 * <li>'{@code *.html}' and '{@code /docs/cvs/commit.html} &rarr; '{@code /docs/cvs/commit.html}'</li>
+	 * <li>'{@code *}' and '{@code /docs/cvs/commit.html} &rarr; '{@code /docs/cvs/commit.html}'</li> </ul>
 	 * <p>Assumes that {@link #match} returns {@code true} for '{@code pattern}' and '{@code path}', but
 	 * does <strong>not</strong> enforce this.
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/Assert.java b/spring-core/src/main/java/org/springframework/util/Assert.java
index fbba65fbc460..fd841793936d 100644
--- a/spring-core/src/main/java/org/springframework/util/Assert.java
+++ b/spring-core/src/main/java/org/springframework/util/Assert.java
@@ -43,7 +43,7 @@
  *
  * <pre class="code">
  * Assert.notNull(clazz, "The class must not be null");
- * Assert.isTrue(i > 0, "The value must be greater than zero");</pre>
+ * Assert.isTrue(i &gt; 0, "The value must be greater than zero");</pre>
  *
  * <p>Mainly for internal use within the framework; for a more comprehensive suite
  * of assertion utilities consider {@code org.apache.commons.lang3.Validate} from
diff --git a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
index 8672b0197a60..b3e0c5554806 100644
--- a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
+++ b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
@@ -288,7 +288,7 @@ public Object invoke() throws InvocationTargetException, IllegalAccessException
 	 * Algorithm that judges the match between the declared parameter types of a candidate method
 	 * and a specific list of arguments that this method is supposed to be invoked with.
 	 * <p>Determines a weight that represents the class hierarchy difference between types and
-	 * arguments. A direct match, i.e. type Integer -> arg of class Integer, does not increase
+	 * arguments. A direct match, i.e. type Integer &rarr; arg of class Integer, does not increase
 	 * the result - all direct matches means weight 0. A match between type Object and arg of
 	 * class Integer would increase the weight by 2, due to the superclass 2 steps up in the
 	 * hierarchy (i.e. Object) being the last one that still matches the required type Object.
diff --git a/spring-core/src/main/java/org/springframework/util/PathMatcher.java b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
index 5d711d00b222..7268e7ba5b75 100644
--- a/spring-core/src/main/java/org/springframework/util/PathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
@@ -94,7 +94,7 @@ public interface PathMatcher {
 	 * Given a pattern and a full path, extract the URI template variables. URI template
 	 * variables are expressed through curly brackets ('{' and '}').
 	 * <p>For example: For pattern "/hotels/{hotel}" and path "/hotels/1", this method will
-	 * return a map containing "hotel"->"1".
+	 * return a map containing "hotel" &rarr; "1".
 	 * @param pattern the path pattern, possibly containing URI templates
 	 * @param path the full path to extract template variables from
 	 * @return a map, containing variable names as keys; variables values as values
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 269257fd6024..5b5c762408fd 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -571,7 +571,7 @@ private static String changeFirstCharacterCase(String str, boolean capitalize) {
 
 	/**
 	 * Extract the filename from the given Java resource path,
-	 * e.g. {@code "mypath/myfile.txt" -> "myfile.txt"}.
+	 * e.g. {@code "mypath/myfile.txt" &rarr; "myfile.txt"}.
 	 * @param path the file path (may be {@code null})
 	 * @return the extracted filename, or {@code null} if none
 	 */
@@ -587,7 +587,7 @@ public static String getFilename(@Nullable String path) {
 
 	/**
 	 * Extract the filename extension from the given Java resource path,
-	 * e.g. "mypath/myfile.txt" -> "txt".
+	 * e.g. "mypath/myfile.txt" &rarr; "txt".
 	 * @param path the file path (may be {@code null})
 	 * @return the extracted filename extension, or {@code null} if none
 	 */
@@ -612,7 +612,7 @@ public static String getFilenameExtension(@Nullable String path) {
 
 	/**
 	 * Strip the filename extension from the given Java resource path,
-	 * e.g. "mypath/myfile.txt" -> "mypath/myfile".
+	 * e.g. "mypath/myfile.txt" &rarr; "mypath/myfile".
 	 * @param path the file path
 	 * @return the path with stripped filename extension
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
index fbb17f687c5c..7da876615b9d 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
@@ -81,8 +81,8 @@ public boolean isAscending() {
 	}
 
 	/**
-	 * Invert the sort order: ascending -> descending or
-	 * descending -> ascending.
+	 * Invert the sort order: ascending &rarr; descending or
+	 * descending &rarr; ascending.
 	 */
 	public void invertOrder() {
 		this.ascending = !this.ascending;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
index e22d47de3723..680e5feb746d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
@@ -111,7 +111,7 @@ public LazyConnectionDataSourceProxy(DataSource targetDataSource) {
 
 	/**
 	 * Set the default auto-commit mode to expose when no target Connection
-	 * has been fetched yet (-> actual JDBC Connection default not known yet).
+	 * has been fetched yet (when the actual JDBC Connection default is not known yet).
 	 * <p>If not specified, the default gets determined by checking a target
 	 * Connection on startup. If that check fails, the default will be determined
 	 * lazily on first access of a Connection.
@@ -123,7 +123,7 @@ public void setDefaultAutoCommit(boolean defaultAutoCommit) {
 
 	/**
 	 * Set the default transaction isolation level to expose when no target Connection
-	 * has been fetched yet (-> actual JDBC Connection default not known yet).
+	 * has been fetched yet (when the actual JDBC Connection default is not known yet).
 	 * <p>This property accepts the int constant value (e.g. 8) as defined in the
 	 * {@link java.sql.Connection} interface; it is mainly intended for programmatic
 	 * use. Consider using the "defaultTransactionIsolationName" property for setting
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
index 8d0957502353..659c11fae8d3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
@@ -48,7 +48,7 @@
  *   &lt;property name="targetDataSource" ref="myTargetDataSource"/&gt;
  *   &lt;property name="username" value="myusername"/&gt;
  *   &lt;property name="password" value="mypassword"/&gt;
- * &lt;/bean></pre>
+ * &lt;/bean&gt;</pre>
  *
  * <p>If the "username" is empty, this proxy will simply delegate to the
  * standard {@code getConnection()} method of the target DataSource.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
index f8d2e4b9b42e..1943d753c49d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
@@ -55,7 +55,7 @@
  *   &lt;property name="targetConnectionFactory" ref="myTargetConnectionFactory"/&gt;
  *   &lt;property name="username" value="myusername"/&gt;
  *   &lt;property name="password" value="mypassword"/&gt;
- * &lt;/bean></pre>
+ * &lt;/bean&gt;</pre>
  *
  * <p>If the "username" is empty, this proxy will simply delegate to the standard
  * {@code createConnection()} method of the target ConnectionFactory.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
index 1702070063b0..d85d89211fa9 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
@@ -33,7 +33,7 @@
  * <p>An ActivationSpec factory is effectively dependent on the concrete
  * JMS provider, e.g. on ActiveMQ. This default implementation simply
  * guesses the ActivationSpec class name from the provider's class name
- * ("ActiveMQResourceAdapter" -> "ActiveMQActivationSpec" in the same package,
+ * ("ActiveMQResourceAdapter" &rarr; "ActiveMQActivationSpec" in the same package,
  * or "ActivationSpecImpl" in the same package as the ResourceAdapter class),
  * and populates the ActivationSpec properties as suggested by the
  * JCA 1.5 specification (Appendix B). Specify the 'activationSpecClass'
@@ -68,7 +68,7 @@ public class DefaultJmsActivationSpecFactory extends StandardJmsActivationSpecFa
 
 	/**
 	 * This implementation guesses the ActivationSpec class name from the
-	 * provider's class name: e.g. "ActiveMQResourceAdapter" ->
+	 * provider's class name: e.g. "ActiveMQResourceAdapter" &rarr;
 	 * "ActiveMQActivationSpec" in the same package, or a class named
 	 * "ActivationSpecImpl" in the same package as the ResourceAdapter class.
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
index 518736f59e20..c6820c66eb1f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
@@ -104,7 +104,7 @@ public void setTransactionManager(Object transactionManager) {
 	 * {@link #setActivationSpecConfig JmsActivationSpecConfig} objects.
 	 * <p>This factory is dependent on the concrete JMS provider, e.g. on ActiveMQ.
 	 * The default implementation simply guesses the ActivationSpec class name
-	 * from the provider's class name (e.g. "ActiveMQResourceAdapter" ->
+	 * from the provider's class name (e.g. "ActiveMQResourceAdapter" &rarr;
 	 * "ActiveMQActivationSpec" in the same package), and populates the
 	 * ActivationSpec properties as suggested by the JCA 1.5 specification
 	 * (plus a couple of autodetected vendor-specific properties).
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java
index 0804bff2d0a1..86bd27208508 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java
@@ -200,7 +200,7 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
 	 * {@code @ControllerAdvice} bean. You can use the following adapter code
 	 * to register {@code @ControllerAdvice} beans here:
 	 * <pre>
-	 * ControllerAdviceBean.findAnnotatedBeans(context).forEach(bean ->
+	 * ControllerAdviceBean.findAnnotatedBeans(context).forEach(bean -&gt;
 	 *         messageHandler.registerMessagingAdvice(new ControllerAdviceWrapper(bean));
 	 *
 	 * public class ControllerAdviceWrapper implements MessagingAdviceBean {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
index 4bcd5c0f4ef5..a779b3272625 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
@@ -461,7 +461,7 @@ private boolean isDataMimeTypeSupported(MimeType dataMimeType) {
 	 *         RSocketMessageHandler.responder(strategies, new ClientHandler());
 	 *
 	 * RSocketRequester.builder()
-	 *         .rsocketConnector(connector -> connector.acceptor(responder))
+	 *         .rsocketConnector(connector -&gt; connector.acceptor(responder))
 	 *         .connectTcp("localhost", server.address().getPort());
 	 * </pre>
 	 *
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
index 92064f2a4cb6..b96d9df89b6b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
@@ -46,7 +46,7 @@
  * &lt;bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"&gt;
  *   ...
  *   &lt;property name="jpaPropertyMap"&gt;
- * 	   &lt;map>
+ * 	   &lt;map&gt;
  *       &lt;entry key="hibernate.resource.beans.container"&gt;
  * 	       &lt;bean class="org.springframework.orm.hibernate5.SpringBeanContainer"/&gt;
  * 	     &lt;/entry&gt;
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java
index 324e419ce000..7b0c7ddd590d 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java
@@ -44,9 +44,9 @@
  * ConnectionFactory factory = …
  *
  * DatabaseClient client = DatabaseClient.create(factory);
- * Mono&gtActor;lt actor = client.sql("select first_name, last_name from t_actor")
- *     .map(row -> new Actor(row.get("first_name, String.class"),
- *     row.get("last_name, String.class")))
+ * Mono&lt;Actor&gt; actor = client.sql("select first_name, last_name from t_actor")
+ *     .map(row -&gt; new Actor(row.get("first_name, String.class"),
+ *          row.get("last_name, String.class")))
  *     .first();
  * </pre>
  *
@@ -190,7 +190,7 @@ interface GenericExecuteSpec {
 		 * before it is executed. For example:
 		 * <pre class="code">
 		 * DatabaseClient client = …;
-		 * client.sql("SELECT book_id FROM book").filter(statement -> statement.fetchSize(100))
+		 * client.sql("SELECT book_id FROM book").filter(statement -&gt; statement.fetchSize(100))
 		 * </pre>
 		 * @param filterFunction the filter to be added to the chain
 		 */
@@ -205,7 +205,7 @@ default GenericExecuteSpec filter(Function<? super Statement, ? extends Statemen
 		 * before it is executed. For example:
 		 * <pre class="code">
 		 * DatabaseClient client = …;
-		 * client.sql("SELECT book_id FROM book").filter((statement, next) -> next.execute(statement.fetchSize(100)))
+		 * client.sql("SELECT book_id FROM book").filter((statement, next) -&gt; next.execute(statement.fetchSize(100)))
 		 * </pre>
 		 * @param filter the filter to be added to the chain
 		 */
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java
index c60888f6ebff..a0bfb22d8a2d 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java
@@ -36,7 +36,7 @@
  * For example:
  * <p><pre class="code">
  * DatabaseClient.builder()
- *		.executeFunction(statement -> statement.execute())
+ *		.executeFunction(statement -&gt; statement.execute())
  * 		.build();
  * </pre>
  *
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
index 10e1f39b3a55..bd57ec72fcd0 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
@@ -256,7 +256,7 @@ public RequestExpectation findExpectation(ClientHttpRequest request) throws IOEx
 		/**
 		 * Invoke this for an expectation that has been matched.
 		 * <p>The count of the given expectation is incremented, then it is
-		 * either stored if remainingCount > 0 or removed otherwise.
+		 * either stored if remainingCount &gt; 0 or removed otherwise.
 		 */
 		public void update(RequestExpectation expectation) {
 			expectation.incrementAndValidate();
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java
index a8d48e9e9d14..f15528a10246 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java
@@ -80,7 +80,7 @@ public Flux<T> getResponseBody() {
 	 * 		.exchange()
 	 * 		.expectStatus().isOk()
 	 *	 	.returnResult()
-	 *	 	.consumeWith(result -> assertThat(...);
+	 *	 	.consumeWith(result -&gt; assertThat(...);
 	 * </pre>
 	 * @param consumer the consumer for {@code "this"} instance
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 878a901c2267..141428f171ab 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -448,15 +448,15 @@ interface Builder {
 		 * <pre>
 		 * client.get().uri("/accounts/1")
 		 *         .exchange()
-		 *         .expectBody(Person.class).consumeWith(exchangeResult -> ... ));
+		 *         .expectBody(Person.class).consumeWith(exchangeResult -&gt; ... ));
 		 *
 		 * client.get().uri("/accounts")
 		 *         .exchange()
-		 *         .expectBodyList(Person.class).consumeWith(exchangeResult -> ... ));
+		 *         .expectBodyList(Person.class).consumeWith(exchangeResult -&gt; ... ));
 		 *
 		 * client.get().uri("/accounts/1")
 		 *         .exchange()
-		 *         .expectBody().consumeWith(exchangeResult -> ... ));
+		 *         .expectBody().consumeWith(exchangeResult -&gt; ... ));
 		 * </pre>
 		 * <p>Note that the configured consumer does not apply to responses
 		 * decoded to {@code Flux<T>} which can be consumed outside the workflow
@@ -802,8 +802,8 @@ interface ResponseSpec {
 		 * <pre class="code">
 		 * webTestClient.get().uri("/hello").exchange()
 		 *     .expectAll(
-		 *         responseSpec -> responseSpec.expectStatus().isOk(),
-		 *         responseSpec -> responseSpec.expectBody(String.class).isEqualTo("Hello, World!")
+		 *         responseSpec -&gt; responseSpec.expectStatus().isOk(),
+		 *         responseSpec -&gt; responseSpec.expectBody(String.class).isEqualTo("Hello, World!")
 		 *     );
 		 * </pre>
 		 * @param consumers the list of {@code ResponseSpec} consumers
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
index 2f80f0cefe57..2e6f56756448 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
@@ -43,7 +43,7 @@
  * <pre class="code">
  * &lt;bean id="myTargetConnectionFactory" class="org.springframework.jndi.JndiObjectFactoryBean"&gt;
  *   &lt;property name="jndiName" value="java:comp/env/cci/mycf"/&gt;
- * &lt;/bean>
+ * &lt;/bean&gt;
  *
  * &lt;bean id="myConnectionFactory" class="org.springframework.jca.cci.connection.ConnectionSpecConnectionFactoryAdapter"&gt;
  *   &lt;property name="targetConnectionFactory" ref="myTargetConnectionFactory"/&gt;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
index 56e5cef3d819..774107b46ff1 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
@@ -79,7 +79,7 @@
  * deriving concrete child bean definitions for specific target objects.
  * This reduces the per-bean definition effort to a minimum.
  *
- * <pre code="class">
+ * <pre class="code">
  * &lt;bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
  *     abstract="true"&gt;
  *   &lt;property name="transactionManager" ref="transactionManager"/&gt;
diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
index 32c718814b2c..1d5254e336a8 100644
--- a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
+++ b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
@@ -576,14 +576,13 @@ public interface Builder {
 		Builder filename(String filename);
 
 		/**
-		 * Set the value of the {@literal filename*} that will be encoded as
-		 * defined in the RFC 5987. Only the US-ASCII, UTF-8 and ISO-8859-1
+		 * Set the value of the {@code filename} that will be encoded as
+		 * defined in RFC 5987. Only the US-ASCII, UTF-8, and ISO-8859-1
 		 * charsets are supported.
 		 * <p><strong>Note:</strong> Do not use this for a
-		 * {@code "multipart/form-data"} requests as per
-		 * <a link="https://tools.ietf.org/html/rfc7578#section-4.2">RFC 7578, Section 4.2</a>
-		 * and also RFC 5987 itself mentions it does not apply to multipart
-		 * requests.
+		 * {@code "multipart/form-data"} request since
+		 * <a href="https://tools.ietf.org/html/rfc7578#section-4.2">RFC 7578, Section 4.2</a>
+		 * and also RFC 5987 mention it does not apply to multipart requests.
 		 */
 		Builder filename(String filename, Charset charset);
 
diff --git a/spring-web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
index f6a9911d1ab5..486b524df91b 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -285,21 +285,21 @@ public enum HttpStatus {
 	I_AM_A_TEAPOT(418, Series.CLIENT_ERROR, "I'm a teapot"),
 	/**
 	 * @deprecated See
-	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff{@literal &}url2=draft-ietf-webdav-protocol-06.txt">
+	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff&amp;url2=draft-ietf-webdav-protocol-06.txt">
 	 *     WebDAV Draft Changes</a>
 	 */
 	@Deprecated
 	INSUFFICIENT_SPACE_ON_RESOURCE(419, Series.CLIENT_ERROR, "Insufficient Space On Resource"),
 	/**
 	 * @deprecated See
-	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff{@literal &}url2=draft-ietf-webdav-protocol-06.txt">
+	 * <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff&amp;url2=draft-ietf-webdav-protocol-06.txt">
 	 *     WebDAV Draft Changes</a>
 	 */
 	@Deprecated
 	METHOD_FAILURE(420, Series.CLIENT_ERROR, "Method Failure"),
 	/**
 	 * @deprecated
-	 * See <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff{@literal &}url2=draft-ietf-webdav-protocol-06.txt">
+	 * See <a href="https://tools.ietf.org/rfcdiff?difftype=--hwdiff&amp;url2=draft-ietf-webdav-protocol-06.txt">
 	 *     WebDAV Draft Changes</a>
 	 */
 	@Deprecated
diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
index 966869878643..82e6f7be71c3 100644
--- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
@@ -42,15 +42,15 @@ public interface ClientHttpRequestInterceptor {
 	 * request and response to the next entity in the chain.
 	 * <p>A typical implementation of this method would follow the following pattern:
 	 * <ol>
-	 * <li>Examine the {@linkplain HttpRequest request} and body</li>
+	 * <li>Examine the {@linkplain HttpRequest request} and body.</li>
 	 * <li>Optionally {@linkplain org.springframework.http.client.support.HttpRequestWrapper
 	 * wrap} the request to filter HTTP attributes.</li>
 	 * <li>Optionally modify the body of the request.</li>
-	 * <li><strong>Either</strong>
 	 * <ul>
+	 * <li><strong>Either</strong>
 	 * <li>execute the request using
 	 * {@link ClientHttpRequestExecution#execute(org.springframework.http.HttpRequest, byte[])},</li>
-	 * <strong>or</strong>
+	 * <li><strong>or</strong></li>
 	 * <li>do not execute the request to block the execution altogether.</li>
 	 * </ul>
 	 * <li>Optionally wrap the response to filter HTTP attributes.</li>
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
index dac546303944..ccd692808702 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
@@ -55,7 +55,7 @@
  * <p>Given the following XML:
  *
  * <pre class="code">
- * &lt;root>
+ * &lt;root&gt;
  *     &lt;child&gt;foo&lt;/child&gt;
  *     &lt;child&gt;bar&lt;/child&gt;
  * &lt;/root&gt;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
index d35f7f4d26d4..6f6ac69bd450 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
@@ -38,11 +38,11 @@
  * <p>A usage example:
  *
  * <pre class="code">
- * &lt;bean class="org.springframework.http.converter.ObjectToStringHttpMessageConverter">
- *   &lt;constructor-arg>
- *     &lt;bean class="org.springframework.context.support.ConversionServiceFactoryBean"/>
- *   &lt;/constructor-arg>
- * &lt;/bean>
+ * &lt;bean class="org.springframework.http.converter.ObjectToStringHttpMessageConverter"&gt;
+ *   &lt;constructor-arg&gt;
+ *     &lt;bean class="org.springframework.context.support.ConversionServiceFactoryBean"/&gt;
+ *   &lt;/constructor-arg&gt;
+ * &lt;/bean&gt;
  * </pre>
  *
  * @author <a href="mailto:dmitry.katsubo@gmail.com">Dmitry Katsubo</a>
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
index 88a074752a4e..ae0a5fdb0bda 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
@@ -25,7 +25,7 @@
  * that can read and write Atom feeds. Specifically, this converter can handle {@link Feed}
  * objects from the <a href="https://github.com/rometools/rome">ROME</a> project.
  *
- * <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * <p><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.</b>
  *
  * <p>By default, this converter reads and writes the media type ({@code application/atom+xml}).
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
index 0ecf87a703ea..28a5f19e7881 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
@@ -25,7 +25,7 @@
  * that can read and write RSS feeds. Specifically, this converter can handle {@link Channel}
  * objects from the <a href="https://github.com/rometools/rome">ROME</a> project.
  *
- * <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * <p><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.</b>
  *
  * <p>By default, this converter reads and writes the media type ({@code application/rss+xml}).
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
index 54382b30d6e7..8b5ff40dc2c6 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
@@ -135,7 +135,7 @@ public void setShutdownDelay(int shutdownDelay) {
 	 * Set the base path for context publication. Default is "/".
 	 * <p>For each context publication path, the service name will be
 	 * appended to this base address. E.g. service name "OrderService"
-	 * -> "/OrderService".
+	 * &rarr; "/OrderService".
 	 * @see javax.xml.ws.Endpoint#publish(Object)
 	 * @see javax.jws.WebService#serviceName()
 	 */
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
index 06786578f9c0..33441765a8a2 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
@@ -52,7 +52,7 @@ public class SimpleJaxWsServiceExporter extends AbstractJaxWsServiceExporter {
 	 * Default is "http://localhost:8080/".
 	 * <p>For each actual publication address, the service name will be
 	 * appended to this base address. E.g. service name "OrderService"
-	 * -> "http://localhost:8080/OrderService".
+	 * &rarr; "http://localhost:8080/OrderService".
 	 * @see javax.xml.ws.Endpoint#publish(String)
 	 * @see javax.jws.WebService#serviceName()
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index da3cd91c3d8c..c5ab1e70d114 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -61,8 +61,8 @@
  *
  * <pre class="code">
  * &lt;absolute-ordering&gt;
- *   &lt;name>some_web_fragment&lt;/name&gt;
- *   &lt;name>spring_web&lt;/name&gt;
+ *   &lt;name&gt;some_web_fragment&lt;/name&gt;
+ *   &lt;name&gt;spring_web&lt;/name&gt;
  * &lt;/absolute-ordering&gt;
  * </pre>
  *
diff --git a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
index 337f53291e7a..955fc624b984 100644
--- a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
@@ -36,15 +36,15 @@
  * follows:
  * <pre class="code">
  * &lt;servlet&gt;
- *   &lt;servlet-name>dispatcher&lt;/servlet-name&gt;
+ *   &lt;servlet-name&gt;dispatcher&lt;/servlet-name&gt;
  *   &lt;servlet-class&gt;
  *     org.springframework.web.servlet.DispatcherServlet
  *   &lt;/servlet-class&gt;
- *   &lt;init-param>
- *     &lt;param-name>contextConfigLocation&lt;/param-name&gt;
- *     &lt;param-value>/WEB-INF/spring/dispatcher-config.xml&lt;/param-value&gt;
+ *   &lt;init-param&gt;
+ *     &lt;param-name&gt;contextConfigLocation&lt;/param-name&gt;
+ *     &lt;param-value&gt;/WEB-INF/spring/dispatcher-config.xml&lt;/param-value&gt;
  *   &lt;/init-param&gt;
- *   &lt;load-on-startup>1&lt;/load-on-startup&gt;
+ *   &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
  * &lt;/servlet&gt;
  *
  * &lt;servlet-mapping&gt;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
index 922174d830d0..ab16c0baa5c6 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
@@ -36,33 +36,33 @@
  * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * <pre class="code">
- * &lt;application>
+ * &lt;application&gt;
  *   ...
- *   &lt;el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver&lt;/el-resolver>
- * &lt;/application></pre>
+ *   &lt;el-resolver&gt;org.springframework.web.jsf.el.SpringBeanFacesELResolver&lt;/el-resolver&gt;
+ * &lt;/application&gt;</pre>
  *
  * All your JSF expressions can then implicitly refer to the names of
  * Spring-managed service layer beans, for example in property values of
  * JSF-managed beans:
  *
  * <pre class="code">
- * &lt;managed-bean>
- *   &lt;managed-bean-name>myJsfManagedBean&lt;/managed-bean-name>
- *   &lt;managed-bean-class>example.MyJsfManagedBean&lt;/managed-bean-class>
- *   &lt;managed-bean-scope>session&lt;/managed-bean-scope>
- *   &lt;managed-property>
- *     &lt;property-name>mySpringManagedBusinessObject&lt;/property-name>
- *     &lt;value>#{mySpringManagedBusinessObject}&lt;/value>
- *   &lt;/managed-property>
- * &lt;/managed-bean></pre>
+ * &lt;managed-bean&gt;
+ *   &lt;managed-bean-name&gt;myJsfManagedBean&lt;/managed-bean-name&gt;
+ *   &lt;managed-bean-class&gt;example.MyJsfManagedBean&lt;/managed-bean-class&gt;
+ *   &lt;managed-bean-scope&gt;session&lt;/managed-bean-scope&gt;
+ *   &lt;managed-property&gt;
+ *     &lt;property-name&gt;mySpringManagedBusinessObject&lt;/property-name&gt;
+ *     &lt;value&gt;#{mySpringManagedBusinessObject}&lt;/value&gt;
+ *   &lt;/managed-property&gt;
+ * &lt;/managed-bean&gt;</pre>
  *
  * with "mySpringManagedBusinessObject" defined as Spring bean in
  * applicationContext.xml:
  *
  * <pre class="code">
- * &lt;bean id="mySpringManagedBusinessObject" class="example.MySpringManagedBusinessObject">
+ * &lt;bean id="mySpringManagedBusinessObject" class="example.MySpringManagedBusinessObject"&gt;
  *   ...
- * &lt;/bean></pre>
+ * &lt;/bean&gt;</pre>
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
index d729187464d3..fd8d4a132bc2 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
@@ -45,10 +45,10 @@
  * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * <pre class="code">
- * &lt;application>
+ * &lt;application&gt;
  *   ...
- *   &lt;el-resolver>org.springframework.web.jsf.el.WebApplicationContextFacesELResolver&lt;/el-resolver>
- * &lt;/application></pre>
+ *   &lt;el-resolver&gt;org.springframework.web.jsf.el.WebApplicationContextFacesELResolver&lt;/el-resolver&gt;
+ * &lt;/application&gt;</pre>
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java b/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java
index d8cef567578e..0062325b64e8 100644
--- a/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java
+++ b/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java
@@ -248,7 +248,7 @@ interface Builder {
 		 * Configure a consumer to modify the current request using a builder.
 		 * <p>Effectively this:
 		 * <pre>
-		 * exchange.mutate().request(builder-> builder.method(HttpMethod.PUT));
+		 * exchange.mutate().request(builder -&gt; builder.method(HttpMethod.PUT));
 		 *
 		 * // vs...
 		 *
diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 663dbb7566c4..e38fdff9b53c 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -290,11 +290,11 @@ public String getPathWithinServletMapping(HttpServletRequest request) {
 	 * i.e. the part of the request's URL beyond the part that called the servlet,
 	 * or "" if the whole URL has been used to identify the servlet.
 	 * <p>Detects include request URL if called within a RequestDispatcher include.
-	 * <p>E.g.: servlet mapping = "/*"; request URI = "/test/a" -> "/test/a".
-	 * <p>E.g.: servlet mapping = "/"; request URI = "/test/a" -> "/test/a".
-	 * <p>E.g.: servlet mapping = "/test/*"; request URI = "/test/a" -> "/a".
-	 * <p>E.g.: servlet mapping = "/test"; request URI = "/test" -> "".
-	 * <p>E.g.: servlet mapping = "/*.test"; request URI = "/a.test" -> "".
+	 * <p>E.g.: servlet mapping = "/*"; request URI = "/test/a" &rarr; "/test/a".
+	 * <p>E.g.: servlet mapping = "/"; request URI = "/test/a" &rarr; "/test/a".
+	 * <p>E.g.: servlet mapping = "/test/*"; request URI = "/test/a" &rarr; "/a".
+	 * <p>E.g.: servlet mapping = "/test"; request URI = "/test" &rarr; "".
+	 * <p>E.g.: servlet mapping = "/*.test"; request URI = "/a.test" &rarr; "".
 	 * @param request current HTTP request
 	 * @param pathWithinApp a precomputed path within the application
 	 * @return the path within the servlet mapping, or ""
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
index fddb3389c56a..c5325284a64d 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
@@ -32,7 +32,7 @@
  *
  * Mono&lt;String&gt; bodyMono = exchangeFunction
  *     .exchange(request)
- *     .flatMap(response -> response.bodyToMono(String.class));
+ *     .flatMap(response -&gt; response.bodyToMono(String.class));
  * </pre>
  *
  * @author Arjen Poutsma
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index 801609d68fbd..4d929888bde8 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -522,7 +522,7 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 * Mono&lt;Object&gt; entityMono = client.get()
 		 *     .uri("/persons/1")
 		 *     .accept(MediaType.APPLICATION_JSON)
-		 *     .exchangeToMono(response -> {
+		 *     .exchangeToMono(response -&gt; {
 		 *         if (response.statusCode().equals(HttpStatus.OK)) {
 		 *             return response.bodyToMono(Person.class);
 		 *         }
@@ -554,7 +554,7 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 * Mono&lt;Object&gt; entityMono = client.get()
 		 *     .uri("/persons")
 		 *     .accept(MediaType.APPLICATION_JSON)
-		 *     .exchangeToFlux(response -> {
+		 *     .exchangeToFlux(response -&gt; {
 		 *         if (response.statusCode().equals(HttpStatus.OK)) {
 		 *             return response.bodyToFlux(Person.class);
 		 *         }
@@ -751,7 +751,7 @@ interface ResponseSpec {
 		 * Provide a function to map specific error status codes to an error
 		 * signal to be propagated downstream instead of the response.
 		 * <p>By default, if there are no matching status handlers, responses
-		 * with status codes >= 400 are mapped to
+		 * with status codes &gt;= 400 are mapped to
 		 * {@link WebClientResponseException} which is created with
 		 * {@link ClientResponse#createException()}.
 		 * <p>To suppress the treatment of a status code as an error and process
@@ -766,7 +766,7 @@ interface ResponseSpec {
 		 *     .retrieve()
 		 *     .bodyToMono(Account.class)
 		 *     .onErrorResume(WebClientResponseException.class,
-		 *          ex -> ex.getRawStatusCode() == 404 ? Mono.empty() : Mono.error(ex));
+		 *          ex -&gt; ex.getRawStatusCode() == 404 ? Mono.empty() : Mono.error(ex));
 		 * </pre>
 		 * @param statusPredicate to match responses with
 		 * @param exceptionFunction to map the response to an error signal
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
index 64d1e3ed9b61..30157153d4ae 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
@@ -670,7 +670,7 @@ public interface Builder {
 		 * <pre class="code">
 		 * RouterFunction&lt;ServerResponse&gt; nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), () ->
+		 *     .nest(RequestPredicates.path("/user"), () -&gt;
 		 *       RouterFunctions.route()
 		 *         .GET(this::listUsers)
 		 *         .POST(this::createUser)
@@ -695,7 +695,7 @@ public interface Builder {
 		 * <pre class="code">
 		 * RouterFunction&lt;ServerResponse&gt; nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), builder ->
+		 *     .nest(RequestPredicates.path("/user"), builder -&gt;
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -740,7 +740,7 @@ public interface Builder {
 		 * <pre class="code">
 		 * RouterFunction&lt;ServerResponse&gt; nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .path("/user", builder ->
+		 *     .path("/user", builder -&gt;
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -762,7 +762,7 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .filter((request, next) -> {
+		 *     .filter((request, next) -&gt; {
 		 *       // check for authentication headers
 		 *       if (isAuthenticated(request)) {
 		 *         return next.handle(request);
@@ -788,7 +788,7 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .before(request -> {
+		 *     .before(request -&gt; {
 		 *       log(request);
 		 *       return request;
 		 *     })
@@ -809,7 +809,7 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .after((request, response) -> {
+		 *     .after((request, response) -&gt; {
 		 *       log(response);
 		 *       return response;
 		 *     })
@@ -829,8 +829,8 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .onError(e -> e instanceof IllegalStateException,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *     .onError(e -&gt; e instanceof IllegalStateException,
+		 *       (e, request) -&gt; ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * </pre>
 		 * @param predicate the type of exception to filter
@@ -850,7 +850,7 @@ Builder onError(Predicate<? super Throwable> predicate,
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
 		 *     .onError(IllegalStateException.class,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *       (e, request) -&gt; ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * </pre>
 		 * @param exceptionType the type of exception to filter
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
index 5376269f2417..5b44e5a45647 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
@@ -310,7 +310,7 @@ default String pathVariable(String name) {
 	 * public Mono&lt;ServerResponse&gt; myHandleMethod(ServerRequest request) {
 	 *   Instant lastModified = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified)
-	 *	   .switchIfEmpty(Mono.defer(() -> {
+	 *	   .switchIfEmpty(Mono.defer(() -&gt; {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   }));
@@ -344,7 +344,7 @@ default Mono<ServerResponse> checkNotModified(Instant lastModified) {
 	 * public Mono&lt;ServerResponse&gt; myHandleMethod(ServerRequest request) {
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(eTag)
-	 *	   .switchIfEmpty(Mono.defer(() -> {
+	 *	   .switchIfEmpty(Mono.defer(() -&gt; {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   }));
@@ -381,7 +381,7 @@ default Mono<ServerResponse> checkNotModified(String etag) {
 	 *   Instant lastModified = // application-specific calculation
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified, eTag)
-	 *	   .switchIfEmpty(Mono.defer(() -> {
+	 *	   .switchIfEmpty(Mono.defer(() -&gt; {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   }));
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
index 0a31cb5aaf39..fd46f78331fa 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
@@ -45,7 +45,7 @@
  * specified prefix and/or suffix. Exporting an attribute that holds the
  * RequestContext to all views is explicitly supported.
  *
- * <p>Example: prefix="templates/", suffix=".ftl", viewname="test" ->
+ * <p>Example: prefix="templates/", suffix=".ftl", viewname="test" &rarr;
  * "templates/test.ftl"
  *
  * <p>As a special feature, redirect URLs can be specified via the "redirect:"
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
index 616931ebda3d..0703dae330d4 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
@@ -45,13 +45,13 @@
  * 	public Mono&lt;Void&gt; handle(WebSocketSession session) {
  *
  * 		Flux&lt;WebSocketMessage&gt; output = session.receive()
- *			.doOnNext(message -> {
+ *			.doOnNext(message -&gt; {
  * 				// ...
  * 			})
- * 			.concatMap(message -> {
+ * 			.concatMap(message -&gt; {
  * 				// ...
  * 			})
- * 			.map(value -> session.textMessage("Echo " + value));
+ * 			.map(value -&gt; session.textMessage("Echo " + value));
  *
  * 		return session.send(output);
  * 	}
@@ -68,10 +68,10 @@
  * 	public Mono&lt;Void&gt; handle(WebSocketSession session) {
  *
  * 		Mono&lt;Void&gt; input = session.receive()
- *			.doOnNext(message -> {
+ *			.doOnNext(message -&gt; {
  * 				// ...
  * 			})
- * 			.concatMap(message -> {
+ * 			.concatMap(message -&gt; {
  * 				// ...
  * 			})
  * 			.then();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 5be28f3e13e0..869b4c6979c5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -1268,7 +1268,7 @@ protected HandlerExecutionChain getHandler(HttpServletRequest request) throws Ex
 	}
 
 	/**
-	 * No handler found -> set appropriate HTTP response status.
+	 * No handler found &rarr; set appropriate HTTP response status.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @throws Exception if preparing the response failed
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
index 9dbb3af4aafb..b10775cf81c7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
@@ -303,7 +303,7 @@ public ModelAndView addObject(Object attributeValue) {
 
 	/**
 	 * Add all attributes contained in the provided Map to the model.
-	 * @param modelMap a Map of attributeName -> attributeValue pairs
+	 * @param modelMap a Map of attributeName &rarr; attributeValue pairs
 	 * @see ModelMap#addAllAttributes(Map)
 	 * @see #getModelMap()
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
index 745bce13ae41..95a59373f4b4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
@@ -582,7 +582,7 @@ public interface Builder {
 		 * <pre class="code">
 		 * RouterFunction&lt;ServerResponse&gt; nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), () ->
+		 *     .nest(RequestPredicates.path("/user"), () -&gt;
 		 *       RouterFunctions.route()
 		 *         .GET(this::listUsers)
 		 *         .POST(this::createUser)
@@ -607,7 +607,7 @@ public interface Builder {
 		 * <pre class="code">
 		 * RouterFunction&lt;ServerResponse&gt; nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), builder ->
+		 *     .nest(RequestPredicates.path("/user"), builder -&gt;
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -652,7 +652,7 @@ public interface Builder {
 		 * <pre class="code">
 		 * RouterFunction&lt;ServerResponse&gt; nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .path("/user", builder ->
+		 *     .path("/user", builder -&gt;
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -674,7 +674,7 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .filter((request, next) -> {
+		 *     .filter((request, next) -&gt; {
 		 *       // check for authentication headers
 		 *       if (isAuthenticated(request)) {
 		 *         return next.handle(request);
@@ -700,7 +700,7 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .before(request -> {
+		 *     .before(request -&gt; {
 		 *       log(request);
 		 *       return request;
 		 *     })
@@ -721,7 +721,7 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .after((request, response) -> {
+		 *     .after((request, response) -&gt; {
 		 *       log(response);
 		 *       return response;
 		 *     })
@@ -741,8 +741,8 @@ public interface Builder {
 		 * RouterFunction&lt;ServerResponse&gt; filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .onError(e -> e instanceof IllegalStateException,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *     .onError(e -&gt; e instanceof IllegalStateException,
+		 *       (e, request) -&gt; ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * </pre>
 		 * @param predicate the type of exception to filter
@@ -762,7 +762,7 @@ Builder onError(Predicate<Throwable> predicate,
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
 		 *     .onError(IllegalStateException.class,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *       (e, request) -&gt; ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * </pre>
 		 * @param exceptionType the type of exception to filter
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
index d8f2f2d013c1..ce50a2466b93 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
@@ -259,7 +259,7 @@ default String pathVariable(String name) {
 	 * public ServerResponse myHandleMethod(ServerRequest request) {
 	 *   Instant lastModified = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified)
-	 *	   .orElseGet(() -> {
+	 *	   .orElseGet(() -&gt; {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   });
@@ -293,7 +293,7 @@ default Optional<ServerResponse> checkNotModified(Instant lastModified) {
 	 * public ServerResponse myHandleMethod(ServerRequest request) {
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(eTag)
-	 *	   .orElseGet(() -> {
+	 *	   .orElseGet(() -&gt; {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   });
@@ -330,7 +330,7 @@ default Optional<ServerResponse> checkNotModified(String etag) {
 	 *   Instant lastModified = // application-specific calculation
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified, eTag)
-	 *	   .orElseGet(() -> {
+	 *	   .orElseGet(() -&gt; {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   });
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
index 2c1479ca70f3..0923087483bb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
@@ -267,14 +267,14 @@ static ServerResponse async(Object asyncResponse, Duration timeout) {
 	 * <p>For example:
 	 * <pre class="code">
 	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse.send("Hello World!"));
+	 *     return ServerResponse.sse(sse -&gt; sse.send("Hello World!"));
 	 * }
 	 * </pre>
 	 *
 	 * <p>or, to set both the id and event type:
 	 * <pre class="code">
 	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse
+	 *     return ServerResponse.sse(sse -&gt; sse
 	 *         .id("42)
 	 *         .event("event")
 	 *         .send("Hello World!"));
@@ -296,14 +296,14 @@ static ServerResponse sse(Consumer<SseBuilder> consumer) {
 	 * <p>For example:
 	 * <pre class="code">
 	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse.send("Hello World!"));
+	 *     return ServerResponse.sse(sse -&gt; sse.send("Hello World!"));
 	 * }
 	 * </pre>
 	 *
 	 * <p>or, to set both the id and event type:
 	 * <pre class="code">
 	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse
+	 *     return ServerResponse.sse(sse -&gt; sse
 	 *         .id("42)
 	 *         .event("event")
 	 *         .send("Hello World!"));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index 542f0ae8f87d..acb57f665210 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -61,7 +61,6 @@
  * <p>This exception resolver is enabled by default in the common Spring
  * {@link org.springframework.web.servlet.DispatcherServlet}.
  *
- * <p>
  * <table>
  * <caption>Supported Exceptions</caption>
  * <thead>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
index e6bb3a73a592..2dd0aa5180d3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
@@ -244,7 +244,7 @@ public final CacheControl getCacheControl() {
 	 * <ul>
 	 * <li>seconds == -1 (default value): no generation cache-related headers</li>
 	 * <li>seconds == 0: "Cache-Control: no-store" will prevent caching</li>
-	 * <li>seconds > 0: "Cache-Control: max-age=seconds" will ask to cache content</li>
+	 * <li>seconds &gt; 0: "Cache-Control: max-age=seconds" will ask to cache content</li>
 	 * </ul>
 	 * <p>For more specific needs, a custom {@link org.springframework.http.CacheControl}
 	 * should be used.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
index 6deab1ca3b48..192aa5681237 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
@@ -51,7 +51,7 @@
  * &lt;/bean&gt;</pre>
  *
  * Every view name returned from a handler will be translated to a JSP
- * resource (for example: "myView" -> "/WEB-INF/jsp/myView.jsp"), using
+ * resource (for example: "myView" &rarr; "/WEB-INF/jsp/myView.jsp"), using
  * this view class by default.
  *
  * @author Rod Johnson
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
index c11eb4e6c94d..8b36835d254e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
@@ -47,7 +47,7 @@
  * &lt;/bean&gt;</pre>
  *
  * Every view name returned from a handler will be translated to a JSP
- * resource (for example: "myView" -> "/WEB-INF/jsp/myView.jsp"), using
+ * resource (for example: "myView" &rarr; "/WEB-INF/jsp/myView.jsp"), using
  * this view class to enable explicit JSTL support.
  *
  * <p>The specified MessageSource loads messages from "messages.properties" etc
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
index d25f426d9e4e..323f1ec93b15 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
@@ -49,7 +49,7 @@
  * specified prefix and/or suffix. Exporting an attribute that holds the
  * RequestContext to all views is explicitly supported.
  *
- * <p>Example: prefix="/WEB-INF/jsp/", suffix=".jsp", viewname="test" ->
+ * <p>Example: prefix="/WEB-INF/jsp/", suffix=".jsp", viewname="test" &rarr;
  * "/WEB-INF/jsp/test.jsp"
  *
  * <p>As a special feature, redirect URLs can be specified via the "redirect:"
@@ -342,14 +342,16 @@ public Map<String, Object> getAttributesMap() {
 	}
 
 	/**
-	 * Specify whether views resolved by this resolver should add path variables to the model or not.
-	 * <p>>The default setting is to let each View decide (see {@link AbstractView#setExposePathVariables}.
-	 * However, you can use this property to override that.
+	 * Specify whether views resolved by this resolver should add path
+	 * variables to the model or not.
+	 * <p>The default setting is to let each View decide
+	 * (see {@link AbstractView#setExposePathVariables}). However, you
+	 * can use this property to override that.
 	 * @param exposePathVariables
 	 * <ul>
 	 * <li>{@code true} - all Views resolved by this resolver will expose path variables
 	 * <li>{@code false} - no Views resolved by this resolver will expose path variables
-	 * <li>{@code null} - individual Views can decide for themselves (this is used by the default)
+	 * <li>{@code null} - individual Views can decide for themselves (this is used by default)
 	 * </ul>
 	 * @see AbstractView#setExposePathVariables
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
index 58e0893cd272..1e17ce42aaad 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
@@ -29,7 +29,7 @@
  * Abstract superclass for Atom Feed views, using the
  * <a href="https://github.com/rometools/rome">ROME</a> package.
  *
- * <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * <p><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.</b>
  *
  * <p>Application-specific view classes will extend this class.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
index 6ea756645817..0e34fe189d81 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
@@ -33,7 +33,7 @@
  * Abstract base class for Atom and RSS Feed views, using the
  * <a href="https://github.com/rometools/rome">ROME</a> package.
  *
- * <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * <p><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.</b>
  *
  * <p>Application-specific view classes will typically extend from either
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
index aef278f791ba..769fbd37ad85 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
@@ -31,7 +31,7 @@
  * Abstract superclass for RSS Feed views, using the
  * <a href="https://github.com/rometools/rome">ROME</a> package.
  *
- * <p>><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * <p><b>NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.</b>
  *
  * <p>Application-specific view classes will extend this class.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
index 0eb2e30f3bc7..577b1025d05b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
@@ -42,7 +42,7 @@
  *
  * <pre class="code">
  * &lt;bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer"&gt;
- *   &lt;property name="templateLoaderPath"&gt;&lt;value&gt;/WEB-INF/freemarker/&lt;/value>&lt;/property&gt;
+ *   &lt;property name="templateLoaderPath"&gt;&lt;value&gt;/WEB-INF/freemarker/&lt;/value&gt;&lt;/property&gt;
  * &lt;/bean&gt;</pre>
  *
  * This bean must be included in the application context of any application
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
index dbbdf0f22e91..8567055fc020 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
@@ -88,17 +88,17 @@
  * <p>A typical TilesConfigurer bean definition looks as follows:
  *
  * <pre class="code">
- * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
- *   &lt;property name="definitions">
- *     &lt;list>
- *       &lt;value>/WEB-INF/defs/general.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/widgets.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/administrator.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/customer.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/templates.xml&lt;/value>
- *     &lt;/list>
- *   &lt;/property>
- * &lt;/bean>
+ * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer"&gt;
+ *   &lt;property name="definitions"&gt;
+ *     &lt;list&gt;
+ *       &lt;value&gt;/WEB-INF/defs/general.xml&lt;/value&gt;
+ *       &lt;value&gt;/WEB-INF/defs/widgets.xml&lt;/value&gt;
+ *       &lt;value&gt;/WEB-INF/defs/administrator.xml&lt;/value&gt;
+ *       &lt;value&gt;/WEB-INF/defs/customer.xml&lt;/value&gt;
+ *       &lt;value&gt;/WEB-INF/defs/templates.xml&lt;/value&gt;
+ *     &lt;/list&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;
  * </pre>
  *
  * The values in the list are the actual Tiles XML files containing the definitions.
@@ -108,14 +108,14 @@
  * definitions is used to indicate locale information, for example:
  *
  * <pre class="code">
- * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
- *   &lt;property name="definitions">
- *     &lt;list>
- *       &lt;value>/WEB-INF/defs/tiles.xml&lt;/value>
- *       &lt;value>/WEB-INF/defs/tiles_fr_FR.xml&lt;/value>
- *     &lt;/list>
- *   &lt;/property>
- * &lt;/bean>
+ * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer"&gt;
+ *   &lt;property name="definitions"&gt;
+ *     &lt;list&gt;
+ *       &lt;value&gt;/WEB-INF/defs/tiles.xml&lt;/value&gt;
+ *       &lt;value&gt;/WEB-INF/defs/tiles_fr_FR.xml&lt;/value&gt;
+ *     &lt;/list&gt;
+ *   &lt;/property&gt;
+ * &lt;/bean&gt;
  * </pre>
  *
  * @author mick semb wever

From 3e53e54b80ead7fb22c05852987b11bbf4cd8bc2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 29 Sep 2021 17:17:13 +0200
Subject: [PATCH 170/735] Remove external Javadoc links to Tiles and Ehcache

Support code for Apache Tiles and Ehcache has already been removed from
Spring Framework 6.0.

This commit therefore removes the configuration for external links to
these projects.
---
 build.gradle | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index d005cc2588a5..6a9eb152bada 100644
--- a/build.gradle
+++ b/build.gradle
@@ -336,10 +336,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
-			"https://tiles.apache.org/tiles-request/apidocs/",
-			"https://tiles.apache.org/framework/apidocs/",
 			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
-			"https://www.ehcache.org/apidocs/2.10.4/",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
 			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
 			"https://fasterxml.github.io/jackson-databind/javadoc/2.10/",

From 167e538dd13535c4b7a7cff171cd7a0ae22c9b81 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 29 Sep 2021 17:19:19 +0200
Subject: [PATCH 171/735] Link to Jakarta EE APIs instead of Java EE APIs

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6a9eb152bada..4328886a06f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -331,7 +331,7 @@ configure([rootProject] + javaProjects) { project ->
 
 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
-			"https://javaee.github.io/javaee-spec/javadocs/",
+			"https://jakarta.ee/specifications/platform/9/apidocs/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",

From 388c8e4aa508798e2fcc170a67fc47c7932dc307 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Thu, 30 Sep 2021 16:15:38 +0200
Subject: [PATCH 172/735] Make sure that MediaType comparators are transitive

Previous to this commit, the specificity and quality comparators
(used by MediaType::sortByQualityValue and MediaType::sortBySpecificity)
could result in IllegalArgumentExceptions when used for sorting.
The underlying reason was that the comparators were not transitive, and
both media types with the same type, and types with the same amount of
parameters, would be considered identical by the comparator (result 0).

This commit ensures that the comparators are transitive.

Closes gh-27488
---
 .../src/main/java/org/springframework/util/MimeType.java    | 6 ------
 .../src/main/java/org/springframework/http/MediaType.java   | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
index de29040b07f6..b6e1ff2ff3de 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeType.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -637,9 +637,6 @@ public int compare(T mimeType1, T mimeType2) {
 			else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) {  // audio/* > */*
 				return -1;
 			}
-			else if (!mimeType1.getType().equals(mimeType2.getType())) {  // audio/basic == text/html
-				return 0;
-			}
 			else {  // mediaType1.getType().equals(mediaType2.getType())
 				if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) {  // audio/* < audio/basic
 					return 1;
@@ -647,9 +644,6 @@ else if (!mimeType1.getType().equals(mimeType2.getType())) {  // audio/basic ==
 				else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) {  // audio/basic > audio/*
 					return -1;
 				}
-				else if (!mimeType1.getSubtype().equals(mimeType2.getSubtype())) {  // audio/basic == audio/wave
-					return 0;
-				}
 				else {  // mediaType2.getSubtype().equals(mediaType2.getSubtype())
 					return compareParameters(mimeType1, mimeType2);
 				}
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index f4af4c01a507..dfdee9740aed 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -798,9 +798,6 @@ else if (mediaType1.isWildcardType() && !mediaType2.isWildcardType()) {  // */*
 		else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) {  // audio/* > */*
 			return -1;
 		}
-		else if (!mediaType1.getType().equals(mediaType2.getType())) {  // audio/basic == text/html
-			return 0;
-		}
 		else {  // mediaType1.getType().equals(mediaType2.getType())
 			if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) {  // audio/* < audio/basic
 				return 1;
@@ -808,9 +805,6 @@ else if (!mediaType1.getType().equals(mediaType2.getType())) {  // audio/basic =
 			else if (mediaType2.isWildcardSubtype() && !mediaType1.isWildcardSubtype()) {  // audio/basic > audio/*
 				return -1;
 			}
-			else if (!mediaType1.getSubtype().equals(mediaType2.getSubtype())) {  // audio/basic == audio/wave
-				return 0;
-			}
 			else {
 				int paramsSize1 = mediaType1.getParameters().size();
 				int paramsSize2 = mediaType2.getParameters().size();

From bfa01b35df42c526253866a4b601e8be83746a4b Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Thu, 30 Sep 2021 17:09:03 +0200
Subject: [PATCH 173/735] Polishing

See gh-27488
---
 .../src/main/java/org/springframework/util/MimeType.java      | 4 ++--
 .../src/main/java/org/springframework/http/MediaType.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
index b6e1ff2ff3de..aa4ef6f53a31 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeType.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -637,14 +637,14 @@ public int compare(T mimeType1, T mimeType2) {
 			else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) {  // audio/* > */*
 				return -1;
 			}
-			else {  // mediaType1.getType().equals(mediaType2.getType())
+			else {
 				if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) {  // audio/* < audio/basic
 					return 1;
 				}
 				else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) {  // audio/basic > audio/*
 					return -1;
 				}
-				else {  // mediaType2.getSubtype().equals(mediaType2.getSubtype())
+				else {
 					return compareParameters(mimeType1, mimeType2);
 				}
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index dfdee9740aed..6b51e1783df8 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -798,7 +798,7 @@ else if (mediaType1.isWildcardType() && !mediaType2.isWildcardType()) {  // */*
 		else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) {  // audio/* > */*
 			return -1;
 		}
-		else {  // mediaType1.getType().equals(mediaType2.getType())
+		else {
 			if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) {  // audio/* < audio/basic
 				return 1;
 			}

From a295a28e4be9dbace211f278ffec309e91a96f86 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 30 Sep 2021 17:33:58 +0200
Subject: [PATCH 174/735] Defensively handle fast class generation failure for
 individual methods

Includes rethrowing of last actual defineClass exception encountered.

Closes gh-27490
---
 .../aop/framework/CglibAopProxy.java          | 36 ++++++++++----
 .../cglib/core/ReflectUtils.java              | 48 ++++++++++---------
 2 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
index 43d747f90cee..022cc0fddf24 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
@@ -679,13 +679,19 @@ public Object intercept(Object proxy, Method method, Object[] args, MethodProxy
 				Object retVal;
 				// Check whether we only have one InvokerInterceptor: that is,
 				// no real advice, but just reflective invocation of the target.
-				if (chain.isEmpty() && Modifier.isPublic(method.getModifiers())) {
+				if (chain.isEmpty() && CglibMethodInvocation.isMethodProxyCompatible(method)) {
 					// We can skip creating a MethodInvocation: just invoke the target directly.
 					// Note that the final invoker must be an InvokerInterceptor, so we know
 					// it does nothing but a reflective operation on the target, and no hot
 					// swapping or fancy proxying.
 					Object[] argsToUse = AopProxyUtils.adaptArgumentsIfNecessary(method, args);
-					retVal = methodProxy.invoke(target, argsToUse);
+					try {
+						retVal = methodProxy.invoke(target, argsToUse);
+					}
+					catch (CodeGenerationException ex) {
+						CglibMethodInvocation.logFastClassGenerationFailure(method);
+						retVal = AopUtils.invokeJoinpointUsingReflection(target, method, argsToUse);
+					}
 				}
 				else {
 					// We need to create a method invocation...
@@ -737,10 +743,7 @@ public CglibMethodInvocation(Object proxy, @Nullable Object target, Method metho
 			super(proxy, target, method, arguments, targetClass, interceptorsAndDynamicMethodMatchers);
 
 			// Only use method proxy for public methods not derived from java.lang.Object
-			this.methodProxy = (Modifier.isPublic(method.getModifiers()) &&
-					method.getDeclaringClass() != Object.class && !AopUtils.isEqualsMethod(method) &&
-					!AopUtils.isHashCodeMethod(method) && !AopUtils.isToStringMethod(method) ?
-					methodProxy : null);
+			this.methodProxy = (isMethodProxyCompatible(method) ? methodProxy : null);
 		}
 
 		@Override
@@ -776,10 +779,25 @@ public Object proceed() throws Throwable {
 		@Override
 		protected Object invokeJoinpoint() throws Throwable {
 			if (this.methodProxy != null) {
-				return this.methodProxy.invoke(this.target, this.arguments);
+				try {
+					return this.methodProxy.invoke(this.target, this.arguments);
+				}
+				catch (CodeGenerationException ex) {
+					logFastClassGenerationFailure(this.method);
+				}
 			}
-			else {
-				return super.invokeJoinpoint();
+			return super.invokeJoinpoint();
+		}
+
+		static boolean isMethodProxyCompatible(Method method) {
+			return (Modifier.isPublic(method.getModifiers()) &&
+					method.getDeclaringClass() != Object.class && !AopUtils.isEqualsMethod(method) &&
+					!AopUtils.isHashCodeMethod(method) && !AopUtils.isToStringMethod(method));
+		}
+
+		static void logFastClassGenerationFailure(Method method) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Failed to generate CGLIB fast class for method: " + method);
 			}
 		}
 	}
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
index 4420c50c9ee1..2f3ac37e6516 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
@@ -63,17 +63,16 @@ private ReflectUtils() {
 
 	private static final Method classLoaderDefineClassMethod;
 
-	private static final ProtectionDomain PROTECTION_DOMAIN;
-
 	private static final Throwable THROWABLE;
 
+	private static final ProtectionDomain PROTECTION_DOMAIN;
+
 	private static final List<Method> OBJECT_METHODS = new ArrayList<Method>();
 
 	static {
 		Method privateLookupIn;
 		Method lookupDefineClass;
 		Method classLoaderDefineClass;
-		ProtectionDomain protectionDomain;
 		Throwable throwable = null;
 		try {
 			privateLookupIn = (Method) AccessController.doPrivileged(new PrivilegedExceptionAction() {
@@ -102,39 +101,37 @@ public Object run() throws Exception {
 							String.class, byte[].class, Integer.TYPE, Integer.TYPE, ProtectionDomain.class);
 				}
 			});
-			protectionDomain = getProtectionDomain(ReflectUtils.class);
-			AccessController.doPrivileged(new PrivilegedExceptionAction() {
-				public Object run() throws Exception {
-					Method[] methods = Object.class.getDeclaredMethods();
-					for (Method method : methods) {
-						if ("finalize".equals(method.getName())
-								|| (method.getModifiers() & (Modifier.FINAL | Modifier.STATIC)) > 0) {
-							continue;
-						}
-						OBJECT_METHODS.add(method);
-					}
-					return null;
-				}
-			});
 		}
 		catch (Throwable t) {
 			privateLookupIn = null;
 			lookupDefineClass = null;
 			classLoaderDefineClass = null;
-			protectionDomain = null;
 			throwable = t;
 		}
+
 		privateLookupInMethod = privateLookupIn;
 		lookupDefineClassMethod = lookupDefineClass;
 		classLoaderDefineClassMethod = classLoaderDefineClass;
-		PROTECTION_DOMAIN = protectionDomain;
 		THROWABLE = throwable;
+		PROTECTION_DOMAIN = getProtectionDomain(ReflectUtils.class);
+
+		AccessController.doPrivileged(new PrivilegedAction() {
+			public Object run() {
+				Method[] methods = Object.class.getDeclaredMethods();
+				for (Method method : methods) {
+					if ("finalize".equals(method.getName())
+							|| (method.getModifiers() & (Modifier.FINAL | Modifier.STATIC)) > 0) {
+						continue;
+					}
+					OBJECT_METHODS.add(method);
+				}
+				return null;
+			}
+		});
 	}
 	// SPRING PATCH END
 
-	private static final String[] CGLIB_PACKAGES = {
-			"java.lang",
-	};
+	private static final String[] CGLIB_PACKAGES = {"java.lang"};
 
 	static {
 		primitives.put("byte", Byte.TYPE);
@@ -499,6 +496,7 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 			ProtectionDomain protectionDomain, Class<?> contextClass) throws Exception {
 
 		Class c = null;
+		Throwable t = THROWABLE;
 
 		// Preferred option: JDK 9+ Lookup.defineClass API if ClassLoader matches
 		if (contextClass != null && contextClass.getClassLoader() == loader &&
@@ -516,6 +514,7 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 				// in case of plain LinkageError (class already defined)
 				// or IllegalArgumentException (class in different package):
 				// fall through to traditional ClassLoader.defineClass below
+				t = ex;
 			}
 			catch (Throwable ex) {
 				throw new CodeGenerationException(ex);
@@ -539,9 +538,11 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 					throw new CodeGenerationException(ex.getTargetException());
 				}
 				// in case of UnsupportedOperationException, fall through
+				t = ex.getTargetException();
 			}
 			catch (Throwable ex) {
 				// publicDefineClass method not available -> fall through
+				t = ex;
 			}
 
 			// Classic option: protected ClassLoader.defineClass method
@@ -562,6 +563,7 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 					if (!ex.getClass().getName().endsWith("InaccessibleObjectException")) {
 						throw new CodeGenerationException(ex);
 					}
+					t = ex;
 				}
 			}
 		}
@@ -584,7 +586,7 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 
 		// No defineClass variant available at all?
 		if (c == null) {
-			throw new CodeGenerationException(THROWABLE);
+			throw new CodeGenerationException(t);
 		}
 
 		// Force static initializers to run.

From 4f44ae3f282b72d7051a2ac67ec5b001ebd9e884 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 30 Sep 2021 17:34:22 +0200
Subject: [PATCH 175/735] Polishing

---
 .../junit/jupiter/SpringExtension.java        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java
index dfd7aaaa28cd..8861c5e3621f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java
@@ -89,8 +89,8 @@ public class SpringExtension implements BeforeAllCallback, AfterAllCallback, Tes
 	 * {@link Namespace} in which {@code @Autowired} validation error messages
 	 * are stored, keyed by test class.
 	 */
-	private static final Namespace AUTOWIRED_VALIDATION_NAMESPACE = Namespace.create(SpringExtension.class.getName() +
-			"#autowired.validation");
+	private static final Namespace AUTOWIRED_VALIDATION_NAMESPACE =
+			Namespace.create(SpringExtension.class.getName() + "#autowired.validation");
 
 	private static final String NO_AUTOWIRED_VIOLATIONS_DETECTED = "NO AUTOWIRED VIOLATIONS DETECTED";
 
@@ -101,8 +101,8 @@ public class SpringExtension implements BeforeAllCallback, AfterAllCallback, Tes
 
 	private static final MethodFilter autowiredTestOrLifecycleMethodFilter =
 			ReflectionUtils.USER_DECLARED_METHODS
-				.and(method -> !Modifier.isPrivate(method.getModifiers()))
-				.and(SpringExtension::isAutowiredTestOrLifecycleMethod);
+					.and(method -> !Modifier.isPrivate(method.getModifiers()))
+					.and(SpringExtension::isAutowiredTestOrLifecycleMethod);
 
 
 	/**
@@ -147,16 +147,16 @@ private void validateAutowiredConfig(ExtensionContext context) {
 		// We save the result in the ExtensionContext.Store so that we don't
 		// re-validate all methods for the same test class multiple times.
 		Store store = context.getStore(AUTOWIRED_VALIDATION_NAMESPACE);
-		String errorMessage = store.getOrComputeIfAbsent(context.getRequiredTestClass(),
-			testClass -> {
+
+		String errorMessage = store.getOrComputeIfAbsent(context.getRequiredTestClass(), testClass -> {
 				Method[] methodsWithErrors =
 						ReflectionUtils.getUniqueDeclaredMethods(testClass, autowiredTestOrLifecycleMethodFilter);
 				return (methodsWithErrors.length == 0 ? NO_AUTOWIRED_VIOLATIONS_DETECTED :
 						String.format(
-							"Test methods and test lifecycle methods must not be annotated with @Autowired. " +
-							"You should instead annotate individual method parameters with @Autowired, " +
-							"@Qualifier, or @Value. Offending methods in test class %s: %s",
-							testClass.getName(), Arrays.toString(methodsWithErrors)));
+								"Test methods and test lifecycle methods must not be annotated with @Autowired. " +
+								"You should instead annotate individual method parameters with @Autowired, " +
+								"@Qualifier, or @Value. Offending methods in test class %s: %s",
+								testClass.getName(), Arrays.toString(methodsWithErrors)));
 			}, String.class);
 
 		if (errorMessage != NO_AUTOWIRED_VIOLATIONS_DETECTED) {
@@ -247,7 +247,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 	private boolean supportsApplicationEvents(ParameterContext parameterContext) {
 		if (ApplicationEvents.class.isAssignableFrom(parameterContext.getParameter().getType())) {
 			Assert.isTrue(parameterContext.getDeclaringExecutable() instanceof Method,
-				"ApplicationEvents can only be injected into test and lifecycle methods");
+					"ApplicationEvents can only be injected into test and lifecycle methods");
 			return true;
 		}
 		return false;

From 24bcb52b2f08aae987cb1d2da14d2436a56a29e6 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 30 Sep 2021 18:09:07 +0200
Subject: [PATCH 176/735] Polishing

---
 .../main/java/org/springframework/cglib/core/ReflectUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
index 2f3ac37e6516..f11a75fc064d 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
@@ -514,7 +514,7 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 				// in case of plain LinkageError (class already defined)
 				// or IllegalArgumentException (class in different package):
 				// fall through to traditional ClassLoader.defineClass below
-				t = ex;
+				t = target;
 			}
 			catch (Throwable ex) {
 				throw new CodeGenerationException(ex);

From f64f07049d4427909251b016c4ed6c152f3368a4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 30 Sep 2021 18:12:10 +0200
Subject: [PATCH 177/735] Upgrade to SLF4J 1.7.32

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 86379dd04b7f..f2346de7918b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ configure(allprojects) { project ->
 				entry 'log4j-jul'
 				entry 'log4j-slf4j-impl'
 			}
-			dependency "org.slf4j:slf4j-api:1.7.30"
+			dependency "org.slf4j:slf4j-api:1.7.32"
 			dependency("com.google.code.findbugs:findbugs:3.0.1") {
 				exclude group: "dom4j", name: "dom4j"
 			}

From ad873617d2eb18bb61bd471ce83fcbaeacc6d6d3 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 30 Sep 2021 18:26:01 +0200
Subject: [PATCH 178/735] Note on ClassLoader.defineClass being used as a
 fallback only

---
 .../java/org/springframework/cglib/core/ReflectUtils.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
index 3d5e1f087ee2..5fe0cef8f26c 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
@@ -63,6 +63,8 @@ private ReflectUtils() {
 
 	// SPRING PATCH BEGIN
 	static {
+		// Resolve protected ClassLoader.defineClass method for fallback use
+		// (even if JDK 9+ Lookup.defineClass is preferably used below)
 		Method classLoaderDefineClass;
 		Throwable throwable = null;
 		try {
@@ -453,7 +455,7 @@ public static Class defineClass(String className, byte[] b, ClassLoader loader,
 				// in case of plain LinkageError (class already defined)
 				// or IllegalArgumentException (class in different package):
 				// fall through to traditional ClassLoader.defineClass below
-				t = target;
+				t = ex;
 			}
 			catch (Throwable ex) {
 				throw new CodeGenerationException(ex);

From f0aa4f4857fbe197c162c9639d24d5bb460eb8f7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 10:35:28 +0200
Subject: [PATCH 179/735] Escape closing curly braces in regular expressions
 for Android support

PR gh-24470 introduced a regression for Android users by no longer
escaping closing curly braces in regular expressions.

This commit therefore partially reverts the changes made in 273812f9c5
for closing curly braces (`}`).

Closes gh27467
---
 .../main/java/org/springframework/util/AntPathMatcher.java  | 6 +++---
 .../test/context/util/TestContextResourceUtils.java         | 4 ++--
 .../java/org/springframework/web/util/UriComponents.java    | 2 +-
 .../org/springframework/web/util/UriComponentsBuilder.java  | 2 +-
 .../springframework/web/util/pattern/RegexPathElement.java  | 4 ++--
 .../web/reactive/result/view/RedirectView.java              | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
index 997925613649..d304f08d2c00 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ public class AntPathMatcher implements PathMatcher {
 
 	private static final int CACHE_TURNOFF_THRESHOLD = 65536;
 
-	private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{[^/]+?}");
+	private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{[^/]+?\\}");
 
 	private static final char[] WILDCARD_CHARS = {'*', '?', '{'};
 
@@ -642,7 +642,7 @@ public Comparator<String> getPatternComparator(String path) {
 	 */
 	protected static class AntPathStringMatcher {
 
-		private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?}|[^/{}]|\\\\[{}])+?)}");
+		private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?\\}|[^/{}]|\\\\[{}])+?)\\}");
 
 		private static final String DEFAULT_VARIABLE_PATTERN = "((?s).*)";
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java b/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
index 632e7a90432f..b931d987cf7b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public abstract class TestContextResourceUtils {
 
 	private static final String SLASH = "/";
 
-	private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile(".*\\$\\{[^}]+}.*");
+	private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile(".*\\$\\{[^}]+\\}.*");
 
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
index fd3a667cef2f..7ff83bdf76da 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
@@ -48,7 +48,7 @@
 public abstract class UriComponents implements Serializable {
 
 	/** Captures URI template variable names. */
-	private static final Pattern NAMES_PATTERN = Pattern.compile("\\{([^/]+?)}");
+	private static final Pattern NAMES_PATTERN = Pattern.compile("\\{([^/]+?)\\}");
 
 
 	@Nullable
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index d378a36840a0..68c98562a280 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -85,7 +85,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable {
 
 	private static final String HOST_PATTERN = "(" + HOST_IPV6_PATTERN + "|" + HOST_IPV4_PATTERN + ")";
 
-	private static final String PORT_PATTERN = "(\\{[^}]+}?|[^/?#]*)";
+	private static final String PORT_PATTERN = "(\\{[^}]+\\}?|[^/?#]*)";
 
 	private static final String PATH_PATTERN = "([^?#]*)";
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
index f326a87e134e..cdbad924bb4f 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
  */
 class RegexPathElement extends PathElement {
 
-	private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?}|[^/{}]|\\\\[{}])+?)}");
+	private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?\\}|[^/{}]|\\\\[{}])+?)\\}");
 
 	private static final String DEFAULT_VARIABLE_PATTERN = "(.*)";
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
index 4ec3f0ecec3c..50aa95ecb0c3 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@
  */
 public class RedirectView extends AbstractUrlBasedView {
 
-	private static final Pattern URI_TEMPLATE_VARIABLE_PATTERN = Pattern.compile("\\{([^/]+?)}");
+	private static final Pattern URI_TEMPLATE_VARIABLE_PATTERN = Pattern.compile("\\{([^/]+?)\\}");
 
 
 	private HttpStatus statusCode = HttpStatus.SEE_OTHER;

From 7311ae19be835816534a5c18bd8a948d26143ded Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 11:09:59 +0200
Subject: [PATCH 180/735] Fix build by disabling linking to JUnit 5.8.1 Javadoc

The `package-list` file no longer exists at
https://junit.org/junit5/docs/5.8.1/api/, due to the following commit.

https://github.com/junit-team/junit5/commit/67ad4e545518b0ce2b0e7c96df31a669866d5003
---
 build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f2346de7918b..c6545c8abf21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -384,7 +384,9 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.8.1/api/",
+			// Disabling linking to JUnit 5.8.1, since the `package-list` file no longer exists due to
+			// https://github.com/junit-team/junit5/commit/67ad4e545518b0ce2b0e7c96df31a669866d5003.
+			// "https://junit.org/junit5/docs/5.8.1/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"

From d6ec6f0fe9f50ff2241229a9972a8649ad2dead5 Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@vmware.com>
Date: Fri, 1 Oct 2021 09:33:17 +0200
Subject: [PATCH 181/735] Remove remark about missing caching API.

---
 src/docs/asciidoc/integration.adoc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 883acc17867a..41d5a0dba8ec 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -6653,15 +6653,13 @@ invoked every time.
 === Plugging-in Different Back-end Caches
 
 Clearly, there are plenty of caching products out there that you can use as a backing
-store. To plug them in, you need to provide a `CacheManager` and a `Cache` implementation,
-since, unfortunately, there is no available standard that we can use instead.
+store. For those that do not support JSR-107 you need to provide a `CacheManager` and a `Cache` implementation.
 This may sound harder than it is, since, in practice, the classes tend to be simple
 https://en.wikipedia.org/wiki/Adapter_pattern[adapters] that map the caching abstraction
 framework on top of the storage API, as the `ehcache` classes do. Most `CacheManager`
 classes can use the classes in the `org.springframework.cache.support` package
 (such as `AbstractCacheManager` which takes care of the boiler-plate code,
-leaving only the actual mapping to be completed). We hope that, in time, the libraries
-that provide integration with Spring can fill in this small configuration gap.
+leaving only the actual mapping to be completed). We hope that, in time, all relevant caches will offer JSR-107 support.
 
 
 

From fd11789db90de09e0edd906d6ad78189df895e22 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 12:51:52 +0200
Subject: [PATCH 182/735] Polish JSR-107 caching ref docs

---
 src/docs/asciidoc/integration.adoc | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 41d5a0dba8ec..6f010159947d 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -5587,8 +5587,8 @@ an existing Spring application. Similar to the <<data-access.adoc#transaction, t
 support, the caching abstraction allows consistent use of various caching solutions with
 minimal impact on the code.
 
-As from Spring 4.1, the cache abstraction has been significantly extended with the
-support of <<cache-jsr-107,JSR-107 annotations>> and more customization options.
+In Spring Framework 4.1, the cache abstraction was significantly extended with support
+for <<cache-jsr-107,JSR-107 annotations>> and more customization options.
 
 
 
@@ -6313,7 +6313,7 @@ up its declaration at runtime and understands its meaning. Note that, as mention
 === JCache (JSR-107) Annotations
 
 Since version 4.1, Spring's caching abstraction fully supports the JCache standard
-annotations: `@CacheResult`, `@CachePut`, `@CacheRemove`, and `@CacheRemoveAll`
+(JSR-107) annotations: `@CacheResult`, `@CachePut`, `@CacheRemove`, and `@CacheRemoveAll`
 as well as the `@CacheDefaults`, `@CacheKey`, and `@CacheValue` companions.
 You can use these annotations even without migrating your cache store to JSR-107.
 The internal implementation uses Spring's caching abstraction and provides default
@@ -6327,8 +6327,8 @@ you can switch to these standard annotations without changing your cache storage
 ==== Feature Summary
 
 For those who are familiar with Spring's caching annotations, the following table
-describes the main differences between the Spring annotations and the JSR-107
-counterpart:
+describes the main differences between the Spring annotations and their JSR-107
+counterparts:
 
 .Spring vs. JSR-107 caching annotations
 [cols="1,1,3"]
@@ -6420,16 +6420,15 @@ invoking the method again:
 
 ==== Enabling JSR-107 Support
 
-You need do nothing specific to enable the JSR-107 support alongside Spring's
-declarative annotation support. Both `@EnableCaching` and the
-`cache:annotation-driven` element automatically enable the JCache support
-if both the JSR-107 API and the `spring-context-support` module are present
-in the classpath.
+You do not need to do anything specific to enable the JSR-107 support alongside Spring's
+declarative annotation support. Both `@EnableCaching` and the `cache:annotation-driven`
+XML element automatically enable the JCache support if both the JSR-107 API and the
+`spring-context-support` module are present in the classpath.
 
-NOTE: Depending on your use case, the choice is basically yours. You can even
-mix and match services by using the JSR-107 API on some and using Spring's own
-annotations on others. However, if these services impact the same caches,
-you should use a consistent and identical key generation implementation.
+NOTE: Depending on your use case, the choice is basically yours. You can even mix and
+match services by using the JSR-107 API on some and using Spring's own annotations on
+others. However, if these services impact the same caches, you should use a consistent
+and identical key generation implementation.
 
 
 
@@ -6653,13 +6652,14 @@ invoked every time.
 === Plugging-in Different Back-end Caches
 
 Clearly, there are plenty of caching products out there that you can use as a backing
-store. For those that do not support JSR-107 you need to provide a `CacheManager` and a `Cache` implementation.
-This may sound harder than it is, since, in practice, the classes tend to be simple
-https://en.wikipedia.org/wiki/Adapter_pattern[adapters] that map the caching abstraction
-framework on top of the storage API, as the `ehcache` classes do. Most `CacheManager`
-classes can use the classes in the `org.springframework.cache.support` package
-(such as `AbstractCacheManager` which takes care of the boiler-plate code,
-leaving only the actual mapping to be completed). We hope that, in time, all relevant caches will offer JSR-107 support.
+store. For those that do not support JSR-107 you need to provide a `CacheManager` and a
+`Cache` implementation. This may sound harder than it is, since, in practice, the classes
+tend to be simple https://en.wikipedia.org/wiki/Adapter_pattern[adapters] that map the
+caching abstraction framework on top of the storage API, as the `ehcache` classes do.
+Most `CacheManager` classes can use the classes in the
+`org.springframework.cache.support` package (such as `AbstractCacheManager` which takes
+care of the boiler-plate code, leaving only the actual mapping to be completed). We hope
+that, in time, all relevant caches will offer JSR-107 support.
 
 
 

From b452d1b41d05e5656d39433ea2649e152fb184b2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 13:06:57 +0200
Subject: [PATCH 183/735] Remove obsolete references to Ehcache 2.x from ref
 docs

---
 src/docs/asciidoc/integration.adoc | 37 ++++++++----------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 6f010159947d..1fa867c39d86 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -5627,7 +5627,7 @@ invoke the method again. The caching logic is applied transparently without any
 interference to the invoker.
 
 IMPORTANT: This approach works only for methods that are guaranteed to return the same
-output (result) for a given input (or arguments) no matter how many times it is invoked.
+output (result) for a given input (or arguments) no matter how many times they are invoked.
 
 The caching abstraction provides other cache-related operations, such as the ability
 to update the content of the cache or to remove one or all entries. These are useful if
@@ -5640,10 +5640,10 @@ provide the actual data store. This abstraction is materialized by the
 `org.springframework.cache.Cache` and `org.springframework.cache.CacheManager` interfaces.
 
 Spring provides <<cache-store-configuration, a few implementations>> of that abstraction:
-JDK `java.util.concurrent.ConcurrentMap` based caches, https://www.ehcache.org/[Ehcache 2.x],
-Gemfire cache, https://github.com/ben-manes/caffeine/wiki[Caffeine], and JSR-107
-compliant caches (such as Ehcache 3.x). See <<cache-plug>> for more information on
-plugging in other cache stores and providers.
+JDK `java.util.concurrent.ConcurrentMap` based caches, Gemfire cache,
+https://github.com/ben-manes/caffeine/wiki[Caffeine], and JSR-107 compliant caches (such
+as Ehcache 3.x). See <<cache-plug>> for more information on plugging in other cache
+stores and providers.
 
 IMPORTANT: The caching abstraction has no special handling for multi-threaded and
 multi-process environments, as such features are handled by the cache implementation.
@@ -5663,7 +5663,7 @@ in that area. See the documentation of your cache provider for more details.
 
 To use the cache abstraction, you need to take care of two aspects:
 
-* Caching declaration: Identify the methods that need to be cached and their policy.
+* Caching declaration: Identify the methods that need to be cached and their policies.
 * Cache configuration: The backing cache where the data is stored and from which it is read.
 
 
@@ -6526,28 +6526,11 @@ and is very fast, but it does not provide any management, persistence capabiliti
 or eviction contracts.
 
 
-[[cache-store-configuration-ehcache]]
+[[cache-store-configuration-eviction]]
 ==== Ehcache-based Cache
 
-NOTE: Ehcache 3.x is fully JSR-107 compliant and no dedicated support is required for it.
-
-The Ehcache 2.x implementation is located in the `org.springframework.cache.ehcache`
-package. Again, to use it, you need to declare the appropriate `CacheManager`.
-The following example shows how to do so:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<bean id="cacheManager"
-			class="org.springframework.cache.ehcache.EhCacheCacheManager" p:cache-manager-ref="ehcache"/>
-
-	<!-- EhCache library setup -->
-	<bean id="ehcache"
-			class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean" p:config-location="ehcache.xml"/>
-----
-
-This setup bootstraps the ehcache library inside the Spring IoC (through the `ehcache`
-bean), which is then wired into the dedicated `CacheManager` implementation. Note that
-the entire Ehcache-specific configuration is read from `ehcache.xml`.
+Ehcache 3.x is fully JSR-107 compliant and no dedicated support is required for it. See
+<<cache-store-configuration-jsr107>> for details.
 
 
 [[cache-store-configuration-caffeine]]
@@ -6655,7 +6638,7 @@ Clearly, there are plenty of caching products out there that you can use as a ba
 store. For those that do not support JSR-107 you need to provide a `CacheManager` and a
 `Cache` implementation. This may sound harder than it is, since, in practice, the classes
 tend to be simple https://en.wikipedia.org/wiki/Adapter_pattern[adapters] that map the
-caching abstraction framework on top of the storage API, as the `ehcache` classes do.
+caching abstraction framework on top of the storage API, as the _Caffeine_ classes do.
 Most `CacheManager` classes can use the classes in the
 `org.springframework.cache.support` package (such as `AbstractCacheManager` which takes
 care of the boiler-plate code, leaving only the actual mapping to be completed). We hope

From f632165dec5df566f2ccac6350d9c67ac63106c4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 1 Oct 2021 13:26:25 +0200
Subject: [PATCH 184/735] Invoke bean-derived (Auto)Closeable.close() method
 directly

Closes gh-27504
---
 .../support/DisposableBeanAdapter.java        | 145 +++++++++++-------
 .../DestroyMethodInferenceTests.java          |  45 ++++--
 .../DestroyMethodInferenceTests-context.xml   |   8 +-
 3 files changed, 136 insertions(+), 62 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
index 3e779752a952..e6f90239343d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
@@ -61,6 +61,8 @@
 @SuppressWarnings("serial")
 class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
+	private static final String DESTROY_METHOD_NAME = "destroy";
+
 	private static final String CLOSE_METHOD_NAME = "close";
 
 	private static final String SHUTDOWN_METHOD_NAME = "shutdown";
@@ -72,12 +74,11 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
 	private final String beanName;
 
-	private final boolean invokeDisposableBean;
-
 	private final boolean nonPublicAccessAllowed;
 
-	@Nullable
-	private final AccessControlContext acc;
+	private final boolean invokeDisposableBean;
+
+	private boolean invokeAutoCloseable;
 
 	@Nullable
 	private String destroyMethodName;
@@ -88,6 +89,9 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 	@Nullable
 	private final List<DestructionAwareBeanPostProcessor> beanPostProcessors;
 
+	@Nullable
+	private final AccessControlContext acc;
+
 
 	/**
 	 * Create a new DisposableBeanAdapter for the given bean.
@@ -103,38 +107,45 @@ public DisposableBeanAdapter(Object bean, String beanName, RootBeanDefinition be
 		Assert.notNull(bean, "Disposable bean must not be null");
 		this.bean = bean;
 		this.beanName = beanName;
-		this.invokeDisposableBean =
-				(this.bean instanceof DisposableBean && !beanDefinition.isExternallyManagedDestroyMethod("destroy"));
 		this.nonPublicAccessAllowed = beanDefinition.isNonPublicAccessAllowed();
-		this.acc = acc;
+		this.invokeDisposableBean = (bean instanceof DisposableBean &&
+				!beanDefinition.isExternallyManagedDestroyMethod(DESTROY_METHOD_NAME));
+
 		String destroyMethodName = inferDestroyMethodIfNecessary(bean, beanDefinition);
-		if (destroyMethodName != null && !(this.invokeDisposableBean && "destroy".equals(destroyMethodName)) &&
+		if (destroyMethodName != null &&
+				!(this.invokeDisposableBean && DESTROY_METHOD_NAME.equals(destroyMethodName)) &&
 				!beanDefinition.isExternallyManagedDestroyMethod(destroyMethodName)) {
-			this.destroyMethodName = destroyMethodName;
-			Method destroyMethod = determineDestroyMethod(destroyMethodName);
-			if (destroyMethod == null) {
-				if (beanDefinition.isEnforceDestroyMethod()) {
-					throw new BeanDefinitionValidationException("Could not find a destroy method named '" +
-							destroyMethodName + "' on bean with name '" + beanName + "'");
-				}
-			}
-			else {
-				if (destroyMethod.getParameterCount() > 0) {
-					Class<?>[] paramTypes = destroyMethod.getParameterTypes();
-					if (paramTypes.length > 1) {
-						throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
-								beanName + "' has more than one parameter - not supported as destroy method");
+
+			this.invokeAutoCloseable = (bean instanceof AutoCloseable && CLOSE_METHOD_NAME.equals(destroyMethodName));
+			if (!this.invokeAutoCloseable) {
+				this.destroyMethodName = destroyMethodName;
+				Method destroyMethod = determineDestroyMethod(destroyMethodName);
+				if (destroyMethod == null) {
+					if (beanDefinition.isEnforceDestroyMethod()) {
+						throw new BeanDefinitionValidationException("Could not find a destroy method named '" +
+								destroyMethodName + "' on bean with name '" + beanName + "'");
 					}
-					else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
-						throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
-								beanName + "' has a non-boolean parameter - not supported as destroy method");
+				}
+				else {
+					if (destroyMethod.getParameterCount() > 0) {
+						Class<?>[] paramTypes = destroyMethod.getParameterTypes();
+						if (paramTypes.length > 1) {
+							throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
+									beanName + "' has more than one parameter - not supported as destroy method");
+						}
+						else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
+							throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
+									beanName + "' has a non-boolean parameter - not supported as destroy method");
+						}
 					}
+					destroyMethod = ClassUtils.getInterfaceMethodIfPossible(destroyMethod);
 				}
-				destroyMethod = ClassUtils.getInterfaceMethodIfPossible(destroyMethod);
+				this.destroyMethod = destroyMethod;
 			}
-			this.destroyMethod = destroyMethod;
 		}
+
 		this.beanPostProcessors = filterPostProcessors(postProcessors, bean);
+		this.acc = acc;
 	}
 
 	/**
@@ -149,26 +160,27 @@ public DisposableBeanAdapter(
 		Assert.notNull(bean, "Disposable bean must not be null");
 		this.bean = bean;
 		this.beanName = bean.getClass().getName();
-		this.invokeDisposableBean = (this.bean instanceof DisposableBean);
 		this.nonPublicAccessAllowed = true;
-		this.acc = acc;
+		this.invokeDisposableBean = (this.bean instanceof DisposableBean);
 		this.beanPostProcessors = filterPostProcessors(postProcessors, bean);
+		this.acc = acc;
 	}
 
 	/**
 	 * Create a new DisposableBeanAdapter for the given bean.
 	 */
-	private DisposableBeanAdapter(Object bean, String beanName, boolean invokeDisposableBean,
-			boolean nonPublicAccessAllowed, @Nullable String destroyMethodName,
+	private DisposableBeanAdapter(Object bean, String beanName, boolean nonPublicAccessAllowed,
+			boolean invokeDisposableBean, boolean invokeAutoCloseable, @Nullable String destroyMethodName,
 			@Nullable List<DestructionAwareBeanPostProcessor> postProcessors) {
 
 		this.bean = bean;
 		this.beanName = beanName;
-		this.invokeDisposableBean = invokeDisposableBean;
 		this.nonPublicAccessAllowed = nonPublicAccessAllowed;
-		this.acc = null;
+		this.invokeDisposableBean = invokeDisposableBean;
+		this.invokeAutoCloseable = invokeAutoCloseable;
 		this.destroyMethodName = destroyMethodName;
 		this.beanPostProcessors = postProcessors;
+		this.acc = null;
 	}
 
 
@@ -211,7 +223,32 @@ public void destroy() {
 			}
 		}
 
-		if (this.destroyMethod != null) {
+		if (this.invokeAutoCloseable) {
+			if (logger.isTraceEnabled()) {
+				logger.trace("Invoking close() on bean with name '" + this.beanName + "'");
+			}
+			try {
+				if (System.getSecurityManager() != null) {
+					AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> {
+						((AutoCloseable) this.bean).close();
+						return null;
+					}, this.acc);
+				}
+				else {
+					((AutoCloseable) this.bean).close();
+				}
+			}
+			catch (Throwable ex) {
+				String msg = "Invocation of close method failed on bean with name '" + this.beanName + "'";
+				if (logger.isDebugEnabled()) {
+					logger.warn(msg, ex);
+				}
+				else {
+					logger.warn(msg + ": " + ex);
+				}
+			}
+		}
+		else if (this.destroyMethod != null) {
 			invokeCustomDestroyMethod(this.destroyMethod);
 		}
 		else if (this.destroyMethodName != null) {
@@ -259,7 +296,7 @@ private void invokeCustomDestroyMethod(final Method destroyMethod) {
 			args[0] = Boolean.TRUE;
 		}
 		if (logger.isTraceEnabled()) {
-			logger.trace("Invoking destroy method '" + this.destroyMethodName +
+			logger.trace("Invoking custom destroy method '" + this.destroyMethodName +
 					"' on bean with name '" + this.beanName + "'");
 		}
 		try {
@@ -282,7 +319,7 @@ private void invokeCustomDestroyMethod(final Method destroyMethod) {
 			}
 		}
 		catch (InvocationTargetException ex) {
-			String msg = "Destroy method '" + this.destroyMethodName + "' on bean with name '" +
+			String msg = "Custom destroy method '" + this.destroyMethodName + "' on bean with name '" +
 					this.beanName + "' threw an exception";
 			if (logger.isDebugEnabled()) {
 				logger.warn(msg, ex.getTargetException());
@@ -292,7 +329,7 @@ private void invokeCustomDestroyMethod(final Method destroyMethod) {
 			}
 		}
 		catch (Throwable ex) {
-			logger.warn("Failed to invoke destroy method '" + this.destroyMethodName +
+			logger.warn("Failed to invoke custom destroy method '" + this.destroyMethodName +
 					"' on bean with name '" + this.beanName + "'", ex);
 		}
 	}
@@ -312,8 +349,9 @@ protected Object writeReplace() {
 				}
 			}
 		}
-		return new DisposableBeanAdapter(this.bean, this.beanName, this.invokeDisposableBean,
-				this.nonPublicAccessAllowed, this.destroyMethodName, serializablePostProcessors);
+		return new DisposableBeanAdapter(
+				this.bean, this.beanName, this.nonPublicAccessAllowed, this.invokeDisposableBean,
+				this.invokeAutoCloseable, this.destroyMethodName, serializablePostProcessors);
 	}
 
 
@@ -323,10 +361,7 @@ protected Object writeReplace() {
 	 * @param beanDefinition the corresponding bean definition
 	 */
 	public static boolean hasDestroyMethod(Object bean, RootBeanDefinition beanDefinition) {
-		if (bean instanceof DisposableBean || bean instanceof AutoCloseable) {
-			return true;
-		}
-		return inferDestroyMethodIfNecessary(bean, beanDefinition) != null;
+		return (bean instanceof DisposableBean || inferDestroyMethodIfNecessary(bean, beanDefinition) != null);
 	}
 
 
@@ -348,21 +383,27 @@ private static String inferDestroyMethodIfNecessary(Object bean, RootBeanDefinit
 		String destroyMethodName = beanDefinition.resolvedDestroyMethodName;
 		if (destroyMethodName == null) {
 			destroyMethodName = beanDefinition.getDestroyMethodName();
+			boolean autoCloseable = (bean instanceof AutoCloseable);
 			if (AbstractBeanDefinition.INFER_METHOD.equals(destroyMethodName) ||
-					(destroyMethodName == null && bean instanceof AutoCloseable)) {
-				// Only perform destroy method inference or Closeable detection
-				// in case of the bean not explicitly implementing DisposableBean
+					(destroyMethodName == null && autoCloseable)) {
+				// Only perform destroy method inference in case of the bean
+				// not explicitly implementing the DisposableBean interface
 				destroyMethodName = null;
 				if (!(bean instanceof DisposableBean)) {
-					try {
-						destroyMethodName = bean.getClass().getMethod(CLOSE_METHOD_NAME).getName();
+					if (autoCloseable) {
+						destroyMethodName = CLOSE_METHOD_NAME;
 					}
-					catch (NoSuchMethodException ex) {
+					else {
 						try {
-							destroyMethodName = bean.getClass().getMethod(SHUTDOWN_METHOD_NAME).getName();
+							destroyMethodName = bean.getClass().getMethod(CLOSE_METHOD_NAME).getName();
 						}
-						catch (NoSuchMethodException ex2) {
-							// no candidate destroy method found
+						catch (NoSuchMethodException ex) {
+							try {
+								destroyMethodName = bean.getClass().getMethod(SHUTDOWN_METHOD_NAME).getName();
+							}
+							catch (NoSuchMethodException ex2) {
+								// no candidate destroy method found
+							}
 						}
 					}
 				}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
index 7da4675bed5e..c15abc241db2 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 /**
  * @author Chris Beams
  * @author Juergen Hoeller
@@ -47,6 +46,7 @@ public void beanMethods() {
 		WithLocalShutdownMethod c7 = ctx.getBean("c7", WithLocalShutdownMethod.class);
 		WithInheritedCloseMethod c8 = ctx.getBean("c8", WithInheritedCloseMethod.class);
 		WithDisposableBean c9 = ctx.getBean("c9", WithDisposableBean.class);
+		WithAutoCloseable c10 = ctx.getBean("c10", WithAutoCloseable.class);
 
 		assertThat(c0.closed).as("c0").isFalse();
 		assertThat(c1.closed).as("c1").isFalse();
@@ -58,6 +58,8 @@ public void beanMethods() {
 		assertThat(c7.closed).as("c7").isFalse();
 		assertThat(c8.closed).as("c8").isFalse();
 		assertThat(c9.closed).as("c9").isFalse();
+		assertThat(c10.closed).as("c10").isFalse();
+
 		ctx.close();
 		assertThat(c0.closed).as("c0").isTrue();
 		assertThat(c1.closed).as("c1").isTrue();
@@ -69,6 +71,7 @@ public void beanMethods() {
 		assertThat(c7.closed).as("c7").isTrue();
 		assertThat(c8.closed).as("c8").isFalse();
 		assertThat(c9.closed).as("c9").isTrue();
+		assertThat(c10.closed).as("c10").isTrue();
 	}
 
 	@Test
@@ -80,21 +83,29 @@ public void xml() {
 		WithLocalCloseMethod x3 = ctx.getBean("x3", WithLocalCloseMethod.class);
 		WithNoCloseMethod x4 = ctx.getBean("x4", WithNoCloseMethod.class);
 		WithInheritedCloseMethod x8 = ctx.getBean("x8", WithInheritedCloseMethod.class);
+		WithDisposableBean x9 = ctx.getBean("x9", WithDisposableBean.class);
+		WithAutoCloseable x10 = ctx.getBean("x10", WithAutoCloseable.class);
 
 		assertThat(x1.closed).isFalse();
 		assertThat(x2.closed).isFalse();
 		assertThat(x3.closed).isFalse();
 		assertThat(x4.closed).isFalse();
+		assertThat(x8.closed).isFalse();
+		assertThat(x9.closed).isFalse();
+		assertThat(x10.closed).isFalse();
+
 		ctx.close();
 		assertThat(x1.closed).isFalse();
 		assertThat(x2.closed).isTrue();
 		assertThat(x3.closed).isTrue();
 		assertThat(x4.closed).isFalse();
 		assertThat(x8.closed).isFalse();
+		assertThat(x9.closed).isTrue();
+		assertThat(x10.closed).isTrue();
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean(destroyMethod = "explicitClose")
@@ -155,6 +166,11 @@ public WithInheritedCloseMethod c8() {
 		public WithDisposableBean c9() {
 			return new WithDisposableBean();
 		}
+
+		@Bean
+		public WithAutoCloseable c10() {
+			return new WithAutoCloseable();
+		}
 	}
 
 
@@ -189,28 +205,39 @@ public void close() {
 	}
 
 
-	static class WithDisposableBean implements DisposableBean {
+	static class WithNoCloseMethod {
 
 		boolean closed = false;
+	}
 
-		@Override
-		public void destroy() {
+
+	static class WithLocalShutdownMethod {
+
+		boolean closed = false;
+
+		public void shutdown() {
 			closed = true;
 		}
 	}
 
 
-	static class WithNoCloseMethod {
+	static class WithDisposableBean implements DisposableBean {
 
 		boolean closed = false;
+
+		@Override
+		public void destroy() {
+			closed = true;
+		}
 	}
 
 
-	static class WithLocalShutdownMethod {
+	static class WithAutoCloseable implements AutoCloseable {
 
 		boolean closed = false;
 
-		public void shutdown() {
+		@Override
+		public void close() {
 			closed = true;
 		}
 	}
diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
index 5c66a6d9e29b..c72bd70db550 100644
--- a/spring-context/src/test/resources/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml
@@ -15,10 +15,16 @@
 		  class="org.springframework.context.annotation.DestroyMethodInferenceTests.WithInheritedCloseMethod"
 		  destroy-method=""/>
 
+	<bean id="x9"
+		  class="org.springframework.context.annotation.DestroyMethodInferenceTests.WithDisposableBean"
+		  destroy-method=""/>
+
+	<bean id="x10"
+		  class="org.springframework.context.annotation.DestroyMethodInferenceTests.WithAutoCloseable"/>
+
 	<beans default-destroy-method="(inferred)">
 		<bean id="x3"
 		      class="org.springframework.context.annotation.DestroyMethodInferenceTests$WithLocalCloseMethod"/>
-
 		<bean id="x4"
 		      class="org.springframework.context.annotation.DestroyMethodInferenceTests$WithNoCloseMethod"/>
 	</beans>

From 678fd8344ea52702659bf47156a58f7883bd5d0e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 1 Oct 2021 14:37:07 +0200
Subject: [PATCH 185/735] Polishing

---
 src/docs/asciidoc/integration.adoc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 6f010159947d..f2ec53ad0aed 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -6658,8 +6658,7 @@ tend to be simple https://en.wikipedia.org/wiki/Adapter_pattern[adapters] that m
 caching abstraction framework on top of the storage API, as the `ehcache` classes do.
 Most `CacheManager` classes can use the classes in the
 `org.springframework.cache.support` package (such as `AbstractCacheManager` which takes
-care of the boiler-plate code, leaving only the actual mapping to be completed). We hope
-that, in time, all relevant caches will offer JSR-107 support.
+care of the boiler-plate code, leaving only the actual mapping to be completed).
 
 
 

From 04eed155cdf10dd943818c343c9fd49fb6d8fcf4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 1 Oct 2021 14:52:27 +0200
Subject: [PATCH 186/735] Upgrade to Hibernate ORM 5.6 CR1, JRuby 9.3, WebJars
 Locator 0.48, HtmlUnit 2.53

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1963b42f8292..569569e295e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -112,9 +112,9 @@ configure(allprojects) { project ->
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core-jakarta:5.5.7.Final"
+			dependency "org.hibernate:hibernate-core-jakarta:5.6.0.CR1"
 			dependency "org.hibernate:hibernate-validator:7.0.1.Final"
-			dependency "org.webjars:webjars-locator-core:0.47"
+			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
 			dependencySet(group: 'org.apache.tomcat', version: '10.0.11') {
@@ -150,7 +150,7 @@ configure(allprojects) { project ->
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
 			dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4"
 
-			dependency "org.jruby:jruby:9.2.19.0"
+			dependency "org.jruby:jruby:9.3.0.0"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"
 
@@ -189,10 +189,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.52.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.53.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.52.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.53.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {

From bf373c5065fc5b561b385365cb01a9eb27621e9e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Sat, 2 Oct 2021 12:04:13 +0200
Subject: [PATCH 187/735] Skip all flaky StopWatch time assertions

---
 .../springframework/util/StopWatchTests.java  | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
index 83eb5adbec63..a3458afb6a1f 100644
--- a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
@@ -20,7 +20,6 @@
 
 import org.springframework.util.StopWatch.TaskInfo;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
@@ -78,18 +77,21 @@ void validUsage() throws Exception {
 		assertThat(stopWatch.currentTaskName()).isEqualTo(name1);
 		stopWatch.stop();
 		assertThat(stopWatch.isRunning()).isFalse();
+
+		/* Flaky StopWatch time assertions...
 		assertThat(stopWatch.getLastTaskTimeNanos())
-			.as("last task time in nanoseconds for task #1")
-			.isGreaterThanOrEqualTo(millisToNanos(duration1 - fudgeFactor))
-			.isLessThanOrEqualTo(millisToNanos(duration1 + fudgeFactor));
+				.as("last task time in nanoseconds for task #1")
+				.isGreaterThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(duration1 - fudgeFactor))
+				.isLessThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(duration1 + fudgeFactor));
 		assertThat(stopWatch.getTotalTimeMillis())
-			.as("total time in milliseconds for task #1")
-			.isGreaterThanOrEqualTo(duration1 - fudgeFactor)
-			.isLessThanOrEqualTo(duration1 + fudgeFactor);
+				.as("total time in milliseconds for task #1")
+				.isGreaterThanOrEqualTo(duration1 - fudgeFactor)
+				.isLessThanOrEqualTo(duration1 + fudgeFactor);
 		assertThat(stopWatch.getTotalTimeSeconds())
-			.as("total time in seconds for task #1")
-			.isGreaterThanOrEqualTo((duration1 - fudgeFactor) / 1000.0)
-			.isLessThanOrEqualTo((duration1 + fudgeFactor) / 1000.0);
+				.as("total time in seconds for task #1")
+				.isGreaterThanOrEqualTo((duration1 - fudgeFactor) / 1000.0)
+				.isLessThanOrEqualTo((duration1 + fudgeFactor) / 1000.0);
+		*/
 
 		stopWatch.start(name2);
 		Thread.sleep(duration2);
@@ -100,17 +102,17 @@ void validUsage() throws Exception {
 
 		/* Flaky StopWatch time assertions...
 		assertThat(stopWatch.getLastTaskTimeNanos())
-			.as("last task time in nanoseconds for task #2")
-			.isGreaterThanOrEqualTo(millisToNanos(duration2))
-			.isLessThanOrEqualTo(millisToNanos(duration2 + fudgeFactor));
+				.as("last task time in nanoseconds for task #2")
+				.isGreaterThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(duration2))
+				.isLessThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(duration2 + fudgeFactor));
 		assertThat(stopWatch.getTotalTimeMillis())
-			.as("total time in milliseconds for tasks #1 and #2")
-			.isGreaterThanOrEqualTo(duration1 + duration2 - fudgeFactor)
-			.isLessThanOrEqualTo(duration1 + duration2 + fudgeFactor);
+				.as("total time in milliseconds for tasks #1 and #2")
+				.isGreaterThanOrEqualTo(duration1 + duration2 - fudgeFactor)
+				.isLessThanOrEqualTo(duration1 + duration2 + fudgeFactor);
 		assertThat(stopWatch.getTotalTimeSeconds())
-			.as("total time in seconds for task #2")
-			.isGreaterThanOrEqualTo((duration1 + duration2 - fudgeFactor) / 1000.0)
-			.isLessThanOrEqualTo((duration1 + duration2 + fudgeFactor) / 1000.0);
+				.as("total time in seconds for task #2")
+				.isGreaterThanOrEqualTo((duration1 + duration2 - fudgeFactor) / 1000.0)
+				.isLessThanOrEqualTo((duration1 + duration2 + fudgeFactor) / 1000.0);
 		*/
 
 		assertThat(stopWatch.getTaskCount()).isEqualTo(2);
@@ -138,12 +140,8 @@ void validUsageDoesNotKeepTaskList() throws Exception {
 		assertThat(stopWatch.prettyPrint()).contains("No task info kept");
 		assertThat(stopWatch.toString()).doesNotContain(name1, name2);
 		assertThatExceptionOfType(UnsupportedOperationException.class)
-			.isThrownBy(stopWatch::getTaskInfo)
-			.withMessage("Task info is not being kept!");
-	}
-
-	private static long millisToNanos(long duration) {
-		return MILLISECONDS.toNanos(duration);
+				.isThrownBy(stopWatch::getTaskInfo)
+				.withMessage("Task info is not being kept!");
 	}
 
 }

From 49427b0c3c7e0d1329b0fe85514d9807ee2f6001 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Sat, 2 Oct 2021 12:08:09 +0200
Subject: [PATCH 188/735] Upgrade to Apache Johnzon 1.2.14, Vavr 0.10.4,
 WebJars Locator 0.48, HtmlUnit 2.53

---
 build.gradle                                         | 12 ++++++------
 .../converter/JsonbMessageConverterTests.java        |  6 +++---
 .../json/JsonbHttpMessageConverterTests.java         |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index c6545c8abf21..ec48137948d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id 'de.undercouch.download' version '4.1.2'
-	id "io.freefair.aspectj" version '6.1.0' apply false
+	id "io.freefair.aspectj" version '6.2.0' apply false
 	id "com.github.ben-manes.versions" version '0.39.0'
 	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
 	id "me.champeau.jmh" version "0.6.6" apply false
@@ -83,7 +83,7 @@ configure(allprojects) { project ->
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.10"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.14"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -99,7 +99,7 @@ configure(allprojects) { project ->
 			dependency "com.github.librepdf:openpdf:1.3.26"
 			dependency "com.rometools:rome:1.16.0"
 			dependency "commons-io:commons-io:2.5"
-			dependency "io.vavr:vavr:0.10.3"
+			dependency "io.vavr:vavr:0.10.4"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
 			dependencySet(group: 'org.apache.activemq', version: '5.16.2') {
 				entry 'activemq-broker'
@@ -125,7 +125,7 @@ configure(allprojects) { project ->
 			dependency "org.ehcache:ehcache:3.4.0"
 			dependency "org.hibernate:hibernate-core:5.4.32.Final"
 			dependency "org.hibernate:hibernate-validator:6.2.0.Final"
-			dependency "org.webjars:webjars-locator-core:0.47"
+			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
 			dependencySet(group: 'org.apache.tomcat', version: '9.0.53') {
@@ -206,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.52.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.53.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.52.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.53.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java
index 63380ea4ebcf..7b524de480ec 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/JsonbMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,7 +165,7 @@ public void toMessageUtf16() {
 		String payload = "H\u00e9llo W\u00f6rld";
 		Message<?> message = converter.toMessage(payload, headers);
 
-		assertThat(new String((byte[]) message.getPayload(), StandardCharsets.UTF_16BE)).isEqualTo(payload);
+		assertThat(new String((byte[]) message.getPayload(), StandardCharsets.UTF_16BE)).isEqualTo("\"" + payload + "\"");
 		assertThat(message.getHeaders().get(MessageHeaders.CONTENT_TYPE)).isEqualTo(contentType);
 	}
 
@@ -181,7 +181,7 @@ public void toMessageUtf16String() {
 		String payload = "H\u00e9llo W\u00f6rld";
 		Message<?> message = converter.toMessage(payload, headers);
 
-		assertThat(message.getPayload()).isEqualTo(payload);
+		assertThat(message.getPayload()).isEqualTo("\"" + payload + "\"");
 		assertThat(message.getHeaders().get(MessageHeaders.CONTENT_TYPE)).isEqualTo(contentType);
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
index 7649e8415bd5..44e14ac57612 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
@@ -162,7 +162,7 @@ public void writeUTF16() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		String body = "H\u00e9llo W\u00f6rld";
 		this.converter.write(body, contentType, outputMessage);
-		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_16BE)).as("Invalid result").isEqualTo(body);
+		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_16BE)).as("Invalid result").isEqualTo("\"" + body + "\"");
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(contentType);
 	}
 
@@ -260,7 +260,7 @@ public void prefixJson() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		this.converter.setPrefixJson(true);
 		this.converter.writeInternal("foo", null, outputMessage);
-		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")]}', foo");
+		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")]}', \"foo\"");
 	}
 
 	@Test
@@ -268,7 +268,7 @@ public void prefixJsonCustom() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		this.converter.setJsonPrefix(")))");
 		this.converter.writeInternal("foo", null, outputMessage);
-		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")))foo");
+		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(")))\"foo\"");
 	}
 
 

From 48eb51a22f640f395124bf546efdb36ce9641762 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Sat, 2 Oct 2021 12:38:26 +0200
Subject: [PATCH 189/735] Upgrade to Jackson 2.13

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 569569e295e4..0ec6ff0279c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ configure(allprojects) { project ->
 
 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.13.0"
 			mavenBom "io.netty:netty-bom:4.1.68.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.11"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"

From 151852b164e990dbff29235ef1bc010a3da0d723 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sun, 3 Oct 2021 07:09:24 +0200
Subject: [PATCH 190/735] Upgrade to GitHub Changelog Generator 0.0.7 in CI

Closes gh-27512
---
 ci/tasks/generate-changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml
index ea048af96a0f..b3f40278c8e6 100755
--- a/ci/tasks/generate-changelog.yml
+++ b/ci/tasks/generate-changelog.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.6'
+    tag: '0.0.7'
 inputs:
 - name: git-repo
 - name: artifactory-repo

From e68219c1acf6f3e3b49faa4e0b49eb02465b2e13 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 5 Oct 2021 12:12:17 +0100
Subject: [PATCH 191/735] ResponseStatusExceptionHandler logs exception message
 only

No need to log the full exception for a resolved exception, and as the
comment suggests that it mirrors Spring MVC equivalent, which also
logs the message only.
---
 .../web/server/handler/ResponseStatusExceptionHandler.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
index 52074e66f94c..618200530e09 100644
--- a/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
 		// Mirrors AbstractHandlerExceptionResolver in spring-webmvc...
 		String logPrefix = exchange.getLogPrefix();
 		if (this.warnLogger != null && this.warnLogger.isWarnEnabled()) {
-			this.warnLogger.warn(logPrefix + formatError(ex, exchange.getRequest()), ex);
+			this.warnLogger.warn(logPrefix + formatError(ex, exchange.getRequest()));
 		}
 		else if (logger.isDebugEnabled()) {
 			logger.debug(logPrefix + formatError(ex, exchange.getRequest()));

From be3bc4c16440795368252dc2030d68b1a2c58164 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 5 Oct 2021 14:24:18 +0200
Subject: [PATCH 192/735] Comment out unused fudgeFactor

---
 .../src/test/java/org/springframework/util/StopWatchTests.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
index a3458afb6a1f..396a06263b48 100644
--- a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
@@ -40,7 +40,7 @@ class StopWatchTests {
 
 	private static final long duration1 = 200;
 	private static final long duration2 = 100;
-	private static final long fudgeFactor = 100;
+	// private static final long fudgeFactor = 100;
 
 	private final StopWatch stopWatch = new StopWatch(ID);
 

From 48a507a99376165eebc020c2f61bbe412325f64c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 5 Oct 2021 14:35:32 +0200
Subject: [PATCH 193/735] Clean up warnings

---
 .../AutowiredAnnotationBeanPostProcessor.java        |  3 +--
 .../annotation/AsyncAnnotationAdvisor.java           |  1 -
 .../test/java/example/scannable/FooServiceImpl.java  |  3 ++-
 .../autoproxy/AspectJAutoProxyCreatorTests.java      |  7 -------
 .../aop/framework/CglibProxyTests.java               |  3 ++-
 .../AggressiveFactoryBeanInstantiationTests.java     |  1 +
 .../ConfigurationClassPostProcessorTests.java        |  4 +++-
 .../context/annotation/ParserStrategyUtilsTests.java |  4 ++--
 .../context/annotation/Spr12278Tests.java            |  3 +++
 .../context/annotation/Spr16179Tests.java            |  1 +
 .../ConfigurationClassProcessingTests.java           | 10 ++++------
 .../configuration/ImportResourceTests.java           |  7 ++++---
 .../configuration/ImportWithConditionTests.java      |  4 +++-
 .../ImportedConfigurationClassEnhancementTests.java  |  3 ++-
 .../annotation/configuration/Spr7167Tests.java       |  3 ++-
 .../support/BeanFactoryPostProcessorTests.java       |  6 +++---
 .../context/support/LiveBeansViewTests.java          |  3 ++-
 .../PropertyResourceConfigurerIntegrationTests.java  |  1 +
 .../PropertySourcesPlaceholderConfigurerTests.java   |  4 ++--
 .../StaticApplicationContextMulticasterTests.java    |  7 ++++---
 .../support/StaticApplicationContextTests.java       |  7 ++++---
 .../context/support/StaticMessageSourceTests.java    |  7 ++++---
 .../EnableMBeanExportConfigurationTests.java         |  4 ++--
 .../core/testfixture/codec/AbstractEncoderTests.java | 10 +++-------
 .../orm/hibernate5/HibernateTemplate.java            |  3 ++-
 .../springframework/r2dbc/core/binding/Bindings.java |  3 ++-
 .../http/codec/EncoderHttpMessageWriter.java         |  3 ---
 .../http/codec/json/Jackson2SmileEncoder.java        |  5 +----
 .../http/codec/json/Jackson2JsonDecoderTests.java    |  2 ++
 .../http/codec/json/Jackson2JsonEncoderTests.java    |  7 +++----
 .../result/method/AbstractHandlerMethodMapping.java  |  4 ----
 .../socket/adapter/ReactorNettyWebSocketSession.java |  1 +
 .../adapter/UndertowWebSocketHandlerAdapter.java     |  5 ++++-
 .../resource/AppCacheManifestTransformerTests.java   |  6 +++---
 .../reactive/resource/ResourceUrlProviderTests.java  |  2 ++
 .../web/servlet/ComplexWebApplicationContext.java    |  2 ++
 .../annotation/ResourceHandlerRegistryTests.java     | 12 +++++++-----
 .../resource/AppCacheManifestTransformerTests.java   |  6 +++---
 .../view/ContentNegotiatingViewResolverTests.java    |  9 +++++----
 39 files changed, 92 insertions(+), 84 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 2065f6b6e9b0..e7131a562ef7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -539,8 +539,7 @@ private MergedAnnotation<?> findAutowiredAnnotation(AccessibleObject ao) {
 	 */
 	@SuppressWarnings({"deprecation", "cast"})
 	protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
-		// The following (AnnotationAttributes) cast is required on JDK 9+.
-		return determineRequiredStatus((AnnotationAttributes)
+		return determineRequiredStatus(
 				ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
index c5636f2daa00..3b8792f7a15f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
@@ -75,7 +75,6 @@ public AsyncAnnotationAdvisor() {
 	 * handle unexpected exception thrown by asynchronous method executions
 	 * @see AnnotationAsyncExecutionInterceptor#getDefaultExecutor(BeanFactory)
 	 */
-	@SuppressWarnings("unchecked")
 	public AsyncAnnotationAdvisor(
 			@Nullable Executor executor, @Nullable AsyncUncaughtExceptionHandler exceptionHandler) {
 
diff --git a/spring-context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
index de062761fac8..6a39aaf892e9 100644
--- a/spring-context/src/test/java/example/scannable/FooServiceImpl.java
+++ b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@
 public abstract class FooServiceImpl implements FooService {
 
 	// Just to test ASM5's bytecode parsing of INVOKESPECIAL/STATIC on interfaces
+	@SuppressWarnings("unused")
 	private static final Comparator<MessageBean> COMPARATOR_BY_MESSAGE = Comparator.comparing(MessageBean::getMessage);
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 279e600ec9e8..d841044f2650 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -48,7 +48,6 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.lang.Nullable;
-import org.springframework.util.StopWatch;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -310,12 +309,6 @@ private String qName(String fileSuffix) {
 		return String.format("%s-%s", getClass().getSimpleName(), fileSuffix);
 	}
 
-	private void assertStopWatchTimeLimit(final StopWatch sw, final long maxTimeMillis) {
-		long totalTimeMillis = sw.getTotalTimeMillis();
-		assertThat(totalTimeMillis < maxTimeMillis).as("'" + sw.getLastTaskName() + "' took too long: expected less than<" + maxTimeMillis +
-				"> ms, actual<" + totalTimeMillis + "> ms.").isTrue();
-	}
-
 }
 
 @Aspect("pertarget(execution(* *.getSpouse()))")
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
index ba247ed89a9b..b1d1cd59438b 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -513,6 +513,7 @@ public void setName(String name) {
 			this.name = name;
 		}
 
+		@SuppressWarnings("unused")
 		public String getName() {
 			return this.name;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AggressiveFactoryBeanInstantiationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AggressiveFactoryBeanInstantiationTests.java
index 5f97cd7f5c9e..07edad06f9d6 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AggressiveFactoryBeanInstantiationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AggressiveFactoryBeanInstantiationTests.java
@@ -137,6 +137,7 @@ public Class<?> getObjectType() {
 
 	static class ExceptionInInitializer {
 
+		@SuppressWarnings("unused")
 		private static final int ERROR = callInClinit();
 
 		private static int callInClinit() {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
index 3b1f1a7f0dd9..2706511ea70f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1956,6 +1956,7 @@ Runnable testBean(Map<String, Runnable> testBeans,
 		}
 
 		// Unrelated, not to be considered as a factory method
+		@SuppressWarnings("unused")
 		private boolean testBean(boolean param) {
 			return param;
 		}
@@ -1985,6 +1986,7 @@ Runnable testBean() {
 		}
 
 		// Unrelated, not to be considered as a factory method
+		@SuppressWarnings("unused")
 		private boolean testBean(boolean param) {
 			return param;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ParserStrategyUtilsTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ParserStrategyUtilsTests.java
index d5e5fc54664c..f13afc69740b 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ParserStrategyUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ParserStrategyUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public class ParserStrategyUtilsTests {
 
 	@BeforeEach
 	void setup() {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		given(this.resourceLoader.getClassLoader()).willReturn(this.beanClassLoader);
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr12278Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr12278Tests.java
index afceea8a090c..c17203dbc131 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr12278Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr12278Tests.java
@@ -74,6 +74,7 @@ private static class SingleConstructorComponent {
 		private final String autowiredName;
 
 		// No @Autowired - implicit wiring
+		@SuppressWarnings("unused")
 		public SingleConstructorComponent(String autowiredName) {
 			this.autowiredName = autowiredName;
 		}
@@ -88,11 +89,13 @@ public TwoConstructorsComponent(String name) {
 			this.name = name;
 		}
 
+		@SuppressWarnings("unused")
 		public TwoConstructorsComponent() {
 			this("fallback");
 		}
 	}
 
+	@SuppressWarnings("unused")
 	private static class TwoSpecificConstructorsComponent {
 
 		private final Integer counter;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java
index afeae7ece20f..3bb817546445 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java
@@ -70,6 +70,7 @@ public static class AssemblerInjection {
 		Assembler<Page<String>> assembler2;
 
 		@Autowired(required = false)
+		@SuppressWarnings("rawtypes")
 		Assembler<Page> assembler3;
 
 		@Autowired(required = false)
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
index 89da3b916225..ce9033334c04 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
@@ -42,7 +42,6 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.config.ListFactoryBean;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -247,7 +246,9 @@ public void configurationWithAdaptiveResourcePrototypes() {
 	public void configurationWithPostProcessor() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(ConfigWithPostProcessor.class);
-		RootBeanDefinition placeholderConfigurer = new RootBeanDefinition(PropertyPlaceholderConfigurer.class);
+		@SuppressWarnings("deprecation")
+		RootBeanDefinition placeholderConfigurer = new RootBeanDefinition(
+				org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.class);
 		placeholderConfigurer.getPropertyValues().add("properties", "myProp=myValue");
 		ctx.registerBeanDefinition("placeholderConfigurer", placeholderConfigurer);
 		ctx.refresh();
@@ -536,6 +537,7 @@ public POBPP beanPostProcessor() {
 
 				String nameSuffix = "-processed-" + myProp;
 
+				@SuppressWarnings("unused")
 				public void setNameSuffix(String nameSuffix) {
 					this.nameSuffix = nameSuffix;
 				}
@@ -552,10 +554,6 @@ public Object postProcessBeforeInitialization(Object bean, String beanName) {
 				public Object postProcessAfterInitialization(Object bean, String beanName) {
 					return bean;
 				}
-
-				public int getOrder() {
-					return 0;
-				}
 			};
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
index 87dd37d39886..12fe608bbb06 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -166,8 +165,10 @@ static class ImportXmlAutowiredConfig {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	@Configuration
-	@ImportResource(locations = "classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties", reader = PropertiesBeanDefinitionReader.class)
+	@ImportResource(locations = "classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties",
+			reader = org.springframework.beans.factory.support.PropertiesBeanDefinitionReader.class)
 	static class ImportNonXmlResourceConfig {
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportWithConditionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportWithConditionTests.java
index 1a7b5f998b28..52755bd7e5f2 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportWithConditionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportWithConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-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.
@@ -59,6 +59,7 @@ public void unconditionalThenConditional() throws Exception {
 	protected static class ConditionalThenUnconditional {
 
 		@Autowired
+		@SuppressWarnings("unused")
 		private BeanOne beanOne;
 	}
 
@@ -68,6 +69,7 @@ protected static class ConditionalThenUnconditional {
 	protected static class UnconditionalThenConditional {
 
 		@Autowired
+		@SuppressWarnings("unused")
 		private BeanOne beanOne;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
index df640ffbd72d..8aa24e9f1e4b 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@ public void autowiredConfigClassIsEnhancedWhenRegisteredViaConstructor() {
 		autowiredConfigClassIsEnhanced(ConfigThatDoesNotImport.class, ConfigToBeAutowired.class);
 	}
 
+	@SuppressWarnings("deprecation")
 	private void autowiredConfigClassIsEnhanced(Class<?>... configClasses) {
 		ApplicationContext ctx = new AnnotationConfigApplicationContext(configClasses);
 		Config config = ctx.getBean(Config.class);
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
index ef73432110cc..6b66fcc5b5c0 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 
 public class Spr7167Tests {
 
+	@SuppressWarnings("deprecation")
 	@Test
 	public void test() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class);
diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
index ffbdceb815e7..93e0dfa25580 100644
--- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -75,6 +74,7 @@ public void testDefinedBeanFactoryPostProcessor() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void testMultipleDefinedBeanFactoryPostProcessors() {
 		StaticApplicationContext ac = new StaticApplicationContext();
 		ac.registerSingleton("tb1", TestBean.class);
@@ -84,7 +84,7 @@ public void testMultipleDefinedBeanFactoryPostProcessors() {
 		ac.registerSingleton("bfpp1", TestBeanFactoryPostProcessor.class, pvs1);
 		MutablePropertyValues pvs2 = new MutablePropertyValues();
 		pvs2.add("properties", "key=value");
-		ac.registerSingleton("bfpp2", PropertyPlaceholderConfigurer.class, pvs2);
+		ac.registerSingleton("bfpp2", org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.class, pvs2);
 		ac.refresh();
 		TestBeanFactoryPostProcessor bfpp = (TestBeanFactoryPostProcessor) ac.getBean("bfpp1");
 		assertThat(bfpp.initValue).isEqualTo("value");
diff --git a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java b/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
index 56c9ef44679e..983fa9bc88c7 100644
--- a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
  * @author Stephane Nicoll
  * @author Sam Brannen
  */
+@SuppressWarnings("deprecation")
 class LiveBeansViewTests {
 
 	private final MockEnvironment environment = new MockEnvironment();
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
index 82a018cf3663..9a598631dcf0 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
@@ -43,6 +43,7 @@
  * @author Sam Brannen
  * @see org.springframework.beans.factory.config.PropertyResourceConfigurerTests
  */
+@SuppressWarnings("deprecation")
 public class PropertyResourceConfigurerIntegrationTests {
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
index 03606bc6979c..8717dba116a5 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@
  */
 public class PropertySourcesPlaceholderConfigurerTests {
 
-
 	@Test
 	public void replacementFromEnvironmentProperties() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@@ -397,6 +396,7 @@ public Optional<String> getName() {
 			return name;
 		}
 
+		@SuppressWarnings("unused")
 		public void setName(Optional<String> name) {
 			this.name = name;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index 403bf613befa..491af1c4db00 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -48,6 +47,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio
 
 	protected StaticApplicationContext sac;
 
+	@SuppressWarnings("deprecation")
 	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
@@ -67,7 +67,8 @@ protected ConfigurableApplicationContext createContext() throws Exception {
 		sac.registerSingleton("beanThatListens", BeanThatListens.class, new MutablePropertyValues());
 		sac.registerSingleton("aca", ACATester.class, new MutablePropertyValues());
 		sac.registerPrototype("aca-prototype", ACATester.class, new MutablePropertyValues());
-		PropertiesBeanDefinitionReader reader = new PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
+		org.springframework.beans.factory.support.PropertiesBeanDefinitionReader reader =
+				new org.springframework.beans.factory.support.PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
 		Resource resource = new ClassPathResource("testBeans.properties", getClass());
 		reader.loadBeanDefinitions(new EncodedResource(resource, "ISO-8859-1"));
 		sac.refresh();
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index 91c06a88da48..023efd449bb8 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.testfixture.AbstractApplicationContextTests;
@@ -40,6 +39,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes
 
 	protected StaticApplicationContext sac;
 
+	@SuppressWarnings("deprecation")
 	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
@@ -57,7 +57,8 @@ protected ConfigurableApplicationContext createContext() throws Exception {
 		sac.registerSingleton("beanThatListens", BeanThatListens.class, new MutablePropertyValues());
 		sac.registerSingleton("aca", ACATester.class, new MutablePropertyValues());
 		sac.registerPrototype("aca-prototype", ACATester.class, new MutablePropertyValues());
-		PropertiesBeanDefinitionReader reader = new PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
+		org.springframework.beans.factory.support.PropertiesBeanDefinitionReader reader =
+				new org.springframework.beans.factory.support.PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
 		reader.loadBeanDefinitions(new ClassPathResource("testBeans.properties", getClass()));
 		sac.refresh();
 		sac.addApplicationListener(listener);
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
index 3b84bd9a8f8f..d24f13a13c8e 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.NoSuchMessageException;
@@ -176,6 +175,7 @@ public void messageSourceResolvable() {
 				sac.getMessage(resolvable4, Locale.US));
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
@@ -197,7 +197,8 @@ protected ConfigurableApplicationContext createContext() throws Exception {
 
 		sac.registerPrototype("aca-prototype", ACATester.class, new MutablePropertyValues());
 
-		PropertiesBeanDefinitionReader reader = new PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
+		org.springframework.beans.factory.support.PropertiesBeanDefinitionReader reader =
+				new org.springframework.beans.factory.support.PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
 		reader.loadBeanDefinitions(new ClassPathResource("testBeans.properties", getClass()));
 		sac.refresh();
 		sac.addApplicationListener(listener);
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java
index 5d7f8998a807..553a4cb14cdc 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/EnableMBeanExportConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -251,7 +251,7 @@ public MBeanExporterTests.Person person() {
 		@Bean
 		@Lazy
 		public Object notLoadable() throws Exception {
-			return Class.forName("does.not.exist").newInstance();
+			return Class.forName("does.not.exist").getDeclaredConstructor().newInstance();
 		}
 	}
 
diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/codec/AbstractEncoderTests.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/codec/AbstractEncoderTests.java
index 106cc114e89c..0b626f94de49 100644
--- a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/codec/AbstractEncoderTests.java
+++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/codec/AbstractEncoderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,8 +39,8 @@
 
 /**
  * Abstract base class for {@link Encoder} unit tests. Subclasses need to implement
- * {@link #canEncode()} and {@link #encode()}, possibly using the wide
- *  * variety of helper methods like {@link #testEncodeAll}.
+ * {@link #canEncode()} and {@link #encode()}, possibly using the wide variety of
+ * helper methods like {@link #testEncodeAll}.
  *
  * @author Arjen Poutsma
  * @since 5.1.3
@@ -58,9 +58,7 @@ public abstract class AbstractEncoderTests<E extends Encoder<?>> extends Abstrac
 	 * @param encoder the encoder
 	 */
 	protected AbstractEncoderTests(E encoder) {
-
 		Assert.notNull(encoder, "Encoder must not be null");
-
 		this.encoder = encoder;
 	}
 
@@ -253,13 +251,11 @@ protected Consumer<DataBuffer> expectString(String expected) {
 			release(dataBuffer);
 			assertThat(actual).isEqualTo(expected);
 		};
-
 	}
 
 	@SuppressWarnings("unchecked")
 	private <T> Encoder<T> encoder() {
 		return (Encoder<T>) this.encoder;
-
 	}
 
 	/**
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
index e624fca329af..d4433bc98551 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -983,6 +983,7 @@ public List<?> findByNamedQueryAndValueBean(String queryName, Object valueBean)
 	// Convenience query methods for iteration and bulk updates/deletes
 	//-------------------------------------------------------------------------
 
+	@SuppressWarnings("deprecation")
 	@Deprecated
 	@Override
 	public Iterator<?> iterate(String queryString, @Nullable Object... values) throws DataAccessException {
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/Bindings.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/Bindings.java
index 63cf20dc5fc1..9be490287ce4 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/Bindings.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/binding/Bindings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,6 +100,7 @@ public void apply(BindTarget bindTarget) {
 	 * Exceptions thrown by the action are relayed to the
 	 * @param action the action to be performed for each {@link Binding}
 	 */
+	@Override
 	public void forEach(Consumer<? super Binding> action) {
 		this.bindings.forEach((marker, binding) -> action.accept(binding));
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
index 3fe192077388..c2d6986bd201 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
@@ -180,9 +180,6 @@ private static MediaType addDefaultCharset(MediaType main, @Nullable MediaType d
 		return main;
 	}
 
-	private static void touch(DataBuffer buffer, Map<String, Object> hints) {
-	}
-
 	private boolean isStreamingMediaType(@Nullable MediaType mediaType) {
 		if (mediaType == null || !(this.encoder instanceof HttpMessageEncoder)) {
 			return false;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java
index 98d294d3bb35..580b35c0027d 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,6 @@ public class Jackson2SmileEncoder extends AbstractJackson2Encoder {
 			new MimeType("application", "x-jackson-smile"),
 			new MimeType("application", "*+x-jackson-smile")};
 
-	private static final MimeType STREAM_MIME_TYPE =
-			MediaType.parseMediaType("application/stream+x-jackson-smile");
-
 	private static final byte[] STREAM_SEPARATOR = new byte[0];
 
 
diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
index 8cfeb045f82b..aa8c1f5dfd14 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
@@ -76,6 +76,7 @@ public Jackson2JsonDecoderTests() {
 
 	@Override
 	@Test
+	@SuppressWarnings("deprecation")
 	public void canDecode() {
 		assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), APPLICATION_JSON)).isTrue();
 		assertThat(decoder.canDecode(ResolvableType.forClass(Pojo.class), APPLICATION_NDJSON)).isTrue();
@@ -311,6 +312,7 @@ private Mono<DataBuffer> stringBuffer(String value, Charset charset) {
 	}
 
 
+	@SuppressWarnings("unused")
 	private static class BeanWithNoDefaultConstructor {
 
 		private final String property1;
diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java
index ebeed1493b7f..a7fb6873d938 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonEncoderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,6 +65,7 @@ public Jackson2JsonEncoderTests() {
 
 	@Override
 	@Test
+	@SuppressWarnings("deprecation")
 	public void canEncode() {
 		ResolvableType pojoType = ResolvableType.forClass(Pojo.class);
 		assertThat(this.encoder.canEncode(pojoType, APPLICATION_JSON)).isTrue();
@@ -84,12 +85,11 @@ public void canEncode() {
 
 		// SPR-15910
 		assertThat(this.encoder.canEncode(ResolvableType.forClass(Object.class), APPLICATION_OCTET_STREAM)).isFalse();
-
-
 	}
 
 	@Override
 	@Test
+	@SuppressWarnings("deprecation")
 	public void encode() throws Exception {
 		Flux<Object> input = Flux.just(new Pojo("foo", "bar"),
 				new Pojo("foofoo", "barbar"),
@@ -257,7 +257,6 @@ public void encodeAscii() {
 				.consumeNextWith(expectString("{\"foo\":\"foo\",\"bar\":\"bar\"}"))
 				.verifyComplete(),
 				new MimeType("application", "json", StandardCharsets.US_ASCII), null);
-
 	}
 
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
index c2e01aaeff70..4487162cc9e6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
@@ -639,10 +639,6 @@ public Match(T mapping, MappingRegistration<T> registration) {
 			this.registration = registration;
 		}
 
-		public T getMapping() {
-			return this.mapping;
-		}
-
 		public HandlerMethod getHandlerMethod() {
 			return this.registration.getHandlerMethod();
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
index b84caa743902..9354318c714d 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
@@ -64,6 +64,7 @@ public ReactorNettyWebSocketSession(WebsocketInbound inbound, WebsocketOutbound
 	 * Constructor with an additional maxFramePayloadLength argument.
 	 * @since 5.1
 	 */
+	@SuppressWarnings("rawtypes")
 	public ReactorNettyWebSocketSession(WebsocketInbound inbound, WebsocketOutbound outbound,
 			HandshakeInfo info, NettyDataBufferFactory bufferFactory,
 			int maxFramePayloadLength) {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
index e2b0323a6146..879ea596b229 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,18 +58,21 @@ protected void onFullTextMessage(WebSocketChannel channel, BufferedTextMessage m
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	protected void onFullBinaryMessage(WebSocketChannel channel, BufferedBinaryMessage message) {
 		this.session.handleMessage(Type.BINARY, toMessage(Type.BINARY, message.getData().getResource()));
 		message.getData().free();
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	protected void onFullPongMessage(WebSocketChannel channel, BufferedBinaryMessage message) {
 		this.session.handleMessage(Type.PONG, toMessage(Type.PONG, message.getData().getResource()));
 		message.getData().free();
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	protected void onFullCloseMessage(WebSocketChannel channel, BufferedBinaryMessage message) {
 		CloseMessage closeMessage = new CloseMessage(message.getData().getResource());
 		this.session.handleClose(CloseStatus.create(closeMessage.getCode(), closeMessage.getReason()));
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
index d58f0fb81cbf..24ce532e492b 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,12 +37,13 @@
  * @author Rossen Stoyanchev
  * @author Brian Clozel
  */
+@SuppressWarnings("deprecation")
 public class AppCacheManifestTransformerTests {
 
 	private static final Duration TIMEOUT = Duration.ofSeconds(5);
 
 
-	private AppCacheManifestTransformer transformer;
+	private final AppCacheManifestTransformer transformer = new AppCacheManifestTransformer();
 
 	private ResourceTransformerChain chain;
 
@@ -57,7 +58,6 @@ public void setup() {
 		ResourceResolverChain resolverChain = new DefaultResourceResolverChain(resolvers);
 
 		this.chain = new DefaultResourceTransformerChain(resolverChain, Collections.emptyList());
-		this.transformer = new AppCacheManifestTransformer();
 		this.transformer.setResourceUrlProvider(createUrlProvider(resolvers));
 	}
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
index c4ffa23a1c1c..ec5d45344aaf 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
@@ -158,6 +158,8 @@ void initializeOnCurrentContext() {
 		assertThat(parentUrlProvider.getHandlerMap()).isEmpty();
 		ResourceUrlProvider childUrlProvider = childContext.getBean(ResourceUrlProvider.class);
 		assertThat(childUrlProvider.getHandlerMap()).hasKeySatisfying(pathPatternStringOf("/resources/**"));
+		childContext.close();
+		parentContext.close();
 	}
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
index 9c00d1950050..be08292460d1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
@@ -266,6 +266,7 @@ public ModelAndView handle(HttpServletRequest request, HttpServletResponse respo
 		}
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public long getLastModified(HttpServletRequest request, Object delegate) {
 			return ((MyHandler) delegate).lastModified();
 		}
@@ -286,6 +287,7 @@ public ModelAndView handle(HttpServletRequest request, HttpServletResponse respo
 		}
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public long getLastModified(HttpServletRequest request, Object delegate) {
 			return -1;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
index 0551598c492a..cce273a24937 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
-import org.springframework.web.servlet.resource.AppCacheManifestTransformer;
 import org.springframework.web.servlet.resource.CachingResourceResolver;
 import org.springframework.web.servlet.resource.CachingResourceTransformer;
 import org.springframework.web.servlet.resource.CssLinkResourceTransformer;
@@ -163,13 +162,14 @@ public void resourceChainWithoutCaching() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void resourceChainWithVersionResolver() throws Exception {
 		VersionResourceResolver versionResolver = new VersionResourceResolver()
 				.addFixedVersionStrategy("fixed", "/**/*.js")
 				.addContentVersionStrategy("/**");
 
 		this.registration.resourceChain(true).addResolver(versionResolver)
-				.addTransformer(new AppCacheManifestTransformer());
+				.addTransformer(new org.springframework.web.servlet.resource.AppCacheManifestTransformer());
 
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
 		List<ResourceResolver> resolvers = handler.getResourceResolvers();
@@ -183,17 +183,19 @@ public void resourceChainWithVersionResolver() throws Exception {
 		assertThat(transformers).hasSize(3);
 		assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
 		assertThat(transformers.get(1)).isInstanceOf(CssLinkResourceTransformer.class);
-		assertThat(transformers.get(2)).isInstanceOf(AppCacheManifestTransformer.class);
+		assertThat(transformers.get(2)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void resourceChainWithOverrides() throws Exception {
 		CachingResourceResolver cachingResolver = Mockito.mock(CachingResourceResolver.class);
 		VersionResourceResolver versionResolver = Mockito.mock(VersionResourceResolver.class);
 		WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class);
 		PathResourceResolver pathResourceResolver = new PathResourceResolver();
 		CachingResourceTransformer cachingTransformer = Mockito.mock(CachingResourceTransformer.class);
-		AppCacheManifestTransformer appCacheTransformer = Mockito.mock(AppCacheManifestTransformer.class);
+		org.springframework.web.servlet.resource.AppCacheManifestTransformer appCacheTransformer =
+				Mockito.mock(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
 		CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer();
 
 		this.registration.setCachePeriod(3600)
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
index 4b12502b8e58..2b321fa7bd93 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,10 @@
  * @author Brian Clozel
  * @author Rossen Stoyanchev
  */
+@SuppressWarnings("deprecation")
 public class AppCacheManifestTransformerTests {
 
-	private AppCacheManifestTransformer transformer;
+	private final AppCacheManifestTransformer transformer = new AppCacheManifestTransformer();
 
 	private ResourceTransformerChain chain;
 
@@ -59,7 +60,6 @@ public void setup() {
 		ResourceResolverChain resolverChain = new DefaultResourceResolverChain(resolvers);
 
 		this.chain = new DefaultResourceTransformerChain(resolverChain, Collections.emptyList());
-		this.transformer = new AppCacheManifestTransformer();
 		this.transformer.setResourceUrlProvider(createUrlProvider(resolvers));
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
index ec619d54aa07..4534036b6f6d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@
 import org.springframework.web.accept.HeaderContentNegotiationStrategy;
 import org.springframework.web.accept.MappingMediaTypeFileExtensionResolver;
 import org.springframework.web.accept.ParameterContentNegotiationStrategy;
-import org.springframework.web.accept.PathExtensionContentNegotiationStrategy;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.support.StaticWebApplicationContext;
@@ -312,11 +311,12 @@ public void resolveViewNameAcceptHeaderDefaultView() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void resolveViewNameFilename() throws Exception {
 		request.setRequestURI("/test.html");
 
 		ContentNegotiationManager manager =
-				new ContentNegotiationManager(new PathExtensionContentNegotiationStrategy());
+				new ContentNegotiationManager(new org.springframework.web.accept.PathExtensionContentNegotiationStrategy());
 
 		ViewResolver viewResolverMock1 = mock(ViewResolver.class, "viewResolver1");
 		ViewResolver viewResolverMock2 = mock(ViewResolver.class, "viewResolver2");
@@ -348,7 +348,8 @@ public void resolveViewNameFilenameDefaultView() throws Exception {
 		request.setRequestURI("/test.json");
 
 		Map<String, MediaType> mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
-		PathExtensionContentNegotiationStrategy pathStrategy = new PathExtensionContentNegotiationStrategy(mapping);
+		org.springframework.web.accept.PathExtensionContentNegotiationStrategy pathStrategy =
+				new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(mapping);
 		viewResolver.setContentNegotiationManager(new ContentNegotiationManager(pathStrategy));
 
 		ViewResolver viewResolverMock1 = mock(ViewResolver.class);

From 0e834660237459069e3bc929bb5062664fa0d51b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 5 Oct 2021 15:23:44 +0200
Subject: [PATCH 194/735] Reference Hamcrest Javadoc via javadoc.io

Due to an SSL/TLS issue with hamcrest.org, the Dokka task fails with the
following.

> Failed to download package-list from https://hamcrest.org/JavaHamcrest/javadoc/2.1/package-list,
> this might suggest that remote resource is not available, module is
> empty or dokka output got corrupted

See: https://github.com/hamcrest/JavaHamcrest/issues/280

As a workaround, this commit switches to javadoc.io to reference the
Hamcrest Javadoc APIs.
---
 gradle/docs-dokka.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
index ef06f904185c..ac2a56885154 100644
--- a/gradle/docs-dokka.gradle
+++ b/gradle/docs-dokka.gradle
@@ -17,7 +17,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
 			}
 			externalDocumentationLink {
-				url.set(new URL("https://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+				url.set(new URL("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))

From 7b9848a352b0403d59fdeabeb6dc6e4ee043c1a6 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 5 Oct 2021 14:32:46 +0100
Subject: [PATCH 195/735] Replace deprecated Reactor Context related methods

---
 .../reactive/TransactionContextManager.java   |  6 ++---
 ...bstractReactiveTransactionAspectTests.java | 16 +++++++-----
 .../ReactiveTransactionSupportTests.java      | 26 +++++++++----------
 ...bstractCoroutinesTransactionAspectTests.kt | 19 +++++++-------
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContextManager.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContextManager.java
index 0a2cdda01a89..db6f4fb414ce 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContextManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContextManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,8 +68,8 @@ public static Mono<TransactionContext> currentContext() throws NoTransactionExce
 	 * Create a {@link TransactionContext} and register it in the subscriber {@link Context}.
 	 * @return functional context registration.
 	 * @throws IllegalStateException if a transaction context is already associated.
-	 * @see Mono#subscriberContext(Function)
-	 * @see Flux#subscriberContext(Function)
+	 * @see Mono#contextWrite(Function)
+	 * @see Flux#contextWrite(Function)
 	 */
 	public static Function<Context, Context> createTransactionContext() {
 		return context -> context.put(TransactionContext.class, new TransactionContext());
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
index 6755d5df16a4..54f9b8eaa71c 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -350,12 +350,14 @@ public void cannotCommitTransaction() throws Exception {
 	}
 
 	private void checkReactiveTransaction(boolean expected) {
-		Mono.subscriberContext().handle((context, sink) -> {
-			if (context.hasKey(TransactionContext.class) != expected) {
-				fail("Should have thrown NoTransactionException");
-			}
-			sink.complete();
-		}).block();
+		Mono.deferContextual(Mono::just)
+				.handle((context, sink) -> {
+					if (context.hasKey(TransactionContext.class) != expected) {
+						fail("Should have thrown NoTransactionException");
+					}
+					sink.complete();
+				})
+				.block();
 	}
 
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/reactive/ReactiveTransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/reactive/ReactiveTransactionSupportTests.java
index b67f5bf8a4a9..4912c96226a0 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/reactive/ReactiveTransactionSupportTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/reactive/ReactiveTransactionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,19 +41,19 @@ public void noExistingTransaction() {
 		ReactiveTransactionManager tm = new ReactiveTestTransactionManager(false, true);
 
 		tm.getReactiveTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_SUPPORTS))
-				.subscriberContext(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
+				.contextWrite(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
 				.as(StepVerifier::create).consumeNextWith(actual -> assertThat(actual.hasTransaction()).isFalse()
 		).verifyComplete();
 
 		tm.getReactiveTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRED))
-				.cast(GenericReactiveTransaction.class).subscriberContext(TransactionContextManager.createTransactionContext())
+				.cast(GenericReactiveTransaction.class).contextWrite(TransactionContextManager.createTransactionContext())
 				.as(StepVerifier::create).consumeNextWith(actual -> {
 			assertThat(actual.hasTransaction()).isTrue();
 			assertThat(actual.isNewTransaction()).isTrue();
 		}).verifyComplete();
 
 		tm.getReactiveTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_MANDATORY))
-				.subscriberContext(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
+				.contextWrite(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
 				.as(StepVerifier::create).expectError(IllegalTransactionStateException.class).verify();
 	}
 
@@ -62,21 +62,21 @@ public void existingTransaction() {
 		ReactiveTransactionManager tm = new ReactiveTestTransactionManager(true, true);
 
 		tm.getReactiveTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_SUPPORTS))
-				.subscriberContext(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
+				.contextWrite(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
 				.as(StepVerifier::create).consumeNextWith(actual -> {
 			assertThat(actual.getTransaction()).isNotNull();
 			assertThat(actual.isNewTransaction()).isFalse();
 		}).verifyComplete();
 
 		tm.getReactiveTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRED))
-				.subscriberContext(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
+				.contextWrite(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
 				.as(StepVerifier::create).consumeNextWith(actual -> {
 			assertThat(actual.getTransaction()).isNotNull();
 			assertThat(actual.isNewTransaction()).isFalse();
 		}).verifyComplete();
 
 		tm.getReactiveTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_MANDATORY))
-				.subscriberContext(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
+				.contextWrite(TransactionContextManager.createTransactionContext()).cast(GenericReactiveTransaction.class)
 				.as(StepVerifier::create).consumeNextWith(actual -> {
 			assertThat(actual.getTransaction()).isNotNull();
 			assertThat(actual.isNewTransaction()).isFalse();
@@ -87,7 +87,7 @@ public void existingTransaction() {
 	public void commitWithoutExistingTransaction() {
 		ReactiveTestTransactionManager tm = new ReactiveTestTransactionManager(false, true);
 		tm.getReactiveTransaction(new DefaultTransactionDefinition()).flatMap(tm::commit)
-				.subscriberContext(TransactionContextManager.createTransactionContext())
+				.contextWrite(TransactionContextManager.createTransactionContext())
 				.as(StepVerifier::create).verifyComplete();
 
 		assertHasBegan(tm);
@@ -101,7 +101,7 @@ public void commitWithoutExistingTransaction() {
 	public void rollbackWithoutExistingTransaction() {
 		ReactiveTestTransactionManager tm = new ReactiveTestTransactionManager(false, true);
 		tm.getReactiveTransaction(new DefaultTransactionDefinition()).flatMap(tm::rollback)
-				.subscriberContext(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
+				.contextWrite(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
 				.verifyComplete();
 
 		assertHasBegan(tm);
@@ -116,7 +116,7 @@ public void rollbackOnlyWithoutExistingTransaction() {
 		ReactiveTestTransactionManager tm = new ReactiveTestTransactionManager(false, true);
 		tm.getReactiveTransaction(new DefaultTransactionDefinition()).doOnNext(ReactiveTransaction::setRollbackOnly)
 				.flatMap(tm::commit)
-				.subscriberContext(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
+				.contextWrite(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
 				.verifyComplete();
 
 		assertHasBegan(tm);
@@ -130,7 +130,7 @@ public void rollbackOnlyWithoutExistingTransaction() {
 	public void commitWithExistingTransaction() {
 		ReactiveTestTransactionManager tm = new ReactiveTestTransactionManager(true, true);
 		tm.getReactiveTransaction(new DefaultTransactionDefinition()).flatMap(tm::commit)
-				.subscriberContext(TransactionContextManager.createTransactionContext())
+				.contextWrite(TransactionContextManager.createTransactionContext())
 				.as(StepVerifier::create).verifyComplete();
 
 		assertHasNotBegan(tm);
@@ -144,7 +144,7 @@ public void commitWithExistingTransaction() {
 	public void rollbackWithExistingTransaction() {
 		ReactiveTestTransactionManager tm = new ReactiveTestTransactionManager(true, true);
 		tm.getReactiveTransaction(new DefaultTransactionDefinition()).flatMap(tm::rollback)
-				.subscriberContext(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
+				.contextWrite(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
 				.verifyComplete();
 
 		assertHasNotBegan(tm);
@@ -158,7 +158,7 @@ public void rollbackWithExistingTransaction() {
 	public void rollbackOnlyWithExistingTransaction() {
 		ReactiveTestTransactionManager tm = new ReactiveTestTransactionManager(true, true);
 		tm.getReactiveTransaction(new DefaultTransactionDefinition()).doOnNext(ReactiveTransaction::setRollbackOnly).flatMap(tm::commit)
-				.subscriberContext(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
+				.contextWrite(TransactionContextManager.createTransactionContext()).as(StepVerifier::create)
 				.verifyComplete();
 
 		assertHasNotBegan(tm);
diff --git a/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt b/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt
index bf437fb430f3..e620ccf4de79 100644
--- a/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt
+++ b/spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.springframework.transaction.*
 import org.springframework.transaction.reactive.TransactionContext
 import reactor.core.publisher.Mono
 import reactor.core.publisher.SynchronousSink
-import reactor.util.context.Context
+import reactor.util.context.ContextView
 import java.lang.reflect.Method
 import kotlin.coroutines.Continuation
 
@@ -299,14 +299,15 @@ abstract class AbstractCoroutinesTransactionAspectTests {
 		}
 	}
 
-	@Suppress("DEPRECATION")
 	private fun checkReactiveTransaction(expected: Boolean) {
-		Mono.subscriberContext().handle { context: Context, sink: SynchronousSink<Any?> ->
-			if (context.hasKey(TransactionContext::class.java) != expected) {
-				Fail.fail<Any>("Should have thrown NoTransactionException")
-			}
-			sink.complete()
-		}.block()
+		Mono.deferContextual{context -> Mono.just(context)}
+				.handle { context: ContextView, sink: SynchronousSink<Any?> ->
+					if (context.hasKey(TransactionContext::class.java) != expected) {
+						Fail.fail<Any>("Should have thrown NoTransactionException")
+					}
+					sink.complete()
+				}
+				.block()
 	}
 
 	protected open fun advised(target: Any, rtm: ReactiveTransactionManager, tas: Array<TransactionAttributeSource>): Any {

From c99210c01fa080758ce1e7b312a8b184dce1d7a6 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Tue, 5 Oct 2021 16:20:30 +0200
Subject: [PATCH 196/735] Propagate Reactor Context when using FluxSink

This commit makes sure that the Reactor context from a given mono or
flux is propagated to the Flux returned by a FluxSink. This change
affects both DataBufferUtils::write and internal classes used by the
DefaultPartHttpMessageReader.

Closes gh-27517
---
 .../core/io/buffer/DataBufferUtils.java       | 13 +++++
 .../core/io/buffer/DataBufferUtilsTests.java  | 49 +++++++++++++++++++
 .../http/codec/multipart/MultipartParser.java |  6 +++
 .../http/codec/multipart/PartGenerator.java   |  6 +++
 4 files changed, 74 insertions(+)

diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
index 127359293740..ad0419ee4b77 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
@@ -47,6 +47,7 @@
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.SynchronousSink;
+import reactor.util.context.Context;
 
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
@@ -1057,6 +1058,12 @@ protected void hookOnError(Throwable throwable) {
 		protected void hookOnComplete() {
 			this.sink.complete();
 		}
+
+		@Override
+		public Context currentContext() {
+			return this.sink.currentContext();
+		}
+
 	}
 
 
@@ -1148,6 +1155,12 @@ private void sinkDataBuffer() {
 			this.sink.next(dataBuffer);
 			this.dataBuffer.set(null);
 		}
+
+		@Override
+		public Context currentContext() {
+			return this.sink.currentContext();
+		}
+
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
index 8615551b3193..ba85a1575bc1 100644
--- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
@@ -24,6 +24,7 @@
 import java.nio.channels.CompletionHandler;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.SeekableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -43,6 +44,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
+import reactor.util.context.Context;
 
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
@@ -940,6 +942,53 @@ void matcher3(String displayName, DataBufferFactory bufferFactory) {
 		release(foo);
 	}
 
+	@ParameterizedDataBufferAllocatingTest
+	void propagateContextByteChannel(String displayName, DataBufferFactory bufferFactory) throws IOException {
+		Path path = Paths.get(this.resource.getURI());
+		try (SeekableByteChannel out = Files.newByteChannel(this.tempFile, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
+			Flux<DataBuffer> result = DataBufferUtils.read(path, bufferFactory, 1024, StandardOpenOption.READ)
+					.transformDeferredContextual((f, ctx) -> {
+						assertThat(ctx.getOrDefault("key", "EMPTY")).isEqualTo("TEST");
+						return f;
+					})
+					.transform(f -> DataBufferUtils.write(f, out))
+					.transformDeferredContextual((f, ctx) -> {
+						assertThat(ctx.getOrDefault("key", "EMPTY")).isEqualTo("TEST");
+						return f;
+					})
+					.contextWrite(Context.of("key", "TEST"));
+
+			StepVerifier.create(result)
+					.consumeNextWith(DataBufferUtils::release)
+					.verifyComplete();
+
+
+		}
+	}
+
+	@ParameterizedDataBufferAllocatingTest
+	void propagateContextAsynchronousFileChannel(String displayName, DataBufferFactory bufferFactory) throws IOException {
+		Path path = Paths.get(this.resource.getURI());
+		try (AsynchronousFileChannel out = AsynchronousFileChannel.open(this.tempFile, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
+			Flux<DataBuffer> result = DataBufferUtils.read(path, bufferFactory, 1024, StandardOpenOption.READ)
+					.transformDeferredContextual((f, ctx) -> {
+						assertThat(ctx.getOrDefault("key", "EMPTY")).isEqualTo("TEST");
+						return f;
+					})
+					.transform(f -> DataBufferUtils.write(f, out))
+					.transformDeferredContextual((f, ctx) -> {
+						assertThat(ctx.getOrDefault("key", "EMPTY")).isEqualTo("TEST");
+						return f;
+					})
+					.contextWrite(Context.of("key", "TEST"));
+
+			StepVerifier.create(result)
+					.consumeNextWith(DataBufferUtils::release)
+					.verifyComplete();
+
+
+		}
+	}
 
 	private static class ZeroDemandSubscriber extends BaseSubscriber<DataBuffer> {
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
index 3d9ab7f2b3b6..d2057f53d627 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
@@ -29,6 +29,7 @@
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
+import reactor.util.context.Context;
 
 import org.springframework.core.codec.DecodingException;
 import org.springframework.core.io.buffer.DataBuffer;
@@ -98,6 +99,11 @@ public static Flux<Token> parse(Flux<DataBuffer> buffers, byte[] boundary, int m
 		});
 	}
 
+	@Override
+	public Context currentContext() {
+		return this.sink.currentContext();
+	}
+
 	@Override
 	protected void hookOnSubscribe(Subscription subscription) {
 		requestBuffer();
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
index 9de34009d480..32a923d8a7d5 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
@@ -42,6 +42,7 @@
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
+import reactor.util.context.Context;
 
 import org.springframework.core.codec.DecodingException;
 import org.springframework.core.io.buffer.DataBuffer;
@@ -113,6 +114,11 @@ public static Flux<Part> createParts(Flux<MultipartParser.Token> tokens, int max
 		});
 	}
 
+	@Override
+	public Context currentContext() {
+		return this.sink.currentContext();
+	}
+
 	@Override
 	protected void hookOnSubscribe(Subscription subscription) {
 		requestToken();

From 47b0da6b257dbe47f95e7ee3e7a55ef57e5641de Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 6 Oct 2021 11:48:30 +0200
Subject: [PATCH 197/735] Polishing

---
 .../src/test/java/org/springframework/util/ClassUtilsTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
index b8ddd8c4ca75..f14412ba4b18 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -154,7 +154,7 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
 		assertThat(ClassUtils.isCacheSafe(composite, childLoader3)).isTrue();
 	}
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "''{0}'' -> {1}")
 	@CsvSource({
 		"boolean, boolean",
 		"byte, byte",

From 41ae9632d1ede2ceafbcb727166b6d6b6d4ab490 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 6 Oct 2021 12:02:26 +0200
Subject: [PATCH 198/735] Upgrade to Checkstyle 9.0 and spring-javaformat
 0.0.29

This commit upgrades the Gradle build to use Checkstyle 9.0 and
spring-javaformat 0.0.29 (which internally uses Checkstyle 8.45.1).

Closes gh-27520
---
 build.gradle                                       |  5 ++---
 .../java/org/springframework/beans/BeanUtils.java  |  2 +-
 .../PropertySourcesPlaceholderConfigurer.java      |  4 ++--
 .../org/springframework/jndi/JndiCallback.java     |  4 ++--
 .../springframework/core/AttributeAccessor.java    |  4 ++--
 .../springframework/core/CollectionFactory.java    | 14 +++++++-------
 .../core/annotation/AnnotationFilter.java          |  4 ++--
 .../core/annotation/AnnotationsProcessor.java      |  6 +++---
 .../core/annotation/ValueExtractor.java            |  4 ++--
 .../core/env/AbstractEnvironment.java              |  3 +++
 .../messaging/rsocket/RSocketRequester.java        |  4 ++--
 .../org/springframework/mock/web/MockCookie.java   |  2 +-
 .../context/ContextConfigurationAttributes.java    |  4 ++--
 .../test/context/MergedContextConfiguration.java   |  6 +++---
 .../test/context/jdbc/MergedSqlConfig.java         |  4 ++--
 .../junit4/statements/ProfileValueChecker.java     |  6 +++---
 .../support/AbstractGenericContextLoader.java      |  6 +++---
 .../support/GenericGroovyXmlContextLoader.java     |  4 ++--
 .../web/AbstractGenericWebContextLoader.java       |  4 ++--
 .../web/GenericGroovyXmlWebContextLoader.java      |  4 ++--
 .../web/servlet/result/StatusResultMatchers.java   |  6 +++---
 .../transaction/reactive/TransactionCallback.java  |  4 ++--
 .../transaction/support/TransactionCallback.java   |  4 ++--
 .../java/org/springframework/http/MediaType.java   |  6 +++---
 .../org/springframework/http/ResponseCookie.java   |  4 ++--
 .../web/client/AsyncRequestCallback.java           |  4 ++--
 .../web/client/RequestCallback.java                |  4 ++--
 .../web/filter/reactive/ForwardedHeaderFilter.java |  6 +++---
 .../web/reactive/function/client/WebClient.java    |  2 +-
 .../web/servlet/HandlerAdapter.java                |  2 +-
 .../web/servlet/mvc/LastModified.java              | 10 +++++-----
 .../web/servlet/mvc/method/RequestMappingInfo.java |  2 +-
 .../view/DefaultRequestToViewNameTranslator.java   |  6 +++---
 src/checkstyle/checkstyle.xml                      |  2 +-
 34 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/build.gradle b/build.gradle
index ec48137948d3..78f42328360c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.41"
+		toolVersion = "9.0"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
@@ -362,8 +362,7 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.28")
-		checkstyle("com.puppycrawl.tools:checkstyle:8.41")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.29")
 	}
 
 	ext.javadocLinks = [
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 3a2b3f0b03ae..77aff7ffe08e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -100,9 +100,9 @@ public abstract class BeanUtils {
 	 * @param clazz class to instantiate
 	 * @return the new instance
 	 * @throws BeanInstantiationException if the bean cannot be instantiated
+	 * @see Class#newInstance()
 	 * @deprecated as of Spring 5.0, following the deprecation of
 	 * {@link Class#newInstance()} in JDK 9
-	 * @see Class#newInstance()
 	 */
 	@Deprecated
 	public static <T> T instantiate(Class<T> clazz) throws BeanInstantiationException {
diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
index abbfec08ab2e..a0907a1f3a15 100644
--- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -185,9 +185,9 @@ protected void processProperties(ConfigurableListableBeanFactory beanFactoryToPr
 	/**
 	 * Implemented for compatibility with
 	 * {@link org.springframework.beans.factory.config.PlaceholderConfigurerSupport}.
+	 * @throws UnsupportedOperationException in this implementation
 	 * @deprecated in favor of
 	 * {@link #processProperties(ConfigurableListableBeanFactory, ConfigurablePropertyResolver)}
-	 * @throws UnsupportedOperationException in this implementation
 	 */
 	@Override
 	@Deprecated
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
index c463cdb10013..cf53e20a47b1 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,8 +44,8 @@ public interface JndiCallback<T> {
 	 * <p>Implementations don't need to worry about error handling
 	 * or cleanup, as the JndiTemplate class will handle this.
 	 * @param ctx the current JNDI context
-	 * @throws NamingException if thrown by JNDI methods
 	 * @return a result object, or {@code null}
+	 * @throws NamingException if thrown by JNDI methods
 	 */
 	@Nullable
 	T doInContext(Context ctx) throws NamingException;
diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
index ea6d3a0c43f2..f8644f2cbab7 100644
--- a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
+++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,9 +65,9 @@ public interface AttributeAccessor {
 	 * @param computeFunction a function that computes a new value for the attribute
 	 * name; the function must not return a {@code null} value
 	 * @return the existing value or newly computed value for the named attribute
+	 * @since 5.3.3
 	 * @see #getAttribute(String)
 	 * @see #setAttribute(String, Object)
-	 * @since 5.3.3
 	 */
 	@SuppressWarnings("unchecked")
 	default <T> T computeAttribute(String name, Function<String, T> computeFunction) {
diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
index 30225a708f35..4f90a3bff18e 100644
--- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -169,14 +169,14 @@ public static <E> Collection<E> createCollection(Class<?> collectionType, int ca
 	 * (note: only relevant for {@link EnumSet} creation)
 	 * @param capacity the initial capacity
 	 * @return a new collection instance
+	 * @throws IllegalArgumentException if the supplied {@code collectionType} is
+	 * {@code null}; or if the desired {@code collectionType} is {@link EnumSet} and
+	 * the supplied {@code elementType} is not a subtype of {@link Enum}
 	 * @since 4.1.3
 	 * @see java.util.LinkedHashSet
 	 * @see java.util.ArrayList
 	 * @see java.util.TreeSet
 	 * @see java.util.EnumSet
-	 * @throws IllegalArgumentException if the supplied {@code collectionType} is
-	 * {@code null}; or if the desired {@code collectionType} is {@link EnumSet} and
-	 * the supplied {@code elementType} is not a subtype of {@link Enum}
 	 */
 	@SuppressWarnings({"unchecked", "cast"})
 	public static <E> Collection<E> createCollection(Class<?> collectionType, @Nullable Class<?> elementType, int capacity) {
@@ -285,14 +285,14 @@ public static <K, V> Map<K, V> createMap(Class<?> mapType, int capacity) {
 	 * (note: only relevant for {@link EnumMap} creation)
 	 * @param capacity the initial capacity
 	 * @return a new map instance
+	 * @throws IllegalArgumentException if the supplied {@code mapType} is
+	 * {@code null}; or if the desired {@code mapType} is {@link EnumMap} and
+	 * the supplied {@code keyType} is not a subtype of {@link Enum}
 	 * @since 4.1.3
 	 * @see java.util.LinkedHashMap
 	 * @see java.util.TreeMap
 	 * @see org.springframework.util.LinkedMultiValueMap
 	 * @see java.util.EnumMap
-	 * @throws IllegalArgumentException if the supplied {@code mapType} is
-	 * {@code null}; or if the desired {@code mapType} is {@link EnumMap} and
-	 * the supplied {@code keyType} is not a subtype of {@link Enum}
 	 */
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	public static <K, V> Map<K, V> createMap(Class<?> mapType, @Nullable Class<?> keyType, int capacity) {
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java
index 07963dc3e8d3..9b5e4ecd2f94 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,10 +74,10 @@ public String toString() {
 	/**
 	 * {@link AnnotationFilter} that never matches and can be used when no
 	 * filtering is needed (allowing for any annotation types to be present).
+	 * @see #PLAIN
 	 * @deprecated as of 5.2.6 since the {@link MergedAnnotations} model
 	 * always ignores lang annotations according to the {@link #PLAIN} filter
 	 * (for efficiency reasons)
-	 * @see #PLAIN
 	 */
 	@Deprecated
 	AnnotationFilter NONE = new AnnotationFilter() {
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsProcessor.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsProcessor.java
index 75552f3b24ef..f7a3d16f2df3 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsProcessor.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@
 /**
  * Callback interface used to process annotations.
  *
- * @param <C> the context type
- * @param <R> the result type
  * @author Phillip Webb
  * @since 5.2
+ * @param <C> the context type
+ * @param <R> the result type
  * @see AnnotationsScanner
  * @see TypeMappedAnnotations
  */
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/ValueExtractor.java b/spring-core/src/main/java/org/springframework/core/annotation/ValueExtractor.java
index 62438f629bf7..5f1b2146393c 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/ValueExtractor.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/ValueExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@
  * source object which is typically an {@link Annotation}, {@link Map}, or
  * {@link TypeMappedAnnotation}.
  *
- * @since 5.2.4
  * @author Sam Brannen
+ * @since 5.2.4
  */
 @FunctionalInterface
 interface ValueExtractor {
diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index 85968d699a89..8ce86529c7e7 100644
--- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -209,10 +209,13 @@ protected final ConfigurablePropertyResolver getPropertyResolver() {
 	 * </pre>
 	 *
 	 * <p>The search order is now C, D, A, B as desired.
+	 *
 	 * <p>Beyond these recommendations, subclasses may use any of the {@code add*},
 	 * {@code remove}, or {@code replace} methods exposed by {@link MutablePropertySources}
 	 * in order to create the exact arrangement of property sources desired.
+	 *
 	 * <p>The base implementation registers no property sources.
+	 *
 	 * <p>Note that clients of any {@link ConfigurableEnvironment} may further customize
 	 * property sources via the {@link #getPropertySources()} accessor, typically within
 	 * an {@link org.springframework.context.ApplicationContextInitializer
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
index 63c726037734..365d894cb953 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
@@ -305,8 +305,8 @@ RSocketRequester transports(
 		 * @param host the server host
 		 * @param port the server port
 		 * @return an {@code RSocketRequester} for the connection
-		 * @deprecated as of 5.3 in favor of {@link #tcp(String, int)}
 		 * @see TcpClientTransport
+		 * @deprecated as of 5.3 in favor of {@link #tcp(String, int)}
 		 */
 		@Deprecated
 		Mono<RSocketRequester> connectTcp(String host, int port);
@@ -315,8 +315,8 @@ RSocketRequester transports(
 		 * Connect to the server over WebSocket.
 		 * @param uri the RSocket server endpoint URI
 		 * @return an {@code RSocketRequester} for the connection
-		 * @deprecated as of 5.3 in favor of {@link #websocket(URI)}
 		 * @see WebsocketClientTransport
+		 * @deprecated as of 5.3 in favor of {@link #websocket(URI)}
 		 */
 		@Deprecated
 		Mono<RSocketRequester> connectWebSocket(URI uri);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
index 372898cd5a36..759eae8f9f0f 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
@@ -68,8 +68,8 @@ public void setExpires(@Nullable ZonedDateTime expires) {
 
 	/**
 	 * Get the "Expires" attribute for this cookie.
-	 * @since 5.1.11
 	 * @return the "Expires" attribute for this cookie, or {@code null} if not set
+	 * @since 5.1.11
 	 */
 	@Nullable
 	public ZonedDateTime getExpires() {
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
index 2f29ba978c2b..e910c4c9d5e4 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -300,8 +300,8 @@ public boolean isInheritInitializers() {
 	 * Get the name of the context hierarchy level that was declared via
 	 * {@link ContextConfiguration @ContextConfiguration}.
 	 * @return the name of the context hierarchy level or {@code null} if not applicable
-	 * @see ContextConfiguration#name()
 	 * @since 3.2.2
+	 * @see ContextConfiguration#name()
 	 */
 	@Nullable
 	public String getName() {
diff --git a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
index f434b14022a2..2ae169bd2959 100644
--- a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -372,8 +372,8 @@ public ContextLoader getContextLoader() {
 	 * Get the {@link MergedContextConfiguration} for the parent application context
 	 * in a context hierarchy.
 	 * @return the parent configuration or {@code null} if there is no parent
-	 * @see #getParentApplicationContext()
 	 * @since 3.2.2
+	 * @see #getParentApplicationContext()
 	 */
 	@Nullable
 	public MergedContextConfiguration getParent() {
@@ -386,8 +386,8 @@ public MergedContextConfiguration getParent() {
 	 * <p>If the parent context has not yet been loaded, it will be loaded, stored
 	 * in the cache, and then returned.
 	 * @return the parent {@code ApplicationContext} or {@code null} if there is no parent
-	 * @see #getParent()
 	 * @since 3.2.2
+	 * @see #getParent()
 	 */
 	@Nullable
 	public ApplicationContext getParentApplicationContext() {
diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
index 1ca7bda328d4..8130ddd3b8bb 100644
--- a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
+++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -174,8 +174,8 @@ String getSeparator() {
 
 	/**
 	 * Get the prefixes that identify single-line comments within the SQL scripts.
-	 * @see SqlConfig#commentPrefixes()
 	 * @since 5.2
+	 * @see SqlConfig#commentPrefixes()
 	 */
 	String[] getCommentPrefixes() {
 		return this.commentPrefixes;
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/ProfileValueChecker.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/ProfileValueChecker.java
index accd806e5fed..d9162ae0d4d6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/ProfileValueChecker.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/ProfileValueChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,10 +77,10 @@ public ProfileValueChecker(Statement next, Class<?> testClass, @Nullable Method
 	 * <p>If a test is not enabled, this method will abort further evaluation
 	 * of the execution chain with a failed assumption; otherwise, this method
 	 * will simply evaluate the next {@link Statement} in the execution chain.
-	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Class)
-	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Method, Class)
 	 * @throws AssumptionViolatedException if the test is disabled
 	 * @throws Throwable if evaluation of the next statement fails
+	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Class)
+	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Method, Class)
 	 */
 	@Override
 	public void evaluate() throws Throwable {
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
index 8794ec49f49a..45ae716f6f02 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,9 +97,9 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * context and registers a JVM shutdown hook for it.</li>
 	 * </ul>
 	 * @return a new application context
+	 * @since 3.1
 	 * @see org.springframework.test.context.SmartContextLoader#loadContext(MergedContextConfiguration)
 	 * @see GenericApplicationContext
-	 * @since 3.1
 	 */
 	@Override
 	public final ConfigurableApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
@@ -170,10 +170,10 @@ protected void validateMergedContextConfiguration(MergedContextConfiguration mer
 	 * and {@link AbstractContextLoader#prepareContext(ConfigurableApplicationContext, MergedContextConfiguration)}
 	 * for an alternative.
 	 * @return a new application context
+	 * @since 2.5
 	 * @see org.springframework.test.context.ContextLoader#loadContext
 	 * @see GenericApplicationContext
 	 * @see #loadContext(MergedContextConfiguration)
-	 * @since 2.5
 	 */
 	@Override
 	public final ConfigurableApplicationContext loadContext(String... locations) throws Exception {
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/GenericGroovyXmlContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericGroovyXmlContextLoader.java
index 86dc00da9489..4c4a02990253 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/GenericGroovyXmlContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/GenericGroovyXmlContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,8 @@ protected String[] getResourceSuffixes() {
 	 * {@code GenericGroovyXmlContextLoader} supports both Groovy and XML
 	 * resource types for detection of defaults. Consequently, this method
 	 * is not supported.
-	 * @see #getResourceSuffixes()
 	 * @throws UnsupportedOperationException in this implementation
+	 * @see #getResourceSuffixes()
 	 */
 	@Override
 	protected String getResourceSuffix() {
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
index c363dd2d671c..e48cfecc8ac8 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -260,8 +260,8 @@ protected void customizeContext(
 	 * {@link org.springframework.test.context.SmartContextLoader SmartContextLoader},
 	 * not as a legacy {@link org.springframework.test.context.ContextLoader ContextLoader}.
 	 * Consequently, this method is not supported.
-	 * @see org.springframework.test.context.ContextLoader#loadContext(java.lang.String[])
 	 * @throws UnsupportedOperationException in this implementation
+	 * @see org.springframework.test.context.ContextLoader#loadContext(java.lang.String[])
 	 */
 	@Override
 	public final ApplicationContext loadContext(String... locations) throws Exception {
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.java
index d0f32b423971..c84f033e5a98 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,8 @@ protected String[] getResourceSuffixes() {
 	 * {@code GenericGroovyXmlWebContextLoader} supports both Groovy and XML
 	 * resource types for detection of defaults. Consequently, this method
 	 * is not supported.
-	 * @see #getResourceSuffixes()
 	 * @throws UnsupportedOperationException in this implementation
+	 * @see #getResourceSuffixes()
 	 */
 	@Override
 	protected String getResourceSuffix() {
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
index a33eba0fa13b..6983b6866097 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -390,8 +390,8 @@ public ResultMatcher isPayloadTooLarge() {
 
 	/**
 	 * Assert the response status code is {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE} (413).
-	 * @deprecated matching the deprecation of {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE}
 	 * @see #isPayloadTooLarge()
+	 * @deprecated matching the deprecation of {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE}
 	 */
 	@Deprecated
 	public ResultMatcher isRequestEntityTooLarge() {
@@ -408,8 +408,8 @@ public ResultMatcher isUriTooLong() {
 
 	/**
 	 * Assert the response status code is {@code HttpStatus.REQUEST_URI_TOO_LONG} (414).
-	 * @deprecated matching the deprecation of {@code HttpStatus.REQUEST_URI_TOO_LONG}
 	 * @see #isUriTooLong()
+	 * @deprecated matching the deprecation of {@code HttpStatus.REQUEST_URI_TOO_LONG}
 	 */
 	@Deprecated
 	public ResultMatcher isRequestUriTooLong() {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionCallback.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionCallback.java
index 9ba759f0d55d..63546c24c435 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@
  * @author Mark Paluch
  * @author Juergen Hoeller
  * @since 5.2
- * @see TransactionalOperator
  * @param <T> the result type
+ * @see TransactionalOperator
  */
 @FunctionalInterface
 public interface TransactionCallback<T> {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
index 08bacac4ec43..926cdaf9289c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@
  *
  * @author Juergen Hoeller
  * @since 17.03.2003
+ * @param <T> the result type
  * @see TransactionTemplate
  * @see CallbackPreferringPlatformTransactionManager
- * @param <T> the result type
  */
 @FunctionalInterface
 public interface TransactionCallback<T> {
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index 6b51e1783df8..ec57d77a5ac2 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -230,20 +230,20 @@ public class MediaType extends MimeType implements Serializable {
 
 	/**
 	 * Public constant media type for {@code application/stream+json}.
-	 * @deprecated as of 5.3, see notice on {@link #APPLICATION_STREAM_JSON_VALUE}.
 	 * @since 5.0
+	 * @deprecated as of 5.3, see notice on {@link #APPLICATION_STREAM_JSON_VALUE}.
 	 */
 	@Deprecated
 	public static final MediaType APPLICATION_STREAM_JSON;
 
 	/**
 	 * A String equivalent of {@link MediaType#APPLICATION_STREAM_JSON}.
+	 * @since 5.0
 	 * @deprecated as of 5.3 since it originates from the W3C Activity Streams
 	 * specification which has a more specific purpose and has been since
 	 * replaced with a different mime type. Use {@link #APPLICATION_NDJSON} as
 	 * a replacement or any other line-delimited JSON format (e.g. JSON Lines,
 	 * JSON Text Sequences).
-	 * @since 5.0
 	 */
 	@Deprecated
 	public static final String APPLICATION_STREAM_JSON_VALUE = "application/stream+json";
diff --git a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
index 01048cab83c4..bada6e559885 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,8 +120,8 @@ public boolean isHttpOnly() {
 	 * Return the cookie "SameSite" attribute, or {@code null} if not set.
 	 * <p>This limits the scope of the cookie such that it will only be attached to
 	 * same site requests if {@code "Strict"} or cross-site requests if {@code "Lax"}.
-	 * @see <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis#section-4.1.2.7">RFC6265 bis</a>
 	 * @since 5.1
+	 * @see <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis#section-4.1.2.7">RFC6265 bis</a>
 	 */
 	@Nullable
 	public String getSameSite() {
diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java
index 4efc74eef602..00e2fdd4ab94 100644
--- a/spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java
+++ b/spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@
  * application code.
  *
  * @author Arjen Poutsma
- * @see org.springframework.web.client.AsyncRestTemplate#execute
  * @since 4.0
+ * @see org.springframework.web.client.AsyncRestTemplate#execute
  * @deprecated as of Spring 5.0, in favor of
  * {@link org.springframework.web.reactive.function.client.ExchangeFilterFunction}
  */
diff --git a/spring-web/src/main/java/org/springframework/web/client/RequestCallback.java b/spring-web/src/main/java/org/springframework/web/client/RequestCallback.java
index e3d32f526f14..82ef0d694e86 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RequestCallback.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RequestCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,8 @@
  * </ul>
  *
  * @author Arjen Poutsma
- * @see RestTemplate#execute
  * @since 3.0
+ * @see RestTemplate#execute
  */
 @FunctionalInterface
 public interface RequestCallback {
diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
index cf8b17b54552..85e7215b4e24 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,13 +34,13 @@
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
+ * @since 5.0
+ * @see <a href="https://tools.ietf.org/html/rfc7239">https://tools.ietf.org/html/rfc7239</a>
  * @deprecated as of 5.1 this filter is deprecated in favor of using
  * {@link ForwardedHeaderTransformer} which can be declared as a bean with the
  * name "forwardedHeaderTransformer" or registered explicitly in
  * {@link org.springframework.web.server.adapter.WebHttpHandlerBuilder
  * WebHttpHandlerBuilder}.
- * @since 5.0
- * @see <a href="https://tools.ietf.org/html/rfc7239">https://tools.ietf.org/html/rfc7239</a>
  */
 @Deprecated
 public class ForwardedHeaderFilter extends ForwardedHeaderTransformer implements WebFilter {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index 4d929888bde8..7e8219c1678a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -469,10 +469,10 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		/**
 		 * Provide a function to populate the Reactor {@code Context}.
 		 * @param contextModifier the function to modify the context with
+		 * @since 5.3.1
 		 * @deprecated in 5.3.2 to be removed soon after; this method cannot
 		 * provide context to downstream (nested or subsequent) requests and is
 		 * of limited value.
-		 * @since 5.3.1
 		 */
 		@Deprecated
 		S context(Function<Context, Context> contextModifier);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
index cd43bdce5b15..2af977fea803 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
@@ -70,9 +70,9 @@ public interface HandlerAdapter {
 	 * @param handler the handler to use. This object must have previously been passed
 	 * to the {@code supports} method of this interface, which must have
 	 * returned {@code true}.
-	 * @throws Exception in case of errors
 	 * @return a ModelAndView object with the name of the view and the required
 	 * model data, or {@code null} if the request has been handled directly
+	 * @throws Exception in case of errors
 	 */
 	@Nullable
 	ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
index a6cfdcf86a69..d8bb3660f52c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
@@ -34,16 +34,16 @@
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
- * @deprecated as of 5.3.9 in favor of using the {@code checkNotModified} methods
- * in {@link org.springframework.web.context.request.WebRequest}, or from an
- * annotated controller method, returning a
- * {@link org.springframework.http.ResponseEntity} with an "ETag" and/or
- * "Last-Modified" headers set.
  * @see javax.servlet.http.HttpServlet#getLastModified
  * @see Controller
  * @see SimpleControllerHandlerAdapter
  * @see org.springframework.web.HttpRequestHandler
  * @see HttpRequestHandlerAdapter
+ * @deprecated as of 5.3.9 in favor of using the {@code checkNotModified} methods
+ * in {@link org.springframework.web.context.request.WebRequest}, or from an
+ * annotated controller method, returning a
+ * {@link org.springframework.http.ResponseEntity} with an "ETag" and/or
+ * "Last-Modified" headers set.
  */
 @Deprecated
 public interface LastModified {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
index 79622c386169..c410a7c7f29d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
@@ -912,9 +912,9 @@ public PathPatternParser getPatternParser() {
 		/**
 		 * Set a custom UrlPathHelper to use for the PatternsRequestCondition.
 		 * <p>By default this is not set.
+		 * @since 4.2.8
 		 * @deprecated as of 5.3, the path is resolved externally and obtained with
 		 * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
-		 * @since 4.2.8
 		 */
 		@Deprecated
 		public void setUrlPathHelper(@Nullable UrlPathHelper urlPathHelper) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
index 9d9bc6811ccb..1180aa734a4a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -168,10 +168,10 @@ public void setUrlPathHelper(UrlPathHelper urlPathHelper) {
 	/**
 	 * Translates the request URI of the incoming {@link HttpServletRequest}
 	 * into the view name based on the configured parameters.
-	 * @see ServletRequestPathUtils#getCachedPath(ServletRequest)
-	 * @see #transformPath
 	 * @throws IllegalArgumentException if neither a parsed RequestPath, nor a
 	 * String lookupPath have been resolved and cached as a request attribute.
+	 * @see ServletRequestPathUtils#getCachedPath(ServletRequest)
+	 * @see #transformPath
 	 */
 	@Override
 	public String getViewName(HttpServletRequest request) {
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 2d8a043623c0..555364592425 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -160,7 +160,7 @@
 		</module>
  		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
 			<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-    		<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
+    		<property name="tagOrder" value="@param, @return, @throws, @since, @see, @deprecated"/>
 		</module>
 
 		<!-- Miscellaneous -->

From 2c583517cb1b3713db8fcbcf561e64424fd111f3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 6 Oct 2021 12:51:27 +0200
Subject: [PATCH 199/735] Change Eclipse project source/target/compliance to
 JDK 17

See gh-27407
---
 src/eclipse/org.eclipse.jdt.core.prefs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/eclipse/org.eclipse.jdt.core.prefs b/src/eclipse/org.eclipse.jdt.core.prefs
index 7fafdb460983..446bdebe14b3 100644
--- a/src/eclipse/org.eclipse.jdt.core.prefs
+++ b/src/eclipse/org.eclipse.jdt.core.prefs
@@ -21,9 +21,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -111,7 +111,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

From 5d3b16cd3a5e7915f4aeeb37c5285ac7e173f6f2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 6 Oct 2021 15:42:52 +0200
Subject: [PATCH 200/735] Indent with tabs instead of spaces

---
 src/checkstyle/checkstyle.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 555364592425..5a9318ef3cbe 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -156,11 +156,11 @@
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
 			<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
-    		<property name="tagOrder" value="@author, @since, @param, @see, @version, @serial, @deprecated"/>
+			<property name="tagOrder" value="@author, @since, @param, @see, @version, @serial, @deprecated"/>
 		</module>
- 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
 			<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-    		<property name="tagOrder" value="@param, @return, @throws, @since, @see, @deprecated"/>
+			<property name="tagOrder" value="@param, @return, @throws, @since, @see, @deprecated"/>
 		</module>
 
 		<!-- Miscellaneous -->

From 90fdcf88d832eb6d8f635d3aa727c762b273845b Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 6 Oct 2021 21:27:56 +0100
Subject: [PATCH 201/735] Generalize formatValue

Provide an overload for additional control and compact output.
---
 .../core/log/LogFormatUtils.java              | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
index c00c33464fc3..cbcd63bf6f08 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,30 +36,48 @@
 public abstract class LogFormatUtils {
 
 	/**
-	 * Format the given value via {@code toString()}, quoting it if it is a
-	 * {@link CharSequence}, and possibly truncating at 100 if limitLength is
-	 * set to true.
+	 * Variant of {@link #formatValue(Object, int, boolean)} and a convenience
+	 * method that truncates at 100 characters when {@code limitLength} is set.
 	 * @param value the value to format
-	 * @param limitLength whether to truncate large formatted values (over 100)
+	 * @param limitLength whether to truncate the value at a length of 100
 	 * @return the formatted value
 	 */
 	public static String formatValue(@Nullable Object value, boolean limitLength) {
+		return formatValue(value, 100, limitLength);
+	}
+
+	/**
+	 * Format the given value via {@code toString()}, quoting it if it is a
+	 * {@link CharSequence}, truncating at the specified {@code maxLength}, and
+	 * compacting it into a single line when {@code replaceNewLines} is set.
+	 * @param value the value to be formatted
+	 * @param maxLength the max length, after which to truncate, or -1 for unlimited
+	 * @param replaceNewlines whether to replace newline characters with placeholders
+	 * @return the formatted value
+	 */
+	public static String formatValue(@Nullable Object value, int maxLength, boolean replaceNewlines) {
 		if (value == null) {
 			return "";
 		}
-		String str;
+		String result;
 		if (value instanceof CharSequence) {
-			str = "\"" + value + "\"";
+			result = "\"" + value + "\"";
 		}
 		else {
 			try {
-				str = value.toString();
+				result = value.toString();
 			}
 			catch (Throwable ex) {
-				str = ex.toString();
+				result = ex.toString();
 			}
 		}
-		return (limitLength && str.length() > 100 ? str.substring(0, 100) + " (truncated)..." : str);
+		if (maxLength != -1) {
+			result = (result.length() > maxLength ? result.substring(0, maxLength) + " (truncated)..." : result);
+		}
+		if (replaceNewlines) {
+			result = result.replace("\n", "<LF>").replace("\r", "<CR>");
+		}
+		return result;
 	}
 
 	/**

From d5597a75a670becc508f6a4f7560a9ef40e70e94 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 7 Oct 2021 08:51:32 +0200
Subject: [PATCH 202/735] Start building against Reactor 2020.0.12 snapshots

See gh-27527
---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 78f42328360c..af1973fefef7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.68.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.11"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.12-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
@@ -292,6 +292,7 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
+			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From 9bd989f1bbf596c44b818b8979f5132b8cda0d1b Mon Sep 17 00:00:00 2001
From: Ashley Scopes <73482956+ascopes@users.noreply.github.com>
Date: Wed, 11 Aug 2021 16:13:41 +0100
Subject: [PATCH 203/735] WebClient tests for socket and response format issues

Added test case for malformed response chunk, which is
now failing as expected.

See gh-27262
---
 .../client/WebClientIntegrationTests.java     | 145 +++++++++++++++++-
 1 file changed, 142 insertions(+), 3 deletions(-)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index e8a082a6b628..4878ca78c2f9 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -18,11 +18,15 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.UncheckedIOException;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -31,16 +35,21 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.SocketPolicy;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.util.SocketUtils;
+import org.springframework.web.reactive.function.client.WebClient.ResponseSpec;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClient;
@@ -83,7 +92,7 @@ class WebClientIntegrationTests {
 
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.METHOD)
-	@ParameterizedTest(name = "[{index}] webClient [{0}]")
+	@ParameterizedTest(name = "[{index}] {displayName} [{0}]")
 	@MethodSource("arguments")
 	@interface ParameterizedWebClientTest {
 	}
@@ -113,7 +122,9 @@ private void startServer(ClientHttpConnector connector) {
 
 	@AfterEach
 	void shutdown() throws IOException {
-		this.server.shutdown();
+		if (server != null) {
+			this.server.shutdown();
+		}
 	}
 
 
@@ -1209,6 +1220,135 @@ void invalidDomain(ClientHttpConnector connector) {
 				.verify();
 	}
 
+	static Stream<Arguments> socketFaultArguments() {
+		Stream.Builder<Arguments> argumentsBuilder = Stream.builder();
+		arguments().forEach(arg -> {
+			argumentsBuilder.accept(Arguments.of(arg, SocketPolicy.DISCONNECT_AT_START));
+			argumentsBuilder.accept(Arguments.of(arg, SocketPolicy.DISCONNECT_DURING_REQUEST_BODY));
+			argumentsBuilder.accept(Arguments.of(arg, SocketPolicy.DISCONNECT_AFTER_REQUEST));
+		});
+		return argumentsBuilder.build();
+	}
+
+	@ParameterizedTest(name = "[{index}] {displayName} [{0}, {1}]")
+	@MethodSource("socketFaultArguments")
+	void prematureClosureFault(ClientHttpConnector connector, SocketPolicy socketPolicy) {
+		startServer(connector);
+
+		prepareResponse(response -> response
+				.setSocketPolicy(socketPolicy)
+				.setStatus("HTTP/1.1 200 OK")
+				.setHeader("Response-Header-1", "value 1")
+				.setHeader("Response-Header-2", "value 2")
+				.setBody("{\"message\": \"Hello, World!\"}"));
+
+		String uri = "/test";
+		Mono<String> result = this.webClient
+				.post()
+				.uri(uri)
+				// Random non-empty body to allow us to interrupt.
+				.bodyValue("{\"action\": \"Say hello!\"}")
+				.retrieve()
+				.bodyToMono(String.class);
+
+		StepVerifier.create(result)
+				.expectErrorSatisfies(throwable -> {
+					assertThat(throwable).isInstanceOf(WebClientRequestException.class);
+					WebClientRequestException ex = (WebClientRequestException) throwable;
+					// Varies between connector providers.
+					assertThat(ex.getCause()).isInstanceOf(IOException.class);
+				})
+				.verify();
+	}
+
+	static Stream<Arguments> malformedResponseChunkArguments() {
+		return Stream.of(
+				Arguments.of(new ReactorClientHttpConnector(), true),
+				Arguments.of(new JettyClientHttpConnector(), true),
+				// Apache injects the Transfer-Encoding header for us, and complains with an exception if we also
+				// add it. The other two connectors do not add the header at all. We need this header for the test
+				// case to work correctly.
+				Arguments.of(new HttpComponentsClientHttpConnector(), false)
+		);
+	}
+
+	@ParameterizedTest(name = "[{index}] {displayName} [{0}, {1}]")
+	@MethodSource("malformedResponseChunkArguments")
+	void malformedResponseChunksOnBodilessEntity(ClientHttpConnector connector, boolean addTransferEncodingHeader) {
+		Mono<?> result = doMalformedResponseChunks(connector, addTransferEncodingHeader, ResponseSpec::toBodilessEntity);
+
+		StepVerifier.create(result)
+				.expectErrorSatisfies(throwable -> {
+					assertThat(throwable).isInstanceOf(WebClientException.class);
+					WebClientException ex = (WebClientException) throwable;
+					assertThat(ex.getCause()).isInstanceOf(IOException.class);
+				})
+				.verify();
+	}
+
+	@ParameterizedTest(name = "[{index}] {displayName} [{0}, {1}]")
+	@MethodSource("malformedResponseChunkArguments")
+	void malformedResponseChunksOnEntityWithBody(ClientHttpConnector connector, boolean addTransferEncodingHeader) {
+		Mono<?> result = doMalformedResponseChunks(connector, addTransferEncodingHeader, spec -> spec.toEntity(String.class));
+
+		StepVerifier.create(result)
+				.expectErrorSatisfies(throwable -> {
+					assertThat(throwable).isInstanceOf(WebClientException.class);
+					WebClientException ex = (WebClientException) throwable;
+					assertThat(ex.getCause()).isInstanceOf(IOException.class);
+				})
+				.verify();
+	}
+
+	private <T> Mono<T> doMalformedResponseChunks(
+			ClientHttpConnector connector,
+			boolean addTransferEncodingHeader,
+			Function<ResponseSpec, Mono<T>> responseHandler
+	) {
+		int port = SocketUtils.findAvailableTcpPort();
+
+		Thread serverThread = new Thread(() -> {
+			// This exists separately to the main mock server, as I had a really hard time getting that to send the
+			// chunked responses correctly, flushing the socket each time. This was the only way I was able to replicate
+			// the issue of the client not handling malformed response chunks correctly.
+			try (ServerSocket serverSocket = new ServerSocket(port)) {
+				Socket socket = serverSocket.accept();
+				InputStream is = socket.getInputStream();
+
+				//noinspection ResultOfMethodCallIgnored
+				is.read(new byte[4096]);
+
+				OutputStream os = socket.getOutputStream();
+				os.write("HTTP/1.1 200 OK\r\n".getBytes(StandardCharsets.UTF_8));
+				os.write("Transfer-Encoding: chunked\r\n".getBytes(StandardCharsets.UTF_8));
+				os.write("\r\n".getBytes(StandardCharsets.UTF_8));
+				os.write("lskdu018973t09sylgasjkfg1][]'./.sdlv".getBytes(StandardCharsets.UTF_8));
+				socket.close();
+			} catch (IOException ex) {
+				throw new RuntimeException(ex);
+			}
+		});
+
+		serverThread.setDaemon(true);
+		serverThread.start();
+
+		ResponseSpec spec = WebClient
+				.builder()
+				.clientConnector(connector)
+				.baseUrl("http://localhost:" + port)
+				.build()
+				.post()
+				.headers(headers -> {
+					if (addTransferEncodingHeader) {
+						headers.add(HttpHeaders.TRANSFER_ENCODING, "chunked");
+					}
+				})
+				.retrieve();
+
+		return responseHandler
+				.apply(spec)
+				.doFinally(signal -> serverThread.stop());
+	}
 
 	private void prepareResponse(Consumer<MockResponse> consumer) {
 		MockResponse response = new MockResponse();
@@ -1252,5 +1392,4 @@ public void setContainerValue(T containerValue) {
 			this.containerValue = containerValue;
 		}
 	}
-
 }

From b6111d04a5453a1e75840c53ad6f38eb7314138a Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 7 Oct 2021 16:50:30 +0100
Subject: [PATCH 204/735] Ensure WebClientResponseException for malformed
 response

Closes gh-27262
---
 .../client/DefaultClientResponse.java         |   2 +-
 .../function/client/DefaultWebClient.java     |   4 +-
 .../client/WebClientIntegrationTests.java     | 106 +++---------------
 3 files changed, 21 insertions(+), 91 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
index 927fcdf205d5..0931bf214072 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
@@ -203,7 +203,7 @@ public Mono<WebClientResponseException> createException() {
 					return bytes;
 				})
 				.defaultIfEmpty(EMPTY)
-				.onErrorReturn(IllegalStateException.class::isInstance, EMPTY)
+				.onErrorReturn(ex -> !(ex instanceof Error), EMPTY)
 				.map(bodyBytes -> {
 					HttpRequest request = this.requestSupplier.get();
 					Charset charset = headers().contentType().map(MimeType::getCharset).orElse(null);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
index aebc7760ac0e..efaf758ef43b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
@@ -612,7 +612,9 @@ public <T> Mono<ResponseEntity<Flux<T>>> toEntityFlux(BodyExtractor<Flux<T>, ? s
 		public Mono<ResponseEntity<Void>> toBodilessEntity() {
 			return this.responseMono.flatMap(response ->
 					WebClientUtils.mapToEntity(response, handleBodyMono(response, Mono.<Void>empty()))
-							.flatMap(entity -> response.releaseBody().thenReturn(entity))
+							.flatMap(entity -> response.releaseBody()
+									.onErrorResume(WebClientUtils.WRAP_EXCEPTION_PREDICATE, exceptionWrappingFunction(response))
+									.thenReturn(entity))
 			);
 		}
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index 4878ca78c2f9..e7fa002ff51b 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -42,14 +42,10 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
-import okhttp3.mockwebserver.SocketPolicy;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.springframework.util.SocketUtils;
-import org.springframework.web.reactive.function.client.WebClient.ResponseSpec;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClient;
@@ -73,7 +69,9 @@
 import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.util.SocketUtils;
 import org.springframework.web.reactive.function.BodyExtractors;
+import org.springframework.web.reactive.function.client.WebClient.ResponseSpec;
 import org.springframework.web.testfixture.xml.Pojo;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -1220,63 +1218,9 @@ void invalidDomain(ClientHttpConnector connector) {
 				.verify();
 	}
 
-	static Stream<Arguments> socketFaultArguments() {
-		Stream.Builder<Arguments> argumentsBuilder = Stream.builder();
-		arguments().forEach(arg -> {
-			argumentsBuilder.accept(Arguments.of(arg, SocketPolicy.DISCONNECT_AT_START));
-			argumentsBuilder.accept(Arguments.of(arg, SocketPolicy.DISCONNECT_DURING_REQUEST_BODY));
-			argumentsBuilder.accept(Arguments.of(arg, SocketPolicy.DISCONNECT_AFTER_REQUEST));
-		});
-		return argumentsBuilder.build();
-	}
-
-	@ParameterizedTest(name = "[{index}] {displayName} [{0}, {1}]")
-	@MethodSource("socketFaultArguments")
-	void prematureClosureFault(ClientHttpConnector connector, SocketPolicy socketPolicy) {
-		startServer(connector);
-
-		prepareResponse(response -> response
-				.setSocketPolicy(socketPolicy)
-				.setStatus("HTTP/1.1 200 OK")
-				.setHeader("Response-Header-1", "value 1")
-				.setHeader("Response-Header-2", "value 2")
-				.setBody("{\"message\": \"Hello, World!\"}"));
-
-		String uri = "/test";
-		Mono<String> result = this.webClient
-				.post()
-				.uri(uri)
-				// Random non-empty body to allow us to interrupt.
-				.bodyValue("{\"action\": \"Say hello!\"}")
-				.retrieve()
-				.bodyToMono(String.class);
-
-		StepVerifier.create(result)
-				.expectErrorSatisfies(throwable -> {
-					assertThat(throwable).isInstanceOf(WebClientRequestException.class);
-					WebClientRequestException ex = (WebClientRequestException) throwable;
-					// Varies between connector providers.
-					assertThat(ex.getCause()).isInstanceOf(IOException.class);
-				})
-				.verify();
-	}
-
-	static Stream<Arguments> malformedResponseChunkArguments() {
-		return Stream.of(
-				Arguments.of(new ReactorClientHttpConnector(), true),
-				Arguments.of(new JettyClientHttpConnector(), true),
-				// Apache injects the Transfer-Encoding header for us, and complains with an exception if we also
-				// add it. The other two connectors do not add the header at all. We need this header for the test
-				// case to work correctly.
-				Arguments.of(new HttpComponentsClientHttpConnector(), false)
-		);
-	}
-
-	@ParameterizedTest(name = "[{index}] {displayName} [{0}, {1}]")
-	@MethodSource("malformedResponseChunkArguments")
-	void malformedResponseChunksOnBodilessEntity(ClientHttpConnector connector, boolean addTransferEncodingHeader) {
-		Mono<?> result = doMalformedResponseChunks(connector, addTransferEncodingHeader, ResponseSpec::toBodilessEntity);
-
+	@ParameterizedWebClientTest
+	void malformedResponseChunksOnBodilessEntity(ClientHttpConnector connector) {
+		Mono<?> result = doMalformedChunkedResponseTest(connector, ResponseSpec::toBodilessEntity);
 		StepVerifier.create(result)
 				.expectErrorSatisfies(throwable -> {
 					assertThat(throwable).isInstanceOf(WebClientException.class);
@@ -1286,11 +1230,9 @@ void malformedResponseChunksOnBodilessEntity(ClientHttpConnector connector, bool
 				.verify();
 	}
 
-	@ParameterizedTest(name = "[{index}] {displayName} [{0}, {1}]")
-	@MethodSource("malformedResponseChunkArguments")
-	void malformedResponseChunksOnEntityWithBody(ClientHttpConnector connector, boolean addTransferEncodingHeader) {
-		Mono<?> result = doMalformedResponseChunks(connector, addTransferEncodingHeader, spec -> spec.toEntity(String.class));
-
+	@ParameterizedWebClientTest
+	void malformedResponseChunksOnEntityWithBody(ClientHttpConnector connector) {
+		Mono<?> result = doMalformedChunkedResponseTest(connector, spec -> spec.toEntity(String.class));
 		StepVerifier.create(result)
 				.expectErrorSatisfies(throwable -> {
 					assertThat(throwable).isInstanceOf(WebClientException.class);
@@ -1300,17 +1242,13 @@ void malformedResponseChunksOnEntityWithBody(ClientHttpConnector connector, bool
 				.verify();
 	}
 
-	private <T> Mono<T> doMalformedResponseChunks(
-			ClientHttpConnector connector,
-			boolean addTransferEncodingHeader,
-			Function<ResponseSpec, Mono<T>> responseHandler
-	) {
+	private <T> Mono<T> doMalformedChunkedResponseTest(
+			ClientHttpConnector connector, Function<ResponseSpec, Mono<T>> handler) {
+
 		int port = SocketUtils.findAvailableTcpPort();
 
 		Thread serverThread = new Thread(() -> {
-			// This exists separately to the main mock server, as I had a really hard time getting that to send the
-			// chunked responses correctly, flushing the socket each time. This was the only way I was able to replicate
-			// the issue of the client not handling malformed response chunks correctly.
+			// No way to simulate a malformed chunked response through MockWebServer.
 			try (ServerSocket serverSocket = new ServerSocket(port)) {
 				Socket socket = serverSocket.accept();
 				InputStream is = socket.getInputStream();
@@ -1324,30 +1262,20 @@ private <T> Mono<T> doMalformedResponseChunks(
 				os.write("\r\n".getBytes(StandardCharsets.UTF_8));
 				os.write("lskdu018973t09sylgasjkfg1][]'./.sdlv".getBytes(StandardCharsets.UTF_8));
 				socket.close();
-			} catch (IOException ex) {
+			}
+			catch (IOException ex) {
 				throw new RuntimeException(ex);
 			}
 		});
 
-		serverThread.setDaemon(true);
 		serverThread.start();
 
-		ResponseSpec spec = WebClient
-				.builder()
+		WebClient client = WebClient.builder()
 				.clientConnector(connector)
 				.baseUrl("http://localhost:" + port)
-				.build()
-				.post()
-				.headers(headers -> {
-					if (addTransferEncodingHeader) {
-						headers.add(HttpHeaders.TRANSFER_ENCODING, "chunked");
-					}
-				})
-				.retrieve();
+				.build();
 
-		return responseHandler
-				.apply(spec)
-				.doFinally(signal -> serverThread.stop());
+		return handler.apply(client.post().retrieve());
 	}
 
 	private void prepareResponse(Consumer<MockResponse> consumer) {

From 6e92c4d6749e4ee4b68f74157a1c4539f19deb2d Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Fri, 8 Oct 2021 11:08:38 +0200
Subject: [PATCH 205/735] Improve Questions section in CONTRIBUTING doc

Closes gh-27509
---
 CONTRIBUTING.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2400b729b4c6..2a3ee1be4e84 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ First off, thank you for taking the time to contribute! :+1: :tada:
 
 * [Code of Conduct](#code-of-conduct)
 * [How to Contribute](#how-to-contribute)
-  * [Discuss](#discuss)
+  * [Ask questions](#ask-questions)
   * [Create an Issue](#create-an-issue)
   * [Issue Lifecycle](#issue-lifecycle)
   * [Submit a Pull Request](#submit-a-pull-request)
@@ -22,11 +22,10 @@ Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
 ### How to Contribute
 
-#### Discuss
+#### Ask questions
 
 If you have a question, check Stack Overflow using
-[this list of tags](https://stackoverflow.com/questions/tagged/spring+or+spring-mvc+or+spring-aop+or+spring-jdbc+or+spring-transactions+or+spring-annotations+or+spring-jms+or+spring-el+or+spring-test+or+spring+or+spring-remoting+or+spring-orm+or+spring-jmx+or+spring-cache+or+spring-webflux?tab=Newest).
-Find an existing discussion, or start a new one if necessary.
+[this list of tags](https://stackoverflow.com/questions/tagged/spring+or+spring-mvc+or+spring-aop+or+spring-jdbc+or+spring-transactions+or+spring-annotations+or+spring-jms+or+spring-el+or+spring-test+or+spring+or+spring-remoting+or+spring-orm+or+spring-jmx+or+spring-cache+or+spring-webflux?tab=Newest). Find an existing discussion, or start a new one if necessary.
 
 If you believe there is an issue, search through
 [existing issues](https://github.com/spring-projects/spring-framework/issues) trying a
@@ -39,14 +38,18 @@ decision.
 
 Reporting an issue or making a feature request is a great way to contribute. Your feedback
 and the conversations that result from it provide a continuous flow of ideas. However,
-before creating a ticket, please take the time to [discuss and research](#discuss) first.
+before creating a ticket, please take the time to [ask and research](#ask-questions) first.
 
 If creating an issue after a discussion on Stack Overflow, please provide a description
 in the issue instead of simply referring to Stack Overflow. The issue tracker is an
 important place of record for design discussions and should be self-sufficient.
 
-Once you're ready, create an issue on
-[GitHub](https://github.com/spring-projects/spring-framework/issues).
+Once you're ready, create an issue on [GitHub](https://github.com/spring-projects/spring-framework/issues).
+
+Many issues are caused by subtle behavior, typos and unintended configuration.
+Creating a [Minimal Reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example)
+(starting with https://start.spring.io for example) of the problem helps the team
+triage quickly your issue adn get to the core of the problem.
 
 #### Issue Lifecycle
 
@@ -129,3 +132,4 @@ When making changes locally, execute `./gradlew asciidoctor` and then browse the
 
 Asciidoctor also supports live editing. For more details see
 [AsciiDoc Tooling](https://docs.asciidoctor.org/asciidoctor/latest/tooling/).
+

From 932291b867d967d1b670df77e960b5f7d7a866be Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Fri, 8 Oct 2021 14:00:23 +0200
Subject: [PATCH 206/735] Polishinig

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2a3ee1be4e84..edf976fff721 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,16 +40,16 @@ Reporting an issue or making a feature request is a great way to contribute. You
 and the conversations that result from it provide a continuous flow of ideas. However,
 before creating a ticket, please take the time to [ask and research](#ask-questions) first.
 
-If creating an issue after a discussion on Stack Overflow, please provide a description
+If you create an issue after a discussion on Stack Overflow, please provide a description
 in the issue instead of simply referring to Stack Overflow. The issue tracker is an
 important place of record for design discussions and should be self-sufficient.
 
 Once you're ready, create an issue on [GitHub](https://github.com/spring-projects/spring-framework/issues).
 
-Many issues are caused by subtle behavior, typos and unintended configuration.
+Many issues are caused by subtle behavior, typos, and unintended configuration.
 Creating a [Minimal Reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example)
 (starting with https://start.spring.io for example) of the problem helps the team
-triage quickly your issue adn get to the core of the problem.
+quickly triage your issue and get to the core of the problem.
 
 #### Issue Lifecycle
 

From e3b48c23dd1e8c14c3a376b93e87fd2b0bd258a6 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 8 Oct 2021 17:59:03 +0100
Subject: [PATCH 207/735] Remove AsyncRestTemplate and related types

---
 .../client/MockAsyncClientHttpRequest.java    |  55 --
 .../MockMvcClientHttpRequestFactory.java      |  25 +-
 .../web/client/MockRestServiceServer.java     |  71 +-
 .../DefaultRequestExpectationTests.java       |  15 +-
 ...orderedRequestExpectationManagerTests.java |  20 +-
 .../MockMvcClientHttpRequestFactoryTests.java |  15 +-
 .../web/client/samples/SampleAsyncTests.java  | 144 ----
 .../AbstractAsyncClientHttpRequest.java       |  85 ---
 ...stractBufferingAsyncClientHttpRequest.java |  65 --
 .../http/client/AsyncClientHttpRequest.java   |  48 --
 .../AsyncClientHttpRequestExecution.java      |  50 --
 .../client/AsyncClientHttpRequestFactory.java |  47 --
 .../AsyncClientHttpRequestInterceptor.java    |  73 --
 .../HttpComponentsAsyncClientHttpRequest.java | 172 -----
 ...mponentsAsyncClientHttpRequestFactory.java | 216 ------
 ...HttpComponentsAsyncClientHttpResponse.java |  90 ---
 .../InterceptingAsyncClientHttpRequest.java   | 125 ---
 ...rceptingAsyncClientHttpRequestFactory.java |  62 --
 .../http/client/Netty4ClientHttpRequest.java  | 187 -----
 .../Netty4ClientHttpRequestFactory.java       | 243 ------
 .../http/client/Netty4ClientHttpResponse.java |  96 ---
 .../client/OkHttp3AsyncClientHttpRequest.java | 109 ---
 .../OkHttp3ClientHttpRequestFactory.java      |  11 +-
 ...SimpleBufferingAsyncClientHttpRequest.java |  99 ---
 .../SimpleClientHttpRequestFactory.java       |  40 +-
 ...SimpleStreamingAsyncClientHttpRequest.java | 125 ---
 .../client/support/AsyncHttpAccessor.java     |  92 ---
 .../InterceptingAsyncHttpAccessor.java        |  67 --
 .../web/client/AsyncRequestCallback.java      |  48 --
 .../web/client/AsyncRestOperations.java       | 464 ------------
 .../web/client/AsyncRestTemplate.java         | 714 ------------------
 .../AbstractAsyncHttpRequestFactoryTests.java | 203 -----
 ...redSimpleAsyncHttpRequestFactoryTests.java |  50 --
 ...ntsAsyncClientHttpRequestFactoryTests.java |  88 ---
 ...ty4AsyncClientHttpRequestFactoryTests.java |  58 --
 .../Netty4ClientHttpRequestFactoryTests.java  |  58 --
 ...tp3AsyncClientHttpRequestFactoryTests.java |  41 -
 .../AsyncRestTemplateIntegrationTests.java    | 669 ----------------
 .../client/RestTemplateIntegrationTests.java  |   3 +-
 src/docs/asciidoc/integration.adoc            |   7 -
 40 files changed, 37 insertions(+), 4813 deletions(-)
 delete mode 100644 spring-test/src/main/java/org/springframework/mock/http/client/MockAsyncClientHttpRequest.java
 delete mode 100644 spring-test/src/test/java/org/springframework/test/web/client/samples/SampleAsyncTests.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/AbstractAsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/AbstractBufferingAsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestExecution.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestFactory.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestInterceptor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/SimpleStreamingAsyncClientHttpRequest.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/support/InterceptingAsyncHttpAccessor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/AbstractAsyncHttpRequestFactoryTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/BufferedSimpleAsyncHttpRequestFactoryTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactoryTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/Netty4AsyncClientHttpRequestFactoryTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/Netty4ClientHttpRequestFactoryTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequestFactoryTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/web/client/AsyncRestTemplateIntegrationTests.java

diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/MockAsyncClientHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/client/MockAsyncClientHttpRequest.java
deleted file mode 100644
index c082fce1b857..000000000000
--- a/spring-test/src/main/java/org/springframework/mock/http/client/MockAsyncClientHttpRequest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- * 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.mock.http.client;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.SettableListenableFuture;
-
-/**
- * An extension of {@link MockClientHttpRequest} that also implements
- * {@link org.springframework.http.client.AsyncClientHttpRequest} by wrapping the response in a
- * {@link SettableListenableFuture}.
- *
- * @author Rossen Stoyanchev
- * @author Sam Brannen
- * @since 4.1
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-public class MockAsyncClientHttpRequest extends MockClientHttpRequest implements org.springframework.http.client.AsyncClientHttpRequest {
-
-	public MockAsyncClientHttpRequest() {
-	}
-
-	public MockAsyncClientHttpRequest(HttpMethod httpMethod, URI uri) {
-		super(httpMethod, uri);
-	}
-
-
-	@Override
-	public ListenableFuture<ClientHttpResponse> executeAsync() throws IOException {
-		SettableListenableFuture<ClientHttpResponse> future = new SettableListenableFuture<>();
-		future.set(execute());
-		return future;
-	}
-
-}
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java b/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
index 42c7a03cefff..4c4592230d54 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.test.web.client;
 
-import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -39,18 +38,10 @@
 /**
  * A {@link ClientHttpRequestFactory} for requests executed via {@link MockMvc}.
  *
- * <p>As of 5.0 this class also implements
- * {@link org.springframework.http.client.AsyncClientHttpRequestFactory
- * AsyncClientHttpRequestFactory}. However note that
- * {@link org.springframework.web.client.AsyncRestTemplate} and related classes
- * have been deprecated at the same time.
- *
  * @author Rossen Stoyanchev
  * @since 3.2
  */
-@SuppressWarnings("deprecation")
-public class MockMvcClientHttpRequestFactory
-		implements ClientHttpRequestFactory, org.springframework.http.client.AsyncClientHttpRequestFactory {
+public class MockMvcClientHttpRequestFactory implements ClientHttpRequestFactory {
 
 	private final MockMvc mockMvc;
 
@@ -65,22 +56,12 @@ public MockMvcClientHttpRequestFactory(MockMvc mockMvc) {
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) {
 		return new MockClientHttpRequest(httpMethod, uri) {
 			@Override
-			public ClientHttpResponse executeInternal() throws IOException {
+			public ClientHttpResponse executeInternal() {
 				return getClientHttpResponse(httpMethod, uri, getHeaders(), getBodyAsBytes());
 			}
 		};
 	}
 
-	@Override
-	public org.springframework.http.client.AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod method) {
-		return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(method, uri) {
-			@Override
-			protected ClientHttpResponse executeInternal() throws IOException {
-				return getClientHttpResponse(method, uri, getHeaders(), getBodyAsBytes());
-			}
-		};
-	}
-
 	private ClientHttpResponse getClientHttpResponse(
 			HttpMethod httpMethod, URI uri, HttpHeaders requestHeaders, byte[] requestBody) {
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java b/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
index d3c0cd7b4156..8dbeff5a6cd9 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
@@ -25,7 +25,7 @@
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.lang.Nullable;
+import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.support.RestGatewaySupport;
@@ -64,7 +64,6 @@
  * @author Rossen Stoyanchev
  * @since 3.2
  */
-@SuppressWarnings("deprecation")
 public final class MockRestServiceServer {
 
 	private final RequestExpectationManager expectationManager;
@@ -147,18 +146,6 @@ public static MockRestServiceServerBuilder bindTo(RestTemplate restTemplate) {
 		return new DefaultBuilder(restTemplate);
 	}
 
-	/**
-	 * Return a builder for a {@code MockRestServiceServer} that should be used
-	 * to reply to the given {@code AsyncRestTemplate}.
-	 * @since 4.3
-	 * @deprecated see deprecation notice on
-	 * {@link org.springframework.web.client.AsyncRestTemplate} itself
-	 */
-	@Deprecated
-	public static MockRestServiceServerBuilder bindTo(org.springframework.web.client.AsyncRestTemplate asyncRestTemplate) {
-		return new DefaultBuilder(asyncRestTemplate);
-	}
-
 	/**
 	 * Return a builder for a {@code MockRestServiceServer} that should be used
 	 * to reply to the given {@code RestGatewaySupport}.
@@ -179,18 +166,6 @@ public static MockRestServiceServer createServer(RestTemplate restTemplate) {
 		return bindTo(restTemplate).build();
 	}
 
-	/**
-	 * A shortcut for {@code bindTo(asyncRestTemplate).build()}.
-	 * @param asyncRestTemplate the AsyncRestTemplate to set up for mock testing
-	 * @return the created mock server
-	 * @deprecated see deprecation notice on
-	 * {@link org.springframework.web.client.AsyncRestTemplate} itself
-	 */
-	@Deprecated
-	public static MockRestServiceServer createServer(org.springframework.web.client.AsyncRestTemplate asyncRestTemplate) {
-		return bindTo(asyncRestTemplate).build();
-	}
-
 	/**
 	 * A shortcut for {@code bindTo(restGateway).build()}.
 	 * @param restGateway the REST gateway to set up for mock testing
@@ -226,8 +201,8 @@ public interface MockRestServiceServerBuilder {
 
 		/**
 		 * Build the {@code MockRestServiceServer} and set up the underlying
-		 * {@code RestTemplate} or {@code AsyncRestTemplate} with a
-		 * {@link ClientHttpRequestFactory} that creates mock requests.
+		 * {@code RestTemplate} with a {@link ClientHttpRequestFactory} that
+		 * creates mock requests.
 		 */
 		MockRestServiceServer build();
 
@@ -241,12 +216,8 @@ public interface MockRestServiceServerBuilder {
 
 	private static class DefaultBuilder implements MockRestServiceServerBuilder {
 
-		@Nullable
 		private final RestTemplate restTemplate;
 
-		@Nullable
-		private final org.springframework.web.client.AsyncRestTemplate asyncRestTemplate;
-
 		private boolean ignoreExpectOrder;
 
 		private boolean bufferContent;
@@ -255,13 +226,6 @@ private static class DefaultBuilder implements MockRestServiceServerBuilder {
 		public DefaultBuilder(RestTemplate restTemplate) {
 			Assert.notNull(restTemplate, "RestTemplate must not be null");
 			this.restTemplate = restTemplate;
-			this.asyncRestTemplate = null;
-		}
-
-		public DefaultBuilder(org.springframework.web.client.AsyncRestTemplate asyncRestTemplate) {
-			Assert.notNull(asyncRestTemplate, "AsyncRestTemplate must not be null");
-			this.restTemplate = null;
-			this.asyncRestTemplate = asyncRestTemplate;
 		}
 
 		@Override
@@ -290,16 +254,11 @@ public MockRestServiceServer build() {
 		public MockRestServiceServer build(RequestExpectationManager manager) {
 			MockRestServiceServer server = new MockRestServiceServer(manager);
 			MockClientHttpRequestFactory factory = server.new MockClientHttpRequestFactory();
-			if (this.restTemplate != null) {
-				if (this.bufferContent) {
-					this.restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(factory));
-				}
-				else {
-					this.restTemplate.setRequestFactory(factory);
-				}
+			if (this.bufferContent) {
+				this.restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(factory));
 			}
-			if (this.asyncRestTemplate != null) {
-				this.asyncRestTemplate.setAsyncRequestFactory(factory);
+			else {
+				this.restTemplate.setRequestFactory(factory);
 			}
 			return server;
 		}
@@ -310,28 +269,18 @@ public MockRestServiceServer build(RequestExpectationManager manager) {
 	 * Mock ClientHttpRequestFactory that creates requests by iterating
 	 * over the list of expected {@link DefaultRequestExpectation}'s.
 	 */
-	private class MockClientHttpRequestFactory implements ClientHttpRequestFactory,
-			org.springframework.http.client.AsyncClientHttpRequestFactory {
+	private class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 
 		@Override
 		public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) {
 			return createRequestInternal(uri, httpMethod);
 		}
 
-		@Override
-		public org.springframework.http.client.AsyncClientHttpRequest createAsyncRequest(
-				URI uri, HttpMethod httpMethod) {
-
-			return createRequestInternal(uri, httpMethod);
-		}
-
-		private org.springframework.mock.http.client.MockAsyncClientHttpRequest createRequestInternal(
-				URI uri, HttpMethod httpMethod) {
-
+		private MockClientHttpRequest createRequestInternal(URI uri, HttpMethod httpMethod) {
 			Assert.notNull(uri, "'uri' must not be null");
 			Assert.notNull(httpMethod, "'httpMethod' must not be null");
 
-			return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(httpMethod, uri) {
+			return new MockClientHttpRequest(httpMethod, uri) {
 
 				@Override
 				protected ClientHttpResponse executeInternal() throws IOException {
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java
index 22351191513b..2c15775637e7 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
+import org.springframework.mock.http.client.MockClientHttpRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.test.web.client.ExpectedCount.once;
 import static org.springframework.test.web.client.ExpectedCount.twice;
@@ -44,15 +44,15 @@ public class DefaultRequestExpectationTests {
 	@Test
 	public void match() throws Exception {
 		RequestExpectation expectation = new DefaultRequestExpectation(once(), requestTo("/foo"));
-		expectation.match(createRequest(GET, "/foo"));
+		expectation.match(createRequest());
 	}
 
 	@Test
-	public void matchWithFailedExpectation() throws Exception {
+	public void matchWithFailedExpectation() {
 		RequestExpectation expectation = new DefaultRequestExpectation(once(), requestTo("/foo"));
 		expectation.andExpect(method(POST));
 		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
-				expectation.match(createRequest(GET, "/foo")))
+				expectation.match(createRequest()))
 			.withMessageContaining("Unexpected HttpMethod expected:<POST> but was:<GET>");
 	}
 
@@ -81,10 +81,9 @@ public void isSatisfied() {
 	}
 
 
-	@SuppressWarnings("deprecation")
-	private ClientHttpRequest createRequest(HttpMethod method, String url) {
+	private ClientHttpRequest createRequest() {
 		try {
-			return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(method,  new URI(url));
+			return new MockClientHttpRequest(HttpMethod.GET,  new URI("/foo"));
 		}
 		catch (URISyntaxException ex) {
 			throw new IllegalStateException(ex);
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java b/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java
index f8f4cfa5b018..973a44df586e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java
@@ -23,6 +23,7 @@
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
+import org.springframework.mock.http.client.MockClientHttpRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -42,7 +43,7 @@
  */
 public class UnorderedRequestExpectationManagerTests {
 
-	private UnorderedRequestExpectationManager manager = new UnorderedRequestExpectationManager();
+	private final UnorderedRequestExpectationManager manager = new UnorderedRequestExpectationManager();
 
 
 	@Test
@@ -57,7 +58,7 @@ public void unexpectedRequest() throws Exception {
 	}
 
 	@Test
-	public void zeroExpectedRequests() throws Exception {
+	public void zeroExpectedRequests() {
 		this.manager.verify();
 	}
 
@@ -108,19 +109,18 @@ public void repeatedRequestsTooFew() throws Exception {
 		this.manager.validateRequest(createRequest(GET, "/bar"));
 		this.manager.validateRequest(createRequest(GET, "/foo"));
 		this.manager.validateRequest(createRequest(GET, "/foo"));
-		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
-				this.manager.verify())
-			.withMessageContaining("3 request(s) executed:\n" +
-				"GET /bar\n" +
-				"GET /foo\n" +
-				"GET /foo\n");
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(this.manager::verify)
+				.withMessageContaining("3 request(s) executed:\n" +
+						"GET /bar\n" +
+						"GET /foo\n" +
+						"GET /foo\n");
 	}
 
 
-	@SuppressWarnings("deprecation")
 	private ClientHttpRequest createRequest(HttpMethod method, String url) {
 		try {
-			return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(method,  new URI(url));
+			return new MockClientHttpRequest(method,  new URI(url));
 		}
 		catch (URISyntaxException ex) {
 			throw new IllegalStateException(ex);
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
index 20262f096845..fc444a423fc0 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -31,7 +30,6 @@
 import org.springframework.test.web.client.MockMvcClientHttpRequestFactory;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -68,21 +66,12 @@ public void setup() {
 	}
 
 	@Test
-	public void test() throws Exception {
+	public void test() {
 		RestTemplate template = new RestTemplate(new MockMvcClientHttpRequestFactory(this.mockMvc));
 		String result = template.getForObject("/foo", String.class);
 		assertThat(result).isEqualTo("bar");
 	}
 
-	@Test
-	@SuppressWarnings("deprecation")
-	public void testAsyncTemplate() throws Exception {
-		org.springframework.web.client.AsyncRestTemplate template = new org.springframework.web.client.AsyncRestTemplate(
-				new MockMvcClientHttpRequestFactory(this.mockMvc));
-		ListenableFuture<ResponseEntity<String>> entity = template.getForEntity("/foo", String.class);
-		assertThat(entity.get().getBody()).isEqualTo("bar");
-	}
-
 
 	@EnableWebMvc
 	@Configuration
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleAsyncTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleAsyncTests.java
deleted file mode 100644
index 975c46d384d1..000000000000
--- a/spring-test/src/test/java/org/springframework/test/web/client/samples/SampleAsyncTests.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.
- * 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.test.web.client.samples;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.web.Person;
-import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.util.concurrent.ListenableFuture;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.web.client.ExpectedCount.manyTimes;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-
-/**
- * Examples to demonstrate writing client-side REST tests with Spring MVC Test.
- * While the tests in this class invoke the RestTemplate directly, in actual
- * tests the RestTemplate may likely be invoked indirectly, i.e. through client
- * code.
- *
- * @author Rossen Stoyanchev
- * @since 4.1
- */
-@SuppressWarnings("deprecation")
-public class SampleAsyncTests {
-
-	private final org.springframework.web.client.AsyncRestTemplate restTemplate = new org.springframework.web.client.AsyncRestTemplate();
-
-	private final MockRestServiceServer mockServer = MockRestServiceServer.createServer(this.restTemplate);
-
-
-	@Test
-	public void performGet() throws Exception {
-
-		String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
-
-		this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
-			.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
-
-		@SuppressWarnings("unused")
-		ListenableFuture<ResponseEntity<Person>> ludwig =
-				this.restTemplate.getForEntity("/composers/{id}", Person.class, 42);
-
-		// We are only validating the request. The response is mocked out.
-		// person.getName().equals("Ludwig van Beethoven")
-		// person.getDouble().equals(1.6035)
-
-		this.mockServer.verify();
-	}
-
-	@Test
-	public void performGetManyTimes() throws Exception {
-
-		String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
-
-		this.mockServer.expect(manyTimes(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
-				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
-
-		@SuppressWarnings("unused")
-		ListenableFuture<ResponseEntity<Person>> ludwig =
-				this.restTemplate.getForEntity("/composers/{id}", Person.class, 42);
-
-		// We are only validating the request. The response is mocked out.
-		// person.getName().equals("Ludwig van Beethoven")
-		// person.getDouble().equals(1.6035)
-
-		this.restTemplate.getForEntity("/composers/{id}", Person.class, 42);
-		this.restTemplate.getForEntity("/composers/{id}", Person.class, 42);
-		this.restTemplate.getForEntity("/composers/{id}", Person.class, 42);
-		this.restTemplate.getForEntity("/composers/{id}", Person.class, 42);
-
-		this.mockServer.verify();
-	}
-
-	@Test
-	public void performGetWithResponseBodyFromFile() throws Exception {
-
-		Resource responseBody = new ClassPathResource("ludwig.json", this.getClass());
-
-		this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
-			.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
-
-		@SuppressWarnings("unused")
-		ListenableFuture<ResponseEntity<Person>> ludwig =
-				this.restTemplate.getForEntity("/composers/{id}", Person.class, 42);
-
-		// hotel.getId() == 42
-		// hotel.getName().equals("Holiday Inn")
-
-		this.mockServer.verify();
-	}
-
-	@Test
-	public void verify() {
-
-		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
-			.andRespond(withSuccess("1", MediaType.TEXT_PLAIN));
-
-		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
-			.andRespond(withSuccess("2", MediaType.TEXT_PLAIN));
-
-		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
-			.andRespond(withSuccess("4", MediaType.TEXT_PLAIN));
-
-		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
-			.andRespond(withSuccess("8", MediaType.TEXT_PLAIN));
-
-		@SuppressWarnings("unused")
-		ListenableFuture<ResponseEntity<String>> result = this.restTemplate.getForEntity("/number", String.class);
-		// result == "1"
-
-		result = this.restTemplate.getForEntity("/number", String.class);
-		// result == "2"
-
-		try {
-			this.mockServer.verify();
-		}
-		catch (AssertionError error) {
-			assertThat(error.getMessage().contains("2 unsatisfied expectation(s)")).as(error.getMessage()).isTrue();
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/AbstractAsyncClientHttpRequest.java
deleted file mode 100644
index 37b09134d94a..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/AbstractAsyncClientHttpRequest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.util.Assert;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * Abstract base for {@link AsyncClientHttpRequest} that makes sure that headers and body
- * are not written multiple times.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @deprecated as of Spring 5.0, in favor of {@link org.springframework.http.client.reactive.AbstractClientHttpRequest}
- */
-@Deprecated
-abstract class AbstractAsyncClientHttpRequest implements AsyncClientHttpRequest {
-
-	private final HttpHeaders headers = new HttpHeaders();
-
-	private boolean executed = false;
-
-
-	@Override
-	public final HttpHeaders getHeaders() {
-		return (this.executed ? HttpHeaders.readOnlyHttpHeaders(this.headers) : this.headers);
-	}
-
-	@Override
-	public final OutputStream getBody() throws IOException {
-		assertNotExecuted();
-		return getBodyInternal(this.headers);
-	}
-
-	@Override
-	public ListenableFuture<ClientHttpResponse> executeAsync() throws IOException {
-		assertNotExecuted();
-		ListenableFuture<ClientHttpResponse> result = executeInternal(this.headers);
-		this.executed = true;
-		return result;
-	}
-
-	/**
-	 * Asserts that this request has not been {@linkplain #executeAsync() executed} yet.
-	 * @throws IllegalStateException if this request has been executed
-	 */
-	protected void assertNotExecuted() {
-		Assert.state(!this.executed, "ClientHttpRequest already executed");
-	}
-
-
-	/**
-	 * Abstract template method that returns the body.
-	 * @param headers the HTTP headers
-	 * @return the body output stream
-	 */
-	protected abstract OutputStream getBodyInternal(HttpHeaders headers) throws IOException;
-
-	/**
-	 * Abstract template method that writes the given headers and content to the HTTP request.
-	 * @param headers the HTTP headers
-	 * @return the response object for the executed request
-	 */
-	protected abstract ListenableFuture<ClientHttpResponse> executeInternal(HttpHeaders headers)
-			throws IOException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingAsyncClientHttpRequest.java
deleted file mode 100644
index f5c9aafe0e9f..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingAsyncClientHttpRequest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * Base implementation of {@link AsyncClientHttpRequest} that buffers output
- * in a byte array before sending it over the wire.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-abstract class AbstractBufferingAsyncClientHttpRequest extends AbstractAsyncClientHttpRequest {
-
-	private ByteArrayOutputStream bufferedOutput = new ByteArrayOutputStream(1024);
-
-
-	@Override
-	protected OutputStream getBodyInternal(HttpHeaders headers) throws IOException {
-		return this.bufferedOutput;
-	}
-
-	@Override
-	protected ListenableFuture<ClientHttpResponse> executeInternal(HttpHeaders headers) throws IOException {
-		byte[] bytes = this.bufferedOutput.toByteArray();
-		if (headers.getContentLength() < 0) {
-			headers.setContentLength(bytes.length);
-		}
-		ListenableFuture<ClientHttpResponse> result = executeInternal(headers, bytes);
-		this.bufferedOutput = new ByteArrayOutputStream(0);
-		return result;
-	}
-
-	/**
-	 * Abstract template method that writes the given headers and content to the HTTP request.
-	 * @param headers the HTTP headers
-	 * @param bufferedOutput the body content
-	 * @return the response object for the executed request
-	 */
-	protected abstract ListenableFuture<ClientHttpResponse> executeInternal(
-			HttpHeaders headers, byte[] bufferedOutput) throws IOException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequest.java
deleted file mode 100644
index 39f3c83ae887..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.HttpRequest;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * Represents a client-side asynchronous HTTP request. Created via an
- * implementation of the {@link AsyncClientHttpRequestFactory}.
- *
- * <p>A {@code AsyncHttpRequest} can be {@linkplain #executeAsync() executed},
- * getting a future {@link ClientHttpResponse} which can be read from.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @see AsyncClientHttpRequestFactory#createAsyncRequest
- * @deprecated as of Spring 5.0, in favor of {@link org.springframework.web.reactive.function.client.ClientRequest}
- */
-@Deprecated
-public interface AsyncClientHttpRequest extends HttpRequest, HttpOutputMessage {
-
-	/**
-	 * Execute this request asynchronously, resulting in a Future handle.
-	 * {@link ClientHttpResponse} that can be read.
-	 * @return the future response result of the execution
-	 * @throws java.io.IOException in case of I/O errors
-	 */
-	ListenableFuture<ClientHttpResponse> executeAsync() throws IOException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestExecution.java b/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestExecution.java
deleted file mode 100644
index 97ecb225cb32..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestExecution.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-
-import org.springframework.http.HttpRequest;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * Represents the context of a client-side HTTP request execution.
- *
- * <p>Used to invoke the next interceptor in the interceptor chain, or -
- * if the calling interceptor is last - execute the request itself.
- *
- * @author Jakub Narloch
- * @author Rossen Stoyanchev
- * @since 4.3
- * @see AsyncClientHttpRequestInterceptor
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.web.reactive.function.client.ExchangeFilterFunction}
- */
-@Deprecated
-public interface AsyncClientHttpRequestExecution {
-
-	/**
-	 * Resume the request execution by invoking the next interceptor in the chain
-	 * or executing the request to the remote service.
-	 * @param request the HTTP request, containing the HTTP method and headers
-	 * @param body the body of the request
-	 * @return a corresponding future handle
-	 * @throws IOException in case of I/O errors
-	 */
-	ListenableFuture<ClientHttpResponse> executeAsync(HttpRequest request, byte[] body) throws IOException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestFactory.java
deleted file mode 100644
index 509d1da713a3..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.springframework.http.HttpMethod;
-
-/**
- * Factory for {@link AsyncClientHttpRequest} objects.
- * Requests are created by the {@link #createAsyncRequest(URI, HttpMethod)} method.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @deprecated as of Spring 5.0, in favor of {@link org.springframework.http.client.reactive.ClientHttpConnector}
- */
-@Deprecated
-public interface AsyncClientHttpRequestFactory {
-
-	/**
-	 * Create a new asynchronous {@link AsyncClientHttpRequest} for the specified URI
-	 * and HTTP method.
-	 * <p>The returned request can be written to, and then executed by calling
-	 * {@link AsyncClientHttpRequest#executeAsync()}.
-	 * @param uri the URI to create a request for
-	 * @param httpMethod the HTTP method to execute
-	 * @return the created request
-	 * @throws IOException in case of I/O errors
-	 */
-	AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) throws IOException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestInterceptor.java b/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestInterceptor.java
deleted file mode 100644
index 34ed8c024e68..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestInterceptor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-
-import org.springframework.http.HttpRequest;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * Intercepts client-side HTTP requests. Implementations of this interface can be
- * {@linkplain org.springframework.web.client.AsyncRestTemplate#setInterceptors registered}
- * with the {@link org.springframework.web.client.AsyncRestTemplate} as to modify
- * the outgoing {@link HttpRequest} and/or register to modify the incoming
- * {@link ClientHttpResponse} with help of a
- * {@link org.springframework.util.concurrent.ListenableFutureAdapter}.
- *
- * <p>The main entry point for interceptors is {@link #intercept}.
- *
- * @author Jakub Narloch
- * @author Rossen Stoyanchev
- * @since 4.3
- * @see org.springframework.web.client.AsyncRestTemplate
- * @see org.springframework.http.client.support.InterceptingAsyncHttpAccessor
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.web.reactive.function.client.ExchangeFilterFunction}
- */
-@Deprecated
-public interface AsyncClientHttpRequestInterceptor {
-
-	/**
-	 * Intercept the given request, and return a response future. The given
-	 * {@link AsyncClientHttpRequestExecution} allows the interceptor to pass on
-	 * the request to the next entity in the chain.
-	 * <p>An implementation might follow this pattern:
-	 * <ol>
-	 * <li>Examine the {@linkplain HttpRequest request} and body</li>
-	 * <li>Optionally {@linkplain org.springframework.http.client.support.HttpRequestWrapper
-	 * wrap} the request to filter HTTP attributes.</li>
-	 * <li>Optionally modify the body of the request.</li>
-	 * <li>One of the following:
-	 * <ul>
-	 * <li>execute the request through {@link ClientHttpRequestExecution}</li>
-	 * <li>don't execute the request to block the execution altogether</li>
-	 * </ul>
-	 * <li>Optionally adapt the response to filter HTTP attributes with the help of
-	 * {@link org.springframework.util.concurrent.ListenableFutureAdapter
-	 * ListenableFutureAdapter}.</li>
-	 * </ol>
-	 * @param request the request, containing method, URI, and headers
-	 * @param body the body of the request
-	 * @param execution the request execution
-	 * @return the response future
-	 * @throws IOException in case of I/O errors
-	 */
-	ListenableFuture<ClientHttpResponse> intercept(HttpRequest request, byte[] body,
-			AsyncClientHttpRequestExecution execution) throws IOException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java
deleted file mode 100644
index ca97edde0bb8..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.concurrent.Future;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.nio.client.HttpAsyncClient;
-import org.apache.http.nio.entity.NByteArrayEntity;
-import org.apache.http.protocol.HttpContext;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.util.concurrent.FailureCallback;
-import org.springframework.util.concurrent.FutureAdapter;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-import org.springframework.util.concurrent.ListenableFutureCallbackRegistry;
-import org.springframework.util.concurrent.SuccessCallback;
-
-
-/**
- * {@link ClientHttpRequest} implementation based on
- * Apache HttpComponents HttpAsyncClient.
- *
- * <p>Created via the {@link HttpComponentsClientHttpRequestFactory}.
- *
- * @author Oleg Kalnichevski
- * @author Arjen Poutsma
- * @since 4.0
- * @see HttpComponentsClientHttpRequestFactory#createRequest
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.http.client.reactive.HttpComponentsClientHttpConnector}
- */
-@Deprecated
-final class HttpComponentsAsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpRequest {
-
-	private final HttpAsyncClient httpClient;
-
-	private final HttpUriRequest httpRequest;
-
-	private final HttpContext httpContext;
-
-
-	HttpComponentsAsyncClientHttpRequest(HttpAsyncClient client, HttpUriRequest request, HttpContext context) {
-		this.httpClient = client;
-		this.httpRequest = request;
-		this.httpContext = context;
-	}
-
-
-	@Override
-	public String getMethodValue() {
-		return this.httpRequest.getMethod();
-	}
-
-	@Override
-	public URI getURI() {
-		return this.httpRequest.getURI();
-	}
-
-	HttpContext getHttpContext() {
-		return this.httpContext;
-	}
-
-	@Override
-	protected ListenableFuture<ClientHttpResponse> executeInternal(HttpHeaders headers, byte[] bufferedOutput)
-			throws IOException {
-
-		HttpComponentsClientHttpRequest.addHeaders(this.httpRequest, headers);
-
-		if (this.httpRequest instanceof HttpEntityEnclosingRequest) {
-			HttpEntityEnclosingRequest entityEnclosingRequest = (HttpEntityEnclosingRequest) this.httpRequest;
-			HttpEntity requestEntity = new NByteArrayEntity(bufferedOutput);
-			entityEnclosingRequest.setEntity(requestEntity);
-		}
-
-		HttpResponseFutureCallback callback = new HttpResponseFutureCallback(this.httpRequest);
-		Future<HttpResponse> futureResponse = this.httpClient.execute(this.httpRequest, this.httpContext, callback);
-		return new ClientHttpResponseFuture(futureResponse, callback);
-	}
-
-
-	private static class HttpResponseFutureCallback implements FutureCallback<HttpResponse> {
-
-		private final HttpUriRequest request;
-
-		private final ListenableFutureCallbackRegistry<ClientHttpResponse> callbacks =
-				new ListenableFutureCallbackRegistry<>();
-
-		public HttpResponseFutureCallback(HttpUriRequest request) {
-			this.request = request;
-		}
-
-		public void addCallback(ListenableFutureCallback<? super ClientHttpResponse> callback) {
-			this.callbacks.addCallback(callback);
-		}
-
-		public void addSuccessCallback(SuccessCallback<? super ClientHttpResponse> callback) {
-			this.callbacks.addSuccessCallback(callback);
-		}
-
-		public void addFailureCallback(FailureCallback callback) {
-			this.callbacks.addFailureCallback(callback);
-		}
-
-		@Override
-		public void completed(HttpResponse result) {
-			this.callbacks.success(new HttpComponentsAsyncClientHttpResponse(result));
-		}
-
-		@Override
-		public void failed(Exception ex) {
-			this.callbacks.failure(ex);
-		}
-
-		@Override
-		public void cancelled() {
-			this.request.abort();
-		}
-	}
-
-
-	private static class ClientHttpResponseFuture extends FutureAdapter<ClientHttpResponse, HttpResponse>
-			implements ListenableFuture<ClientHttpResponse> {
-
-		private final HttpResponseFutureCallback callback;
-
-		public ClientHttpResponseFuture(Future<HttpResponse> response, HttpResponseFutureCallback callback) {
-			super(response);
-			this.callback = callback;
-		}
-
-		@Override
-		protected ClientHttpResponse adapt(HttpResponse response) {
-			return new HttpComponentsAsyncClientHttpResponse(response);
-		}
-
-		@Override
-		public void addCallback(ListenableFutureCallback<? super ClientHttpResponse> callback) {
-			this.callback.addCallback(callback);
-		}
-
-		@Override
-		public void addCallback(SuccessCallback<? super ClientHttpResponse> successCallback,
-				FailureCallback failureCallback) {
-
-			this.callback.addSuccessCallback(successCallback);
-			this.callback.addFailureCallback(failureCallback);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java
deleted file mode 100644
index 84bd07a159e6..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.URI;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.Configurable;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
-import org.apache.http.impl.nio.client.HttpAsyncClients;
-import org.apache.http.nio.client.HttpAsyncClient;
-import org.apache.http.protocol.HttpContext;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.http.HttpMethod;
-import org.springframework.util.Assert;
-
-/**
- * Asynchronous extension of the {@link HttpComponentsClientHttpRequestFactory}. Uses
- * <a href="https://hc.apache.org/httpcomponents-asyncclient-dev/">Apache HttpComponents
- * HttpAsyncClient 4.0</a> to create requests.
- *
- * @author Arjen Poutsma
- * @author Stephane Nicoll
- * @since 4.0
- * @see HttpAsyncClient
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.http.client.reactive.HttpComponentsClientHttpConnector}
- */
-@Deprecated
-public class HttpComponentsAsyncClientHttpRequestFactory extends HttpComponentsClientHttpRequestFactory
-		implements AsyncClientHttpRequestFactory, InitializingBean {
-
-	private HttpAsyncClient asyncClient;
-
-
-	/**
-	 * Create a new instance of the {@code HttpComponentsAsyncClientHttpRequestFactory}
-	 * with a default {@link HttpAsyncClient} and {@link HttpClient}.
-	 */
-	public HttpComponentsAsyncClientHttpRequestFactory() {
-		super();
-		this.asyncClient = HttpAsyncClients.createSystem();
-	}
-
-	/**
-	 * Create a new instance of the {@code HttpComponentsAsyncClientHttpRequestFactory}
-	 * with the given {@link HttpAsyncClient} instance and a default {@link HttpClient}.
-	 * @param asyncClient the HttpAsyncClient instance to use for this request factory
-	 * @since 4.3.10
-	 */
-	public HttpComponentsAsyncClientHttpRequestFactory(HttpAsyncClient asyncClient) {
-		super();
-		this.asyncClient = asyncClient;
-	}
-
-	/**
-	 * Create a new instance of the {@code HttpComponentsAsyncClientHttpRequestFactory}
-	 * with the given {@link CloseableHttpAsyncClient} instance and a default {@link HttpClient}.
-	 * @param asyncClient the CloseableHttpAsyncClient instance to use for this request factory
-	 */
-	public HttpComponentsAsyncClientHttpRequestFactory(CloseableHttpAsyncClient asyncClient) {
-		super();
-		this.asyncClient = asyncClient;
-	}
-
-	/**
-	 * Create a new instance of the {@code HttpComponentsAsyncClientHttpRequestFactory}
-	 * with the given {@link HttpClient} and {@link HttpAsyncClient} instances.
-	 * @param httpClient the HttpClient instance to use for this request factory
-	 * @param asyncClient the HttpAsyncClient instance to use for this request factory
-	 * @since 4.3.10
-	 */
-	public HttpComponentsAsyncClientHttpRequestFactory(HttpClient httpClient, HttpAsyncClient asyncClient) {
-		super(httpClient);
-		this.asyncClient = asyncClient;
-	}
-
-	/**
-	 * Create a new instance of the {@code HttpComponentsAsyncClientHttpRequestFactory}
-	 * with the given {@link CloseableHttpClient} and {@link CloseableHttpAsyncClient} instances.
-	 * @param httpClient the CloseableHttpClient instance to use for this request factory
-	 * @param asyncClient the CloseableHttpAsyncClient instance to use for this request factory
-	 */
-	public HttpComponentsAsyncClientHttpRequestFactory(
-			CloseableHttpClient httpClient, CloseableHttpAsyncClient asyncClient) {
-
-		super(httpClient);
-		this.asyncClient = asyncClient;
-	}
-
-
-	/**
-	 * Set the {@code HttpAsyncClient} used for
-	 * {@linkplain #createAsyncRequest(URI, HttpMethod) synchronous execution}.
-	 * @since 4.3.10
-	 * @see #setHttpClient(HttpClient)
-	 */
-	public void setAsyncClient(HttpAsyncClient asyncClient) {
-		Assert.notNull(asyncClient, "HttpAsyncClient must not be null");
-		this.asyncClient = asyncClient;
-	}
-
-	/**
-	 * Return the {@code HttpAsyncClient} used for
-	 * {@linkplain #createAsyncRequest(URI, HttpMethod) synchronous execution}.
-	 * @since 4.3.10
-	 * @see #getHttpClient()
-	 */
-	public HttpAsyncClient getAsyncClient() {
-		return this.asyncClient;
-	}
-
-	/**
-	 * Set the {@code CloseableHttpAsyncClient} used for
-	 * {@linkplain #createAsyncRequest(URI, HttpMethod) asynchronous execution}.
-	 * @deprecated as of 4.3.10, in favor of {@link #setAsyncClient(HttpAsyncClient)}
-	 */
-	@Deprecated
-	public void setHttpAsyncClient(CloseableHttpAsyncClient asyncClient) {
-		this.asyncClient = asyncClient;
-	}
-
-	/**
-	 * Return the {@code CloseableHttpAsyncClient} used for
-	 * {@linkplain #createAsyncRequest(URI, HttpMethod) asynchronous execution}.
-	 * @deprecated as of 4.3.10, in favor of {@link #getAsyncClient()}
-	 */
-	@Deprecated
-	public CloseableHttpAsyncClient getHttpAsyncClient() {
-		Assert.state(this.asyncClient instanceof CloseableHttpAsyncClient,
-				"No CloseableHttpAsyncClient - use getAsyncClient() instead");
-		return (CloseableHttpAsyncClient) this.asyncClient;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		startAsyncClient();
-	}
-
-	private HttpAsyncClient startAsyncClient() {
-		HttpAsyncClient client = getAsyncClient();
-		if (client instanceof CloseableHttpAsyncClient) {
-			@SuppressWarnings("resource")
-			CloseableHttpAsyncClient closeableAsyncClient = (CloseableHttpAsyncClient) client;
-			if (!closeableAsyncClient.isRunning()) {
-				closeableAsyncClient.start();
-			}
-		}
-		return client;
-	}
-
-	@Override
-	public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) throws IOException {
-		HttpAsyncClient client = startAsyncClient();
-
-		HttpUriRequest httpRequest = createHttpUriRequest(httpMethod, uri);
-		postProcessHttpRequest(httpRequest);
-		HttpContext context = createHttpContext(httpMethod, uri);
-		if (context == null) {
-			context = HttpClientContext.create();
-		}
-
-		// Request configuration not set in the context
-		if (context.getAttribute(HttpClientContext.REQUEST_CONFIG) == null) {
-			// Use request configuration given by the user, when available
-			RequestConfig config = null;
-			if (httpRequest instanceof Configurable) {
-				config = ((Configurable) httpRequest).getConfig();
-			}
-			if (config == null) {
-				config = createRequestConfig(client);
-			}
-			if (config != null) {
-				context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
-			}
-		}
-
-		return new HttpComponentsAsyncClientHttpRequest(client, httpRequest, context);
-	}
-
-	@Override
-	public void destroy() throws Exception {
-		try {
-			super.destroy();
-		}
-		finally {
-			HttpAsyncClient asyncClient = getAsyncClient();
-			if (asyncClient instanceof Closeable) {
-				((Closeable) asyncClient).close();
-			}
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java
deleted file mode 100644
index 54297db86008..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StreamUtils;
-
-/**
- * {@link ClientHttpResponse} implementation based on
- * Apache HttpComponents HttpAsyncClient.
- *
- * <p>Created via the {@link HttpComponentsAsyncClientHttpRequest}.
- *
- * @author Oleg Kalnichevski
- * @author Arjen Poutsma
- * @since 4.0
- * @see HttpComponentsAsyncClientHttpRequest#executeAsync()
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.http.client.reactive.HttpComponentsClientHttpConnector}
- */
-@Deprecated
-final class HttpComponentsAsyncClientHttpResponse extends AbstractClientHttpResponse {
-
-	private final HttpResponse httpResponse;
-
-	@Nullable
-	private HttpHeaders headers;
-
-
-	HttpComponentsAsyncClientHttpResponse(HttpResponse httpResponse) {
-		this.httpResponse = httpResponse;
-	}
-
-
-	@Override
-	public int getRawStatusCode() throws IOException {
-		return this.httpResponse.getStatusLine().getStatusCode();
-	}
-
-	@Override
-	public String getStatusText() throws IOException {
-		return this.httpResponse.getStatusLine().getReasonPhrase();
-	}
-
-	@Override
-	public HttpHeaders getHeaders() {
-		if (this.headers == null) {
-			this.headers = new HttpHeaders();
-			for (Header header : this.httpResponse.getAllHeaders()) {
-				this.headers.add(header.getName(), header.getValue());
-			}
-		}
-		return this.headers;
-	}
-
-	@Override
-	public InputStream getBody() throws IOException {
-		HttpEntity entity = this.httpResponse.getEntity();
-		return (entity != null ? entity.getContent() : StreamUtils.emptyInput());
-	}
-
-	@Override
-	public void close() {
-        // HTTP responses returned by async HTTP client are not bound to an
-        // active connection and do not have to deallocate any resources...
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java
deleted file mode 100644
index 4dd835f29404..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Iterator;
-import java.util.List;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
-import org.springframework.util.Assert;
-import org.springframework.util.StreamUtils;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * An {@link AsyncClientHttpRequest} wrapper that enriches it proceeds the actual
- * request execution with calling the registered interceptors.
- *
- * @author Jakub Narloch
- * @author Rossen Stoyanchev
- * @see InterceptingAsyncClientHttpRequestFactory
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-class InterceptingAsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpRequest {
-
-	private AsyncClientHttpRequestFactory requestFactory;
-
-	private List<AsyncClientHttpRequestInterceptor> interceptors;
-
-	private URI uri;
-
-	private HttpMethod httpMethod;
-
-
-	/**
-	 * Create new instance of {@link InterceptingAsyncClientHttpRequest}.
-	 * @param requestFactory the async request factory
-	 * @param interceptors the list of interceptors
-	 * @param uri the request URI
-	 * @param httpMethod the HTTP method
-	 */
-	public InterceptingAsyncClientHttpRequest(AsyncClientHttpRequestFactory requestFactory,
-			List<AsyncClientHttpRequestInterceptor> interceptors, URI uri, HttpMethod httpMethod) {
-
-		this.requestFactory = requestFactory;
-		this.interceptors = interceptors;
-		this.uri = uri;
-		this.httpMethod = httpMethod;
-	}
-
-
-	@Override
-	protected ListenableFuture<ClientHttpResponse> executeInternal(HttpHeaders headers, byte[] body)
-			throws IOException {
-
-		return new AsyncRequestExecution().executeAsync(this, body);
-	}
-
-	@Override
-	public HttpMethod getMethod() {
-		return this.httpMethod;
-	}
-
-	@Override
-	public String getMethodValue() {
-		return this.httpMethod.name();
-	}
-
-	@Override
-	public URI getURI() {
-		return this.uri;
-	}
-
-
-	private class AsyncRequestExecution implements AsyncClientHttpRequestExecution {
-
-		private Iterator<AsyncClientHttpRequestInterceptor> iterator;
-
-		public AsyncRequestExecution() {
-			this.iterator = interceptors.iterator();
-		}
-
-		@Override
-		public ListenableFuture<ClientHttpResponse> executeAsync(HttpRequest request, byte[] body)
-				throws IOException {
-
-			if (this.iterator.hasNext()) {
-				AsyncClientHttpRequestInterceptor interceptor = this.iterator.next();
-				return interceptor.intercept(request, body, this);
-			}
-			else {
-				URI uri = request.getURI();
-				HttpMethod method = request.getMethod();
-				HttpHeaders headers = request.getHeaders();
-
-				Assert.state(method != null, "No standard HTTP method");
-				AsyncClientHttpRequest delegate = requestFactory.createAsyncRequest(uri, method);
-				delegate.getHeaders().putAll(headers);
-				if (body.length > 0) {
-					StreamUtils.copy(body, delegate.getBody());
-				}
-
-				return delegate.executeAsync();
-			}
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.java
deleted file mode 100644
index 9721e46cc2cc..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequestFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.http.HttpMethod;
-import org.springframework.lang.Nullable;
-
-/**
- * Wrapper for a {@link AsyncClientHttpRequestFactory} that has support for
- * {@link AsyncClientHttpRequestInterceptor AsyncClientHttpRequestInterceptors}.
- *
- * @author Jakub Narloch
- * @since 4.3
- * @see InterceptingAsyncClientHttpRequest
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-public class InterceptingAsyncClientHttpRequestFactory implements AsyncClientHttpRequestFactory {
-
-	private AsyncClientHttpRequestFactory delegate;
-
-	private List<AsyncClientHttpRequestInterceptor> interceptors;
-
-
-	/**
-	 * Create new instance of {@link InterceptingAsyncClientHttpRequestFactory}
-	 * with delegated request factory and list of interceptors.
-	 * @param delegate the request factory to delegate to
-	 * @param interceptors the list of interceptors to use
-	 */
-	public InterceptingAsyncClientHttpRequestFactory(AsyncClientHttpRequestFactory delegate,
-			@Nullable List<AsyncClientHttpRequestInterceptor> interceptors) {
-
-		this.delegate = delegate;
-		this.interceptors = (interceptors != null ? interceptors : Collections.emptyList());
-	}
-
-
-	@Override
-	public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod method) {
-		return new InterceptingAsyncClientHttpRequest(this.delegate, this.interceptors, uri, method);
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java
deleted file mode 100644
index c4c7d6f37d40..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.concurrent.ExecutionException;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.buffer.ByteBufOutputStream;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.codec.http.DefaultFullHttpRequest;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpVersion;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.SettableListenableFuture;
-
-/**
- * {@link ClientHttpRequest} implementation based on Netty 4.
- *
- * <p>Created via the {@link Netty4ClientHttpRequestFactory}.
- *
- * @author Arjen Poutsma
- * @author Rossen Stoyanchev
- * @author Brian Clozel
- * @since 4.1.2
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.http.client.reactive.ReactorClientHttpConnector}
- */
-@Deprecated
-class Netty4ClientHttpRequest extends AbstractAsyncClientHttpRequest implements ClientHttpRequest {
-
-	private final Bootstrap bootstrap;
-
-	private final URI uri;
-
-	private final HttpMethod method;
-
-	private final ByteBufOutputStream body;
-
-
-	public Netty4ClientHttpRequest(Bootstrap bootstrap, URI uri, HttpMethod method) {
-		this.bootstrap = bootstrap;
-		this.uri = uri;
-		this.method = method;
-		this.body = new ByteBufOutputStream(Unpooled.buffer(1024));
-	}
-
-
-	@Override
-	public HttpMethod getMethod() {
-		return this.method;
-	}
-
-	@Override
-	public String getMethodValue() {
-		return this.method.name();
-	}
-
-	@Override
-	public URI getURI() {
-		return this.uri;
-	}
-
-	@Override
-	public ClientHttpResponse execute() throws IOException {
-		try {
-			return executeAsync().get();
-		}
-		catch (InterruptedException ex) {
-			Thread.currentThread().interrupt();
-			throw new IOException("Interrupted during request execution", ex);
-		}
-		catch (ExecutionException ex) {
-			if (ex.getCause() instanceof IOException) {
-				throw (IOException) ex.getCause();
-			}
-			else {
-				throw new IOException(ex.getMessage(), ex.getCause());
-			}
-		}
-	}
-
-	@Override
-	protected OutputStream getBodyInternal(HttpHeaders headers) throws IOException {
-		return this.body;
-	}
-
-	@Override
-	protected ListenableFuture<ClientHttpResponse> executeInternal(final HttpHeaders headers) throws IOException {
-		final SettableListenableFuture<ClientHttpResponse> responseFuture = new SettableListenableFuture<>();
-
-		ChannelFutureListener connectionListener = future -> {
-			if (future.isSuccess()) {
-				Channel channel = future.channel();
-				channel.pipeline().addLast(new RequestExecuteHandler(responseFuture));
-				FullHttpRequest nettyRequest = createFullHttpRequest(headers);
-				channel.writeAndFlush(nettyRequest);
-			}
-			else {
-				responseFuture.setException(future.cause());
-			}
-		};
-
-		this.bootstrap.connect(this.uri.getHost(), getPort(this.uri)).addListener(connectionListener);
-		return responseFuture;
-	}
-
-	private FullHttpRequest createFullHttpRequest(HttpHeaders headers) {
-		io.netty.handler.codec.http.HttpMethod nettyMethod =
-				io.netty.handler.codec.http.HttpMethod.valueOf(this.method.name());
-
-		String authority = this.uri.getRawAuthority();
-		String path = this.uri.toString().substring(this.uri.toString().indexOf(authority) + authority.length());
-		FullHttpRequest nettyRequest = new DefaultFullHttpRequest(
-				HttpVersion.HTTP_1_1, nettyMethod, path, this.body.buffer());
-
-		nettyRequest.headers().set(HttpHeaders.HOST, this.uri.getHost() + ":" + getPort(this.uri));
-		nettyRequest.headers().set(HttpHeaders.CONNECTION, "close");
-		headers.forEach((headerName, headerValues) -> nettyRequest.headers().add(headerName, headerValues));
-		if (!nettyRequest.headers().contains(HttpHeaders.CONTENT_LENGTH) && this.body.buffer().readableBytes() > 0) {
-			nettyRequest.headers().set(HttpHeaders.CONTENT_LENGTH, this.body.buffer().readableBytes());
-		}
-
-		return nettyRequest;
-	}
-
-	private static int getPort(URI uri) {
-		int port = uri.getPort();
-		if (port == -1) {
-			if ("http".equalsIgnoreCase(uri.getScheme())) {
-				port = 80;
-			}
-			else if ("https".equalsIgnoreCase(uri.getScheme())) {
-				port = 443;
-			}
-		}
-		return port;
-	}
-
-
-	/**
-	 * A SimpleChannelInboundHandler to update the given SettableListenableFuture.
-	 */
-	private static class RequestExecuteHandler extends SimpleChannelInboundHandler<FullHttpResponse> {
-
-		private final SettableListenableFuture<ClientHttpResponse> responseFuture;
-
-		public RequestExecuteHandler(SettableListenableFuture<ClientHttpResponse> responseFuture) {
-			this.responseFuture = responseFuture;
-		}
-
-		@Override
-		protected void channelRead0(ChannelHandlerContext context, FullHttpResponse response) throws Exception {
-			this.responseFuture.set(new Netty4ClientHttpResponse(context, response));
-		}
-
-		@Override
-		public void exceptionCaught(ChannelHandlerContext context, Throwable cause) throws Exception {
-			this.responseFuture.setException(cause);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.java
deleted file mode 100644
index bc0c83472fb9..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.SSLException;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.ChannelConfig;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.SocketChannelConfig;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.timeout.ReadTimeoutHandler;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.http.HttpMethod;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.http.client.ClientHttpRequestFactory} implementation
- * that uses <a href="https://netty.io/">Netty 4</a> to create requests.
- *
- * <p>Allows to use a pre-configured {@link EventLoopGroup} instance: useful for
- * sharing across multiple clients.
- *
- * <p>Note that this implementation consistently closes the HTTP connection on each
- * request.
- *
- * @author Arjen Poutsma
- * @author Rossen Stoyanchev
- * @author Brian Clozel
- * @author Mark Paluch
- * @since 4.1.2
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.http.client.reactive.ReactorClientHttpConnector}
- */
-@Deprecated
-public class Netty4ClientHttpRequestFactory implements ClientHttpRequestFactory,
-		AsyncClientHttpRequestFactory, InitializingBean, DisposableBean {
-
-	/**
-	 * The default maximum response size.
-	 * @see #setMaxResponseSize(int)
-	 */
-	public static final int DEFAULT_MAX_RESPONSE_SIZE = 1024 * 1024 * 10;
-
-
-	private final EventLoopGroup eventLoopGroup;
-
-	private final boolean defaultEventLoopGroup;
-
-	private int maxResponseSize = DEFAULT_MAX_RESPONSE_SIZE;
-
-	@Nullable
-	private SslContext sslContext;
-
-	private int connectTimeout = -1;
-
-	private int readTimeout = -1;
-
-	@Nullable
-	private volatile Bootstrap bootstrap;
-
-
-	/**
-	 * Create a new {@code Netty4ClientHttpRequestFactory} with a default
-	 * {@link NioEventLoopGroup}.
-	 */
-	public Netty4ClientHttpRequestFactory() {
-		int ioWorkerCount = Runtime.getRuntime().availableProcessors() * 2;
-		this.eventLoopGroup = new NioEventLoopGroup(ioWorkerCount);
-		this.defaultEventLoopGroup = true;
-	}
-
-	/**
-	 * Create a new {@code Netty4ClientHttpRequestFactory} with the given
-	 * {@link EventLoopGroup}.
-	 * <p><b>NOTE:</b> the given group will <strong>not</strong> be
-	 * {@linkplain EventLoopGroup#shutdownGracefully() shutdown} by this factory;
-	 * doing so becomes the responsibility of the caller.
-	 */
-	public Netty4ClientHttpRequestFactory(EventLoopGroup eventLoopGroup) {
-		Assert.notNull(eventLoopGroup, "EventLoopGroup must not be null");
-		this.eventLoopGroup = eventLoopGroup;
-		this.defaultEventLoopGroup = false;
-	}
-
-
-	/**
-	 * Set the default maximum response size.
-	 * <p>By default this is set to {@link #DEFAULT_MAX_RESPONSE_SIZE}.
-	 * @since 4.1.5
-	 * @see HttpObjectAggregator#HttpObjectAggregator(int)
-	 */
-	public void setMaxResponseSize(int maxResponseSize) {
-		this.maxResponseSize = maxResponseSize;
-	}
-
-	/**
-	 * Set the SSL context. When configured it is used to create and insert an
-	 * {@link io.netty.handler.ssl.SslHandler} in the channel pipeline.
-	 * <p>A default client SslContext is configured if none has been provided.
-	 */
-	public void setSslContext(SslContext sslContext) {
-		this.sslContext = sslContext;
-	}
-
-	/**
-	 * Set the underlying connect timeout (in milliseconds).
-	 * A timeout value of 0 specifies an infinite timeout.
-	 * @see ChannelConfig#setConnectTimeoutMillis(int)
-	 */
-	public void setConnectTimeout(int connectTimeout) {
-		this.connectTimeout = connectTimeout;
-	}
-
-	/**
-	 * Set the underlying URLConnection's read timeout (in milliseconds).
-	 * A timeout value of 0 specifies an infinite timeout.
-	 * @see ReadTimeoutHandler
-	 */
-	public void setReadTimeout(int readTimeout) {
-		this.readTimeout = readTimeout;
-	}
-
-
-	@Override
-	public void afterPropertiesSet() {
-		if (this.sslContext == null) {
-			this.sslContext = getDefaultClientSslContext();
-		}
-	}
-
-	private SslContext getDefaultClientSslContext() {
-		try {
-			return SslContextBuilder.forClient().build();
-		}
-		catch (SSLException ex) {
-			throw new IllegalStateException("Could not create default client SslContext", ex);
-		}
-	}
-
-
-	@Override
-	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
-		return createRequestInternal(uri, httpMethod);
-	}
-
-	@Override
-	public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) throws IOException {
-		return createRequestInternal(uri, httpMethod);
-	}
-
-	private Netty4ClientHttpRequest createRequestInternal(URI uri, HttpMethod httpMethod) {
-		return new Netty4ClientHttpRequest(getBootstrap(uri), uri, httpMethod);
-	}
-
-	private Bootstrap getBootstrap(URI uri) {
-		boolean isSecure = (uri.getPort() == 443 || "https".equalsIgnoreCase(uri.getScheme()));
-		if (isSecure) {
-			return buildBootstrap(uri, true);
-		}
-		else {
-			Bootstrap bootstrap = this.bootstrap;
-			if (bootstrap == null) {
-				bootstrap = buildBootstrap(uri, false);
-				this.bootstrap = bootstrap;
-			}
-			return bootstrap;
-		}
-	}
-
-	private Bootstrap buildBootstrap(URI uri, boolean isSecure) {
-		Bootstrap bootstrap = new Bootstrap();
-		bootstrap.group(this.eventLoopGroup).channel(NioSocketChannel.class)
-				.handler(new ChannelInitializer<SocketChannel>() {
-					@Override
-					protected void initChannel(SocketChannel channel) throws Exception {
-						configureChannel(channel.config());
-						ChannelPipeline pipeline = channel.pipeline();
-						if (isSecure) {
-							Assert.notNull(sslContext, "sslContext should not be null");
-							pipeline.addLast(sslContext.newHandler(channel.alloc(), uri.getHost(), uri.getPort()));
-						}
-						pipeline.addLast(new HttpClientCodec());
-						pipeline.addLast(new HttpObjectAggregator(maxResponseSize));
-						if (readTimeout > 0) {
-							pipeline.addLast(new ReadTimeoutHandler(readTimeout,
-									TimeUnit.MILLISECONDS));
-						}
-					}
-				});
-		return bootstrap;
-	}
-
-	/**
-	 * Template method for changing properties on the given {@link SocketChannelConfig}.
-	 * <p>The default implementation sets the connect timeout based on the set property.
-	 * @param config the channel configuration
-	 */
-	protected void configureChannel(SocketChannelConfig config) {
-		if (this.connectTimeout >= 0) {
-			config.setConnectTimeoutMillis(this.connectTimeout);
-		}
-	}
-
-
-	@Override
-	public void destroy() throws InterruptedException {
-		if (this.defaultEventLoopGroup) {
-			// Clean up the EventLoopGroup if we created it in the constructor
-			this.eventLoopGroup.shutdownGracefully().sync();
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java
deleted file mode 100644
index 6ac0de0a19e6..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpResponse.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.FullHttpResponse;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * {@link ClientHttpResponse} implementation based on Netty 4.
- *
- * @author Arjen Poutsma
- * @since 4.1.2
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.http.client.reactive.ReactorClientHttpConnector}
- */
-@Deprecated
-class Netty4ClientHttpResponse extends AbstractClientHttpResponse {
-
-	private final ChannelHandlerContext context;
-
-	private final FullHttpResponse nettyResponse;
-
-	private final ByteBufInputStream body;
-
-	@Nullable
-	private volatile HttpHeaders headers;
-
-
-	public Netty4ClientHttpResponse(ChannelHandlerContext context, FullHttpResponse nettyResponse) {
-		Assert.notNull(context, "ChannelHandlerContext must not be null");
-		Assert.notNull(nettyResponse, "FullHttpResponse must not be null");
-		this.context = context;
-		this.nettyResponse = nettyResponse;
-		this.body = new ByteBufInputStream(this.nettyResponse.content());
-		this.nettyResponse.retain();
-	}
-
-
-	@Override
-	public int getRawStatusCode() throws IOException {
-		return this.nettyResponse.getStatus().code();
-	}
-
-	@Override
-	public String getStatusText() throws IOException {
-		return this.nettyResponse.getStatus().reasonPhrase();
-	}
-
-	@Override
-	public HttpHeaders getHeaders() {
-		HttpHeaders headers = this.headers;
-		if (headers == null) {
-			headers = new HttpHeaders();
-			for (Map.Entry<String, String> entry : this.nettyResponse.headers()) {
-				headers.add(entry.getKey(), entry.getValue());
-			}
-			this.headers = headers;
-		}
-		return headers;
-	}
-
-	@Override
-	public InputStream getBody() throws IOException {
-		return this.body;
-	}
-
-	@Override
-	public void close() {
-		this.nettyResponse.release();
-		this.context.close();
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java
deleted file mode 100644
index ee8d2eb23394..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.net.URI;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.SettableListenableFuture;
-
-/**
- * {@link AsyncClientHttpRequest} implementation based on OkHttp 3.x.
- *
- * <p>Created via the {@link OkHttp3ClientHttpRequestFactory}.
- *
- * @author Luciano Leggieri
- * @author Arjen Poutsma
- * @author Roy Clarkson
- * @since 4.3
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-class OkHttp3AsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpRequest {
-
-	private final OkHttpClient client;
-
-	private final URI uri;
-
-	private final HttpMethod method;
-
-
-	public OkHttp3AsyncClientHttpRequest(OkHttpClient client, URI uri, HttpMethod method) {
-		this.client = client;
-		this.uri = uri;
-		this.method = method;
-	}
-
-
-	@Override
-	public HttpMethod getMethod() {
-		return this.method;
-	}
-
-	@Override
-	public String getMethodValue() {
-		return this.method.name();
-	}
-
-	@Override
-	public URI getURI() {
-		return this.uri;
-	}
-
-	@Override
-	protected ListenableFuture<ClientHttpResponse> executeInternal(HttpHeaders headers, byte[] content)
-			throws IOException {
-
-		Request request = OkHttp3ClientHttpRequestFactory.buildRequest(headers, content, this.uri, this.method);
-		return new OkHttpListenableFuture(this.client.newCall(request));
-	}
-
-
-	private static class OkHttpListenableFuture extends SettableListenableFuture<ClientHttpResponse> {
-
-		private final Call call;
-
-		public OkHttpListenableFuture(Call call) {
-			this.call = call;
-			this.call.enqueue(new Callback() {
-				@Override
-				public void onResponse(Call call, Response response) {
-					set(new OkHttp3ClientHttpResponse(response));
-				}
-				@Override
-				public void onFailure(Call call, IOException ex) {
-					setException(ex);
-				}
-			});
-		}
-
-		@Override
-		protected void interruptTask() {
-			this.call.cancel();
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java
index f23febf88d5c..e81bbe61a4ca 100644
--- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,9 +42,7 @@
  * @author Roy Clarkson
  * @since 4.3
  */
-@SuppressWarnings("deprecation")
-public class OkHttp3ClientHttpRequestFactory
-		implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory, DisposableBean {
+public class OkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, DisposableBean {
 
 	private OkHttpClient client;
 
@@ -106,11 +104,6 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) {
 		return new OkHttp3ClientHttpRequest(this.client, uri, httpMethod);
 	}
 
-	@Override
-	public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) {
-		return new OkHttp3AsyncClientHttpRequest(this.client, uri, httpMethod);
-	}
-
 
 	@Override
 	public void destroy() throws IOException {
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
deleted file mode 100644
index ec2672534d11..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
+++ /dev/null
@@ -1,99 +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.http.client;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * {@link org.springframework.http.client.ClientHttpRequest} implementation that uses
- * standard JDK facilities to execute buffered requests. Created via the
- * {@link org.springframework.http.client.SimpleClientHttpRequestFactory}.
- *
- * @author Arjen Poutsma
- * @since 3.0
- * @see org.springframework.http.client.SimpleClientHttpRequestFactory#createRequest
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-final class SimpleBufferingAsyncClientHttpRequest extends AbstractBufferingAsyncClientHttpRequest {
-
-	private final HttpURLConnection connection;
-
-	private final boolean outputStreaming;
-
-	private final AsyncListenableTaskExecutor taskExecutor;
-
-
-	SimpleBufferingAsyncClientHttpRequest(HttpURLConnection connection,
-			boolean outputStreaming, AsyncListenableTaskExecutor taskExecutor) {
-
-		this.connection = connection;
-		this.outputStreaming = outputStreaming;
-		this.taskExecutor = taskExecutor;
-	}
-
-
-	@Override
-	public String getMethodValue() {
-		return this.connection.getRequestMethod();
-	}
-
-	@Override
-	public URI getURI() {
-		try {
-			return this.connection.getURL().toURI();
-		}
-		catch (URISyntaxException ex) {
-			throw new IllegalStateException("Could not get HttpURLConnection URI: " + ex.getMessage(), ex);
-		}
-	}
-
-	@Override
-	protected ListenableFuture<ClientHttpResponse> executeInternal(
-			HttpHeaders headers, byte[] bufferedOutput) throws IOException {
-
-		return this.taskExecutor.submitListenable(() -> {
-			SimpleBufferingClientHttpRequest.addHeaders(this.connection, headers);
-			// JDK <1.8 doesn't support getOutputStream with HTTP DELETE
-			if (getMethod() == HttpMethod.DELETE && bufferedOutput.length == 0) {
-				this.connection.setDoOutput(false);
-			}
-			if (this.connection.getDoOutput() && this.outputStreaming) {
-				this.connection.setFixedLengthStreamingMode(bufferedOutput.length);
-			}
-			this.connection.connect();
-			if (this.connection.getDoOutput()) {
-				FileCopyUtils.copy(bufferedOutput, this.connection.getOutputStream());
-			}
-			else {
-				// Immediately trigger the request in a no-output scenario as well
-				this.connection.getResponseCode();
-			}
-			return new SimpleClientHttpResponse(this.connection);
-		});
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
index 4674df6e476c..091b345a26fd 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,8 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 
 /**
  * {@link ClientHttpRequestFactory} implementation that uses standard JDK facilities.
@@ -37,8 +35,7 @@
  * @see java.net.HttpURLConnection
  * @see HttpComponentsClientHttpRequestFactory
  */
-@SuppressWarnings("deprecation")
-public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory {
+public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory {
 
 	private static final int DEFAULT_CHUNK_SIZE = 4096;
 
@@ -56,9 +53,6 @@ public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory,
 
 	private boolean outputStreaming = true;
 
-	@Nullable
-	private AsyncListenableTaskExecutor taskExecutor;
-
 
 	/**
 	 * Set the {@link Proxy} to use for this request factory.
@@ -130,15 +124,6 @@ public void setOutputStreaming(boolean outputStreaming) {
 		this.outputStreaming = outputStreaming;
 	}
 
-	/**
-	 * Set the task executor for this request factory. Setting this property is required
-	 * for {@linkplain #createAsyncRequest(URI, HttpMethod) creating asynchronous requests}.
-	 * @param taskExecutor the task executor
-	 */
-	public void setTaskExecutor(AsyncListenableTaskExecutor taskExecutor) {
-		this.taskExecutor = taskExecutor;
-	}
-
 
 	@Override
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
@@ -153,27 +138,6 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 		}
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * <p>Setting the {@link #setTaskExecutor taskExecutor} property is required before calling this method.
-	 */
-	@Override
-	public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) throws IOException {
-		Assert.state(this.taskExecutor != null, "Asynchronous execution requires TaskExecutor to be set");
-
-		HttpURLConnection connection = openConnection(uri.toURL(), this.proxy);
-		prepareConnection(connection, httpMethod.name());
-
-		if (this.bufferRequestBody) {
-			return new SimpleBufferingAsyncClientHttpRequest(
-					connection, this.outputStreaming, this.taskExecutor);
-		}
-		else {
-			return new SimpleStreamingAsyncClientHttpRequest(
-					connection, this.chunkSize, this.outputStreaming, this.taskExecutor);
-		}
-	}
-
 	/**
 	 * Opens and returns a connection to the given URL.
 	 * <p>The default implementation uses the given {@linkplain #setProxy(java.net.Proxy) proxy} -
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingAsyncClientHttpRequest.java
deleted file mode 100644
index eb8ef1adf8d8..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingAsyncClientHttpRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StreamUtils;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * {@link org.springframework.http.client.ClientHttpRequest} implementation
- * that uses standard Java facilities to execute streaming requests. Created
- * via the {@link org.springframework.http.client.SimpleClientHttpRequestFactory}.
- *
- * @author Arjen Poutsma
- * @since 3.0
- * @see org.springframework.http.client.SimpleClientHttpRequestFactory#createRequest
- * @see org.springframework.http.client.support.AsyncHttpAccessor
- * @see org.springframework.web.client.AsyncRestTemplate
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-final class SimpleStreamingAsyncClientHttpRequest extends AbstractAsyncClientHttpRequest {
-
-	private final HttpURLConnection connection;
-
-	private final int chunkSize;
-
-	@Nullable
-	private OutputStream body;
-
-	private final boolean outputStreaming;
-
-	private final AsyncListenableTaskExecutor taskExecutor;
-
-
-	SimpleStreamingAsyncClientHttpRequest(HttpURLConnection connection, int chunkSize,
-			boolean outputStreaming, AsyncListenableTaskExecutor taskExecutor) {
-
-		this.connection = connection;
-		this.chunkSize = chunkSize;
-		this.outputStreaming = outputStreaming;
-		this.taskExecutor = taskExecutor;
-	}
-
-
-	@Override
-	public String getMethodValue() {
-		return this.connection.getRequestMethod();
-	}
-
-	@Override
-	public URI getURI() {
-		try {
-			return this.connection.getURL().toURI();
-		}
-		catch (URISyntaxException ex) {
-			throw new IllegalStateException(
-					"Could not get HttpURLConnection URI: " + ex.getMessage(), ex);
-		}
-	}
-
-	@Override
-	protected OutputStream getBodyInternal(HttpHeaders headers) throws IOException {
-		if (this.body == null) {
-			if (this.outputStreaming) {
-				long contentLength = headers.getContentLength();
-				if (contentLength >= 0) {
-					this.connection.setFixedLengthStreamingMode(contentLength);
-				}
-				else {
-					this.connection.setChunkedStreamingMode(this.chunkSize);
-				}
-			}
-			SimpleBufferingClientHttpRequest.addHeaders(this.connection, headers);
-			this.connection.connect();
-			this.body = this.connection.getOutputStream();
-		}
-		return StreamUtils.nonClosing(this.body);
-	}
-
-	@Override
-	protected ListenableFuture<ClientHttpResponse> executeInternal(HttpHeaders headers) throws IOException {
-		return this.taskExecutor.submitListenable(() -> {
-			try {
-				if (this.body != null) {
-					this.body.close();
-				}
-				else {
-					SimpleBufferingClientHttpRequest.addHeaders(this.connection, headers);
-					this.connection.connect();
-					// Immediately trigger the request in a no-output scenario as well
-					this.connection.getResponseCode();
-				}
-			}
-			catch (IOException ex) {
-				// ignore
-			}
-			return new SimpleClientHttpResponse(this.connection);
-		});
-
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java b/spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java
deleted file mode 100644
index faf8c309c727..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- * 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.http.client.support;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.apache.commons.logging.Log;
-
-import org.springframework.http.HttpLogging;
-import org.springframework.http.HttpMethod;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Base class for {@link org.springframework.web.client.AsyncRestTemplate}
- * and other HTTP accessing gateway helpers, defining common properties
- * such as the {@link org.springframework.http.client.AsyncClientHttpRequestFactory}
- * to operate on.
- *
- * <p>Not intended to be used directly. See
- * {@link org.springframework.web.client.AsyncRestTemplate}.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @see org.springframework.web.client.AsyncRestTemplate
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-public class AsyncHttpAccessor {
-
-	/** Logger available to subclasses. */
-	protected final Log logger = HttpLogging.forLogName(getClass());
-
-	@Nullable
-	private org.springframework.http.client.AsyncClientHttpRequestFactory asyncRequestFactory;
-
-
-	/**
-	 * Set the request factory that this accessor uses for obtaining {@link
-	 * org.springframework.http.client.ClientHttpRequest HttpRequests}.
-	 */
-	public void setAsyncRequestFactory(
-			org.springframework.http.client.AsyncClientHttpRequestFactory asyncRequestFactory) {
-
-		Assert.notNull(asyncRequestFactory, "AsyncClientHttpRequestFactory must not be null");
-		this.asyncRequestFactory = asyncRequestFactory;
-	}
-
-	/**
-	 * Return the request factory that this accessor uses for obtaining {@link
-	 * org.springframework.http.client.ClientHttpRequest HttpRequests}.
-	 */
-	public org.springframework.http.client.AsyncClientHttpRequestFactory getAsyncRequestFactory() {
-		Assert.state(this.asyncRequestFactory != null, "No AsyncClientHttpRequestFactory set");
-		return this.asyncRequestFactory;
-	}
-
-	/**
-	 * Create a new {@link org.springframework.http.client.AsyncClientHttpRequest} via this template's
-	 * {@link org.springframework.http.client.AsyncClientHttpRequestFactory}.
-	 * @param url the URL to connect to
-	 * @param method the HTTP method to execute (GET, POST, etc.)
-	 * @return the created request
-	 * @throws IOException in case of I/O errors
-	 */
-	protected org.springframework.http.client.AsyncClientHttpRequest createAsyncRequest(URI url, HttpMethod method)
-			throws IOException {
-
-		org.springframework.http.client.AsyncClientHttpRequest request =
-				getAsyncRequestFactory().createAsyncRequest(url, method);
-		if (logger.isDebugEnabled()) {
-			logger.debug("Created asynchronous " + method.name() + " request for \"" + url + "\"");
-		}
-		return request;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/InterceptingAsyncHttpAccessor.java b/spring-web/src/main/java/org/springframework/http/client/support/InterceptingAsyncHttpAccessor.java
deleted file mode 100644
index 9f8586ec84e1..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/support/InterceptingAsyncHttpAccessor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.
- * 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.http.client.support;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * The HTTP accessor that extends the base {@link AsyncHttpAccessor} with
- * request intercepting functionality.
- *
- * @author Jakub Narloch
- * @author Rossen Stoyanchev
- * @since 4.3
- * @deprecated as of Spring 5.0, with no direct replacement
- */
-@Deprecated
-public abstract class InterceptingAsyncHttpAccessor extends AsyncHttpAccessor {
-
-	private List<org.springframework.http.client.AsyncClientHttpRequestInterceptor> interceptors =
-			new ArrayList<>();
-
-
-	/**
-	 * Set the request interceptors that this accessor should use.
-	 * @param interceptors the list of interceptors
-	 */
-	public void setInterceptors(List<org.springframework.http.client.AsyncClientHttpRequestInterceptor> interceptors) {
-		this.interceptors = interceptors;
-	}
-
-	/**
-	 * Return the request interceptor that this accessor uses.
-	 */
-	public List<org.springframework.http.client.AsyncClientHttpRequestInterceptor> getInterceptors() {
-		return this.interceptors;
-	}
-
-
-	@Override
-	public org.springframework.http.client.AsyncClientHttpRequestFactory getAsyncRequestFactory() {
-		org.springframework.http.client.AsyncClientHttpRequestFactory delegate = super.getAsyncRequestFactory();
-		if (!CollectionUtils.isEmpty(getInterceptors())) {
-			return new org.springframework.http.client.InterceptingAsyncClientHttpRequestFactory(delegate, getInterceptors());
-		}
-		else {
-			return delegate;
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java
deleted file mode 100644
index 00e2fdd4ab94..000000000000
--- a/spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java
+++ /dev/null
@@ -1,48 +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.web.client;
-
-import java.io.IOException;
-
-/**
- * Callback interface for code that operates on an
- * {@link org.springframework.http.client.AsyncClientHttpRequest}. Allows to
- * manipulate the request headers, and write to the request body.
- *
- * <p>Used internally by the {@link AsyncRestTemplate}, but also useful for
- * application code.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @see org.springframework.web.client.AsyncRestTemplate#execute
- * @deprecated as of Spring 5.0, in favor of
- * {@link org.springframework.web.reactive.function.client.ExchangeFilterFunction}
- */
-@FunctionalInterface
-@Deprecated
-public interface AsyncRequestCallback {
-
-	/**
-	 * Gets called by {@link AsyncRestTemplate#execute} with an opened {@code ClientHttpRequest}.
-	 * Does not need to care about closing the request or about handling errors:
-	 * this will all be handled by the {@code RestTemplate}.
-	 * @param request the active HTTP request
-	 * @throws java.io.IOException in case of I/O errors
-	 */
-	void doWithRequest(org.springframework.http.client.AsyncClientHttpRequest request) throws IOException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java
deleted file mode 100644
index c9d92a2aff4b..000000000000
--- a/spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * 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.
- * 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.web.client;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Future;
-
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.lang.Nullable;
-import org.springframework.util.concurrent.ListenableFuture;
-
-/**
- * Interface specifying a basic set of asynchronous RESTful operations.
- * Implemented by {@link AsyncRestTemplate}. Not often used directly, but a useful
- * option to enhance testability, as it can easily be mocked or stubbed.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @see AsyncRestTemplate
- * @see RestOperations
- * @deprecated as of Spring 5.0, in favor of {@link org.springframework.web.reactive.function.client.WebClient}
- */
-@Deprecated
-public interface AsyncRestOperations {
-
-	/**
-	 * Expose the synchronous Spring RestTemplate to allow synchronous invocation.
-	 */
-	RestOperations getRestOperations();
-
-
-	// GET
-
-	/**
-	 * Asynchronously retrieve an entity by doing a GET on the specified URL.
-	 * The response is converted and stored in an {@link ResponseEntity}.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param responseType the type of the return value
-	 * @param uriVariables the variables to expand the template
-	 * @return the entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> getForEntity(String url, Class<T> responseType,
-			Object... uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously retrieve a representation by doing a GET on the URI template.
-	 * The response is converted and stored in an {@link ResponseEntity}.
-	 * <p>URI Template variables are expanded using the given map.
-	 * @param url the URL
-	 * @param responseType the type of the return value
-	 * @param uriVariables the map containing variables for the URI template
-	 * @return the entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> getForEntity(String url, Class<T> responseType,
-			Map<String, ?> uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously retrieve a representation by doing a GET on the URL.
-	 * The response is converted and stored in an {@link ResponseEntity}.
-	 * @param url the URL
-	 * @param responseType the type of the return value
-	 * @return the entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> getForEntity(URI url, Class<T> responseType)
-			throws RestClientException;
-
-
-	// HEAD
-
-	/**
-	 * Asynchronously retrieve all headers of the resource specified by the URI template.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param uriVariables the variables to expand the template
-	 * @return all HTTP headers of that resource wrapped in a {@link Future}
-	 */
-	ListenableFuture<HttpHeaders> headForHeaders(String url, Object... uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Asynchronously retrieve all headers of the resource specified by the URI template.
-	 * <p>URI Template variables are expanded using the given map.
-	 * @param url the URL
-	 * @param uriVariables the map containing variables for the URI template
-	 * @return all HTTP headers of that resource wrapped in a {@link Future}
-	 */
-	ListenableFuture<HttpHeaders> headForHeaders(String url, Map<String, ?> uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Asynchronously retrieve all headers of the resource specified by the URL.
-	 * @param url the URL
-	 * @return all HTTP headers of that resource wrapped in a {@link Future}
-	 */
-	ListenableFuture<HttpHeaders> headForHeaders(URI url) throws RestClientException;
-
-
-	// POST
-
-	/**
-	 * Create a new resource by POSTing the given object to the URI template, and
-	 * asynchronously returns the value of the {@code Location} header. This header
-	 * typically indicates where the new resource is stored.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param request the Object to be POSTed (may be {@code null})
-	 * @param uriVariables the variables to expand the template
-	 * @return the value for the {@code Location} header wrapped in a {@link Future}
-	 * @see org.springframework.http.HttpEntity
-	 */
-	ListenableFuture<URI> postForLocation(String url, @Nullable HttpEntity<?> request, Object... uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Create a new resource by POSTing the given object to the URI template, and
-	 * asynchronously returns the value of the {@code Location} header. This header
-	 * typically indicates where the new resource is stored.
-	 * <p>URI Template variables are expanded using the given map.
-	 * @param url the URL
-	 * @param request the Object to be POSTed (may be {@code null})
-	 * @param uriVariables the variables to expand the template
-	 * @return the value for the {@code Location} header wrapped in a {@link Future}
-	 * @see org.springframework.http.HttpEntity
-	 */
-	ListenableFuture<URI> postForLocation(String url, @Nullable HttpEntity<?> request, Map<String, ?> uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Create a new resource by POSTing the given object to the URL, and asynchronously
-	 * returns the value of the {@code Location} header. This header typically indicates
-	 * where the new resource is stored.
-	 * @param url the URL
-	 * @param request the Object to be POSTed (may be {@code null})
-	 * @return the value for the {@code Location} header wrapped in a {@link Future}
-	 * @see org.springframework.http.HttpEntity
-	 */
-	ListenableFuture<URI> postForLocation(URI url, @Nullable HttpEntity<?> request) throws RestClientException;
-
-	/**
-	 * Create a new resource by POSTing the given object to the URI template,
-	 * and asynchronously returns the response as {@link ResponseEntity}.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param request the Object to be POSTed (may be {@code null})
-	 * @param uriVariables the variables to expand the template
-	 * @return the entity wrapped in a {@link Future}
-	 * @see org.springframework.http.HttpEntity
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> postForEntity(String url, @Nullable HttpEntity<?> request,
-			Class<T> responseType, Object... uriVariables) throws RestClientException;
-
-	/**
-	 * Create a new resource by POSTing the given object to the URI template,
-	 * and asynchronously returns the response as {@link ResponseEntity}.
-	 * <p>URI Template variables are expanded using the given map.
-	 * @param url the URL
-	 * @param request the Object to be POSTed (may be {@code null})
-	 * @param uriVariables the variables to expand the template
-	 * @return the entity wrapped in a {@link Future}
-	 * @see org.springframework.http.HttpEntity
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> postForEntity(String url, @Nullable HttpEntity<?> request,
-			Class<T> responseType, Map<String, ?> uriVariables) throws RestClientException;
-
-	/**
-	 * Create a new resource by POSTing the given object to the URL,
-	 * and asynchronously returns the response as {@link ResponseEntity}.
-	 * @param url the URL
-	 * @param request the Object to be POSTed (may be {@code null})
-	 * @return the entity wrapped in a {@link Future}
-	 * @see org.springframework.http.HttpEntity
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> postForEntity(URI url, @Nullable HttpEntity<?> request,
-			Class<T> responseType) throws RestClientException;
-
-
-	// PUT
-
-	/**
-	 * Create or update a resource by PUTting the given object to the URI.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * <p>The Future will return a {@code null} result upon completion.
-	 * @param url the URL
-	 * @param request the Object to be PUT (may be {@code null})
-	 * @param uriVariables the variables to expand the template
-	 * @see HttpEntity
-	 */
-	ListenableFuture<?> put(String url, @Nullable HttpEntity<?> request, Object... uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Creates a new resource by PUTting the given object to URI template.
-	 * <p>URI Template variables are expanded using the given map.
-	 * <p>The Future will return a {@code null} result upon completion.
-	 * @param url the URL
-	 * @param request the Object to be PUT (may be {@code null})
-	 * @param uriVariables the variables to expand the template
-	 * @see HttpEntity
-	 */
-	ListenableFuture<?> put(String url, @Nullable HttpEntity<?> request, Map<String, ?> uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Creates a new resource by PUTting the given object to URL.
-	 * <p>The Future will return a {@code null} result upon completion.
-	 * @param url the URL
-	 * @param request the Object to be PUT (may be {@code null})
-	 * @see HttpEntity
-	 */
-	ListenableFuture<?> put(URI url, @Nullable HttpEntity<?> request) throws RestClientException;
-
-
-	// DELETE
-
-	/**
-	 * Asynchronously delete the resources at the specified URI.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * <p>The Future will return a {@code null} result upon completion.
-	 * @param url the URL
-	 * @param uriVariables the variables to expand in the template
-	 */
-	ListenableFuture<?> delete(String url, Object... uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously delete the resources at the specified URI.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * <p>The Future will return a {@code null} result upon completion.
-	 * @param url the URL
-	 * @param uriVariables the variables to expand in the template
-	 */
-	ListenableFuture<?> delete(String url, Map<String, ?> uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously delete the resources at the specified URI.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * <p>The Future will return a {@code null} result upon completion.
-	 * @param url the URL
-	 */
-	ListenableFuture<?> delete(URI url) throws RestClientException;
-
-
-	// OPTIONS
-
-	/**
-	 * Asynchronously return the value of the Allow header for the given URI.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param uriVariables the variables to expand in the template
-	 * @return the value of the allow header wrapped in a {@link Future}
-	 */
-	ListenableFuture<Set<HttpMethod>> optionsForAllow(String url, Object... uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Asynchronously return the value of the Allow header for the given URI.
-	 * <p>URI Template variables are expanded using the given map.
-	 * @param url the URL
-	 * @param uriVariables the variables to expand in the template
-	 * @return the value of the allow header wrapped in a {@link Future}
-	 */
-	ListenableFuture<Set<HttpMethod>> optionsForAllow(String url, Map<String, ?> uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Asynchronously return the value of the Allow header for the given URL.
-	 * @param url the URL
-	 * @return the value of the allow header wrapped in a {@link Future}
-	 */
-	ListenableFuture<Set<HttpMethod>> optionsForAllow(URI url) throws RestClientException;
-
-
-	// exchange
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, writing the
-	 * given request entity to the request, and returns the response as
-	 * {@link ResponseEntity}.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestEntity the entity (headers and/or body) to write to the request
-	 * (may be {@code null})
-	 * @param responseType the type of the return value
-	 * @param uriVariables the variables to expand in the template
-	 * @return the response as entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables)
-			throws RestClientException;
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, writing the
-	 * given request entity to the request, and returns the response as
-	 * {@link ResponseEntity}.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestEntity the entity (headers and/or body) to write to the request
-	 * (may be {@code null})
-	 * @param responseType the type of the return value
-	 * @param uriVariables the variables to expand in the template
-	 * @return the response as entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, Class<T> responseType,
-			Map<String, ?> uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, writing the
-	 * given request entity to the request, and returns the response as
-	 * {@link ResponseEntity}.
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestEntity the entity (headers and/or body) to write to the request
-	 * (may be {@code null})
-	 * @param responseType the type of the return value
-	 * @return the response as entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> exchange(URI url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, Class<T> responseType)
-			throws RestClientException;
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, writing the given
-	 * request entity to the request, and returns the response as {@link ResponseEntity}.
-	 * The given {@link ParameterizedTypeReference} is used to pass generic type
-	 * information:
-	 * <pre class="code">
-	 * ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt; myBean =
-	 *     new ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt;() {};
-	 *
-	 * ResponseEntity&lt;List&lt;MyBean&gt;&gt; response =
-	 *     template.exchange(&quot;https://example.com&quot;,HttpMethod.GET, null, myBean);
-	 * </pre>
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestEntity the entity (headers and/or body) to write to the
-	 * request (may be {@code null})
-	 * @param responseType the type of the return value
-	 * @param uriVariables the variables to expand in the template
-	 * @return the response as entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, ParameterizedTypeReference<T> responseType,
-			Object... uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, writing the given
-	 * request entity to the request, and returns the response as {@link ResponseEntity}.
-	 * The given {@link ParameterizedTypeReference} is used to pass generic type
-	 * information:
-	 * <pre class="code">
-	 * ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt; myBean =
-	 *     new ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt;() {};
-	 *
-	 * ResponseEntity&lt;List&lt;MyBean&gt;&gt; response =
-	 *     template.exchange(&quot;https://example.com&quot;,HttpMethod.GET, null, myBean);
-	 * </pre>
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestEntity the entity (headers and/or body) to write to the request
-	 * (may be {@code null})
-	 * @param responseType the type of the return value
-	 * @param uriVariables the variables to expand in the template
-	 * @return the response as entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, ParameterizedTypeReference<T> responseType,
-			Map<String, ?> uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, writing the given
-	 * request entity to the request, and returns the response as {@link ResponseEntity}.
-	 * The given {@link ParameterizedTypeReference} is used to pass generic type
-	 * information:
-	 * <pre class="code">
-	 * ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt; myBean =
-	 *     new ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt;() {};
-	 *
-	 * ResponseEntity&lt;List&lt;MyBean&gt;&gt; response =
-	 *     template.exchange(&quot;https://example.com&quot;,HttpMethod.GET, null, myBean);
-	 * </pre>
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestEntity the entity (headers and/or body) to write to the request
-	 * (may be {@code null})
-	 * @param responseType the type of the return value
-	 * @return the response as entity wrapped in a {@link Future}
-	 */
-	<T> ListenableFuture<ResponseEntity<T>> exchange(URI url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, ParameterizedTypeReference<T> responseType)
-			throws RestClientException;
-
-
-	// general execution
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, preparing the
-	 * request with the {@link AsyncRequestCallback}, and reading the response with a
-	 * {@link ResponseExtractor}.
-	 * <p>URI Template variables are expanded using the given URI variables, if any.
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestCallback object that prepares the request
-	 * @param responseExtractor object that extracts the return value from the response
-	 * @param uriVariables the variables to expand in the template
-	 * @return an arbitrary object, as returned by the {@link ResponseExtractor}
-	 */
-	<T> ListenableFuture<T> execute(String url, HttpMethod method,
-			@Nullable AsyncRequestCallback requestCallback, @Nullable ResponseExtractor<T> responseExtractor,
-			Object... uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URI template, preparing the
-	 * request with the {@link AsyncRequestCallback}, and reading the response with a
-	 * {@link ResponseExtractor}.
-	 * <p>URI Template variables are expanded using the given URI variables map.
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestCallback object that prepares the request
-	 * @param responseExtractor object that extracts the return value from the response
-	 * @param uriVariables the variables to expand in the template
-	 * @return an arbitrary object, as returned by the {@link ResponseExtractor}
-	 */
-	<T> ListenableFuture<T> execute(String url, HttpMethod method,
-			@Nullable AsyncRequestCallback requestCallback, @Nullable ResponseExtractor<T> responseExtractor,
-			Map<String, ?> uriVariables) throws RestClientException;
-
-	/**
-	 * Asynchronously execute the HTTP method to the given URL, preparing the request
-	 * with the {@link AsyncRequestCallback}, and reading the response with a
-	 * {@link ResponseExtractor}.
-	 * @param url the URL
-	 * @param method the HTTP method (GET, POST, etc)
-	 * @param requestCallback object that prepares the request
-	 * @param responseExtractor object that extracts the return value from the response
-	 * @return an arbitrary object, as returned by the {@link ResponseExtractor}
-	 */
-	<T> ListenableFuture<T> execute(URI url, HttpMethod method,
-			@Nullable AsyncRequestCallback requestCallback, @Nullable ResponseExtractor<T> responseExtractor)
-			throws RestClientException;
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java
deleted file mode 100644
index f94359de4aeb..000000000000
--- a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- * 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.
- * 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.web.client;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.core.task.AsyncTaskExecutor;
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.ClientHttpRequest;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureAdapter;
-import org.springframework.web.util.DefaultUriBuilderFactory;
-import org.springframework.web.util.UriTemplateHandler;
-
-/**
- * <strong>Spring's central class for asynchronous client-side HTTP access.</strong>
- * Exposes similar methods as {@link RestTemplate}, but returns {@link ListenableFuture}
- * wrappers as opposed to concrete results.
- *
- * <p>The {@code AsyncRestTemplate} exposes a synchronous {@link RestTemplate} via the
- * {@link #getRestOperations()} method and shares its {@linkplain #setErrorHandler error handler}
- * and {@linkplain #setMessageConverters message converters} with that {@code RestTemplate}.
- *
- * <p><strong>Note:</strong> by default {@code AsyncRestTemplate} relies on
- * standard JDK facilities to establish HTTP connections. You can switch to use
- * a different HTTP library such as Apache HttpComponents, Netty, and OkHttp by
- * using a constructor accepting an {@link org.springframework.http.client.AsyncClientHttpRequestFactory}.
- *
- * <p>For more information, please refer to the {@link RestTemplate} API documentation.
- *
- * @author Arjen Poutsma
- * @since 4.0
- * @see RestTemplate
- * @deprecated as of Spring 5.0, in favor of {@link org.springframework.web.reactive.function.client.WebClient}
- */
-@Deprecated
-public class AsyncRestTemplate extends org.springframework.http.client.support.InterceptingAsyncHttpAccessor
-		implements AsyncRestOperations {
-
-	private final RestTemplate syncTemplate;
-
-
-	/**
-	 * Create a new instance of the {@code AsyncRestTemplate} using default settings.
-	 * <p>This constructor uses a {@link SimpleClientHttpRequestFactory} in combination
-	 * with a {@link SimpleAsyncTaskExecutor} for asynchronous execution.
-	 */
-	public AsyncRestTemplate() {
-		this(new SimpleAsyncTaskExecutor());
-	}
-
-	/**
-	 * Create a new instance of the {@code AsyncRestTemplate} using the given
-	 * {@link AsyncTaskExecutor}.
-	 * <p>This constructor uses a {@link SimpleClientHttpRequestFactory} in combination
-	 * with the given {@code AsyncTaskExecutor} for asynchronous execution.
-	 */
-	public AsyncRestTemplate(AsyncListenableTaskExecutor taskExecutor) {
-		Assert.notNull(taskExecutor, "AsyncTaskExecutor must not be null");
-		SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-		requestFactory.setTaskExecutor(taskExecutor);
-		this.syncTemplate = new RestTemplate(requestFactory);
-		setAsyncRequestFactory(requestFactory);
-	}
-
-	/**
-	 * Create a new instance of the {@code AsyncRestTemplate} using the given
-	 * {@link org.springframework.http.client.AsyncClientHttpRequestFactory}.
-	 * <p>This constructor will cast the given asynchronous
-	 * {@code AsyncClientHttpRequestFactory} to a {@link ClientHttpRequestFactory}. Since
-	 * all implementations of {@code ClientHttpRequestFactory} provided in Spring also
-	 * implement {@code AsyncClientHttpRequestFactory}, this should not result in a
-	 * {@code ClassCastException}.
-	 */
-	public AsyncRestTemplate(org.springframework.http.client.AsyncClientHttpRequestFactory asyncRequestFactory) {
-		this(asyncRequestFactory, (ClientHttpRequestFactory) asyncRequestFactory);
-	}
-
-	/**
-	 * Creates a new instance of the {@code AsyncRestTemplate} using the given
-	 * asynchronous and synchronous request factories.
-	 * @param asyncRequestFactory the asynchronous request factory
-	 * @param syncRequestFactory the synchronous request factory
-	 */
-	public AsyncRestTemplate(org.springframework.http.client.AsyncClientHttpRequestFactory asyncRequestFactory,
-			ClientHttpRequestFactory syncRequestFactory) {
-
-		this(asyncRequestFactory, new RestTemplate(syncRequestFactory));
-	}
-
-	/**
-	 * Create a new instance of the {@code AsyncRestTemplate} using the given
-	 * {@link org.springframework.http.client.AsyncClientHttpRequestFactory} and synchronous {@link RestTemplate}.
-	 * @param requestFactory the asynchronous request factory to use
-	 * @param restTemplate the synchronous template to use
-	 */
-	public AsyncRestTemplate(org.springframework.http.client.AsyncClientHttpRequestFactory requestFactory,
-			RestTemplate restTemplate) {
-
-		Assert.notNull(restTemplate, "RestTemplate must not be null");
-		this.syncTemplate = restTemplate;
-		setAsyncRequestFactory(requestFactory);
-	}
-
-
-	/**
-	 * Set the error handler.
-	 * <p>By default, AsyncRestTemplate uses a
-	 * {@link org.springframework.web.client.DefaultResponseErrorHandler}.
-	 */
-	public void setErrorHandler(ResponseErrorHandler errorHandler) {
-		this.syncTemplate.setErrorHandler(errorHandler);
-	}
-
-	/**
-	 * Return the error handler.
-	 */
-	public ResponseErrorHandler getErrorHandler() {
-		return this.syncTemplate.getErrorHandler();
-	}
-
-	/**
-	 * Configure default URI variable values. This is a shortcut for:
-	 * <pre class="code">
-	 * DefaultUriTemplateHandler handler = new DefaultUriTemplateHandler();
-	 * handler.setDefaultUriVariables(...);
-	 *
-	 * AsyncRestTemplate restTemplate = new AsyncRestTemplate();
-	 * restTemplate.setUriTemplateHandler(handler);
-	 * </pre>
-	 * @param defaultUriVariables the default URI variable values
-	 * @since 4.3
-	 */
-	@SuppressWarnings("deprecation")
-	public void setDefaultUriVariables(Map<String, ?> defaultUriVariables) {
-		UriTemplateHandler handler = this.syncTemplate.getUriTemplateHandler();
-		if (handler instanceof DefaultUriBuilderFactory) {
-			((DefaultUriBuilderFactory) handler).setDefaultUriVariables(defaultUriVariables);
-		}
-		else if (handler instanceof org.springframework.web.util.AbstractUriTemplateHandler) {
-			((org.springframework.web.util.AbstractUriTemplateHandler) handler)
-					.setDefaultUriVariables(defaultUriVariables);
-		}
-		else {
-			throw new IllegalArgumentException(
-					"This property is not supported with the configured UriTemplateHandler.");
-		}
-	}
-
-	/**
-	 * This property has the same purpose as the corresponding property on the
-	 * {@code RestTemplate}. For more details see
-	 * {@link RestTemplate#setUriTemplateHandler}.
-	 * @param handler the URI template handler to use
-	 */
-	public void setUriTemplateHandler(UriTemplateHandler handler) {
-		this.syncTemplate.setUriTemplateHandler(handler);
-	}
-
-	/**
-	 * Return the configured URI template handler.
-	 */
-	public UriTemplateHandler getUriTemplateHandler() {
-		return this.syncTemplate.getUriTemplateHandler();
-	}
-
-	@Override
-	public RestOperations getRestOperations() {
-		return this.syncTemplate;
-	}
-
-	/**
-	 * Set the message body converters to use.
-	 * <p>These converters are used to convert from and to HTTP requests and responses.
-	 */
-	public void setMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
-		this.syncTemplate.setMessageConverters(messageConverters);
-	}
-
-	/**
-	 * Return the message body converters.
-	 */
-	public List<HttpMessageConverter<?>> getMessageConverters() {
-		return this.syncTemplate.getMessageConverters();
-	}
-
-
-	// GET
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> getForEntity(String url, Class<T> responseType, Object... uriVariables)
-			throws RestClientException {
-
-		AsyncRequestCallback requestCallback = acceptHeaderRequestCallback(responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> getForEntity(String url, Class<T> responseType,
-			Map<String, ?> uriVariables) throws RestClientException {
-
-		AsyncRequestCallback requestCallback = acceptHeaderRequestCallback(responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, HttpMethod.GET, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> getForEntity(URI url, Class<T> responseType)
-			throws RestClientException {
-
-		AsyncRequestCallback requestCallback = acceptHeaderRequestCallback(responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, HttpMethod.GET, requestCallback, responseExtractor);
-	}
-
-
-	// HEAD
-
-	@Override
-	public ListenableFuture<HttpHeaders> headForHeaders(String url, Object... uriVariables)
-			throws RestClientException {
-
-		ResponseExtractor<HttpHeaders> headersExtractor = headersExtractor();
-		return execute(url, HttpMethod.HEAD, null, headersExtractor, uriVariables);
-	}
-
-	@Override
-	public ListenableFuture<HttpHeaders> headForHeaders(String url, Map<String, ?> uriVariables)
-			throws RestClientException {
-
-		ResponseExtractor<HttpHeaders> headersExtractor = headersExtractor();
-		return execute(url, HttpMethod.HEAD, null, headersExtractor, uriVariables);
-	}
-
-	@Override
-	public ListenableFuture<HttpHeaders> headForHeaders(URI url) throws RestClientException {
-		ResponseExtractor<HttpHeaders> headersExtractor = headersExtractor();
-		return execute(url, HttpMethod.HEAD, null, headersExtractor);
-	}
-
-
-	// POST
-
-	@Override
-	public ListenableFuture<URI> postForLocation(String url, @Nullable HttpEntity<?> request, Object... uriVars)
-			throws RestClientException {
-
-		AsyncRequestCallback callback = httpEntityCallback(request);
-		ResponseExtractor<HttpHeaders> extractor = headersExtractor();
-		ListenableFuture<HttpHeaders> future = execute(url, HttpMethod.POST, callback, extractor, uriVars);
-		return adaptToLocationHeader(future);
-	}
-
-	@Override
-	public ListenableFuture<URI> postForLocation(String url, @Nullable HttpEntity<?> request, Map<String, ?> uriVars)
-			throws RestClientException {
-
-		AsyncRequestCallback callback = httpEntityCallback(request);
-		ResponseExtractor<HttpHeaders> extractor = headersExtractor();
-		ListenableFuture<HttpHeaders> future = execute(url, HttpMethod.POST, callback, extractor, uriVars);
-		return adaptToLocationHeader(future);
-	}
-
-	@Override
-	public ListenableFuture<URI> postForLocation(URI url, @Nullable HttpEntity<?> request)
-			throws RestClientException {
-
-		AsyncRequestCallback callback = httpEntityCallback(request);
-		ResponseExtractor<HttpHeaders> extractor = headersExtractor();
-		ListenableFuture<HttpHeaders> future = execute(url, HttpMethod.POST, callback, extractor);
-		return adaptToLocationHeader(future);
-	}
-
-	private static ListenableFuture<URI> adaptToLocationHeader(ListenableFuture<HttpHeaders> future) {
-		return new ListenableFutureAdapter<URI, HttpHeaders>(future) {
-			@Override
-			@Nullable
-			protected URI adapt(HttpHeaders headers) throws ExecutionException {
-				return headers.getLocation();
-			}
-		};
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> postForEntity(String url, @Nullable HttpEntity<?> request,
-			Class<T> responseType, Object... uriVariables) throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(request, responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, HttpMethod.POST, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> postForEntity(String url, @Nullable HttpEntity<?> request,
-			Class<T> responseType, Map<String, ?> uriVariables) throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(request, responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, HttpMethod.POST, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> postForEntity(URI url,
-			@Nullable HttpEntity<?> request, Class<T> responseType) throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(request, responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, HttpMethod.POST, requestCallback, responseExtractor);
-	}
-
-
-	// PUT
-
-	@Override
-	public ListenableFuture<?> put(String url, @Nullable HttpEntity<?> request, Object... uriVars)
-			throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(request);
-		return execute(url, HttpMethod.PUT, requestCallback, null, uriVars);
-	}
-
-	@Override
-	public ListenableFuture<?> put(String url, @Nullable HttpEntity<?> request, Map<String, ?> uriVars)
-			throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(request);
-		return execute(url, HttpMethod.PUT, requestCallback, null, uriVars);
-	}
-
-	@Override
-	public ListenableFuture<?> put(URI url, @Nullable HttpEntity<?> request) throws RestClientException {
-		AsyncRequestCallback requestCallback = httpEntityCallback(request);
-		return execute(url, HttpMethod.PUT, requestCallback, null);
-	}
-
-
-	// DELETE
-
-	@Override
-	public ListenableFuture<?> delete(String url, Object... uriVariables) throws RestClientException {
-		return execute(url, HttpMethod.DELETE, null, null, uriVariables);
-	}
-
-	@Override
-	public ListenableFuture<?> delete(String url, Map<String, ?> uriVariables) throws RestClientException {
-		return execute(url, HttpMethod.DELETE, null, null, uriVariables);
-	}
-
-	@Override
-	public ListenableFuture<?> delete(URI url) throws RestClientException {
-		return execute(url, HttpMethod.DELETE, null, null);
-	}
-
-
-	// OPTIONS
-
-	@Override
-	public ListenableFuture<Set<HttpMethod>> optionsForAllow(String url, Object... uriVars)
-			throws RestClientException {
-
-		ResponseExtractor<HttpHeaders> extractor = headersExtractor();
-		ListenableFuture<HttpHeaders> future = execute(url, HttpMethod.OPTIONS, null, extractor, uriVars);
-		return adaptToAllowHeader(future);
-	}
-
-	@Override
-	public ListenableFuture<Set<HttpMethod>> optionsForAllow(String url, Map<String, ?> uriVars)
-			throws RestClientException {
-
-		ResponseExtractor<HttpHeaders> extractor = headersExtractor();
-		ListenableFuture<HttpHeaders> future = execute(url, HttpMethod.OPTIONS, null, extractor, uriVars);
-		return adaptToAllowHeader(future);
-	}
-
-	@Override
-	public ListenableFuture<Set<HttpMethod>> optionsForAllow(URI url) throws RestClientException {
-		ResponseExtractor<HttpHeaders> extractor = headersExtractor();
-		ListenableFuture<HttpHeaders> future = execute(url, HttpMethod.OPTIONS, null, extractor);
-		return adaptToAllowHeader(future);
-	}
-
-	private static ListenableFuture<Set<HttpMethod>> adaptToAllowHeader(ListenableFuture<HttpHeaders> future) {
-		return new ListenableFutureAdapter<Set<HttpMethod>, HttpHeaders>(future) {
-			@Override
-			protected Set<HttpMethod> adapt(HttpHeaders headers) throws ExecutionException {
-				return headers.getAllow();
-			}
-		};
-	}
-
-	// exchange
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables)
-			throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(requestEntity, responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, method, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, Class<T> responseType, Map<String, ?> uriVariables)
-			throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(requestEntity, responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, method, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> exchange(URI url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, Class<T> responseType) throws RestClientException {
-
-		AsyncRequestCallback requestCallback = httpEntityCallback(requestEntity, responseType);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(responseType);
-		return execute(url, method, requestCallback, responseExtractor);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, ParameterizedTypeReference<T> responseType,
-			Object... uriVariables) throws RestClientException {
-
-		Type type = responseType.getType();
-		AsyncRequestCallback requestCallback = httpEntityCallback(requestEntity, type);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(type);
-		return execute(url, method, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> exchange(String url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, ParameterizedTypeReference<T> responseType,
-			Map<String, ?> uriVariables) throws RestClientException {
-
-		Type type = responseType.getType();
-		AsyncRequestCallback requestCallback = httpEntityCallback(requestEntity, type);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(type);
-		return execute(url, method, requestCallback, responseExtractor, uriVariables);
-	}
-
-	@Override
-	public <T> ListenableFuture<ResponseEntity<T>> exchange(URI url, HttpMethod method,
-			@Nullable HttpEntity<?> requestEntity, ParameterizedTypeReference<T> responseType)
-			throws RestClientException {
-
-		Type type = responseType.getType();
-		AsyncRequestCallback requestCallback = httpEntityCallback(requestEntity, type);
-		ResponseExtractor<ResponseEntity<T>> responseExtractor = responseEntityExtractor(type);
-		return execute(url, method, requestCallback, responseExtractor);
-	}
-
-
-	// general execution
-
-	@Override
-	public <T> ListenableFuture<T> execute(String url, HttpMethod method, @Nullable AsyncRequestCallback requestCallback,
-			@Nullable ResponseExtractor<T> responseExtractor, Object... uriVariables) throws RestClientException {
-
-		URI expanded = getUriTemplateHandler().expand(url, uriVariables);
-		return doExecute(expanded, method, requestCallback, responseExtractor);
-	}
-
-	@Override
-	public <T> ListenableFuture<T> execute(String url, HttpMethod method,
-			@Nullable AsyncRequestCallback requestCallback, @Nullable ResponseExtractor<T> responseExtractor,
-			Map<String, ?> uriVariables) throws RestClientException {
-
-		URI expanded = getUriTemplateHandler().expand(url, uriVariables);
-		return doExecute(expanded, method, requestCallback, responseExtractor);
-	}
-
-	@Override
-	public <T> ListenableFuture<T> execute(URI url, HttpMethod method,
-			@Nullable AsyncRequestCallback requestCallback,
-			@Nullable ResponseExtractor<T> responseExtractor) throws RestClientException {
-
-		return doExecute(url, method, requestCallback, responseExtractor);
-	}
-
-	/**
-	 * Execute the given method on the provided URI. The
-	 * {@link org.springframework.http.client.ClientHttpRequest}
-	 * is processed using the {@link RequestCallback}; the response with
-	 * the {@link ResponseExtractor}.
-	 * @param url the fully-expanded URL to connect to
-	 * @param method the HTTP method to execute (GET, POST, etc.)
-	 * @param requestCallback object that prepares the request (can be {@code null})
-	 * @param responseExtractor object that extracts the return value from the response (can
-	 * be {@code null})
-	 * @return an arbitrary object, as returned by the {@link ResponseExtractor}
-	 */
-	protected <T> ListenableFuture<T> doExecute(URI url, HttpMethod method,
-			@Nullable AsyncRequestCallback requestCallback,
-			@Nullable ResponseExtractor<T> responseExtractor) throws RestClientException {
-
-		Assert.notNull(url, "'url' must not be null");
-		Assert.notNull(method, "'method' must not be null");
-		try {
-			org.springframework.http.client.AsyncClientHttpRequest request = createAsyncRequest(url, method);
-			if (requestCallback != null) {
-				requestCallback.doWithRequest(request);
-			}
-			ListenableFuture<ClientHttpResponse> responseFuture = request.executeAsync();
-			return new ResponseExtractorFuture<>(method, url, responseFuture, responseExtractor);
-		}
-		catch (IOException ex) {
-			throw new ResourceAccessException("I/O error on " + method.name() +
-					" request for \"" + url + "\":" + ex.getMessage(), ex);
-		}
-	}
-
-	private void logResponseStatus(HttpMethod method, URI url, ClientHttpResponse response) {
-		if (logger.isDebugEnabled()) {
-			try {
-				logger.debug("Async " + method.name() + " request for \"" + url + "\" resulted in " +
-						response.getRawStatusCode() + " (" + response.getStatusText() + ")");
-			}
-			catch (IOException ex) {
-				// ignore
-			}
-		}
-	}
-
-	private void handleResponseError(HttpMethod method, URI url, ClientHttpResponse response) throws IOException {
-		if (logger.isWarnEnabled()) {
-			try {
-				logger.warn("Async " + method.name() + " request for \"" + url + "\" resulted in " +
-						response.getRawStatusCode() + " (" + response.getStatusText() + "); invoking error handler");
-			}
-			catch (IOException ex) {
-				// ignore
-			}
-		}
-		getErrorHandler().handleError(url, method, response);
-	}
-
-	/**
-	 * Returns a request callback implementation that prepares the request {@code Accept}
-	 * headers based on the given response type and configured {@linkplain
-	 * #getMessageConverters() message converters}.
-	 */
-	protected <T> AsyncRequestCallback acceptHeaderRequestCallback(Class<T> responseType) {
-		return new AsyncRequestCallbackAdapter(this.syncTemplate.acceptHeaderRequestCallback(responseType));
-	}
-
-	/**
-	 * Returns a request callback implementation that writes the given object to the
-	 * request stream.
-	 */
-	protected <T> AsyncRequestCallback httpEntityCallback(@Nullable HttpEntity<T> requestBody) {
-		return new AsyncRequestCallbackAdapter(this.syncTemplate.httpEntityCallback(requestBody));
-	}
-
-	/**
-	 * Returns a request callback implementation that writes the given object to the
-	 * request stream.
-	 */
-	protected <T> AsyncRequestCallback httpEntityCallback(@Nullable HttpEntity<T> request, Type responseType) {
-		return new AsyncRequestCallbackAdapter(this.syncTemplate.httpEntityCallback(request, responseType));
-	}
-
-	/**
-	 * Returns a response extractor for {@link ResponseEntity}.
-	 */
-	protected <T> ResponseExtractor<ResponseEntity<T>> responseEntityExtractor(Type responseType) {
-		return this.syncTemplate.responseEntityExtractor(responseType);
-	}
-
-	/**
-	 * Returns a response extractor for {@link HttpHeaders}.
-	 */
-	protected ResponseExtractor<HttpHeaders> headersExtractor() {
-		return this.syncTemplate.headersExtractor();
-	}
-
-
-	/**
-	 * Future returned from
-	 * {@link #doExecute(URI, HttpMethod, AsyncRequestCallback, ResponseExtractor)}.
-	 */
-	private class ResponseExtractorFuture<T> extends ListenableFutureAdapter<T, ClientHttpResponse> {
-
-		private final HttpMethod method;
-
-		private final URI url;
-
-		@Nullable
-		private final ResponseExtractor<T> responseExtractor;
-
-		public ResponseExtractorFuture(HttpMethod method, URI url,
-				ListenableFuture<ClientHttpResponse> clientHttpResponseFuture,
-				@Nullable ResponseExtractor<T> responseExtractor) {
-
-			super(clientHttpResponseFuture);
-			this.method = method;
-			this.url = url;
-			this.responseExtractor = responseExtractor;
-		}
-
-		@Override
-		@Nullable
-		protected final T adapt(ClientHttpResponse response) throws ExecutionException {
-			try {
-				if (!getErrorHandler().hasError(response)) {
-					logResponseStatus(this.method, this.url, response);
-				}
-				else {
-					handleResponseError(this.method, this.url, response);
-				}
-				return convertResponse(response);
-			}
-			catch (Throwable ex) {
-				throw new ExecutionException(ex);
-			}
-			finally {
-				response.close();
-			}
-		}
-
-		@Nullable
-		protected T convertResponse(ClientHttpResponse response) throws IOException {
-			return (this.responseExtractor != null ? this.responseExtractor.extractData(response) : null);
-		}
-	}
-
-
-	/**
-	 * Adapts a {@link RequestCallback} to the {@link AsyncRequestCallback} interface.
-	 */
-	private static class AsyncRequestCallbackAdapter implements AsyncRequestCallback {
-
-		private final RequestCallback adaptee;
-
-		/**
-		 * Create a new {@code AsyncRequestCallbackAdapter} from the given
-		 * {@link RequestCallback}.
-		 * @param requestCallback the callback to base this adapter on
-		 */
-		public AsyncRequestCallbackAdapter(RequestCallback requestCallback) {
-			this.adaptee = requestCallback;
-		}
-
-		@Override
-		public void doWithRequest(final org.springframework.http.client.AsyncClientHttpRequest request)
-				throws IOException {
-
-			this.adaptee.doWithRequest(new ClientHttpRequest() {
-				@Override
-				public ClientHttpResponse execute() throws IOException {
-					throw new UnsupportedOperationException("execute not supported");
-				}
-				@Override
-				public OutputStream getBody() throws IOException {
-					return request.getBody();
-				}
-				@Override
-				@Nullable
-				public HttpMethod getMethod() {
-					return request.getMethod();
-				}
-				@Override
-				public String getMethodValue() {
-					return request.getMethodValue();
-				}
-				@Override
-				public URI getURI() {
-					return request.getURI();
-				}
-				@Override
-				public HttpHeaders getHeaders() {
-					return request.getHeaders();
-				}
-			});
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/client/AbstractAsyncHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/AbstractAsyncHttpRequestFactoryTests.java
deleted file mode 100644
index 4ae702d55111..000000000000
--- a/spring-web/src/test/java/org/springframework/http/client/AbstractAsyncHttpRequestFactoryTests.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.concurrent.Future;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.StreamingHttpOutputMessage;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.util.StreamUtils;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-
-@SuppressWarnings("deprecation")
-public abstract class AbstractAsyncHttpRequestFactoryTests extends AbstractMockWebServerTests {
-
-	protected AsyncClientHttpRequestFactory factory;
-
-
-	@BeforeEach
-	public final void createFactory() throws Exception {
-		this.factory = createRequestFactory();
-		if (this.factory instanceof InitializingBean) {
-			((InitializingBean) this.factory).afterPropertiesSet();
-		}
-	}
-
-	@AfterEach
-	public final void destroyFactory() throws Exception {
-		if (this.factory instanceof DisposableBean) {
-			((DisposableBean) this.factory).destroy();
-		}
-	}
-
-	protected abstract AsyncClientHttpRequestFactory createRequestFactory();
-
-
-	@Test
-	public void status() throws Exception {
-		URI uri = new URI(baseUrl + "/status/notfound");
-		AsyncClientHttpRequest request = this.factory.createAsyncRequest(uri, HttpMethod.GET);
-		assertThat(request.getMethod()).as("Invalid HTTP method").isEqualTo(HttpMethod.GET);
-		assertThat(request.getURI()).as("Invalid HTTP URI").isEqualTo(uri);
-		Future<ClientHttpResponse> futureResponse = request.executeAsync();
-		try (ClientHttpResponse response = futureResponse.get()) {
-			assertThat(response.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.NOT_FOUND);
-		}
-	}
-
-	@Test
-	public void statusCallback() throws Exception {
-		URI uri = new URI(baseUrl + "/status/notfound");
-		AsyncClientHttpRequest request = this.factory.createAsyncRequest(uri, HttpMethod.GET);
-		assertThat(request.getMethod()).as("Invalid HTTP method").isEqualTo(HttpMethod.GET);
-		assertThat(request.getURI()).as("Invalid HTTP URI").isEqualTo(uri);
-		ListenableFuture<ClientHttpResponse> listenableFuture = request.executeAsync();
-		listenableFuture.addCallback(new ListenableFutureCallback<ClientHttpResponse>() {
-			@Override
-			public void onSuccess(ClientHttpResponse result) {
-				try {
-					assertThat(result.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.NOT_FOUND);
-				}
-				catch (IOException ex) {
-					throw new AssertionError(ex.getMessage(), ex);
-				}
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				throw new AssertionError(ex.getMessage(), ex);
-			}
-		});
-		try (ClientHttpResponse response = listenableFuture.get()) {
-			assertThat(response.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.NOT_FOUND);
-		}
-	}
-
-	@Test
-	public void echo() throws Exception {
-		AsyncClientHttpRequest request = this.factory.createAsyncRequest(new URI(baseUrl + "/echo"), HttpMethod.PUT);
-		assertThat(request.getMethod()).as("Invalid HTTP method").isEqualTo(HttpMethod.PUT);
-		String headerName = "MyHeader";
-		String headerValue1 = "value1";
-		request.getHeaders().add(headerName, headerValue1);
-		String headerValue2 = "value2";
-		request.getHeaders().add(headerName, headerValue2);
-		final byte[] body = "Hello World".getBytes("UTF-8");
-		request.getHeaders().setContentLength(body.length);
-
-		if (request instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingRequest = (StreamingHttpOutputMessage) request;
-			streamingRequest.setBody(outputStream -> StreamUtils.copy(body, outputStream));
-		}
-		else {
-			StreamUtils.copy(body, request.getBody());
-		}
-
-		Future<ClientHttpResponse> futureResponse = request.executeAsync();
-		try ( ClientHttpResponse response = futureResponse.get()) {
-			assertThat(response.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.OK);
-			assertThat(response.getHeaders().containsKey(headerName)).as("Header not found").isTrue();
-			assertThat(response.getHeaders().get(headerName)).as("Header value not found").isEqualTo(Arrays.asList(headerValue1, headerValue2));
-			byte[] result = FileCopyUtils.copyToByteArray(response.getBody());
-			assertThat(Arrays.equals(body, result)).as("Invalid body").isTrue();
-		}
-	}
-
-	@Test
-	public void multipleWrites() throws Exception {
-		AsyncClientHttpRequest request = this.factory.createAsyncRequest(new URI(baseUrl + "/echo"), HttpMethod.POST);
-		final byte[] body = "Hello World".getBytes("UTF-8");
-
-		if (request instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingRequest = (StreamingHttpOutputMessage) request;
-			streamingRequest.setBody(outputStream -> StreamUtils.copy(body, outputStream));
-		}
-		else {
-			StreamUtils.copy(body, request.getBody());
-		}
-
-		Future<ClientHttpResponse> futureResponse = request.executeAsync();
-		try (ClientHttpResponse response = futureResponse.get()) {
-			assertThat(response).isNotNull();
-			assertThatIllegalStateException().isThrownBy(() -> FileCopyUtils.copy(body, request.getBody()));
-		}
-	}
-
-	@Test
-	public void headersAfterExecute() throws Exception {
-		AsyncClientHttpRequest request = this.factory.createAsyncRequest(new URI(baseUrl + "/echo"), HttpMethod.POST);
-		request.getHeaders().add("MyHeader", "value");
-		byte[] body = "Hello World".getBytes("UTF-8");
-		FileCopyUtils.copy(body, request.getBody());
-
-		Future<ClientHttpResponse> futureResponse = request.executeAsync();
-		try (ClientHttpResponse response = futureResponse.get()) {
-			assertThat(response).isNotNull();
-			assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() ->
-					request.getHeaders().add("MyHeader", "value"));
-		}
-	}
-
-	@Test
-	public void httpMethods() throws Exception {
-		assertHttpMethod("get", HttpMethod.GET);
-		assertHttpMethod("head", HttpMethod.HEAD);
-		assertHttpMethod("post", HttpMethod.POST);
-		assertHttpMethod("put", HttpMethod.PUT);
-		assertHttpMethod("options", HttpMethod.OPTIONS);
-		assertHttpMethod("delete", HttpMethod.DELETE);
-	}
-
-	protected void assertHttpMethod(String path, HttpMethod method) throws Exception {
-		AsyncClientHttpRequest request = this.factory.createAsyncRequest(new URI(baseUrl + "/methods/" + path), method);
-		if (method == HttpMethod.POST || method == HttpMethod.PUT || method == HttpMethod.PATCH) {
-			// requires a body
-			request.getBody().write(32);
-		}
-		Future<ClientHttpResponse> futureResponse = request.executeAsync();
-		try (ClientHttpResponse response = futureResponse.get()) {
-			assertThat(response.getStatusCode()).as("Invalid response status").isEqualTo(HttpStatus.OK);
-			assertThat(request.getMethod().name()).as("Invalid method").isEqualTo(path.toUpperCase(Locale.ENGLISH));
-		}
-	}
-
-	@Test
-	public void cancel() throws Exception {
-		URI uri = new URI(baseUrl + "/status/notfound");
-		AsyncClientHttpRequest request = this.factory.createAsyncRequest(uri, HttpMethod.GET);
-		Future<ClientHttpResponse> futureResponse = request.executeAsync();
-		futureResponse.cancel(true);
-		assertThat(futureResponse.isCancelled()).isTrue();
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleAsyncHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleAsyncHttpRequestFactoryTests.java
deleted file mode 100644
index f019ddd797bc..000000000000
--- a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleAsyncHttpRequestFactoryTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.http.client;
-
-import java.net.ProtocolException;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.http.HttpMethod;
-
-public class BufferedSimpleAsyncHttpRequestFactoryTests extends AbstractAsyncHttpRequestFactoryTests {
-
-	@SuppressWarnings("deprecation")
-	@Override
-	protected AsyncClientHttpRequestFactory createRequestFactory() {
-		SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-		AsyncListenableTaskExecutor taskExecutor = new SimpleAsyncTaskExecutor();
-		requestFactory.setTaskExecutor(taskExecutor);
-		return requestFactory;
-	}
-
-	@Override
-	@Test
-	public void httpMethods() throws Exception {
-		super.httpMethods();
-		try {
-			assertHttpMethod("patch", HttpMethod.PATCH);
-		}
-		catch (ProtocolException ex) {
-			// Currently HttpURLConnection does not support HTTP PATCH
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactoryTests.java
deleted file mode 100644
index 7ae09ce86962..000000000000
--- a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactoryTests.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import java.net.URI;
-
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
-import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.http.HttpMethod;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Arjen Poutsma
- * @author Stephane Nicoll
- */
-@SuppressWarnings("deprecation")
-public class HttpComponentsAsyncClientHttpRequestFactoryTests extends AbstractAsyncHttpRequestFactoryTests {
-
-	@Override
-	protected AsyncClientHttpRequestFactory createRequestFactory() {
-		return new HttpComponentsAsyncClientHttpRequestFactory();
-	}
-
-
-	@Override
-	@Test
-	public void httpMethods() throws Exception {
-		super.httpMethods();
-		assertHttpMethod("patch", HttpMethod.PATCH);
-	}
-
-	@Test
-	public void customHttpAsyncClientUsesItsDefault() throws Exception {
-		HttpComponentsAsyncClientHttpRequestFactory factory =
-				new HttpComponentsAsyncClientHttpRequestFactory();
-
-		URI uri = new URI(baseUrl + "/status/ok");
-		HttpComponentsAsyncClientHttpRequest request = (HttpComponentsAsyncClientHttpRequest)
-				factory.createAsyncRequest(uri, HttpMethod.GET);
-
-		assertThat(request.getHttpContext().getAttribute(HttpClientContext.REQUEST_CONFIG)).as("No custom config should be set with a custom HttpAsyncClient").isNull();
-	}
-
-	@Test
-	public void defaultSettingsOfHttpAsyncClientLostOnExecutorCustomization() throws Exception {
-		CloseableHttpAsyncClient client = HttpAsyncClientBuilder.create()
-				.setDefaultRequestConfig(RequestConfig.custom().setConnectTimeout(1234).build())
-				.build();
-		HttpComponentsAsyncClientHttpRequestFactory factory = new HttpComponentsAsyncClientHttpRequestFactory(client);
-
-		URI uri = new URI(baseUrl + "/status/ok");
-		HttpComponentsAsyncClientHttpRequest request = (HttpComponentsAsyncClientHttpRequest)
-				factory.createAsyncRequest(uri, HttpMethod.GET);
-
-		assertThat(request.getHttpContext().getAttribute(HttpClientContext.REQUEST_CONFIG)).as("No custom config should be set with a custom HttpClient").isNull();
-
-		factory.setConnectionRequestTimeout(4567);
-		HttpComponentsAsyncClientHttpRequest request2 = (HttpComponentsAsyncClientHttpRequest)
-				factory.createAsyncRequest(uri, HttpMethod.GET);
-		Object requestConfigAttribute = request2.getHttpContext().getAttribute(HttpClientContext.REQUEST_CONFIG);
-		assertThat(requestConfigAttribute).isNotNull();
-		RequestConfig requestConfig = (RequestConfig) requestConfigAttribute;
-
-		assertThat(requestConfig.getConnectionRequestTimeout()).isEqualTo(4567);
-		// No way to access the request config of the HTTP client so no way to "merge" our customizations
-		assertThat(requestConfig.getConnectTimeout()).isEqualTo(-1);
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/client/Netty4AsyncClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/Netty4AsyncClientHttpRequestFactoryTests.java
deleted file mode 100644
index 87ed2ae399a4..000000000000
--- a/spring-web/src/test/java/org/springframework/http/client/Netty4AsyncClientHttpRequestFactoryTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.http.HttpMethod;
-
-/**
- * @author Arjen Poutsma
- */
-public class Netty4AsyncClientHttpRequestFactoryTests extends AbstractAsyncHttpRequestFactoryTests {
-
-	private static EventLoopGroup eventLoopGroup;
-
-
-	@BeforeAll
-	public static void createEventLoopGroup() {
-		eventLoopGroup = new NioEventLoopGroup();
-	}
-
-	@AfterAll
-	public static void shutdownEventLoopGroup() throws InterruptedException {
-		eventLoopGroup.shutdownGracefully().sync();
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	protected AsyncClientHttpRequestFactory createRequestFactory() {
-		return new Netty4ClientHttpRequestFactory(eventLoopGroup);
-	}
-
-	@Override
-	@Test
-	public void httpMethods() throws Exception {
-		super.httpMethods();
-		assertHttpMethod("patch", HttpMethod.PATCH);
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/client/Netty4ClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/Netty4ClientHttpRequestFactoryTests.java
deleted file mode 100644
index bfc087f84806..000000000000
--- a/spring-web/src/test/java/org/springframework/http/client/Netty4ClientHttpRequestFactoryTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.http.HttpMethod;
-
-/**
- * @author Arjen Poutsma
- */
-public class Netty4ClientHttpRequestFactoryTests extends AbstractHttpRequestFactoryTests {
-
-	private static EventLoopGroup eventLoopGroup;
-
-
-	@BeforeAll
-	public static void createEventLoopGroup() {
-		eventLoopGroup = new NioEventLoopGroup();
-	}
-
-	@AfterAll
-	public static void shutdownEventLoopGroup() throws InterruptedException {
-		eventLoopGroup.shutdownGracefully().sync();
-	}
-
-	@Override
-	@SuppressWarnings("deprecation")
-	protected ClientHttpRequestFactory createRequestFactory() {
-		return new Netty4ClientHttpRequestFactory(eventLoopGroup);
-	}
-
-	@Override
-	@Test
-	public void httpMethods() throws Exception {
-		super.httpMethods();
-		assertHttpMethod("patch", HttpMethod.PATCH);
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequestFactoryTests.java
deleted file mode 100644
index 541b7bd693c0..000000000000
--- a/spring-web/src/test/java/org/springframework/http/client/OkHttp3AsyncClientHttpRequestFactoryTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- * 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.http.client;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.http.HttpMethod;
-
-/**
- * @author Roy Clarkson
- */
-public class OkHttp3AsyncClientHttpRequestFactoryTests extends AbstractAsyncHttpRequestFactoryTests {
-
-	@SuppressWarnings("deprecation")
-	@Override
-	protected AsyncClientHttpRequestFactory createRequestFactory() {
-		return new OkHttp3ClientHttpRequestFactory();
-	}
-
-	@Override
-	@Test
-	public void httpMethods() throws Exception {
-		super.httpMethods();
-		assertHttpMethod("patch", HttpMethod.PATCH);
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/web/client/AsyncRestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/AsyncRestTemplateIntegrationTests.java
deleted file mode 100644
index 245172958b2c..000000000000
--- a/spring-web/src/test/java/org/springframework/web/client/AsyncRestTemplateIntegrationTests.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
- * 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.
- * 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.web.client;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.fail;
-
-/**
- * Integration tests for {@link AsyncRestTemplate}.
- *
- * <h3>Logging configuration for {@code MockWebServer}</h3>
- *
- * <p>In order for our log4j2 configuration to be used in an IDE, you must
- * set the following system property before running any tests &mdash; for
- * example, in <em>Run Configurations</em> in Eclipse.
- *
- * <pre class="code">
- * -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
- * </pre>
- *
- * @author Arjen Poutsma
- * @author Sebastien Deleuze
- */
-@SuppressWarnings("deprecation")
-public class AsyncRestTemplateIntegrationTests extends AbstractMockWebServerTests {
-
-	private final AsyncRestTemplate template = new AsyncRestTemplate(
-			new org.springframework.http.client.HttpComponentsAsyncClientHttpRequestFactory());
-
-
-	@Test
-	public void getEntity() throws Exception {
-		Future<ResponseEntity<String>> future = template.getForEntity(baseUrl + "/{method}", String.class, "get");
-		ResponseEntity<String> entity = future.get();
-		assertThat(entity.getBody()).as("Invalid content").isEqualTo(helloWorld);
-		assertThat(entity.getHeaders().isEmpty()).as("No headers").isFalse();
-		assertThat(entity.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(textContentType);
-		assertThat(entity.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.OK);
-	}
-
-	@Test
-	public void getEntityFromCompletable() throws Exception {
-		ListenableFuture<ResponseEntity<String>> future = template.getForEntity(baseUrl + "/{method}", String.class, "get");
-		ResponseEntity<String> entity = future.completable().get();
-		assertThat(entity.getBody()).as("Invalid content").isEqualTo(helloWorld);
-		assertThat(entity.getHeaders().isEmpty()).as("No headers").isFalse();
-		assertThat(entity.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(textContentType);
-		assertThat(entity.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.OK);
-	}
-
-	@Test
-	public void multipleFutureGets() throws Exception {
-		Future<ResponseEntity<String>> future = template.getForEntity(baseUrl + "/{method}", String.class, "get");
-		future.get();
-		future.get();
-	}
-
-	@Test
-	public void getEntityCallback() throws Exception {
-		ListenableFuture<ResponseEntity<String>> futureEntity =
-				template.getForEntity(baseUrl + "/{method}", String.class, "get");
-		futureEntity.addCallback(new ListenableFutureCallback<ResponseEntity<String>>() {
-			@Override
-			public void onSuccess(ResponseEntity<String> entity) {
-				assertThat(entity.getBody()).as("Invalid content").isEqualTo(helloWorld);
-				assertThat(entity.getHeaders().isEmpty()).as("No headers").isFalse();
-				assertThat(entity.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(textContentType);
-				assertThat(entity.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.OK);
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(futureEntity);
-	}
-
-	@Test
-	public void getEntityCallbackWithLambdas() throws Exception {
-		ListenableFuture<ResponseEntity<String>> futureEntity =
-				template.getForEntity(baseUrl + "/{method}", String.class, "get");
-		futureEntity.addCallback(entity -> {
-			assertThat(entity.getBody()).as("Invalid content").isEqualTo(helloWorld);
-			assertThat(entity.getHeaders().isEmpty()).as("No headers").isFalse();
-			assertThat(entity.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(textContentType);
-			assertThat(entity.getStatusCode()).as("Invalid status code").isEqualTo(HttpStatus.OK);
-		}, ex -> fail(ex.getMessage()));
-		waitTillDone(futureEntity);
-	}
-
-	@Test
-	public void getNoResponse() throws Exception {
-		Future<ResponseEntity<String>> futureEntity = template.getForEntity(baseUrl + "/get/nothing", String.class);
-		ResponseEntity<String> entity = futureEntity.get();
-		assertThat(entity.getBody()).as("Invalid content").isNull();
-	}
-
-	@Test
-	public void getNoContentTypeHeader() throws Exception {
-		Future<ResponseEntity<byte[]>> futureEntity = template.getForEntity(baseUrl + "/get/nocontenttype", byte[].class);
-		ResponseEntity<byte[]> responseEntity = futureEntity.get();
-		assertThat(responseEntity.getBody()).as("Invalid content").isEqualTo(helloWorld.getBytes("UTF-8"));
-	}
-
-	@Test
-	public void getNoContent() throws Exception {
-		Future<ResponseEntity<String>> responseFuture = template.getForEntity(baseUrl + "/status/nocontent", String.class);
-		ResponseEntity<String> entity = responseFuture.get();
-		assertThat(entity.getStatusCode()).as("Invalid response code").isEqualTo(HttpStatus.NO_CONTENT);
-		assertThat(entity.getBody()).as("Invalid content").isNull();
-	}
-
-	@Test
-	public void getNotModified() throws Exception {
-		Future<ResponseEntity<String>> responseFuture = template.getForEntity(baseUrl + "/status/notmodified", String.class);
-		ResponseEntity<String> entity = responseFuture.get();
-		assertThat(entity.getStatusCode()).as("Invalid response code").isEqualTo(HttpStatus.NOT_MODIFIED);
-		assertThat(entity.getBody()).as("Invalid content").isNull();
-	}
-
-	@Test
-	public void headForHeaders() throws Exception {
-		Future<HttpHeaders> headersFuture = template.headForHeaders(baseUrl + "/get");
-		HttpHeaders headers = headersFuture.get();
-		assertThat(headers.containsKey("Content-Type")).as("No Content-Type header").isTrue();
-	}
-
-	@Test
-	public void headForHeadersCallback() throws Exception {
-		ListenableFuture<HttpHeaders> headersFuture = template.headForHeaders(baseUrl + "/get");
-		headersFuture.addCallback(new ListenableFutureCallback<HttpHeaders>() {
-			@Override
-			public void onSuccess(HttpHeaders result) {
-				assertThat(result.containsKey("Content-Type")).as("No Content-Type header").isTrue();
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(headersFuture);
-	}
-
-	@Test
-	public void headForHeadersCallbackWithLambdas() throws Exception {
-		ListenableFuture<HttpHeaders> headersFuture = template.headForHeaders(baseUrl + "/get");
-		headersFuture.addCallback(result -> assertThat(result.containsKey("Content-Type")).as("No Content-Type header").isTrue(), ex -> fail(ex.getMessage()));
-		waitTillDone(headersFuture);
-	}
-
-	@Test
-	public void postForLocation() throws Exception  {
-		HttpHeaders entityHeaders = new HttpHeaders();
-		entityHeaders.setContentType(new MediaType("text", "plain", StandardCharsets.ISO_8859_1));
-		HttpEntity<String> entity = new HttpEntity<>(helloWorld, entityHeaders);
-		Future<URI> locationFuture = template.postForLocation(baseUrl + "/{method}", entity, "post");
-		URI location = locationFuture.get();
-		assertThat(location).as("Invalid location").isEqualTo(new URI(baseUrl + "/post/1"));
-	}
-
-	@Test
-	public void postForLocationCallback() throws Exception  {
-		HttpHeaders entityHeaders = new HttpHeaders();
-		entityHeaders.setContentType(new MediaType("text", "plain", StandardCharsets.ISO_8859_1));
-		HttpEntity<String> entity = new HttpEntity<>(helloWorld, entityHeaders);
-		final URI expected = new URI(baseUrl + "/post/1");
-		ListenableFuture<URI> locationFuture = template.postForLocation(baseUrl + "/{method}", entity, "post");
-		locationFuture.addCallback(new ListenableFutureCallback<URI>() {
-			@Override
-			public void onSuccess(URI result) {
-				assertThat(result).as("Invalid location").isEqualTo(expected);
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(locationFuture);
-	}
-
-	@Test
-	public void postForLocationCallbackWithLambdas() throws Exception  {
-		HttpHeaders entityHeaders = new HttpHeaders();
-		entityHeaders.setContentType(new MediaType("text", "plain", StandardCharsets.ISO_8859_1));
-		HttpEntity<String> entity = new HttpEntity<>(helloWorld, entityHeaders);
-		final URI expected = new URI(baseUrl + "/post/1");
-		ListenableFuture<URI> locationFuture = template.postForLocation(baseUrl + "/{method}", entity, "post");
-		locationFuture.addCallback(result -> assertThat(result).as("Invalid location").isEqualTo(expected),
-				ex -> fail(ex.getMessage()));
-		waitTillDone(locationFuture);
-	}
-
-	@Test
-	public void postForEntity() throws Exception  {
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld);
-		Future<ResponseEntity<String>> responseEntityFuture =
-				template.postForEntity(baseUrl + "/{method}", requestEntity, String.class, "post");
-		ResponseEntity<String> responseEntity = responseEntityFuture.get();
-		assertThat(responseEntity.getBody()).as("Invalid content").isEqualTo(helloWorld);
-	}
-
-	@Test
-	public void postForEntityCallback() throws Exception  {
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld);
-		ListenableFuture<ResponseEntity<String>> responseEntityFuture =
-				template.postForEntity(baseUrl + "/{method}", requestEntity, String.class, "post");
-		responseEntityFuture.addCallback(new ListenableFutureCallback<ResponseEntity<String>>() {
-			@Override
-			public void onSuccess(ResponseEntity<String> result) {
-				assertThat(result.getBody()).as("Invalid content").isEqualTo(helloWorld);
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(responseEntityFuture);
-	}
-
-	@Test
-	public void postForEntityCallbackWithLambdas() throws Exception  {
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld);
-		ListenableFuture<ResponseEntity<String>> responseEntityFuture =
-				template.postForEntity(baseUrl + "/{method}", requestEntity, String.class, "post");
-		responseEntityFuture.addCallback(
-				result -> assertThat(result.getBody()).as("Invalid content").isEqualTo(helloWorld),
-				ex -> fail(ex.getMessage()));
-		waitTillDone(responseEntityFuture);
-	}
-
-	@Test
-	public void put() throws Exception  {
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld);
-		Future<?> responseEntityFuture = template.put(baseUrl + "/{method}", requestEntity, "put");
-		responseEntityFuture.get();
-	}
-
-	@Test
-	public void putCallback() throws Exception  {
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld);
-		ListenableFuture<?> responseEntityFuture = template.put(baseUrl + "/{method}", requestEntity, "put");
-		responseEntityFuture.addCallback(new ListenableFutureCallback<Object>() {
-			@Override
-			public void onSuccess(Object result) {
-				assertThat(result).isNull();
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(responseEntityFuture);
-	}
-
-	@Test
-	public void delete() throws Exception  {
-		Future<?> deletedFuture = template.delete(new URI(baseUrl + "/delete"));
-		deletedFuture.get();
-	}
-
-	@Test
-	public void deleteCallback() throws Exception  {
-		ListenableFuture<?> deletedFuture = template.delete(new URI(baseUrl + "/delete"));
-		deletedFuture.addCallback(new ListenableFutureCallback<Object>() {
-			@Override
-			public void onSuccess(Object result) {
-				assertThat(result).isNull();
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(deletedFuture);
-	}
-
-	@Test
-	public void deleteCallbackWithLambdas() throws Exception  {
-		ListenableFuture<?> deletedFuture = template.delete(new URI(baseUrl + "/delete"));
-		deletedFuture.addCallback(result -> assertThat(result).isNull(), ex -> fail(ex.getMessage()));
-		waitTillDone(deletedFuture);
-	}
-
-	@Test
-	public void identicalExceptionThroughGetAndCallback() throws Exception {
-		final HttpClientErrorException[] callbackException = new HttpClientErrorException[1];
-
-		final CountDownLatch latch = new CountDownLatch(1);
-		ListenableFuture<?> future = template.execute(baseUrl + "/status/notfound", HttpMethod.GET, null, null);
-		future.addCallback(new ListenableFutureCallback<Object>() {
-			@Override
-			public void onSuccess(Object result) {
-				fail("onSuccess not expected");
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				boolean condition = ex instanceof HttpClientErrorException;
-				assertThat(condition).isTrue();
-				callbackException[0] = (HttpClientErrorException) ex;
-				latch.countDown();
-			}
-		});
-
-		try {
-			future.get();
-			fail("Exception expected");
-		}
-		catch (ExecutionException ex) {
-			Throwable cause = ex.getCause();
-			boolean condition = cause instanceof HttpClientErrorException;
-			assertThat(condition).isTrue();
-			latch.await(5, TimeUnit.SECONDS);
-			assertThat(cause).isSameAs(callbackException[0]);
-		}
-	}
-
-	@Test
-	public void notFoundGet() throws Exception {
-		assertThatExceptionOfType(ExecutionException.class).isThrownBy(() -> {
-				Future<?> future = template.execute(baseUrl + "/status/notfound", HttpMethod.GET, null, null);
-				future.get();
-				})
-			.withCauseInstanceOf(HttpClientErrorException.class)
-			.satisfies(ex -> {
-				HttpClientErrorException cause = (HttpClientErrorException) ex.getCause();
-				assertThat(cause.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
-				assertThat(cause.getStatusText()).isNotNull();
-				assertThat(cause.getResponseBodyAsString()).isNotNull();
-			});
-	}
-
-	@Test
-	public void notFoundCallback() throws Exception {
-		ListenableFuture<?> future = template.execute(baseUrl + "/status/notfound", HttpMethod.GET, null, null);
-		future.addCallback(new ListenableFutureCallback<Object>() {
-			@Override
-			public void onSuccess(Object result) {
-				fail("onSuccess not expected");
-			}
-			@Override
-			public void onFailure(Throwable t) {
-				boolean condition = t instanceof HttpClientErrorException;
-				assertThat(condition).isTrue();
-				HttpClientErrorException ex = (HttpClientErrorException) t;
-				assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
-				assertThat(ex.getStatusText()).isNotNull();
-				assertThat(ex.getResponseBodyAsString()).isNotNull();
-			}
-		});
-		waitTillDone(future);
-	}
-
-	@Test
-	public void notFoundCallbackWithLambdas() throws Exception {
-		ListenableFuture<?> future = template.execute(baseUrl + "/status/notfound", HttpMethod.GET, null, null);
-		future.addCallback(result -> fail("onSuccess not expected"), ex -> {
-			boolean condition = ex instanceof HttpClientErrorException;
-			assertThat(condition).isTrue();
-			HttpClientErrorException hcex = (HttpClientErrorException) ex;
-			assertThat(hcex.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
-			assertThat(hcex.getStatusText()).isNotNull();
-			assertThat(hcex.getResponseBodyAsString()).isNotNull();
-		});
-		waitTillDone(future);
-	}
-
-	@Test
-	public void serverError() throws Exception {
-		try {
-			Future<Void> future = template.execute(baseUrl + "/status/server", HttpMethod.GET, null, null);
-			future.get();
-			fail("HttpServerErrorException expected");
-		}
-		catch (ExecutionException ex) {
-			boolean condition = ex.getCause() instanceof HttpServerErrorException;
-			assertThat(condition).isTrue();
-			HttpServerErrorException cause = (HttpServerErrorException)ex.getCause();
-
-			assertThat(cause.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
-			assertThat(cause.getStatusText()).isNotNull();
-			assertThat(cause.getResponseBodyAsString()).isNotNull();
-		}
-	}
-
-	@Test
-	public void serverErrorCallback() throws Exception {
-		ListenableFuture<Void> future = template.execute(baseUrl + "/status/server", HttpMethod.GET, null, null);
-		future.addCallback(new ListenableFutureCallback<Void>() {
-			@Override
-			public void onSuccess(Void result) {
-				fail("onSuccess not expected");
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				boolean condition = ex instanceof HttpServerErrorException;
-				assertThat(condition).isTrue();
-				HttpServerErrorException hsex = (HttpServerErrorException) ex;
-				assertThat(hsex.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
-				assertThat(hsex.getStatusText()).isNotNull();
-				assertThat(hsex.getResponseBodyAsString()).isNotNull();
-			}
-		});
-		waitTillDone(future);
-	}
-
-	@Test
-	public void serverErrorCallbackWithLambdas() throws Exception {
-		ListenableFuture<Void> future = template.execute(baseUrl + "/status/server", HttpMethod.GET, null, null);
-		future.addCallback(result -> fail("onSuccess not expected"), ex -> {
-			boolean condition = ex instanceof HttpServerErrorException;
-			assertThat(condition).isTrue();
-			HttpServerErrorException hsex = (HttpServerErrorException) ex;
-			assertThat(hsex.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
-			assertThat(hsex.getStatusText()).isNotNull();
-			assertThat(hsex.getResponseBodyAsString()).isNotNull();
-		});
-		waitTillDone(future);
-	}
-
-	@Test
-	public void optionsForAllow() throws Exception {
-		Future<Set<HttpMethod>> allowedFuture = template.optionsForAllow(new URI(baseUrl + "/get"));
-		Set<HttpMethod> allowed = allowedFuture.get();
-		assertThat(allowed).as("Invalid response").isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS, HttpMethod.HEAD, HttpMethod.TRACE));
-	}
-
-	@Test
-	public void optionsForAllowCallback() throws Exception {
-		ListenableFuture<Set<HttpMethod>> allowedFuture = template.optionsForAllow(new URI(baseUrl + "/get"));
-		allowedFuture.addCallback(new ListenableFutureCallback<Set<HttpMethod>>() {
-			@Override
-			public void onSuccess(Set<HttpMethod> result) {
-				assertThat(result).as("Invalid response").isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS,
-								HttpMethod.HEAD, HttpMethod.TRACE));
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(allowedFuture);
-	}
-
-	@Test
-	public void optionsForAllowCallbackWithLambdas() throws Exception{
-		ListenableFuture<Set<HttpMethod>> allowedFuture = template.optionsForAllow(new URI(baseUrl + "/get"));
-		allowedFuture.addCallback(result -> assertThat(result).as("Invalid response").isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS, HttpMethod.HEAD,HttpMethod.TRACE)),
-				ex -> fail(ex.getMessage()));
-		waitTillDone(allowedFuture);
-	}
-
-	@Test
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void exchangeGet() throws Exception {
-		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.set("MyHeader", "MyValue");
-		HttpEntity<?> requestEntity = new HttpEntity(requestHeaders);
-		Future<ResponseEntity<String>> responseFuture =
-				template.exchange(baseUrl + "/{method}", HttpMethod.GET, requestEntity, String.class, "get");
-		ResponseEntity<String> response = responseFuture.get();
-		assertThat(response.getBody()).as("Invalid content").isEqualTo(helloWorld);
-	}
-
-	@Test
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void exchangeGetCallback() throws Exception {
-		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.set("MyHeader", "MyValue");
-		HttpEntity<?> requestEntity = new HttpEntity(requestHeaders);
-		ListenableFuture<ResponseEntity<String>> responseFuture =
-				template.exchange(baseUrl + "/{method}", HttpMethod.GET, requestEntity, String.class, "get");
-		responseFuture.addCallback(new ListenableFutureCallback<ResponseEntity<String>>() {
-			@Override
-			public void onSuccess(ResponseEntity<String> result) {
-				assertThat(result.getBody()).as("Invalid content").isEqualTo(helloWorld);
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(responseFuture);
-	}
-
-	@Test
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void exchangeGetCallbackWithLambdas() throws Exception {
-		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.set("MyHeader", "MyValue");
-		HttpEntity<?> requestEntity = new HttpEntity(requestHeaders);
-		ListenableFuture<ResponseEntity<String>> responseFuture =
-				template.exchange(baseUrl + "/{method}", HttpMethod.GET, requestEntity, String.class, "get");
-		responseFuture.addCallback(result -> assertThat(result.getBody()).as("Invalid content").isEqualTo(helloWorld), ex -> fail(ex.getMessage()));
-		waitTillDone(responseFuture);
-	}
-
-	@Test
-	public void exchangePost() throws Exception {
-		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.set("MyHeader", "MyValue");
-		requestHeaders.setContentType(MediaType.TEXT_PLAIN);
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld, requestHeaders);
-		Future<ResponseEntity<Void>> resultFuture =
-				template.exchange(baseUrl + "/{method}", HttpMethod.POST, requestEntity, Void.class, "post");
-		ResponseEntity<Void> result = resultFuture.get();
-		assertThat(result.getHeaders().getLocation()).as("Invalid location").isEqualTo(new URI(baseUrl + "/post/1"));
-		assertThat(result.hasBody()).isFalse();
-	}
-
-	@Test
-	public void exchangePostCallback() throws Exception {
-		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.set("MyHeader", "MyValue");
-		requestHeaders.setContentType(MediaType.TEXT_PLAIN);
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld, requestHeaders);
-		ListenableFuture<ResponseEntity<Void>> resultFuture =
-				template.exchange(baseUrl + "/{method}", HttpMethod.POST, requestEntity, Void.class, "post");
-		final URI expected =new URI(baseUrl + "/post/1");
-		resultFuture.addCallback(new ListenableFutureCallback<ResponseEntity<Void>>() {
-			@Override
-			public void onSuccess(ResponseEntity<Void> result) {
-				assertThat(result.getHeaders().getLocation()).as("Invalid location").isEqualTo(expected);
-				assertThat(result.hasBody()).isFalse();
-			}
-			@Override
-			public void onFailure(Throwable ex) {
-				fail(ex.getMessage());
-			}
-		});
-		waitTillDone(resultFuture);
-	}
-
-	@Test
-	public void exchangePostCallbackWithLambdas() throws Exception {
-		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.set("MyHeader", "MyValue");
-		requestHeaders.setContentType(MediaType.TEXT_PLAIN);
-		HttpEntity<String> requestEntity = new HttpEntity<>(helloWorld, requestHeaders);
-		ListenableFuture<ResponseEntity<Void>> resultFuture =
-				template.exchange(baseUrl + "/{method}", HttpMethod.POST, requestEntity, Void.class, "post");
-		final URI expected =new URI(baseUrl + "/post/1");
-		resultFuture.addCallback(result -> {
-			assertThat(result.getHeaders().getLocation()).as("Invalid location").isEqualTo(expected);
-			assertThat(result.hasBody()).isFalse();
-		}, ex -> fail(ex.getMessage()));
-		waitTillDone(resultFuture);
-	}
-
-	@Test
-	public void multipartFormData() throws Exception {
-		MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
-		parts.add("name 1", "value 1");
-		parts.add("name 2", "value 2+1");
-		parts.add("name 2", "value 2+2");
-		Resource logo = new ClassPathResource("/org/springframework/http/converter/logo.jpg");
-		parts.add("logo", logo);
-
-		HttpEntity<MultiValueMap<String, Object>> requestBody = new HttpEntity<>(parts);
-		Future<URI> future = template.postForLocation(baseUrl + "/multipartFormData", requestBody);
-		future.get();
-	}
-
-	@Test
-	public void getAndInterceptResponse() throws Exception {
-		RequestInterceptor interceptor = new RequestInterceptor();
-		template.setInterceptors(Collections.singletonList(interceptor));
-		ListenableFuture<ResponseEntity<String>> future = template.getForEntity(baseUrl + "/get", String.class);
-
-		interceptor.latch.await(5, TimeUnit.SECONDS);
-		assertThat(interceptor.response).isNotNull();
-		assertThat(interceptor.response.getStatusCode()).isEqualTo(HttpStatus.OK);
-		assertThat(interceptor.exception).isNull();
-		assertThat(future.get().getBody()).isEqualTo(helloWorld);
-	}
-
-	@Test
-	public void getAndInterceptError() throws Exception {
-		RequestInterceptor interceptor = new RequestInterceptor();
-		template.setInterceptors(Collections.singletonList(interceptor));
-		template.getForEntity(baseUrl + "/status/notfound", String.class);
-
-		interceptor.latch.await(5, TimeUnit.SECONDS);
-		assertThat(interceptor.response).isNotNull();
-		assertThat(interceptor.response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
-		assertThat(interceptor.exception).isNull();
-	}
-
-	private void waitTillDone(ListenableFuture<?> future) {
-		while (!future.isDone()) {
-			try {
-				Thread.sleep(5);
-			}
-			catch (InterruptedException ex) {
-				Thread.currentThread().interrupt();
-			}
-		}
-	}
-
-
-	private static class RequestInterceptor implements org.springframework.http.client.AsyncClientHttpRequestInterceptor {
-
-		private final CountDownLatch latch = new CountDownLatch(1);
-
-		private volatile ClientHttpResponse response;
-
-		private volatile Throwable exception;
-
-		@Override
-		public ListenableFuture<ClientHttpResponse> intercept(HttpRequest request, byte[] body,
-				org.springframework.http.client.AsyncClientHttpRequestExecution execution) throws IOException {
-
-			ListenableFuture<ClientHttpResponse> future = execution.executeAsync(request, body);
-			future.addCallback(
-					resp -> {
-						response = resp;
-						this.latch.countDown();
-					},
-					ex -> {
-						exception = ex;
-						this.latch.countDown();
-					});
-			return future;
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
index f53cf890c79b..cc684fe001bc 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,6 @@ static Stream<ClientHttpRequestFactory> clientHttpRequestFactories() {
 		return Stream.of(
 			new SimpleClientHttpRequestFactory(),
 			new HttpComponentsClientHttpRequestFactory(),
-			new org.springframework.http.client.Netty4ClientHttpRequestFactory(),
 			new OkHttp3ClientHttpRequestFactory()
 		);
 	}
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index c299efbe5e47..c895bb9c5a4e 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -344,13 +344,6 @@ to `multipart/form-data` by the `FormHttpMessageConverter`. If the `MultiValueMa
 If necessary the `Content-Type` may also be set explicitly.
 
 
-[[rest-async-resttemplate]]
-=== Using `AsyncRestTemplate` (Deprecated)
-
-The `AsyncRestTemplate` is deprecated. For all use cases where you might consider using
-`AsyncRestTemplate`, use the <<web-reactive.adoc#webflux-client, WebClient>> instead.
-
-
 
 [[remoting]]
 == Remoting and Web Services

From f14bd5003373fc6ddd81b7efdedeffbdb0333685 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 8 Oct 2021 18:19:59 +0100
Subject: [PATCH 208/735] Prune empty method adapter classes

---
 .../support/ChannelInterceptorAdapter.java    |  64 ------
 .../CallableProcessingInterceptorAdapter.java |  61 ------
 ...redResultProcessingInterceptorAdapter.java |  82 --------
 .../annotation/WebMvcConfigurerAdapter.java   | 191 ------------------
 .../handler/HandlerInterceptorAdapter.java    |  34 ----
 5 files changed, 432 deletions(-)
 delete mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java b/spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java
deleted file mode 100644
index a8477f58436f..000000000000
--- a/spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- * 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.messaging.support;
-
-import org.springframework.lang.Nullable;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageChannel;
-
-/**
- * A {@link ChannelInterceptor} base class with empty method implementations
- * as a convenience.
- *
- * @author Mark Fisher
- * @author Rossen Stoyanchev
- * @since 4.0
- * @deprecated as of 5.0.7 {@link ChannelInterceptor} has default methods (made
- * possible by a Java 8 baseline) and can be implemented directly without the
- * need for this no-op adapter
- */
-@Deprecated
-public abstract class ChannelInterceptorAdapter implements ChannelInterceptor {
-
-	@Override
-	public Message<?> preSend(Message<?> message, MessageChannel channel) {
-		return message;
-	}
-
-	@Override
-	public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
-	}
-
-	@Override
-	public void afterSendCompletion(Message<?> message, MessageChannel channel, boolean sent, @Nullable Exception ex) {
-	}
-
-	@Override
-	public boolean preReceive(MessageChannel channel) {
-		return true;
-	}
-
-	@Override
-	public Message<?> postReceive(Message<?> message, MessageChannel channel) {
-		return message;
-	}
-
-	@Override
-	public void afterReceiveCompletion(@Nullable Message<?> message, MessageChannel channel, @Nullable Exception ex) {
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java b/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java
deleted file mode 100644
index 4c04274e7406..000000000000
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- * 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.web.context.request.async;
-
-import java.util.concurrent.Callable;
-
-import org.springframework.web.context.request.NativeWebRequest;
-
-/**
- * Abstract adapter class for the {@link CallableProcessingInterceptor} interface,
- * for simplified implementation of individual methods.
- *
- * @author Rossen Stoyanchev
- * @author Rob Winch
- * @since 3.2
- * @deprecated as of 5.0 where CallableProcessingInterceptor has default methods
- */
-@Deprecated
-public abstract class CallableProcessingInterceptorAdapter implements CallableProcessingInterceptor {
-
-	@Override
-	public <T> void beforeConcurrentHandling(NativeWebRequest request, Callable<T> task) throws Exception {
-	}
-
-	@Override
-	public <T> void preProcess(NativeWebRequest request, Callable<T> task) throws Exception {
-	}
-
-	@Override
-	public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) throws Exception {
-	}
-
-	@Override
-	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) throws Exception {
-		return RESULT_NONE;
-	}
-
-	@Override
-	public <T> Object handleError(NativeWebRequest request, Callable<T> task, Throwable t) throws Exception {
-		return RESULT_NONE;
-	}
-
-	@Override
-	public <T> void afterCompletion(NativeWebRequest request, Callable<T> task) throws Exception {
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java
deleted file mode 100644
index 9afac024a51a..000000000000
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- * 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.web.context.request.async;
-
-import org.springframework.web.context.request.NativeWebRequest;
-
-/**
- * Abstract adapter class for the {@link DeferredResultProcessingInterceptor}
- * interface for simplified implementation of individual methods.
- *
- * @author Rossen Stoyanchev
- * @author Rob Winch
- * @since 3.2
- * @deprecated as of 5.0 where DeferredResultProcessingInterceptor has default methods
- */
-@Deprecated
-public abstract class DeferredResultProcessingInterceptorAdapter implements DeferredResultProcessingInterceptor {
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult)
-			throws Exception {
-	}
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void preProcess(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
-	}
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferredResult,
-			Object concurrentResult) throws Exception {
-	}
-
-	/**
-	 * This implementation returns {@code true} by default allowing other interceptors
-	 * to be given a chance to handle the timeout.
-	 */
-	@Override
-	public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
-		return true;
-	}
-
-	/**
-	 * This implementation returns {@code true} by default allowing other interceptors
-	 * to be given a chance to handle the error.
-	 */
-	@Override
-	public <T> boolean handleError(NativeWebRequest request, DeferredResult<T> deferredResult, Throwable t)
-			throws Exception {
-		return true;
-	}
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void afterCompletion(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
deleted file mode 100644
index 3c9acbf1ec72..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.config.annotation;
-
-import java.util.List;
-
-import org.springframework.format.FormatterRegistry;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.lang.Nullable;
-import org.springframework.validation.MessageCodesResolver;
-import org.springframework.validation.Validator;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
-import org.springframework.web.servlet.HandlerExceptionResolver;
-
-/**
- * An implementation of {@link WebMvcConfigurer} with empty methods allowing
- * subclasses to override only the methods they're interested in.
- *
- * @author Rossen Stoyanchev
- * @since 3.1
- * @deprecated as of 5.0 {@link WebMvcConfigurer} has default methods (made
- * possible by a Java 8 baseline) and can be implemented directly without the
- * need for this adapter
- */
-@Deprecated
-public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configurePathMatch(PathMatchConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addFormatters(FormatterRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addCorsMappings(CorsRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addViewControllers(ViewControllerRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureViewResolvers(ViewResolverRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void extendHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation returns {@code null}.
-	 */
-	@Override
-	@Nullable
-	public Validator getValidator() {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation returns {@code null}.
-	 */
-	@Override
-	@Nullable
-	public MessageCodesResolver getMessageCodesResolver() {
-		return null;
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
deleted file mode 100644
index 9681be818dc5..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.handler;
-
-import org.springframework.web.servlet.AsyncHandlerInterceptor;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-/**
- * Abstract adapter class for the {@link AsyncHandlerInterceptor} interface,
- * for simplified implementation of pre-only/post-only interceptors.
- *
- * @author Juergen Hoeller
- * @since 05.12.2003
- * @deprecated as of 5.3 in favor of implementing {@link HandlerInterceptor}
- * and/or {@link AsyncHandlerInterceptor} directly.
- */
-@Deprecated
-public abstract class HandlerInterceptorAdapter implements AsyncHandlerInterceptor {
-
-}

From fa3a2dc98142d397c8394e93d79749f345c149a7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 8 Oct 2021 19:27:06 +0200
Subject: [PATCH 209/735] Upgrade to AspectJ 1.9.8 RC1 for Java 17 support

See gh-27537
---
 build.gradle                         | 2 +-
 spring-aspects/spring-aspects.gradle | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index ef49f6bad0d5..e872cdedb5a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ configure(allprojects) { project ->
 			}
 			dependency "com.google.code.findbugs:jsr305:3.0.2"
 
-			dependencySet(group: 'org.aspectj', version: '1.9.7') {
+			dependencySet(group: 'org.aspectj', version: '1.9.8.RC1') {
 				entry 'aspectjrt'
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index ec29638bf5ec..0461a8be3fb2 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -11,12 +11,12 @@ sourceSets.test.java.srcDirs = files()
 aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
 
 compileAspectj {
-	sourceCompatibility "1.8"
-	targetCompatibility "1.8"
+	sourceCompatibility "17"
+	targetCompatibility "17"
 }
 compileTestAspectj {
-	sourceCompatibility "1.8"
-	targetCompatibility "1.8"
+	sourceCompatibility "17"
+	targetCompatibility "17"
 }
 
 dependencies {

From 4b01370f54f284f377d2c3dbc725a886fa105e97 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 8 Oct 2021 20:41:18 +0200
Subject: [PATCH 210/735] UriTemplateRequestEntity overrides equals/hashCode

Closes gh-27531
---
 .../springframework/http/RequestEntity.java   | 35 +++++++++++++-----
 .../http/RequestEntityTests.java              | 36 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/RequestEntity.java b/spring-web/src/main/java/org/springframework/http/RequestEntity.java
index 4c77123332c6..6dd27d02db20 100644
--- a/spring-web/src/main/java/org/springframework/http/RequestEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/RequestEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -194,15 +194,15 @@ public boolean equals(@Nullable Object other) {
 			return false;
 		}
 		RequestEntity<?> otherEntity = (RequestEntity<?>) other;
-		return (ObjectUtils.nullSafeEquals(getMethod(), otherEntity.getMethod()) &&
-				ObjectUtils.nullSafeEquals(getUrl(), otherEntity.getUrl()));
+		return (ObjectUtils.nullSafeEquals(this.method, otherEntity.method) &&
+				ObjectUtils.nullSafeEquals(this.url, otherEntity.url));
 	}
 
 	@Override
 	public int hashCode() {
 		int hashCode = super.hashCode();
 		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.method);
-		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(getUrl());
+		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.url);
 		return hashCode;
 	}
 
@@ -544,13 +544,13 @@ private static class DefaultBodyBuilder implements BodyBuilder {
 		private final URI uri;
 
 		@Nullable
-		String uriTemplate;
+		private final String uriTemplate;
 
 		@Nullable
-		private Object[] uriVarsArray;
+		private final Object[] uriVarsArray;
 
 		@Nullable
-		Map<String, ?> uriVarsMap;
+		private final Map<String, ?> uriVarsMap;
 
 		DefaultBodyBuilder(HttpMethod method, URI url) {
 			this.method = method;
@@ -661,7 +661,7 @@ public <T> RequestEntity<T> body(T body, Type type) {
 			return buildInternal(body, type);
 		}
 
-		private <T> RequestEntity<T>  buildInternal(@Nullable T body, @Nullable Type type) {
+		private <T> RequestEntity<T> buildInternal(@Nullable T body, @Nullable Type type) {
 			if (this.uri != null) {
 				return new RequestEntity<>(body, this.headers, this.method, this.uri, type);
 			}
@@ -716,6 +716,25 @@ public Object[] getVars() {
 			return this.uriVarsMap;
 		}
 
+		@Override
+		public boolean equals(@Nullable Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!super.equals(other)) {
+				return false;
+			}
+			UriTemplateRequestEntity<?> otherEntity = (UriTemplateRequestEntity<?>) other;
+			return (ObjectUtils.nullSafeEquals(this.uriTemplate, otherEntity.uriTemplate) &&
+					ObjectUtils.nullSafeEquals(this.uriVarsArray, otherEntity.uriVarsArray) &&
+					ObjectUtils.nullSafeEquals(this.uriVarsMap, otherEntity.uriVarsMap));
+		}
+
+		@Override
+		public int hashCode() {
+			return (29 * super.hashCode() + ObjectUtils.nullSafeHashCode(this.uriTemplate));
+		}
+
 		@Override
 		public String toString() {
 			return format(getMethod(), getUriTemplate(), getBody(), getHeaders());
diff --git a/spring-web/src/test/java/org/springframework/http/RequestEntityTests.java b/spring-web/src/test/java/org/springframework/http/RequestEntityTests.java
index e165ef8082d5..1c979728f9b4 100644
--- a/spring-web/src/test/java/org/springframework/http/RequestEntityTests.java
+++ b/spring-web/src/test/java/org/springframework/http/RequestEntityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -175,4 +176,37 @@ void types() throws URISyntaxException {
 		assertThat(entity.getType()).isEqualTo(typeReference.getType());
 	}
 
+	@Test
+	void equalityWithUrl() {
+		RequestEntity<Void> requestEntity1 = RequestEntity.method(HttpMethod.GET, "http://test.api/path/").build();
+		RequestEntity<Void> requestEntity2 = RequestEntity.method(HttpMethod.GET, "http://test.api/path/").build();
+		RequestEntity<Void> requestEntity3 = RequestEntity.method(HttpMethod.GET, "http://test.api/pathX/").build();
+
+		assertThat(requestEntity1).isEqualTo(requestEntity2);
+		assertThat(requestEntity2).isEqualTo(requestEntity1);
+		assertThat(requestEntity1).isNotEqualTo(requestEntity3);
+		assertThat(requestEntity3).isNotEqualTo(requestEntity2);
+		assertThat(requestEntity1.hashCode()).isEqualTo(requestEntity2.hashCode());
+		assertThat(requestEntity1.hashCode()).isNotEqualTo(requestEntity3.hashCode());
+	}
+
+	@Test  // gh-27531
+	void equalityWithUriTemplate() {
+		Map<String, Object> vars = Collections.singletonMap("id", "1");
+
+		RequestEntity<Void> requestEntity1 =
+				RequestEntity.method(HttpMethod.GET, "http://test.api/path/{id}", vars).build();
+		RequestEntity<Void> requestEntity2 =
+				RequestEntity.method(HttpMethod.GET, "http://test.api/path/{id}", vars).build();
+		RequestEntity<Void> requestEntity3 =
+				RequestEntity.method(HttpMethod.GET, "http://test.api/pathX/{id}", vars).build();
+
+		assertThat(requestEntity1).isEqualTo(requestEntity2);
+		assertThat(requestEntity2).isEqualTo(requestEntity1);
+		assertThat(requestEntity1).isNotEqualTo(requestEntity3);
+		assertThat(requestEntity3).isNotEqualTo(requestEntity2);
+		assertThat(requestEntity1.hashCode()).isEqualTo(requestEntity2.hashCode());
+		assertThat(requestEntity1.hashCode()).isNotEqualTo(requestEntity3.hashCode());
+	}
+
 }

From 87aaf5049b81bce2a8bbb37e7aef69128f79a1e5 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 8 Oct 2021 20:41:51 +0200
Subject: [PATCH 211/735] Polishing

---
 .../org/springframework/core/ReactiveAdapterRegistry.java   | 2 +-
 .../web/bind/MethodArgumentNotValidException.java           | 4 ++--
 .../result/method/AbstractHandlerMethodMapping.java         | 6 ++----
 .../mvc/support/DefaultHandlerExceptionResolver.java        | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index 0193dff6c256..9e56b5d5e37d 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -41,7 +41,7 @@
 /**
  * A registry of adapters to adapt Reactive Streams {@link Publisher} to/from
  * various async/reactive types such as {@code CompletableFuture}, RxJava
- * {@code Observable}, and others.
+ * {@code Flowable}, and others.
  *
  * <p>By default, depending on classpath availability, adapters are registered
  * for Reactor, RxJava 3, {@link CompletableFuture}, {@code Flow.Publisher},
diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
index e51f136e4755..3638ac1411b3 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
@@ -56,8 +56,8 @@ public final MethodParameter getParameter() {
 	@Override
 	public String getMessage() {
 		StringBuilder sb = new StringBuilder("Validation failed for argument [")
-			.append(this.parameter.getParameterIndex()).append("] in ")
-			.append(this.parameter.getExecutable().toGenericString());
+				.append(this.parameter.getParameterIndex()).append("] in ")
+				.append(this.parameter.getExecutable().toGenericString());
 		BindingResult bindingResult = getBindingResult();
 		if (bindingResult.getErrorCount() > 1) {
 			sb.append(" with ").append(bindingResult.getErrorCount()).append(" errors");
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
index 4487162cc9e6..7d59209955d6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
@@ -157,12 +157,10 @@ public void unregisterMapping(T mapping) {
 	 */
 	@Override
 	public void afterPropertiesSet() {
-
 		initHandlerMethods();
 
-		// Total includes detected mappings + explicit registrations via registerMapping..
-		int total = this.getHandlerMethods().size();
-
+		// Total includes detected mappings + explicit registrations via registerMapping
+		int total = getHandlerMethods().size();
 		if ((logger.isTraceEnabled() && total == 0) || (logger.isDebugEnabled() && total > 0) ) {
 			logger.debug(total + " mappings in " + formatMappingName());
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index acb57f665210..47bb3de32563 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -520,7 +520,7 @@ protected ModelAndView handleNoHandlerFoundException(NoHandlerFoundException ex,
 	/**
 	 * Handle the case where an async request timed out.
 	 * <p>The default implementation sends an HTTP 503 error.
-	 * @param ex the {@link AsyncRequestTimeoutException }to be handled
+	 * @param ex the {@link AsyncRequestTimeoutException} to be handled
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param handler the executed handler, or {@code null} if none chosen

From bdfd983bb4d855218f2c07d40ddd33d754559fdb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 8 Oct 2021 21:30:39 +0200
Subject: [PATCH 212/735] Fix example code formatting in @EnableWebMvc

---
 .../config/annotation/EnableWebMvc.java       | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
index acdb6e05640a..2f03b7135a39 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
  * &#064;EnableWebMvc
  * &#064;ComponentScan(basePackageClasses = MyConfiguration.class)
  * public class MyConfiguration {
- *
  * }
  * </pre>
  *
@@ -46,15 +45,15 @@
  * &#064;ComponentScan(basePackageClasses = MyConfiguration.class)
  * public class MyConfiguration implements WebMvcConfigurer {
  *
- * 	   &#064;Override
- * 	   public void addFormatters(FormatterRegistry formatterRegistry) {
+ *     &#064;Override
+ *     public void addFormatters(FormatterRegistry formatterRegistry) {
  *         formatterRegistry.addConverter(new MyConverter());
- * 	   }
+ *     }
  *
- * 	   &#064;Override
- * 	   public void configureMessageConverters(List&lt;HttpMessageConverter&lt;?&gt;&gt; converters) {
+ *     &#064;Override
+ *     public void configureMessageConverters(List&lt;HttpMessageConverter&lt;?&gt;&gt; converters) {
  *         converters.add(new MyHttpMessageConverter());
- * 	   }
+ *     }
  *
  * }
  * </pre>
@@ -66,7 +65,7 @@
  * configuration.
  *
  * <p>If {@link WebMvcConfigurer} does not expose some more advanced setting that
- * needs to be configured consider removing the {@code @EnableWebMvc}
+ * needs to be configured, consider removing the {@code @EnableWebMvc}
  * annotation and extending directly from {@link WebMvcConfigurationSupport}
  * or {@link DelegatingWebMvcConfiguration}, e.g.:
  *
@@ -75,16 +74,16 @@
  * &#064;ComponentScan(basePackageClasses = { MyConfiguration.class })
  * public class MyConfiguration extends WebMvcConfigurationSupport {
  *
- * 	   &#064;Override
- *	   public void addFormatters(FormatterRegistry formatterRegistry) {
+ *     &#064;Override
+ *     public void addFormatters(FormatterRegistry formatterRegistry) {
  *         formatterRegistry.addConverter(new MyConverter());
- *	   }
+ *     }
  *
- *	   &#064;Bean
- *	   public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
+ *     &#064;Bean
+ *     public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
  *         // Create or delegate to "super" to create and
  *         // customize properties of RequestMappingHandlerAdapter
- *	   }
+ *     }
  * }
  * </pre>
  *

From 47b8e8d528e150fe595b33101daee7b9f2c1d9c6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 10 Oct 2021 23:26:07 +0200
Subject: [PATCH 213/735] Upgrade to Mockito 4

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index af1973fefef7..3c5f9af16f2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -198,7 +198,7 @@ configure(allprojects) { project ->
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '3.12.4') {
+			dependencySet(group: 'org.mockito', version: '4.0.0') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}

From e8f6cd10a543d4f03da8e8a9750091ec9291e703 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 11 Oct 2021 11:14:02 +0100
Subject: [PATCH 214/735] Apply value formatting to resolved exceptions

---
 .../java/org/springframework/core/log/LogFormatUtils.java  | 2 +-
 .../web/server/handler/ResponseStatusExceptionHandler.java | 6 ++++--
 .../servlet/handler/AbstractHandlerExceptionResolver.java  | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
index cbcd63bf6f08..8ef04c71baf7 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
@@ -43,7 +43,7 @@ public abstract class LogFormatUtils {
 	 * @return the formatted value
 	 */
 	public static String formatValue(@Nullable Object value, boolean limitLength) {
-		return formatValue(value, 100, limitLength);
+		return formatValue(value, (limitLength ? 100 : -1), limitLength);
 	}
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
index 618200530e09..47ae9ce358ce 100644
--- a/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/server/handler/ResponseStatusExceptionHandler.java
@@ -20,6 +20,7 @@
 import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Mono;
 
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
@@ -81,9 +82,10 @@ else if (logger.isDebugEnabled()) {
 
 
 	private String formatError(Throwable ex, ServerHttpRequest request) {
-		String reason = ex.getClass().getSimpleName() + ": " + ex.getMessage();
+		String className = ex.getClass().getSimpleName();
+		String message = LogFormatUtils.formatValue(ex.getMessage(), -1, true);
 		String path = request.getURI().getRawPath();
-		return "Resolved [" + reason + "] for HTTP " + request.getMethod() + " " + path;
+		return "Resolved [" + className + ": " + message + "] for HTTP " + request.getMethod() + " " + path;
 	}
 
 	private boolean updateResponse(ServerHttpResponse response, Throwable ex) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
index e5e2db0b6a16..e96c43987a87 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.core.Ordered;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerExceptionResolver;
@@ -142,7 +143,7 @@ public ModelAndView resolveException(
 			if (result != null) {
 				// Print debug message when warn logger is not enabled.
 				if (logger.isDebugEnabled() && (this.warnLogger == null || !this.warnLogger.isWarnEnabled())) {
-					logger.debug("Resolved [" + ex + "]" + (result.isEmpty() ? "" : " to " + result));
+					logger.debug(buildLogMessage(ex, request) + (result.isEmpty() ? "" : " to " + result));
 				}
 				// Explicitly configured warn logger in logException method.
 				logException(ex, request);
@@ -215,7 +216,7 @@ protected void logException(Exception ex, HttpServletRequest request) {
 	 * @return the log message to use
 	 */
 	protected String buildLogMessage(Exception ex, HttpServletRequest request) {
-		return "Resolved [" + ex + "]";
+		return "Resolved [" + LogFormatUtils.formatValue(ex, -1, true) + "]";
 	}
 
 	/**

From 63fac1b7c871ce3c8129baf12705ee8e15a01f5c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 10 Oct 2021 22:40:26 +0200
Subject: [PATCH 215/735] Allow default CacheAwareContextLoaderDelegate
 configuration via system property

Prior to this commit, the default CacheAwareContextLoaderDelegate could
be configured by extending AbstractTestContextBootstrapper and
overriding getCacheAwareContextLoaderDelegate(); however, this required
that the user configure the custom TestContextBootstrapper via
@BootstrapWith.

This commit introduces a new
"spring.test.context.default.CacheAwareContextLoaderDelegate" property
that can be configured via a JVM system property or via the
SpringProperties mechanism. BootstrapUtils uses this new property to
load the default CacheAwareContextLoaderDelegate. If the property is
not defined, BootstrapUtils will fall back to creating a
DefaultCacheAwareContextLoaderDelegate as it did previously.

This allows third parties to configure the default
CacheAwareContextLoaderDelegate transparently for the user -- for
example, to intercept context loading in order to load the context in a
different manner -- for example, to make use of ahead of time (AOT)
techniques for implementing a different type of ApplicationContext at
build time.

Closes gh-27540
---
 .../test/context/BootstrapUtils.java          | 26 +++--
 .../CacheAwareContextLoaderDelegate.java      | 16 +++-
 ...tCacheAwareContextLoaderDelegateTests.java | 95 +++++++++++++++++++
 3 files changed, 127 insertions(+), 10 deletions(-)
 create mode 100644 spring-test/src/test/java/org/springframework/test/context/support/CustomDefaultCacheAwareContextLoaderDelegateTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java b/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java
index ff88ade86241..0336e4d513c1 100644
--- a/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,11 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.BeanUtils;
+import org.springframework.core.SpringProperties;
 import org.springframework.lang.Nullable;
 import org.springframework.test.context.TestContextAnnotationUtils.AnnotationDescriptor;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@code BootstrapUtils} is a collection of utility methods to assist with
@@ -65,7 +67,11 @@ abstract class BootstrapUtils {
 	/**
 	 * Create the {@code BootstrapContext} for the specified {@linkplain Class test class}.
 	 * <p>Uses reflection to create a {@link org.springframework.test.context.support.DefaultBootstrapContext}
-	 * that uses a {@link org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate}.
+	 * that uses a default {@link CacheAwareContextLoaderDelegate} &mdash; configured
+	 * via the {@link CacheAwareContextLoaderDelegate#DEFAULT_CACHE_AWARE_CONTEXT_LOADER_DELEGATE_PROPERTY_NAME}
+	 * system property or falling back to the
+	 * {@link org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate}
+	 * if the system property is not defined.
 	 * @param testClass the test class for which the bootstrap context should be created
 	 * @return a new {@code BootstrapContext}; never {@code null}
 	 */
@@ -90,19 +96,21 @@ static BootstrapContext createBootstrapContext(Class<?> testClass) {
 
 	@SuppressWarnings("unchecked")
 	private static CacheAwareContextLoaderDelegate createCacheAwareContextLoaderDelegate() {
-		Class<? extends CacheAwareContextLoaderDelegate> clazz = null;
+		String className = SpringProperties.getProperty(
+				CacheAwareContextLoaderDelegate.DEFAULT_CACHE_AWARE_CONTEXT_LOADER_DELEGATE_PROPERTY_NAME);
+		className = (StringUtils.hasText(className) ? className.trim() :
+				DEFAULT_CACHE_AWARE_CONTEXT_LOADER_DELEGATE_CLASS_NAME);
 		try {
-			clazz = (Class<? extends CacheAwareContextLoaderDelegate>) ClassUtils.forName(
-				DEFAULT_CACHE_AWARE_CONTEXT_LOADER_DELEGATE_CLASS_NAME, BootstrapUtils.class.getClassLoader());
-
+			Class<? extends CacheAwareContextLoaderDelegate> clazz =
+					(Class<? extends CacheAwareContextLoaderDelegate>) ClassUtils.forName(
+						className, BootstrapUtils.class.getClassLoader());
 			if (logger.isDebugEnabled()) {
-				logger.debug(String.format("Instantiating CacheAwareContextLoaderDelegate from class [%s]",
-					clazz.getName()));
+				logger.debug(String.format("Instantiating CacheAwareContextLoaderDelegate from class [%s]", className));
 			}
 			return BeanUtils.instantiateClass(clazz, CacheAwareContextLoaderDelegate.class);
 		}
 		catch (Throwable ex) {
-			throw new IllegalStateException("Could not load CacheAwareContextLoaderDelegate [" + clazz + "]", ex);
+			throw new IllegalStateException("Could not create CacheAwareContextLoaderDelegate [" + className + "]", ex);
 		}
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java b/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java
index fd9e8bb6971f..d05da0c51d15 100644
--- a/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java
+++ b/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,20 @@
  */
 public interface CacheAwareContextLoaderDelegate {
 
+	/**
+	 * System property used to configure the fully qualified class name of the
+	 * default {@code CacheAwareContextLoaderDelegate}.
+	 * <p>May alternatively be configured via the
+	 * {@link org.springframework.core.SpringProperties} mechanism.
+	 * <p>If this property is not defined, the
+	 * {@link org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate
+	 * DefaultCacheAwareContextLoaderDelegate} will be used as the default.
+	 * @since 5.3.11
+	 */
+	String DEFAULT_CACHE_AWARE_CONTEXT_LOADER_DELEGATE_PROPERTY_NAME =
+			"spring.test.context.default.CacheAwareContextLoaderDelegate";
+
+
 	/**
 	 * Determine if the {@linkplain ApplicationContext application context} for
 	 * the supplied {@link MergedContextConfiguration} has been loaded (i.e.,
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomDefaultCacheAwareContextLoaderDelegateTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomDefaultCacheAwareContextLoaderDelegateTests.java
new file mode 100644
index 000000000000..963b616354f2
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/support/CustomDefaultCacheAwareContextLoaderDelegateTests.java
@@ -0,0 +1,95 @@
+/*
+ * 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.test.context.support;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.testkit.engine.EngineTestKit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.SpringProperties;
+import org.springframework.test.context.CacheAwareContextLoaderDelegate;
+import org.springframework.test.context.MergedContextConfiguration;
+import org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+
+/**
+ * Integration tests for configuring a custom default {@link CacheAwareContextLoaderDelegate}
+ * via {@link SpringProperties}.
+ *
+ * @author sbrannen
+ * @since 5.3.11
+ */
+class CustomDefaultCacheAwareContextLoaderDelegateTests {
+
+	@Test
+	void customDefaultCacheAwareContextLoaderDelegateConfiguredViaSpringProperties() {
+		String key = CacheAwareContextLoaderDelegate.DEFAULT_CACHE_AWARE_CONTEXT_LOADER_DELEGATE_PROPERTY_NAME;
+
+		try {
+			SpringProperties.setProperty(key, AotCacheAwareContextLoaderDelegate.class.getName());
+
+			EngineTestKit.engine("junit-jupiter")//
+					.selectors(selectClass(TestCase.class))//
+					.execute()//
+					.testEvents()//
+					.assertStatistics(stats -> stats.started(1).succeeded(1).failed(0));
+		}
+		finally {
+			SpringProperties.setProperty(key, null);
+		}
+	}
+
+
+	@SpringJUnitConfig
+	static class TestCase {
+
+		@Test
+		void test(@Autowired String foo) {
+			// foo will be "bar" unless the AotCacheAwareContextLoaderDelegate is registered.
+			assertThat(foo).isEqualTo("AOT");
+		}
+
+
+		@Configuration
+		static class Config {
+
+			@Bean
+			String foo() {
+				return "bar";
+			}
+		}
+	}
+
+	static class AotCacheAwareContextLoaderDelegate extends DefaultCacheAwareContextLoaderDelegate {
+
+		@Override
+		protected ApplicationContext loadContextInternal(MergedContextConfiguration mergedContextConfiguration) {
+			GenericApplicationContext applicationContext = new GenericApplicationContext();
+			applicationContext.registerBean("foo", String.class, () -> "AOT");
+			applicationContext.refresh();
+			return applicationContext;
+		}
+	}
+
+}

From 114fa47171e666cfd2214cf436f99c267b6a2d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <sergei.tsypanov@yandex.ru>
Date: Mon, 11 Oct 2021 10:55:00 +0300
Subject: [PATCH 216/735] Use Arrays.hashCode() in ByteArrayResource.hashCode()

---
 .../java/org/springframework/core/io/ByteArrayResource.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
index 359d6b8574b1..6a2e666b6b1e 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
@@ -126,7 +126,7 @@ public boolean equals(@Nullable Object other) {
 	 */
 	@Override
 	public int hashCode() {
-		return (byte[].class.hashCode() * 29 * this.byteArray.length);
+		return Arrays.hashCode(byteArray);
 	}
 
 }

From eb07dea7958b0314fc79ea4f4b5e8ce710c169ef Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 11 Oct 2021 15:31:40 +0200
Subject: [PATCH 217/735] Polish contribution

See gh-27544
---
 .../java/org/springframework/core/io/ByteArrayResource.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
index 6a2e666b6b1e..c5989b8330dc 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,7 +126,7 @@ public boolean equals(@Nullable Object other) {
 	 */
 	@Override
 	public int hashCode() {
-		return Arrays.hashCode(byteArray);
+		return Arrays.hashCode(this.byteArray);
 	}
 
 }

From 83eac9af187c0151bf8039f1827649a8c3ca588f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 11 Oct 2021 16:18:35 +0200
Subject: [PATCH 218/735] Upgrade CI to github-release resource 1.5.5

Closes gh-27459
---
 ci/pipeline.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index b9fe3db2f917..64f6ffe3ad1a 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -46,6 +46,11 @@ resource_types:
   source:
     repository: springio/artifactory-resource
     tag: 0.0.17
+- name: github-release
+  type: registry-image
+  source:
+    repository: concourse/github-release-resource
+    tag: 1.5.5
 - name: github-status-resource
   type: registry-image
   source:

From 276aa46a1c7c4bdd8ed23bd70e569334435ab4c7 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 11 Oct 2021 16:22:30 +0200
Subject: [PATCH 219/735] Polish

---
 ci/README.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/README.adoc b/ci/README.adoc
index cb617637d9b4..9ff0d5b1e86c 100644
--- a/ci/README.adoc
+++ b/ci/README.adoc
@@ -2,7 +2,7 @@
 
 The Spring Framework uses https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
 The Spring team has a dedicated Concourse instance available at https://ci.spring.io with a build pipeline
-for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-5.3.x[Spring Framework 5.3.x].
+for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.0.x[Spring Framework 6.0.x].
 
 === Setting up your development environment
 
@@ -51,7 +51,7 @@ The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring set-pipeline -p spring-framework-5.3.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring set-pipeline -p spring-framework-6.0.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
 NOTE: This assumes that you have credhub integration configured with the appropriate secrets.

From 50ccb1bfcd93318508ec656e2cfe513b2e2bc6d2 Mon Sep 17 00:00:00 2001
From: Nick <n.v.golubev@gmail.com>
Date: Thu, 30 Sep 2021 22:40:21 +0300
Subject: [PATCH 220/735] Avoid duplicate JCacheOperationSource bean
 registration in <cache:annotation-driven />

In our application we use XML context and <cache:annotation-driven />
declaration. Also we disable bean definition duplication by setting
GenericApplicationContext.setAllowBeanDefinitionOverriding(false) in an
ApplicationContextInitializer. This combination leads to a
BeanDefinitionOverrideException because the
DefaultJCacheOperationSource bean is registered twice.

 - once for: parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
 - once for: parserContext.registerBeanComponent(new BeanComponentDefinition(sourceDef, sourceName));

This commit refactors JCacheCachingConfigurer.registerCacheAspect(...)
so that the JCacheOperationSource bean is registered only once.

Closes gh-27499
---
 .../AnnotationDrivenCacheBeanDefinitionParser.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
index 41c0bbc7b6d5..c7466616d496 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
@@ -245,16 +245,20 @@ private static void registerCacheAdvisor(Element element, ParserContext parserCo
 		private static void registerCacheAspect(Element element, ParserContext parserContext) {
 			if (!parserContext.getRegistry().containsBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME)) {
 				Object eleSource = parserContext.extractSource(element);
+
+				BeanDefinition sourceDef = createJCacheOperationSourceBeanDefinition(element, eleSource);
+				String sourceName = parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
+
 				RootBeanDefinition def = new RootBeanDefinition();
 				def.setBeanClassName(JCACHE_ASPECT_CLASS_NAME);
 				def.setFactoryMethodName("aspectOf");
-				BeanDefinition sourceDef = createJCacheOperationSourceBeanDefinition(element, eleSource);
-				String sourceName =
-						parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
 				def.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(sourceName));
+				parserContext.getRegistry().registerBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME, def);
 
-				parserContext.registerBeanComponent(new BeanComponentDefinition(sourceDef, sourceName));
-				parserContext.registerBeanComponent(new BeanComponentDefinition(def, CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME));
+				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
+				compositeDef.addNestedComponent(new BeanComponentDefinition(sourceDef, sourceName));
+				compositeDef.addNestedComponent(new BeanComponentDefinition(def, CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME));
+				parserContext.registerComponent(compositeDef);
 			}
 		}
 

From 5bd90538b32a84fd84026bceeae17b901cc39910 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 12 Oct 2021 12:22:24 +0200
Subject: [PATCH 221/735] Introduce test for gh-27499 and polish contribution

---
 .../JCacheAspectJNamespaceConfigTests.java    | 11 ++++++---
 ...tationDrivenCacheBeanDefinitionParser.java | 24 +++++++++----------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java
index 81ba6d0faff9..c755d8c3f4aa 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,18 @@
 
 /**
  * @author Stephane Nicoll
+ * @author Sam Brannen
  */
 public class JCacheAspectJNamespaceConfigTests extends AbstractJCacheAnnotationTests {
 
 	@Override
 	protected ApplicationContext getApplicationContext() {
-		return new GenericXmlApplicationContext(
-				"/org/springframework/cache/config/annotation-jcache-aspectj.xml");
+		GenericXmlApplicationContext context = new GenericXmlApplicationContext();
+		// Disallow bean definition overriding to test https://github.com/spring-projects/spring-framework/pull/27499
+		context.setAllowBeanDefinitionOverriding(false);
+		context.load("/org/springframework/cache/config/annotation-jcache-aspectj.xml");
+		context.refresh();
+		return context;
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
index c7466616d496..f2768059a0db 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -244,20 +244,20 @@ private static void registerCacheAdvisor(Element element, ParserContext parserCo
 
 		private static void registerCacheAspect(Element element, ParserContext parserContext) {
 			if (!parserContext.getRegistry().containsBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME)) {
-				Object eleSource = parserContext.extractSource(element);
+				Object source = parserContext.extractSource(element);
 
-				BeanDefinition sourceDef = createJCacheOperationSourceBeanDefinition(element, eleSource);
-				String sourceName = parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
+				BeanDefinition cacheOperationSourceDef = createJCacheOperationSourceBeanDefinition(element, source);
+				String cacheOperationSourceName = parserContext.getReaderContext().registerWithGeneratedName(cacheOperationSourceDef);
 
-				RootBeanDefinition def = new RootBeanDefinition();
-				def.setBeanClassName(JCACHE_ASPECT_CLASS_NAME);
-				def.setFactoryMethodName("aspectOf");
-				def.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(sourceName));
-				parserContext.getRegistry().registerBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME, def);
+				RootBeanDefinition jcacheAspectDef = new RootBeanDefinition();
+				jcacheAspectDef.setBeanClassName(JCACHE_ASPECT_CLASS_NAME);
+				jcacheAspectDef.setFactoryMethodName("aspectOf");
+				jcacheAspectDef.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(cacheOperationSourceName));
+				parserContext.getRegistry().registerBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME, jcacheAspectDef);
 
-				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
-				compositeDef.addNestedComponent(new BeanComponentDefinition(sourceDef, sourceName));
-				compositeDef.addNestedComponent(new BeanComponentDefinition(def, CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME));
+				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), source);
+				compositeDef.addNestedComponent(new BeanComponentDefinition(cacheOperationSourceDef, cacheOperationSourceName));
+				compositeDef.addNestedComponent(new BeanComponentDefinition(jcacheAspectDef, CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME));
 				parserContext.registerComponent(compositeDef);
 			}
 		}

From a2c52a97babdb927d809ad55c696c42d160d4fff Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 12 Oct 2021 11:59:39 +0100
Subject: [PATCH 222/735] Filter non-existing static resource locations

See gh-27538
---
 .../resource/ResourceHttpRequestHandler.java  | 10 ++++++++--
 .../ResourceHttpRequestHandlerTests.java      | 20 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index ed49cf3cd201..0831a2a2f29b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -424,6 +425,7 @@ public void afterPropertiesSet() throws Exception {
 	}
 
 	private void resolveResourceLocations() {
+		List<Resource> result = new ArrayList<>();
 		if (!this.locationValues.isEmpty()) {
 			ApplicationContext applicationContext = obtainApplicationContext();
 			for (String location : this.locationValues) {
@@ -452,7 +454,7 @@ private void resolveResourceLocations() {
 									"but resolved to a Resource of type: " + resource.getClass() + ". " +
 									"If this is intentional, please pass it as a pre-configured Resource via setLocations.");
 				}
-				this.locationsToUse.add(resource);
+				result.add(resource);
 				if (charset != null) {
 					if (!(resource instanceof UrlResource)) {
 						throw new IllegalArgumentException("Unexpected charset for non-UrlResource: " + resource);
@@ -461,7 +463,11 @@ private void resolveResourceLocations() {
 				}
 			}
 		}
-		this.locationsToUse.addAll(this.locationResources);
+
+		result.addAll(this.locationResources);
+		result = result.stream().filter(Resource::exists).collect(Collectors.toList());
+
+		this.locationsToUse.addAll(result);
 	}
 
 	/**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
index 6ced3a30d33e..2d3ce439569b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -312,6 +312,24 @@ public String getMimeType(String filePath) {
 		assertThat(this.response.getContentAsString()).isEqualTo("h1 { color:red; }");
 	}
 
+	@Test // gh-27538
+	public void filterNonExistingLocations() throws Exception {
+		List<Resource> inputLocations = Arrays.asList(
+				new ClassPathResource("test/", getClass()),
+				new ClassPathResource("testalternatepath/", getClass()),
+				new ClassPathResource("nosuchpath/", getClass()));
+
+		ResourceHttpRequestHandler handler = new ResourceHttpRequestHandler();
+		handler.setServletContext(new MockServletContext());
+		handler.setLocations(inputLocations);
+		handler.afterPropertiesSet();
+
+		List<Resource> actual = handler.getLocations();
+		assertThat(actual).hasSize(2);
+		assertThat(actual.get(0).getURL().toString()).endsWith("test/");
+		assertThat(actual.get(1).getURL().toString()).endsWith("testalternatepath/");
+	}
+
 	@Test
 	public void testInvalidPath() throws Exception {
 

From 1490d27d7581e3741a10252d9ed0bdb81a8dbf34 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 12 Oct 2021 15:10:19 +0200
Subject: [PATCH 223/735] Decouple urlResourceWithCharset test from existence
 of tmp directory

See gh-25738
---
 .../ResourceHandlerRegistryTests.java         | 30 +++++++++----------
 .../ResourceHttpRequestHandlerTests.java      |  8 ++---
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
index cce273a24937..fccde83979de 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
@@ -27,7 +27,6 @@
 
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
 import org.springframework.http.CacheControl;
 import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.context.support.GenericWebApplicationContext;
@@ -64,7 +63,7 @@ public class ResourceHandlerRegistryTests {
 
 
 	@BeforeEach
-	public void setUp() {
+	public void setup() {
 		GenericWebApplicationContext appContext = new GenericWebApplicationContext();
 		appContext.refresh();
 
@@ -76,8 +75,14 @@ public void setUp() {
 		this.response = new MockHttpServletResponse();
 	}
 
+	private ResourceHttpRequestHandler getHandler(String pathPattern) {
+		SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) this.registry.getHandlerMapping();
+		return (ResourceHttpRequestHandler) hm.getUrlMap().get(pathPattern);
+	}
+
+
 	@Test
-	public void noResourceHandlers() throws Exception {
+	public void noResourceHandlers() {
 		this.registry = new ResourceHandlerRegistry(new GenericWebApplicationContext(), new MockServletContext());
 		assertThat((Object) this.registry.getHandlerMapping()).isNull();
 	}
@@ -126,7 +131,7 @@ public void hasMappingForPattern() {
 	}
 
 	@Test
-	public void resourceChain() throws Exception {
+	public void resourceChain() {
 		ResourceResolver mockResolver = Mockito.mock(ResourceResolver.class);
 		ResourceTransformer mockTransformer = Mockito.mock(ResourceTransformer.class);
 		this.registration.resourceChain(true).addResolver(mockResolver).addTransformer(mockTransformer);
@@ -148,7 +153,7 @@ public void resourceChain() throws Exception {
 	}
 
 	@Test
-	public void resourceChainWithoutCaching() throws Exception {
+	public void resourceChainWithoutCaching() {
 		this.registration.resourceChain(false);
 
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
@@ -163,7 +168,7 @@ public void resourceChainWithoutCaching() throws Exception {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	public void resourceChainWithVersionResolver() throws Exception {
+	public void resourceChainWithVersionResolver() {
 		VersionResourceResolver versionResolver = new VersionResourceResolver()
 				.addFixedVersionStrategy("fixed", "/**/*.js")
 				.addContentVersionStrategy("/**");
@@ -188,7 +193,7 @@ public void resourceChainWithVersionResolver() throws Exception {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	public void resourceChainWithOverrides() throws Exception {
+	public void resourceChainWithOverrides() {
 		CachingResourceResolver cachingResolver = Mockito.mock(CachingResourceResolver.class);
 		VersionResourceResolver versionResolver = Mockito.mock(VersionResourceResolver.class);
 		WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class);
@@ -224,13 +229,11 @@ public void resourceChainWithOverrides() throws Exception {
 	}
 
 	@Test
-	public void urlResourceWithCharset() throws Exception {
+	public void urlResourceWithCharset()  {
 		this.registration.addResourceLocations("[charset=ISO-8859-1]file:///tmp");
 		this.registration.resourceChain(true);
 
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
-		UrlResource resource = (UrlResource) handler.getLocations().get(1);
-		assertThat(resource.getURL().toString()).isEqualTo("file:/tmp");
 		assertThat(handler.getUrlPathHelper()).isNotNull();
 
 		List<ResourceResolver> resolvers = handler.getResourceResolvers();
@@ -241,15 +244,10 @@ public void urlResourceWithCharset() throws Exception {
 	}
 
 	@Test
-	void lastModifiedDisabled() {
+	public void lastModifiedDisabled() {
 		this.registration.setUseLastModified(false);
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
 		assertThat(handler.isUseLastModified()).isFalse();
 	}
 
-	private ResourceHttpRequestHandler getHandler(String pathPattern) {
-		SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) this.registry.getHandlerMapping();
-		return (ResourceHttpRequestHandler) hm.getUrlMap().get(pathPattern);
-	}
-
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
index 2d3ce439569b..9aefd7f9d07b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -290,7 +290,6 @@ public void getMediaTypeWithFavorPathExtensionOff() throws Exception {
 
 	@Test  // SPR-14368
 	public void getResourceWithMediaTypeResolvedThroughServletContext() throws Exception {
-
 		MockServletContext servletContext = new MockServletContext() {
 			@Override
 			public String getMimeType(String filePath) {
@@ -312,7 +311,7 @@ public String getMimeType(String filePath) {
 		assertThat(this.response.getContentAsString()).isEqualTo("h1 { color:red; }");
 	}
 
-	@Test // gh-27538
+	@Test  // gh-27538
 	public void filterNonExistingLocations() throws Exception {
 		List<Resource> inputLocations = Arrays.asList(
 				new ClassPathResource("test/", getClass()),
@@ -332,7 +331,6 @@ public void filterNonExistingLocations() throws Exception {
 
 	@Test
 	public void testInvalidPath() throws Exception {
-
 		// Use mock ResourceResolver: i.e. we're only testing upfront validations...
 
 		Resource resource = mock(Resource.class);
@@ -678,7 +676,7 @@ public void partialContentMultipleByteRanges() throws Exception {
 		assertThat(ranges[11]).isEqualTo("t.");
 	}
 
-	@Test // gh-25976
+	@Test  // gh-25976
 	public void partialContentByteRangeWithEncodedResource(GzipSupport.GzippedFiles gzippedFiles) throws Exception {
 		String path = "js/foo.js";
 		gzippedFiles.create(path);
@@ -707,7 +705,7 @@ public void partialContentByteRangeWithEncodedResource(GzipSupport.GzippedFiles
 		assertThat(this.response.getHeaderValues("Vary")).containsExactly("Accept-Encoding");
 	}
 
-	@Test // gh-25976
+	@Test  // gh-25976
 	public void partialContentWithHttpHead() throws Exception {
 		this.request.setMethod("HEAD");
 		this.request.addHeader("Range", "bytes=0-1");

From b53275f2d2344ce3ad52dfbd7be7183fbb093789 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 12 Oct 2021 15:13:05 +0200
Subject: [PATCH 224/735] Add efficient existence check to
 ClassPathResource.isReadable()

Includes reduced isReadable() check in PathResourceLookupFunction, aligned with PathResourceResolver.

Closes gh-27538
See gh-21372
---
 .../core/io/AbstractFileResolvingResource.java       | 12 ++++++++++--
 .../springframework/core/io/ClassPathResource.java   | 12 ++++++++++++
 .../function/server/PathResourceLookupFunction.java  |  4 ++--
 .../servlet/function/PathResourceLookupFunction.java |  4 ++--
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
index 958b3babce7c..ac9ea29a5dca 100644
--- a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +88,15 @@ else if (code == HttpURLConnection.HTTP_NOT_FOUND) {
 	@Override
 	public boolean isReadable() {
 		try {
-			URL url = getURL();
+			return checkReadable(getURL());
+		}
+		catch (IOException ex) {
+			return false;
+		}
+	}
+
+	boolean checkReadable(URL url) {
+		try {
 			if (ResourceUtils.isFileURL(url)) {
 				// Proceed with file system resolution
 				File file = getFile();
diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
index 6374f2768b9d..f99adce06ce4 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
@@ -142,6 +142,18 @@ public boolean exists() {
 		return (resolveURL() != null);
 	}
 
+	/**
+	 * This implementation checks for the resolution of a resource URL upfront,
+	 * then proceeding with {@link AbstractFileResolvingResource}'s length check.
+	 * @see java.lang.ClassLoader#getResource(String)
+	 * @see java.lang.Class#getResource(String)
+	 */
+	@Override
+	public boolean isReadable() {
+		URL url = resolveURL();
+		return (url != null && checkReadable(url));
+	}
+
 	/**
 	 * Resolves a URL for the underlying class path resource.
 	 * @return the resolved URL, or {@code null} if not resolvable
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
index e17cca7906e4..60caf7c19e38 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ public Mono<Resource> apply(ServerRequest request) {
 
 		try {
 			Resource resource = this.location.createRelative(path);
-			if (resource.exists() && resource.isReadable() && isResourceUnderLocation(resource)) {
+			if (resource.isReadable() && isResourceUnderLocation(resource)) {
 				return Mono.just(resource);
 			}
 			else {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/PathResourceLookupFunction.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/PathResourceLookupFunction.java
index 7079290f30a0..c37bbfdce919 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/PathResourceLookupFunction.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/PathResourceLookupFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public Optional<Resource> apply(ServerRequest request) {
 
 		try {
 			Resource resource = this.location.createRelative(path);
-			if (resource.exists() && resource.isReadable() && isResourceUnderLocation(resource)) {
+			if (resource.isReadable() && isResourceUnderLocation(resource)) {
 				return Optional.of(resource);
 			}
 			else {

From 715f300fa11e4c20a7aaa9f9ac8439fc4072b00b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 12 Oct 2021 15:15:51 +0200
Subject: [PATCH 225/735] Avoid expensive isReadable() check during classpath
 scan

Closes gh-25741
See gh-21372
---
 ...athScanningCandidateComponentProvider.java | 47 +++++++++----------
 .../core/io/InputStreamSource.java            |  5 +-
 .../LocalSessionFactoryBuilder.java           |  8 +++-
 .../DefaultPersistenceUnitManager.java        |  8 +++-
 4 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
index 05ea7a5159a5..92d502a13f0b 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.context.annotation;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -424,40 +425,38 @@ private Set<BeanDefinition> scanCandidateComponents(String basePackage) {
 				if (traceEnabled) {
 					logger.trace("Scanning " + resource);
 				}
-				if (resource.isReadable()) {
-					try {
-						MetadataReader metadataReader = getMetadataReaderFactory().getMetadataReader(resource);
-						if (isCandidateComponent(metadataReader)) {
-							ScannedGenericBeanDefinition sbd = new ScannedGenericBeanDefinition(metadataReader);
-							sbd.setSource(resource);
-							if (isCandidateComponent(sbd)) {
-								if (debugEnabled) {
-									logger.debug("Identified candidate component class: " + resource);
-								}
-								candidates.add(sbd);
-							}
-							else {
-								if (debugEnabled) {
-									logger.debug("Ignored because not a concrete top-level class: " + resource);
-								}
+				try {
+					MetadataReader metadataReader = getMetadataReaderFactory().getMetadataReader(resource);
+					if (isCandidateComponent(metadataReader)) {
+						ScannedGenericBeanDefinition sbd = new ScannedGenericBeanDefinition(metadataReader);
+						sbd.setSource(resource);
+						if (isCandidateComponent(sbd)) {
+							if (debugEnabled) {
+								logger.debug("Identified candidate component class: " + resource);
 							}
+							candidates.add(sbd);
 						}
 						else {
-							if (traceEnabled) {
-								logger.trace("Ignored because not matching any filter: " + resource);
+							if (debugEnabled) {
+								logger.debug("Ignored because not a concrete top-level class: " + resource);
 							}
 						}
 					}
-					catch (Throwable ex) {
-						throw new BeanDefinitionStoreException(
-								"Failed to read candidate component class: " + resource, ex);
+					else {
+						if (traceEnabled) {
+							logger.trace("Ignored because not matching any filter: " + resource);
+						}
 					}
 				}
-				else {
+				catch (FileNotFoundException ex) {
 					if (traceEnabled) {
-						logger.trace("Ignored because not readable: " + resource);
+						logger.trace("Ignored non-readable " + resource + ": " + ex.getMessage());
 					}
 				}
+				catch (Throwable ex) {
+					throw new BeanDefinitionStoreException(
+							"Failed to read candidate component class: " + resource, ex);
+				}
 			}
 		}
 		catch (IOException ex) {
diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
index b769895ece77..8d72c9cd8bbc 100644
--- a/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,9 @@ public interface InputStreamSource {
 	 * creating mail attachments. For such a use case, it is <i>required</i>
 	 * that each {@code getInputStream()} call returns a fresh stream.
 	 * @return the input stream for the underlying resource (must not be {@code null})
-	 * @throws java.io.FileNotFoundException if the underlying resource doesn't exist
+	 * @throws java.io.FileNotFoundException if the underlying resource does not exist
 	 * @throws IOException if the content stream could not be opened
+	 * @see Resource#isReadable()
 	 */
 	InputStream getInputStream() throws IOException;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
index 9011db8fb55b..a21b13579ed1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.orm.hibernate5;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -320,7 +321,7 @@ public LocalSessionFactoryBuilder scanPackages(String... packagesToScan) throws
 				Resource[] resources = this.resourcePatternResolver.getResources(pattern);
 				MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver);
 				for (Resource resource : resources) {
-					if (resource.isReadable()) {
+					try {
 						MetadataReader reader = readerFactory.getMetadataReader(resource);
 						String className = reader.getClassMetadata().getClassName();
 						if (matchesEntityTypeFilter(reader, readerFactory)) {
@@ -333,6 +334,9 @@ else if (className.endsWith(PACKAGE_INFO_SUFFIX)) {
 							packageNames.add(className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length()));
 						}
 					}
+					catch (FileNotFoundException ex) {
+						// Ignore non-readable resource
+					}
 				}
 			}
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
index 8e2fd410d54b..310e2e55e4e1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.orm.jpa.persistenceunit;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -585,7 +586,7 @@ private void scanPackage(SpringPersistenceUnitInfo scannedUnit, String pkg) {
 			Resource[] resources = this.resourcePatternResolver.getResources(pattern);
 			MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver);
 			for (Resource resource : resources) {
-				if (resource.isReadable()) {
+				try {
 					MetadataReader reader = readerFactory.getMetadataReader(resource);
 					String className = reader.getClassMetadata().getClassName();
 					if (matchesFilter(reader, readerFactory)) {
@@ -602,6 +603,9 @@ else if (className.endsWith(PACKAGE_INFO_SUFFIX)) {
 								className.substring(0, className.length() - PACKAGE_INFO_SUFFIX.length()));
 					}
 				}
+				catch (FileNotFoundException ex) {
+					// Ignore non-readable resource
+				}
 			}
 		}
 		catch (IOException ex) {

From e4934a90ebf22adfde31a8e44b32d88cae5ed7c1 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 12 Oct 2021 15:17:18 +0200
Subject: [PATCH 226/735] Use TriggerContext's Clock instead of new Date()

Closes gh-27546
---
 .../org/springframework/scheduling/support/CronTrigger.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
index 3af71481c27d..6581cdd61fe0 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,11 +105,11 @@ public Date nextExecutionTime(TriggerContext triggerContext) {
 			}
 		}
 		else {
-			date = new Date();
+			date = new Date(triggerContext.getClock().millis());
 		}
 		ZonedDateTime dateTime = ZonedDateTime.ofInstant(date.toInstant(), this.zoneId);
 		ZonedDateTime next = this.expression.next(dateTime);
-		return next != null ? Date.from(next.toInstant()) : null;
+		return (next != null ? Date.from(next.toInstant()) : null);
 	}
 
 

From eda3ca5fbc3520f22cecd726e211dca053a8cb99 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 12 Oct 2021 15:17:44 +0200
Subject: [PATCH 227/735] Remove unnecessary final declarations at method level

---
 .../beans/factory/xml/ParserContext.java             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java
index 2223f789ae1c..4bd6ef58e966 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,24 +64,24 @@ public ParserContext(XmlReaderContext readerContext, BeanDefinitionParserDelegat
 	}
 
 
-	public final XmlReaderContext getReaderContext() {
+	public XmlReaderContext getReaderContext() {
 		return this.readerContext;
 	}
 
-	public final BeanDefinitionRegistry getRegistry() {
+	public BeanDefinitionRegistry getRegistry() {
 		return this.readerContext.getRegistry();
 	}
 
-	public final BeanDefinitionParserDelegate getDelegate() {
+	public BeanDefinitionParserDelegate getDelegate() {
 		return this.delegate;
 	}
 
 	@Nullable
-	public final BeanDefinition getContainingBeanDefinition() {
+	public BeanDefinition getContainingBeanDefinition() {
 		return this.containingBeanDefinition;
 	}
 
-	public final boolean isNested() {
+	public boolean isNested() {
 		return (this.containingBeanDefinition != null);
 	}
 

From 800922266ab46c20cadd41dabfd3a4bce97ee3e0 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 12 Oct 2021 16:23:10 +0100
Subject: [PATCH 228/735] Upgrade to Reactor 2021.0.12

Closes gh-27527
---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3c5f9af16f2c..015d5c019801 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.68.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.12-SNAPSHOT"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.12"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
@@ -292,7 +292,6 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
-			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From 8820c893e64ffe83b2ba90f5e820c291507517a6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 12 Oct 2021 17:23:47 +0200
Subject: [PATCH 229/735] Add note about Groovy Tools not working in Eclipse
 2021-09 with Java 17

Closes gh-27407
---
 import-into-eclipse.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/import-into-eclipse.md b/import-into-eclipse.md
index 1ab36c1fcfd3..d2a8b154bbd5 100644
--- a/import-into-eclipse.md
+++ b/import-into-eclipse.md
@@ -21,6 +21,7 @@ from the Eclipse Marketplace.
 _When instructed to execute `./gradlew` from the command line, be sure to execute it within your locally cloned `spring-framework` working directory._
 
 1. Install the [Groovy Development Tools](https://marketplace.eclipse.org/content/groovy-development-tools).
+   - **NOTE**: As of October 12, 2021, the Groovy Development Tools do not work in Eclipse 2021-09 (4.21). See [Groovy Eclipse #1303](https://github.com/groovy/groovy-eclipse/issues/1303) for details.
 1. Switch to Groovy 3.0 in Eclipse (Preferences &#8594; Groovy &#8594; Compiler &#8594; Switch to 3.0...).
    - If you encounter build errors stating something similar to _"Groovy: compiler mismatch: project level is 2.5, workspace level is 3.0"_, change the Groovy compiler version to 3.0 for each affected project.
 1. Ensure that the _Forbidden reference (access rule)_ in Eclipse is set to `Info`

From 2cbba0923b17af2e29e7a8e99fa737279d11e832 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 13 Oct 2021 12:38:06 +0200
Subject: [PATCH 230/735] Upgrade to Netty 4.1.69, Jetty 9.4.44, Kotlin 1.5.31

---
 build.gradle | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 015d5c019801..8ff65cc6f42b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,17 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
-	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
+	id "io.freefair.aspectj" version '6.2.0' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
-	id 'de.undercouch.download' version '4.1.2'
-	id "io.freefair.aspectj" version '6.2.0' apply false
+	id "org.unbroken-dome.xjc" version '2.0.0' apply false
 	id "com.github.ben-manes.versions" version '0.39.0'
 	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
+	id 'de.undercouch.download' version '4.1.2'
 	id "me.champeau.jmh" version "0.6.6" apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false
-	id "org.unbroken-dome.xjc" version '2.0.0' apply false
 }
 
 ext {
@@ -28,12 +28,12 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
-			mavenBom "io.netty:netty-bom:4.1.68.Final"
+			mavenBom "io.netty:netty-bom:4.1.69.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.12"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
 			mavenBom "org.junit:junit-bom:5.8.1"

From 0f36569d75b814a43b081d5a8036534fc1090d62 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 13 Oct 2021 12:38:39 +0200
Subject: [PATCH 231/735] Remove dead fallback code

---
 .../config/FreeMarkerConfigurerBeanDefinitionParser.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerConfigurerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerConfigurerBeanDefinitionParser.java
index 30b3716999bb..7524e63a63b9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerConfigurerBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerConfigurerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,9 +61,6 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
 			for (Element childElement : childElements) {
 				locations.add(childElement.getAttribute("location"));
 			}
-			if (locations.isEmpty()) {
-				locations.add("/WEB-INF/");
-			}
 			builder.addPropertyValue("templateLoaderPaths", StringUtils.toStringArray(locations));
 		}
 	}

From b1c7f7d12732d820b144781c919351d933995424 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 13 Oct 2021 12:48:47 +0200
Subject: [PATCH 232/735] Polishing

---
 .../pattern/CaptureTheRestPathElement.java    | 19 +++++------
 .../pattern/CaptureVariablePathElement.java   | 27 ++++++++--------
 .../web/util/pattern/LiteralPathElement.java  |  9 +++---
 .../web/util/pattern/PathPattern.java         | 12 +++----
 .../util/pattern/PatternParseException.java   | 14 ++++----
 .../web/util/pattern/RegexPathElement.java    | 32 +++++++++----------
 .../util/pattern/SeparatorPathElement.java    | 11 ++++---
 .../SingleCharWildcardedPathElement.java      | 12 +++----
 .../web/util/pattern/WildcardPathElement.java | 11 ++++---
 .../pattern/WildcardTheRestPathElement.java   | 11 ++++---
 10 files changed, 82 insertions(+), 76 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java
index 4cf59596397b..3ee4ff2ebac0 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureTheRestPathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,17 +83,17 @@ public boolean matches(int pathIndex, MatchingContext matchingContext) {
 	}
 
 	private String pathToString(int fromSegment, List<Element> pathElements) {
-		StringBuilder buf = new StringBuilder();
+		StringBuilder sb = new StringBuilder();
 		for (int i = fromSegment, max = pathElements.size(); i < max; i++) {
 			Element element = pathElements.get(i);
 			if (element instanceof PathSegment) {
-				buf.append(((PathSegment)element).valueToMatch());
+				sb.append(((PathSegment)element).valueToMatch());
 			}
 			else {
-				buf.append(element.value());
+				sb.append(element.value());
 			}
 		}
-		return buf.toString();
+		return sb.toString();
 	}
 
 	@Override
@@ -101,6 +101,11 @@ public int getNormalizedLength() {
 		return 1;
 	}
 
+	@Override
+	public char[] getChars() {
+		return ("/{*" + this.variableName + "}").toCharArray();
+	}
+
 	@Override
 	public int getWildcardCount() {
 		return 0;
@@ -117,8 +122,4 @@ public String toString() {
 		return "CaptureTheRest(/{*" + this.variableName + "})";
 	}
 
-	@Override
-	public char[] getChars() {
-		return ("/{*"+this.variableName+"}").toCharArray();
-	}
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
index 0e7b812323c9..856c35af986d 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
@@ -35,7 +35,7 @@ class CaptureVariablePathElement extends PathElement {
 	private final String variableName;
 
 	@Nullable
-	private Pattern constraintPattern;
+	private final Pattern constraintPattern;
 
 
 	/**
@@ -55,6 +55,7 @@ class CaptureVariablePathElement extends PathElement {
 		if (colon == -1) {
 			// no constraint
 			this.variableName = new String(captureDescriptor, 1, captureDescriptor.length - 2);
+			this.constraintPattern = null;
 		}
 		else {
 			this.variableName = new String(captureDescriptor, 1, colon - 1);
@@ -134,6 +135,18 @@ public int getNormalizedLength() {
 		return 1;
 	}
 
+	@Override
+	public char[] getChars() {
+		StringBuilder sb = new StringBuilder();
+		sb.append('{');
+		sb.append(this.variableName);
+		if (this.constraintPattern != null) {
+			sb.append(':').append(this.constraintPattern.pattern());
+		}
+		sb.append('}');
+		return sb.toString().toCharArray();
+	}
+
 	@Override
 	public int getWildcardCount() {
 		return 0;
@@ -156,16 +169,4 @@ public String toString() {
 				(this.constraintPattern != null ? ":" + this.constraintPattern.pattern() : "") + "})";
 	}
 
-	@Override
-	public char[] getChars() {
-		StringBuilder b = new StringBuilder();
-		b.append('{');
-		b.append(this.variableName);
-		if (this.constraintPattern != null) {
-			b.append(':').append(this.constraintPattern.pattern());
-		}
-		b.append('}');
-		return b.toString().toCharArray();
-	}
-
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java
index 224d5d721708..70160199f726 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,14 +26,15 @@
  * literal path elements 'foo', 'bar' and 'goo'.
  *
  * @author Andy Clement
+ * @since 5.0
  */
 class LiteralPathElement extends PathElement {
 
-	private char[] text;
+	private final char[] text;
 
-	private int len;
+	private final int len;
 
-	private boolean caseSensitive;
+	private final boolean caseSensitive;
 
 
 	public LiteralPathElement(int pos, char[] literalText, boolean caseSensitive, char separator) {
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
index 777b83720e30..ba87fd6b6f75 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
@@ -336,18 +336,18 @@ public PathContainer extractPathWithinPattern(PathContainer path) {
 		PathContainer resultPath = null;
 		if (multipleAdjacentSeparators) {
 			// Need to rebuild the path without the duplicate adjacent separators
-			StringBuilder buf = new StringBuilder();
+			StringBuilder sb = new StringBuilder();
 			int i = startIndex;
 			while (i < endIndex) {
 				Element e = pathElements.get(i++);
-				buf.append(e.value());
+				sb.append(e.value());
 				if (e instanceof Separator) {
 					while (i < endIndex && (pathElements.get(i) instanceof Separator)) {
 						i++;
 					}
 				}
 			}
-			resultPath = PathContainer.parsePath(buf.toString(), this.pathOptions);
+			resultPath = PathContainer.parsePath(sb.toString(), this.pathOptions);
 		}
 		else if (startIndex >= endIndex) {
 			resultPath = PathContainer.parsePath("");
@@ -491,13 +491,13 @@ String toChainString() {
 	 * @return the string form of the pattern
 	 */
 	String computePatternString() {
-		StringBuilder buf = new StringBuilder();
+		StringBuilder sb = new StringBuilder();
 		PathElement pe = this.head;
 		while (pe != null) {
-			buf.append(pe.getChars());
+			sb.append(pe.getChars());
 			pe = pe.next;
 		}
-		return buf.toString();
+		return sb.toString();
 	}
 
 	@Nullable
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java
index 824357596375..1e49751da82c 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PatternParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,14 +66,14 @@ public String getMessage() {
 	 * with a pointer to the error position, as well as the error message.
 	 */
 	public String toDetailedString() {
-		StringBuilder buf = new StringBuilder();
-		buf.append(this.pattern).append('\n');
+		StringBuilder sb = new StringBuilder();
+		sb.append(this.pattern).append('\n');
 		for (int i = 0; i < this.position; i++) {
-			buf.append(' ');
+			sb.append(' ');
 		}
-		buf.append("^\n");
-		buf.append(getMessage());
-		return buf.toString();
+		sb.append("^\n");
+		sb.append(getMessage());
+		return sb.toString();
 	}
 
 	public int getPosition() {
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
index cdbad924bb4f..c5cd8f588ff2 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
@@ -136,20 +136,19 @@ public boolean matches(int pathIndex, MatchingContext matchingContext) {
 		if (matches) {
 			if (isNoMorePattern()) {
 				if (matchingContext.determineRemainingPath &&
-					(this.variableNames.isEmpty() || textToMatch.length() > 0)) {
+						(this.variableNames.isEmpty() || textToMatch.length() > 0)) {
 					matchingContext.remainingPathIndex = pathIndex + 1;
 					matches = true;
 				}
 				else {
 					// No more pattern, is there more data?
 					// If pattern is capturing variables there must be some actual data to bind to them
-					matches = (pathIndex + 1) >= matchingContext.pathLength
-							&& (this.variableNames.isEmpty() || textToMatch.length() > 0);
+					matches = (pathIndex + 1 >= matchingContext.pathLength) &&
+							(this.variableNames.isEmpty() || textToMatch.length() > 0);
 					if (!matches && matchingContext.isMatchOptionalTrailingSeparator()) {
-						matches = (this.variableNames.isEmpty()
-								|| textToMatch.length() > 0)
-								&& (pathIndex + 2) >= matchingContext.pathLength
-								&& matchingContext.isSeparator(pathIndex + 1);
+						matches = (this.variableNames.isEmpty() || textToMatch.length() > 0) &&
+								(pathIndex + 2 >= matchingContext.pathLength) &&
+								matchingContext.isSeparator(pathIndex + 1);
 					}
 				}
 			}
@@ -160,11 +159,11 @@ public boolean matches(int pathIndex, MatchingContext matchingContext) {
 
 		if (matches && matchingContext.extractingVariables) {
 			// Process captures
-			if (this.variableNames.size() != matcher.groupCount()) { // SPR-8455
-				throw new IllegalArgumentException("The number of capturing groups in the pattern segment "
-						+ this.pattern + " does not match the number of URI template variables it defines, "
-						+ "which can occur if capturing groups are used in a URI template regex. "
-						+ "Use non-capturing groups instead.");
+			if (this.variableNames.size() != matcher.groupCount()) {  // SPR-8455
+				throw new IllegalArgumentException("The number of capturing groups in the pattern segment " +
+						this.pattern + " does not match the number of URI template variables it defines, " +
+						"which can occur if capturing groups are used in a URI template regex. " +
+						"Use non-capturing groups instead.");
 			}
 			for (int i = 1; i <= matcher.groupCount(); i++) {
 				String name = this.variableNames.get(i - 1);
@@ -187,6 +186,11 @@ public int getNormalizedLength() {
 		return (this.regex.length - varsLength - this.variableNames.size());
 	}
 
+	@Override
+	public char[] getChars() {
+		return this.regex;
+	}
+
 	@Override
 	public int getCaptureCount() {
 		return this.variableNames.size();
@@ -208,8 +212,4 @@ public String toString() {
 		return "Regex(" + String.valueOf(this.regex) + ")";
 	}
 
-	@Override
-	public char[] getChars() {
-		return this.regex;
-	}
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java
index 19cbd3d319e3..b140e88b44e3 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,13 +63,14 @@ public int getNormalizedLength() {
 	}
 
 	@Override
-	public String toString() {
-		return "Separator(" + this.separator + ")";
+	public char[] getChars() {
+		return new char[] {this.separator};
 	}
 
+
 	@Override
-	public char[] getChars() {
-		return new char[] {this.separator};
+	public String toString() {
+		return "Separator(" + this.separator + ")";
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java
index 7aa748af6f47..d249cf7d78b3 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -124,15 +124,15 @@ public int getNormalizedLength() {
 		return this.len;
 	}
 
-
 	@Override
-	public String toString() {
-		return "SingleCharWildcarded(" + String.valueOf(this.text) + ")";
+	public char[] getChars() {
+		return this.text;
 	}
 
+
 	@Override
-	public char[] getChars() {
-		return this.text;
+	public String toString() {
+		return "SingleCharWildcarded(" + String.valueOf(this.text) + ")";
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
index 1f4f0b3e87a1..5413dedc7957 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,6 +86,11 @@ public int getNormalizedLength() {
 		return 1;
 	}
 
+	@Override
+	public char[] getChars() {
+		return new char[] {'*'};
+	}
+
 	@Override
 	public int getWildcardCount() {
 		return 1;
@@ -102,8 +107,4 @@ public String toString() {
 		return "Wildcard(*)";
 	}
 
-	@Override
-	public char[] getChars() {
-		return new char[] {'*'};
-	}
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java
index 25a72d58831c..e3b83634dc42 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardTheRestPathElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,11 @@ public int getNormalizedLength() {
 		return 1;
 	}
 
+	@Override
+	public char[] getChars() {
+		return (this.separator + "**").toCharArray();
+	}
+
 	@Override
 	public int getWildcardCount() {
 		return 1;
@@ -58,8 +63,4 @@ public String toString() {
 		return "WildcardTheRest(" + this.separator + "**)";
 	}
 
-	@Override
-	public char[] getChars() {
-		return (this.separator+"**").toCharArray();
-	}
 }

From daf10d6c459ea547f2a66d0e770e9e20fbad35d6 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Wed, 13 Oct 2021 14:00:29 +0200
Subject: [PATCH 233/735] Include correct keyword in CookieAssertions failure
 messages

Closes gh-27550
---
 .../test/web/reactive/server/CookieAssertions.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
index 0745ef7d7fd1..26b28b486a41 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
@@ -188,7 +188,7 @@ public WebTestClient.ResponseSpec secure(String name, boolean expected) {
 	public WebTestClient.ResponseSpec httpOnly(String name, boolean expected) {
 		boolean isHttpOnly = getCookie(name).isHttpOnly();
 		this.exchangeResult.assertWithDiagnostics(() -> {
-			String message = getMessage(name) + " secure";
+			String message = getMessage(name) + " httpOnly";
 			AssertionErrors.assertEquals(message, expected, isHttpOnly);
 		});
 		return this.responseSpec;
@@ -200,7 +200,7 @@ public WebTestClient.ResponseSpec httpOnly(String name, boolean expected) {
 	public WebTestClient.ResponseSpec sameSite(String name, String expected) {
 		String sameSite = getCookie(name).getSameSite();
 		this.exchangeResult.assertWithDiagnostics(() -> {
-			String message = getMessage(name) + " secure";
+			String message = getMessage(name) + " sameSite";
 			AssertionErrors.assertEquals(message, expected, sameSite);
 		});
 		return this.responseSpec;

From 50b92118a966af79718dcf7b14d541b4dc13bf73 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Wed, 13 Oct 2021 14:00:29 +0200
Subject: [PATCH 234/735] Include correct keyword in CookieAssertions failure
 messages

Closes gh-27550
---
 .../test/web/reactive/server/CookieAssertions.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
index 0745ef7d7fd1..26b28b486a41 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
@@ -188,7 +188,7 @@ public WebTestClient.ResponseSpec secure(String name, boolean expected) {
 	public WebTestClient.ResponseSpec httpOnly(String name, boolean expected) {
 		boolean isHttpOnly = getCookie(name).isHttpOnly();
 		this.exchangeResult.assertWithDiagnostics(() -> {
-			String message = getMessage(name) + " secure";
+			String message = getMessage(name) + " httpOnly";
 			AssertionErrors.assertEquals(message, expected, isHttpOnly);
 		});
 		return this.responseSpec;
@@ -200,7 +200,7 @@ public WebTestClient.ResponseSpec httpOnly(String name, boolean expected) {
 	public WebTestClient.ResponseSpec sameSite(String name, String expected) {
 		String sameSite = getCookie(name).getSameSite();
 		this.exchangeResult.assertWithDiagnostics(() -> {
-			String message = getMessage(name) + " secure";
+			String message = getMessage(name) + " sameSite";
 			AssertionErrors.assertEquals(message, expected, sameSite);
 		});
 		return this.responseSpec;

From 1e3996ea78f8540217037ebad8899ee9b6c9cab9 Mon Sep 17 00:00:00 2001
From: Hantsy Bai <hantsy@gmail.com>
Date: Wed, 13 Oct 2021 21:27:02 +0800
Subject: [PATCH 235/735] Upgrade SmallRye Mutiny to 1.1.1

Closes gh-27555
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8ff65cc6f42b..e5aa6b6b7d1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
-			dependency "io.smallrye.reactive:mutiny:1.0.0"
+			dependency "io.smallrye.reactive:mutiny:1.1.1"
 			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"

From 0436dd04bff89670a0e307e7183220b04f97878a Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 13 Oct 2021 13:03:09 +0100
Subject: [PATCH 236/735] Correctly handle coroutine with ResponseEntity

ResponseEntityResultHandler nests correctly, only once for the ResponseEntity,
when there is a Mono adapted from a Kotlin Continuation.

Closes gh-27292
---
 .../AbstractMessageWriterResultHandler.java   |  2 +-
 .../ResponseEntityResultHandler.java          |  8 ++++--
 .../annotation/CoroutinesIntegrationTests.kt  | 27 ++++++++++++++++---
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
index cbdd2f851fce..45e1e17974c3 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
@@ -52,7 +52,7 @@
  */
 public abstract class AbstractMessageWriterResultHandler extends HandlerResultHandlerSupport {
 
-	private static final String COROUTINES_FLOW_CLASS_NAME = "kotlinx.coroutines.flow.Flow";
+	protected static final String COROUTINES_FLOW_CLASS_NAME = "kotlinx.coroutines.flow.Flow";
 
 	private final List<HttpMessageWriter<?>> messageWriters;
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
index 3ad66a9bfce0..26b59a4bd4b7 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import reactor.core.publisher.Mono;
 
+import org.springframework.core.KotlinDetector;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ReactiveAdapter;
 import org.springframework.core.ReactiveAdapterRegistry;
@@ -108,6 +109,7 @@ private boolean isSupportedType(@Nullable Class<?> clazz) {
 
 
 	@Override
+	@SuppressWarnings("ConstantConditions")
 	public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result) {
 
 		Mono<?> returnValueMono;
@@ -118,7 +120,9 @@ public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result)
 		if (adapter != null) {
 			Assert.isTrue(!adapter.isMultiValue(), "Only a single ResponseEntity supported");
 			returnValueMono = Mono.from(adapter.toPublisher(result.getReturnValue()));
-			bodyParameter = actualParameter.nested().nested();
+			boolean isContinuation = (KotlinDetector.isSuspendingFunction(actualParameter.getMethod()) &&
+					!COROUTINES_FLOW_CLASS_NAME.equals(actualParameter.getParameterType().getName()));
+			bodyParameter = (isContinuation ? actualParameter.nested() : actualParameter.nested().nested());
 		}
 		else {
 			returnValueMono = Mono.justOrEmpty(result.getReturnValue());
diff --git a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt
index af2502c09f87..7a43168c7b35 100644
--- a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt
+++ b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,18 +22,20 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import org.assertj.core.api.Assertions.*
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
-import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer
+import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.client.HttpServerErrorException
 import org.springframework.web.reactive.config.EnableWebFlux
+import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer
 
 class CoroutinesIntegrationTests : AbstractRequestMappingIntegrationTests() {
 
@@ -63,6 +65,15 @@ class CoroutinesIntegrationTests : AbstractRequestMappingIntegrationTests() {
 		assertThat(entity.body).isEqualTo("foo")
 	}
 
+	@ParameterizedHttpServerTest  // gh-27292
+	fun `Suspending ResponseEntity handler method`(httpServer: HttpServer) {
+		startServer(httpServer)
+
+		val entity = performGet<String>("/suspend-response-entity", HttpHeaders.EMPTY, String::class.java)
+		assertThat(entity.statusCode).isEqualTo(HttpStatus.OK)
+		assertThat(entity.body).isEqualTo("{\"value\":\"foo\"}")
+	}
+
 	@ParameterizedHttpServerTest
 	fun `Handler method returning Flow`(httpServer: HttpServer) {
 		startServer(httpServer)
@@ -119,6 +130,12 @@ class CoroutinesIntegrationTests : AbstractRequestMappingIntegrationTests() {
 			"foo"
 		}
 
+		@GetMapping("/suspend-response-entity")
+		suspend fun suspendingResponseEntityEndpoint(): ResponseEntity<FooContainer<String>> {
+			delay(1)
+			return ResponseEntity.ok(FooContainer("foo"))
+		}
+
 		@GetMapping("/flow")
 		fun flowEndpoint()= flow {
 			emit("foo")
@@ -151,4 +168,8 @@ class CoroutinesIntegrationTests : AbstractRequestMappingIntegrationTests() {
 		}
 
 	}
+
+
+	class FooContainer<T>(val value: T)
+
 }

From 4dac8339ffb4705554458bf2c32d81fc16b61f43 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 13 Oct 2021 14:37:03 +0100
Subject: [PATCH 237/735] Filter non-existing static resource locations

Same as a2c52a97babdb927d809ad55c696c42d160d4fff, on the WebFlux side.

See gh-27538
---
 .../reactive/resource/ResourceWebHandler.java | 52 +++++++++++--------
 .../resource/ResourceWebHandlerTests.java     | 17 ++++++
 .../resource/ResourceHttpRequestHandler.java  |  4 ++
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index be4edf688ce2..2361d1532895 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,7 +96,9 @@ public class ResourceWebHandler implements WebHandler, InitializingBean {
 
 	private final List<String> locationValues = new ArrayList<>(4);
 
-	private final List<Resource> locations = new ArrayList<>(4);
+	private final List<Resource> locationResources = new ArrayList<>(4);
+
+	private final List<Resource> locationsToUse = new ArrayList<>(4);
 
 	private final List<ResourceResolver> resourceResolvers = new ArrayList<>(4);
 
@@ -147,9 +149,9 @@ public List<String> getLocationValues() {
 	 * for serving static resources.
 	 */
 	public void setLocations(@Nullable List<Resource> locations) {
-		this.locations.clear();
+		this.locationResources.clear();
 		if (locations != null) {
-			this.locations.addAll(locations);
+			this.locationResources.addAll(locations);
 		}
 	}
 
@@ -159,11 +161,18 @@ public void setLocations(@Nullable List<Resource> locations) {
 	 * <p>Note that if {@link #setLocationValues(List) locationValues} are provided,
 	 * instead of loaded Resource-based locations, this method will return
 	 * empty until after initialization via {@link #afterPropertiesSet()}.
+	 * <p><strong>Note:</strong> As of 5.3.11 the list of locations is filtered
+	 * to exclude those that don't actually exist and therefore the list returned
+	 * from this method may be a subset of all given locations.
 	 * @see #setLocationValues
 	 * @see #setLocations
 	 */
 	public List<Resource> getLocations() {
-		return this.locations;
+		if (this.locationsToUse.isEmpty()) {
+			// Possibly not yet initialized, return only what we have so far
+			return this.locationResources;
+		}
+		return this.locationsToUse;
 	}
 
 	/**
@@ -295,7 +304,7 @@ public void setUseLastModified(boolean useLastModified) {
 	public void afterPropertiesSet() throws Exception {
 		resolveResourceLocations();
 
-		if (logger.isWarnEnabled() && CollectionUtils.isEmpty(this.locations)) {
+		if (logger.isWarnEnabled() && CollectionUtils.isEmpty(getLocations())) {
 			logger.warn("Locations list is empty. No resources will be served unless a " +
 					"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
 		}
@@ -316,21 +325,22 @@ public void afterPropertiesSet() throws Exception {
 	}
 
 	private void resolveResourceLocations() {
-		if (CollectionUtils.isEmpty(this.locationValues)) {
-			return;
-		}
-		else if (!CollectionUtils.isEmpty(this.locations)) {
-			throw new IllegalArgumentException("Please set either Resource-based \"locations\" or " +
-					"String-based \"locationValues\", but not both.");
+		List<Resource> result = new ArrayList<>(this.locationResources);
+
+		if (!this.locationValues.isEmpty()) {
+			Assert.notNull(this.resourceLoader,
+					"ResourceLoader is required when \"locationValues\" are configured.");
+			Assert.isTrue(CollectionUtils.isEmpty(this.locationResources), "Please set " +
+					"either Resource-based \"locations\" or String-based \"locationValues\", but not both.");
+			for (String location : this.locationValues) {
+				result.add(this.resourceLoader.getResource(location));
+			}
 		}
 
-		Assert.notNull(this.resourceLoader,
-				"ResourceLoader is required when \"locationValues\" are configured.");
+		result = result.stream().filter(Resource::exists).collect(Collectors.toList());
 
-		for (String location : this.locationValues) {
-			Resource resource = this.resourceLoader.getResource(location);
-			this.locations.add(resource);
-		}
+		this.locationsToUse.clear();
+		this.locationsToUse.addAll(result);
 	}
 
 	/**
@@ -339,7 +349,7 @@ else if (!CollectionUtils.isEmpty(this.locations)) {
 	 * match the {@link #setLocations locations} configured on this class.
 	 */
 	protected void initAllowedLocations() {
-		if (CollectionUtils.isEmpty(this.locations)) {
+		if (CollectionUtils.isEmpty(getLocations())) {
 			if (logger.isInfoEnabled()) {
 				logger.info("Locations list is empty. No resources will be served unless a " +
 						"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
@@ -618,8 +628,8 @@ private Object formatLocations() {
 		if (!this.locationValues.isEmpty()) {
 			return this.locationValues.stream().collect(Collectors.joining("\", \"", "[\"", "\"]"));
 		}
-		else if (!this.locations.isEmpty()) {
-			return "[" + this.locations.toString()
+		if (!getLocations().isEmpty()) {
+			return "[" + getLocations().toString()
 					.replaceAll("class path resource", "Classpath")
 					.replaceAll("ServletContext resource", "ServletContext") + "]";
 		}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
index 691afde68ee3..b668172197d6 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
@@ -253,6 +253,23 @@ public void getResourceFromFileSystem() throws Exception {
 		assertResponseBody(exchange, "h1 { color:red; }");
 	}
 
+	@Test  // gh-27538
+	public void filterNonExistingLocations() throws Exception {
+		List<Resource> inputLocations = Arrays.asList(
+				new ClassPathResource("test/", getClass()),
+				new ClassPathResource("testalternatepath/", getClass()),
+				new ClassPathResource("nosuchpath/", getClass()));
+
+		ResourceWebHandler handler = new ResourceWebHandler();
+		handler.setLocations(inputLocations);
+		handler.afterPropertiesSet();
+
+		List<Resource> actual = handler.getLocations();
+		assertThat(actual).hasSize(2);
+		assertThat(actual.get(0).getURL().toString()).endsWith("test/");
+		assertThat(actual.get(1).getURL().toString()).endsWith("testalternatepath/");
+	}
+
 	@Test // SPR-14577
 	public void getMediaTypeWithFavorPathExtensionOff() throws Exception {
 		List<Resource> paths = Collections.singletonList(new ClassPathResource("test/", getClass()));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 0831a2a2f29b..6e556e9af5fa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -189,6 +189,9 @@ public void setLocations(List<Resource> locations) {
 	 * locations provided via {@link #setLocations(List) setLocations}.
 	 * <p>Note that the returned list is fully initialized only after
 	 * initialization via {@link #afterPropertiesSet()}.
+	 * <p><strong>Note:</strong> As of 5.3.11 the list of locations is filtered
+	 * to exclude those that don't actually exist and therefore the list returned
+	 * from this method may be a subset of all given locations.
 	 * @see #setLocationValues
 	 * @see #setLocations
 	 */
@@ -467,6 +470,7 @@ private void resolveResourceLocations() {
 		result.addAll(this.locationResources);
 		result = result.stream().filter(Resource::exists).collect(Collectors.toList());
 
+		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
 	}
 

From 89c7797ffbe2f50c4087a9ada1ebf2fbd10462d9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 13 Oct 2021 19:09:53 +0200
Subject: [PATCH 238/735] Commit in DatabasePopulatorUtils if Connection has
 auto-commit=false

Prior to this commit, DatabasePopulatorUtils.execute(...) did not
perform a commit for the current Connection. This works for most use
cases; however, when DatabasePopulatorUtils is used to execute
initialization scripts without a managed transaction -- for example,
via a DataSourceInitializer configured as a bean in the
ApplicationContext or via Spring Boot configuration in
application.properties -- if the underlying database is configured with
auto-commit=false, the results of executing the SQL scripts are not
committed to the database which can lead to data being silently lost.

This commit addresses this issue by committing the Connection for the
supplied DataSource if the connection is not configured for auto-commit
and is not transactional. Existing use cases running with a managed
transaction should therefore not be affected by this change.

Closes gh-27008
---
 .../jdbc/datasource/DataSourceUtils.java      |   6 +-
 .../init/DatabasePopulatorUtils.java          |  10 +-
 ...tDisabledH2EmbeddedDatabaseConfigurer.java |  51 ++++++++
 .../H2DatabasePopulatorIntegrationTests.java  |  54 ---------
 .../init/H2DatabasePopulatorTests.java        | 111 ++++++++++++++++++
 .../init/HsqlDatabasePopulatorTests.java      |   4 +-
 6 files changed, 177 insertions(+), 59 deletions(-)
 create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/AutoCommitDisabledH2EmbeddedDatabaseConfigurer.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorIntegrationTests.java
 create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorTests.java

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
index 67c8338394db..ae708030bcc1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,8 @@ public abstract class DataSourceUtils {
 	 * @return a JDBC Connection from the given DataSource
 	 * @throws org.springframework.jdbc.CannotGetJdbcConnectionException
 	 * if the attempt to get a Connection failed
-	 * @see #releaseConnection
+	 * @see #releaseConnection(Connection, DataSource)
+	 * @see #isConnectionTransactional(Connection, DataSource)
 	 */
 	public static Connection getConnection(DataSource dataSource) throws CannotGetJdbcConnectionException {
 		try {
@@ -298,6 +299,7 @@ public static void resetConnectionAfterTransaction(Connection con, @Nullable Int
 	 * @param dataSource the DataSource that the Connection was obtained from
 	 * (may be {@code null})
 	 * @return whether the Connection is transactional
+	 * @see #getConnection(DataSource)
 	 */
 	public static boolean isConnectionTransactional(Connection con, @Nullable DataSource dataSource) {
 		if (dataSource == null) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java
index 3861cb5e54b2..f3f0d5780f92 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,9 +36,14 @@ public abstract class DatabasePopulatorUtils {
 
 	/**
 	 * Execute the given {@link DatabasePopulator} against the given {@link DataSource}.
+	 * <p>As of Spring Framework 5.3.11, the {@link Connection} for the supplied
+	 * {@code DataSource} will be {@linkplain Connection#commit() committed} if
+	 * it is not configured for {@link Connection#getAutoCommit() auto-commit} and
+	 * is not {@linkplain DataSourceUtils#isConnectionTransactional transactional}.
 	 * @param populator the {@code DatabasePopulator} to execute
 	 * @param dataSource the {@code DataSource} to execute against
 	 * @throws DataAccessException if an error occurs, specifically a {@link ScriptException}
+	 * @see DataSourceUtils#isConnectionTransactional(Connection, DataSource)
 	 */
 	public static void execute(DatabasePopulator populator, DataSource dataSource) throws DataAccessException {
 		Assert.notNull(populator, "DatabasePopulator must not be null");
@@ -47,6 +52,9 @@ public static void execute(DatabasePopulator populator, DataSource dataSource) t
 			Connection connection = DataSourceUtils.getConnection(dataSource);
 			try {
 				populator.populate(connection);
+				if (!connection.getAutoCommit() && !DataSourceUtils.isConnectionTransactional(connection, dataSource)) {
+					connection.commit();
+				}
 			}
 			finally {
 				DataSourceUtils.releaseConnection(connection, dataSource);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/AutoCommitDisabledH2EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/AutoCommitDisabledH2EmbeddedDatabaseConfigurer.java
new file mode 100644
index 000000000000..723d6d915c4e
--- /dev/null
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/AutoCommitDisabledH2EmbeddedDatabaseConfigurer.java
@@ -0,0 +1,51 @@
+/*
+ * 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.jdbc.datasource.embedded;
+
+import java.sql.Driver;
+
+import org.springframework.util.ClassUtils;
+
+/**
+ * {@link EmbeddedDatabaseConfigurer} for an H2 embedded database instance
+ * with auto-commit disabled.
+ *
+ * @author Sam Brannen
+ * @since 5.3.11
+ */
+public class AutoCommitDisabledH2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer {
+
+	private final Class<? extends Driver> driverClass;
+
+
+	@SuppressWarnings("unchecked")
+	public AutoCommitDisabledH2EmbeddedDatabaseConfigurer() throws Exception {
+		this.driverClass = (Class<? extends Driver>) ClassUtils.forName("org.h2.Driver",
+			AutoCommitDisabledH2EmbeddedDatabaseConfigurer.class.getClassLoader());
+	}
+
+	@Override
+	public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
+		String url = String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false;AUTOCOMMIT=false", databaseName);
+
+		properties.setDriverClass(this.driverClass);
+		properties.setUrl(url);
+		properties.setUsername("sa");
+		properties.setPassword("");
+	}
+
+}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorIntegrationTests.java
deleted file mode 100644
index 37ea29bbf85c..000000000000
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorIntegrationTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- * 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.jdbc.datasource.init;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Sam Brannen
- * @since 4.0.3
- */
-class H2DatabasePopulatorIntegrationTests extends AbstractDatabasePopulatorTests {
-
-	@Override
-	protected EmbeddedDatabaseType getEmbeddedDatabaseType() {
-		return EmbeddedDatabaseType.H2;
-	}
-
-	/**
-	 * https://jira.spring.io/browse/SPR-15896
-	 *
-	 * @since 5.0
-	 */
-	@Test
-	void scriptWithH2Alias() throws Exception {
-		databasePopulator.addScript(usersSchema());
-		databasePopulator.addScript(resource("db-test-data-h2-alias.sql"));
-		// Set statement separator to double newline so that ";" is not
-		// considered a statement separator within the source code of the
-		// aliased function 'REVERSE'.
-		databasePopulator.setSeparator("\n\n");
-		DatabasePopulatorUtils.execute(databasePopulator, db);
-		String sql = "select REVERSE(first_name) from users where last_name='Brannen'";
-		assertThat(jdbcTemplate.queryForObject(sql, String.class)).isEqualTo("maS");
-	}
-
-}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorTests.java
new file mode 100644
index 000000000000..6a67619bc893
--- /dev/null
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorTests.java
@@ -0,0 +1,111 @@
+/*
+ * 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.jdbc.datasource.init;
+
+import java.sql.Connection;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceUtils;
+import org.springframework.jdbc.datasource.embedded.AutoCommitDisabledH2EmbeddedDatabaseConfigurer;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseFactory;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Sam Brannen
+ * @since 4.0.3
+ */
+class H2DatabasePopulatorTests extends AbstractDatabasePopulatorTests {
+
+	@Override
+	protected EmbeddedDatabaseType getEmbeddedDatabaseType() {
+		return EmbeddedDatabaseType.H2;
+	}
+
+	/**
+	 * https://jira.spring.io/browse/SPR-15896
+	 *
+	 * @since 5.0
+	 */
+	@Test
+	void scriptWithH2Alias() throws Exception {
+		databasePopulator.addScript(usersSchema());
+		databasePopulator.addScript(resource("db-test-data-h2-alias.sql"));
+		// Set statement separator to double newline so that ";" is not
+		// considered a statement separator within the source code of the
+		// aliased function 'REVERSE'.
+		databasePopulator.setSeparator("\n\n");
+		DatabasePopulatorUtils.execute(databasePopulator, db);
+		String sql = "select REVERSE(first_name) from users where last_name='Brannen'";
+		assertThat(jdbcTemplate.queryForObject(sql, String.class)).isEqualTo("maS");
+	}
+
+	/**
+	 * https://github.com/spring-projects/spring-framework/issues/27008
+	 *
+	 * @since 5.3.11
+	 */
+	@Test
+	void automaticallyCommitsIfAutoCommitIsDisabled() throws Exception {
+		EmbeddedDatabase database = null;
+		try {
+			EmbeddedDatabaseFactory databaseFactory = new EmbeddedDatabaseFactory();
+			databaseFactory.setDatabaseConfigurer(new AutoCommitDisabledH2EmbeddedDatabaseConfigurer());
+			database = databaseFactory.getDatabase();
+
+			assertAutoCommitDisabledPreconditions(database);
+
+			// Set up schema
+			databasePopulator.setScripts(usersSchema());
+			DatabasePopulatorUtils.execute(databasePopulator, database);
+			assertThat(selectFirstNames(database)).isEmpty();
+
+			// Insert data
+			databasePopulator.setScripts(resource("users-data.sql"));
+			DatabasePopulatorUtils.execute(databasePopulator, database);
+			assertThat(selectFirstNames(database)).containsExactly("Sam");
+		}
+		finally {
+			if (database != null) {
+				database.shutdown();
+			}
+		}
+	}
+
+	/**
+	 * DatabasePopulatorUtils.execute() will obtain a new Connection, so we're
+	 * really just testing the configuration of the database here.
+	 */
+	private void assertAutoCommitDisabledPreconditions(DataSource dataSource) throws Exception {
+		Connection connection = DataSourceUtils.getConnection(dataSource);
+		assertThat(connection.getAutoCommit()).as("auto-commit").isFalse();
+		assertThat(DataSourceUtils.isConnectionTransactional(connection, dataSource)).as("transactional").isFalse();
+		connection.close();
+	}
+
+	private List<String> selectFirstNames(DataSource dataSource) {
+		return new JdbcTemplate(dataSource).queryForList("select first_name from users", String.class);
+	}
+
+}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java
index 0b43cd74a3cf..9135c2055856 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
  * @author Sam Brannen
  * @since 4.0.3
  */
-public class HsqlDatabasePopulatorTests extends AbstractDatabasePopulatorTests {
+class HsqlDatabasePopulatorTests extends AbstractDatabasePopulatorTests {
 
 	@Override
 	protected EmbeddedDatabaseType getEmbeddedDatabaseType() {

From fcf4315e020c9d76ed66e1a4fea4ee908fd563ec Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 13 Oct 2021 20:04:40 +0200
Subject: [PATCH 239/735] Indent with tabs instead of spaces

---
 gradle/docs-dokka.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
index ac2a56885154..dfe137d9cfe6 100644
--- a/gradle/docs-dokka.gradle
+++ b/gradle/docs-dokka.gradle
@@ -1,7 +1,7 @@
 tasks.findByName("dokkaHtmlPartial")?.configure {
-    outputDirectory.set(new File(buildDir, "docs/kdoc"))
-    dokkaSourceSets {
-        configureEach {
+	outputDirectory.set(new File(buildDir, "docs/kdoc"))
+	dokkaSourceSets {
+		configureEach {
 			sourceRoots.setFrom(file("src/main/kotlin"))
 			classpath.from(sourceSets["main"].runtimeClasspath)
 			externalDocumentationLink {
@@ -26,5 +26,5 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
 			}
 		}
-    }
+	}
 }

From 1ef47fa3691f8d43aacb0f6d626a92811931869c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 13 Oct 2021 20:41:49 +0200
Subject: [PATCH 240/735] Use instanceof pattern matching in select classes in
 spring-test

---
 .../test/util/AopTestUtils.java               | 10 ++++-----
 .../test/util/ExceptionCollector.java         |  8 +++----
 .../test/util/JsonPathExpectationsHelper.java | 22 +++++++++----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/util/AopTestUtils.java b/spring-test/src/main/java/org/springframework/test/util/AopTestUtils.java
index a9a7e41b0f3c..9080c252cb2f 100644
--- a/spring-test/src/main/java/org/springframework/test/util/AopTestUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/util/AopTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,8 @@ public abstract class AopTestUtils {
 	public static <T> T getTargetObject(Object candidate) {
 		Assert.notNull(candidate, "Candidate must not be null");
 		try {
-			if (AopUtils.isAopProxy(candidate) && candidate instanceof Advised) {
-				Object target = ((Advised) candidate).getTargetSource().getTarget();
+			if (AopUtils.isAopProxy(candidate) && candidate instanceof Advised advised) {
+				Object target = advised.getTargetSource().getTarget();
 				if (target != null) {
 					return (T) target;
 				}
@@ -86,8 +86,8 @@ public static <T> T getTargetObject(Object candidate) {
 	public static <T> T getUltimateTargetObject(Object candidate) {
 		Assert.notNull(candidate, "Candidate must not be null");
 		try {
-			if (AopUtils.isAopProxy(candidate) && candidate instanceof Advised) {
-				Object target = ((Advised) candidate).getTargetSource().getTarget();
+			if (AopUtils.isAopProxy(candidate) && candidate instanceof Advised advised) {
+				Object target = advised.getTargetSource().getTarget();
 				if (target != null) {
 					return (T) getUltimateTargetObject(target);
 				}
diff --git a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
index f53190b7aff7..68b84e0eb91d 100644
--- a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
+++ b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
@@ -87,11 +87,11 @@ public void assertEmpty() throws Exception {
 
 		if (this.exceptions.size() == 1) {
 			Throwable exception = this.exceptions.get(0);
-			if (exception instanceof Error) {
-				throw (Error) exception;
+			if (exception instanceof Error error) {
+				throw error;
 			}
-			if (exception instanceof Exception) {
-				throw (Exception) exception;
+			if (exception instanceof Exception ex) {
+				throw ex;
 			}
 			AssertionError assertionError = new AssertionError(exception.getMessage());
 			assertionError.initCause(exception);
diff --git a/spring-test/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
index e8c1b475222e..6bf523226e93 100644
--- a/spring-test/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
+++ b/spring-test/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,9 +97,7 @@ public <T> void assertValue(String content, Matcher<? super T> matcher, Class<T>
 	 */
 	public void assertValue(String content, @Nullable Object expectedValue) {
 		Object actualValue = evaluateJsonPath(content);
-		if ((actualValue instanceof List) && !(expectedValue instanceof List)) {
-			@SuppressWarnings("rawtypes")
-			List actualValueList = (List) actualValue;
+		if ((actualValue instanceof List<?> actualValueList) && !(expectedValue instanceof List)) {
 			if (actualValueList.isEmpty()) {
 				AssertionErrors.fail("No matching value at JSON path \"" + this.expression + "\"");
 			}
@@ -209,8 +207,8 @@ public void doesNotExist(String content) {
 			return;
 		}
 		String reason = failureReason("no value", value);
-		if (pathIsIndefinite() && value instanceof List) {
-			AssertionErrors.assertTrue(reason, ((List<?>) value).isEmpty());
+		if (pathIsIndefinite() && value instanceof List<?> list) {
+			AssertionErrors.assertTrue(reason, list.isEmpty());
 		}
 		else {
 			AssertionErrors.assertTrue(reason, (value == null));
@@ -252,9 +250,9 @@ public void assertValueIsNotEmpty(String content) {
 	 */
 	public void hasJsonPath(String content) {
 		Object value = evaluateJsonPath(content);
-		if (pathIsIndefinite() && value instanceof List) {
+		if (pathIsIndefinite() && value instanceof List<?> list) {
 			String message = "No values for JSON path \"" + this.expression + "\"";
-			AssertionErrors.assertTrue(message, !((List<?>) value).isEmpty());
+			AssertionErrors.assertTrue(message, !list.isEmpty());
 		}
 	}
 
@@ -276,8 +274,8 @@ public void doesNotHaveJsonPath(String content) {
 		catch (AssertionError ex) {
 			return;
 		}
-		if (pathIsIndefinite() && value instanceof List) {
-			AssertionErrors.assertTrue(failureReason("no values", value), ((List<?>) value).isEmpty());
+		if (pathIsIndefinite() && value instanceof List<?> list) {
+			AssertionErrors.assertTrue(failureReason("no values", value), list.isEmpty());
 		}
 		else {
 			AssertionErrors.fail(failureReason("no value", value));
@@ -328,8 +326,8 @@ private Object assertExistsAndReturn(String content) {
 		Object value = evaluateJsonPath(content);
 		String reason = "No value at JSON path \"" + this.expression + "\"";
 		AssertionErrors.assertTrue(reason, value != null);
-		if (pathIsIndefinite() && value instanceof List) {
-			AssertionErrors.assertTrue(reason, !((List<?>) value).isEmpty());
+		if (pathIsIndefinite() && value instanceof List<?> list) {
+			AssertionErrors.assertTrue(reason, !list.isEmpty());
 		}
 		return value;
 	}

From 373b90d26319d0e741b940de9bec1d22fa7983b8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 13 Oct 2021 20:43:13 +0200
Subject: [PATCH 241/735] Simplify JsonPathExpectationsHelperTests with text
 blocks

---
 .../util/JsonPathExpectationsHelperTests.java | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java b/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
index 177e1da909cc..1f8145cbc030 100644
--- a/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
+++ b/spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,25 +30,29 @@
  */
 class JsonPathExpectationsHelperTests {
 
-	private static final String CONTENT = "{" + //
-			"'str':         'foo',           " + //
-			"'num':         5,               " + //
-			"'bool':        true,            " + //
-			"'arr':         [42],            " + //
-			"'colorMap':    {'red': 'rojo'}, " + //
-			"'whitespace':  '    ',          " + //
-			"'emptyString': '',              " + //
-			"'emptyArray':  [],              " + //
-			"'emptyMap':    {}               " + //
-	"}";
-
-	private static final String SIMPSONS = "{ 'familyMembers': [ " + //
-			"{'name': 'Homer' }, " + //
-			"{'name': 'Marge' }, " + //
-			"{'name': 'Bart'  }, " + //
-			"{'name': 'Lisa'  }, " + //
-			"{'name': 'Maggie'}  " + //
-	" ] }";
+	private static final String CONTENT = """
+			{
+				'str':         'foo',
+				'num':         5,
+				'bool':        true,
+				'arr':         [42],
+				'colorMap':    {'red': 'rojo'},
+				'whitespace':  '    ',
+				'emptyString': '',
+				'emptyArray':  [],
+				'emptyMap':    {}
+			}""";
+
+	private static final String SIMPSONS = """
+			{
+				'familyMembers': [
+					{'name': 'Homer' },
+					{'name': 'Marge' },
+					{'name': 'Bart'  },
+					{'name': 'Lisa'  },
+					{'name': 'Maggie'}
+				]
+			}""";
 
 
 	@Test

From a178bbe86fb4ef408e5b43f6789f9e8e4cc54b86 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 13 Oct 2021 20:51:10 +0100
Subject: [PATCH 242/735] DefaultResponseErrorHandler shows full error details

Closes gh-27552
---
 .../core/log/LogFormatUtils.java              | 16 +++++-----
 .../client/DefaultResponseErrorHandler.java   | 31 +++++--------------
 .../DefaultResponseErrorHandlerTests.java     | 23 ++------------
 3 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
index 8ef04c71baf7..e3ae033e9f22 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
@@ -60,16 +60,11 @@ public static String formatValue(@Nullable Object value, int maxLength, boolean
 			return "";
 		}
 		String result;
-		if (value instanceof CharSequence) {
-			result = "\"" + value + "\"";
+		try {
+			result = value.toString();
 		}
-		else {
-			try {
-				result = value.toString();
-			}
-			catch (Throwable ex) {
-				result = ex.toString();
-			}
+		catch (Throwable ex) {
+			result = ex.toString();
 		}
 		if (maxLength != -1) {
 			result = (result.length() > maxLength ? result.substring(0, maxLength) + " (truncated)..." : result);
@@ -77,6 +72,9 @@ public static String formatValue(@Nullable Object value, int maxLength, boolean
 		if (replaceNewlines) {
 			result = result.replace("\n", "<LF>").replace("\r", "<CR>");
 		}
+		if (value instanceof CharSequence) {
+			result = "\"" + result + "\"";
+		}
 		return result;
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index 31355571c685..70e1038871a5 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,11 @@
 
 package org.springframework.web.client;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -135,31 +132,17 @@ private String getErrorMessage(
 			int rawStatusCode, String statusText, @Nullable byte[] responseBody, @Nullable Charset charset) {
 
 		String preface = rawStatusCode + " " + statusText + ": ";
+
 		if (ObjectUtils.isEmpty(responseBody)) {
 			return preface + "[no body]";
 		}
 
-		if (charset == null) {
-			charset = StandardCharsets.UTF_8;
-		}
-		int maxChars = 200;
+		charset = (charset != null ? charset : StandardCharsets.UTF_8);
 
-		if (responseBody.length < maxChars * 2) {
-			return preface + "[" + new String(responseBody, charset) + "]";
-		}
+		String bodyText = new String(responseBody, charset);
+		bodyText = LogFormatUtils.formatValue(bodyText, -1, true);
 
-		try {
-			Reader reader = new InputStreamReader(new ByteArrayInputStream(responseBody), charset);
-			CharBuffer buffer = CharBuffer.allocate(maxChars);
-			reader.read(buffer);
-			reader.close();
-			buffer.flip();
-			return preface + "[" + buffer.toString() + "... (" + responseBody.length + " bytes)]";
-		}
-		catch (IOException ex) {
-			// should never happen
-			throw new IllegalStateException(ex);
-		}
+		return preface + bodyText;
 	}
 
 	/**
diff --git a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
index cea2263411e3..a455f7088d55 100644
--- a/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.function.Function;
 
 import org.junit.jupiter.api.Test;
-import reactor.core.publisher.Flux;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -74,27 +72,10 @@ public void handleError() throws Exception {
 
 		assertThatExceptionOfType(HttpClientErrorException.class)
 				.isThrownBy(() -> handler.handleError(response))
-				.withMessage("404 Not Found: [Hello World]")
+				.withMessage("404 Not Found: \"Hello World\"")
 				.satisfies(ex -> assertThat(ex.getResponseHeaders()).isSameAs(headers));
 	}
 
-	@Test
-	public void handleErrorWithLongBody() throws Exception {
-
-		Function<Integer, String> bodyGenerator =
-				size -> Flux.just("a").repeat(size-1).reduce((s, s2) -> s + s2).block();
-
-		given(response.getRawStatusCode()).willReturn(HttpStatus.NOT_FOUND.value());
-		given(response.getStatusText()).willReturn("Not Found");
-		given(response.getHeaders()).willReturn(new HttpHeaders());
-		given(response.getBody()).willReturn(
-				new ByteArrayInputStream(bodyGenerator.apply(500).getBytes(StandardCharsets.UTF_8)));
-
-		assertThatExceptionOfType(HttpClientErrorException.class)
-				.isThrownBy(() -> handler.handleError(response))
-				.withMessage("404 Not Found: [" + bodyGenerator.apply(200) + "... (500 bytes)]");
-	}
-
 	@Test
 	public void handleErrorIOException() throws Exception {
 		HttpHeaders headers = new HttpHeaders();

From ca999fb38c37e9eba4916bf0399d9b9a9d0e4662 Mon Sep 17 00:00:00 2001
From: liuzhifei <2679431923@qq.com>
Date: Tue, 28 Sep 2021 19:22:51 +0800
Subject: [PATCH 243/735] fix Javadoc typo in
 PathMatchConfigurer#setUseSuffixPatternMatch

---
 .../web/servlet/config/annotation/PathMatchConfigurer.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
index 9eca10f1ccad..113d59cfb31b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
@@ -120,7 +120,7 @@ public PathMatchConfigurer addPathPrefix(String prefix, Predicate<Class<?>> pred
 	/**
 	 * Whether to use suffix pattern match (".*") when matching patterns to
 	 * requests. If enabled a method mapped to "/users" also matches to "/users.*".
-	 * <p>By default this is set to {@code true}.
+	 * <p>By default this is set to {@code false}.
 	 * <p><strong>Note:</strong> This property is mutually exclusive with and
 	 * ignored when {@link #setPatternParser(PathPatternParser)} is set.
 	 * @deprecated as of 5.2.4. See class-level note in

From 0705454ce012b6390ba50744f59a98223c0464a6 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 14 Oct 2021 09:42:40 +0100
Subject: [PATCH 244/735] Fix typo in Javadoc

See gh-27484
---
 .../web/servlet/config/annotation/PathMatchConfigurer.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
index 9eca10f1ccad..113d59cfb31b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
@@ -120,7 +120,7 @@ public PathMatchConfigurer addPathPrefix(String prefix, Predicate<Class<?>> pred
 	/**
 	 * Whether to use suffix pattern match (".*") when matching patterns to
 	 * requests. If enabled a method mapped to "/users" also matches to "/users.*".
-	 * <p>By default this is set to {@code true}.
+	 * <p>By default this is set to {@code false}.
 	 * <p><strong>Note:</strong> This property is mutually exclusive with and
 	 * ignored when {@link #setPatternParser(PathPatternParser)} is set.
 	 * @deprecated as of 5.2.4. See class-level note in

From bf461ba0b2e3beb14f27f2ec53d2f85bfca7095c Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Thu, 14 Oct 2021 09:35:45 +0000
Subject: [PATCH 245/735] Next development version (v5.3.12-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 237a595d4483..aea3f16f967a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.11-SNAPSHOT
+version=5.3.12-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From d312c1372188f98402d413b55eb07528152c4edf Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 14 Oct 2021 14:48:56 +0200
Subject: [PATCH 246/735] Upgrade to Hibernate ORM 5.6 Final, RxJava 3.1.2,
 JRuby 9.3.1

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ac36b1b71eb3..5829d4212a4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,7 @@ configure(allprojects) { project ->
 				entry 'groovy-xml'
 			}
 
-			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.2"
 			dependency "io.smallrye.reactive:mutiny:1.1.1"
 			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 
@@ -112,7 +112,7 @@ configure(allprojects) { project ->
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core-jakarta:5.6.0.CR1"
+			dependency "org.hibernate:hibernate-core-jakarta:5.6.0.Final"
 			dependency "org.hibernate:hibernate-validator:7.0.1.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
@@ -150,7 +150,7 @@ configure(allprojects) { project ->
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
 			dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4"
 
-			dependency "org.jruby:jruby:9.3.0.0"
+			dependency "org.jruby:jruby:9.3.1.0"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"
 

From 0853baaa3f9644df4de205a2472e71a748353e25 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 15:15:23 +0200
Subject: [PATCH 247/735] Fix Javadoc in
 [NamedParameter]JdbcOperations.queryForObject methods

This commit fixes the Javadoc in all queryForObject(...) methods in
JdbcOperations and NamedParameterJdbcOperations regarding what kinds of
exceptions are thrown under which conditions.

Closes gh-27559
---
 .../jdbc/core/JdbcOperations.java             | 63 ++++++++++---------
 .../NamedParameterJdbcOperations.java         | 19 +++---
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
index c285ddcb978e..7910753806aa 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,22 +22,21 @@
 import java.util.stream.Stream;
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 import org.springframework.lang.Nullable;
 
 /**
  * Interface specifying a basic set of JDBC operations.
- * Implemented by {@link JdbcTemplate}. Not often used directly, but a useful
+ *
+ * <p>Implemented by {@link JdbcTemplate}. Not often used directly, but a useful
  * option to enhance testability, as it can easily be mocked or stubbed.
  *
  * <p>Alternatively, the standard JDBC infrastructure can be mocked.
  * However, mocking this interface constitutes significantly less work.
  * As an alternative to a mock objects approach to testing data access code,
- * consider the powerful integration testing support provided in the
- * {@code org.springframework.test} package, shipped in
- * {@code spring-test.jar}.
+ * consider the powerful integration testing support provided via the <em>Spring
+ * TestContext Framework</em>, in the {@code spring-test} artifact.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -160,8 +159,8 @@ public interface JdbcOperations {
 	 * @param rowMapper a callback that will map one object per row
 	 * @return the single mapped object (may be {@code null} if the given
 	 * {@link RowMapper} returned {@code} null)
-	 * @throws IncorrectResultSizeDataAccessException if the query does not
-	 * return exactly one row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForObject(String, RowMapper, Object...)
 	 */
@@ -180,8 +179,10 @@ public interface JdbcOperations {
 	 * @param sql the SQL query to execute
 	 * @param requiredType the type that the result object is expected to match
 	 * @return the result object of the required type, or {@code null} in case of SQL NULL
-	 * @throws IncorrectResultSizeDataAccessException if the query does not return
-	 * exactly one row, or does not return exactly one column in that row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
+	 * @throws org.springframework.jdbc.IncorrectResultSetColumnCountException
+	 * if the query does not return a row containing a single column
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForObject(String, Class, Object...)
 	 */
@@ -198,8 +199,8 @@ public interface JdbcOperations {
 	 * mapped to a Map (one entry for each column, using the column name as the key).
 	 * @param sql the SQL query to execute
 	 * @return the result Map (one entry per column, with column name as key)
-	 * @throws IncorrectResultSizeDataAccessException if the query does not
-	 * return exactly one row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForMap(String, Object...)
 	 * @see ColumnMapRowMapper
@@ -603,8 +604,8 @@ <T> Stream<T> queryForStream(String sql, RowMapper<T> rowMapper, @Nullable Objec
 	 * @param rowMapper a callback that will map one object per row
 	 * @return the single mapped object (may be {@code null} if the given
 	 * {@link RowMapper} returned {@code} null)
-	 * @throws IncorrectResultSizeDataAccessException if the query does not
-	 * return exactly one row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if the query fails
 	 */
 	@Nullable
@@ -623,8 +624,8 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, RowMapper<T> row
 	 * @param rowMapper a callback that will map one object per row
 	 * @return the single mapped object (may be {@code null} if the given
 	 * {@link RowMapper} returned {@code} null)
-	 * @throws IncorrectResultSizeDataAccessException if the query does not
-	 * return exactly one row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if the query fails
 	 * @deprecated as of 5.3, in favor of {@link #queryForObject(String, RowMapper, Object...)}
 	 */
@@ -644,8 +645,8 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, RowMapper<T> row
 	 * only the argument value but also the SQL type and optionally the scale
 	 * @return the single mapped object (may be {@code null} if the given
 	 * {@link RowMapper} returned {@code} null)
-	 * @throws IncorrectResultSizeDataAccessException if the query does not
-	 * return exactly one row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if the query fails
 	 * @since 3.0.1
 	 */
@@ -663,8 +664,10 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, RowMapper<T> row
 	 * (constants from {@code java.sql.Types})
 	 * @param requiredType the type that the result object is expected to match
 	 * @return the result object of the required type, or {@code null} in case of SQL NULL
-	 * @throws IncorrectResultSizeDataAccessException if the query does not return
-	 * exactly one row, or does not return exactly one column in that row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
+	 * @throws org.springframework.jdbc.IncorrectResultSetColumnCountException
+	 * if the query does not return a row containing a single column
 	 * @throws DataAccessException if the query fails
 	 * @see #queryForObject(String, Class)
 	 * @see java.sql.Types
@@ -685,8 +688,10 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, Class<T> require
 	 * only the argument value but also the SQL type and optionally the scale
 	 * @param requiredType the type that the result object is expected to match
 	 * @return the result object of the required type, or {@code null} in case of SQL NULL
-	 * @throws IncorrectResultSizeDataAccessException if the query does not return
-	 * exactly one row, or does not return exactly one column in that row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
+	 * @throws org.springframework.jdbc.IncorrectResultSetColumnCountException
+	 * if the query does not return a row containing a single column
 	 * @throws DataAccessException if the query fails
 	 * @see #queryForObject(String, Class)
 	 * @deprecated as of 5.3, in favor of {@link #queryForObject(String, Class, Object...)}
@@ -707,8 +712,10 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, Class<T> require
 	 * may also contain {@link SqlParameterValue} objects which indicate not
 	 * only the argument value but also the SQL type and optionally the scale
 	 * @return the result object of the required type, or {@code null} in case of SQL NULL
-	 * @throws IncorrectResultSizeDataAccessException if the query does not return
-	 * exactly one row, or does not return exactly one column in that row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
+	 * @throws org.springframework.jdbc.IncorrectResultSetColumnCountException
+	 * if the query does not return a row containing a single column
 	 * @throws DataAccessException if the query fails
 	 * @since 3.0.1
 	 * @see #queryForObject(String, Class)
@@ -726,8 +733,8 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, Class<T> require
 	 * @param argTypes the SQL types of the arguments
 	 * (constants from {@code java.sql.Types})
 	 * @return the result Map (one entry per column, with column name as key)
-	 * @throws IncorrectResultSizeDataAccessException if the query does not
-	 * return exactly one row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if the query fails
 	 * @see #queryForMap(String)
 	 * @see ColumnMapRowMapper
@@ -750,8 +757,8 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, Class<T> require
 	 * only the argument value but also the SQL type and optionally the scale
 	 * @return the result Map (one entry for each column, using the
 	 * column name as the key)
-	 * @throws IncorrectResultSizeDataAccessException if the query does not
-	 * return exactly one row
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if the query fails
 	 * @see #queryForMap(String)
 	 * @see ColumnMapRowMapper
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
index 5d22b535e612..b308e06f735b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -268,8 +268,7 @@ <T> Stream<T> queryForStream(String sql, Map<String, ?> paramMap, RowMapper<T> r
 	 * @return the single mapped object (may be {@code null} if the given
 	 * {@link RowMapper} returned {@code} null)
 	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
-	 * if the query does not return exactly one row, or does not return exactly
-	 * one column in that row
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if the query fails
 	 */
 	@Nullable
@@ -287,8 +286,7 @@ <T> T queryForObject(String sql, SqlParameterSource paramSource, RowMapper<T> ro
 	 * @return the single mapped object (may be {@code null} if the given
 	 * {@link RowMapper} returned {@code} null)
 	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
-	 * if the query does not return exactly one row, or does not return exactly
-	 * one column in that row
+	 * if the query does not return exactly one row
 	 * @throws DataAccessException if the query fails
 	 */
 	@Nullable
@@ -305,10 +303,12 @@ <T> T queryForObject(String sql, Map<String, ?> paramMap, RowMapper<T> rowMapper
 	 * @param requiredType the type that the result object is expected to match
 	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
-	 * if the query does not return exactly one row, or does not return exactly
-	 * one column in that row
+	 * if the query does not return exactly one row
+	 * @throws org.springframework.jdbc.IncorrectResultSetColumnCountException
+	 * if the query does not return a row containing a single column
 	 * @throws DataAccessException if the query fails
 	 * @see org.springframework.jdbc.core.JdbcTemplate#queryForObject(String, Class)
+	 * @see org.springframework.jdbc.core.SingleColumnRowMapper
 	 */
 	@Nullable
 	<T> T queryForObject(String sql, SqlParameterSource paramSource, Class<T> requiredType)
@@ -325,8 +325,9 @@ <T> T queryForObject(String sql, SqlParameterSource paramSource, Class<T> requir
 	 * @param requiredType the type that the result object is expected to match
 	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
-	 * if the query does not return exactly one row, or does not return exactly
-	 * one column in that row
+	 * if the query does not return exactly one row
+	 * @throws org.springframework.jdbc.IncorrectResultSetColumnCountException
+	 * if the query does not return a row containing a single column
 	 * @throws DataAccessException if the query fails
 	 * @see org.springframework.jdbc.core.JdbcTemplate#queryForObject(String, Class)
 	 */

From 7e4870577dd37098452fdec9ee2ecfe0c3950bb1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 15:50:36 +0200
Subject: [PATCH 248/735] Apply "instanceof pattern matching" Eclipse clean-up
 in spring-test

This has only been applied to `src/main/java`.
---
 .../springframework/mock/web/MockHttpServletRequest.java  | 3 +--
 .../springframework/mock/web/MockHttpServletResponse.java | 3 +--
 .../test/context/ContextConfigurationAttributes.java      | 3 +--
 .../cache/DefaultCacheAwareContextLoaderDelegate.java     | 3 +--
 .../test/context/event/DefaultApplicationEvents.java      | 6 +++---
 .../context/support/AbstractTestContextBootstrapper.java  | 3 +--
 .../test/context/support/DefaultTestContext.java          | 4 +---
 .../context/transaction/TestContextTransactionUtils.java  | 8 ++------
 .../test/context/web/ServletTestExecutionListener.java    | 7 ++-----
 .../web/socket/MockServerContainerContextCustomizer.java  | 3 +--
 .../web/servlet/client/AbstractMockMvcServerSpec.java     | 1 +
 .../test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java | 3 +--
 .../servlet/request/MockHttpServletRequestBuilder.java    | 4 +---
 .../request/MockMultipartHttpServletRequestBuilder.java   | 3 +--
 .../test/web/servlet/result/PrintingResultHandler.java    | 3 +--
 15 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
index 1a3e7102e9e1..2ac4b33e4c76 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -1279,8 +1279,7 @@ public String getServletPath() {
 
 	public void setSession(HttpSession session) {
 		this.session = session;
-		if (session instanceof MockHttpSession) {
-			MockHttpSession mockSession = ((MockHttpSession) session);
+		if (session instanceof MockHttpSession mockSession) {
 			mockSession.access();
 		}
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index df02fa4deba8..981f3a515ad3 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -444,8 +444,7 @@ else if (expires != null) {
 		if (cookie.isHttpOnly()) {
 			buf.append("; HttpOnly");
 		}
-		if (cookie instanceof MockCookie) {
-			MockCookie mockCookie = (MockCookie) cookie;
+		if (cookie instanceof MockCookie mockCookie) {
 			if (StringUtils.hasText(mockCookie.getSameSite())) {
 				buf.append("; SameSite=").append(mockCookie.getSameSite());
 			}
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
index e910c4c9d5e4..7b2e275c2b3d 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
@@ -335,10 +335,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ContextConfigurationAttributes)) {
+		if (!(other instanceof ContextConfigurationAttributes otherAttr)) {
 			return false;
 		}
-		ContextConfigurationAttributes otherAttr = (ContextConfigurationAttributes) other;
 		return (ObjectUtils.nullSafeEquals(this.declaringClass, otherAttr.declaringClass) &&
 				Arrays.equals(this.classes, otherAttr.classes)) &&
 				Arrays.equals(this.locations, otherAttr.locations) &&
diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java
index 133373dc7f41..2e5e54eed13d 100644
--- a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java
+++ b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java
@@ -94,8 +94,7 @@ protected ApplicationContext loadContextInternal(MergedContextConfiguration merg
 
 		ApplicationContext applicationContext;
 
-		if (contextLoader instanceof SmartContextLoader) {
-			SmartContextLoader smartContextLoader = (SmartContextLoader) contextLoader;
+		if (contextLoader instanceof SmartContextLoader smartContextLoader) {
 			applicationContext = smartContextLoader.loadContext(mergedContextConfiguration);
 		}
 		else {
diff --git a/spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java b/spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java
index 22d2eff61bfb..b7638ba2d551 100644
--- a/spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java
+++ b/spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,8 +58,8 @@ public void clear() {
 	}
 
 	private Object unwrapPayloadEvent(Object source) {
-		return (PayloadApplicationEvent.class.isInstance(source) ?
-				((PayloadApplicationEvent<?>) source).getPayload() : source);
+		return ((source instanceof PayloadApplicationEvent<?> payloadApplicationEvent) ?
+				payloadApplicationEvent.getPayload() : source);
 	}
 
 }
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
index 17bddaf5b4ce..be2b3b8d57cb 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
@@ -352,8 +352,7 @@ private MergedContextConfiguration buildMergedContextConfiguration(Class<?> test
 				logger.trace(String.format("Processing locations and classes for context configuration attributes %s",
 						configAttributes));
 			}
-			if (contextLoader instanceof SmartContextLoader) {
-				SmartContextLoader smartContextLoader = (SmartContextLoader) contextLoader;
+			if (contextLoader instanceof SmartContextLoader smartContextLoader) {
 				smartContextLoader.processContextConfiguration(configAttributes);
 				locations.addAll(0, Arrays.asList(configAttributes.getLocations()));
 				classes.addAll(0, Arrays.asList(configAttributes.getClasses()));
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java
index 0d0d0af7e139..ff318f8c3da5 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java
@@ -122,9 +122,7 @@ public boolean hasApplicationContext() {
 	@Override
 	public ApplicationContext getApplicationContext() {
 		ApplicationContext context = this.cacheAwareContextLoaderDelegate.loadContext(this.mergedContextConfiguration);
-		if (context instanceof ConfigurableApplicationContext) {
-			@SuppressWarnings("resource")
-			ConfigurableApplicationContext cac = (ConfigurableApplicationContext) context;
+		if (context instanceof ConfigurableApplicationContext cac) {
 			Assert.state(cac.isActive(), () ->
 					"The ApplicationContext loaded for [" + this.mergedContextConfiguration +
 					"] is not active. This may be due to one of the following reasons: " +
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java
index fc2c8be8e248..8b10ae16a09b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java
@@ -106,9 +106,7 @@ public static DataSource retrieveDataSource(TestContext testContext, @Nullable S
 		}
 
 		try {
-			if (bf instanceof ListableBeanFactory) {
-				ListableBeanFactory lbf = (ListableBeanFactory) bf;
-
+			if (bf instanceof ListableBeanFactory lbf) {
 				// Look up single bean by type
 				Map<String, DataSource> dataSources =
 						BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, DataSource.class);
@@ -180,9 +178,7 @@ public static PlatformTransactionManager retrieveTransactionManager(TestContext
 		}
 
 		try {
-			if (bf instanceof ListableBeanFactory) {
-				ListableBeanFactory lbf = (ListableBeanFactory) bf;
-
+			if (bf instanceof ListableBeanFactory lbf) {
 				// Look up single TransactionManagementConfigurer
 				Map<String, TransactionManagementConfigurer> configurers =
 						BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, TransactionManagementConfigurer.class);
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
index 3051524eb899..0badc4476c68 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
@@ -188,8 +188,7 @@ private void setUpRequestContextIfNecessary(TestContext testContext) {
 
 		ApplicationContext context = testContext.getApplicationContext();
 
-		if (context instanceof WebApplicationContext) {
-			WebApplicationContext wac = (WebApplicationContext) context;
+		if (context instanceof WebApplicationContext wac) {
 			ServletContext servletContext = wac.getServletContext();
 			Assert.state(servletContext instanceof MockServletContext, () -> String.format(
 						"The WebApplicationContext for test context %s must be configured with a MockServletContext.",
@@ -211,9 +210,7 @@ private void setUpRequestContextIfNecessary(TestContext testContext) {
 			testContext.setAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
 			testContext.setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
 
-			if (wac instanceof ConfigurableApplicationContext) {
-				@SuppressWarnings("resource")
-				ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) wac;
+			if (wac instanceof ConfigurableApplicationContext configurableApplicationContext) {
 				ConfigurableListableBeanFactory bf = configurableApplicationContext.getBeanFactory();
 				bf.registerResolvableDependency(MockHttpServletResponse.class, response);
 				bf.registerResolvableDependency(ServletWebRequest.class, servletWebRequest);
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
index c746941672bf..7a4222833be4 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
@@ -36,8 +36,7 @@ class MockServerContainerContextCustomizer implements ContextCustomizer {
 
 	@Override
 	public void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) {
-		if (context instanceof WebApplicationContext) {
-			WebApplicationContext wac = (WebApplicationContext) context;
+		if (context instanceof WebApplicationContext wac) {
 			ServletContext sc = wac.getServletContext();
 			if (sc != null) {
 				sc.setAttribute("jakarta.websocket.server.ServerContainer", new MockServerContainer());
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
index d811cdb12e31..252e70a0bfc4 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
@@ -45,6 +45,7 @@ public <T extends B> T filters(Filter... filters) {
 		return self();
 	}
 
+	@Override
 	public final <T extends B> T filter(Filter filter, String... urlPatterns) {
 		getMockMvcBuilder().addFilter(filter, urlPatterns);
 		return self();
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index 16df1e7e4894..81bde230655b 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -370,8 +370,7 @@ private void params(MockHttpServletRequest request, UriComponents uriComponents)
 			});
 		});
 		for (NameValuePair param : this.webRequest.getRequestParameters()) {
-			if (param instanceof KeyDataPair) {
-				KeyDataPair pair = (KeyDataPair) param;
+			if (param instanceof KeyDataPair pair) {
 				File file = pair.getFile();
 				MockPart part;
 				if (file != null) {
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index e7122070f130..d9d45f34c8e4 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -561,11 +561,9 @@ public Object merge(@Nullable Object parent) {
 		if (parent == null) {
 			return this;
 		}
-		if (!(parent instanceof MockHttpServletRequestBuilder)) {
+		if (!(parent instanceof MockHttpServletRequestBuilder parentBuilder)) {
 			throw new IllegalArgumentException("Cannot merge with [" + parent.getClass().getName() + "]");
 		}
-		MockHttpServletRequestBuilder parentBuilder = (MockHttpServletRequestBuilder) parent;
-
 		if (!StringUtils.hasText(this.contextPath)) {
 			this.contextPath = parentBuilder.contextPath;
 		}
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
index e9a8b694493e..0ead22c22f5b 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
@@ -122,8 +122,7 @@ public Object merge(@Nullable Object parent) {
 		}
 		if (parent instanceof MockHttpServletRequestBuilder) {
 			super.merge(parent);
-			if (parent instanceof MockMultipartHttpServletRequestBuilder) {
-				MockMultipartHttpServletRequestBuilder parentBuilder = (MockMultipartHttpServletRequestBuilder) parent;
+			if (parent instanceof MockMultipartHttpServletRequestBuilder parentBuilder) {
 				this.files.addAll(parentBuilder.files);
 				parentBuilder.parts.keySet().forEach(name ->
 						this.parts.putIfAbsent(name, parentBuilder.parts.get(name)));
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
index f9539b1a6a0a..7f1cc67268e7 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -179,8 +179,7 @@ protected void printHandler(@Nullable Object handler, @Nullable HandlerIntercept
 			this.printer.printValue("Type", null);
 		}
 		else {
-			if (handler instanceof HandlerMethod) {
-				HandlerMethod handlerMethod = (HandlerMethod) handler;
+			if (handler instanceof HandlerMethod handlerMethod) {
 				this.printer.printValue("Type", handlerMethod.getBeanType().getName());
 				this.printer.printValue("Method", handlerMethod);
 			}

From 940a37f9cefb33fd9c70072e8ced6a21d4a98a2b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 15:53:54 +0200
Subject: [PATCH 249/735] Apply "final fields" Eclipse clean-up in spring-test

This has only been applied to `src/main/java`.
---
 .../main/java/org/springframework/mock/env/MockEnvironment.java | 2 +-
 .../test/web/client/response/DefaultResponseCreator.java        | 2 +-
 .../test/web/servlet/setup/AbstractMockMvcBuilder.java          | 2 +-
 .../test/web/servlet/setup/StandaloneMockMvcBuilder.java        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
index 8495e7c37b06..447352f87cf1 100644
--- a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
+++ b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
@@ -31,7 +31,7 @@
  */
 public class MockEnvironment extends AbstractEnvironment {
 
-	private MockPropertySource propertySource = new MockPropertySource();
+	private final MockPropertySource propertySource = new MockPropertySource();
 
 	/**
 	 * Create a new {@code MockEnvironment} with a single {@link MockPropertySource}.
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java b/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
index 5170d5a515dd..f76553c7feb3 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
@@ -40,7 +40,7 @@
  */
 public class DefaultResponseCreator implements ResponseCreator {
 
-	private HttpStatus statusCode;
+	private final HttpStatus statusCode;
 
 	private byte[] content = new byte[0];
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
index dcf4b06b687e..f8636fbd91e9 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
@@ -56,7 +56,7 @@
 public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B>>
 		extends MockMvcBuilderSupport implements ConfigurableMockMvcBuilder<B> {
 
-	private List<Filter> filters = new ArrayList<>();
+	private final List<Filter> filters = new ArrayList<>();
 
 	@Nullable
 	private RequestBuilder defaultRequestBuilder;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index ac94d5c103fc..7a547b5fe130 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -137,7 +137,7 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
 	@Nullable
 	private Boolean removeSemicolonContent;
 
-	private Map<String, String> placeholderValues = new HashMap<>();
+	private final Map<String, String> placeholderValues = new HashMap<>();
 
 	private Supplier<RequestMappingHandlerMapping> handlerMappingFactory = RequestMappingHandlerMapping::new;
 

From fba92c012042a48443a169cf3f42dabb542aa8c1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 16:03:39 +0200
Subject: [PATCH 250/735] Update copyright date

---
 .../main/java/org/springframework/mock/env/MockEnvironment.java | 2 +-
 .../context/cache/DefaultCacheAwareContextLoaderDelegate.java   | 2 +-
 .../test/context/support/AbstractTestContextBootstrapper.java   | 2 +-
 .../test/context/support/DefaultTestContext.java                | 2 +-
 .../test/context/transaction/TestContextTransactionUtils.java   | 2 +-
 .../test/context/web/ServletTestExecutionListener.java          | 2 +-
 .../web/socket/MockServerContainerContextCustomizer.java        | 2 +-
 .../test/web/client/response/DefaultResponseCreator.java        | 2 +-
 .../test/web/servlet/client/AbstractMockMvcServerSpec.java      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
index 447352f87cf1..fd5e36da3131 100644
--- a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
+++ b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java
index 2e5e54eed13d..8cb5c9ab383b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java
+++ b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
index be2b3b8d57cb..c242a0c7edcd 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java
index ff318f8c3da5..2c2f1318a7cc 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java
index 8b10ae16a09b..a91f4a1f44c7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
index 0badc4476c68..322a826ca218 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
index 7a4222833be4..441615cf1c68 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java b/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
index f76553c7feb3..8a10c217209d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
index 252e70a0bfc4..ac693c0293ed 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 07cd6ab76181e2e9e30063bb3a9f1892f02b6f05 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 16:13:50 +0200
Subject: [PATCH 251/735] Apply "instanceof pattern matching" Eclipse clean-up
 in spring-aop

This commit also applies additional clean-up tasks such as the following.

- final fields

This has only been applied to `src/main/java`.
---
 .../aop/aspectj/AbstractAspectJAdvice.java            |  6 ++----
 .../aspectj/AspectJAdviceParameterNameDiscoverer.java |  6 +++---
 .../aop/aspectj/AspectJAroundAdvice.java              |  3 +--
 .../aop/aspectj/AspectJExpressionPointcut.java        |  3 +--
 .../aop/aspectj/AspectJPointcutAdvisor.java           |  3 +--
 .../annotation/AbstractAspectJAdvisorFactory.java     |  3 +--
 .../config/AspectJAutoProxyBeanDefinitionParser.java  |  3 +--
 .../aop/config/ConfigBeanDefinitionParser.java        |  2 +-
 .../config/ScopedProxyBeanDefinitionDecorator.java    |  3 +--
 .../framework/AbstractAdvisingBeanPostProcessor.java  |  3 +--
 .../springframework/aop/framework/AdvisedSupport.java |  3 +--
 .../springframework/aop/framework/CglibAopProxy.java  |  3 +--
 .../aop/framework/DefaultAdvisorChainFactory.java     | 11 ++++-------
 .../aop/framework/ProxyFactoryBean.java               |  3 +--
 .../aop/framework/ReflectiveMethodInvocation.java     |  6 ++----
 .../adapter/DefaultAdvisorAdapterRegistry.java        |  3 +--
 .../aop/interceptor/ExposeBeanNameAdvisors.java       |  9 +++------
 .../aop/scope/ScopedProxyFactoryBean.java             |  4 +---
 .../aop/support/AbstractPointcutAdvisor.java          |  3 +--
 .../aop/support/AbstractRegexpMethodPointcut.java     |  3 +--
 .../org/springframework/aop/support/AopUtils.java     |  3 +--
 .../aop/support/ComposablePointcut.java               |  3 +--
 .../aop/support/ControlFlowPointcut.java              |  3 +--
 .../aop/support/DefaultIntroductionAdvisor.java       |  3 +--
 ...elegatePerTargetObjectIntroductionInterceptor.java |  4 ++--
 .../springframework/aop/support/MethodMatchers.java   |  9 +++------
 .../aop/support/annotation/AnnotationClassFilter.java |  3 +--
 .../annotation/AnnotationMatchingPointcut.java        |  6 ++----
 .../support/annotation/AnnotationMethodMatcher.java   |  3 +--
 .../springframework/aop/target/EmptyTargetSource.java |  3 +--
 .../aop/target/SingletonTargetSource.java             |  3 +--
 31 files changed, 44 insertions(+), 82 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
index 8ef1bf148a17..5beb29f55b5e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
@@ -78,10 +78,9 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	 */
 	public static JoinPoint currentJoinPoint() {
 		MethodInvocation mi = ExposeInvocationInterceptor.currentInvocation();
-		if (!(mi instanceof ProxyMethodInvocation)) {
+		if (!(mi instanceof ProxyMethodInvocation pmi)) {
 			throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
 		}
-		ProxyMethodInvocation pmi = (ProxyMethodInvocation) mi;
 		JoinPoint jp = (JoinPoint) pmi.getUserAttribute(JOIN_POINT_KEY);
 		if (jp == null) {
 			jp = new MethodInvocationProceedingJoinPoint(pmi);
@@ -714,10 +713,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof AdviceExcludingMethodMatcher)) {
+			if (!(other instanceof AdviceExcludingMethodMatcher otherMm)) {
 				return false;
 			}
-			AdviceExcludingMethodMatcher otherMm = (AdviceExcludingMethodMatcher) other;
 			return this.adviceMethod.equals(otherMm.adviceMethod);
 		}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
index 60a45977513e..9497eb30a266 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
@@ -158,7 +158,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 
 	/** The pointcut expression associated with the advice, as a simple String. */
 	@Nullable
-	private String pointcutExpression;
+	private final String pointcutExpression;
 
 	private boolean raiseExceptions;
 
@@ -759,10 +759,10 @@ private void findAndBind(Class<?> argumentType, String varName) {
 	 */
 	private static class PointcutBody {
 
-		private int numTokensConsumed;
+		private final int numTokensConsumed;
 
 		@Nullable
-		private String text;
+		private final String text;
 
 		public PointcutBody(int tokens, @Nullable String text) {
 			this.numTokensConsumed = tokens;
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
index 7a7029323d26..e3530a11a5ac 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
@@ -63,10 +63,9 @@ protected boolean supportsProceedingJoinPoint() {
 	@Override
 	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
-		if (!(mi instanceof ProxyMethodInvocation)) {
+		if (!(mi instanceof ProxyMethodInvocation pmi)) {
 			throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
 		}
-		ProxyMethodInvocation pmi = (ProxyMethodInvocation) mi;
 		ProceedingJoinPoint pjp = lazyGetProceedingJoinPoint(pmi);
 		JoinPointMatch jpm = getJoinPointMatch(pmi);
 		return invokeAdviceMethod(pjp, jpm, null, null);
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
index 8b5e5f6f3e0f..40aa1c95f74e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
@@ -523,10 +523,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AspectJExpressionPointcut)) {
+		if (!(other instanceof AspectJExpressionPointcut otherPc)) {
 			return false;
 		}
-		AspectJExpressionPointcut otherPc = (AspectJExpressionPointcut) other;
 		return ObjectUtils.nullSafeEquals(this.getExpression(), otherPc.getExpression()) &&
 				ObjectUtils.nullSafeEquals(this.pointcutDeclarationScope, otherPc.pointcutDeclarationScope) &&
 				ObjectUtils.nullSafeEquals(this.pointcutParameterNames, otherPc.pointcutParameterNames) &&
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
index b1a12175212b..17fc3422a966 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
@@ -97,10 +97,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AspectJPointcutAdvisor)) {
+		if (!(other instanceof AspectJPointcutAdvisor otherAdvisor)) {
 			return false;
 		}
-		AspectJPointcutAdvisor otherAdvisor = (AspectJPointcutAdvisor) other;
 		return this.advice.equals(otherAdvisor.advice);
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index 58f3c23b459f..54110bcd0d81 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -214,8 +214,7 @@ private AspectJAnnotationType determineAnnotationType(A annotation) {
 		private String resolveExpression(A annotation) {
 			for (String attributeName : EXPRESSION_ATTRIBUTES) {
 				Object val = AnnotationUtils.getValue(annotation, attributeName);
-				if (val instanceof String) {
-					String str = (String) val;
+				if (val instanceof String str) {
 					if (!str.isEmpty()) {
 						return str;
 					}
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
index 4271bec65d5e..1f23b5ecb7e4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
@@ -59,8 +59,7 @@ private void addIncludePatterns(Element element, ParserContext parserContext, Be
 		NodeList childNodes = element.getChildNodes();
 		for (int i = 0; i < childNodes.getLength(); i++) {
 			Node node = childNodes.item(i);
-			if (node instanceof Element) {
-				Element includeElement = (Element) node;
+			if (node instanceof Element includeElement) {
 				TypedStringValue valueHolder = new TypedStringValue(includeElement.getAttribute("name"));
 				valueHolder.setSource(parserContext.extractSource(includeElement));
 				includePatterns.add(valueHolder);
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
index de31818c70a6..70b6870f75c1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
@@ -93,7 +93,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	private static final int POINTCUT_INDEX = 1;
 	private static final int ASPECT_INSTANCE_FACTORY_INDEX = 2;
 
-	private ParseState parseState = new ParseState();
+	private final ParseState parseState = new ParseState();
 
 
 	@Override
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
index ca940ec518f1..0e51956f940a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
@@ -42,8 +42,7 @@ class ScopedProxyBeanDefinitionDecorator implements BeanDefinitionDecorator {
 	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 		boolean proxyTargetClass = true;
-		if (node instanceof Element) {
-			Element ele = (Element) node;
+		if (node instanceof Element ele) {
 			if (ele.hasAttribute(PROXY_TARGET_CLASS)) {
 				proxyTargetClass = Boolean.parseBoolean(ele.getAttribute(PROXY_TARGET_CLASS));
 			}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java
index d941bdac4c9c..57c301e9b11e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java
@@ -69,8 +69,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 			return bean;
 		}
 
-		if (bean instanceof Advised) {
-			Advised advised = (Advised) bean;
+		if (bean instanceof Advised advised) {
 			if (!advised.isFrozen() && isEligible(AopUtils.getTargetClass(bean))) {
 				// Add our local Advisor to the existing proxy's Advisor chain...
 				if (this.beforeExistingAdvisors) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
index b2b8060b8a6a..65ca054410eb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -283,8 +283,7 @@ public void removeAdvisor(int index) throws AopConfigException {
 		}
 
 		Advisor advisor = this.advisors.remove(index);
-		if (advisor instanceof IntroductionAdvisor) {
-			IntroductionAdvisor ia = (IntroductionAdvisor) advisor;
+		if (advisor instanceof IntroductionAdvisor ia) {
 			// We need to remove introduction interfaces.
 			for (Class<?> ifc : ia.getInterfaces()) {
 				removeInterface(ifc);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
index 022cc0fddf24..0e6504b64a0f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
@@ -949,10 +949,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ProxyCallbackFilter)) {
+			if (!(other instanceof ProxyCallbackFilter otherCallbackFilter)) {
 				return false;
 			}
-			ProxyCallbackFilter otherCallbackFilter = (ProxyCallbackFilter) other;
 			AdvisedSupport otherAdvised = otherCallbackFilter.advised;
 			if (this.advised.isFrozen() != otherAdvised.isFrozen()) {
 				return false;
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
index a8f458781d65..67e435a88357 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,9 +60,8 @@ public List<Object> getInterceptorsAndDynamicInterceptionAdvice(
 		Boolean hasIntroductions = null;
 
 		for (Advisor advisor : advisors) {
-			if (advisor instanceof PointcutAdvisor) {
+			if (advisor instanceof PointcutAdvisor pointcutAdvisor) {
 				// Add it conditionally.
-				PointcutAdvisor pointcutAdvisor = (PointcutAdvisor) advisor;
 				if (config.isPreFiltered() || pointcutAdvisor.getPointcut().getClassFilter().matches(actualClass)) {
 					MethodMatcher mm = pointcutAdvisor.getPointcut().getMethodMatcher();
 					boolean match;
@@ -90,8 +89,7 @@ public List<Object> getInterceptorsAndDynamicInterceptionAdvice(
 					}
 				}
 			}
-			else if (advisor instanceof IntroductionAdvisor) {
-				IntroductionAdvisor ia = (IntroductionAdvisor) advisor;
+			else if (advisor instanceof IntroductionAdvisor ia) {
 				if (config.isPreFiltered() || ia.getClassFilter().matches(actualClass)) {
 					Interceptor[] interceptors = registry.getInterceptors(advisor);
 					interceptorList.addAll(Arrays.asList(interceptors));
@@ -111,8 +109,7 @@ else if (advisor instanceof IntroductionAdvisor) {
 	 */
 	private static boolean hasMatchingIntroductions(Advisor[] advisors, Class<?> actualClass) {
 		for (Advisor advisor : advisors) {
-			if (advisor instanceof IntroductionAdvisor) {
-				IntroductionAdvisor ia = (IntroductionAdvisor) advisor;
+			if (advisor instanceof IntroductionAdvisor ia) {
 				if (ia.getClassFilter().matches(actualClass)) {
 					return true;
 				}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
index 6c9efc49f0d7..d14f8008eddd 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
@@ -479,8 +479,7 @@ private List<Advisor> freshAdvisorChain() {
 		Advisor[] advisors = getAdvisors();
 		List<Advisor> freshAdvisors = new ArrayList<>(advisors.length);
 		for (Advisor advisor : advisors) {
-			if (advisor instanceof PrototypePlaceholderAdvisor) {
-				PrototypePlaceholderAdvisor pa = (PrototypePlaceholderAdvisor) advisor;
+			if (advisor instanceof PrototypePlaceholderAdvisor pa) {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Refreshing bean named '" + pa.getBeanName() + "'");
 				}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
index 1db34223cb41..6b57eb9fa49a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,11 +165,9 @@ public Object proceed() throws Throwable {
 
 		Object interceptorOrInterceptionAdvice =
 				this.interceptorsAndDynamicMethodMatchers.get(++this.currentInterceptorIndex);
-		if (interceptorOrInterceptionAdvice instanceof InterceptorAndDynamicMethodMatcher) {
+		if (interceptorOrInterceptionAdvice instanceof InterceptorAndDynamicMethodMatcher dm) {
 			// Evaluate dynamic method matcher here: static part will already have
 			// been evaluated and found to match.
-			InterceptorAndDynamicMethodMatcher dm =
-					(InterceptorAndDynamicMethodMatcher) interceptorOrInterceptionAdvice;
 			Class<?> targetClass = (this.targetClass != null ? this.targetClass : this.method.getDeclaringClass());
 			if (dm.methodMatcher.matches(this.method, targetClass, this.arguments)) {
 				return dm.interceptor.invoke(this);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
index 7f2c66144b66..da24c8017cff 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
@@ -58,10 +58,9 @@ public Advisor wrap(Object adviceObject) throws UnknownAdviceTypeException {
 		if (adviceObject instanceof Advisor) {
 			return (Advisor) adviceObject;
 		}
-		if (!(adviceObject instanceof Advice)) {
+		if (!(adviceObject instanceof Advice advice)) {
 			throw new UnknownAdviceTypeException(adviceObject);
 		}
-		Advice advice = (Advice) adviceObject;
 		if (advice instanceof MethodInterceptor) {
 			// So well-known it doesn't even need an adapter.
 			return new DefaultPointcutAdvisor(advice);
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
index 7dfb777dee39..17aa3bfaf527 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
@@ -68,10 +68,9 @@ public static String getBeanName() throws IllegalStateException {
 	 * @throws IllegalStateException if the bean name has not been exposed
 	 */
 	public static String getBeanName(MethodInvocation mi) throws IllegalStateException {
-		if (!(mi instanceof ProxyMethodInvocation)) {
+		if (!(mi instanceof ProxyMethodInvocation pmi)) {
 			throw new IllegalArgumentException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
 		}
-		ProxyMethodInvocation pmi = (ProxyMethodInvocation) mi;
 		String beanName = (String) pmi.getUserAttribute(BEAN_NAME_ATTRIBUTE);
 		if (beanName == null) {
 			throw new IllegalStateException("Cannot get bean name; not set on MethodInvocation: " + mi);
@@ -113,10 +112,9 @@ public ExposeBeanNameInterceptor(String beanName) {
 		@Override
 		@Nullable
 		public Object invoke(MethodInvocation mi) throws Throwable {
-			if (!(mi instanceof ProxyMethodInvocation)) {
+			if (!(mi instanceof ProxyMethodInvocation pmi)) {
 				throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
 			}
-			ProxyMethodInvocation pmi = (ProxyMethodInvocation) mi;
 			pmi.setUserAttribute(BEAN_NAME_ATTRIBUTE, this.beanName);
 			return mi.proceed();
 		}
@@ -138,10 +136,9 @@ public ExposeBeanNameIntroduction(String beanName) {
 		@Override
 		@Nullable
 		public Object invoke(MethodInvocation mi) throws Throwable {
-			if (!(mi instanceof ProxyMethodInvocation)) {
+			if (!(mi instanceof ProxyMethodInvocation pmi)) {
 				throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
 			}
-			ProxyMethodInvocation pmi = (ProxyMethodInvocation) mi;
 			pmi.setUserAttribute(BEAN_NAME_ATTRIBUTE, this.beanName);
 			return super.invoke(mi);
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
index 281b975a4c8c..2a77bf6b54b7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
@@ -85,11 +85,9 @@ public void setTargetBeanName(String targetBeanName) {
 
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
-		if (!(beanFactory instanceof ConfigurableBeanFactory)) {
+		if (!(beanFactory instanceof ConfigurableBeanFactory cbf)) {
 			throw new IllegalStateException("Not running in a ConfigurableBeanFactory: " + beanFactory);
 		}
-		ConfigurableBeanFactory cbf = (ConfigurableBeanFactory) beanFactory;
-
 		this.scopedTargetSource.setBeanFactory(beanFactory);
 
 		ProxyFactory pf = new ProxyFactory();
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
index 7b7c95a8ac5e..9c515e8ed04f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
@@ -69,10 +69,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof PointcutAdvisor)) {
+		if (!(other instanceof PointcutAdvisor otherAdvisor)) {
 			return false;
 		}
-		PointcutAdvisor otherAdvisor = (PointcutAdvisor) other;
 		return (ObjectUtils.nullSafeEquals(getAdvice(), otherAdvisor.getAdvice()) &&
 				ObjectUtils.nullSafeEquals(getPointcut(), otherAdvisor.getPointcut()));
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
index a6ca47c15c37..8add9103caa1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
@@ -200,10 +200,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AbstractRegexpMethodPointcut)) {
+		if (!(other instanceof AbstractRegexpMethodPointcut otherPointcut)) {
 			return false;
 		}
-		AbstractRegexpMethodPointcut otherPointcut = (AbstractRegexpMethodPointcut) other;
 		return (Arrays.equals(this.patterns, otherPointcut.patterns) &&
 				Arrays.equals(this.excludedPatterns, otherPointcut.excludedPatterns));
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
index 8055ec98cb60..1260627ff3f8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
@@ -284,8 +284,7 @@ public static boolean canApply(Advisor advisor, Class<?> targetClass, boolean ha
 		if (advisor instanceof IntroductionAdvisor) {
 			return ((IntroductionAdvisor) advisor).getClassFilter().matches(targetClass);
 		}
-		else if (advisor instanceof PointcutAdvisor) {
-			PointcutAdvisor pca = (PointcutAdvisor) advisor;
+		else if (advisor instanceof PointcutAdvisor pca) {
 			return canApply(pca.getPointcut(), targetClass, hasIntroductions);
 		}
 		else {
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
index 4bbcaf333411..b73c40bd4c10 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
@@ -188,10 +188,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ComposablePointcut)) {
+		if (!(other instanceof ComposablePointcut otherPointcut)) {
 			return false;
 		}
-		ComposablePointcut otherPointcut = (ComposablePointcut) other;
 		return (this.classFilter.equals(otherPointcut.classFilter) &&
 				this.methodMatcher.equals(otherPointcut.methodMatcher));
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
index 1c4dd8bf43fa..788eae69a5fe 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
@@ -128,10 +128,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ControlFlowPointcut)) {
+		if (!(other instanceof ControlFlowPointcut that)) {
 			return false;
 		}
-		ControlFlowPointcut that = (ControlFlowPointcut) other;
 		return (this.clazz.equals(that.clazz)) && ObjectUtils.nullSafeEquals(this.methodName, that.methodName);
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
index ff2370a32233..5fefc059f36a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
@@ -155,10 +155,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof DefaultIntroductionAdvisor)) {
+		if (!(other instanceof DefaultIntroductionAdvisor otherAdvisor)) {
 			return false;
 		}
-		DefaultIntroductionAdvisor otherAdvisor = (DefaultIntroductionAdvisor) other;
 		return (this.advice.equals(otherAdvisor.advice) && this.interfaces.equals(otherAdvisor.interfaces));
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
index e55cf0b6d3bd..a212e8983c4f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
@@ -61,9 +61,9 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction
 	 */
 	private final Map<Object, Object> delegateMap = new WeakHashMap<>();
 
-	private Class<?> defaultImplType;
+	private final Class<?> defaultImplType;
 
-	private Class<?> interfaceType;
+	private final Class<?> interfaceType;
 
 
 	public DelegatePerTargetObjectIntroductionInterceptor(Class<?> defaultImplType, Class<?> interfaceType) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
index 23b4d9b78de5..6fbd38279dc5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
@@ -146,10 +146,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof UnionMethodMatcher)) {
+			if (!(other instanceof UnionMethodMatcher that)) {
 				return false;
 			}
-			UnionMethodMatcher that = (UnionMethodMatcher) other;
 			return (this.mm1.equals(that.mm1) && this.mm2.equals(that.mm2));
 		}
 
@@ -223,8 +222,7 @@ public boolean equals(@Nullable Object other) {
 			}
 			ClassFilter otherCf1 = ClassFilter.TRUE;
 			ClassFilter otherCf2 = ClassFilter.TRUE;
-			if (other instanceof ClassFilterAwareUnionMethodMatcher) {
-				ClassFilterAwareUnionMethodMatcher cfa = (ClassFilterAwareUnionMethodMatcher) other;
+			if (other instanceof ClassFilterAwareUnionMethodMatcher cfa) {
 				otherCf1 = cfa.cf1;
 				otherCf2 = cfa.cf2;
 			}
@@ -312,10 +310,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof IntersectionMethodMatcher)) {
+			if (!(other instanceof IntersectionMethodMatcher that)) {
 				return false;
 			}
-			IntersectionMethodMatcher that = (IntersectionMethodMatcher) other;
 			return (this.mm1.equals(that.mm1) && this.mm2.equals(that.mm2));
 		}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
index 847f1bb86220..40530db71895 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
@@ -72,10 +72,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AnnotationClassFilter)) {
+		if (!(other instanceof AnnotationClassFilter otherCf)) {
 			return false;
 		}
-		AnnotationClassFilter otherCf = (AnnotationClassFilter) other;
 		return (this.annotationType.equals(otherCf.annotationType) && this.checkInherited == otherCf.checkInherited);
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
index d734fbc0f147..f17a78f6ecb6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
@@ -125,10 +125,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AnnotationMatchingPointcut)) {
+		if (!(other instanceof AnnotationMatchingPointcut otherPointcut)) {
 			return false;
 		}
-		AnnotationMatchingPointcut otherPointcut = (AnnotationMatchingPointcut) other;
 		return (this.classFilter.equals(otherPointcut.classFilter) &&
 				this.methodMatcher.equals(otherPointcut.methodMatcher));
 	}
@@ -189,10 +188,9 @@ public boolean equals(Object obj) {
 			if (this == obj) {
 				return true;
 			}
-			if (!(obj instanceof AnnotationCandidateClassFilter)) {
+			if (!(obj instanceof AnnotationCandidateClassFilter that)) {
 				return false;
 			}
-			AnnotationCandidateClassFilter that = (AnnotationCandidateClassFilter) obj;
 			return this.annotationType.equals(that.annotationType);
 		}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
index 720c7b889bbb..b65661bb4b74 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
@@ -92,10 +92,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AnnotationMethodMatcher)) {
+		if (!(other instanceof AnnotationMethodMatcher otherMm)) {
 			return false;
 		}
-		AnnotationMethodMatcher otherMm = (AnnotationMethodMatcher) other;
 		return (this.annotationType.equals(otherMm.annotationType) && this.checkInherited == otherMm.checkInherited);
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
index 2ebcc216dce7..cf3afa032c7d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
@@ -135,10 +135,9 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof EmptyTargetSource)) {
+		if (!(other instanceof EmptyTargetSource otherTs)) {
 			return false;
 		}
-		EmptyTargetSource otherTs = (EmptyTargetSource) other;
 		return (ObjectUtils.nullSafeEquals(this.targetClass, otherTs.targetClass) && this.isStatic == otherTs.isStatic);
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
index 24ae9865a6db..52115fbf45fb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
@@ -85,10 +85,9 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof SingletonTargetSource)) {
+		if (!(other instanceof SingletonTargetSource otherTargetSource)) {
 			return false;
 		}
-		SingletonTargetSource otherTargetSource = (SingletonTargetSource) other;
 		return this.target.equals(otherTargetSource.target);
 	}
 

From 63c6a7e15efe741adc38a4bccaef389468bb808b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 16:26:21 +0200
Subject: [PATCH 252/735] Update copyright date

---
 .../org/springframework/aop/aspectj/AbstractAspectJAdvice.java  | 2 +-
 .../org/springframework/aop/aspectj/AspectJAroundAdvice.java    | 2 +-
 .../org/springframework/aop/aspectj/AspectJPointcutAdvisor.java | 2 +-
 .../aop/config/AspectJAutoProxyBeanDefinitionParser.java        | 2 +-
 .../springframework/aop/config/ConfigBeanDefinitionParser.java  | 2 +-
 .../aop/config/ScopedProxyBeanDefinitionDecorator.java          | 2 +-
 .../java/org/springframework/aop/framework/AdvisedSupport.java  | 2 +-
 .../org/springframework/aop/framework/ProxyFactoryBean.java     | 2 +-
 .../aop/framework/adapter/DefaultAdvisorAdapterRegistry.java    | 2 +-
 .../springframework/aop/interceptor/ExposeBeanNameAdvisors.java | 2 +-
 .../org/springframework/aop/scope/ScopedProxyFactoryBean.java   | 2 +-
 .../springframework/aop/support/AbstractPointcutAdvisor.java    | 2 +-
 .../aop/support/AbstractRegexpMethodPointcut.java               | 2 +-
 .../src/main/java/org/springframework/aop/support/AopUtils.java | 2 +-
 .../org/springframework/aop/support/ComposablePointcut.java     | 2 +-
 .../support/DelegatePerTargetObjectIntroductionInterceptor.java | 2 +-
 .../java/org/springframework/aop/support/MethodMatchers.java    | 2 +-
 .../aop/support/annotation/AnnotationClassFilter.java           | 2 +-
 .../aop/support/annotation/AnnotationMatchingPointcut.java      | 2 +-
 .../aop/support/annotation/AnnotationMethodMatcher.java         | 2 +-
 .../java/org/springframework/aop/target/EmptyTargetSource.java  | 2 +-
 .../org/springframework/aop/target/SingletonTargetSource.java   | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
index 5beb29f55b5e..fdede934f586 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
index e3530a11a5ac..d1584c54af8a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
index 17fc3422a966..442df0808f26 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
index 1f23b5ecb7e4..70b9762006b0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
index 70b6870f75c1..fff18c0a4e42 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
index 0e51956f940a..e116ec85947a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
index 65ca054410eb..7bd772a29060 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
index d14f8008eddd..5f3d3d17e416 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
index da24c8017cff..9335a1f5a012 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
index 17aa3bfaf527..1f095ed89e9e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
index 2a77bf6b54b7..fe7934b0ca0c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
index 9c515e8ed04f..c032db69e90b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
index 8add9103caa1..9587e1164612 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
index 1260627ff3f8..a40218231b10 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
index b73c40bd4c10..9a259b16a23e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
index a212e8983c4f..299a474a64e0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
index 6fbd38279dc5..893986f6a9a2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
index 40530db71895..5ed1ae5f8b1e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
index f17a78f6ecb6..539e5820b12b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
index b65661bb4b74..ce6ec2e29afe 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
index cf3afa032c7d..da63c2bb2f8c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
index 52115fbf45fb..216b7c0648b5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 401c0d220a8e6f89b7707530005ce802c67729e8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 16:45:08 +0200
Subject: [PATCH 253/735] Apply "instanceof pattern matching" Eclipse clean-up
 in spring-beans

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes
- Comparator.comparing

This has only been applied to `src/main/java`.
---
 .../beans/BeanMetadataAttribute.java          |  5 +-
 .../beans/ExtendedBeanInfo.java               | 10 ++-
 .../GenericTypeAwarePropertyDescriptor.java   |  3 +-
 .../beans/MutablePropertyValues.java          |  5 +-
 .../springframework/beans/PropertyValue.java  |  5 +-
 .../beans/factory/BeanFactoryUtils.java       | 23 +++----
 .../BeanFactoryAnnotationUtils.java           |  5 +-
 .../annotation/CustomAutowireConfigurer.java  |  8 +--
 ...nitDestroyAnnotationBeanPostProcessor.java |  3 +-
 .../factory/annotation/InjectionMetadata.java |  5 +-
 .../factory/config/BeanDefinitionHolder.java  |  5 +-
 .../factory/config/BeanDefinitionVisitor.java | 11 ++-
 .../factory/config/BeanExpressionContext.java |  5 +-
 .../config/ConstructorArgumentValues.java     |  3 +-
 .../config/RuntimeBeanNameReference.java      |  5 +-
 .../factory/config/RuntimeBeanReference.java  |  5 +-
 .../factory/config/TypedStringValue.java      |  5 +-
 .../groovy/GroovyBeanDefinitionReader.java    |  2 +-
 .../parsing/BeanComponentDefinition.java      |  6 +-
 .../AbstractAutowireCapableBeanFactory.java   |  7 +-
 .../support/AbstractBeanDefinition.java       |  9 +--
 .../factory/support/AbstractBeanFactory.java  |  6 +-
 .../beans/factory/support/AutowireUtils.java  | 11 ++-
 .../support/BeanDefinitionValueResolver.java  | 68 +++++++++----------
 .../factory/support/ChildBeanDefinition.java  |  5 +-
 .../support/DefaultListableBeanFactory.java   |  7 +-
 .../support/GenericBeanDefinition.java        |  5 +-
 ...ricTypeAwareAutowireCandidateResolver.java |  5 +-
 .../beans/factory/support/LookupOverride.java |  3 +-
 .../beans/factory/support/MethodOverride.java |  5 +-
 .../factory/support/MethodOverrides.java      |  5 +-
 .../PropertiesBeanDefinitionReader.java       |  8 +--
 .../factory/support/ReplaceOverride.java      |  3 +-
 .../support/StaticListableBeanFactory.java    |  4 +-
 .../xml/BeanDefinitionParserDelegate.java     |  5 +-
 .../DefaultBeanDefinitionDocumentReader.java  |  5 +-
 .../SimpleConstructorNamespaceHandler.java    |  5 +-
 .../xml/SimplePropertyNamespaceHandler.java   |  5 +-
 .../factory/xml/XmlBeanDefinitionReader.java  |  4 +-
 .../beans/support/MutableSortDefinition.java  |  5 +-
 40 files changed, 120 insertions(+), 179 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
index db6435d5c0e4..57662a952b1a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,10 +85,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof BeanMetadataAttribute)) {
+		if (!(other instanceof BeanMetadataAttribute otherMa)) {
 			return false;
 		}
-		BeanMetadataAttribute otherMa = (BeanMetadataAttribute) other;
 		return (this.name.equals(otherMa.name) &&
 				ObjectUtils.nullSafeEquals(this.value, otherMa.value) &&
 				ObjectUtils.nullSafeEquals(this.source, otherMa.source));
diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
index 21ce57cf6add..a338b7cde609 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -139,7 +139,7 @@ private List<Method> findCandidateWriteMethods(MethodDescriptor[] methodDescript
 		// Sort non-void returning write methods to guard against the ill effects of
 		// non-deterministic sorting of methods returned from Class#getDeclaredMethods
 		// under JDK 7. See https://bugs.java.com/view_bug.do?bug_id=7023180
-		matches.sort((m1, m2) -> m2.toString().compareTo(m1.toString()));
+		matches.sort(Comparator.comparing(Method::toString).reversed());
 		return matches;
 	}
 
@@ -188,8 +188,7 @@ private PropertyDescriptor findExistingPropertyDescriptor(String propertyName, C
 		for (PropertyDescriptor pd : this.propertyDescriptors) {
 			final Class<?> candidateType;
 			final String candidateName = pd.getName();
-			if (pd instanceof IndexedPropertyDescriptor) {
-				IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
+			if (pd instanceof IndexedPropertyDescriptor ipd) {
 				candidateType = ipd.getIndexedPropertyType();
 				if (candidateName.equals(propertyName) &&
 						(candidateType.equals(propertyType) || candidateType.equals(propertyType.getComponentType()))) {
@@ -494,10 +493,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof IndexedPropertyDescriptor)) {
+			if (!(other instanceof IndexedPropertyDescriptor otherPd)) {
 				return false;
 			}
-			IndexedPropertyDescriptor otherPd = (IndexedPropertyDescriptor) other;
 			return (ObjectUtils.nullSafeEquals(getIndexedReadMethod(), otherPd.getIndexedReadMethod()) &&
 					ObjectUtils.nullSafeEquals(getIndexedWriteMethod(), otherPd.getIndexedWriteMethod()) &&
 					ObjectUtils.nullSafeEquals(getIndexedPropertyType(), otherPd.getIndexedPropertyType()) &&
diff --git a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
index b4052b7b84e9..fb5d4d15ae1d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -168,10 +168,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof GenericTypeAwarePropertyDescriptor)) {
+		if (!(other instanceof GenericTypeAwarePropertyDescriptor otherPd)) {
 			return false;
 		}
-		GenericTypeAwarePropertyDescriptor otherPd = (GenericTypeAwarePropertyDescriptor) other;
 		return (getBeanClass().equals(otherPd.getBeanClass()) && PropertyDescriptorUtils.equals(this, otherPd));
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
index 97c0a0ab05b9..1c978059ef1e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -221,8 +221,7 @@ public void setPropertyValueAt(PropertyValue pv, int i) {
 	 */
 	private PropertyValue mergeIfRequired(PropertyValue newPv, PropertyValue currentPv) {
 		Object value = newPv.getValue();
-		if (value instanceof Mergeable) {
-			Mergeable mergeable = (Mergeable) value;
+		if (value instanceof Mergeable mergeable) {
 			if (mergeable.isMergeEnabled()) {
 				Object merged = mergeable.merge(currentPv.getValue());
 				return new PropertyValue(newPv.getName(), merged);
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
index 16c6bae560a4..93b97042b010 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -192,10 +192,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof PropertyValue)) {
+		if (!(other instanceof PropertyValue otherPv)) {
 			return false;
 		}
-		PropertyValue otherPv = (PropertyValue) other;
 		return (this.name.equals(otherPv.name) &&
 				ObjectUtils.nullSafeEquals(this.value, otherPv.value) &&
 				ObjectUtils.nullSafeEquals(getSource(), otherPv.getSource()));
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
index 17a5d70460de..fbc7cb4751d0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -161,8 +161,7 @@ public static String[] beanNamesIncludingAncestors(ListableBeanFactory lbf) {
 	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, ResolvableType type) {
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type);
-		if (lbf instanceof HierarchicalBeanFactory) {
-			HierarchicalBeanFactory hbf = (HierarchicalBeanFactory) lbf;
+		if (lbf instanceof HierarchicalBeanFactory hbf) {
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				String[] parentResult = beanNamesForTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type);
@@ -199,8 +198,7 @@ public static String[] beanNamesForTypeIncludingAncestors(
 
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);
-		if (lbf instanceof HierarchicalBeanFactory) {
-			HierarchicalBeanFactory hbf = (HierarchicalBeanFactory) lbf;
+		if (lbf instanceof HierarchicalBeanFactory hbf) {
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				String[] parentResult = beanNamesForTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit);
@@ -226,8 +224,7 @@ public static String[] beanNamesForTypeIncludingAncestors(
 	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, Class<?> type) {
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type);
-		if (lbf instanceof HierarchicalBeanFactory) {
-			HierarchicalBeanFactory hbf = (HierarchicalBeanFactory) lbf;
+		if (lbf instanceof HierarchicalBeanFactory hbf) {
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				String[] parentResult = beanNamesForTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type);
@@ -263,8 +260,7 @@ public static String[] beanNamesForTypeIncludingAncestors(
 
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);
-		if (lbf instanceof HierarchicalBeanFactory) {
-			HierarchicalBeanFactory hbf = (HierarchicalBeanFactory) lbf;
+		if (lbf instanceof HierarchicalBeanFactory hbf) {
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				String[] parentResult = beanNamesForTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit);
@@ -289,8 +285,7 @@ public static String[] beanNamesForAnnotationIncludingAncestors(
 
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForAnnotation(annotationType);
-		if (lbf instanceof HierarchicalBeanFactory) {
-			HierarchicalBeanFactory hbf = (HierarchicalBeanFactory) lbf;
+		if (lbf instanceof HierarchicalBeanFactory hbf) {
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				String[] parentResult = beanNamesForAnnotationIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), annotationType);
@@ -327,8 +322,7 @@ public static <T> Map<String, T> beansOfTypeIncludingAncestors(ListableBeanFacto
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		Map<String, T> result = new LinkedHashMap<>(4);
 		result.putAll(lbf.getBeansOfType(type));
-		if (lbf instanceof HierarchicalBeanFactory) {
-			HierarchicalBeanFactory hbf = (HierarchicalBeanFactory) lbf;
+		if (lbf instanceof HierarchicalBeanFactory hbf) {
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				Map<String, T> parentResult = beansOfTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type);
@@ -376,8 +370,7 @@ public static <T> Map<String, T> beansOfTypeIncludingAncestors(
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		Map<String, T> result = new LinkedHashMap<>(4);
 		result.putAll(lbf.getBeansOfType(type, includeNonSingletons, allowEagerInit));
-		if (lbf instanceof HierarchicalBeanFactory) {
-			HierarchicalBeanFactory hbf = (HierarchicalBeanFactory) lbf;
+		if (lbf instanceof HierarchicalBeanFactory hbf) {
 			if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
 				Map<String, T> parentResult = beansOfTypeIncludingAncestors(
 						(ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
index 58e04c4c032d..722995aabec4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -166,8 +166,7 @@ public static boolean isQualifierMatch(
 				if (beanFactory instanceof ConfigurableBeanFactory) {
 					BeanDefinition bd = ((ConfigurableBeanFactory) beanFactory).getMergedBeanDefinition(beanName);
 					// Explicit qualifier metadata on bean definition? (typically in XML definition)
-					if (bd instanceof AbstractBeanDefinition) {
-						AbstractBeanDefinition abd = (AbstractBeanDefinition) bd;
+					if (bd instanceof AbstractBeanDefinition abd) {
 						AutowireCandidateQualifier candidate = abd.getQualifier(Qualifier.class.getName());
 						if (candidate != null) {
 							Object value = candidate.getAttribute(AutowireCandidateQualifier.VALUE_KEY);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
index d43329a0f626..86fe4482b2ee 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,11 +91,10 @@ public void setCustomQualifierTypes(Set<?> customQualifierTypes) {
 	@SuppressWarnings("unchecked")
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		if (this.customQualifierTypes != null) {
-			if (!(beanFactory instanceof DefaultListableBeanFactory)) {
+			if (!(beanFactory instanceof DefaultListableBeanFactory dlbf)) {
 				throw new IllegalStateException(
 						"CustomAutowireConfigurer needs to operate on a DefaultListableBeanFactory");
 			}
-			DefaultListableBeanFactory dlbf = (DefaultListableBeanFactory) beanFactory;
 			if (!(dlbf.getAutowireCandidateResolver() instanceof QualifierAnnotationAutowireCandidateResolver)) {
 				dlbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
 			}
@@ -106,8 +105,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 				if (value instanceof Class) {
 					customType = (Class<? extends Annotation>) value;
 				}
-				else if (value instanceof String) {
-					String className = (String) value;
+				else if (value instanceof String className) {
 					customType = (Class<? extends Annotation>) ClassUtils.resolveClassName(className, this.beanClassLoader);
 				}
 				else {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
index 2f1bd7763b2c..804c89a4455d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
@@ -394,10 +394,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof LifecycleElement)) {
+			if (!(other instanceof LifecycleElement otherElement)) {
 				return false;
 			}
-			LifecycleElement otherElement = (LifecycleElement) other;
 			return (this.identifier.equals(otherElement.identifier));
 		}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
index f7dcb8d18cf1..4e205558523d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -304,10 +304,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof InjectedElement)) {
+			if (!(other instanceof InjectedElement otherElement)) {
 				return false;
 			}
-			InjectedElement otherElement = (InjectedElement) other;
 			return this.member.equals(otherElement.member);
 		}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
index d6767f7dcf7e..0b25ad6144a1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -168,10 +168,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof BeanDefinitionHolder)) {
+		if (!(other instanceof BeanDefinitionHolder otherHolder)) {
 			return false;
 		}
-		BeanDefinitionHolder otherHolder = (BeanDefinitionHolder) other;
 		return this.beanDefinition.equals(otherHolder.beanDefinition) &&
 				this.beanName.equals(otherHolder.beanName) &&
 				ObjectUtils.nullSafeEquals(this.aliases, otherHolder.aliases);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
index 7b826c50d7cd..d3d83c71ca93 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -178,8 +178,7 @@ protected Object resolveValue(@Nullable Object value) {
 		else if (value instanceof BeanDefinitionHolder) {
 			visitBeanDefinition(((BeanDefinitionHolder) value).getBeanDefinition());
 		}
-		else if (value instanceof RuntimeBeanReference) {
-			RuntimeBeanReference ref = (RuntimeBeanReference) value;
+		else if (value instanceof RuntimeBeanReference ref) {
 			String newBeanName = resolveStringValue(ref.getBeanName());
 			if (newBeanName == null) {
 				return null;
@@ -188,8 +187,7 @@ else if (value instanceof RuntimeBeanReference) {
 				return new RuntimeBeanReference(newBeanName);
 			}
 		}
-		else if (value instanceof RuntimeBeanNameReference) {
-			RuntimeBeanNameReference ref = (RuntimeBeanNameReference) value;
+		else if (value instanceof RuntimeBeanNameReference ref) {
 			String newBeanName = resolveStringValue(ref.getBeanName());
 			if (newBeanName == null) {
 				return null;
@@ -210,8 +208,7 @@ else if (value instanceof Set) {
 		else if (value instanceof Map) {
 			visitMap((Map) value);
 		}
-		else if (value instanceof TypedStringValue) {
-			TypedStringValue typedStringValue = (TypedStringValue) value;
+		else if (value instanceof TypedStringValue typedStringValue) {
 			String stringValue = typedStringValue.getValue();
 			if (stringValue != null) {
 				String visitedString = resolveStringValue(stringValue);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
index e6e383935e78..e50e9346587e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,10 +73,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof BeanExpressionContext)) {
+		if (!(other instanceof BeanExpressionContext otherContext)) {
 			return false;
 		}
-		BeanExpressionContext otherContext = (BeanExpressionContext) other;
 		return (this.beanFactory == otherContext.beanFactory && this.scope == otherContext.scope);
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
index c4d779e697b8..a90e57094530 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
@@ -392,10 +392,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ConstructorArgumentValues)) {
+		if (!(other instanceof ConstructorArgumentValues that)) {
 			return false;
 		}
-		ConstructorArgumentValues that = (ConstructorArgumentValues) other;
 		if (this.genericArgumentValues.size() != that.genericArgumentValues.size() ||
 				this.indexedArgumentValues.size() != that.indexedArgumentValues.size()) {
 			return false;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
index 805f6bbd61bc..90a59c2ac7f5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,10 +71,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof RuntimeBeanNameReference)) {
+		if (!(other instanceof RuntimeBeanNameReference that)) {
 			return false;
 		}
-		RuntimeBeanNameReference that = (RuntimeBeanNameReference) other;
 		return this.beanName.equals(that.beanName);
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
index 11b4f1ac79b6..a414c3e78297 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,10 +135,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof RuntimeBeanReference)) {
+		if (!(other instanceof RuntimeBeanReference that)) {
 			return false;
 		}
-		RuntimeBeanReference that = (RuntimeBeanReference) other;
 		return (this.beanName.equals(that.beanName) && this.beanType == that.beanType &&
 				this.toParent == that.toParent);
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
index 70d4ab2ff09c..bd27173a3f88 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -219,10 +219,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof TypedStringValue)) {
+		if (!(other instanceof TypedStringValue otherValue)) {
 			return false;
 		}
-		TypedStringValue otherValue = (TypedStringValue) other;
 		return (ObjectUtils.nullSafeEquals(this.value, otherValue.value) &&
 				ObjectUtils.nullSafeEquals(this.targetType, otherValue.targetType));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
index 9ef7aa3799f3..56dd8580e9f8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
@@ -244,7 +244,7 @@ public int loadBeanDefinitions(EncodedResource encodedResource) throws BeanDefin
 		}
 
 		@SuppressWarnings("serial")
-		Closure<Object> beans = new Closure<Object>(this) {
+		Closure<Object> beans = new Closure<>(this) {
 			@Override
 			public Object call(Object... args) {
 				invokeBeanDefiningClosure((Closure<?>) args[0]);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
index 32305abbacc3..cb7720f85c9a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,9 +36,9 @@
  */
 public class BeanComponentDefinition extends BeanDefinitionHolder implements ComponentDefinition {
 
-	private BeanDefinition[] innerBeanDefinitions;
+	private final BeanDefinition[] innerBeanDefinitions;
 
-	private BeanReference[] beanReferences;
+	private final BeanReference[] beanReferences;
 
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index 77abc22fce61..5ab6fb085a27 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -303,9 +303,7 @@ public void ignoreDependencyInterface(Class<?> ifc) {
 	@Override
 	public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 		super.copyConfigurationFrom(otherFactory);
-		if (otherFactory instanceof AbstractAutowireCapableBeanFactory) {
-			AbstractAutowireCapableBeanFactory otherAutowireFactory =
-					(AbstractAutowireCapableBeanFactory) otherFactory;
+		if (otherFactory instanceof AbstractAutowireCapableBeanFactory otherAutowireFactory) {
 			this.instantiationStrategy = otherAutowireFactory.instantiationStrategy;
 			this.allowCircularReferences = otherAutowireFactory.allowCircularReferences;
 			this.ignoredDependencyTypes.addAll(otherAutowireFactory.ignoredDependencyTypes);
@@ -344,8 +342,7 @@ public Object configureBean(Object existingBean, String beanName) throws BeansEx
 		markBeanAsCreated(beanName);
 		BeanDefinition mbd = getMergedBeanDefinition(beanName);
 		RootBeanDefinition bd = null;
-		if (mbd instanceof RootBeanDefinition) {
-			RootBeanDefinition rbd = (RootBeanDefinition) mbd;
+		if (mbd instanceof RootBeanDefinition rbd) {
 			bd = (rbd.isPrototype() ? rbd : rbd.cloneBeanDefinition());
 		}
 		if (bd == null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
index 2ceff658dbce..09bbf79d1943 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
@@ -236,8 +236,7 @@ protected AbstractBeanDefinition(BeanDefinition original) {
 		setSource(original.getSource());
 		copyAttributesFrom(original);
 
-		if (original instanceof AbstractBeanDefinition) {
-			AbstractBeanDefinition originalAbd = (AbstractBeanDefinition) original;
+		if (original instanceof AbstractBeanDefinition originalAbd) {
 			if (originalAbd.hasBeanClass()) {
 				setBeanClass(originalAbd.getBeanClass());
 			}
@@ -313,8 +312,7 @@ public void overrideFrom(BeanDefinition other) {
 		setSource(other.getSource());
 		copyAttributesFrom(other);
 
-		if (other instanceof AbstractBeanDefinition) {
-			AbstractBeanDefinition otherAbd = (AbstractBeanDefinition) other;
+		if (other instanceof AbstractBeanDefinition otherAbd) {
 			if (otherAbd.hasBeanClass()) {
 				setBeanClass(otherAbd.getBeanClass());
 			}
@@ -1178,10 +1176,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AbstractBeanDefinition)) {
+		if (!(other instanceof AbstractBeanDefinition that)) {
 			return false;
 		}
-		AbstractBeanDefinition that = (AbstractBeanDefinition) other;
 		return (ObjectUtils.nullSafeEquals(getBeanClassName(), that.getBeanClassName()) &&
 				ObjectUtils.nullSafeEquals(this.scope, that.scope) &&
 				this.abstractFlag == that.abstractFlag &&
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index 921b46c38533..b33651f186d3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1054,8 +1054,7 @@ public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 		setCacheBeanMetadata(otherFactory.isCacheBeanMetadata());
 		setBeanExpressionResolver(otherFactory.getBeanExpressionResolver());
 		setConversionService(otherFactory.getConversionService());
-		if (otherFactory instanceof AbstractBeanFactory) {
-			AbstractBeanFactory otherAbstractFactory = (AbstractBeanFactory) otherFactory;
+		if (otherFactory instanceof AbstractBeanFactory otherAbstractFactory) {
 			this.propertyEditorRegistrars.addAll(otherAbstractFactory.propertyEditorRegistrars);
 			this.customEditors.putAll(otherAbstractFactory.customEditors);
 			this.typeConverter = otherAbstractFactory.typeConverter;
@@ -1512,8 +1511,7 @@ private Class<?> doResolveBeanClass(RootBeanDefinition mbd, Class<?>... typesToM
 			if (tempClassLoader != null) {
 				dynamicLoader = tempClassLoader;
 				freshResolve = true;
-				if (tempClassLoader instanceof DecoratingClassLoader) {
-					DecoratingClassLoader dcl = (DecoratingClassLoader) tempClassLoader;
+				if (tempClassLoader instanceof DecoratingClassLoader dcl) {
 					for (Class<?> typeToMatch : typesToMatch) {
 						dcl.excludeClass(typeToMatch.getName());
 					}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
index d807cc4dc2fe..c91508cb1810 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -198,8 +198,7 @@ public static Class<?> resolveReturnTypeForFactoryMethod(
 				Type methodParameterType = methodParameterTypes[i];
 				Object arg = args[i];
 				if (methodParameterType.equals(genericReturnType)) {
-					if (arg instanceof TypedStringValue) {
-						TypedStringValue typedValue = ((TypedStringValue) arg);
+					if (arg instanceof TypedStringValue typedValue) {
 						if (typedValue.hasTargetType()) {
 							return typedValue.getTargetType();
 						}
@@ -220,8 +219,7 @@ else if (arg != null && !(arg instanceof BeanMetadataElement)) {
 					}
 					return method.getReturnType();
 				}
-				else if (methodParameterType instanceof ParameterizedType) {
-					ParameterizedType parameterizedType = (ParameterizedType) methodParameterType;
+				else if (methodParameterType instanceof ParameterizedType parameterizedType) {
 					Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
 					for (Type typeArg : actualTypeArguments) {
 						if (typeArg.equals(genericReturnType)) {
@@ -233,8 +231,7 @@ else if (methodParameterType instanceof ParameterizedType) {
 								if (arg instanceof String) {
 									className = (String) arg;
 								}
-								else if (arg instanceof TypedStringValue) {
-									TypedStringValue typedValue = ((TypedStringValue) arg);
+								else if (arg instanceof TypedStringValue typedValue) {
 									String targetTypeName = typedValue.getTargetTypeName();
 									if (targetTypeName == null || Class.class.getName().equals(targetTypeName)) {
 										className = typedValue.getValue();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
index be9667b19a38..0468bc4aadd1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,7 @@
  * Used by {@link AbstractAutowireCapableBeanFactory}.
  *
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 1.2
  * @see AbstractAutowireCapableBeanFactory
  */
@@ -108,12 +109,11 @@ public BeanDefinitionValueResolver(AbstractAutowireCapableBeanFactory beanFactor
 	public Object resolveValueIfNecessary(Object argName, @Nullable Object value) {
 		// We must check each value to see whether it requires a runtime reference
 		// to another bean to be resolved.
-		if (value instanceof RuntimeBeanReference) {
-			RuntimeBeanReference ref = (RuntimeBeanReference) value;
+		if (value instanceof RuntimeBeanReference ref) {
 			return resolveReference(argName, ref);
 		}
-		else if (value instanceof RuntimeBeanNameReference) {
-			String refName = ((RuntimeBeanNameReference) value).getBeanName();
+		else if (value instanceof RuntimeBeanNameReference ref) {
+			String refName = ref.getBeanName();
 			refName = String.valueOf(doEvaluate(refName));
 			if (!this.beanFactory.containsBean(refName)) {
 				throw new BeanDefinitionStoreException(
@@ -121,22 +121,20 @@ else if (value instanceof RuntimeBeanNameReference) {
 			}
 			return refName;
 		}
-		else if (value instanceof BeanDefinitionHolder) {
+		else if (value instanceof BeanDefinitionHolder bdHolder) {
 			// Resolve BeanDefinitionHolder: contains BeanDefinition with name and aliases.
-			BeanDefinitionHolder bdHolder = (BeanDefinitionHolder) value;
 			return resolveInnerBean(argName, bdHolder.getBeanName(), bdHolder.getBeanDefinition());
 		}
-		else if (value instanceof BeanDefinition) {
+		else if (value instanceof BeanDefinition bd) {
 			// Resolve plain BeanDefinition, without contained name: use dummy name.
-			BeanDefinition bd = (BeanDefinition) value;
 			String innerBeanName = "(inner bean)" + BeanFactoryUtils.GENERATED_BEAN_NAME_SEPARATOR +
 					ObjectUtils.getIdentityHexString(bd);
 			return resolveInnerBean(argName, innerBeanName, bd);
 		}
-		else if (value instanceof DependencyDescriptor) {
+		else if (value instanceof DependencyDescriptor dependencyDescriptor) {
 			Set<String> autowiredBeanNames = new LinkedHashSet<>(4);
 			Object result = this.beanFactory.resolveDependency(
-					(DependencyDescriptor) value, this.beanName, autowiredBeanNames, this.typeConverter);
+					dependencyDescriptor, this.beanName, autowiredBeanNames, this.typeConverter);
 			for (String autowiredBeanName : autowiredBeanNames) {
 				if (this.beanFactory.containsBean(autowiredBeanName)) {
 					this.beanFactory.registerDependentBean(autowiredBeanName, this.beanName);
@@ -144,16 +142,15 @@ else if (value instanceof DependencyDescriptor) {
 			}
 			return result;
 		}
-		else if (value instanceof ManagedArray) {
+		else if (value instanceof ManagedArray managedArray) {
 			// May need to resolve contained runtime references.
-			ManagedArray array = (ManagedArray) value;
-			Class<?> elementType = array.resolvedElementType;
+			Class<?> elementType = managedArray.resolvedElementType;
 			if (elementType == null) {
-				String elementTypeName = array.getElementTypeName();
+				String elementTypeName = managedArray.getElementTypeName();
 				if (StringUtils.hasText(elementTypeName)) {
 					try {
 						elementType = ClassUtils.forName(elementTypeName, this.beanFactory.getBeanClassLoader());
-						array.resolvedElementType = elementType;
+						managedArray.resolvedElementType = elementType;
 					}
 					catch (Throwable ex) {
 						// Improve the message by showing the context.
@@ -168,27 +165,27 @@ else if (value instanceof ManagedArray) {
 			}
 			return resolveManagedArray(argName, (List<?>) value, elementType);
 		}
-		else if (value instanceof ManagedList) {
+		else if (value instanceof ManagedList<?> managedList) {
 			// May need to resolve contained runtime references.
-			return resolveManagedList(argName, (List<?>) value);
+			return resolveManagedList(argName, managedList);
 		}
-		else if (value instanceof ManagedSet) {
+		else if (value instanceof ManagedSet<?> managedSet) {
 			// May need to resolve contained runtime references.
-			return resolveManagedSet(argName, (Set<?>) value);
+			return resolveManagedSet(argName, managedSet);
 		}
-		else if (value instanceof ManagedMap) {
+		else if (value instanceof ManagedMap<?, ?> managedMap) {
 			// May need to resolve contained runtime references.
-			return resolveManagedMap(argName, (Map<?, ?>) value);
+			return resolveManagedMap(argName, managedMap);
 		}
-		else if (value instanceof ManagedProperties) {
-			Properties original = (Properties) value;
+		else if (value instanceof ManagedProperties original) {
+			// Properties original = managedProperties;
 			Properties copy = new Properties();
 			original.forEach((propKey, propValue) -> {
-				if (propKey instanceof TypedStringValue) {
-					propKey = evaluate((TypedStringValue) propKey);
+				if (propKey instanceof TypedStringValue typedStringValue) {
+					propKey = evaluate(typedStringValue);
 				}
-				if (propValue instanceof TypedStringValue) {
-					propValue = evaluate((TypedStringValue) propValue);
+				if (propValue instanceof TypedStringValue typedStringValue) {
+					propValue = evaluate(typedStringValue);
 				}
 				if (propKey == null || propValue == null) {
 					throw new BeanCreationException(
@@ -199,9 +196,8 @@ else if (value instanceof ManagedProperties) {
 			});
 			return copy;
 		}
-		else if (value instanceof TypedStringValue) {
+		else if (value instanceof TypedStringValue typedStringValue) {
 			// Convert value to target type here.
-			TypedStringValue typedStringValue = (TypedStringValue) value;
 			Object valueObject = evaluate(typedStringValue);
 			try {
 				Class<?> resolvedTargetType = resolveTargetType(typedStringValue);
@@ -248,11 +244,10 @@ protected Object evaluate(TypedStringValue value) {
 	 */
 	@Nullable
 	protected Object evaluate(@Nullable Object value) {
-		if (value instanceof String) {
-			return doEvaluate((String) value);
+		if (value instanceof String str) {
+			return doEvaluate(str);
 		}
-		else if (value instanceof String[]) {
-			String[] values = (String[]) value;
+		else if (value instanceof String[] values) {
 			boolean actuallyResolved = false;
 			Object[] resolvedValues = new Object[values.length];
 			for (int i = 0; i < values.length; i++) {
@@ -372,10 +367,9 @@ private Object resolveInnerBean(Object argName, String innerBeanName, BeanDefini
 			}
 			// Actually create the inner bean instance now...
 			Object innerBean = this.beanFactory.createBean(actualInnerBeanName, mbd, null);
-			if (innerBean instanceof FactoryBean) {
+			if (innerBean instanceof FactoryBean<?> factoryBean) {
 				boolean synthetic = mbd.isSynthetic();
-				innerBean = this.beanFactory.getObjectFromFactoryBean(
-						(FactoryBean<?>) innerBean, actualInnerBeanName, !synthetic);
+				innerBean = this.beanFactory.getObjectFromFactoryBean(factoryBean, actualInnerBeanName, !synthetic);
 			}
 			if (innerBean instanceof NullBean) {
 				innerBean = null;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
index 51b981f6193c..bab5f2118faa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -160,10 +160,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ChildBeanDefinition)) {
+		if (!(other instanceof ChildBeanDefinition that)) {
 			return false;
 		}
-		ChildBeanDefinition that = (ChildBeanDefinition) other;
 		return (ObjectUtils.nullSafeEquals(this.parentName, that.parentName) && super.equals(other));
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index 7c16748e1414..6848c7347745 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -310,8 +310,7 @@ public AutowireCandidateResolver getAutowireCandidateResolver() {
 	@Override
 	public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 		super.copyConfigurationFrom(otherFactory);
-		if (otherFactory instanceof DefaultListableBeanFactory) {
-			DefaultListableBeanFactory otherListableFactory = (DefaultListableBeanFactory) otherFactory;
+		if (otherFactory instanceof DefaultListableBeanFactory otherListableFactory) {
 			this.allowBeanDefinitionOverriding = otherListableFactory.allowBeanDefinitionOverriding;
 			this.allowEagerClassLoading = otherListableFactory.allowEagerClassLoading;
 			this.dependencyComparator = otherListableFactory.dependencyComparator;
@@ -389,7 +388,7 @@ public <T> ObjectProvider<T> getBeanProvider(Class<T> requiredType, boolean allo
 
 	@Override
 	public <T> ObjectProvider<T> getBeanProvider(ResolvableType requiredType, boolean allowEagerInit) {
-		return new BeanObjectProvider<T>() {
+		return new BeanObjectProvider<>() {
 			@Override
 			public T getObject() throws BeansException {
 				T resolved = resolveBean(requiredType, null, false);
@@ -1248,7 +1247,7 @@ private <T> NamedBeanHolder<T> resolveNamedBean(
 		if (bean instanceof NullBean) {
 			return null;
 		}
-		return new NamedBeanHolder<T>(beanName, adaptBeanInstance(beanName, bean, requiredType.toClass()));
+		return new NamedBeanHolder<>(beanName, adaptBeanInstance(beanName, bean, requiredType.toClass()));
 	}
 
 	@Override
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
index ca779d1e66e9..b0a40b332ae3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,10 +88,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof GenericBeanDefinition)) {
+		if (!(other instanceof GenericBeanDefinition that)) {
 			return false;
 		}
-		GenericBeanDefinition that = (GenericBeanDefinition) other;
 		return (ObjectUtils.nullSafeEquals(this.parentName, that.parentName) && super.equals(other));
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericTypeAwareAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericTypeAwareAutowireCandidateResolver.java
index 01b81450903d..8fe5a854ffeb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericTypeAwareAutowireCandidateResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericTypeAwareAutowireCandidateResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,8 +142,7 @@ protected boolean checkGenericTypeMatch(BeanDefinitionHolder bdHolder, Dependenc
 	@Nullable
 	protected RootBeanDefinition getResolvedDecoratedDefinition(RootBeanDefinition rbd) {
 		BeanDefinitionHolder decDef = rbd.getDecoratedDefinition();
-		if (decDef != null && this.beanFactory instanceof ConfigurableListableBeanFactory) {
-			ConfigurableListableBeanFactory clbf = (ConfigurableListableBeanFactory) this.beanFactory;
+		if (decDef != null && this.beanFactory instanceof ConfigurableListableBeanFactory clbf) {
 			if (clbf.containsBeanDefinition(decDef.getBeanName())) {
 				BeanDefinition dbd = clbf.getMergedBeanDefinition(decDef.getBeanName());
 				if (dbd instanceof RootBeanDefinition) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
index c441bf7e9cc3..faa7478a8198 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
@@ -102,10 +102,9 @@ public boolean matches(Method method) {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (!(other instanceof LookupOverride) || !super.equals(other)) {
+		if (!(other instanceof LookupOverride that) || !super.equals(other)) {
 			return false;
 		}
-		LookupOverride that = (LookupOverride) other;
 		return (ObjectUtils.nullSafeEquals(this.method, that.method) &&
 				ObjectUtils.nullSafeEquals(this.beanName, that.beanName));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
index 24a2056cf195..0107e104c213 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,10 +109,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MethodOverride)) {
+		if (!(other instanceof MethodOverride that)) {
 			return false;
 		}
-		MethodOverride that = (MethodOverride) other;
 		return (ObjectUtils.nullSafeEquals(this.methodName, that.methodName) &&
 				ObjectUtils.nullSafeEquals(this.source, that.source));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
index a84a15f83020..07dc3a6b0db9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,10 +107,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MethodOverrides)) {
+		if (!(other instanceof MethodOverrides that)) {
 			return false;
 		}
-		MethodOverrides that = (MethodOverrides) other;
 		return this.overrides.equals(that.overrides);
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
index 617a13be564b..01d901048d00 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -363,10 +363,9 @@ public int registerBeanDefinitions(Map<?, ?> map, @Nullable String prefix, Strin
 		int beanCount = 0;
 
 		for (Object key : map.keySet()) {
-			if (!(key instanceof String)) {
+			if (!(key instanceof String keyString)) {
 				throw new IllegalArgumentException("Illegal key [" + key + "]: only Strings allowed");
 			}
-			String keyString = (String) key;
 			if (keyString.startsWith(prefix)) {
 				// Key is of form: prefix<name>.property
 				String nameAndProperty = keyString.substring(prefix.length());
@@ -519,8 +518,7 @@ else if (property.endsWith(REF_SUFFIX)) {
 	 */
 	private Object readValue(Map.Entry<?, ?> entry) {
 		Object val = entry.getValue();
-		if (val instanceof String) {
-			String strVal = (String) val;
+		if (val instanceof String strVal) {
 			// If it starts with a reference prefix...
 			if (strVal.startsWith(REF_PREFIX)) {
 				// Expand the reference.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
index 80f866d21cc7..a702b7d7af1a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
@@ -97,10 +97,9 @@ public boolean matches(Method method) {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (!(other instanceof ReplaceOverride) || !super.equals(other)) {
+		if (!(other instanceof ReplaceOverride that) || !super.equals(other)) {
 			return false;
 		}
-		ReplaceOverride that = (ReplaceOverride) other;
 		return (ObjectUtils.nullSafeEquals(this.methodReplacerBeanName, that.methodReplacerBeanName) &&
 				ObjectUtils.nullSafeEquals(this.typeIdentifiers, that.typeIdentifiers));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
index a5430120dfdb..b9994f6f7633 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -284,7 +284,7 @@ public <T> ObjectProvider<T> getBeanProvider(Class<T> requiredType, boolean allo
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> ObjectProvider<T> getBeanProvider(ResolvableType requiredType, boolean allowEagerInit) {
-		return new ObjectProvider<T>() {
+		return new ObjectProvider<>() {
 			@Override
 			public T getObject() throws BeansException {
 				String[] beanNames = getBeanNamesForType(requiredType);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
index 6be311eb1efe..fd5f4ad64527 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1186,8 +1186,7 @@ public Map<Object, Object> parseMapElement(Element mapEle, @Nullable BeanDefinit
 			Element valueEle = null;
 			for (int j = 0; j < entrySubNodes.getLength(); j++) {
 				Node node = entrySubNodes.item(j);
-				if (node instanceof Element) {
-					Element candidateEle = (Element) node;
+				if (node instanceof Element candidateEle) {
 					if (nodeNameEquals(candidateEle, KEY_ELEMENT)) {
 						if (keyEle != null) {
 							error("<entry> element is only allowed to contain one <key> sub-element", entryEle);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
index af5026dce346..b8e2935a9c46 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -170,8 +170,7 @@ protected void parseBeanDefinitions(Element root, BeanDefinitionParserDelegate d
 			NodeList nl = root.getChildNodes();
 			for (int i = 0; i < nl.getLength(); i++) {
 				Node node = nl.item(i);
-				if (node instanceof Element) {
-					Element ele = (Element) node;
+				if (node instanceof Element ele) {
 					if (delegate.isDefaultNamespace(ele)) {
 						parseDefaultElement(ele, delegate);
 					}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
index ddffb17d5175..f30852f97b6c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,8 +78,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
-		if (node instanceof Attr) {
-			Attr attr = (Attr) node;
+		if (node instanceof Attr attr) {
 			String argName = StringUtils.trimWhitespace(parserContext.getDelegate().getLocalName(attr));
 			String argValue = StringUtils.trimWhitespace(attr.getValue());
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
index 9cecef4eed47..ec3c1512d8a8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,8 +67,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
-		if (node instanceof Attr) {
-			Attr attr = (Attr) node;
+		if (node instanceof Attr attr) {
 			String propertyName = parserContext.getDelegate().getLocalName(attr);
 			String propertyValue = attr.getValue();
 			MutablePropertyValues pvs = definition.getBeanDefinition().getPropertyValues();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
index 589208a4d3af..25cef22bd011 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 	private final XmlValidationModeDetector validationModeDetector = new XmlValidationModeDetector();
 
 	private final ThreadLocal<Set<EncodedResource>> resourcesCurrentlyBeingLoaded =
-			new NamedThreadLocal<Set<EncodedResource>>("XML bean definition resources currently being loaded"){
+			new NamedThreadLocal<>("XML bean definition resources currently being loaded"){
 				@Override
 				protected Set<EncodedResource> initialValue() {
 					return new HashSet<>(4);
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
index 2a428fc9d077..096b0d6a2cde 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,10 +159,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof SortDefinition)) {
+		if (!(other instanceof SortDefinition otherSd)) {
 			return false;
 		}
-		SortDefinition otherSd = (SortDefinition) other;
 		return (getProperty().equals(otherSd.getProperty()) &&
 				isAscending() == otherSd.isAscending() &&
 				isIgnoreCase() == otherSd.isIgnoreCase());

From 67333a3f94b5ad3ab828988932f4a75759d0c53c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 17:09:30 +0200
Subject: [PATCH 254/735] Apply "instanceof pattern matching" Eclipse clean-up
 in spring-context

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes
- Comparator.comparing
- convert to switch expression

This has only been applied to `src/main/java`.
---
 .../AnnotationCacheOperationSource.java       |  5 +--
 .../cache/config/CacheAdviceParser.java       | 12 ++---
 .../cache/interceptor/CacheAspectSupport.java |  3 +-
 .../CacheOperationSourcePointcut.java         |  5 +--
 .../NameMatchCacheOperationSource.java        |  7 ++-
 .../AnnotationBeanNameGenerator.java          |  5 +--
 .../AnnotationScopeMetadataResolver.java      |  5 +--
 .../CommonAnnotationBeanPostProcessor.java    | 26 +++++------
 ...onfigurationClassBeanDefinitionReader.java |  8 ++--
 .../ConfigurationClassEnhancer.java           |  6 +--
 .../ConfigurationClassPostProcessor.java      | 45 +++++++++----------
 .../Jsr330ScopeMetadataResolver.java          |  5 +--
 .../AbstractApplicationEventMulticaster.java  |  3 +-
 .../ApplicationListenerMethodAdapter.java     |  3 +-
 .../expression/AnnotatedElementKey.java       |  5 +--
 .../expression/CachedExpressionEvaluator.java |  5 +--
 .../support/AbstractApplicationContext.java   |  5 +--
 .../DefaultMessageSourceResolvable.java       |  5 +--
 .../PostProcessorRegistrationDelegate.java    | 10 ++---
 .../PropertySourcesPlaceholderConfigurer.java |  2 +-
 .../context/support/SimpleThreadScope.java    |  4 +-
 .../standard/DateTimeFormatterFactory.java    |  9 ++++
 .../format/number/NumberStyleFormatter.java   |  5 +--
 .../support/FormattingConversionService.java  |  5 +--
 ...esourceOverridingShadowingClassLoader.java |  6 +--
 .../jmx/access/MBeanClientInterceptor.java    | 15 +++----
 .../jmx/export/MBeanExporter.java             |  4 +-
 ...bstractConfigurableMBeanInfoAssembler.java |  8 ++--
 .../support/ConnectorServerFactoryBean.java   |  4 +-
 .../MBeanServerConnectionFactoryBean.java     |  4 +-
 .../support/NotificationListenerHolder.java   |  5 +--
 .../jndi/support/SimpleJndiBeanFactory.java   |  4 +-
 .../annotation/AsyncAnnotationAdvisor.java    |  4 +-
 .../DefaultManagedAwareThreadFactory.java     |  4 +-
 .../concurrent/ThreadPoolTaskScheduler.java   |  3 +-
 .../scheduling/support/BitsCronField.java     |  3 +-
 .../support/CompositeCronField.java           |  3 +-
 .../scheduling/support/CronExpression.java    |  3 +-
 .../support/CronSequenceGenerator.java        |  5 +--
 .../scheduling/support/PeriodicTrigger.java   |  5 +--
 .../scheduling/support/QuartzCronField.java   |  3 +-
 .../support/StandardScriptFactory.java        |  5 +--
 .../support/UiApplicationContextUtils.java    |  5 +--
 .../validation/AbstractBindingResult.java     |  8 ++--
 .../SpringValidatorAdapter.java               | 12 ++---
 .../support/BindingAwareModelMap.java         |  3 +-
 46 files changed, 137 insertions(+), 172 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java
index 5d34d0e1031f..230a36d18766 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -168,10 +168,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AnnotationCacheOperationSource)) {
+		if (!(other instanceof AnnotationCacheOperationSource otherCos)) {
 			return false;
 		}
-		AnnotationCacheOperationSource otherCos = (AnnotationCacheOperationSource) other;
 		return (this.annotationParsers.equals(otherCos.annotationParsers) &&
 				this.publicMethodsOnly == otherCos.publicMethodsOnly);
 	}
diff --git a/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java
index 2d75593e50da..c85dcad9065d 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -175,15 +175,15 @@ private static String getAttributeValue(Element element, String attributeName, S
 	 */
 	private static class Props {
 
-		private String key;
+		private final String key;
 
-		private String keyGenerator;
+		private final String keyGenerator;
 
-		private String cacheManager;
+		private final String cacheManager;
 
-		private String condition;
+		private final String condition;
 
-		private String method;
+		private final String method;
 
 		@Nullable
 		private String[] caches;
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
index c528a83206bd..f29dfe3395ff 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
@@ -857,10 +857,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof CacheOperationCacheKey)) {
+			if (!(other instanceof CacheOperationCacheKey otherKey)) {
 				return false;
 			}
-			CacheOperationCacheKey otherKey = (CacheOperationCacheKey) other;
 			return (this.cacheOperation.equals(otherKey.cacheOperation) &&
 					this.methodCacheKey.equals(otherKey.methodCacheKey));
 		}
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
index 5cf286faf637..d555d802a234 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,10 +53,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof CacheOperationSourcePointcut)) {
+		if (!(other instanceof CacheOperationSourcePointcut otherPc)) {
 			return false;
 		}
-		CacheOperationSourcePointcut otherPc = (CacheOperationSourcePointcut) other;
 		return ObjectUtils.nullSafeEquals(getCacheOperationSource(), otherPc.getCacheOperationSource());
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
index ac23ae7e9fd2..d916e3f89c76 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class NameMatchCacheOperationSource implements CacheOperationSource, Seri
 
 
 	/** Keys are method names; values are TransactionAttributes. */
-	private Map<String, Collection<CacheOperation>> nameMap = new LinkedHashMap<>();
+	private final Map<String, Collection<CacheOperation>> nameMap = new LinkedHashMap<>();
 
 
 	/**
@@ -114,10 +114,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof NameMatchCacheOperationSource)) {
+		if (!(other instanceof NameMatchCacheOperationSource otherTas)) {
 			return false;
 		}
-		NameMatchCacheOperationSource otherTas = (NameMatchCacheOperationSource) other;
 		return ObjectUtils.nullSafeEquals(this.nameMap, otherTas.nameMap);
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index d686b5f29921..e690e76d86ea 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,8 +107,7 @@ protected String determineBeanNameFromAnnotation(AnnotatedBeanDefinition annotat
 				});
 				if (isStereotypeWithNameValue(type, metaTypes, attributes)) {
 					Object value = attributes.get("value");
-					if (value instanceof String) {
-						String strVal = (String) value;
+					if (value instanceof String strVal) {
 						if (StringUtils.hasLength(strVal)) {
 							if (beanName != null && !strVal.equals(beanName)) {
 								throw new IllegalStateException("Stereotype annotations suggest inconsistent " +
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
index fec4fb3e0780..867d8d17e2b4 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,8 +77,7 @@ public void setScopeAnnotationType(Class<? extends Annotation> scopeAnnotationTy
 	@Override
 	public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 		ScopeMetadata metadata = new ScopeMetadata();
-		if (definition instanceof AnnotatedBeanDefinition) {
-			AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
+		if (definition instanceof AnnotatedBeanDefinition annDef) {
 			AnnotationAttributes attributes = AnnotationConfigUtils.attributesFor(
 					annDef.getMetadata(), this.scopeAnnotationType);
 			if (attributes != null) {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index c3efdfbed261..81b77e5e6a41 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -266,8 +266,8 @@ public void setBeanFactory(BeanFactory beanFactory) {
 		if (this.resourceFactory == null) {
 			this.resourceFactory = beanFactory;
 		}
-		if (beanFactory instanceof ConfigurableBeanFactory) {
-			this.embeddedValueResolver = new EmbeddedValueResolver((ConfigurableBeanFactory) beanFactory);
+		if (beanFactory instanceof ConfigurableBeanFactory configurableBeanFactory) {
+			this.embeddedValueResolver = new EmbeddedValueResolver(configurableBeanFactory);
 		}
 	}
 
@@ -437,8 +437,8 @@ public void releaseTarget(Object target) {
 		if (element.lookupType.isInterface()) {
 			pf.addInterface(element.lookupType);
 		}
-		ClassLoader classLoader = (this.beanFactory instanceof ConfigurableBeanFactory ?
-				((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader() : null);
+		ClassLoader classLoader = (this.beanFactory instanceof ConfigurableBeanFactory configurableBeanFactory ?
+				configurableBeanFactory.getBeanClassLoader() : null);
 		return pf.getProxy(classLoader);
 	}
 
@@ -492,18 +492,17 @@ protected Object autowireResource(BeanFactory factory, LookupElement element, @N
 		Set<String> autowiredBeanNames;
 		String name = element.name;
 
-		if (factory instanceof AutowireCapableBeanFactory) {
-			AutowireCapableBeanFactory beanFactory = (AutowireCapableBeanFactory) factory;
+		if (factory instanceof AutowireCapableBeanFactory autowireCapableBeanFactory) {
 			DependencyDescriptor descriptor = element.getDependencyDescriptor();
 			if (this.fallbackToDefaultTypeMatch && element.isDefaultName && !factory.containsBean(name)) {
 				autowiredBeanNames = new LinkedHashSet<>();
-				resource = beanFactory.resolveDependency(descriptor, requestingBeanName, autowiredBeanNames, null);
+				resource = autowireCapableBeanFactory.resolveDependency(descriptor, requestingBeanName, autowiredBeanNames, null);
 				if (resource == null) {
 					throw new NoSuchBeanDefinitionException(element.getLookupType(), "No resolvable resource object");
 				}
 			}
 			else {
-				resource = beanFactory.resolveBeanByName(name, descriptor);
+				resource = autowireCapableBeanFactory.resolveBeanByName(name, descriptor);
 				autowiredBeanNames = Collections.singleton(name);
 			}
 		}
@@ -512,11 +511,10 @@ protected Object autowireResource(BeanFactory factory, LookupElement element, @N
 			autowiredBeanNames = Collections.singleton(name);
 		}
 
-		if (factory instanceof ConfigurableBeanFactory) {
-			ConfigurableBeanFactory beanFactory = (ConfigurableBeanFactory) factory;
+		if (factory instanceof ConfigurableBeanFactory configurableBeanFactory) {
 			for (String autowiredBeanName : autowiredBeanNames) {
-				if (requestingBeanName != null && beanFactory.containsBean(autowiredBeanName)) {
-					beanFactory.registerDependentBean(autowiredBeanName, requestingBeanName);
+				if (requestingBeanName != null && configurableBeanFactory.containsBean(autowiredBeanName)) {
+					configurableBeanFactory.registerDependentBean(autowiredBeanName, requestingBeanName);
 				}
 			}
 		}
@@ -671,8 +669,8 @@ protected Object getResourceToInject(Object target, @Nullable String requestingB
 				if (beanFactory != null && beanFactory.containsBean(this.beanName)) {
 					// Local match found for explicitly specified local bean name.
 					Object bean = beanFactory.getBean(this.beanName, this.lookupType);
-					if (requestingBeanName != null && beanFactory instanceof ConfigurableBeanFactory) {
-						((ConfigurableBeanFactory) beanFactory).registerDependentBean(this.beanName, requestingBeanName);
+					if (requestingBeanName != null && beanFactory instanceof ConfigurableBeanFactory configurableBeanFactory) {
+						configurableBeanFactory.registerDependentBean(this.beanName, requestingBeanName);
 					}
 					return bean;
 				}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
index 427e2bec83b2..85b45e1574f1 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -305,8 +305,7 @@ protected boolean isOverriddenByExistingDefinition(BeanMethod beanMethod, String
 		// -> allow the current bean method to override, since both are at second-pass level.
 		// However, if the bean method is an overloaded case on the same configuration class,
 		// preserve the existing bean definition.
-		if (existingBeanDef instanceof ConfigurationClassBeanDefinition) {
-			ConfigurationClassBeanDefinition ccbd = (ConfigurationClassBeanDefinition) existingBeanDef;
+		if (existingBeanDef instanceof ConfigurationClassBeanDefinition ccbd) {
 			if (ccbd.getMetadata().getClassName().equals(
 					beanMethod.getConfigurationClass().getMetadata().getClassName())) {
 				if (ccbd.getFactoryMethodMetadata().getMethodName().equals(ccbd.getFactoryMethodName())) {
@@ -373,8 +372,7 @@ else if (shouldIgnoreXml) {
 					// Instantiate the specified BeanDefinitionReader
 					reader = readerClass.getConstructor(BeanDefinitionRegistry.class).newInstance(this.registry);
 					// Delegate the current ResourceLoader to it if possible
-					if (reader instanceof AbstractBeanDefinitionReader) {
-						AbstractBeanDefinitionReader abdr = ((AbstractBeanDefinitionReader) reader);
+					if (reader instanceof AbstractBeanDefinitionReader abdr) {
 						abdr.setResourceLoader(this.resourceLoader);
 						abdr.setEnvironment(this.environment);
 					}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
index 17079522c7f6..eb53d63fbf84 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.aop.scope.ScopedProxyFactoryBean;
+import org.springframework.asm.Opcodes;
 import org.springframework.asm.Type;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -36,7 +37,6 @@
 import org.springframework.beans.factory.support.SimpleInstantiationStrategy;
 import org.springframework.cglib.core.ClassGenerator;
 import org.springframework.cglib.core.ClassLoaderAwareGeneratorStrategy;
-import org.springframework.cglib.core.Constants;
 import org.springframework.cglib.core.SpringNamingPolicy;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.CallbackFilter;
@@ -219,7 +219,7 @@ protected ClassGenerator transform(ClassGenerator cg) throws Exception {
 			ClassEmitterTransformer transformer = new ClassEmitterTransformer() {
 				@Override
 				public void end_class() {
-					declare_field(Constants.ACC_PUBLIC, BEAN_FACTORY_FIELD, Type.getType(BeanFactory.class), null);
+					declare_field(Opcodes.ACC_PUBLIC, BEAN_FACTORY_FIELD, Type.getType(BeanFactory.class), null);
 					super.end_class();
 				}
 			};
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
index 7913e61f56b2..e5da4c44c794 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -371,10 +371,10 @@ else if (ConfigurationClassUtils.checkConfigurationClassCandidate(beanDef, this.
 			sbr.registerSingleton(IMPORT_REGISTRY_BEAN_NAME, parser.getImportRegistry());
 		}
 
-		if (this.metadataReaderFactory instanceof CachingMetadataReaderFactory) {
+		if (this.metadataReaderFactory instanceof CachingMetadataReaderFactory cachingMetadataReaderFactory) {
 			// Clear cache in externally provided MetadataReaderFactory; this is a no-op
 			// for a shared cache since it'll be cleared by the ApplicationContext.
-			((CachingMetadataReaderFactory) this.metadataReaderFactory).clearCache();
+			cachingMetadataReaderFactory.clearCache();
 		}
 	}
 
@@ -392,33 +392,30 @@ public void enhanceConfigurationClasses(ConfigurableListableBeanFactory beanFact
 			Object configClassAttr = beanDef.getAttribute(ConfigurationClassUtils.CONFIGURATION_CLASS_ATTRIBUTE);
 			AnnotationMetadata annotationMetadata = null;
 			MethodMetadata methodMetadata = null;
-			if (beanDef instanceof AnnotatedBeanDefinition) {
-				AnnotatedBeanDefinition annotatedBeanDefinition = (AnnotatedBeanDefinition) beanDef;
+			if (beanDef instanceof AnnotatedBeanDefinition annotatedBeanDefinition) {
 				annotationMetadata = annotatedBeanDefinition.getMetadata();
 				methodMetadata = annotatedBeanDefinition.getFactoryMethodMetadata();
 			}
-			if ((configClassAttr != null || methodMetadata != null) && beanDef instanceof AbstractBeanDefinition) {
+			if ((configClassAttr != null || methodMetadata != null) &&
+					(beanDef instanceof AbstractBeanDefinition abd) && !abd.hasBeanClass()) {
 				// 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.
-				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);
-						}
+				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);
 					}
 				}
 			}
 			if (ConfigurationClassUtils.CONFIGURATION_CLASS_FULL.equals(configClassAttr)) {
-				if (!(beanDef instanceof AbstractBeanDefinition)) {
+				if (!(beanDef instanceof AbstractBeanDefinition abd)) {
 					throw new BeanDefinitionStoreException("Cannot enhance @Configuration bean definition '" +
 							beanName + "' since it is not stored in an AbstractBeanDefinition subclass");
 				}
@@ -428,7 +425,7 @@ else if (logger.isInfoEnabled() && beanFactory.containsSingleton(beanName)) {
 							"is a non-static @Bean method with a BeanDefinitionRegistryPostProcessor " +
 							"return type: Consider declaring such methods as 'static'.");
 				}
-				configBeanDefs.put(beanName, (AbstractBeanDefinition) beanDef);
+				configBeanDefs.put(beanName, abd);
 			}
 		}
 		if (configBeanDefs.isEmpty() || NativeDetector.inNativeImage()) {
@@ -469,19 +466,19 @@ public ImportAwareBeanPostProcessor(BeanFactory beanFactory) {
 		public PropertyValues postProcessProperties(@Nullable PropertyValues pvs, Object bean, String beanName) {
 			// Inject the BeanFactory before AutowiredAnnotationBeanPostProcessor's
 			// postProcessProperties method attempts to autowire other configuration beans.
-			if (bean instanceof EnhancedConfiguration) {
-				((EnhancedConfiguration) bean).setBeanFactory(this.beanFactory);
+			if (bean instanceof EnhancedConfiguration enhancedConfiguration) {
+				enhancedConfiguration.setBeanFactory(this.beanFactory);
 			}
 			return pvs;
 		}
 
 		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) {
-			if (bean instanceof ImportAware) {
+			if (bean instanceof ImportAware importAware) {
 				ImportRegistry ir = this.beanFactory.getBean(IMPORT_REGISTRY_BEAN_NAME, ImportRegistry.class);
 				AnnotationMetadata importingClass = ir.getImportingClassFor(ClassUtils.getUserClass(bean).getName());
 				if (importingClass != null) {
-					((ImportAware) bean).setImportMetadata(importingClass);
+					importAware.setImportMetadata(importingClass);
 				}
 			}
 			return bean;
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
index 7dc65574f4cd..b3e1c6736ef1 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,8 +87,7 @@ protected String resolveScopeName(String annotationType) {
 	public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 		ScopeMetadata metadata = new ScopeMetadata();
 		metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
-		if (definition instanceof AnnotatedBeanDefinition) {
-			AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
+		if (definition instanceof AnnotatedBeanDefinition annDef) {
 			Set<String> annTypes = annDef.getMetadata().getAnnotationTypes();
 			String found = null;
 			for (String annType : annTypes) {
diff --git a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
index d765539d0ada..26147f825acc 100644
--- a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
+++ b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
@@ -400,10 +400,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ListenerCacheKey)) {
+			if (!(other instanceof ListenerCacheKey otherKey)) {
 				return false;
 			}
-			ListenerCacheKey otherKey = (ListenerCacheKey) other;
 			return (this.eventType.equals(otherKey.eventType) &&
 					ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType));
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
index bc7e1f939899..748fa55b3938 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
@@ -293,8 +293,7 @@ private void publishEvents(Object result) {
 				publishEvent(event);
 			}
 		}
-		else if (result instanceof Collection<?>) {
-			Collection<?> events = (Collection<?>) result;
+		else if (result instanceof Collection<?> events) {
 			for (Object event : events) {
 				publishEvent(event);
 			}
diff --git a/spring-context/src/main/java/org/springframework/context/expression/AnnotatedElementKey.java b/spring-context/src/main/java/org/springframework/context/expression/AnnotatedElementKey.java
index 582e823ee0b3..6476217f3203 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/AnnotatedElementKey.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/AnnotatedElementKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,10 +55,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AnnotatedElementKey)) {
+		if (!(other instanceof AnnotatedElementKey otherKey)) {
 			return false;
 		}
-		AnnotatedElementKey otherKey = (AnnotatedElementKey) other;
 		return (this.element.equals(otherKey.element) &&
 				ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass));
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java b/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
index 7b868fc9871e..e24511d6e1c3 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,10 +118,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ExpressionKey)) {
+			if (!(other instanceof ExpressionKey otherKey)) {
 				return false;
 			}
-			ExpressionKey otherKey = (ExpressionKey) other;
 			return (this.element.equals(otherKey.element) &&
 					ObjectUtils.nullSafeEquals(this.expression, otherKey.expression));
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
index aca706e82c1f..dae989caa666 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -211,7 +211,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	private Thread shutdownHook;
 
 	/** ResourcePatternResolver used by this context. */
-	private ResourcePatternResolver resourcePatternResolver;
+	private final ResourcePatternResolver resourcePatternResolver;
 
 	/** LifecycleProcessor for managing the lifecycle of beans within this context. */
 	@Nullable
@@ -771,8 +771,7 @@ protected void initMessageSource() {
 		if (beanFactory.containsLocalBean(MESSAGE_SOURCE_BEAN_NAME)) {
 			this.messageSource = beanFactory.getBean(MESSAGE_SOURCE_BEAN_NAME, MessageSource.class);
 			// Make MessageSource aware of parent MessageSource.
-			if (this.parent != null && this.messageSource instanceof HierarchicalMessageSource) {
-				HierarchicalMessageSource hms = (HierarchicalMessageSource) this.messageSource;
+			if (this.parent != null && this.messageSource instanceof HierarchicalMessageSource hms) {
 				if (hms.getParentMessageSource() == null) {
 					// Only set parent context as parent MessageSource if no parent MessageSource
 					// registered already.
diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
index 334204465fb0..e8297a5bcf06 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -174,10 +174,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MessageSourceResolvable)) {
+		if (!(other instanceof MessageSourceResolvable otherResolvable)) {
 			return false;
 		}
-		MessageSourceResolvable otherResolvable = (MessageSourceResolvable) other;
 		return (ObjectUtils.nullSafeEquals(getCodes(), otherResolvable.getCodes()) &&
 				ObjectUtils.nullSafeEquals(getArguments(), otherResolvable.getArguments()) &&
 				ObjectUtils.nullSafeEquals(getDefaultMessage(), otherResolvable.getDefaultMessage()));
diff --git a/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java b/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java
index 493eb3789428..ebf935ab51cf 100644
--- a/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java
+++ b/spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java
@@ -35,7 +35,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.OrderComparator;
 import org.springframework.core.Ordered;
 import org.springframework.core.PriorityOrdered;
@@ -75,15 +74,12 @@ public static void invokeBeanFactoryPostProcessors(
 		// Invoke BeanDefinitionRegistryPostProcessors first, if any.
 		Set<String> processedBeans = new HashSet<>();
 
-		if (beanFactory instanceof BeanDefinitionRegistry) {
-			BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
+		if (beanFactory instanceof BeanDefinitionRegistry registry) {
 			List<BeanFactoryPostProcessor> regularPostProcessors = new ArrayList<>();
 			List<BeanDefinitionRegistryPostProcessor> registryProcessors = new ArrayList<>();
 
 			for (BeanFactoryPostProcessor postProcessor : beanFactoryPostProcessors) {
-				if (postProcessor instanceof BeanDefinitionRegistryPostProcessor) {
-					BeanDefinitionRegistryPostProcessor registryProcessor =
-							(BeanDefinitionRegistryPostProcessor) postProcessor;
+				if (postProcessor instanceof BeanDefinitionRegistryPostProcessor registryProcessor) {
 					registryProcessor.postProcessBeanDefinitionRegistry(registry);
 					registryProcessors.add(registryProcessor);
 				}
@@ -384,7 +380,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 		private boolean isInfrastructureBean(@Nullable String beanName) {
 			if (beanName != null && this.beanFactory.containsBeanDefinition(beanName)) {
 				BeanDefinition bd = this.beanFactory.getBeanDefinition(beanName);
-				return (bd.getRole() == RootBeanDefinition.ROLE_INFRASTRUCTURE);
+				return (bd.getRole() == BeanDefinition.ROLE_INFRASTRUCTURE);
 			}
 			return false;
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
index a0907a1f3a15..c2d5e65d583c 100644
--- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
@@ -130,7 +130,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 			this.propertySources = new MutablePropertySources();
 			if (this.environment != null) {
 				this.propertySources.addLast(
-					new PropertySource<Environment>(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, this.environment) {
+					new PropertySource<>(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, this.environment) {
 						@Override
 						@Nullable
 						public String getProperty(String key) {
diff --git a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
index a1750518a42d..0b237eb0b1c2 100644
--- a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
+++ b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class SimpleThreadScope implements Scope {
 	private static final Log logger = LogFactory.getLog(SimpleThreadScope.class);
 
 	private final ThreadLocal<Map<String, Object>> threadScope =
-			new NamedThreadLocal<Map<String, Object>>("SimpleThreadScope") {
+			new NamedThreadLocal<>("SimpleThreadScope") {
 				@Override
 				protected Map<String, Object> initialValue() {
 					return new HashMap<>();
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java
index c2fc3148dbc3..df4f277e5de9 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java
@@ -183,6 +183,15 @@ public DateTimeFormatter createDateTimeFormatter(DateTimeFormatter fallbackForma
 			dateTimeFormatter = DateTimeFormatterUtils.createStrictDateTimeFormatter(this.pattern);
 		}
 		else if (this.iso != null && this.iso != ISO.NONE) {
+			// TODO Use switch expression once spring-javaformat 0.0.30 has been released.
+			// See https://github.com/spring-io/spring-javaformat/issues/300
+			//
+			// dateTimeFormatter = switch (this.iso) {
+			// 	case DATE -> DateTimeFormatter.ISO_DATE;
+			// 	case TIME -> DateTimeFormatter.ISO_TIME;
+			// 	case DATE_TIME -> DateTimeFormatter.ISO_DATE_TIME;
+			// 	default -> throw new IllegalStateException("Unsupported ISO format: " + this.iso);
+			// };
 			switch (this.iso) {
 				case DATE:
 					dateTimeFormatter = DateTimeFormatter.ISO_DATE;
diff --git a/spring-context/src/main/java/org/springframework/format/number/NumberStyleFormatter.java b/spring-context/src/main/java/org/springframework/format/number/NumberStyleFormatter.java
index 2ebbe36ce383..1597180306a6 100644
--- a/spring-context/src/main/java/org/springframework/format/number/NumberStyleFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/NumberStyleFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,13 +71,12 @@ public void setPattern(String pattern) {
 	@Override
 	public NumberFormat getNumberFormat(Locale locale) {
 		NumberFormat format = NumberFormat.getInstance(locale);
-		if (!(format instanceof DecimalFormat)) {
+		if (!(format instanceof DecimalFormat decimalFormat)) {
 			if (this.pattern != null) {
 				throw new IllegalStateException("Cannot support pattern for non-DecimalFormat: " + format);
 			}
 			return format;
 		}
-		DecimalFormat decimalFormat = (DecimalFormat) format;
 		decimalFormat.setParseBigDecimal(true);
 		if (this.pattern != null) {
 			decimalFormat.applyPattern(this.pattern);
diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
index 661c198fd498..9f502e1f9e42 100644
--- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
+++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -370,10 +370,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof AnnotationConverterKey)) {
+			if (!(other instanceof AnnotationConverterKey otherKey)) {
 				return false;
 			}
-			AnnotationConverterKey otherKey = (AnnotationConverterKey) other;
 			return (this.fieldType == otherKey.fieldType && this.annotation.equals(otherKey.annotation));
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
index 4e68ab9fe527..21b75d9c2f2b 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
  */
 public class ResourceOverridingShadowingClassLoader extends ShadowingClassLoader {
 
-	private static final Enumeration<URL> EMPTY_URL_ENUMERATION = new Enumeration<URL>() {
+	private static final Enumeration<URL> EMPTY_URL_ENUMERATION = new Enumeration<>() {
 		@Override
 		public boolean hasMoreElements() {
 			return false;
@@ -51,7 +51,7 @@ public URL nextElement() {
 	/**
 	 * Key is asked for value: value is actual value.
 	 */
-	private Map<String, String> overrides = new HashMap<>();
+	private final Map<String, String> overrides = new HashMap<>();
 
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
index 816459b3e54c..e60e6bacd8b3 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -566,8 +566,7 @@ protected Object convertResultValueIfNecessary(@Nullable Object result, MethodPa
 				Method fromMethod = targetClass.getMethod("from", CompositeData.class);
 				return ReflectionUtils.invokeMethod(fromMethod, null, result);
 			}
-			else if (result instanceof CompositeData[]) {
-				CompositeData[] array = (CompositeData[]) result;
+			else if (result instanceof CompositeData[] array) {
 				if (targetClass.isArray()) {
 					return convertDataArrayToTargetArray(array, targetClass);
 				}
@@ -583,8 +582,7 @@ else if (result instanceof TabularData) {
 				Method fromMethod = targetClass.getMethod("from", TabularData.class);
 				return ReflectionUtils.invokeMethod(fromMethod, null, result);
 			}
-			else if (result instanceof TabularData[]) {
-				TabularData[] array = (TabularData[]) result;
+			else if (result instanceof TabularData[] array) {
 				if (targetClass.isArray()) {
 					return convertDataArrayToTargetArray(array, targetClass);
 				}
@@ -621,8 +619,8 @@ private Collection<?> convertDataArrayToTargetCollection(Object[] array, Class<?
 
 		Method fromMethod = elementType.getMethod("from", array.getClass().getComponentType());
 		Collection<Object> resultColl = CollectionFactory.createCollection(collectionType, Array.getLength(array));
-		for (int i = 0; i < array.length; i++) {
-			resultColl.add(ReflectionUtils.invokeMethod(fromMethod, null, array[i]));
+		for (Object element : array) {
+			resultColl.add(ReflectionUtils.invokeMethod(fromMethod, null, element));
 		}
 		return resultColl;
 	}
@@ -660,10 +658,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof MethodCacheKey)) {
+			if (!(other instanceof MethodCacheKey otherKey)) {
 				return false;
 			}
-			MethodCacheKey otherKey = (MethodCacheKey) other;
 			return (this.name.equals(otherKey.name) && Arrays.equals(this.parameterTypes, otherKey.parameterTypes));
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
index 98090fca6ce1..fce9739404df 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,7 +165,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 	private boolean exposeManagedResourceClassLoader = true;
 
 	/** A set of bean names that should be excluded from autodetection. */
-	private Set<String> excludedBeans = new HashSet<>();
+	private final Set<String> excludedBeans = new HashSet<>();
 
 	/** The MBeanExporterListeners registered with this exporter. */
 	@Nullable
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
index 4ebcbc4749dc..525a27432656 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,19 +73,17 @@ protected ModelMBeanNotificationInfo[] getNotificationInfo(Object managedBean, S
 	}
 
 	private ModelMBeanNotificationInfo[] extractNotificationMetadata(Object mapValue) {
-		if (mapValue instanceof ManagedNotification) {
-			ManagedNotification mn = (ManagedNotification) mapValue;
+		if (mapValue instanceof ManagedNotification mn) {
 			return new ModelMBeanNotificationInfo[] {JmxMetadataUtils.convertToModelMBeanNotificationInfo(mn)};
 		}
 		else if (mapValue instanceof Collection) {
 			Collection<?> col = (Collection<?>) mapValue;
 			List<ModelMBeanNotificationInfo> result = new ArrayList<>();
 			for (Object colValue : col) {
-				if (!(colValue instanceof ManagedNotification)) {
+				if (!(colValue instanceof ManagedNotification mn)) {
 					throw new IllegalArgumentException(
 							"Property 'notificationInfoMappings' only accepts ManagedNotifications for Map values");
 				}
-				ManagedNotification mn = (ManagedNotification) colValue;
 				result.add(JmxMetadataUtils.convertToModelMBeanNotificationInfo(mn));
 			}
 			return result.toArray(new ModelMBeanNotificationInfo[0]);
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
index c02f5fbca10a..799c5c8cbb3c 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 
 	private String serviceUrl = DEFAULT_SERVICE_URL;
 
-	private Map<String, Object> environment = new HashMap<>();
+	private final Map<String, Object> environment = new HashMap<>();
 
 	@Nullable
 	private MBeanServerForwarder forwarder;
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
index 64258d71192e..dfaf6d7afcaa 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public class MBeanServerConnectionFactoryBean
 	@Nullable
 	private JMXServiceURL serviceUrl;
 
-	private Map<String, Object> environment = new HashMap<>();
+	private final Map<String, Object> environment = new HashMap<>();
 
 	private boolean connectOnStartup = true;
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
index ac573bb1fa70..29df6edf539d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -161,10 +161,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof NotificationListenerHolder)) {
+		if (!(other instanceof NotificationListenerHolder otherNlh)) {
 			return false;
 		}
-		NotificationListenerHolder otherNlh = (NotificationListenerHolder) other;
 		return (ObjectUtils.nullSafeEquals(this.notificationListener, otherNlh.notificationListener) &&
 				ObjectUtils.nullSafeEquals(this.notificationFilter, otherNlh.notificationFilter) &&
 				ObjectUtils.nullSafeEquals(this.handback, otherNlh.handback) &&
diff --git a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
index 25249087720f..186f546c6115 100644
--- a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
+++ b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -155,7 +155,7 @@ public <T> T getBean(Class<T> requiredType, @Nullable Object... args) throws Bea
 
 	@Override
 	public <T> ObjectProvider<T> getBeanProvider(Class<T> requiredType) {
-		return new ObjectProvider<T>() {
+		return new ObjectProvider<>() {
 			@Override
 			public T getObject() throws BeansException {
 				return getBean(requiredType);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
index 43326b427971..371c34333446 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
 @SuppressWarnings("serial")
 public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware {
 
-	private Advice advice;
+	private final Advice advice;
 
 	private Pointcut pointcut;
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java
index d52b92ed7597..417a542c6862 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public class DefaultManagedAwareThreadFactory extends CustomizableThreadFactory
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate();
+	private final JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate();
 
 	@Nullable
 	private String jndiName = "java:comp/DefaultManagedThreadFactory";
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
index 718c5833929e..f1f0df514782 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
@@ -169,8 +169,7 @@ protected ExecutorService initializeExecutor(
 
 		this.scheduledExecutor = createExecutor(this.poolSize, threadFactory, rejectedExecutionHandler);
 
-		if (this.scheduledExecutor instanceof ScheduledThreadPoolExecutor) {
-			ScheduledThreadPoolExecutor scheduledPoolExecutor = (ScheduledThreadPoolExecutor) this.scheduledExecutor;
+		if (this.scheduledExecutor instanceof ScheduledThreadPoolExecutor scheduledPoolExecutor) {
 			if (this.removeOnCancelPolicy) {
 				scheduledPoolExecutor.setRemoveOnCancelPolicy(true);
 			}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
index 8ea07d5ba854..9619c12ca5c3 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
@@ -260,10 +260,9 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof BitsCronField)) {
+		if (!(o instanceof BitsCronField other)) {
 			return false;
 		}
-		BitsCronField other = (BitsCronField) o;
 		return type() == other.type() && this.bits == other.bits;
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CompositeCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/CompositeCronField.java
index 97f808fc4c5c..a3bf6eced060 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CompositeCronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CompositeCronField.java
@@ -81,10 +81,9 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof CompositeCronField)) {
+		if (!(o instanceof CompositeCronField other)) {
 			return false;
 		}
-		CompositeCronField other = (CompositeCronField) o;
 		return type() == other.type() &&
 				this.value.equals(other.value);
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java
index e2e6687055e3..93e65bf9c54a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java
@@ -280,8 +280,7 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (o instanceof CronExpression) {
-			CronExpression other = (CronExpression) o;
+		if (o instanceof CronExpression other) {
 			return Arrays.equals(this.fields, other.fields);
 		}
 		else {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
index 1f2b90f7cf1f..e9c74387b2b4 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -438,10 +438,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof CronSequenceGenerator)) {
+		if (!(other instanceof CronSequenceGenerator otherCron)) {
 			return false;
 		}
-		CronSequenceGenerator otherCron = (CronSequenceGenerator) other;
 		return (this.months.equals(otherCron.months) && this.daysOfMonth.equals(otherCron.daysOfMonth) &&
 				this.daysOfWeek.equals(otherCron.daysOfWeek) && this.hours.equals(otherCron.hours) &&
 				this.minutes.equals(otherCron.minutes) && this.seconds.equals(otherCron.seconds));
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
index 8e19a265f04b..9292c0086212 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,10 +148,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof PeriodicTrigger)) {
+		if (!(other instanceof PeriodicTrigger otherTrigger)) {
 			return false;
 		}
-		PeriodicTrigger otherTrigger = (PeriodicTrigger) other;
 		return (this.fixedRate == otherTrigger.fixedRate && this.initialDelay == otherTrigger.initialDelay &&
 				this.period == otherTrigger.period);
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
index 0b72a273ab2c..db1f20a7cb79 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
@@ -360,10 +360,9 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (!(o instanceof QuartzCronField)) {
+		if (!(o instanceof QuartzCronField other)) {
 			return false;
 		}
-		QuartzCronField other = (QuartzCronField) o;
 		return type() == other.type() &&
 				this.value.equals(other.value);
 	}
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java
index 80a1a8fb6fac..3a14dcb33a5d 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -241,11 +241,10 @@ protected Object adaptToInterfaces(
 
 		if (adaptedIfc != null) {
 			ScriptEngine scriptEngine = this.scriptEngine;
-			if (!(scriptEngine instanceof Invocable)) {
+			if (!(scriptEngine instanceof Invocable invocable)) {
 				throw new ScriptCompilationException(scriptSource,
 						"ScriptEngine must implement Invocable in order to adapt it to an interface: " + scriptEngine);
 			}
-			Invocable invocable = (Invocable) scriptEngine;
 			if (script != null) {
 				script = invocable.getInterface(script, adaptedIfc);
 			}
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
index bd842c419a76..675c705fb374 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,8 +57,7 @@ public static ThemeSource initThemeSource(ApplicationContext context) {
 		if (context.containsLocalBean(THEME_SOURCE_BEAN_NAME)) {
 			ThemeSource themeSource = context.getBean(THEME_SOURCE_BEAN_NAME, ThemeSource.class);
 			// Make ThemeSource aware of parent ThemeSource.
-			if (context.getParent() instanceof ThemeSource && themeSource instanceof HierarchicalThemeSource) {
-				HierarchicalThemeSource hts = (HierarchicalThemeSource) themeSource;
+			if (context.getParent() instanceof ThemeSource && themeSource instanceof HierarchicalThemeSource hts) {
 				if (hts.getParentThemeSource() == null) {
 					// Only set parent context as parent ThemeSource if no parent ThemeSource
 					// registered already.
diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
index b8857b15b50b..2ef8f10ae0fe 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -204,8 +204,7 @@ public List<FieldError> getFieldErrors(String field) {
 	public FieldError getFieldError(String field) {
 		String fixedField = fixedField(field);
 		for (ObjectError objectError : this.errors) {
-			if (objectError instanceof FieldError) {
-				FieldError fieldError = (FieldError) objectError;
+			if (objectError instanceof FieldError fieldError) {
 				if (isMatchingFieldError(fixedField, fieldError)) {
 					return fieldError;
 				}
@@ -364,10 +363,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof BindingResult)) {
+		if (!(other instanceof BindingResult otherResult)) {
 			return false;
 		}
-		BindingResult otherResult = (BindingResult) other;
 		return (getObjectName().equals(otherResult.getObjectName()) &&
 				ObjectUtils.nullSafeEquals(getTarget(), otherResult.getTarget()) &&
 				getAllErrors().equals(otherResult.getAllErrors()));
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
index de02082dffe7..ef6d19b3afb8 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
@@ -58,6 +58,7 @@
  * Bean Validation 1.1 as well as 2.0.
  *
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.0
  * @see SmartValidator
  * @see CustomValidatorBean
@@ -136,8 +137,8 @@ public void validateValue(
 	private Class<?>[] asValidationGroups(Object... validationHints) {
 		Set<Class<?>> groups = new LinkedHashSet<>(4);
 		for (Object hint : validationHints) {
-			if (hint instanceof Class) {
-				groups.add((Class<?>) hint);
+			if (hint instanceof Class<?> clazz) {
+				groups.add(clazz);
 			}
 		}
 		return ClassUtils.toClassArray(groups);
@@ -159,10 +160,9 @@ protected void processConstraintViolations(Set<ConstraintViolation<Object>> viol
 					ConstraintDescriptor<?> cd = violation.getConstraintDescriptor();
 					String errorCode = determineErrorCode(cd);
 					Object[] errorArgs = getArgumentsForConstraint(errors.getObjectName(), field, cd);
-					if (errors instanceof BindingResult) {
+					if (errors instanceof BindingResult bindingResult) {
 						// Can do custom FieldError registration with invalid value from ConstraintViolation,
 						// as necessary for Hibernate Validator compatibility (non-indexed set path in field)
-						BindingResult bindingResult = (BindingResult) errors;
 						String nestedField = bindingResult.getNestedPath() + field;
 						if (nestedField.isEmpty()) {
 							String[] errorCodes = bindingResult.resolveMessageCodes(errorCode);
@@ -269,8 +269,8 @@ protected Object[] getArgumentsForConstraint(String objectName, String field, Co
 		Map<String, Object> attributesToExpose = new TreeMap<>();
 		descriptor.getAttributes().forEach((attributeName, attributeValue) -> {
 			if (!internalAnnotationAttributes.contains(attributeName)) {
-				if (attributeValue instanceof String) {
-					attributeValue = new ResolvableAttribute(attributeValue.toString());
+				if (attributeValue instanceof String str) {
+					attributeValue = new ResolvableAttribute(str);
 				}
 				attributesToExpose.put(attributeName, attributeValue);
 			}
diff --git a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
index 9ac97145bafd..c37eca8a7a0e 100644
--- a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
+++ b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
@@ -52,8 +52,7 @@ public void putAll(Map<? extends String, ?> map) {
 	}
 
 	private void removeBindingResultIfNecessary(Object key, @Nullable Object value) {
-		if (key instanceof String) {
-			String attributeName = (String) key;
+		if (key instanceof String attributeName) {
 			if (!attributeName.startsWith(BindingResult.MODEL_KEY_PREFIX)) {
 				String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + attributeName;
 				BindingResult bindingResult = (BindingResult) get(bindingResultKey);

From 0eb73c130c4006b631edb6df6adebe1330fc07a7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 17:33:42 +0200
Subject: [PATCH 255/735] Apply "instanceof pattern matching" Eclipse clean-up
 in spring-context-indexer

---
 .../springframework/context/index/processor/TypeHelper.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java
index 470c0398a235..f24fd21df42a 100644
--- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java
+++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,8 +60,7 @@ public String getType(TypeMirror type) {
 		if (type == null) {
 			return null;
 		}
-		if (type instanceof DeclaredType) {
-			DeclaredType declaredType = (DeclaredType) type;
+		if (type instanceof DeclaredType declaredType) {
 			Element enclosingElement = declaredType.asElement().getEnclosingElement();
 			if (enclosingElement instanceof TypeElement) {
 				return getQualifiedName(enclosingElement) + "$" + declaredType.asElement().getSimpleName().toString();

From b3473a3e810fc0ebe6d6d1a63e5ec281de31fa51 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 17:45:56 +0200
Subject: [PATCH 256/735] Apply "instanceof pattern matching" Eclipse clean-up
 in spring-context-support

This has only been applied to `src/main/java`.
---
 .../interceptor/CacheResolverAdapter.java     |  5 ++---
 .../JCacheOperationSourcePointcut.java        |  5 ++---
 .../SimpleExceptionCacheResolver.java         |  5 ++---
 .../mail/SimpleMailMessage.java               |  5 ++---
 .../mail/javamail/MimeMessageHelper.java      | 20 ++++++++++---------
 .../quartz/SchedulerAccessorBean.java         |  5 ++---
 6 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java
index 88724adc12c2..041d9aea0ef7 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,10 +59,9 @@ protected javax.cache.annotation.CacheResolver getTarget() {
 
 	@Override
 	public Collection<? extends Cache> resolveCaches(CacheOperationInvocationContext<?> context) {
-		if (!(context instanceof CacheInvocationContext<?>)) {
+		if (!(context instanceof CacheInvocationContext<?> cacheInvocationContext)) {
 			throw new IllegalStateException("Unexpected context " + context);
 		}
-		CacheInvocationContext<?> cacheInvocationContext = (CacheInvocationContext<?>) context;
 		javax.cache.Cache<Object, Object> cache = this.target.resolveCache(cacheInvocationContext);
 		if (cache == null) {
 			throw new IllegalStateException("Could not resolve cache for " + context + " using " + this.target);
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheOperationSourcePointcut.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheOperationSourcePointcut.java
index 4b6d7e0fb940..1dbb4210894c 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheOperationSourcePointcut.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheOperationSourcePointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,10 +52,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof JCacheOperationSourcePointcut)) {
+		if (!(other instanceof JCacheOperationSourcePointcut otherPc)) {
 			return false;
 		}
-		JCacheOperationSourcePointcut otherPc = (JCacheOperationSourcePointcut) other;
 		return ObjectUtils.nullSafeEquals(getCacheOperationSource(), otherPc.getCacheOperationSource());
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/SimpleExceptionCacheResolver.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/SimpleExceptionCacheResolver.java
index f2091ab1fb31..1aa569546131 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/SimpleExceptionCacheResolver.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/SimpleExceptionCacheResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,10 +43,9 @@ public SimpleExceptionCacheResolver(CacheManager cacheManager) {
 	@Override
 	protected Collection<String> getCacheNames(CacheOperationInvocationContext<?> context) {
 		BasicOperation operation = context.getOperation();
-		if (!(operation instanceof CacheResultOperation)) {
+		if (!(operation instanceof CacheResultOperation cacheResultOperation)) {
 			throw new IllegalStateException("Could not extract exception cache name from " + operation);
 		}
-		CacheResultOperation cacheResultOperation = (CacheResultOperation) operation;
 		String exceptionCacheName = cacheResultOperation.getExceptionCacheName();
 		if (exceptionCacheName != null) {
 			return Collections.singleton(exceptionCacheName);
diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
index 95268a2993e0..4e8295f70d31 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,10 +226,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof SimpleMailMessage)) {
+		if (!(other instanceof SimpleMailMessage otherMessage)) {
 			return false;
 		}
-		SimpleMailMessage otherMessage = (SimpleMailMessage) other;
 		return (ObjectUtils.nullSafeEquals(this.from, otherMessage.from) &&
 				ObjectUtils.nullSafeEquals(this.replyTo, otherMessage.replyTo) &&
 				ObjectUtils.nullSafeEquals(this.to, otherMessage.to) &&
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index c056ec623d27..3d7bf4c7b0dc 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import jakarta.mail.BodyPart;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeBodyPart;
@@ -91,6 +92,7 @@
  * on the MULTIPART_MODE constants contains more detailed information.
  *
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 19.01.2004
  * @see #setText(String, boolean)
  * @see #setText(String, String)
@@ -427,8 +429,8 @@ public final MimeMultipart getMimeMultipart() throws IllegalStateException {
 	 */
 	@Nullable
 	protected String getDefaultEncoding(MimeMessage mimeMessage) {
-		if (mimeMessage instanceof SmartMimeMessage) {
-			return ((SmartMimeMessage) mimeMessage).getDefaultEncoding();
+		if (mimeMessage instanceof SmartMimeMessage smartMimeMessage) {
+			return smartMimeMessage.getDefaultEncoding();
 		}
 		return null;
 	}
@@ -449,8 +451,8 @@ public String getEncoding() {
 	 * @see ConfigurableMimeFileTypeMap
 	 */
 	protected FileTypeMap getDefaultFileTypeMap(MimeMessage mimeMessage) {
-		if (mimeMessage instanceof SmartMimeMessage) {
-			FileTypeMap fileTypeMap = ((SmartMimeMessage) mimeMessage).getDefaultFileTypeMap();
+		if (mimeMessage instanceof SmartMimeMessage smartMimeMessage) {
+			FileTypeMap fileTypeMap = smartMimeMessage.getDefaultFileTypeMap();
 			if (fileTypeMap != null) {
 				return fileTypeMap;
 			}
@@ -908,7 +910,7 @@ public void addInline(String contentId, DataSource dataSource) throws MessagingE
 		Assert.notNull(contentId, "Content ID must not be null");
 		Assert.notNull(dataSource, "DataSource must not be null");
 		MimeBodyPart mimeBodyPart = new MimeBodyPart();
-		mimeBodyPart.setDisposition(MimeBodyPart.INLINE);
+		mimeBodyPart.setDisposition(Part.INLINE);
 		mimeBodyPart.setContentID("<" + contentId + ">");
 		mimeBodyPart.setDataHandler(new DataHandler(dataSource));
 		getMimeMultipart().addBodyPart(mimeBodyPart);
@@ -990,7 +992,7 @@ public void addInline(String contentId, InputStreamSource inputStreamSource, Str
 			throws MessagingException {
 
 		Assert.notNull(inputStreamSource, "InputStreamSource must not be null");
-		if (inputStreamSource instanceof Resource && ((Resource) inputStreamSource).isOpen()) {
+		if (inputStreamSource instanceof Resource resource && resource.isOpen()) {
 			throw new IllegalArgumentException(
 					"Passed-in Resource contains an open stream: invalid argument. " +
 					"JavaMail requires an InputStreamSource that creates a fresh stream for every call.");
@@ -1018,7 +1020,7 @@ public void addAttachment(String attachmentFilename, DataSource dataSource) thro
 		Assert.notNull(dataSource, "DataSource must not be null");
 		try {
 			MimeBodyPart mimeBodyPart = new MimeBodyPart();
-			mimeBodyPart.setDisposition(MimeBodyPart.ATTACHMENT);
+			mimeBodyPart.setDisposition(Part.ATTACHMENT);
 			mimeBodyPart.setFileName(isEncodeFilenames() ?
 					MimeUtility.encodeText(attachmentFilename) : attachmentFilename);
 			mimeBodyPart.setDataHandler(new DataHandler(dataSource));
@@ -1095,7 +1097,7 @@ public void addAttachment(
 			throws MessagingException {
 
 		Assert.notNull(inputStreamSource, "InputStreamSource must not be null");
-		if (inputStreamSource instanceof Resource && ((Resource) inputStreamSource).isOpen()) {
+		if (inputStreamSource instanceof Resource resource && resource.isOpen()) {
 			throw new IllegalArgumentException(
 					"Passed-in Resource contains an open stream: invalid argument. " +
 					"JavaMail requires an InputStreamSource that creates a fresh stream for every call.");
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
index 42a80e2a33bf..ea136c6e4fb1 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,8 +99,7 @@ public void afterPropertiesSet() throws SchedulerException {
 	}
 
 	protected Scheduler findScheduler(String schedulerName) throws SchedulerException {
-		if (this.beanFactory instanceof ListableBeanFactory) {
-			ListableBeanFactory lbf = (ListableBeanFactory) this.beanFactory;
+		if (this.beanFactory instanceof ListableBeanFactory lbf) {
 			String[] beanNames = lbf.getBeanNamesForType(Scheduler.class);
 			for (String beanName : beanNames) {
 				Scheduler schedulerBean = (Scheduler) lbf.getBean(beanName);

From 76c9306dda572ab1be9b888feeb7b56ceb989d85 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 14 Oct 2021 17:18:34 +0100
Subject: [PATCH 257/735] Adjust logging of resource locations

---
 .../reactive/resource/ResourceWebHandler.java | 32 +++++++------------
 .../resource/ResourceHttpRequestHandler.java  | 22 +++++++------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index 2361d1532895..75ac8ddd320e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -304,11 +304,6 @@ public void setUseLastModified(boolean useLastModified) {
 	public void afterPropertiesSet() throws Exception {
 		resolveResourceLocations();
 
-		if (logger.isWarnEnabled() && CollectionUtils.isEmpty(getLocations())) {
-			logger.warn("Locations list is empty. No resources will be served unless a " +
-					"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
-		}
-
 		if (this.resourceResolvers.isEmpty()) {
 			this.resourceResolvers.add(new PathResourceResolver());
 		}
@@ -341,6 +336,12 @@ private void resolveResourceLocations() {
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
+
+		if (logger.isInfoEnabled()) {
+			logger.info(!this.locationsToUse.isEmpty() ?
+					"Locations in use: " + locationToString(this.locationsToUse) :
+					"0 locations in use.");
+		}
 	}
 
 	/**
@@ -350,10 +351,6 @@ private void resolveResourceLocations() {
 	 */
 	protected void initAllowedLocations() {
 		if (CollectionUtils.isEmpty(getLocations())) {
-			if (logger.isInfoEnabled()) {
-				logger.info("Locations list is empty. No resources will be served unless a " +
-						"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
-			}
 			return;
 		}
 		for (int i = getResourceResolvers().size() - 1; i >= 0; i--) {
@@ -621,18 +618,13 @@ protected void setHeaders(ServerWebExchange exchange, Resource resource, @Nullab
 
 	@Override
 	public String toString() {
-		return "ResourceWebHandler " + formatLocations();
+		return "ResourceWebHandler " + locationToString(getLocations());
 	}
 
-	private Object formatLocations() {
-		if (!this.locationValues.isEmpty()) {
-			return this.locationValues.stream().collect(Collectors.joining("\", \"", "[\"", "\"]"));
-		}
-		if (!getLocations().isEmpty()) {
-			return "[" + getLocations().toString()
-					.replaceAll("class path resource", "Classpath")
-					.replaceAll("ServletContext resource", "ServletContext") + "]";
-		}
-		return Collections.emptyList();
+	private String locationToString(List<Resource> locations) {
+		return locations.toString()
+				.replaceAll("class path resource", "classpath")
+				.replaceAll("ServletContext resource", "ServletContext");
 	}
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 6e556e9af5fa..7456f37f0318 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -392,11 +392,6 @@ public void setUseLastModified(boolean useLastModified) {
 	public void afterPropertiesSet() throws Exception {
 		resolveResourceLocations();
 
-		if (logger.isWarnEnabled() && CollectionUtils.isEmpty(getLocations())) {
-			logger.warn("Locations list is empty. No resources will be served unless a " +
-					"custom ResourceResolver is configured as an alternative to PathResourceResolver.");
-		}
-
 		if (this.resourceResolvers.isEmpty()) {
 			this.resourceResolvers.add(new PathResourceResolver());
 		}
@@ -472,6 +467,12 @@ private void resolveResourceLocations() {
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
+
+		if (logger.isInfoEnabled()) {
+			logger.info(!this.locationsToUse.isEmpty() ?
+					"Locations in use: " + locationToString(this.locationsToUse) :
+					"0 locations in use.");
+		}
 	}
 
 	/**
@@ -810,10 +811,13 @@ protected void setHeaders(HttpServletResponse response, Resource resource, @Null
 
 	@Override
 	public String toString() {
-		return "ResourceHttpRequestHandler " +
-				getLocations().toString()
-						.replaceAll("class path resource", "Classpath")
-						.replaceAll("ServletContext resource", "ServletContext");
+		return "ResourceHttpRequestHandler " + locationToString(getLocations());
+	}
+
+	private String locationToString(List<Resource> locations) {
+		return locations.toString()
+				.replaceAll("class path resource", "classpath")
+				.replaceAll("ServletContext resource", "ServletContext");
 	}
 
 }

From cb17441780eee8489a26b7772b70cdc77aecacff Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 18:12:27 +0200
Subject: [PATCH 258/735] Apply "instanceof pattern matching" Eclipse clean-up
 in spring-core

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes

This has only been applied to `src/main/java`.
---
 .../core/CollectionFactory.java               | 32 +++++-----
 .../springframework/core/MethodClassKey.java  |  5 +-
 .../springframework/core/MethodParameter.java |  5 +-
 .../core/ParameterizedTypeReference.java      |  4 +-
 .../springframework/core/ResolvableType.java  | 14 ++--
 .../core/annotation/AnnotationUtils.java      |  8 +--
 .../core/annotation/AnnotationsScanner.java   |  5 +-
 .../MergedAnnotationsCollection.java          |  4 +-
 .../core/annotation/TypeMappedAnnotation.java |  5 +-
 .../core/convert/Property.java                |  5 +-
 .../core/convert/TypeDescriptor.java          |  3 +-
 .../convert/support/ByteBufferConverter.java  |  3 +-
 .../support/GenericConversionService.java     |  5 +-
 .../support/ObjectToObjectConverter.java      |  8 +--
 .../io/AbstractFileResolvingResource.java     |  3 +-
 .../core/io/ClassPathResource.java            |  3 +-
 .../core/io/buffer/DataBufferUtils.java       |  3 +-
 .../core/io/buffer/DefaultDataBuffer.java     |  3 +-
 .../core/io/support/EncodedResource.java      |  5 +-
 .../PathMatchingResourcePatternResolver.java  |  9 ++-
 .../springframework/core/log/LogMessage.java  |  4 +-
 .../core/style/DefaultValueStyler.java        |  5 +-
 .../AnnotationReadingVisitorUtils.java        |  8 +--
 .../ClassMetadataReadingVisitor.java          |  4 +-
 ...impleAnnotationMetadataReadingVisitor.java |  8 +--
 .../objenesis/SpringObjenesis.java            |  4 +-
 .../util/ConcurrentReferenceHashMap.java      |  9 +--
 .../util/LinkedCaseInsensitiveMap.java        |  2 +-
 .../org/springframework/util/MimeType.java    |  5 +-
 .../org/springframework/util/TypeUtils.java   | 64 +++++++++----------
 .../util/xml/XMLEventStreamReader.java        |  5 +-
 31 files changed, 108 insertions(+), 142 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
index 4f90a3bff18e..a9321e0a34bf 100644
--- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
@@ -119,7 +119,7 @@ public static boolean isApproximableCollectionType(@Nullable Class<?> collection
 	 * @see java.util.TreeSet
 	 * @see java.util.LinkedHashSet
 	 */
-	@SuppressWarnings({"rawtypes", "unchecked", "cast"})
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	public static <E> Collection<E> createApproximateCollection(@Nullable Object collection, int capacity) {
 		if (collection instanceof LinkedList) {
 			return new LinkedList<>();
@@ -127,14 +127,13 @@ public static <E> Collection<E> createApproximateCollection(@Nullable Object col
 		else if (collection instanceof List) {
 			return new ArrayList<>(capacity);
 		}
-		else if (collection instanceof EnumSet) {
-			// Cast is necessary for compilation in Eclipse 4.4.1.
-			Collection<E> enumSet = (Collection<E>) EnumSet.copyOf((EnumSet) collection);
-			enumSet.clear();
-			return enumSet;
+		else if (collection instanceof EnumSet enumSet) {
+			Collection<E> copy = EnumSet.copyOf(enumSet);
+			copy.clear();
+			return copy;
 		}
-		else if (collection instanceof SortedSet) {
-			return new TreeSet<>(((SortedSet<E>) collection).comparator());
+		else if (collection instanceof SortedSet sortedSet) {
+			return new TreeSet<>(sortedSet.comparator());
 		}
 		else {
 			return new LinkedHashSet<>(capacity);
@@ -178,7 +177,7 @@ public static <E> Collection<E> createCollection(Class<?> collectionType, int ca
 	 * @see java.util.TreeSet
 	 * @see java.util.EnumSet
 	 */
-	@SuppressWarnings({"unchecked", "cast"})
+	@SuppressWarnings("unchecked")
 	public static <E> Collection<E> createCollection(Class<?> collectionType, @Nullable Class<?> elementType, int capacity) {
 		Assert.notNull(collectionType, "Collection type must not be null");
 		if (collectionType.isInterface()) {
@@ -197,8 +196,7 @@ else if (SortedSet.class == collectionType || NavigableSet.class == collectionTy
 		}
 		else if (EnumSet.class.isAssignableFrom(collectionType)) {
 			Assert.notNull(elementType, "Cannot create EnumSet for unknown element type");
-			// Cast is necessary for compilation in Eclipse 4.4.1.
-			return (Collection<E>) EnumSet.noneOf(asEnumType(elementType));
+			return EnumSet.noneOf(asEnumType(elementType));
 		}
 		else {
 			if (!Collection.class.isAssignableFrom(collectionType)) {
@@ -243,13 +241,13 @@ public static boolean isApproximableMapType(@Nullable Class<?> mapType) {
 	 */
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	public static <K, V> Map<K, V> createApproximateMap(@Nullable Object map, int capacity) {
-		if (map instanceof EnumMap) {
-			EnumMap enumMap = new EnumMap((EnumMap) map);
-			enumMap.clear();
-			return enumMap;
+		if (map instanceof EnumMap enumMap) {
+			EnumMap copy = new EnumMap(enumMap);
+			copy.clear();
+			return copy;
 		}
-		else if (map instanceof SortedMap) {
-			return new TreeMap<>(((SortedMap<K, V>) map).comparator());
+		else if (map instanceof SortedMap sortedMap) {
+			return new TreeMap<>(sortedMap.comparator());
 		}
 		else {
 			return new LinkedHashMap<>(capacity);
diff --git a/spring-core/src/main/java/org/springframework/core/MethodClassKey.java b/spring-core/src/main/java/org/springframework/core/MethodClassKey.java
index 62ca1ea04f48..60e28be1e092 100644
--- a/spring-core/src/main/java/org/springframework/core/MethodClassKey.java
+++ b/spring-core/src/main/java/org/springframework/core/MethodClassKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,10 +54,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MethodClassKey)) {
+		if (!(other instanceof MethodClassKey otherKey)) {
 			return false;
 		}
-		MethodClassKey otherKey = (MethodClassKey) other;
 		return (this.method.equals(otherKey.method) &&
 				ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass));
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
index 3ec9549cb60f..3bbe10d5d4c6 100644
--- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java
+++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -753,10 +753,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MethodParameter)) {
+		if (!(other instanceof MethodParameter otherParam)) {
 			return false;
 		}
-		MethodParameter otherParam = (MethodParameter) other;
 		return (getContainingClass() == otherParam.getContainingClass() &&
 				ObjectUtils.nullSafeEquals(this.typeIndexesPerLevel, otherParam.typeIndexesPerLevel) &&
 				this.nestingLevel == otherParam.nestingLevel &&
diff --git a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
index c10dd89aee9e..2cb589eb74c6 100644
--- a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public String toString() {
 	 * @since 4.3.12
 	 */
 	public static <T> ParameterizedTypeReference<T> forType(Type type) {
-		return new ParameterizedTypeReference<T>(type) {
+		return new ParameterizedTypeReference<>(type) {
 		};
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
index ae6fe4f0846b..17a9572ccd03 100644
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -594,8 +594,7 @@ private boolean isUnresolvableTypeVariable() {
 	 * without specific bounds (i.e., equal to {@code ? extends Object}).
 	 */
 	private boolean isWildcardWithoutBounds() {
-		if (this.type instanceof WildcardType) {
-			WildcardType wt = (WildcardType) this.type;
+		if (this.type instanceof WildcardType wt) {
 			if (wt.getLowerBounds().length == 0) {
 				Type[] upperBounds = wt.getUpperBounds();
 				if (upperBounds.length == 0 || (upperBounds.length == 1 && Object.class == upperBounds[0])) {
@@ -870,8 +869,7 @@ private ResolvableType resolveVariable(TypeVariable<?> variable) {
 		if (this.type instanceof TypeVariable) {
 			return resolveType().resolveVariable(variable);
 		}
-		if (this.type instanceof ParameterizedType) {
-			ParameterizedType parameterizedType = (ParameterizedType) this.type;
+		if (this.type instanceof ParameterizedType parameterizedType) {
 			Class<?> resolved = resolve();
 			if (resolved == null) {
 				return null;
@@ -906,11 +904,10 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ResolvableType)) {
+		if (!(other instanceof ResolvableType otherType)) {
 			return false;
 		}
 
-		ResolvableType otherType = (ResolvableType) other;
 		if (!ObjectUtils.nullSafeEquals(this.type, otherType.type)) {
 			return false;
 		}
@@ -1573,10 +1570,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ParameterizedType)) {
+			if (!(other instanceof ParameterizedType otherType)) {
 				return false;
 			}
-			ParameterizedType otherType = (ParameterizedType) other;
 			return (otherType.getOwnerType() == null && this.rawType.equals(otherType.getRawType()) &&
 					Arrays.equals(this.typeArguments, otherType.getActualTypeArguments()));
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
index edd099624154..2009d848b8cd 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1006,12 +1006,10 @@ private static Object adaptValue(
 				return names;
 			}
 		}
-		if (value instanceof Annotation) {
-			Annotation annotation = (Annotation) value;
+		if (value instanceof Annotation annotation) {
 			return MergedAnnotation.from(annotatedElement, annotation).synthesize();
 		}
-		if (value instanceof Annotation[]) {
-			Annotation[] annotations = (Annotation[]) value;
+		if (value instanceof Annotation[] annotations) {
 			Annotation[] synthesized = (Annotation[]) Array.newInstance(
 					annotations.getClass().getComponentType(), annotations.length);
 			for (int i = 0; i < annotations.length; i++) {
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
index 626413838c9b..19d520c3c14a 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -521,8 +521,7 @@ private static boolean isWithoutHierarchy(AnnotatedElement source, SearchStrateg
 			return (searchStrategy == SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES ? noSuperTypes &&
 					sourceClass.getEnclosingClass() == null : noSuperTypes);
 		}
-		if (source instanceof Method) {
-			Method sourceMethod = (Method) source;
+		if (source instanceof Method sourceMethod) {
 			return (Modifier.isPrivate(sourceMethod.getModifiers()) ||
 					isWithoutHierarchy(sourceMethod.getDeclaringClass(), searchStrategy));
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationsCollection.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationsCollection.java
index 9fc6cb53671d..0d2e8372d078 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationsCollection.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotationsCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -221,7 +221,7 @@ static MergedAnnotations of(Collection<MergedAnnotation<?>> annotations) {
 	private class AnnotationsSpliterator<A extends Annotation> implements Spliterator<MergedAnnotation<A>> {
 
 		@Nullable
-		private Object requiredType;
+		private final Object requiredType;
 
 		private final int[] mappingCursors;
 
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
index 06aa93d7d5a3..660e43b86951 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -439,8 +439,7 @@ else if (value instanceof Class[] && type == String[].class) {
 			}
 			value = names;
 		}
-		else if (value instanceof String[] && type == Class[].class) {
-			String[] names = (String[]) value;
+		else if (value instanceof String[] names && type == Class[].class) {
 			Class<?>[] classes = new Class<?>[names.length];
 			for (int i = 0; i < names.length; i++) {
 				classes[i] = ClassUtils.resolveClassName(names[i], getClassLoader());
diff --git a/spring-core/src/main/java/org/springframework/core/convert/Property.java b/spring-core/src/main/java/org/springframework/core/convert/Property.java
index 5cddaea8769f..afabd528fb02 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/Property.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -263,10 +263,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof Property)) {
+		if (!(other instanceof Property otherProperty)) {
 			return false;
 		}
-		Property otherProperty = (Property) other;
 		return (ObjectUtils.nullSafeEquals(this.objectType, otherProperty.objectType) &&
 				ObjectUtils.nullSafeEquals(this.name, otherProperty.name) &&
 				ObjectUtils.nullSafeEquals(this.readMethod, otherProperty.readMethod) &&
diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
index 1bc8cb281b1f..064579c82f86 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -458,10 +458,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof TypeDescriptor)) {
+		if (!(other instanceof TypeDescriptor otherDesc)) {
 			return false;
 		}
-		TypeDescriptor otherDesc = (TypeDescriptor) other;
 		if (getType() != otherDesc.getType()) {
 			return false;
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
index 0a230ef076c7..64e49717974c 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
@@ -88,8 +88,7 @@ private boolean matchesToByteBuffer(TypeDescriptor sourceType) {
 	@Nullable
 	public Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		boolean byteBufferTarget = targetType.isAssignableTo(BYTE_BUFFER_TYPE);
-		if (source instanceof ByteBuffer) {
-			ByteBuffer buffer = (ByteBuffer) source;
+		if (source instanceof ByteBuffer buffer) {
 			return (byteBufferTarget ? buffer.duplicate() : convertFromByteBuffer(buffer, targetType));
 		}
 		if (byteBufferTarget) {
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
index 1134483e88a8..0c0e9c036474 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -463,10 +463,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ConverterCacheKey)) {
+			if (!(other instanceof ConverterCacheKey otherKey)) {
 				return false;
 			}
-			ConverterCacheKey otherKey = (ConverterCacheKey) other;
 			return (this.sourceType.equals(otherKey.sourceType)) &&
 					this.targetType.equals(otherKey.targetType);
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
index 802e09700804..145e28806fb3 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,8 +92,7 @@ public Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDe
 		Member member = getValidatedMember(targetClass, sourceClass);
 
 		try {
-			if (member instanceof Method) {
-				Method method = (Method) member;
+			if (member instanceof Method method) {
 				ReflectionUtils.makeAccessible(method);
 				if (!Modifier.isStatic(method.getModifiers())) {
 					return method.invoke(source);
@@ -152,8 +151,7 @@ private static Member getValidatedMember(Class<?> targetClass, Class<?> sourceCl
 	}
 
 	private static boolean isApplicable(Member member, Class<?> sourceClass) {
-		if (member instanceof Method) {
-			Method method = (Method) member;
+		if (member instanceof Method method) {
 			return (!Modifier.isStatic(method.getModifiers()) ?
 					ClassUtils.isAssignable(method.getDeclaringClass(), sourceClass) :
 					method.getParameterTypes()[0] == sourceClass);
diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
index ac9ea29a5dca..5369b2fdea9f 100644
--- a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
@@ -106,8 +106,7 @@ boolean checkReadable(URL url) {
 				// Try InputStream resolution for jar resources
 				URLConnection con = url.openConnection();
 				customizeConnection(con);
-				if (con instanceof HttpURLConnection) {
-					HttpURLConnection httpCon = (HttpURLConnection) con;
+				if (con instanceof HttpURLConnection httpCon) {
 					int code = httpCon.getResponseCode();
 					if (code != HttpURLConnection.HTTP_OK) {
 						httpCon.disconnect();
diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
index f99adce06ce4..cbaad7001b8c 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
@@ -267,10 +267,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ClassPathResource)) {
+		if (!(other instanceof ClassPathResource otherRes)) {
 			return false;
 		}
-		ClassPathResource otherRes = (ClassPathResource) other;
 		return (this.path.equals(otherRes.path) &&
 				ObjectUtils.nullSafeEquals(this.classLoader, otherRes.classLoader) &&
 				ObjectUtils.nullSafeEquals(this.clazz, otherRes.clazz));
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
index ad0419ee4b77..d97a59fe45e0 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
@@ -513,8 +513,7 @@ public static <T extends DataBuffer> T touch(T dataBuffer, Object hint) {
 	 * @return {@code true} if the buffer was released; {@code false} otherwise.
 	 */
 	public static boolean release(@Nullable DataBuffer dataBuffer) {
-		if (dataBuffer instanceof PooledDataBuffer) {
-			PooledDataBuffer pooledDataBuffer = (PooledDataBuffer) dataBuffer;
+		if (dataBuffer instanceof PooledDataBuffer pooledDataBuffer) {
 			if (pooledDataBuffer.isAllocated()) {
 				try {
 					return pooledDataBuffer.release();
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
index ab6c80a25f45..2efc753ab6c7 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
@@ -431,10 +431,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof DefaultDataBuffer)) {
+		if (!(other instanceof DefaultDataBuffer otherBuffer)) {
 			return false;
 		}
-		DefaultDataBuffer otherBuffer = (DefaultDataBuffer) other;
 		return (this.readPosition == otherBuffer.readPosition &&
 				this.writePosition == otherBuffer.writePosition &&
 				this.byteBuffer.equals(otherBuffer.byteBuffer));
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java b/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
index f718fe73cfa2..ed4eb169da6d 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,10 +165,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof EncodedResource)) {
+		if (!(other instanceof EncodedResource otherResource)) {
 			return false;
 		}
-		EncodedResource otherResource = (EncodedResource) other;
 		return (this.resource.equals(otherResource.resource) &&
 				ObjectUtils.nullSafeEquals(this.charset, otherResource.charset) &&
 				ObjectUtils.nullSafeEquals(this.encoding, otherResource.encoding));
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
index 69cd66134883..aef2476b0a55 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -368,9 +368,9 @@ protected Resource convertClassLoaderURL(URL url) {
 	 * @since 4.1.1
 	 */
 	protected void addAllClassLoaderJarRoots(@Nullable ClassLoader classLoader, Set<Resource> result) {
-		if (classLoader instanceof URLClassLoader) {
+		if (classLoader instanceof URLClassLoader urlClassLoader) {
 			try {
-				for (URL url : ((URLClassLoader) classLoader).getURLs()) {
+				for (URL url : urlClassLoader.getURLs()) {
 					try {
 						UrlResource jarResource = (ResourceUtils.URL_PROTOCOL_JAR.equals(url.getProtocol()) ?
 								new UrlResource(url) :
@@ -597,9 +597,8 @@ protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource,
 		String rootEntryPath;
 		boolean closeJarFile;
 
-		if (con instanceof JarURLConnection) {
+		if (con instanceof JarURLConnection jarCon) {
 			// Should usually be the case for traditional JAR files.
-			JarURLConnection jarCon = (JarURLConnection) con;
 			ResourceUtils.useCachesIfNecessary(jarCon);
 			jarFile = jarCon.getJarFile();
 			jarFileUrl = jarCon.getJarFileURL().toExternalForm();
diff --git a/spring-core/src/main/java/org/springframework/core/log/LogMessage.java b/spring-core/src/main/java/org/springframework/core/log/LogMessage.java
index ee7dd65f2814..4546f7a76ab8 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogMessage.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,7 +143,7 @@ public static LogMessage format(String format, Object... args) {
 
 	private static final class SupplierMessage extends LogMessage {
 
-		private Supplier<? extends CharSequence> supplier;
+		private final Supplier<? extends CharSequence> supplier;
 
 		SupplierMessage(Supplier<? extends CharSequence> supplier) {
 			Assert.notNull(supplier, "Supplier must not be null");
diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
index f56ac82af9cb..2b968d113068 100644
--- a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,7 @@ else if (value instanceof String) {
 		else if (value instanceof Class) {
 			return ClassUtils.getShortName((Class<?>) value);
 		}
-		else if (value instanceof Method) {
-			Method method = (Method) value;
+		else if (value instanceof Method method) {
 			return method.getName() + "@" + ClassUtils.getShortName(method.getDeclaringClass());
 		}
 		else if (value instanceof Map) {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
index d7c47ea2660a..98bb301ba40b 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,7 @@ public static AnnotationAttributes convertClassValues(Object annotatedElement,
 					value = convertClassValues(
 							annotatedElement, classLoader, (AnnotationAttributes) value, classValuesAsString);
 				}
-				else if (value instanceof AnnotationAttributes[]) {
-					AnnotationAttributes[] values = (AnnotationAttributes[]) value;
+				else if (value instanceof AnnotationAttributes[] values) {
 					for (int i = 0; i < values.length; i++) {
 						values[i] = convertClassValues(annotatedElement, classLoader, values[i], classValuesAsString);
 					}
@@ -72,8 +71,7 @@ else if (value instanceof Type) {
 					value = (classValuesAsString ? ((Type) value).getClassName() :
 							ClassUtils.forName(((Type) value).getClassName(), classLoader));
 				}
-				else if (value instanceof Type[]) {
-					Type[] array = (Type[]) value;
+				else if (value instanceof Type[] array) {
 					Object[] convArray =
 							(classValuesAsString ? new String[array.length] : new Class<?>[array.length]);
 					for (int i = 0; i < array.length; i++) {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
index aca2ecd8b7d1..c80520cb5e77 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ class ClassMetadataReadingVisitor extends ClassVisitor implements ClassMetadata
 
 	private String[] interfaces = new String[0];
 
-	private Set<String> memberClassNames = new LinkedHashSet<>(4);
+	private final Set<String> memberClassNames = new LinkedHashSet<>(4);
 
 
 	public ClassMetadataReadingVisitor() {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
index 6422cda99105..2875b1e263b1 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,11 +59,11 @@ final class SimpleAnnotationMetadataReadingVisitor extends ClassVisitor {
 
 	private boolean independentInnerClass;
 
-	private Set<String> memberClassNames = new LinkedHashSet<>(4);
+	private final Set<String> memberClassNames = new LinkedHashSet<>(4);
 
-	private List<MergedAnnotation<?>> annotations = new ArrayList<>();
+	private final List<MergedAnnotation<?>> annotations = new ArrayList<>();
 
-	private List<SimpleMethodMetadata> annotatedMethods = new ArrayList<>();
+	private final List<SimpleMethodMetadata> annotatedMethods = new ArrayList<>();
 
 	@Nullable
 	private SimpleAnnotationMetadata metadata;
diff --git a/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java b/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java
index 9984211efcd4..031ef027f03c 100644
--- a/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java
+++ b/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,10 +102,12 @@ public <T> T newInstance(Class<T> clazz, boolean useCache) {
 		return getInstantiatorOf(clazz).newInstance();
 	}
 
+	@Override
 	public <T> T newInstance(Class<T> clazz) {
 		return getInstantiatorOf(clazz).newInstance();
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> ObjectInstantiator<T> getInstantiatorOf(Class<T> clazz) {
 		ObjectInstantiator<?> instantiator = this.cache.get(clazz);
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java b/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
index 3291ca6e079a..47f44b188c09 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
@@ -762,10 +762,9 @@ public final boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof Map.Entry)) {
+			if (!(other instanceof Map.Entry otherEntry)) {
 				return false;
 			}
-			Map.Entry otherEntry = (Map.Entry) other;
 			return (ObjectUtils.nullSafeEquals(getKey(), otherEntry.getKey()) &&
 					ObjectUtils.nullSafeEquals(getValue(), otherEntry.getValue()));
 		}
@@ -853,8 +852,7 @@ public Iterator<Map.Entry<K, V>> iterator() {
 
 		@Override
 		public boolean contains(@Nullable Object o) {
-			if (o instanceof Map.Entry<?, ?>) {
-				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+			if (o instanceof Map.Entry<?, ?> entry) {
 				Reference<K, V> ref = ConcurrentReferenceHashMap.this.getReference(entry.getKey(), Restructure.NEVER);
 				Entry<K, V> otherEntry = (ref != null ? ref.get() : null);
 				if (otherEntry != null) {
@@ -866,8 +864,7 @@ public boolean contains(@Nullable Object o) {
 
 		@Override
 		public boolean remove(Object o) {
-			if (o instanceof Map.Entry<?, ?>) {
-				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+			if (o instanceof Map.Entry<?, ?> entry) {
 				return ConcurrentReferenceHashMap.this.remove(entry.getKey(), entry.getValue());
 			}
 			return false;
diff --git a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
index 4689d53ee1e6..8deb9bf9c02e 100644
--- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
+++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
@@ -110,7 +110,7 @@ public LinkedCaseInsensitiveMap(int expectedSize) {
 	 * @see #convertKey(String)
 	 */
 	public LinkedCaseInsensitiveMap(int expectedSize, @Nullable Locale locale) {
-		this.targetMap = new LinkedHashMap<String, V>(
+		this.targetMap = new LinkedHashMap<>(
 				(int) (expectedSize / CollectionUtils.DEFAULT_LOAD_FACTOR), CollectionUtils.DEFAULT_LOAD_FACTOR) {
 			@Override
 			public boolean containsKey(Object key) {
diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
index aa4ef6f53a31..d77b2f5711be 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeType.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -453,10 +453,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MimeType)) {
+		if (!(other instanceof MimeType otherType)) {
 			return false;
 		}
-		MimeType otherType = (MimeType) other;
 		return (this.type.equalsIgnoreCase(otherType.type) &&
 				this.subtype.equalsIgnoreCase(otherType.subtype) &&
 				parametersAreEqual(otherType));
diff --git a/spring-core/src/main/java/org/springframework/util/TypeUtils.java b/spring-core/src/main/java/org/springframework/util/TypeUtils.java
index 4a959aef52f0..0b770779550b 100644
--- a/spring-core/src/main/java/org/springframework/util/TypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/TypeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,12 @@
 
 /**
  * Utility to work with Java 5 generic type parameters.
- * Mainly for internal use within the framework.
+ * <p>Mainly for internal use within the framework.
  *
  * @author Ramnivas Laddad
  * @author Juergen Hoeller
  * @author Chris Beams
+ * @author Sam Brannen
  * @since 2.0.7
  */
 public abstract class TypeUtils {
@@ -50,62 +51,56 @@ public static boolean isAssignable(Type lhsType, Type rhsType) {
 			return true;
 		}
 
-		if (lhsType instanceof Class) {
-			Class<?> lhsClass = (Class<?>) lhsType;
-
+		if (lhsType instanceof Class<?> lhsClass) {
 			// just comparing two classes
-			if (rhsType instanceof Class) {
-				return ClassUtils.isAssignable(lhsClass, (Class<?>) rhsType);
+			if (rhsType instanceof Class<?> rhsClass) {
+				return ClassUtils.isAssignable(lhsClass, rhsClass);
 			}
 
-			if (rhsType instanceof ParameterizedType) {
-				Type rhsRaw = ((ParameterizedType) rhsType).getRawType();
+			if (rhsType instanceof ParameterizedType rhsParameterizedType) {
+				Type rhsRaw = rhsParameterizedType.getRawType();
 
 				// a parameterized type is always assignable to its raw class type
-				if (rhsRaw instanceof Class) {
-					return ClassUtils.isAssignable(lhsClass, (Class<?>) rhsRaw);
+				if (rhsRaw instanceof Class<?> rhRawClass) {
+					return ClassUtils.isAssignable(lhsClass, rhRawClass);
 				}
 			}
-			else if (lhsClass.isArray() && rhsType instanceof GenericArrayType) {
-				Type rhsComponent = ((GenericArrayType) rhsType).getGenericComponentType();
+			else if (lhsClass.isArray() && rhsType instanceof GenericArrayType rhsGenericArrayType) {
+				Type rhsComponent = rhsGenericArrayType.getGenericComponentType();
 
 				return isAssignable(lhsClass.getComponentType(), rhsComponent);
 			}
 		}
 
 		// parameterized types are only assignable to other parameterized types and class types
-		if (lhsType instanceof ParameterizedType) {
-			if (rhsType instanceof Class) {
-				Type lhsRaw = ((ParameterizedType) lhsType).getRawType();
+		if (lhsType instanceof ParameterizedType lhsParameterizedType) {
+			if (rhsType instanceof Class<?> rhsClass) {
+				Type lhsRaw = lhsParameterizedType.getRawType();
 
-				if (lhsRaw instanceof Class) {
-					return ClassUtils.isAssignable((Class<?>) lhsRaw, (Class<?>) rhsType);
+				if (lhsRaw instanceof Class<?> lhsClass) {
+					return ClassUtils.isAssignable(lhsClass, rhsClass);
 				}
 			}
-			else if (rhsType instanceof ParameterizedType) {
-				return isAssignable((ParameterizedType) lhsType, (ParameterizedType) rhsType);
+			else if (rhsType instanceof ParameterizedType rhsParameterizedType) {
+				return isAssignable(lhsParameterizedType, rhsParameterizedType);
 			}
 		}
 
-		if (lhsType instanceof GenericArrayType) {
-			Type lhsComponent = ((GenericArrayType) lhsType).getGenericComponentType();
-
-			if (rhsType instanceof Class) {
-				Class<?> rhsClass = (Class<?>) rhsType;
+		if (lhsType instanceof GenericArrayType lhsGenericArrayType) {
+			Type lhsComponent = lhsGenericArrayType.getGenericComponentType();
 
-				if (rhsClass.isArray()) {
-					return isAssignable(lhsComponent, rhsClass.getComponentType());
-				}
+			if (rhsType instanceof Class<?> rhsClass && rhsClass.isArray()) {
+				return isAssignable(lhsComponent, rhsClass.getComponentType());
 			}
-			else if (rhsType instanceof GenericArrayType) {
-				Type rhsComponent = ((GenericArrayType) rhsType).getGenericComponentType();
+			else if (rhsType instanceof GenericArrayType rhsGenericArrayType) {
+				Type rhsComponent = rhsGenericArrayType.getGenericComponentType();
 
 				return isAssignable(lhsComponent, rhsComponent);
 			}
 		}
 
-		if (lhsType instanceof WildcardType) {
-			return isAssignable((WildcardType) lhsType, rhsType);
+		if (lhsType instanceof WildcardType lhsWildcardType) {
+			return isAssignable(lhsWildcardType, rhsType);
 		}
 
 		return false;
@@ -128,7 +123,7 @@ private static boolean isAssignable(ParameterizedType lhsType, ParameterizedType
 			Type rhsArg = rhsTypeArguments[i];
 
 			if (!lhsArg.equals(rhsArg) &&
-					!(lhsArg instanceof WildcardType && isAssignable((WildcardType) lhsArg, rhsArg))) {
+					!(lhsArg instanceof WildcardType wildcardType && isAssignable(wildcardType, rhsArg))) {
 				return false;
 			}
 		}
@@ -151,11 +146,10 @@ private static boolean isAssignable(WildcardType lhsType, Type rhsType) {
 			lLowerBounds = new Type[] { null };
 		}
 
-		if (rhsType instanceof WildcardType) {
+		if (rhsType instanceof WildcardType rhsWcType) {
 			// both the upper and lower bounds of the right-hand side must be
 			// completely enclosed in the upper and lower bounds of the left-
 			// hand side.
-			WildcardType rhsWcType = (WildcardType) rhsType;
 			Type[] rUpperBounds = rhsWcType.getUpperBounds();
 
 			if (rUpperBounds.length == 0) {
diff --git a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
index 7a27d683c297..7b1ba92bfb40 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.Attribute;
 import javax.xml.stream.events.Comment;
@@ -155,7 +156,7 @@ public String getText() {
 		if (this.event.isCharacters()) {
 			return this.event.asCharacters().getData();
 		}
-		else if (this.event.getEventType() == XMLEvent.COMMENT) {
+		else if (this.event.getEventType() == XMLStreamConstants.COMMENT) {
 			return ((Comment) this.event).getText();
 		}
 		else {

From 4e6ef82d8f3ae7c587e0f1900ca263fd5d7b7f02 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 19:46:21 +0200
Subject: [PATCH 259/735] Apply "instanceof pattern matching" in
 spring-expression

This commit also applies additional clean-up tasks such as the following.

- final fields

This commit also makes use of java.lang.String.repeat(int) in OptMultiply.

This has only been applied to `src/main/java`.
---
 .../expression/TypedValue.java                |  5 +-
 .../spel/ast/ConstructorReference.java        | 11 ++--
 .../expression/spel/ast/Indexer.java          | 36 ++++++-------
 .../expression/spel/ast/InlineList.java       | 18 +++----
 .../expression/spel/ast/InlineMap.java        | 30 +++++------
 .../expression/spel/ast/OpDec.java            | 14 ++---
 .../expression/spel/ast/OpDivide.java         |  8 ++-
 .../expression/spel/ast/OpGE.java             |  7 +--
 .../expression/spel/ast/OpGT.java             |  7 +--
 .../expression/spel/ast/OpInc.java            | 14 ++---
 .../expression/spel/ast/OpLE.java             |  7 +--
 .../expression/spel/ast/OpLT.java             |  7 +--
 .../expression/spel/ast/OpMinus.java          | 52 +++++++++----------
 .../expression/spel/ast/OpModulus.java        |  9 ++--
 .../expression/spel/ast/OpMultiply.java       | 16 ++----
 .../expression/spel/ast/OpPlus.java           | 14 ++---
 .../expression/spel/ast/Operator.java         |  6 +--
 .../expression/spel/ast/OperatorMatches.java  |  8 +--
 .../expression/spel/ast/OperatorPower.java    |  7 +--
 .../spel/ast/PropertyOrFieldReference.java    | 20 ++++---
 .../expression/spel/standard/Tokenizer.java   | 10 ++--
 .../support/ReflectivePropertyAccessor.java   | 42 +++++++--------
 .../spel/support/StandardTypeComparator.java  |  9 ++--
 23 files changed, 151 insertions(+), 206 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
index d2d470b72d70..a4f2427cc0ad 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,10 +85,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof TypedValue)) {
+		if (!(other instanceof TypedValue otherTv)) {
 			return false;
 		}
-		TypedValue otherTv = (TypedValue) other;
 		// Avoid TypeDescriptor initialization if not necessary
 		return (ObjectUtils.nullSafeEquals(this.value, otherTv.value) &&
 				((this.typeDescriptor == null && otherTv.typeDescriptor == null) ||
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
index d42a375410f6..9841cee9ba98 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
@@ -136,8 +136,8 @@ private TypedValue createNewInstance(ExpressionState state) throws EvaluationExc
 				if (ex.getCause() instanceof InvocationTargetException) {
 					// User exception was the root cause - exit now
 					Throwable rootCause = ex.getCause().getCause();
-					if (rootCause instanceof RuntimeException) {
-						throw (RuntimeException) rootCause;
+					if (rootCause instanceof RuntimeException runtimeException) {
+						throw runtimeException;
 					}
 					else {
 						String typeName = (String) this.children[0].getValueInternal(state).getValue();
@@ -158,9 +158,9 @@ private TypedValue createNewInstance(ExpressionState state) throws EvaluationExc
 		executorToUse = findExecutorForConstructor(typeName, argumentTypes, state);
 		try {
 			this.cachedExecutor = executorToUse;
-			if (executorToUse instanceof ReflectiveConstructorExecutor) {
+			if (executorToUse instanceof ReflectiveConstructorExecutor reflectiveConstructorExecutor) {
 				this.exitTypeDescriptor = CodeFlow.toDescriptor(
-						((ReflectiveConstructorExecutor) executorToUse).getConstructor().getDeclaringClass());
+						reflectiveConstructorExecutor.getConstructor().getDeclaringClass());
 
 			}
 			return executorToUse.execute(state.getEvaluationContext(), arguments);
@@ -228,14 +228,13 @@ public String toStringAST() {
 	private TypedValue createArray(ExpressionState state) throws EvaluationException {
 		// First child gives us the array type which will either be a primitive or reference type
 		Object intendedArrayType = getChild(0).getValue(state);
-		if (!(intendedArrayType instanceof String)) {
+		if (!(intendedArrayType instanceof String type)) {
 			throw new SpelEvaluationException(getChild(0).getStartPosition(),
 					SpelMessage.TYPE_NAME_EXPECTED_FOR_ARRAY_CONSTRUCTION,
 					FormatHelper.formatClassNameForMessage(
 							intendedArrayType != null ? intendedArrayType.getClass() : null));
 		}
 
-		String type = (String) intendedArrayType;
 		Class<?> componentType;
 		TypeCode arrayTypeCode = TypeCode.forName(type);
 		if (arrayTypeCode == TypeCode.OBJECT) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
index 04b502816169..7a9d277ac027 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@
  * @author Andy Clement
  * @author Phillip Webb
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 3.0
  */
 // TODO support multidimensional arrays
@@ -121,8 +122,7 @@ protected ValueRef getValueRef(ExpressionState state) throws EvaluationException
 		Object index;
 
 		// This first part of the if clause prevents a 'double dereference' of the property (SPR-5847)
-		if (target instanceof Map && (this.children[0] instanceof PropertyOrFieldReference)) {
-			PropertyOrFieldReference reference = (PropertyOrFieldReference) this.children[0];
+		if (target instanceof Map && (this.children[0] instanceof PropertyOrFieldReference reference)) {
 			index = reference.getName();
 			indexValue = new TypedValue(index);
 		}
@@ -148,13 +148,13 @@ protected ValueRef getValueRef(ExpressionState state) throws EvaluationException
 		Assert.state(targetDescriptor != null, "No type descriptor");
 
 		// Indexing into a Map
-		if (target instanceof Map) {
+		if (target instanceof Map<?, ?> map) {
 			Object key = index;
 			if (targetDescriptor.getMapKeyTypeDescriptor() != null) {
 				key = state.convertValue(key, targetDescriptor.getMapKeyTypeDescriptor());
 			}
 			this.indexedType = IndexedType.MAP;
-			return new MapIndexingValueRef(state.getTypeConverter(), (Map<?, ?>) target, key, targetDescriptor);
+			return new MapIndexingValueRef(state.getTypeConverter(), map, key, targetDescriptor);
 		}
 
 		// If the object is something that looks indexable by an integer,
@@ -275,8 +275,7 @@ else if (this.indexedType == IndexedType.MAP) {
 			mv.visitTypeInsn(CHECKCAST, "java/util/Map");
 			// Special case when the key is an unquoted string literal that will be parsed as
 			// a property/field reference
-			if ((this.children[0] instanceof PropertyOrFieldReference)) {
-				PropertyOrFieldReference reference = (PropertyOrFieldReference) this.children[0];
+			if ((this.children[0] instanceof PropertyOrFieldReference reference)) {
 				String mapKeyName = reference.getName();
 				mv.visitLdcInsn(mapKeyName);
 			}
@@ -306,9 +305,9 @@ else if (this.indexedType == IndexedType.OBJECT) {
 				}
 			}
 
-			if (member instanceof Method) {
+			if (member instanceof Method method) {
 				mv.visitMethodInsn((isStatic? INVOKESTATIC : INVOKEVIRTUAL), classDesc, member.getName(),
-						CodeFlow.createSignatureDescriptor((Method) member), false);
+						CodeFlow.createSignatureDescriptor(method), false);
 			}
 			else {
 				mv.visitFieldInsn((isStatic ? GETSTATIC : GETFIELD), classDesc, member.getName(),
@@ -572,19 +571,17 @@ public TypedValue getValue() {
 						targetObjectRuntimeClass, this.evaluationContext.getPropertyAccessors());
 				for (PropertyAccessor accessor : accessorsToTry) {
 					if (accessor.canRead(this.evaluationContext, this.targetObject, this.name)) {
-						if (accessor instanceof ReflectivePropertyAccessor) {
-							accessor = ((ReflectivePropertyAccessor) accessor).createOptimalAccessor(
+						if (accessor instanceof ReflectivePropertyAccessor reflectivePropertyAccessor) {
+							accessor = reflectivePropertyAccessor.createOptimalAccessor(
 									this.evaluationContext, this.targetObject, this.name);
 						}
 						Indexer.this.cachedReadAccessor = accessor;
 						Indexer.this.cachedReadName = this.name;
 						Indexer.this.cachedReadTargetType = targetObjectRuntimeClass;
-						if (accessor instanceof ReflectivePropertyAccessor.OptimalPropertyAccessor) {
-							ReflectivePropertyAccessor.OptimalPropertyAccessor optimalAccessor =
-									(ReflectivePropertyAccessor.OptimalPropertyAccessor) accessor;
+						if (accessor instanceof ReflectivePropertyAccessor.OptimalPropertyAccessor optimalAccessor) {
 							Member member = optimalAccessor.member;
-							Indexer.this.exitTypeDescriptor = CodeFlow.toDescriptor(member instanceof Method ?
-									((Method) member).getReturnType() : ((Field) member).getType());
+							Indexer.this.exitTypeDescriptor = CodeFlow.toDescriptor(member instanceof Method method ?
+									method.getReturnType() : ((Field) member).getType());
 						}
 						return accessor.read(this.evaluationContext, this.targetObject, this.name);
 					}
@@ -665,8 +662,8 @@ public CollectionIndexingValueRef(Collection collection, int index, TypeDescript
 		@Override
 		public TypedValue getValue() {
 			growCollectionIfNecessary();
-			if (this.collection instanceof List) {
-				Object o = ((List) this.collection).get(this.index);
+			if (this.collection instanceof List list) {
+				Object o = list.get(this.index);
 				exitTypeDescriptor = CodeFlow.toDescriptor(Object.class);
 				return new TypedValue(o, this.collectionEntryDescriptor.elementTypeDescriptor(o));
 			}
@@ -683,8 +680,7 @@ public TypedValue getValue() {
 		@Override
 		public void setValue(@Nullable Object newValue) {
 			growCollectionIfNecessary();
-			if (this.collection instanceof List) {
-				List list = (List) this.collection;
+			if (this.collection instanceof List list) {
 				if (this.collectionEntryDescriptor.getElementTypeDescriptor() != null) {
 					newValue = this.typeConverter.convertValue(newValue, TypeDescriptor.forObject(newValue),
 							this.collectionEntryDescriptor.getElementTypeDescriptor());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
index 4fa298eb5a3d..8abf63ec6ddf 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
  * Represent a list in an expression, e.g. '{1,2,3}'
  *
  * @author Andy Clement
+ * @author Sam Brannen
  * @since 3.0.4
  */
 public class InlineList extends SpelNodeImpl {
@@ -59,8 +60,7 @@ private void checkIfConstant() {
 		for (int c = 0, max = getChildCount(); c < max; c++) {
 			SpelNode child = getChild(c);
 			if (!(child instanceof Literal)) {
-				if (child instanceof InlineList) {
-					InlineList inlineList = (InlineList) child;
+				if (child instanceof InlineList inlineList) {
 					if (!inlineList.isConstant()) {
 						isConstant = false;
 					}
@@ -75,11 +75,11 @@ private void checkIfConstant() {
 			int childcount = getChildCount();
 			for (int c = 0; c < childcount; c++) {
 				SpelNode child = getChild(c);
-				if ((child instanceof Literal)) {
-					constantList.add(((Literal) child).getLiteralValue().getValue());
+				if (child instanceof Literal literal) {
+					constantList.add(literal.getLiteralValue().getValue());
 				}
-				else if (child instanceof InlineList) {
-					constantList.add(((InlineList) child).getConstantValue());
+				else if (child instanceof InlineList inlineList) {
+					constantList.add(inlineList.getConstantValue());
 				}
 			}
 			this.constant = new TypedValue(Collections.unmodifiableList(constantList));
@@ -164,8 +164,8 @@ void generateClinitCode(String clazzname, String constantFieldName, MethodVisito
 			// The children might be further lists if they are not constants. In this
 			// situation do not call back into generateCode() because it will register another clinit adder.
 			// Instead, directly build the list here:
-			if (this.children[c] instanceof InlineList) {
-				((InlineList)this.children[c]).generateClinitCode(clazzname, constantFieldName, mv, codeflow, true);
+			if (this.children[c] instanceof InlineList inlineList) {
+				inlineList.generateClinitCode(clazzname, constantFieldName, mv, codeflow, true);
 			}
 			else {
 				this.children[c].generateCode(mv, codeflow);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
index c70759b03fe1..7f63c356885b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
@@ -31,6 +31,7 @@
  * Represent a map in an expression, e.g. '{name:'foo',age:12}'
  *
  * @author Andy Clement
+ * @author Sam Brannen
  * @since 4.1
  */
 public class InlineMap extends SpelNodeImpl {
@@ -56,15 +57,13 @@ private void checkIfConstant() {
 		for (int c = 0, max = getChildCount(); c < max; c++) {
 			SpelNode child = getChild(c);
 			if (!(child instanceof Literal)) {
-				if (child instanceof InlineList) {
-					InlineList inlineList = (InlineList) child;
+				if (child instanceof InlineList inlineList) {
 					if (!inlineList.isConstant()) {
 						isConstant = false;
 						break;
 					}
 				}
-				else if (child instanceof InlineMap) {
-					InlineMap inlineMap = (InlineMap) child;
+				else if (child instanceof InlineMap inlineMap) {
 					if (!inlineMap.isConstant()) {
 						isConstant = false;
 						break;
@@ -84,23 +83,23 @@ else if (!(c % 2 == 0 && child instanceof PropertyOrFieldReference)) {
 				SpelNode valueChild = getChild(c);
 				Object key = null;
 				Object value = null;
-				if (keyChild instanceof Literal) {
-					key = ((Literal) keyChild).getLiteralValue().getValue();
+				if (keyChild instanceof Literal literal) {
+					key = literal.getLiteralValue().getValue();
 				}
-				else if (keyChild instanceof PropertyOrFieldReference) {
-					key = ((PropertyOrFieldReference) keyChild).getName();
+				else if (keyChild instanceof PropertyOrFieldReference propertyOrFieldReference) {
+					key = propertyOrFieldReference.getName();
 				}
 				else {
 					return;
 				}
-				if (valueChild instanceof Literal) {
-					value = ((Literal) valueChild).getLiteralValue().getValue();
+				if (valueChild instanceof Literal literal) {
+					value = literal.getLiteralValue().getValue();
 				}
-				else if (valueChild instanceof InlineList) {
-					value = ((InlineList) valueChild).getConstantValue();
+				else if (valueChild instanceof InlineList inlineList) {
+					value = inlineList.getConstantValue();
 				}
-				else if (valueChild instanceof InlineMap) {
-					value = ((InlineMap) valueChild).getConstantValue();
+				else if (valueChild instanceof InlineMap inlineMap) {
+					value = inlineMap.getConstantValue();
 				}
 				constantMap.put(key, value);
 			}
@@ -120,8 +119,7 @@ public TypedValue getValueInternal(ExpressionState expressionState) throws Evalu
 				// TODO allow for key being PropertyOrFieldReference like Indexer on maps
 				SpelNode keyChild = getChild(c++);
 				Object key = null;
-				if (keyChild instanceof PropertyOrFieldReference) {
-					PropertyOrFieldReference reference = (PropertyOrFieldReference) keyChild;
+				if (keyChild instanceof PropertyOrFieldReference reference) {
 					key = reference.getName();
 				}
 				else {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDec.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDec.java
index 9bab5a1e381b..d61e8d641062 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDec.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Giovanni Dall'Oglio Risso
+ * @author Sam Brannen
  * @since 3.2
  */
 public class OpDec extends Operator {
@@ -60,10 +61,9 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		TypedValue returnValue = operandTypedValue;
 		TypedValue newValue = null;
 
-		if (operandValue instanceof Number) {
-			Number op1 = (Number) operandValue;
-			if (op1 instanceof BigDecimal) {
-				newValue = new TypedValue(((BigDecimal) op1).subtract(BigDecimal.ONE), operandTypedValue.getTypeDescriptor());
+		if (operandValue instanceof Number op1) {
+			if (op1 instanceof BigDecimal bigDecimal) {
+				newValue = new TypedValue(bigDecimal.subtract(BigDecimal.ONE), operandTypedValue.getTypeDescriptor());
 			}
 			else if (op1 instanceof Double) {
 				newValue = new TypedValue(op1.doubleValue() - 1.0d, operandTypedValue.getTypeDescriptor());
@@ -71,8 +71,8 @@ else if (op1 instanceof Double) {
 			else if (op1 instanceof Float) {
 				newValue = new TypedValue(op1.floatValue() - 1.0f, operandTypedValue.getTypeDescriptor());
 			}
-			else if (op1 instanceof BigInteger) {
-				newValue = new TypedValue(((BigInteger) op1).subtract(BigInteger.ONE), operandTypedValue.getTypeDescriptor());
+			else if (op1 instanceof BigInteger bigInteger) {
+				newValue = new TypedValue(bigInteger.subtract(BigInteger.ONE), operandTypedValue.getTypeDescriptor());
 			}
 			else if (op1 instanceof Long) {
 				newValue = new TypedValue(op1.longValue() - 1L, operandTypedValue.getTypeDescriptor());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
index 02eae2f48c85..f555d75f3209 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Giovanni Dall'Oglio Risso
+ * @author Sam Brannen
  * @since 3.0
  */
 public class OpDivide extends Operator {
@@ -49,10 +50,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		Object leftOperand = getLeftOperand().getValueInternal(state).getValue();
 		Object rightOperand = getRightOperand().getValueInternal(state).getValue();
 
-		if (leftOperand instanceof Number && rightOperand instanceof Number) {
-			Number leftNumber = (Number) leftOperand;
-			Number rightNumber = (Number) rightOperand;
-
+		if (leftOperand instanceof Number leftNumber && rightOperand instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
index 708e1b89c593..8dea989339f8 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,10 +50,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 		this.leftActualDescriptor = CodeFlow.toDescriptorFromObject(left);
 		this.rightActualDescriptor = CodeFlow.toDescriptorFromObject(right);
 
-		if (left instanceof Number && right instanceof Number) {
-			Number leftNumber = (Number) left;
-			Number rightNumber = (Number) right;
-
+		if (left instanceof Number leftNumber && right instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
index 3a4b2fd70889..7823bf888a57 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,10 +50,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 		this.leftActualDescriptor = CodeFlow.toDescriptorFromObject(left);
 		this.rightActualDescriptor = CodeFlow.toDescriptorFromObject(right);
 
-		if (left instanceof Number && right instanceof Number) {
-			Number leftNumber = (Number) left;
-			Number rightNumber = (Number) right;
-
+		if (left instanceof Number leftNumber && right instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpInc.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpInc.java
index ee19b59988ca..f6dc184c0f5e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpInc.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpInc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Giovanni Dall'Oglio Risso
+ * @author Sam Brannen
  * @since 3.2
  */
 public class OpInc extends Operator {
@@ -58,10 +59,9 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		TypedValue returnValue = typedValue;
 		TypedValue newValue = null;
 
-		if (value instanceof Number) {
-			Number op1 = (Number) value;
-			if (op1 instanceof BigDecimal) {
-				newValue = new TypedValue(((BigDecimal) op1).add(BigDecimal.ONE), typedValue.getTypeDescriptor());
+		if (value instanceof Number op1) {
+			if (op1 instanceof BigDecimal bigDecimal) {
+				newValue = new TypedValue(bigDecimal.add(BigDecimal.ONE), typedValue.getTypeDescriptor());
 			}
 			else if (op1 instanceof Double) {
 				newValue = new TypedValue(op1.doubleValue() + 1.0d, typedValue.getTypeDescriptor());
@@ -69,8 +69,8 @@ else if (op1 instanceof Double) {
 			else if (op1 instanceof Float) {
 				newValue = new TypedValue(op1.floatValue() + 1.0f, typedValue.getTypeDescriptor());
 			}
-			else if (op1 instanceof BigInteger) {
-				newValue = new TypedValue(((BigInteger) op1).add(BigInteger.ONE), typedValue.getTypeDescriptor());
+			else if (op1 instanceof BigInteger bigInteger) {
+				newValue = new TypedValue(bigInteger.add(BigInteger.ONE), typedValue.getTypeDescriptor());
 			}
 			else if (op1 instanceof Long) {
 				newValue = new TypedValue(op1.longValue() + 1L, typedValue.getTypeDescriptor());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
index adbc29916405..1fa2e2025308 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,10 +50,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 		this.leftActualDescriptor = CodeFlow.toDescriptorFromObject(left);
 		this.rightActualDescriptor = CodeFlow.toDescriptorFromObject(right);
 
-		if (left instanceof Number && right instanceof Number) {
-			Number leftNumber = (Number) left;
-			Number rightNumber = (Number) right;
-
+		if (left instanceof Number leftNumber && right instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
index 8101dee8b31f..fc6d91705c8d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,10 +50,7 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 		this.leftActualDescriptor = CodeFlow.toDescriptorFromObject(left);
 		this.rightActualDescriptor = CodeFlow.toDescriptorFromObject(right);
 
-		if (left instanceof Number && right instanceof Number) {
-			Number leftNumber = (Number) left;
-			Number rightNumber = (Number) right;
-
+		if (left instanceof Number leftNumber && right instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
index 54d6b689d8e1..ddbc9c7d6f67 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Giovanni Dall'Oglio Risso
+ * @author Sam Brannen
  * @since 3.0
  */
 public class OpMinus extends Operator {
@@ -58,38 +59,38 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 
 		if (this.children.length < 2) {  // if only one operand, then this is unary minus
 			Object operand = leftOp.getValueInternal(state).getValue();
-			if (operand instanceof Number) {
-				if (operand instanceof BigDecimal) {
-					return new TypedValue(((BigDecimal) operand).negate());
+			if (operand instanceof Number number) {
+				if (number instanceof BigDecimal bigDecimal) {
+					return new TypedValue(bigDecimal.negate());
 				}
-				else if (operand instanceof Double) {
+				else if (number instanceof BigInteger bigInteger) {
+					return new TypedValue(bigInteger.negate());
+				}
+				else if (number instanceof Double) {
 					this.exitTypeDescriptor = "D";
-					return new TypedValue(0 - ((Number) operand).doubleValue());
+					return new TypedValue(0 - number.doubleValue());
 				}
-				else if (operand instanceof Float) {
+				else if (number instanceof Float) {
 					this.exitTypeDescriptor = "F";
-					return new TypedValue(0 - ((Number) operand).floatValue());
-				}
-				else if (operand instanceof BigInteger) {
-					return new TypedValue(((BigInteger) operand).negate());
+					return new TypedValue(0 - number.floatValue());
 				}
-				else if (operand instanceof Long) {
+				else if (number instanceof Long) {
 					this.exitTypeDescriptor = "J";
-					return new TypedValue(0 - ((Number) operand).longValue());
+					return new TypedValue(0 - number.longValue());
 				}
-				else if (operand instanceof Integer) {
+				else if (number instanceof Integer) {
 					this.exitTypeDescriptor = "I";
-					return new TypedValue(0 - ((Number) operand).intValue());
+					return new TypedValue(0 - number.intValue());
 				}
-				else if (operand instanceof Short) {
-					return new TypedValue(0 - ((Number) operand).shortValue());
+				else if (number instanceof Short) {
+					return new TypedValue(0 - number.shortValue());
 				}
-				else if (operand instanceof Byte) {
-					return new TypedValue(0 - ((Number) operand).byteValue());
+				else if (number instanceof Byte) {
+					return new TypedValue(0 - number.byteValue());
 				}
 				else {
-					// Unknown Number subtypes -> best guess is double subtraction
-					return new TypedValue(0 - ((Number) operand).doubleValue());
+					// Unknown Number subtype -> best guess is double subtraction
+					return new TypedValue(0 - number.doubleValue());
 				}
 			}
 			return state.operate(Operation.SUBTRACT, operand, null);
@@ -98,10 +99,7 @@ else if (operand instanceof Byte) {
 		Object left = leftOp.getValueInternal(state).getValue();
 		Object right = getRightOperand().getValueInternal(state).getValue();
 
-		if (left instanceof Number && right instanceof Number) {
-			Number leftNumber = (Number) left;
-			Number rightNumber = (Number) right;
-
+		if (left instanceof Number leftNumber && right instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
@@ -134,9 +132,7 @@ else if (CodeFlow.isIntegerForNumericOp(leftNumber) || CodeFlow.isIntegerForNume
 			}
 		}
 
-		if (left instanceof String && right instanceof Integer && ((String) left).length() == 1) {
-			String theString = (String) left;
-			Integer theInteger = (Integer) right;
+		if (left instanceof String theString && right instanceof Integer theInteger && theString.length() == 1) {
 			// Implements character - int (ie. b - 1 = a)
 			return new TypedValue(Character.toString((char) (theString.charAt(0) - theInteger)));
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
index eadd9a960d1f..51385a3603ea 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,10 +48,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		Object leftOperand = getLeftOperand().getValueInternal(state).getValue();
 		Object rightOperand = getRightOperand().getValueInternal(state).getValue();
 
-		if (leftOperand instanceof Number && rightOperand instanceof Number) {
-			Number leftNumber = (Number) leftOperand;
-			Number rightNumber = (Number) rightOperand;
-
+		if (leftOperand instanceof Number leftNumber && rightOperand instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
@@ -79,7 +76,7 @@ else if (CodeFlow.isIntegerForNumericOp(leftNumber) || CodeFlow.isIntegerForNume
 				return new TypedValue(leftNumber.intValue() % rightNumber.intValue());
 			}
 			else {
-				// Unknown Number subtypes -> best guess is double division
+				// Unknown Number subtype -> best guess is double division
 				return new TypedValue(leftNumber.doubleValue() % rightNumber.doubleValue());
 			}
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
index fbf28317b32b..83c406e01d09 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,10 +72,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		Object leftOperand = getLeftOperand().getValueInternal(state).getValue();
 		Object rightOperand = getRightOperand().getValueInternal(state).getValue();
 
-		if (leftOperand instanceof Number && rightOperand instanceof Number) {
-			Number leftNumber = (Number) leftOperand;
-			Number rightNumber = (Number) rightOperand;
-
+		if (leftOperand instanceof Number leftNumber && rightOperand instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
@@ -108,13 +105,8 @@ else if (CodeFlow.isIntegerForNumericOp(leftNumber) || CodeFlow.isIntegerForNume
 			}
 		}
 
-		if (leftOperand instanceof String && rightOperand instanceof Integer) {
-			int repeats = (Integer) rightOperand;
-			StringBuilder result = new StringBuilder();
-			for (int i = 0; i < repeats; i++) {
-				result.append(leftOperand);
-			}
-			return new TypedValue(result.toString());
+		if (leftOperand instanceof String text && rightOperand instanceof Integer repeats) {
+			return new TypedValue(text.repeat(repeats));
 		}
 
 		return state.operate(Operation.MULTIPLY, leftOperand, rightOperand);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
index d128f56b2deb..098f96dca123 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,10 +85,7 @@ else if (operandOne instanceof Integer) {
 		TypedValue operandTwoValue = getRightOperand().getValueInternal(state);
 		Object rightOperand = operandTwoValue.getValue();
 
-		if (leftOperand instanceof Number && rightOperand instanceof Number) {
-			Number leftNumber = (Number) leftOperand;
-			Number rightNumber = (Number) rightOperand;
-
+		if (leftOperand instanceof Number leftNumber && rightOperand instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
@@ -121,9 +118,9 @@ else if (CodeFlow.isIntegerForNumericOp(leftNumber) || CodeFlow.isIntegerForNume
 			}
 		}
 
-		if (leftOperand instanceof String && rightOperand instanceof String) {
+		if (leftOperand instanceof String leftString && rightOperand instanceof String rightString) {
 			this.exitTypeDescriptor = "Ljava/lang/String";
-			return new TypedValue((String) leftOperand + rightOperand);
+			return new TypedValue(leftString + rightString);
 		}
 
 		if (leftOperand instanceof String) {
@@ -190,8 +187,7 @@ public boolean isCompilable() {
 	 * them all to the same (on stack) StringBuilder.
 	 */
 	private void walk(MethodVisitor mv, CodeFlow cf, @Nullable SpelNodeImpl operand) {
-		if (operand instanceof OpPlus) {
-			OpPlus plus = (OpPlus)operand;
+		if (operand instanceof OpPlus plus) {
 			walk(mv, cf, plus.getLeftOperand());
 			walk(mv, cf, plus.getRightOperand());
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
index ec31559e379f..11150a7c9bf6 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
@@ -36,6 +36,7 @@
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Giovanni Dall'Oglio Risso
+ * @author Sam Brannen
  * @since 3.0
  */
 public abstract class Operator extends SpelNodeImpl {
@@ -261,10 +262,7 @@ else if (targetType == 'I') {
 	 * @param right the right-hand operand value
 	 */
 	public static boolean equalityCheck(EvaluationContext context, @Nullable Object left, @Nullable Object right) {
-		if (left instanceof Number && right instanceof Number) {
-			Number leftNumber = (Number) left;
-			Number rightNumber = (Number) right;
-
+		if (left instanceof Number leftNumber && right instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
index 22795a928796..6c9bfbaf3ed5 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
  *
  * @author Andy Clement
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.0
  */
 public class OperatorMatches extends Operator {
@@ -69,13 +70,12 @@ public BooleanTypedValue getValueInternal(ExpressionState state) throws Evaluati
 			throw new SpelEvaluationException(leftOp.getStartPosition(),
 					SpelMessage.INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR, (Object) null);
 		}
-		if (!(right instanceof String)) {
+		if (!(right instanceof String rightString)) {
 			throw new SpelEvaluationException(rightOp.getStartPosition(),
 					SpelMessage.INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR, right);
 		}
 
 		try {
-			String rightString = (String) right;
 			Pattern pattern = this.patternCache.get(rightString);
 			if (pattern == null) {
 				pattern = Pattern.compile(rightString);
@@ -111,7 +111,7 @@ private static class MatcherInput implements CharSequence {
 
 		private final CharSequence value;
 
-		private AccessCount access;
+		private final AccessCount access;
 
 		public MatcherInput(CharSequence value, AccessCount access) {
 			this.value = value;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
index 2a256ea4371e..cd90af1effff 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,10 +47,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		Object leftOperand = leftOp.getValueInternal(state).getValue();
 		Object rightOperand = rightOp.getValueInternal(state).getValue();
 
-		if (leftOperand instanceof Number && rightOperand instanceof Number) {
-			Number leftNumber = (Number) leftOperand;
-			Number rightNumber = (Number) rightOperand;
-
+		if (leftOperand instanceof Number leftNumber && rightOperand instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				return new TypedValue(leftBigDecimal.pow(rightNumber.intValue()));
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
index 476fb4c9b7a2..769376c9fa50 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
  * @author Andy Clement
  * @author Juergen Hoeller
  * @author Clark Duplichien
+ * @author Sam Brannen
  * @since 3.0
  */
 public class PropertyOrFieldReference extends SpelNodeImpl {
@@ -91,8 +92,7 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		TypedValue tv = getValueInternal(state.getActiveContextObject(), state.getEvaluationContext(),
 				state.getConfiguration().isAutoGrowNullReferences());
 		PropertyAccessor accessorToUse = this.cachedReadAccessor;
-		if (accessorToUse instanceof CompilablePropertyAccessor) {
-			CompilablePropertyAccessor accessor = (CompilablePropertyAccessor) accessorToUse;
+		if (accessorToUse instanceof CompilablePropertyAccessor accessor) {
 			setExitTypeDescriptor(CodeFlow.toDescriptor(accessor.getPropertyType()));
 		}
 		return tv;
@@ -196,8 +196,8 @@ private TypedValue readProperty(TypedValue contextObject, EvaluationContext eval
 		try {
 			for (PropertyAccessor accessor : accessorsToTry) {
 				if (accessor.canRead(evalContext, contextObject.getValue(), name)) {
-					if (accessor instanceof ReflectivePropertyAccessor) {
-						accessor = ((ReflectivePropertyAccessor) accessor).createOptimalAccessor(
+					if (accessor instanceof ReflectivePropertyAccessor reflectivePropertyAccessor) {
+						accessor = reflectivePropertyAccessor.createOptimalAccessor(
 								evalContext, contextObject.getValue(), name);
 					}
 					this.cachedReadAccessor = accessor;
@@ -330,9 +330,8 @@ else if (clazz.isAssignableFrom(targetType)) {
 
 	@Override
 	public boolean isCompilable() {
-		PropertyAccessor accessorToUse = this.cachedReadAccessor;
-		return (accessorToUse instanceof CompilablePropertyAccessor &&
-				((CompilablePropertyAccessor) accessorToUse).isCompilable());
+		return (this.cachedReadAccessor instanceof CompilablePropertyAccessor compilablePropertyAccessor &&
+				compilablePropertyAccessor.isCompilable());
 	}
 
 	@Override
@@ -404,9 +403,8 @@ public AccessorLValue(PropertyOrFieldReference propertyOrFieldReference, TypedVa
 		public TypedValue getValue() {
 			TypedValue value =
 					this.ref.getValueInternal(this.contextObject, this.evalContext, this.autoGrowNullReferences);
-			PropertyAccessor accessorToUse = this.ref.cachedReadAccessor;
-			if (accessorToUse instanceof CompilablePropertyAccessor) {
-				this.ref.setExitTypeDescriptor(CodeFlow.toDescriptor(((CompilablePropertyAccessor) accessorToUse).getPropertyType()));
+			if (this.ref.cachedReadAccessor instanceof CompilablePropertyAccessor compilablePropertyAccessor) {
+				this.ref.setExitTypeDescriptor(CodeFlow.toDescriptor(compilablePropertyAccessor.getPropertyType()));
 			}
 			return value;
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
index 5034c960ec61..2726fa53fb3c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,15 +65,15 @@ class Tokenizer {
 	}
 
 
-	private String expressionString;
+	private final String expressionString;
 
-	private char[] charsToProcess;
+	private final char[] charsToProcess;
 
 	private int pos;
 
-	private int max;
+	private final int max;
 
-	private List<Token> tokens = new ArrayList<>();
+	private final List<Token> tokens = new ArrayList<>();
 
 
 	public Tokenizer(String inputData) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
index 5fd48cdad88a..fae62e1d3791 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ public boolean canRead(EvaluationContext context, @Nullable Object target, Strin
 			return false;
 		}
 
-		Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
+		Class<?> type = (target instanceof Class<?> clazz ? clazz : target.getClass());
 		if (type.isArray() && name.equals("length")) {
 			return true;
 		}
@@ -160,7 +160,7 @@ public boolean canRead(EvaluationContext context, @Nullable Object target, Strin
 	@Override
 	public TypedValue read(EvaluationContext context, @Nullable Object target, String name) throws AccessException {
 		Assert.state(target != null, "Target must not be null");
-		Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
+		Class<?> type = (target instanceof Class<?> clazz ? clazz : target.getClass());
 
 		if (type.isArray() && name.equals("length")) {
 			if (target instanceof Class) {
@@ -231,7 +231,7 @@ public boolean canWrite(EvaluationContext context, @Nullable Object target, Stri
 			return false;
 		}
 
-		Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
+		Class<?> type = (target instanceof Class<?> clazz ? clazz : target.getClass());
 		PropertyCacheKey cacheKey = new PropertyCacheKey(type, name, target instanceof Class);
 		if (this.writerCache.containsKey(cacheKey)) {
 			return true;
@@ -269,7 +269,7 @@ public void write(EvaluationContext context, @Nullable Object target, String nam
 		}
 
 		Assert.state(target != null, "Target must not be null");
-		Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
+		Class<?> type = (target instanceof Class<?> clazz ? clazz : target.getClass());
 
 		Object possiblyConvertedNewValue = newValue;
 		TypeDescriptor typeDescriptor = getTypeDescriptor(context, target, name);
@@ -346,7 +346,7 @@ public Member getLastReadInvokerPair() {
 
 	@Nullable
 	private TypeDescriptor getTypeDescriptor(EvaluationContext context, Object target, String name) {
-		Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
+		Class<?> type = (target instanceof Class<?> clazz ? clazz : target.getClass());
 
 		if (type.isArray() && name.equals("length")) {
 			return TypeDescriptor.valueOf(Integer.TYPE);
@@ -533,18 +533,18 @@ public PropertyAccessor createOptimalAccessor(EvaluationContext context, @Nullab
 		if (target == null) {
 			return this;
 		}
-		Class<?> clazz = (target instanceof Class ? (Class<?>) target : target.getClass());
-		if (clazz.isArray()) {
+		Class<?> type = (target instanceof Class<?> clazz ? clazz : target.getClass());
+		if (type.isArray()) {
 			return this;
 		}
 
-		PropertyCacheKey cacheKey = new PropertyCacheKey(clazz, name, target instanceof Class);
+		PropertyCacheKey cacheKey = new PropertyCacheKey(type, name, target instanceof Class);
 		InvokerPair invocationTarget = this.readerCache.get(cacheKey);
 
 		if (invocationTarget == null || invocationTarget.member instanceof Method) {
 			Method method = (Method) (invocationTarget != null ? invocationTarget.member : null);
 			if (method == null) {
-				method = findGetterForProperty(name, clazz, target);
+				method = findGetterForProperty(name, type, target);
 				if (method != null) {
 					TypeDescriptor typeDescriptor = new TypeDescriptor(new MethodParameter(method, -1));
 					method = ClassUtils.getInterfaceMethodIfPossible(method);
@@ -561,7 +561,7 @@ public PropertyAccessor createOptimalAccessor(EvaluationContext context, @Nullab
 		if (invocationTarget == null || invocationTarget.member instanceof Field) {
 			Field field = (invocationTarget != null ? (Field) invocationTarget.member : null);
 			if (field == null) {
-				field = findField(name, clazz, target instanceof Class);
+				field = findField(name, type, target instanceof Class);
 				if (field != null) {
 					invocationTarget = new InvokerPair(field, new TypeDescriptor(field));
 					ReflectionUtils.makeAccessible(field);
@@ -600,7 +600,7 @@ private static final class PropertyCacheKey implements Comparable<PropertyCacheK
 
 		private final String property;
 
-		private boolean targetIsClass;
+		private final boolean targetIsClass;
 
 		public PropertyCacheKey(Class<?> clazz, String name, boolean targetIsClass) {
 			this.clazz = clazz;
@@ -613,10 +613,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof PropertyCacheKey)) {
+			if (!(other instanceof PropertyCacheKey otherKey)) {
 				return false;
 			}
-			PropertyCacheKey otherKey = (PropertyCacheKey) other;
 			return (this.clazz == otherKey.clazz && this.property.equals(otherKey.property) &&
 					this.targetIsClass == otherKey.targetIsClass);
 		}
@@ -676,13 +675,12 @@ public boolean canRead(EvaluationContext context, @Nullable Object target, Strin
 			if (target == null) {
 				return false;
 			}
-			Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
+			Class<?> type = (target instanceof Class<?> clazz ? clazz : target.getClass());
 			if (type.isArray()) {
 				return false;
 			}
 
-			if (this.member instanceof Method) {
-				Method method = (Method) this.member;
+			if (this.member instanceof Method method) {
 				String getterName = "get" + StringUtils.capitalize(name);
 				if (getterName.equals(method.getName())) {
 					return true;
@@ -697,8 +695,7 @@ public boolean canRead(EvaluationContext context, @Nullable Object target, Strin
 
 		@Override
 		public TypedValue read(EvaluationContext context, @Nullable Object target, String name) throws AccessException {
-			if (this.member instanceof Method) {
-				Method method = (Method) this.member;
+			if (this.member instanceof Method method) {
 				try {
 					ReflectionUtils.makeAccessible(method);
 					Object value = method.invoke(target);
@@ -739,8 +736,8 @@ public boolean isCompilable() {
 
 		@Override
 		public Class<?> getPropertyType() {
-			if (this.member instanceof Method) {
-				return ((Method) this.member).getReturnType();
+			if (this.member instanceof Method method) {
+				return method.getReturnType();
 			}
 			else {
 				return ((Field) this.member).getType();
@@ -769,8 +766,7 @@ public void generateCode(String propertyName, MethodVisitor mv, CodeFlow cf) {
 				}
 			}
 
-			if (this.member instanceof Method) {
-				Method method = (Method) this.member;
+			if (this.member instanceof Method method) {
 				boolean isInterface = method.getDeclaringClass().isInterface();
 				int opcode = (isStatic ? INVOKESTATIC : isInterface ? INVOKEINTERFACE : INVOKEVIRTUAL);
 				mv.visitMethodInsn(opcode, classDesc, method.getName(),
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
index 8e48aa878c8f..fc15f6b3ec0e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,10 +62,7 @@ else if (right == null) {
 		}
 
 		// Basic number comparisons
-		if (left instanceof Number && right instanceof Number) {
-			Number leftNumber = (Number) left;
-			Number rightNumber = (Number) right;
-
+		if (left instanceof Number leftNumber && right instanceof Number rightNumber) {
 			if (leftNumber instanceof BigDecimal || rightNumber instanceof BigDecimal) {
 				BigDecimal leftBigDecimal = NumberUtils.convertNumberToTargetClass(leftNumber, BigDecimal.class);
 				BigDecimal rightBigDecimal = NumberUtils.convertNumberToTargetClass(rightNumber, BigDecimal.class);
@@ -95,7 +92,7 @@ else if (leftNumber instanceof Byte || rightNumber instanceof Byte) {
 				return Byte.compare(leftNumber.byteValue(), rightNumber.byteValue());
 			}
 			else {
-				// Unknown Number subtypes -> best guess is double multiplication
+				// Unknown Number subtype -> best guess is double multiplication
 				return Double.compare(leftNumber.doubleValue(), rightNumber.doubleValue());
 			}
 		}

From 971f665eb1e8cd9e8a0c788a8f5612f815894082 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 19:53:40 +0200
Subject: [PATCH 260/735] Apply "instanceof pattern matching" in spring-jdbc

This commit also applies additional clean-up tasks such as the following.

- final fields

This has only been applied to `src/main/java`.
---
 .../core/ArgumentPreparedStatementSetter.java   |  5 ++---
 .../ArgumentTypePreparedStatementSetter.java    |  5 ++---
 .../jdbc/core/BatchUpdateUtils.java             |  5 ++---
 .../springframework/jdbc/core/JdbcTemplate.java |  8 +++-----
 .../core/PreparedStatementCreatorFactory.java   | 11 +++++------
 .../jdbc/core/StatementCreatorUtils.java        | 17 ++++++-----------
 .../metadata/GenericTableMetaDataProvider.java  |  6 +++---
 .../core/namedparam/NamedParameterUtils.java    |  3 +--
 .../jdbc/datasource/DataSourceUtils.java        |  2 +-
 .../embedded/EmbeddedDatabaseFactory.java       |  5 ++---
 .../lookup/IsolationLevelDataSourceRouter.java  |  5 ++---
 .../springframework/jdbc/support/JdbcUtils.java |  8 +++-----
 .../jdbc/support/lob/PassThroughBlob.java       |  4 ++--
 .../jdbc/support/lob/PassThroughClob.java       |  4 ++--
 14 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentPreparedStatementSetter.java
index 4f92385be8d4..915c602e6bc0 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentPreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 	 * @throws SQLException if thrown by PreparedStatement methods
 	 */
 	protected void doSetValue(PreparedStatement ps, int parameterPosition, Object argValue) throws SQLException {
-		if (argValue instanceof SqlParameterValue) {
-			SqlParameterValue paramValue = (SqlParameterValue) argValue;
+		if (argValue instanceof SqlParameterValue paramValue) {
 			StatementCreatorUtils.setParameterValue(ps, parameterPosition, paramValue, paramValue.getValue());
 		}
 		else {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java
index 7e102efe31dc..3d89d8abe775 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,8 +64,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 				if (arg instanceof Collection && this.argTypes[i] != Types.ARRAY) {
 					Collection<?> entries = (Collection<?>) arg;
 					for (Object entry : entries) {
-						if (entry instanceof Object[]) {
-							Object[] valueArray = ((Object[]) entry);
+						if (entry instanceof Object[] valueArray) {
 							for (Object argValue : valueArray) {
 								doSetValue(ps, parameterPosition, this.argTypes[i], argValue);
 								parameterPosition++;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
index 8f1fcef395a3..dcab3b2ca9b8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,8 +62,7 @@ protected static void setStatementParameters(Object[] values, PreparedStatement
 		int colIndex = 0;
 		for (Object value : values) {
 			colIndex++;
-			if (value instanceof SqlParameterValue) {
-				SqlParameterValue paramValue = (SqlParameterValue) value;
+			if (value instanceof SqlParameterValue paramValue) {
 				StatementCreatorUtils.setParameterValue(ps, colIndex, paramValue, paramValue.getValue());
 			}
 			else {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
index f41390c2c439..179a6b79e166 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1094,8 +1094,7 @@ public void setValues(PreparedStatement ps, int i) throws SQLException {
 						int colIndex = 0;
 						for (Object value : values) {
 							colIndex++;
-							if (value instanceof SqlParameterValue) {
-								SqlParameterValue paramValue = (SqlParameterValue) value;
+							if (value instanceof SqlParameterValue paramValue) {
 								StatementCreatorUtils.setParameterValue(ps, colIndex, paramValue, paramValue.getValue());
 							}
 							else {
@@ -1337,8 +1336,7 @@ protected Map<String, Object> extractOutputParameters(CallableStatement cs, List
 		Map<String, Object> results = CollectionUtils.newLinkedHashMap(parameters.size());
 		int sqlColIndex = 1;
 		for (SqlParameter param : parameters) {
-			if (param instanceof SqlOutParameter) {
-				SqlOutParameter outParam = (SqlOutParameter) param;
+			if (param instanceof SqlOutParameter outParam) {
 				Assert.state(outParam.getName() != null, "Anonymous parameters not allowed");
 				SqlReturnType returnType = outParam.getSqlReturnType();
 				if (returnType != null) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
index e6083f8be0f5..ecf784e4c63e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -228,7 +229,7 @@ public PreparedStatement createPreparedStatement(Connection con) throws SQLExcep
 					ps = con.prepareStatement(this.actualSql, generatedKeysColumnNames);
 				}
 				else {
-					ps = con.prepareStatement(this.actualSql, PreparedStatement.RETURN_GENERATED_KEYS);
+					ps = con.prepareStatement(this.actualSql, Statement.RETURN_GENERATED_KEYS);
 				}
 			}
 			else if (resultSetType == ResultSet.TYPE_FORWARD_ONLY && !updatableResults) {
@@ -251,8 +252,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 				SqlParameter declaredParameter;
 				// SqlParameterValue overrides declared parameter meta-data, in particular for
 				// independence from the declared parameter position in case of named parameters.
-				if (in instanceof SqlParameterValue) {
-					SqlParameterValue paramValue = (SqlParameterValue) in;
+				if (in instanceof SqlParameterValue paramValue) {
 					in = paramValue.getValue();
 					declaredParameter = paramValue;
 				}
@@ -268,8 +268,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 				if (in instanceof Iterable && declaredParameter.getSqlType() != Types.ARRAY) {
 					Iterable<?> entries = (Iterable<?>) in;
 					for (Object entry : entries) {
-						if (entry instanceof Object[]) {
-							Object[] valueArray = (Object[]) entry;
+						if (entry instanceof Object[] valueArray) {
 							for (Object argValue : valueArray) {
 								StatementCreatorUtils.setParameterValue(ps, sqlColIndx++, declaredParameter, argValue);
 							}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
index 5c6c1d859d22..3d7edf0e8e25 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -202,8 +202,7 @@ private static void setParameterValueInternal(PreparedStatement ps, int paramInd
 		Object inValueToUse = inValue;
 
 		// override type info?
-		if (inValue instanceof SqlParameterValue) {
-			SqlParameterValue parameterValue = (SqlParameterValue) inValue;
+		if (inValue instanceof SqlParameterValue parameterValue) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Overriding type info with runtime info from SqlParameterValue: column index " + paramIndex +
 						", SQL type " + parameterValue.getSqlType() + ", type name " + parameterValue.getTypeName());
@@ -350,8 +349,7 @@ else if (sqlType == Types.DATE) {
 					ps.setDate(paramIndex, new java.sql.Date(((java.util.Date) inValue).getTime()));
 				}
 			}
-			else if (inValue instanceof Calendar) {
-				Calendar cal = (Calendar) inValue;
+			else if (inValue instanceof Calendar cal) {
 				ps.setDate(paramIndex, new java.sql.Date(cal.getTime().getTime()), cal);
 			}
 			else {
@@ -367,8 +365,7 @@ else if (sqlType == Types.TIME) {
 					ps.setTime(paramIndex, new java.sql.Time(((java.util.Date) inValue).getTime()));
 				}
 			}
-			else if (inValue instanceof Calendar) {
-				Calendar cal = (Calendar) inValue;
+			else if (inValue instanceof Calendar cal) {
 				ps.setTime(paramIndex, new java.sql.Time(cal.getTime().getTime()), cal);
 			}
 			else {
@@ -384,8 +381,7 @@ else if (sqlType == Types.TIMESTAMP) {
 					ps.setTimestamp(paramIndex, new java.sql.Timestamp(((java.util.Date) inValue).getTime()));
 				}
 			}
-			else if (inValue instanceof Calendar) {
-				Calendar cal = (Calendar) inValue;
+			else if (inValue instanceof Calendar cal) {
 				ps.setTimestamp(paramIndex, new java.sql.Timestamp(cal.getTime().getTime()), cal);
 			}
 			else {
@@ -400,8 +396,7 @@ else if (sqlType == SqlTypeValue.TYPE_UNKNOWN || (sqlType == Types.OTHER &&
 			else if (isDateValue(inValue.getClass())) {
 				ps.setTimestamp(paramIndex, new java.sql.Timestamp(((java.util.Date) inValue).getTime()));
 			}
-			else if (inValue instanceof Calendar) {
-				Calendar cal = (Calendar) inValue;
+			else if (inValue instanceof Calendar cal) {
 				ps.setTimestamp(paramIndex, new java.sql.Timestamp(cal.getTime().getTime()), cal);
 			}
 			else {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
index 5228cb9b05cd..85c3bc65fcc6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
@@ -56,7 +56,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 
 	/** the name of the user currently connected. */
 	@Nullable
-	private String userName;
+	private final String userName;
 
 	/** indicates whether the identifiers are uppercased. */
 	private boolean storesUpperCaseIdentifiers = true;
@@ -71,11 +71,11 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 	private boolean generatedKeysColumnNameArraySupported = true;
 
 	/** database products we know not supporting the use of a String[] for generated keys. */
-	private List<String> productsNotSupportingGeneratedKeysColumnNameArray =
+	private final List<String> productsNotSupportingGeneratedKeysColumnNameArray =
 			Arrays.asList("Apache Derby", "HSQL Database Engine");
 
 	/** Collection of TableParameterMetaData objects. */
-	private List<TableParameterMetaData> tableParameterMetaData = new ArrayList<>();
+	private final List<TableParameterMetaData> tableParameterMetaData = new ArrayList<>();
 
 
 	/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
index 1325cdedf5e7..981dfc22e7fb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
@@ -293,8 +293,7 @@ public static String substituteNamedParameters(ParsedSql parsedSql, @Nullable Sq
 						}
 						k++;
 						Object entryItem = entryIter.next();
-						if (entryItem instanceof Object[]) {
-							Object[] expressionList = (Object[]) entryItem;
+						if (entryItem instanceof Object[] expressionList) {
 							actualSql.append('(');
 							for (int m = 0; m < expressionList.length; m++) {
 								if (m > 0) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
index ae708030bcc1..6f14c748e0d9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
@@ -474,7 +474,7 @@ private static class ConnectionSynchronization implements TransactionSynchroniza
 
 		private final DataSource dataSource;
 
-		private int order;
+		private final int order;
 
 		private boolean holderActive = true;
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index 52b66888b968..afc49cadd8fb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -185,8 +185,7 @@ protected void initDatabase() {
 		this.dataSource = this.dataSourceFactory.getDataSource();
 
 		if (logger.isInfoEnabled()) {
-			if (this.dataSource instanceof SimpleDriverDataSource) {
-				SimpleDriverDataSource simpleDriverDataSource = (SimpleDriverDataSource) this.dataSource;
+			if (this.dataSource instanceof SimpleDriverDataSource simpleDriverDataSource) {
 				logger.info(String.format("Starting embedded database: url='%s', username='%s'",
 						simpleDriverDataSource.getUrl(), simpleDriverDataSource.getUsername()));
 			}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
index b008aabf3d54..6e5cd3c67b81 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,8 +106,7 @@ protected Object resolveSpecifiedLookupKey(Object lookupKey) {
 		if (lookupKey instanceof Integer) {
 			return lookupKey;
 		}
-		else if (lookupKey instanceof String) {
-			String constantName = (String) lookupKey;
+		else if (lookupKey instanceof String constantName) {
 			if (!constantName.startsWith(DefaultTransactionDefinition.PREFIX_ISOLATION)) {
 				throw new IllegalArgumentException("Only isolation constants allowed");
 			}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
index 6fe7e9ea125a..1fbeb253708e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -285,12 +285,10 @@ public static Object getResultSetValue(ResultSet rs, int index) throws SQLExcept
 		if (obj != null) {
 			className = obj.getClass().getName();
 		}
-		if (obj instanceof Blob) {
-			Blob blob = (Blob) obj;
+		if (obj instanceof Blob blob) {
 			obj = blob.getBytes(1, (int) blob.length());
 		}
-		else if (obj instanceof Clob) {
-			Clob clob = (Clob) obj;
+		else if (obj instanceof Clob clob) {
 			obj = clob.getSubString(1, (int) clob.length());
 		}
 		else if ("oracle.sql.TIMESTAMP".equals(className) || "oracle.sql.TIMESTAMPTZ".equals(className)) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
index ad50eeb94e65..099bd27391cc 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ class PassThroughBlob implements Blob {
 	@Nullable
 	private InputStream binaryStream;
 
-	private long contentLength;
+	private final long contentLength;
 
 
 	public PassThroughBlob(byte[] content) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
index 0f4d25a12d2d..b9a27afe922e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ class PassThroughClob implements Clob {
 	@Nullable
 	private InputStream asciiStream;
 
-	private long contentLength;
+	private final long contentLength;
 
 
 	public PassThroughClob(String content) {

From d70a610a0d2794d53110064b76c749ed45d3059a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 19:58:22 +0200
Subject: [PATCH 261/735] Apply "instanceof pattern matching" in spring-jms

This commit also applies additional clean-up tasks such as the following.

- final fields

This has only been applied to `src/main/java`.
---
 .../jms/connection/CachingConnectionFactory.java          | 3 +--
 .../UserCredentialsConnectionFactoryAdapter.java          | 8 +++-----
 .../listener/AbstractPollingMessageListenerContainer.java | 4 ++--
 .../adapter/AbstractAdaptableMessageListener.java         | 5 ++---
 .../springframework/jms/listener/adapter/JmsResponse.java | 5 ++---
 .../java/org/springframework/jms/support/QosSettings.java | 5 ++---
 .../converter/MappingJackson2MessageConverter.java        | 5 ++---
 .../support/converter/MarshallingMessageConverter.java    | 8 +++-----
 .../jms/support/converter/MessagingMessageConverter.java  | 6 +++---
 9 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
index 109762e0888d..3ad92bf33cb1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
@@ -598,10 +598,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ConsumerCacheKey)) {
+			if (!(other instanceof ConsumerCacheKey otherKey)) {
 				return false;
 			}
-			ConsumerCacheKey otherKey = (ConsumerCacheKey) other;
 			return (destinationEquals(otherKey) &&
 					ObjectUtils.nullSafeEquals(this.selector, otherKey.selector) &&
 					ObjectUtils.nullSafeEquals(this.noLocal, otherKey.noLocal) &&
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
index d781e30997a6..657c0862f8a5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -232,10 +232,9 @@ protected QueueConnection doCreateQueueConnection(
 			@Nullable String username, @Nullable String password) throws JMSException {
 
 		ConnectionFactory target = obtainTargetConnectionFactory();
-		if (!(target instanceof QueueConnectionFactory)) {
+		if (!(target instanceof QueueConnectionFactory queueFactory)) {
 			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a QueueConnectionFactory");
 		}
-		QueueConnectionFactory queueFactory = (QueueConnectionFactory) target;
 		if (StringUtils.hasLength(username)) {
 			return queueFactory.createQueueConnection(username, password);
 		}
@@ -284,10 +283,9 @@ protected TopicConnection doCreateTopicConnection(
 			@Nullable String username, @Nullable String password) throws JMSException {
 
 		ConnectionFactory target = obtainTargetConnectionFactory();
-		if (!(target instanceof TopicConnectionFactory)) {
+		if (!(target instanceof TopicConnectionFactory queueFactory)) {
 			throw new jakarta.jms.IllegalStateException("'targetConnectionFactory' is not a TopicConnectionFactory");
 		}
-		TopicConnectionFactory queueFactory = (TopicConnectionFactory) target;
 		if (StringUtils.hasLength(username)) {
 			return queueFactory.createTopicConnection(username, password);
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
index e681aaef1b19..7d5de80078e1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
 	@Nullable
 	private PlatformTransactionManager transactionManager;
 
-	private DefaultTransactionDefinition transactionDefinition = new DefaultTransactionDefinition();
+	private final DefaultTransactionDefinition transactionDefinition = new DefaultTransactionDefinition();
 
 	private long receiveTimeout = DEFAULT_RECEIVE_TIMEOUT;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
index 0bfec3872626..0cd9bf2bd8e6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -411,8 +411,7 @@ protected Destination resolveDefaultResponseDestination(Session session) throws
 		if (this.defaultResponseDestination instanceof Destination) {
 			return (Destination) this.defaultResponseDestination;
 		}
-		if (this.defaultResponseDestination instanceof DestinationNameHolder) {
-			DestinationNameHolder nameHolder = (DestinationNameHolder) this.defaultResponseDestination;
+		if (this.defaultResponseDestination instanceof DestinationNameHolder nameHolder) {
 			return getDestinationResolver().resolveDestinationName(session, nameHolder.name, nameHolder.isTopic);
 		}
 		return null;
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java
index 16564a3b6c2e..2fdaca138416 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/JmsResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,8 +94,7 @@ public Destination resolveDestination(DestinationResolver destinationResolver, S
 		if (this.destination instanceof Destination) {
 			return (Destination) this.destination;
 		}
-		if (this.destination instanceof DestinationNameHolder) {
-			DestinationNameHolder nameHolder = (DestinationNameHolder) this.destination;
+		if (this.destination instanceof DestinationNameHolder nameHolder) {
 			return destinationResolver.resolveDestinationName(session,
 					nameHolder.destinationName, nameHolder.pubSubDomain);
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java b/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java
index 2cd329fff708..9f627cf08999 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/QosSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -114,11 +114,10 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof QosSettings)) {
+		if (!(other instanceof QosSettings otherSettings)) {
 			return false;
 		}
 
-		QosSettings otherSettings = (QosSettings) other;
 		return (this.deliveryMode == otherSettings.deliveryMode &&
 				this.priority == otherSettings.priority &&
 				this.timeToLive == otherSettings.timeToLive);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
index 7b6c3370aed1..429343f6b235 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -85,7 +85,7 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
 
 	private Map<String, Class<?>> idClassMappings = new HashMap<>();
 
-	private Map<Class<?>, String> classIdMappings = new HashMap<>();
+	private final Map<Class<?>, String> classIdMappings = new HashMap<>();
 
 	@Nullable
 	private ClassLoader beanClassLoader;
@@ -476,8 +476,7 @@ protected JavaType getJavaTypeForMessage(Message message) throws JMSException {
 	 */
 	@Nullable
 	protected Class<?> getSerializationView(@Nullable Object conversionHint) {
-		if (conversionHint instanceof MethodParameter) {
-			MethodParameter methodParam = (MethodParameter) conversionHint;
+		if (conversionHint instanceof MethodParameter methodParam) {
 			JsonView annotation = methodParam.getParameterAnnotation(JsonView.class);
 			if (annotation == null) {
 				annotation = methodParam.getMethodAnnotation(JsonView.class);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
index b420ec92c6b0..e8524239e9e4 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -178,12 +178,10 @@ public Message toMessage(Object object, Session session) throws JMSException, Me
 	public Object fromMessage(Message message) throws JMSException, MessageConversionException {
 		Assert.state(this.unmarshaller != null, "No Unmarshaller set");
 		try {
-			if (message instanceof TextMessage) {
-				TextMessage textMessage = (TextMessage) message;
+			if (message instanceof TextMessage textMessage) {
 				return unmarshalFromTextMessage(textMessage, this.unmarshaller);
 			}
-			else if (message instanceof BytesMessage) {
-				BytesMessage bytesMessage = (BytesMessage) message;
+			else if (message instanceof BytesMessage bytesMessage) {
 				return unmarshalFromBytesMessage(bytesMessage, this.unmarshaller);
 			}
 			else {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java
index 98e8ad026395..70daf59e493d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.core.AbstractMessagingTemplate;
+import org.springframework.messaging.core.AbstractMessageSendingTemplate;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.util.Assert;
 
@@ -107,7 +107,7 @@ public jakarta.jms.Message toMessage(Object object, Session session) throws JMSE
 		}
 		Message<?> input = (Message<?>) object;
 		MessageHeaders headers = input.getHeaders();
-		Object conversionHint = headers.get(AbstractMessagingTemplate.CONVERSION_HINT_HEADER);
+		Object conversionHint = headers.get(AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER);
 		jakarta.jms.Message reply = createMessageForPayload(input.getPayload(), session, conversionHint);
 		this.headerMapper.fromHeaders(headers, reply);
 		return reply;

From 1cd70bbe6b25b01d185a5283a223795395f33e27 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 20:15:10 +0200
Subject: [PATCH 262/735] Apply "instanceof pattern matching" in
 spring-messaging

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes
- for-each loop

This has only been applied to `src/main/java`.
---
 .../converter/AbstractMessageConverter.java        |  5 ++---
 .../converter/MappingJackson2MessageConverter.java |  3 +--
 .../handler/CompositeMessageCondition.java         |  5 ++---
 .../messaging/handler/HandlerMethod.java           |  3 +--
 .../support/MessageMethodArgumentResolver.java     |  5 ++---
 .../support/PayloadMethodArgumentResolver.java     |  5 ++---
 .../invocation/AbstractMethodMessageHandler.java   |  3 +--
 .../HandlerMethodReturnValueHandlerComposite.java  |  5 ++---
 .../reactive/AbstractMethodMessageHandler.java     |  2 +-
 .../HandlerMethodReturnValueHandlerComposite.java  |  5 ++---
 .../reactive/InvocableHandlerMethod.java           |  5 ++---
 .../rsocket/DefaultRSocketRequesterBuilder.java    |  6 +++---
 .../support/SendToMethodReturnValueHandler.java    |  8 ++++----
 .../SubscriptionMethodReturnValueHandler.java      |  6 +++---
 .../simp/broker/AbstractBrokerMessageHandler.java  |  4 ++--
 .../simp/broker/DefaultSubscriptionRegistry.java   |  8 ++++----
 .../broker/OrderedMessageChannelDecorator.java     |  5 ++---
 .../simp/stomp/StompBrokerRelayMessageHandler.java |  2 ++
 .../messaging/simp/stomp/StompEncoder.java         | 10 ++++++----
 .../simp/user/MultiServerUserRegistry.java         |  7 +++----
 .../simp/user/UserDestinationMessageHandler.java   |  8 +++++---
 .../messaging/support/MessageHeaderAccessor.java   | 14 +++++---------
 22 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/AbstractMessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/AbstractMessageConverter.java
index b8400e046c89..6a8386fbb439 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/AbstractMessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/AbstractMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -314,8 +314,7 @@ protected Object convertToInternal(
 
 
 	static Type getResolvedType(Class<?> targetClass, @Nullable Object conversionHint) {
-		if (conversionHint instanceof MethodParameter) {
-			MethodParameter param = (MethodParameter) conversionHint;
+		if (conversionHint instanceof MethodParameter param) {
 			param = param.nestedIfOptional();
 			if (Message.class.isAssignableFrom(param.getParameterType())) {
 				param = param.nested();
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
index 9bb32eebd942..008d0b5ba759 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
@@ -285,8 +285,7 @@ protected Object convertToInternal(Object payload, @Nullable MessageHeaders head
 	 */
 	@Nullable
 	protected Class<?> getSerializationView(@Nullable Object conversionHint) {
-		if (conversionHint instanceof MethodParameter) {
-			MethodParameter param = (MethodParameter) conversionHint;
+		if (conversionHint instanceof MethodParameter param) {
 			JsonView annotation = (param.getParameterIndex() >= 0 ?
 					param.getParameterAnnotation(JsonView.class) : param.getMethodAnnotation(JsonView.class));
 			if (annotation != null) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java
index 4a70d4f6a91e..4d4d21614b99 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,10 +131,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof CompositeMessageCondition)) {
+		if (!(other instanceof CompositeMessageCondition otherComposite)) {
 			return false;
 		}
-		CompositeMessageCondition otherComposite = (CompositeMessageCondition) other;
 		checkCompatible(otherComposite);
 		List<MessageCondition<?>> otherConditions = otherComposite.getMessageConditions();
 		for (int i = 0; i < this.messageConditions.size(); i++) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
index 4ace844929fb..d254f5d5c0d2 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
@@ -308,10 +308,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof HandlerMethod)) {
+		if (!(other instanceof HandlerMethod otherMethod)) {
 			return false;
 		}
-		HandlerMethod otherMethod = (HandlerMethod) other;
 		return (this.bean.equals(otherMethod.bean) && this.method.equals(otherMethod.method));
 	}
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java
index fcbe59313223..8b0e23fb7edf 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -134,8 +134,7 @@ else if (payload instanceof String) {
 
 	private Object convertPayload(Message<?> message, MethodParameter parameter, Class<?> targetPayloadType) {
 		Object result = null;
-		if (this.converter instanceof SmartMessageConverter) {
-			SmartMessageConverter smartConverter = (SmartMessageConverter) this.converter;
+		if (this.converter instanceof SmartMessageConverter smartConverter) {
 			result = smartConverter.fromMessage(message, targetPayloadType, parameter);
 		}
 		else if (this.converter != null) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java
index 92e5d5ecc9f5..9e14cb324eee 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,8 +133,7 @@ public Object resolveArgument(MethodParameter parameter, Message<?> message) thr
 			return payload;
 		}
 		else {
-			if (this.converter instanceof SmartMessageConverter) {
-				SmartMessageConverter smartConverter = (SmartMessageConverter) this.converter;
+			if (this.converter instanceof SmartMessageConverter smartConverter) {
 				payload = smartConverter.fromMessage(message, targetClass, parameter);
 			}
 			else {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
index f160d506eed7..b1b0da1f7f3a 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
@@ -478,8 +478,7 @@ protected String getLookupDestination(@Nullable String destination) {
 		if (CollectionUtils.isEmpty(this.destinationPrefixes)) {
 			return destination;
 		}
-		for (int i = 0; i < this.destinationPrefixes.size(); i++) {
-			String prefix = this.destinationPrefixes.get(i);
+		for (String prefix : this.destinationPrefixes) {
 			if (destination.startsWith(prefix)) {
 				return destination.substring(prefix.length());
 			}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java
index 645538e8273b..af3efda05c66 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,8 +104,7 @@ public boolean supportsReturnType(MethodParameter returnType) {
 	@SuppressWarnings("ForLoopReplaceableByForEach")
 	@Nullable
 	private HandlerMethodReturnValueHandler getReturnValueHandler(MethodParameter returnType) {
-		for (int i = 0; i < this.returnValueHandlers.size(); i++) {
-			HandlerMethodReturnValueHandler handler = this.returnValueHandlers.get(i);
+		for (HandlerMethodReturnValueHandler handler : this.returnValueHandlers) {
 			if (handler.supportsReturnType(returnType)) {
 				return handler;
 			}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
index a240f4d8efa0..f59fde59ec48 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
@@ -512,7 +512,7 @@ private void addMatchesToCollection(
 		for (T mapping : mappingsToCheck) {
 			T match = getMatchingMapping(mapping, message);
 			if (match != null) {
-				matches.add(new Match<T>(match, this.handlerMethods.get(mapping)));
+				matches.add(new Match<>(match, this.handlerMethods.get(mapping)));
 			}
 		}
 	}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandlerComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandlerComposite.java
index c9347256b0e5..724fc8b650d0 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandlerComposite.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodReturnValueHandlerComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,8 +95,7 @@ public Mono<Void> handleReturnValue(@Nullable Object returnValue, MethodParamete
 	@SuppressWarnings("ForLoopReplaceableByForEach")
 	@Nullable
 	private HandlerMethodReturnValueHandler getReturnValueHandler(MethodParameter returnType) {
-		for (int i = 0; i < this.returnValueHandlers.size(); i++) {
-			HandlerMethodReturnValueHandler handler = this.returnValueHandlers.get(i);
+		for (HandlerMethodReturnValueHandler handler : this.returnValueHandlers) {
 			if (handler.supportsReturnType(returnType)) {
 				return handler;
 			}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
index aad9384af251..3156c66a824f 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
@@ -54,7 +54,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
 	private static final Object NO_ARG_VALUE = new Object();
 
 
-	private HandlerMethodArgumentResolverComposite resolvers = new HandlerMethodArgumentResolverComposite();
+	private final HandlerMethodArgumentResolverComposite resolvers = new HandlerMethodArgumentResolverComposite();
 
 	private ParameterNameDiscoverer parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
 
@@ -206,8 +206,7 @@ private boolean isAsyncVoidReturnType(MethodParameter returnType, @Nullable Reac
 				return true;
 			}
 			Type parameterType = returnType.getGenericParameterType();
-			if (parameterType instanceof ParameterizedType) {
-				ParameterizedType type = (ParameterizedType) parameterType;
+			if (parameterType instanceof ParameterizedType type) {
 				if (type.getActualTypeArguments().length == 1) {
 					return Void.class.equals(type.getActualTypeArguments()[0]);
 				}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
index 3c3ff332a976..c251b7dbcd1f 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,9 +90,9 @@ final class DefaultRSocketRequesterBuilder implements RSocketRequester.Builder {
 	@Nullable
 	private RSocketStrategies strategies;
 
-	private List<Consumer<RSocketStrategies.Builder>> strategiesConfigurers = new ArrayList<>();
+	private final List<Consumer<RSocketStrategies.Builder>> strategiesConfigurers = new ArrayList<>();
 
-	private List<RSocketConnectorConfigurer> rsocketConnectorConfigurers = new ArrayList<>();
+	private final List<RSocketConnectorConfigurer> rsocketConnectorConfigurers = new ArrayList<>();
 
 
 	@Override
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java
index 8a150a572f1d..f91f47bc5e7e 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.core.AbstractMessageSendingTemplate;
 import org.springframework.messaging.handler.DestinationPatternsMessageCondition;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.messaging.handler.annotation.support.DestinationVariableMethodArgumentResolver;
@@ -35,7 +36,6 @@
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.messaging.simp.SimpMessageType;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.messaging.simp.annotation.SendToUser;
 import org.springframework.messaging.simp.user.DestinationUserNameProvider;
 import org.springframework.messaging.support.MessageHeaderInitializer;
@@ -68,7 +68,7 @@ public class SendToMethodReturnValueHandler implements HandlerMethodReturnValueH
 
 	private String defaultUserDestinationPrefix = "/queue";
 
-	private PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("{", "}", null, false);
+	private final PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("{", "}", null, false);
 
 	@Nullable
 	private MessageHeaderInitializer headerInitializer;
@@ -244,7 +244,7 @@ private MessageHeaders createHeaders(@Nullable String sessionId, MethodParameter
 		if (sessionId != null) {
 			headerAccessor.setSessionId(sessionId);
 		}
-		headerAccessor.setHeader(SimpMessagingTemplate.CONVERSION_HINT_HEADER, returnType);
+		headerAccessor.setHeader(AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType);
 		headerAccessor.setLeaveMutable(true);
 		return headerAccessor.getMessageHeaders();
 	}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java
index 5e2be5c3e971..8ff4d521a2fe 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,13 @@
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.core.AbstractMessageSendingTemplate;
 import org.springframework.messaging.core.MessageSendingOperations;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler;
 import org.springframework.messaging.simp.SimpLogging;
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.simp.SimpMessageType;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.messaging.simp.annotation.SendToUser;
 import org.springframework.messaging.simp.annotation.SubscribeMapping;
 import org.springframework.messaging.support.MessageHeaderInitializer;
@@ -141,7 +141,7 @@ private MessageHeaders createHeaders(@Nullable String sessionId, String subscrip
 			accessor.setSessionId(sessionId);
 		}
 		accessor.setSubscriptionId(subscriptionId);
-		accessor.setHeader(SimpMessagingTemplate.CONVERSION_HINT_HEADER, returnType);
+		accessor.setHeader(AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType);
 		accessor.setLeaveMutable(true);
 		return accessor.getMessageHeaders();
 	}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java
index 1babc663ebf5..19896834a929 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public abstract class AbstractBrokerMessageHandler
 	@Nullable
 	private ApplicationEventPublisher eventPublisher;
 
-	private AtomicBoolean brokerAvailable = new AtomicBoolean();
+	private final AtomicBoolean brokerAvailable = new AtomicBoolean();
 
 	private final BrokerAvailabilityEvent availableEvent = new BrokerAvailabilityEvent(true, this);
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
index 709f88e4db1f..e46e34de6737 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.messaging.support.NativeMessageHeaderAccessor;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
 import org.springframework.util.LinkedMultiValueMap;
@@ -162,7 +163,7 @@ private Expression getSelectorExpression(MessageHeaders headers) {
 		if (getSelectorHeaderName() == null) {
 			return null;
 		}
-		String selector = SimpMessageHeaderAccessor.getFirstNativeHeader(getSelectorHeaderName(), headers);
+		String selector = NativeMessageHeaderAccessor.getFirstNativeHeader(getSelectorHeaderName(), headers);
 		if (selector == null) {
 			return null;
 		}
@@ -509,8 +510,7 @@ public TypedValue read(EvaluationContext context, @Nullable Object target, Strin
 			if (target instanceof Message) {
 				value = name.equals("headers") ? ((Message) target).getHeaders() : null;
 			}
-			else if (target instanceof MessageHeaders) {
-				MessageHeaders headers = (MessageHeaders) target;
+			else if (target instanceof MessageHeaders headers) {
 				SimpMessageHeaderAccessor accessor =
 						MessageHeaderAccessor.getAccessor(headers, SimpMessageHeaderAccessor.class);
 				Assert.state(accessor != null, "No SimpMessageHeaderAccessor");
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java
index 7a55adde7c35..15fd1063eb7a 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/OrderedMessageChannelDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,8 +154,7 @@ public static void configureInterceptor(MessageChannel channel, boolean preserve
 				execChannel.addInterceptor(0, new CallbackInterceptor());
 			}
 		}
-		else if (channel instanceof ExecutorSubscribableChannel) {
-			ExecutorSubscribableChannel execChannel = (ExecutorSubscribableChannel) channel;
+		else if (channel instanceof ExecutorSubscribableChannel execChannel) {
 			execChannel.getInterceptors().stream().filter(i -> i instanceof CallbackInterceptor)
 					.findFirst().map(execChannel::removeInterceptor);
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
index f756b0b1f9ea..343ef8696ee2 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -657,6 +657,7 @@ private RelayConnectionHandler(String sessionId, StompHeaderAccessor connectHead
 		}
 
 
+		@Override
 		public String getSessionId() {
 			return this.sessionId;
 		}
@@ -984,6 +985,7 @@ protected void afterStompConnected(StompHeaderAccessor connectedHeaders) {
 			sendSystemSubscriptions();
 		}
 
+		@Override
 		protected void initHeartbeats(StompHeaderAccessor connectedHeaders) {
 			TcpConnection<byte[]> con = getTcpConnection();
 			Assert.state(con != null, "No TcpConnection available");
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
index 175043f586db..c4480b6fc2a7 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public class StompEncoder  {
 
 	@SuppressWarnings("serial")
 	private final Map<String, byte[]> headerKeyUpdateCache =
-			new LinkedHashMap<String, byte[]>(HEADER_KEY_CACHE_LIMIT, 0.75f, true) {
+			new LinkedHashMap<>(HEADER_KEY_CACHE_LIMIT, 0.75f, true) {
 				@Override
 				protected boolean removeEldestEntry(Map.Entry<String, byte[]> eldest) {
 					if (size() > HEADER_KEY_CACHE_LIMIT) {
@@ -236,22 +236,24 @@ private static class DefaultResult extends ArrayList<Object> implements Result {
 
 		private int size;
 
+		@Override
 		public void add(byte[] bytes) {
 			this.size += bytes.length;
 			super.add(bytes);
 		}
 
+		@Override
 		public void add(byte b) {
 			this.size++;
 			super.add(b);
 		}
 
+		@Override
 		public byte[] toByteArray() {
 			byte[] result = new byte[this.size];
 			int position = 0;
 			for (Object o : this) {
-				if (o instanceof byte[]) {
-					byte[] src = (byte[]) o;
+				if (o instanceof byte[] src) {
 					System.arraycopy(src, 0, result, position, src.length);
 					position += src.length;
 				}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java
index 5bc331d666af..c6f32b9f3cd5 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -275,7 +275,7 @@ private static class TransferSimpUser implements SimpUser {
 		private String name = "";
 
 		// User sessions from "this" registry only (i.e. one server)
-		private Set<TransferSimpSession> sessions;
+		private final Set<TransferSimpSession> sessions;
 
 		// Cross-server session lookup (e.g. user connected to multiple servers)
 		@Nullable
@@ -535,10 +535,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof SimpSubscription)) {
+			if (!(other instanceof SimpSubscription otherSubscription)) {
 				return false;
 			}
-			SimpSubscription otherSubscription = (SimpSubscription) other;
 			return (getId().equals(otherSubscription.getId()) &&
 					ObjectUtils.nullSafeEquals(getSession(), otherSubscription.getSession()));
 		}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java
index 4b80d09cde68..f6d0db3dd32b 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,9 @@
 import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.messaging.support.MessageHeaderAccessor;
 import org.springframework.messaging.support.MessageHeaderInitializer;
+import org.springframework.messaging.support.NativeMessageHeaderAccessor;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -258,7 +260,7 @@ public Message<?> preHandle(Message<?> message) throws MessagingException {
 				return message;
 			}
 			SimpMessageHeaderAccessor accessor =
-					SimpMessageHeaderAccessor.getAccessor(message, SimpMessageHeaderAccessor.class);
+					MessageHeaderAccessor.getAccessor(message, SimpMessageHeaderAccessor.class);
 			Assert.state(accessor != null, "No SimpMessageHeaderAccessor");
 			if (accessor.getSessionId() == null) {
 				// Our own broadcast
@@ -284,7 +286,7 @@ public Message<?> preHandle(Message<?> message) throws MessagingException {
 
 		public void handleUnresolved(Message<?> message) {
 			MessageHeaders headers = message.getHeaders();
-			if (SimpMessageHeaderAccessor.getFirstNativeHeader(
+			if (NativeMessageHeaderAccessor.getFirstNativeHeader(
 					SimpMessageHeaderAccessor.ORIGINAL_DESTINATION, headers) != null) {
 				// Re-broadcast
 				return;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
index 95e04b63f489..a1f93eb7a403 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -495,14 +495,12 @@ public String getDetailedLogMessage(@Nullable Object payload) {
 	}
 
 	protected String getShortPayloadLogMessage(Object payload) {
-		if (payload instanceof String) {
-			String payloadText = (String) payload;
+		if (payload instanceof String payloadText) {
 			return (payloadText.length() < 80) ?
 				" payload=" + payloadText :
 				" payload=" + payloadText.substring(0, 80) + "...(truncated)";
 		}
-		else if (payload instanceof byte[]) {
-			byte[] bytes = (byte[]) payload;
+		else if (payload instanceof byte[] bytes) {
 			if (isReadableContentType()) {
 				return (bytes.length < 80) ?
 						" payload=" + new String(bytes, getCharset()) :
@@ -524,8 +522,7 @@ protected String getDetailedPayloadLogMessage(@Nullable Object payload) {
 		if (payload instanceof String) {
 			return " payload=" + payload;
 		}
-		else if (payload instanceof byte[]) {
-			byte[] bytes = (byte[]) payload;
+		else if (payload instanceof byte[] bytes) {
 			if (isReadableContentType()) {
 				return " payload=" + new String(bytes, getCharset());
 			}
@@ -601,8 +598,7 @@ public static <T extends MessageHeaderAccessor> T getAccessor(Message<?> message
 	public static <T extends MessageHeaderAccessor> T getAccessor(
 			MessageHeaders messageHeaders, @Nullable Class<T> requiredType) {
 
-		if (messageHeaders instanceof MutableMessageHeaders) {
-			MutableMessageHeaders mutableHeaders = (MutableMessageHeaders) messageHeaders;
+		if (messageHeaders instanceof MutableMessageHeaders mutableHeaders) {
 			MessageHeaderAccessor headerAccessor = mutableHeaders.getAccessor();
 			if (requiredType == null || requiredType.isInstance(headerAccessor))  {
 				return (T) headerAccessor;

From 40ead013fa9b33e5264338975142c0a0491b729e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 21:53:47 +0200
Subject: [PATCH 263/735] Apply "instanceof pattern matching" in spring-orm

This has only been applied to `src/main/java`.
---
 .../HibernateExceptionTranslator.java         |  5 ++--
 .../orm/hibernate5/SessionFactoryUtils.java   | 23 +++++---------
 .../orm/hibernate5/SpringSessionContext.java  | 13 ++++----
 .../jpa/AbstractEntityManagerFactoryBean.java | 13 ++++----
 .../orm/jpa/EntityManagerFactoryAccessor.java |  5 ++--
 .../orm/jpa/EntityManagerFactoryUtils.java    |  6 ++--
 .../orm/jpa/ExtendedEntityManagerCreator.java |  5 ++--
 .../orm/jpa/JpaTransactionManager.java        |  5 ++--
 .../orm/jpa/SharedEntityManagerCreator.java   |  8 ++---
 ...ersistenceAnnotationBeanPostProcessor.java | 28 ++++++++---------
 .../jpa/support/SharedEntityManagerBean.java  |  5 ++--
 .../orm/jpa/vendor/HibernateJpaDialect.java   | 30 +++++++------------
 12 files changed, 58 insertions(+), 88 deletions(-)

diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
index 2f69163421f6..6b66360c22fc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,8 +90,7 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 	 * @see SessionFactoryUtils#convertHibernateAccessException
 	 */
 	protected DataAccessException convertHibernateAccessException(HibernateException ex) {
-		if (this.jdbcExceptionTranslator != null && ex instanceof JDBCException) {
-			JDBCException jdbcEx = (JDBCException) ex;
+		if (this.jdbcExceptionTranslator != null && ex instanceof JDBCException jdbcEx) {
 			DataAccessException dae = this.jdbcExceptionTranslator.translate(
 					"Hibernate operation: " + jdbcEx.getMessage(), jdbcEx.getSQL(), jdbcEx.getSQLException());
 			if (dae != null) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
index 32cf2bc90e72..ce92d686ce55 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,8 +159,7 @@ public static DataSource getDataSource(SessionFactory sessionFactory) {
 				}
 			}
 		}
-		if (sessionFactory instanceof SessionFactoryImplementor) {
-			SessionFactoryImplementor sfi = (SessionFactoryImplementor) sessionFactory;
+		if (sessionFactory instanceof SessionFactoryImplementor sfi) {
 			try {
 				ConnectionProvider cp = sfi.getServiceRegistry().getService(ConnectionProvider.class);
 				if (cp != null) {
@@ -188,29 +187,23 @@ public static DataAccessException convertHibernateAccessException(HibernateExcep
 		if (ex instanceof JDBCConnectionException) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
-		if (ex instanceof SQLGrammarException) {
-			SQLGrammarException jdbcEx = (SQLGrammarException) ex;
+		if (ex instanceof SQLGrammarException jdbcEx) {
 			return new InvalidDataAccessResourceUsageException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof QueryTimeoutException) {
-			QueryTimeoutException jdbcEx = (QueryTimeoutException) ex;
+		if (ex instanceof QueryTimeoutException jdbcEx) {
 			return new org.springframework.dao.QueryTimeoutException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof LockAcquisitionException) {
-			LockAcquisitionException jdbcEx = (LockAcquisitionException) ex;
+		if (ex instanceof LockAcquisitionException jdbcEx) {
 			return new CannotAcquireLockException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof PessimisticLockException) {
-			PessimisticLockException jdbcEx = (PessimisticLockException) ex;
+		if (ex instanceof PessimisticLockException jdbcEx) {
 			return new PessimisticLockingFailureException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof ConstraintViolationException) {
-			ConstraintViolationException jdbcEx = (ConstraintViolationException) ex;
+		if (ex instanceof ConstraintViolationException jdbcEx) {
 			return new DataIntegrityViolationException(ex.getMessage()  + "; SQL [" + jdbcEx.getSQL() +
 					"]; constraint [" + jdbcEx.getConstraintName() + "]", ex);
 		}
-		if (ex instanceof DataException) {
-			DataException jdbcEx = (DataException) ex;
+		if (ex instanceof DataException jdbcEx) {
 			return new DataIntegrityViolationException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
 		if (ex instanceof JDBCException) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
index a7a5e2f3d26a..ea814641ca2a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringSessionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,12 +81,11 @@ public SpringSessionContext(SessionFactoryImplementor sessionFactory) {
 	@Override
 	public Session currentSession() throws HibernateException {
 		Object value = TransactionSynchronizationManager.getResource(this.sessionFactory);
-		if (value instanceof Session) {
-			return (Session) value;
+		if (value instanceof Session session) {
+			return session;
 		}
-		else if (value instanceof SessionHolder) {
+		else if (value instanceof SessionHolder sessionHolder) {
 			// HibernateTransactionManager
-			SessionHolder sessionHolder = (SessionHolder) value;
 			Session session = sessionHolder.getSession();
 			if (!sessionHolder.isSynchronizedWithTransaction() &&
 					TransactionSynchronizationManager.isSynchronizationActive()) {
@@ -104,9 +103,9 @@ else if (value instanceof SessionHolder) {
 			}
 			return session;
 		}
-		else if (value instanceof EntityManagerHolder) {
+		else if (value instanceof EntityManagerHolder entityManagerHolder) {
 			// JpaTransactionManager
-			return ((EntityManagerHolder) value).getEntityManager().unwrap(Session.class);
+			return entityManagerHolder.getEntityManager().unwrap(Session.class);
 		}
 
 		if (this.transactionManager != null && this.jtaSessionContext != null) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
index 1a7328254610..1c85df6d06b8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -501,12 +501,12 @@ else if (method.getName().equals("createEntityManager") && args != null && args.
 		if (args != null) {
 			for (int i = 0; i < args.length; i++) {
 				Object arg = args[i];
-				if (arg instanceof Query && Proxy.isProxyClass(arg.getClass())) {
+				if (arg instanceof Query query && Proxy.isProxyClass(arg.getClass())) {
 					// Assumably a Spring-generated proxy from SharedEntityManagerCreator:
 					// since we're passing it back to the native EntityManagerFactory,
 					// let's unwrap it to the original Query object from the provider.
 					try {
-						args[i] = ((Query) arg).unwrap(null);
+						args[i] = query.unwrap(null);
 					}
 					catch (RuntimeException ex) {
 						// Ignore - simply proceed with given Query object then
@@ -517,9 +517,8 @@ else if (method.getName().equals("createEntityManager") && args != null && args.
 
 		// Standard delegation to the native factory, just post-processing EntityManager return values
 		Object retVal = method.invoke(getNativeEntityManagerFactory(), args);
-		if (retVal instanceof EntityManager) {
+		if (retVal instanceof EntityManager rawEntityManager) {
 			// Any other createEntityManager variant - expecting non-synchronized semantics
-			EntityManager rawEntityManager = (EntityManager) retVal;
 			postProcessEntityManager(rawEntityManager);
 			retVal = ExtendedEntityManagerCreator.createApplicationManagedEntityManager(rawEntityManager, this, false);
 		}
@@ -568,9 +567,9 @@ public EntityManagerFactory getNativeEntityManagerFactory() {
 			}
 			catch (ExecutionException ex) {
 				Throwable cause = ex.getCause();
-				if (cause instanceof PersistenceException) {
+				if (cause instanceof PersistenceException persistenceException) {
 					// Rethrow a provider configuration exception (possibly with a nested cause) directly
-					throw (PersistenceException) cause;
+					throw persistenceException;
 				}
 				throw new IllegalStateException("Failed to asynchronously initialize native EntityManagerFactory: " +
 						ex.getMessage(), cause);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
index 5f73add85814..045559a02f52 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,11 +146,10 @@ public Map<String, Object> getJpaPropertyMap() {
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (getEntityManagerFactory() == null) {
-			if (!(beanFactory instanceof ListableBeanFactory)) {
+			if (!(beanFactory instanceof ListableBeanFactory lbf)) {
 				throw new IllegalStateException("Cannot retrieve EntityManagerFactory by persistence unit name " +
 						"in a non-listable BeanFactory: " + beanFactory);
 			}
-			ListableBeanFactory lbf = (ListableBeanFactory) beanFactory;
 			setEntityManagerFactory(EntityManagerFactoryUtils.findEntityManagerFactory(lbf, getPersistenceUnitName()));
 		}
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
index ceb470a9ea04..d8e515c16361 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@@ -302,8 +302,7 @@ else if (!TransactionSynchronizationManager.isSynchronizationActive()) {
 	 */
 	@Nullable
 	private static Object prepareTransaction(EntityManager em, EntityManagerFactory emf) {
-		if (emf instanceof EntityManagerFactoryInfo) {
-			EntityManagerFactoryInfo emfInfo = (EntityManagerFactoryInfo) emf;
+		if (emf instanceof EntityManagerFactoryInfo emfInfo) {
 			JpaDialect jpaDialect = emfInfo.getJpaDialect();
 			if (jpaDialect != null) {
 				return jpaDialect.prepareTransaction(em,
@@ -322,8 +321,7 @@ private static Object prepareTransaction(EntityManager em, EntityManagerFactory
 	 * @see JpaDialect#cleanupTransaction
 	 */
 	private static void cleanupTransaction(@Nullable Object transactionData, EntityManagerFactory emf) {
-		if (emf instanceof EntityManagerFactoryInfo) {
-			EntityManagerFactoryInfo emfInfo = (EntityManagerFactoryInfo) emf;
+		if (emf instanceof EntityManagerFactoryInfo emfInfo) {
 			JpaDialect jpaDialect = emfInfo.getJpaDialect();
 			if (jpaDialect != null) {
 				jpaDialect.cleanupTransaction(transactionData);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
index 29b7a008ca93..452eb81b9678 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -169,8 +169,7 @@ public static EntityManager createContainerManagedEntityManager(
 			EntityManagerFactory emf, @Nullable Map<?, ?> properties, boolean synchronizedWithTransaction) {
 
 		Assert.notNull(emf, "EntityManagerFactory must not be null");
-		if (emf instanceof EntityManagerFactoryInfo) {
-			EntityManagerFactoryInfo emfInfo = (EntityManagerFactoryInfo) emf;
+		if (emf instanceof EntityManagerFactoryInfo emfInfo) {
 			EntityManager rawEntityManager = emfInfo.createNativeEntityManager(properties);
 			return createProxy(rawEntityManager, emfInfo, true, synchronizedWithTransaction);
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
index 79e48b7d0f32..3c02cc2d11ef 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -326,11 +326,10 @@ public void setEntityManagerInitializer(Consumer<EntityManager> entityManagerIni
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (getEntityManagerFactory() == null) {
-			if (!(beanFactory instanceof ListableBeanFactory)) {
+			if (!(beanFactory instanceof ListableBeanFactory lbf)) {
 				throw new IllegalStateException("Cannot retrieve EntityManagerFactory by persistence unit name " +
 						"in a non-listable BeanFactory: " + beanFactory);
 			}
-			ListableBeanFactory lbf = (ListableBeanFactory) beanFactory;
 			setEntityManagerFactory(EntityManagerFactoryUtils.findEntityManagerFactory(lbf, getPersistenceUnitName()));
 		}
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index 26add517b036..0fb6acc3bab5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -308,8 +308,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			// Invoke method on current EntityManager.
 			try {
 				Object result = method.invoke(target, args);
-				if (result instanceof Query) {
-					Query query = (Query) result;
+				if (result instanceof Query query) {
 					if (isNewEm) {
 						Class<?>[] ifcs = cachedQueryInterfaces.computeIfAbsent(query.getClass(), key ->
 								ClassUtils.getAllInterfacesForClass(key, this.proxyClassLoader));
@@ -419,8 +418,7 @@ else if (targetClass.isInstance(proxy)) {
 				if (queryTerminatingMethods.contains(method.getName())) {
 					// Actual execution of the query: close the EntityManager right
 					// afterwards, since that was the only reason we kept it open.
-					if (this.outputParameters != null && this.target instanceof StoredProcedureQuery) {
-						StoredProcedureQuery storedProc = (StoredProcedureQuery) this.target;
+					if (this.outputParameters != null && this.target instanceof StoredProcedureQuery storedProc) {
 						for (Map.Entry<Object, Object> entry : this.outputParameters.entrySet()) {
 							try {
 								Object key = entry.getKey();
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
index 20747130ac71..3f8171c84b60 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -324,8 +324,8 @@ public int getOrder() {
 
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
-		if (beanFactory instanceof ListableBeanFactory) {
-			this.beanFactory = (ListableBeanFactory) beanFactory;
+		if (beanFactory instanceof ListableBeanFactory lbf) {
+			this.beanFactory = lbf;
 		}
 	}
 
@@ -543,8 +543,8 @@ protected EntityManagerFactory findNamedEntityManagerFactory(String unitName, @N
 		Assert.state(this.beanFactory != null, "ListableBeanFactory required for EntityManagerFactory bean lookup");
 
 		EntityManagerFactory emf = EntityManagerFactoryUtils.findEntityManagerFactory(this.beanFactory, unitName);
-		if (requestingBeanName != null && this.beanFactory instanceof ConfigurableBeanFactory) {
-			((ConfigurableBeanFactory) this.beanFactory).registerDependentBean(unitName, requestingBeanName);
+		if (requestingBeanName != null && this.beanFactory instanceof ConfigurableBeanFactory cbf) {
+			cbf.registerDependentBean(unitName, requestingBeanName);
 		}
 		return emf;
 	}
@@ -559,9 +559,8 @@ protected EntityManagerFactory findDefaultEntityManagerFactory(@Nullable String
 
 		Assert.state(this.beanFactory != null, "ListableBeanFactory required for EntityManagerFactory bean lookup");
 
-		if (this.beanFactory instanceof ConfigurableListableBeanFactory) {
+		if (this.beanFactory instanceof ConfigurableListableBeanFactory clbf) {
 			// Fancy variant with dependency registration
-			ConfigurableListableBeanFactory clbf = (ConfigurableListableBeanFactory) this.beanFactory;
 			NamedBeanHolder<EntityManagerFactory> emfHolder = clbf.resolveNamedBean(EntityManagerFactory.class);
 			if (requestingBeanName != null) {
 				clbf.registerDependentBean(emfHolder.getBeanName(), requestingBeanName);
@@ -596,11 +595,11 @@ private class LocatorDelegate {
 
 		public <T> T lookup(String jndiName, Class<T> requiredType) throws Exception {
 			JndiLocatorDelegate locator = new JndiLocatorDelegate();
-			if (jndiEnvironment instanceof JndiTemplate) {
-				locator.setJndiTemplate((JndiTemplate) jndiEnvironment);
+			if (jndiEnvironment instanceof JndiTemplate jndiTemplate) {
+				locator.setJndiTemplate(jndiTemplate);
 			}
-			else if (jndiEnvironment instanceof Properties) {
-				locator.setJndiEnvironment((Properties) jndiEnvironment);
+			else if (jndiEnvironment instanceof Properties properties) {
+				locator.setJndiEnvironment(properties);
 			}
 			else if (jndiEnvironment != null) {
 				throw new IllegalStateException("Illegal 'jndiEnvironment' type: " + jndiEnvironment.getClass());
@@ -696,8 +695,7 @@ private EntityManager resolveEntityManager(@Nullable String requestingBeanName)
 					emf = findEntityManagerFactory(this.unitName, requestingBeanName);
 				}
 				// Inject a shared transactional EntityManager proxy.
-				if (emf instanceof EntityManagerFactoryInfo &&
-						((EntityManagerFactoryInfo) emf).getEntityManagerInterface() != null) {
+				if (emf instanceof EntityManagerFactoryInfo emfInfo && emfInfo.getEntityManagerInterface() != null) {
 					// Create EntityManager based on the info's vendor-specific type
 					// (which might be more specific than the field's type).
 					em = SharedEntityManagerCreator.createSharedEntityManager(
@@ -727,9 +725,9 @@ private EntityManager resolveExtendedEntityManager(Object target, @Nullable Stri
 				em = ExtendedEntityManagerCreator.createContainerManagedEntityManager(
 						emf, this.properties, this.synchronizedWithTransaction);
 			}
-			if (em instanceof EntityManagerProxy && beanFactory != null && requestingBeanName != null &&
+			if (em instanceof EntityManagerProxy emp && beanFactory != null && requestingBeanName != null &&
 					beanFactory.containsBean(requestingBeanName) && !beanFactory.isPrototype(requestingBeanName)) {
-				extendedEntityManagersToClose.put(target, ((EntityManagerProxy) em).getTargetEntityManager());
+				extendedEntityManagersToClose.put(target, emp.getTargetEntityManager());
 			}
 			return em;
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
index a3f465dc68d9..0b460b000014 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,8 +89,7 @@ public final void afterPropertiesSet() {
 		if (emf == null) {
 			throw new IllegalArgumentException("'entityManagerFactory' or 'persistenceUnitName' is required");
 		}
-		if (emf instanceof EntityManagerFactoryInfo) {
-			EntityManagerFactoryInfo emfInfo = (EntityManagerFactoryInfo) emf;
+		if (emf instanceof EntityManagerFactoryInfo emfInfo) {
 			if (this.entityManagerInterface == null) {
 				this.entityManagerInterface = emfInfo.getEntityManagerInterface();
 				if (this.entityManagerInterface == null) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
index a87bf44b6519..acf70e0909c5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
@@ -241,8 +241,7 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 	 * @return the corresponding DataAccessException instance
 	 */
 	protected DataAccessException convertHibernateAccessException(HibernateException ex) {
-		if (this.jdbcExceptionTranslator != null && ex instanceof JDBCException) {
-			JDBCException jdbcEx = (JDBCException) ex;
+		if (this.jdbcExceptionTranslator != null && ex instanceof JDBCException jdbcEx) {
 			DataAccessException dae = this.jdbcExceptionTranslator.translate(
 					"Hibernate operation: " + jdbcEx.getMessage(), jdbcEx.getSQL(), jdbcEx.getSQLException());
 			if (dae != null) {
@@ -253,29 +252,23 @@ protected DataAccessException convertHibernateAccessException(HibernateException
 		if (ex instanceof JDBCConnectionException) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
-		if (ex instanceof SQLGrammarException) {
-			SQLGrammarException jdbcEx = (SQLGrammarException) ex;
+		if (ex instanceof SQLGrammarException jdbcEx) {
 			return new InvalidDataAccessResourceUsageException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof QueryTimeoutException) {
-			QueryTimeoutException jdbcEx = (QueryTimeoutException) ex;
+		if (ex instanceof QueryTimeoutException jdbcEx) {
 			return new org.springframework.dao.QueryTimeoutException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof LockAcquisitionException) {
-			LockAcquisitionException jdbcEx = (LockAcquisitionException) ex;
+		if (ex instanceof LockAcquisitionException jdbcEx) {
 			return new CannotAcquireLockException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof PessimisticLockException) {
-			PessimisticLockException jdbcEx = (PessimisticLockException) ex;
+		if (ex instanceof PessimisticLockException jdbcEx) {
 			return new PessimisticLockingFailureException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
-		if (ex instanceof ConstraintViolationException) {
-			ConstraintViolationException jdbcEx = (ConstraintViolationException) ex;
+		if (ex instanceof ConstraintViolationException jdbcEx) {
 			return new DataIntegrityViolationException(ex.getMessage()  + "; SQL [" + jdbcEx.getSQL() +
 					"]; constraint [" + jdbcEx.getConstraintName() + "]", ex);
 		}
-		if (ex instanceof DataException) {
-			DataException jdbcEx = (DataException) ex;
+		if (ex instanceof DataException jdbcEx) {
 			return new DataIntegrityViolationException(ex.getMessage() + "; SQL [" + jdbcEx.getSQL() + "]", ex);
 		}
 		// end of JDBCException subclass handling
@@ -301,16 +294,13 @@ protected DataAccessException convertHibernateAccessException(HibernateException
 		if (ex instanceof ObjectDeletedException) {
 			return new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
 		}
-		if (ex instanceof UnresolvableObjectException) {
-			UnresolvableObjectException hibEx = (UnresolvableObjectException) ex;
+		if (ex instanceof UnresolvableObjectException hibEx) {
 			return new ObjectRetrievalFailureException(hibEx.getEntityName(), hibEx.getIdentifier(), ex.getMessage(), ex);
 		}
-		if (ex instanceof WrongClassException) {
-			WrongClassException hibEx = (WrongClassException) ex;
+		if (ex instanceof WrongClassException hibEx) {
 			return new ObjectRetrievalFailureException(hibEx.getEntityName(), hibEx.getIdentifier(), ex.getMessage(), ex);
 		}
-		if (ex instanceof StaleObjectStateException) {
-			StaleObjectStateException hibEx = (StaleObjectStateException) ex;
+		if (ex instanceof StaleObjectStateException hibEx) {
 			return new ObjectOptimisticLockingFailureException(hibEx.getEntityName(), hibEx.getIdentifier(), ex);
 		}
 		if (ex instanceof StaleStateException) {

From 9b4f3880b3a0090ecaa78a6e9ffab37d8e2ae7fc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 22:06:55 +0200
Subject: [PATCH 264/735] Apply "instanceof pattern matching" in spring-oxm

This has only been applied to `src/main/java`.
---
 .../oxm/jaxb/Jaxb2Marshaller.java             | 19 +++---
 .../oxm/xstream/XStreamMarshaller.java        | 61 ++++++++-----------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 7267f311cc08..4b30aad1e06d 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -111,6 +111,7 @@
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 3.0
  * @see #setContextPath
  * @see #setClassesToBeBound
@@ -607,25 +608,21 @@ public boolean supports(Class<?> clazz) {
 
 	@Override
 	public boolean supports(Type genericType) {
-		if (genericType instanceof ParameterizedType) {
-			ParameterizedType parameterizedType = (ParameterizedType) genericType;
+		if (genericType instanceof ParameterizedType parameterizedType) {
 			if (JAXBElement.class == parameterizedType.getRawType() &&
 					parameterizedType.getActualTypeArguments().length == 1) {
 				Type typeArgument = parameterizedType.getActualTypeArguments()[0];
-				if (typeArgument instanceof Class) {
-					Class<?> classArgument = (Class<?>) typeArgument;
+				if (typeArgument instanceof Class<?> classArgument) {
 					return ((classArgument.isArray() && Byte.TYPE == classArgument.getComponentType()) ||
 							isPrimitiveWrapper(classArgument) || isStandardClass(classArgument) ||
 							supportsInternal(classArgument, false));
 				}
-				else if (typeArgument instanceof GenericArrayType) {
-					GenericArrayType arrayType = (GenericArrayType) typeArgument;
+				else if (typeArgument instanceof GenericArrayType arrayType) {
 					return (Byte.TYPE == arrayType.getGenericComponentType());
 				}
 			}
 		}
-		else if (genericType instanceof Class) {
-			Class<?> clazz = (Class<?>) genericType;
+		else if (genericType instanceof Class<?> clazz) {
 			return supportsInternal(clazz, this.checkForXmlRootElement);
 		}
 		return false;
@@ -866,13 +863,11 @@ private Source processSource(Source source) {
 		XMLReader xmlReader = null;
 		InputSource inputSource = null;
 
-		if (source instanceof SAXSource) {
-			SAXSource saxSource = (SAXSource) source;
+		if (source instanceof SAXSource saxSource) {
 			xmlReader = saxSource.getXMLReader();
 			inputSource = saxSource.getInputSource();
 		}
-		else if (source instanceof StreamSource) {
-			StreamSource streamSource = (StreamSource) source;
+		else if (source instanceof StreamSource streamSource) {
 			if (streamSource.getInputStream() != null) {
 				inputSource = new InputSource(streamSource.getInputStream());
 			}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index 342f9a41edac..3a3356d485cb 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -253,8 +253,8 @@ public void setMapperWrappers(Class<? extends MapperWrapper>... mapperWrappers)
 	 */
 	public void setConverterLookup(ConverterLookup converterLookup) {
 		this.converterLookup = converterLookup;
-		if (converterLookup instanceof ConverterRegistry) {
-			this.converterRegistry = (ConverterRegistry) converterLookup;
+		if (converterLookup instanceof ConverterRegistry registry) {
+			this.converterRegistry = registry;
 		}
 	}
 
@@ -491,11 +491,11 @@ protected MapperWrapper wrapMapper(MapperWrapper next) {
 	protected void configureXStream(XStream xstream) {
 		if (this.converters != null) {
 			for (int i = 0; i < this.converters.length; i++) {
-				if (this.converters[i] instanceof Converter) {
-					xstream.registerConverter((Converter) this.converters[i], i);
+				if (this.converters[i] instanceof Converter converter) {
+					xstream.registerConverter(converter, i);
 				}
-				else if (this.converters[i] instanceof SingleValueConverter) {
-					xstream.registerConverter((SingleValueConverter) this.converters[i], i);
+				else if (this.converters[i] instanceof SingleValueConverter converter) {
+					xstream.registerConverter(converter, i);
 				}
 				else {
 					throw new IllegalArgumentException("Invalid ConverterMatcher [" + this.converters[i] + "]");
@@ -553,26 +553,23 @@ else if (this.converters[i] instanceof SingleValueConverter) {
 		}
 		if (this.useAttributeFor != null) {
 			for (Map.Entry<?, ?> entry : this.useAttributeFor.entrySet()) {
-				if (entry.getKey() instanceof String) {
-					if (entry.getValue() instanceof Class) {
-						xstream.useAttributeFor((String) entry.getKey(), (Class<?>) entry.getValue());
+				if (entry.getKey() instanceof String key) {
+					if (entry.getValue() instanceof Class<?> clazz) {
+						xstream.useAttributeFor(key, clazz);
 					}
 					else {
 						throw new IllegalArgumentException(
 								"'useAttributesFor' takes Map<String, Class> when using a map key of type String");
 					}
 				}
-				else if (entry.getKey() instanceof Class) {
-					Class<?> key = (Class<?>) entry.getKey();
-					if (entry.getValue() instanceof String) {
-						xstream.useAttributeFor(key, (String) entry.getValue());
+				else if (entry.getKey() instanceof Class<?> key) {
+					if (entry.getValue() instanceof String value) {
+						xstream.useAttributeFor(key, value);
 					}
-					else if (entry.getValue() instanceof List) {
-						@SuppressWarnings("unchecked")
-						List<Object> listValue = (List<Object>) entry.getValue();
+					else if (entry.getValue() instanceof List<?> listValue) {
 						for (Object element : listValue) {
-							if (element instanceof String) {
-								xstream.useAttributeFor(key, (String) element);
+							if (element instanceof String value) {
+								xstream.useAttributeFor(key, value);
 							}
 						}
 					}
@@ -619,11 +616,10 @@ private Map<String, Class<?>> toClassMap(Map<String, ?> map) throws ClassNotFoun
 			String key = entry.getKey();
 			Object value = entry.getValue();
 			Class<?> type;
-			if (value instanceof Class) {
-				type = (Class<?>) value;
+			if (value instanceof Class<?> clazz) {
+				type = clazz;
 			}
-			else if (value instanceof String) {
-				String className = (String) value;
+			else if (value instanceof String className) {
 				type = ClassUtils.forName(className, this.beanClassLoader);
 			}
 			else {
@@ -676,11 +672,11 @@ public boolean supports(Class<?> clazz) {
 	@Override
 	protected void marshalDomNode(Object graph, Node node) throws XmlMappingException {
 		HierarchicalStreamWriter streamWriter;
-		if (node instanceof Document) {
-			streamWriter = new DomWriter((Document) node, this.nameCoder);
+		if (node instanceof Document document) {
+			streamWriter = new DomWriter(document, this.nameCoder);
 		}
-		else if (node instanceof Element) {
-			streamWriter = new DomWriter((Element) node, node.getOwnerDocument(), this.nameCoder);
+		else if (node instanceof Element element) {
+			streamWriter = new DomWriter(element, node.getOwnerDocument(), this.nameCoder);
 		}
 		else {
 			throw new IllegalArgumentException("DOMResult contains neither Document nor Element");
@@ -691,10 +687,7 @@ else if (node instanceof Element) {
 	@Override
 	protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) throws XmlMappingException {
 		ContentHandler contentHandler = StaxUtils.createContentHandler(eventWriter);
-		LexicalHandler lexicalHandler = null;
-		if (contentHandler instanceof LexicalHandler) {
-			lexicalHandler = (LexicalHandler) contentHandler;
-		}
+		LexicalHandler lexicalHandler = (contentHandler instanceof LexicalHandler handler ? handler : null);
 		marshalSaxHandlers(graph, contentHandler, lexicalHandler);
 	}
 
@@ -789,11 +782,11 @@ else if (streamSource.getReader() != null) {
 	@Override
 	protected Object unmarshalDomNode(Node node) throws XmlMappingException {
 		HierarchicalStreamReader streamReader;
-		if (node instanceof Document) {
-			streamReader = new DomReader((Document) node, this.nameCoder);
+		if (node instanceof Document document) {
+			streamReader = new DomReader(document, this.nameCoder);
 		}
-		else if (node instanceof Element) {
-			streamReader = new DomReader((Element) node, this.nameCoder);
+		else if (node instanceof Element element) {
+			streamReader = new DomReader(element, this.nameCoder);
 		}
 		else {
 			throw new IllegalArgumentException("DOMSource contains neither Document nor Element");

From b8fc79543dd1a445aaf6f0e0daaa6dd28421f003 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 22:12:23 +0200
Subject: [PATCH 265/735] Polish tests and test fixtures in spring-test

---
 .../springframework/mock/web/MockHttpSessionTests.java    | 2 +-
 .../test/context/TestContextConcurrencyTests.java         | 2 +-
 .../test/context/cache/ContextCacheTests.java             | 2 +-
 .../junit4/statements/SpringFailOnTimeoutTests.java       | 2 +-
 .../springframework/test/util/subpackage/Component.java   | 8 ++++----
 .../test/java/org/springframework/test/web/Person.java    | 3 +--
 .../test/web/reactive/server/samples/Person.java          | 8 ++++++--
 .../web/servlet/result/PrintingResultHandlerTests.java    | 2 +-
 .../test/web/servlet/samples/spr/EncodedUriTests.java     | 4 +---
 .../test/web/servlet/samples/spr/HttpOptionsTests.java    | 2 +-
 .../samples/standalone/FrameworkExtensionTests.java       | 2 +-
 11 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java
index d20693b2d204..602290d5597a 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java
@@ -34,7 +34,7 @@
  */
 class MockHttpSessionTests {
 
-	private MockHttpSession session = new MockHttpSession();
+	private final MockHttpSession session = new MockHttpSession();
 
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java
index 80548d015c4f..4194f243b3e2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java
@@ -118,7 +118,7 @@ void test_010() {
 
 	private static class TrackingListener implements TestExecutionListener {
 
-		private ThreadLocal<String> methodName = new ThreadLocal<>();
+		private final ThreadLocal<String> methodName = new ThreadLocal<>();
 
 
 		@Override
diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java
index 202af4bb4b1b..c454e72ad9c5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java
@@ -47,7 +47,7 @@
  */
 class ContextCacheTests {
 
-	private ContextCache contextCache = new DefaultContextCache();
+	private final ContextCache contextCache = new DefaultContextCache();
 
 
 	@BeforeEach
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java
index 59f037e199e7..2c6627c0c672 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java
@@ -38,7 +38,7 @@
  */
 public class SpringFailOnTimeoutTests {
 
-	private Statement statement = mock(Statement.class);
+	private final Statement statement = mock(Statement.class);
 
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
index 676592741381..7260f3182da6 100644
--- a/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
+++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java
@@ -68,16 +68,16 @@ int subtract(int a, int b) {
 
 	int add(int... args) {
 		int sum = 0;
-		for (int i = 0; i < args.length; i++) {
-			sum += args[i];
+		for (int arg : args) {
+			sum += arg;
 		}
 		return sum;
 	}
 
 	int multiply(Integer... args) {
 		int product = 1;
-		for (int i = 0; i < args.length; i++) {
-			product *= args[i];
+		for (Integer arg : args) {
+			product *= arg;
 		}
 		return product;
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/web/Person.java b/spring-test/src/test/java/org/springframework/test/web/Person.java
index 2282b70dc304..5184cd0a9cd3 100644
--- a/spring-test/src/test/java/org/springframework/test/web/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/web/Person.java
@@ -70,10 +70,9 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof Person)) {
+		if (!(other instanceof Person otherPerson)) {
 			return false;
 		}
-		Person otherPerson = (Person) other;
 		return (ObjectUtils.nullSafeEquals(this.name, otherPerson.name) &&
 				ObjectUtils.nullSafeEquals(this.someDouble, otherPerson.someDouble) &&
 				ObjectUtils.nullSafeEquals(this.someBoolean, otherPerson.someBoolean));
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
index d99265f36a06..b56aebe8ebf0 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java
@@ -45,8 +45,12 @@ public String getName() {
 
 	@Override
 	public boolean equals(Object other) {
-		if (this == other) return true;
-		if (other == null || getClass() != other.getClass()) return false;
+		if (this == other) {
+			return true;
+		}
+		if (other == null || getClass() != other.getClass()) {
+			return false;
+		}
 		Person person = (Person) other;
 		return getName().equals(person.getName());
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
index c7c3cab6772f..e7ff36a4cf15 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
@@ -347,7 +347,7 @@ private static class TestResultValuePrinter implements ResultValuePrinter {
 
 			private String printedHeading;
 
-			private Map<String, Map<String, Object>> printedValues = new HashMap<>();
+			private final Map<String, Map<String, Object>> printedValues = new HashMap<>();
 
 			@Override
 			public void printHeading(String heading) {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java
index aac7d7985be9..b67aeb493e2f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java
@@ -117,9 +117,7 @@ private static class HandlerMappingConfigurer implements BeanPostProcessor, Prio
 
 		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-			if (bean instanceof RequestMappingHandlerMapping) {
-				RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping) bean;
-
+			if (bean instanceof RequestMappingHandlerMapping requestMappingHandlerMapping) {
 				// URL decode after request mapping, not before.
 				requestMappingHandlerMapping.setUrlDecode(false);
 			}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java
index 508c697c67b7..97f8f5a457bb 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java
@@ -86,7 +86,7 @@ public MyController myController() {
 	@Controller
 	private static class MyController {
 
-		private AtomicInteger counter = new AtomicInteger();
+		private final AtomicInteger counter = new AtomicInteger();
 
 
 		@RequestMapping(value = "/myUrl", method = RequestMethod.OPTIONS)
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java
index a18759bba83b..e98278f98c4b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java
@@ -85,7 +85,7 @@ private static TestRequestPostProcessor headers() {
 	 */
 	private static class TestRequestPostProcessor implements RequestPostProcessor {
 
-		private HttpHeaders headers = new HttpHeaders();
+		private final HttpHeaders headers = new HttpHeaders();
 
 
 		public TestRequestPostProcessor foo(String value) {

From e9cf645b86c39c66759492435e6d44b70736cee5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 14 Oct 2021 22:18:01 +0200
Subject: [PATCH 266/735] Apply "instanceof pattern matching" in spring-tx

This commit also applies additional clean-up tasks such as the following.

- final fields

This has only been applied to `src/main/java`.
---
 .../jca/support/SimpleBootstrapContext.java         |  4 ++--
 .../AnnotationTransactionAttributeSource.java       |  5 ++---
 .../AbstractFallbackTransactionAttributeSource.java |  5 ++---
 .../MatchAlwaysTransactionAttributeSource.java      |  9 ++++-----
 .../MethodMapTransactionAttributeSource.java        |  9 ++++-----
 .../NameMatchTransactionAttributeSource.java        | 13 ++++++-------
 .../interceptor/RollbackRuleAttribute.java          |  5 ++---
 .../TransactionAttributeSourcePointcut.java         |  5 ++---
 8 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
index c607a6f2660a..fac8e45d5abe 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
 public class SimpleBootstrapContext implements BootstrapContext {
 
 	@Nullable
-	private WorkManager workManager;
+	private final WorkManager workManager;
 
 	@Nullable
 	private XATerminator xaTerminator;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
index 13f16a20e93e..5d4e2e939559 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -194,10 +194,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AnnotationTransactionAttributeSource)) {
+		if (!(other instanceof AnnotationTransactionAttributeSource otherTas)) {
 			return false;
 		}
-		AnnotationTransactionAttributeSource otherTas = (AnnotationTransactionAttributeSource) other;
 		return (this.annotationParsers.equals(otherTas.annotationParsers) &&
 				this.publicMethodsOnly == otherTas.publicMethodsOnly);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
index 80983806eded..e50c9b52319a 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,8 +128,7 @@ public TransactionAttribute getTransactionAttribute(Method method, @Nullable Cla
 			}
 			else {
 				String methodIdentification = ClassUtils.getQualifiedMethodName(method, targetClass);
-				if (txAttr instanceof DefaultTransactionAttribute) {
-					DefaultTransactionAttribute dta = (DefaultTransactionAttribute) txAttr;
+				if (txAttr instanceof DefaultTransactionAttribute dta) {
 					dta.setDescriptor(methodIdentification);
 					dta.resolveAttributeStrings(this.embeddedValueResolver);
 				}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
index c5698a7cb131..d1f068dbf4a4 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,8 +49,8 @@ public class MatchAlwaysTransactionAttributeSource implements TransactionAttribu
 	 * @see org.springframework.transaction.interceptor.TransactionAttributeEditor
 	 */
 	public void setTransactionAttribute(TransactionAttribute transactionAttribute) {
-		if (transactionAttribute instanceof DefaultTransactionAttribute) {
-			((DefaultTransactionAttribute) transactionAttribute).resolveAttributeStrings(null);
+		if (transactionAttribute instanceof DefaultTransactionAttribute dta) {
+			dta.resolveAttributeStrings(null);
 		}
 		this.transactionAttribute = transactionAttribute;
 	}
@@ -68,10 +68,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MatchAlwaysTransactionAttributeSource)) {
+		if (!(other instanceof MatchAlwaysTransactionAttributeSource otherTas)) {
 			return false;
 		}
-		MatchAlwaysTransactionAttributeSource otherTas = (MatchAlwaysTransactionAttributeSource) other;
 		return ObjectUtils.nullSafeEquals(this.transactionAttribute, otherTas.transactionAttribute);
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
index 9407b1881a6c..e328a88a2eca 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -199,8 +199,8 @@ public void addTransactionalMethod(Method method, TransactionAttribute attr) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Adding transactional method [" + method + "] with attribute [" + attr + "]");
 		}
-		if (this.embeddedValueResolver != null && attr instanceof DefaultTransactionAttribute) {
-			((DefaultTransactionAttribute) attr).resolveAttributeStrings(this.embeddedValueResolver);
+		if (this.embeddedValueResolver != null && attr instanceof DefaultTransactionAttribute dta) {
+			dta.resolveAttributeStrings(this.embeddedValueResolver);
 		}
 		this.transactionAttributeMap.put(method, attr);
 	}
@@ -242,10 +242,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof MethodMapTransactionAttributeSource)) {
+		if (!(other instanceof MethodMapTransactionAttributeSource otherTas)) {
 			return false;
 		}
-		MethodMapTransactionAttributeSource otherTas = (MethodMapTransactionAttributeSource) other;
 		return ObjectUtils.nullSafeEquals(this.methodMap, otherTas.methodMap);
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
index b9c8996424cf..a0f4e15bf4b4 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,8 +101,8 @@ public void addTransactionalMethod(String methodName, TransactionAttribute attr)
 		if (logger.isDebugEnabled()) {
 			logger.debug("Adding transactional method [" + methodName + "] with attribute [" + attr + "]");
 		}
-		if (this.embeddedValueResolver != null && attr instanceof DefaultTransactionAttribute) {
-			((DefaultTransactionAttribute) attr).resolveAttributeStrings(this.embeddedValueResolver);
+		if (this.embeddedValueResolver != null && attr instanceof DefaultTransactionAttribute dta) {
+			dta.resolveAttributeStrings(this.embeddedValueResolver);
 		}
 		this.nameMap.put(methodName, attr);
 	}
@@ -115,8 +115,8 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
 	@Override
 	public void afterPropertiesSet()  {
 		for (TransactionAttribute attr : this.nameMap.values()) {
-			if (attr instanceof DefaultTransactionAttribute) {
-				((DefaultTransactionAttribute) attr).resolveAttributeStrings(this.embeddedValueResolver);
+			if (attr instanceof DefaultTransactionAttribute dta) {
+				dta.resolveAttributeStrings(this.embeddedValueResolver);
 			}
 		}
 	}
@@ -167,10 +167,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof NameMatchTransactionAttributeSource)) {
+		if (!(other instanceof NameMatchTransactionAttributeSource otherTas)) {
 			return false;
 		}
-		NameMatchTransactionAttributeSource otherTas = (NameMatchTransactionAttributeSource) other;
 		return ObjectUtils.nullSafeEquals(this.nameMap, otherTas.nameMap);
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
index e0552d41f21a..f9defeecd4b6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -129,10 +129,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof RollbackRuleAttribute)) {
+		if (!(other instanceof RollbackRuleAttribute rhs)) {
 			return false;
 		}
-		RollbackRuleAttribute rhs = (RollbackRuleAttribute) other;
 		return this.exceptionName.equals(rhs.exceptionName);
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
index ceef2bd82f94..a7cdc8867d02 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,10 +52,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof TransactionAttributeSourcePointcut)) {
+		if (!(other instanceof TransactionAttributeSourcePointcut otherPc)) {
 			return false;
 		}
-		TransactionAttributeSourcePointcut otherPc = (TransactionAttributeSourcePointcut) other;
 		return ObjectUtils.nullSafeEquals(getTransactionAttributeSource(), otherPc.getTransactionAttributeSource());
 	}
 

From 785212d67655119a71d3ad700e90c6e09e7c6361 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 17 Oct 2021 12:58:25 +0200
Subject: [PATCH 267/735] Apply "instanceof pattern matching" in spring-web

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes
- try with resources

This has only been applied to `src/main/java`.
---
 .../http/ContentDisposition.java              |  3 +-
 .../org/springframework/http/HttpCookie.java  |  5 +--
 .../org/springframework/http/HttpRange.java   |  8 ++--
 .../org/springframework/http/MediaType.java   |  6 +--
 .../springframework/http/ResponseCookie.java  |  3 +-
 .../HttpComponentsClientHttpRequest.java      |  5 +--
 ...pComponentsStreamingClientHttpRequest.java |  5 +--
 .../client/InterceptingClientHttpRequest.java |  9 ++---
 .../http/client/MultipartBodyBuilder.java     | 22 +++++------
 .../HttpComponentsHeadersAdapter.java         | 12 +++---
 .../client/reactive/JettyHeadersAdapter.java  | 39 ++++++++++---------
 .../client/reactive/NettyHeadersAdapter.java  | 13 ++++---
 .../reactive/ReactorClientHttpResponse.java   | 13 +++----
 .../codec/json/AbstractJackson2Encoder.java   |  9 ++---
 .../AbstractGenericHttpMessageConverter.java  |  7 ++--
 .../AbstractHttpMessageConverter.java         |  5 +--
 .../BufferedImageHttpMessageConverter.java    |  5 +--
 .../converter/FormHttpMessageConverter.java   | 16 +++-----
 .../ResourceRegionHttpMessageConverter.java   | 30 +++++++-------
 .../AbstractJackson2HttpMessageConverter.java | 28 ++++++-------
 .../Jaxb2CollectionHttpMessageConverter.java  | 12 +++---
 .../Jaxb2RootElementHttpMessageConverter.java |  3 +-
 .../ServletServerHttpAsyncRequestControl.java |  4 +-
 .../http/server/ServletServerHttpRequest.java |  3 +-
 .../DefaultServerHttpRequestBuilder.java      |  6 +--
 .../reactive/JettyHttpHandlerAdapter.java     | 14 +++----
 .../server/reactive/NettyHeadersAdapter.java  | 12 +++---
 .../server/reactive/TomcatHeadersAdapter.java | 21 +++++-----
 .../reactive/TomcatHttpHandlerAdapter.java    | 21 +++++-----
 .../reactive/UndertowHeadersAdapter.java      | 20 +++++-----
 .../reactive/UndertowServerHttpRequest.java   |  5 +--
 .../ContentNegotiationManagerFactoryBean.java |  4 +-
 .../web/bind/EscapedErrors.java               | 11 +++---
 .../bind/support/WebRequestDataBinder.java    |  3 +-
 .../web/context/ContextLoader.java            | 31 +++++++--------
 .../async/StandardServletAsyncWebRequest.java |  4 +-
 .../context/support/RequestHandledEvent.java  |  6 +--
 .../support/ServletContextResource.java       |  5 +--
 ...ServletContextResourcePatternResolver.java |  5 +--
 .../web/filter/DelegatingFilterProxy.java     | 11 ++----
 .../web/filter/FormContentFilter.java         |  4 +-
 .../web/filter/HttpPutFormContentFilter.java  |  4 +-
 .../web/filter/OncePerRequestFilter.java      |  7 +---
 .../web/jsf/DecoratingNavigationHandler.java  |  5 +--
 .../WebApplicationContextFacesELResolver.java |  8 ++--
 .../web/method/ControllerAdviceBean.java      | 20 +++++-----
 .../web/method/HandlerMethod.java             |  6 +--
 .../CompositeUriComponentsContributor.java    | 16 ++++----
 .../support/ByteArrayMultipartFileEditor.java |  3 +-
 .../support/StringMultipartFileEditor.java    |  5 +--
 .../AbstractReactiveWebInitializer.java       | 16 +++-----
 .../web/util/HierarchicalUriComponents.java   | 12 +++---
 .../web/util/OpaqueUriComponents.java         |  5 +--
 .../springframework/web/util/WebUtils.java    | 20 +++++-----
 .../web/util/pattern/PathPattern.java         |  8 +---
 55 files changed, 262 insertions(+), 321 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
index 1d5254e336a8..63149ae9e018 100644
--- a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
+++ b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
@@ -212,10 +212,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ContentDisposition)) {
+		if (!(other instanceof ContentDisposition otherCd)) {
 			return false;
 		}
-		ContentDisposition otherCd = (ContentDisposition) other;
 		return (ObjectUtils.nullSafeEquals(this.type, otherCd.type) &&
 				ObjectUtils.nullSafeEquals(this.name, otherCd.name) &&
 				ObjectUtils.nullSafeEquals(this.filename, otherCd.filename) &&
diff --git a/spring-web/src/main/java/org/springframework/http/HttpCookie.java b/spring-web/src/main/java/org/springframework/http/HttpCookie.java
index e09070c9bf79..c09cdc947f15 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpCookie.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpCookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,10 +66,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof HttpCookie)) {
+		if (!(other instanceof HttpCookie otherCookie)) {
 			return false;
 		}
-		HttpCookie otherCookie = (HttpCookie) other;
 		return (this.name.equalsIgnoreCase(otherCookie.getName()));
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/HttpRange.java b/spring-web/src/main/java/org/springframework/http/HttpRange.java
index ae591cd33529..25159745e574 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpRange.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -272,10 +272,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ByteRange)) {
+			if (!(other instanceof ByteRange otherRange)) {
 				return false;
 			}
-			ByteRange otherRange = (ByteRange) other;
 			return (this.firstPos == otherRange.firstPos &&
 					ObjectUtils.nullSafeEquals(this.lastPos, otherRange.lastPos));
 		}
@@ -335,10 +334,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof SuffixByteRange)) {
+			if (!(other instanceof SuffixByteRange otherRange)) {
 				return false;
 			}
-			SuffixByteRange otherRange = (SuffixByteRange) other;
 			return (this.suffixLength == otherRange.suffixLength);
 		}
 
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index ec57d77a5ac2..dfd68464b433 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -691,8 +691,8 @@ public static List<MediaType> asMediaTypes(List<MimeType> mimeTypes) {
 	 * @since 5.0
 	 */
 	public static MediaType asMediaType(MimeType mimeType) {
-		if (mimeType instanceof MediaType) {
-			return (MediaType) mimeType;
+		if (mimeType instanceof MediaType mediaType) {
+			return mediaType;
 		}
 		return new MediaType(mimeType.getType(), mimeType.getSubtype(), mimeType.getParameters());
 	}
@@ -817,7 +817,7 @@ else if (mediaType2.isWildcardSubtype() && !mediaType1.isWildcardSubtype()) {  /
 	/**
 	 * Comparator used by {@link #sortBySpecificity(List)}.
 	 */
-	public static final Comparator<MediaType> SPECIFICITY_COMPARATOR = new SpecificityComparator<MediaType>() {
+	public static final Comparator<MediaType> SPECIFICITY_COMPARATOR = new SpecificityComparator<>() {
 
 		@Override
 		protected int compareParameters(MediaType mediaType1, MediaType mediaType2) {
diff --git a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
index bada6e559885..cd0a19f0b5d0 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
@@ -134,10 +134,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ResponseCookie)) {
+		if (!(other instanceof ResponseCookie otherCookie)) {
 			return false;
 		}
-		ResponseCookie otherCookie = (ResponseCookie) other;
 		return (getName().equalsIgnoreCase(otherCookie.getName()) &&
 				ObjectUtils.nullSafeEquals(this.path, otherCookie.getPath()) &&
 				ObjectUtils.nullSafeEquals(this.domain, otherCookie.getDomain()));
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
index e1b328df0ffd..5803e19f92a1 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,8 +79,7 @@ HttpContext getHttpContext() {
 	protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
 		addHeaders(this.httpRequest, headers);
 
-		if (this.httpRequest instanceof HttpEntityEnclosingRequest) {
-			HttpEntityEnclosingRequest entityEnclosingRequest = (HttpEntityEnclosingRequest) this.httpRequest;
+		if (this.httpRequest instanceof HttpEntityEnclosingRequest entityEnclosingRequest) {
 			HttpEntity requestEntity = new ByteArrayEntity(bufferedOutput);
 			entityEnclosingRequest.setEntity(requestEntity);
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
index 7b145e2a306f..ed0cc19fa79d 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,8 +90,7 @@ protected OutputStream getBodyInternal(HttpHeaders headers) throws IOException {
 	protected ClientHttpResponse executeInternal(HttpHeaders headers) throws IOException {
 		HttpComponentsClientHttpRequest.addHeaders(this.httpRequest, headers);
 
-		if (this.httpRequest instanceof HttpEntityEnclosingRequest && this.body != null) {
-			HttpEntityEnclosingRequest entityEnclosingRequest = (HttpEntityEnclosingRequest) this.httpRequest;
+		if (this.httpRequest instanceof HttpEntityEnclosingRequest entityEnclosingRequest && this.body != null) {
 			HttpEntity requestEntity = new StreamingHttpEntity(getHeaders(), this.body);
 			entityEnclosingRequest.setEntity(requestEntity);
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
index 8b75f7e31a76..57198a5e697a 100644
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,9 +41,9 @@ class InterceptingClientHttpRequest extends AbstractBufferingClientHttpRequest {
 
 	private final List<ClientHttpRequestInterceptor> interceptors;
 
-	private HttpMethod method;
+	private final HttpMethod method;
 
-	private URI uri;
+	private final URI uri;
 
 
 	protected InterceptingClientHttpRequest(ClientHttpRequestFactory requestFactory,
@@ -98,8 +98,7 @@ public ClientHttpResponse execute(HttpRequest request, byte[] body) throws IOExc
 				ClientHttpRequest delegate = requestFactory.createRequest(request.getURI(), method);
 				request.getHeaders().forEach((key, value) -> delegate.getHeaders().addAll(key, value));
 				if (body.length > 0) {
-					if (delegate instanceof StreamingHttpOutputMessage) {
-						StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) delegate;
+					if (delegate instanceof StreamingHttpOutputMessage streamingOutputMessage) {
 						streamingOutputMessage.setBody(outputStream -> StreamUtils.copy(body, outputStream));
 					}
 					else {
diff --git a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java
index 9d76f72f15b1..c80e3c56e23f 100644
--- a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java
@@ -83,6 +83,7 @@
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 5.0.2
  * @see <a href="https://tools.ietf.org/html/rfc7578">RFC 7578</a>
  */
@@ -127,8 +128,7 @@ public PartBuilder part(String name, Object part, @Nullable MediaType contentTyp
 		Assert.hasLength(name, "'name' must not be empty");
 		Assert.notNull(part, "'part' must not be null");
 
-		if (part instanceof Part) {
-			Part partObject = (Part) part;
+		if (part instanceof Part partObject) {
 			PartBuilder builder = asyncPart(name, partObject.content(), DataBuffer.class);
 			if (!partObject.headers().isEmpty()) {
 				builder.headers(headers -> {
@@ -144,8 +144,8 @@ public PartBuilder part(String name, Object part, @Nullable MediaType contentTyp
 			return builder;
 		}
 
-		if (part instanceof PublisherEntity<?,?>) {
-			PublisherPartBuilder<?, ?> builder = new PublisherPartBuilder<>(name, (PublisherEntity<?, ?>) part);
+		if (part instanceof PublisherEntity<?,?> publisherEntity) {
+			PublisherPartBuilder<?, ?> builder = new PublisherPartBuilder<>(name, publisherEntity);
 			if (contentType != null) {
 				builder.contentType(contentType);
 			}
@@ -155,20 +155,20 @@ public PartBuilder part(String name, Object part, @Nullable MediaType contentTyp
 
 		Object partBody;
 		HttpHeaders partHeaders = null;
-		if (part instanceof HttpEntity) {
-			partBody = ((HttpEntity<?>) part).getBody();
+		if (part instanceof HttpEntity<?> httpEntity) {
+			partBody = httpEntity.getBody();
 			partHeaders = new HttpHeaders();
-			partHeaders.putAll(((HttpEntity<?>) part).getHeaders());
+			partHeaders.putAll(httpEntity.getHeaders());
 		}
 		else {
 			partBody = part;
 		}
 
 		if (partBody instanceof Publisher) {
-			throw new IllegalArgumentException(
-					"Use asyncPart(String, Publisher, Class)" +
-							" or asyncPart(String, Publisher, ParameterizedTypeReference) or" +
-							" or MultipartBodyBuilder.PublisherEntity");
+			throw new IllegalArgumentException("""
+					Use asyncPart(String, Publisher, Class) \
+					or asyncPart(String, Publisher, ParameterizedTypeReference) \
+					or MultipartBodyBuilder.PublisherEntity""");
 		}
 
 		DefaultPartBuilder builder = new DefaultPartBuilder(name, partHeaders, partBody);
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java
index f24d77cb86d6..9b914c1a4e21 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.response.containsHeader((String) key));
+		return (key instanceof String headerName && this.response.containsHeader(headerName));
 	}
 
 	@Override
@@ -136,9 +136,9 @@ public List<String> put(String key, List<String> values) {
 	@Nullable
 	@Override
 	public List<String> remove(Object key) {
-		if (key instanceof String) {
+		if (key instanceof String headerName) {
 			List<String> oldValues = get(key);
-			this.response.removeHeaders((String) key);
+			this.response.removeHeaders(headerName);
 			return oldValues;
 		}
 		return null;
@@ -174,7 +174,7 @@ public Collection<List<String>> values() {
 
 	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
-		return new AbstractSet<Entry<String, List<String>>>() {
+		return new AbstractSet<>() {
 			@Override
 			public Iterator<Entry<String, List<String>>> iterator() {
 				return new EntryIterator();
@@ -196,7 +196,7 @@ public String toString() {
 
 	private class EntryIterator implements Iterator<Entry<String, List<String>>> {
 
-		private Iterator<Header> iterator = response.headerIterator();
+		private final Iterator<Header> iterator = response.headerIterator();
 
 		@Override
 		public boolean hasNext() {
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java
index 6d42dc76204e..b1c01aa88225 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyHeadersAdapter.java
@@ -40,6 +40,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 5.3
  */
 class JettyHeadersAdapter implements MultiValueMap<String, String> {
@@ -59,10 +60,10 @@ public String getFirst(String key) {
 
 	@Override
 	public void add(String key, @Nullable String value) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
+		if (!(this.headers instanceof HttpFields.Mutable mutableHttpFields)) {
 			throw new IllegalStateException("Immutable headers");
 		}
-		((HttpFields.Mutable) this.headers).add(key, value);
+		mutableHttpFields.add(key, value);
 	}
 
 	@Override
@@ -77,10 +78,10 @@ public void addAll(MultiValueMap<String, String> values) {
 
 	@Override
 	public void set(String key, @Nullable String value) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
+		if (!(this.headers instanceof HttpFields.Mutable mutableHttpFields)) {
 			throw new IllegalStateException("Immutable headers");
 		}
-		((HttpFields.Mutable) this.headers).put(key, value);
+		mutableHttpFields.put(key, value);
 	}
 
 	@Override
@@ -112,13 +113,13 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.headers.contains((String) key));
+		return (key instanceof String headerName && this.headers.contains(headerName));
 	}
 
 	@Override
 	public boolean containsValue(Object value) {
-		return (value instanceof String &&
-				this.headers.stream().anyMatch(field -> field.contains((String) value)));
+		return (value instanceof String searchString &&
+				this.headers.stream().anyMatch(field -> field.contains(searchString)));
 	}
 
 	@Nullable
@@ -133,23 +134,23 @@ public List<String> get(Object key) {
 	@Nullable
 	@Override
 	public List<String> put(String key, List<String> value) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
+		if (!(this.headers instanceof HttpFields.Mutable mutableHttpFields)) {
 			throw new IllegalStateException("Immutable headers");
 		}
 		List<String> oldValues = get(key);
-		((HttpFields.Mutable) this.headers).put(key, value);
+		mutableHttpFields.put(key, value);
 		return oldValues;
 	}
 
 	@Nullable
 	@Override
 	public List<String> remove(Object key) {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
+		if (!(this.headers instanceof HttpFields.Mutable mutableHttpFields)) {
 			throw new IllegalStateException("Immutable headers");
 		}
-		if (key instanceof String) {
+		if (key instanceof String name) {
 			List<String> oldValues = get(key);
-			((HttpFields.Mutable) this.headers).remove((String) key);
+			mutableHttpFields.remove(name);
 			return oldValues;
 		}
 		return null;
@@ -162,10 +163,10 @@ public void putAll(Map<? extends String, ? extends List<String>> map) {
 
 	@Override
 	public void clear() {
-		if (!(this.headers instanceof HttpFields.Mutable)) {
+		if (!(this.headers instanceof HttpFields.Mutable mutableHttpFields)) {
 			throw new IllegalStateException("Immutable headers");
 		}
-		((HttpFields.Mutable) this.headers).clear();
+		mutableHttpFields.clear();
 	}
 
 	@Override
@@ -181,7 +182,7 @@ public Collection<List<String>> values() {
 
 	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
-		return new AbstractSet<Entry<String, List<String>>>() {
+		return new AbstractSet<>() {
 			@Override
 			public Iterator<Entry<String, List<String>>> iterator() {
 				return new EntryIterator();
@@ -237,11 +238,11 @@ public List<String> getValue() {
 
 		@Override
 		public List<String> setValue(List<String> value) {
-			if (!(headers instanceof HttpFields.Mutable)) {
+			if (!(headers instanceof HttpFields.Mutable mutableHttpFields)) {
 				throw new IllegalStateException("Immutable headers");
 			}
 			List<String> previousValues = headers.getValuesList(this.key);
-			((HttpFields.Mutable) headers).put(this.key, value);
+			mutableHttpFields.put(this.key, value);
 			return previousValues;
 		}
 	}
@@ -285,7 +286,7 @@ public String next() {
 
 		@Override
 		public void remove() {
-			if (!(headers instanceof HttpFields.Mutable)) {
+			if (!(headers instanceof HttpFields.Mutable mutableHttpFields)) {
 				throw new IllegalStateException("Immutable headers");
 			}
 			if (this.currentName == null) {
@@ -294,7 +295,7 @@ public void remove() {
 			if (!headers.contains(this.currentName)) {
 				throw new IllegalStateException("Header not present: " + this.currentName);
 			}
-			((HttpFields.Mutable) headers).remove(this.currentName);
+			mutableHttpFields.remove(this.currentName);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java
index 382203b34b99..b35fa91ed902 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java
@@ -36,6 +36,7 @@
  * <p>There is a duplicate of this class in the server package!
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 5.3
  */
 class NettyHeadersAdapter implements MultiValueMap<String, String> {
@@ -107,7 +108,7 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.headers.contains((String) key));
+		return (key instanceof String headerName && this.headers.contains(headerName));
 	}
 
 	@Override
@@ -137,9 +138,9 @@ public List<String> put(String key, @Nullable List<String> value) {
 	@Nullable
 	@Override
 	public List<String> remove(Object key) {
-		if (key instanceof String) {
-			List<String> previousValues = this.headers.getAll((String) key);
-			this.headers.remove((String) key);
+		if (key instanceof String headerName) {
+			List<String> previousValues = this.headers.getAll(headerName);
+			this.headers.remove(headerName);
 			return previousValues;
 		}
 		return null;
@@ -168,7 +169,7 @@ public Collection<List<String>> values() {
 
 	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
-		return new AbstractSet<Entry<String, List<String>>>() {
+		return new AbstractSet<>() {
 			@Override
 			public Iterator<Entry<String, List<String>>> iterator() {
 				return new EntryIterator();
@@ -190,7 +191,7 @@ public String toString() {
 
 	private class EntryIterator implements Iterator<Entry<String, List<String>>> {
 
-		private Iterator<String> names = headers.names().iterator();
+		private final Iterator<String> names = headers.names().iterator();
 
 		@Override
 		public boolean hasNext() {
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
index 26903c4481aa..5139d9e3ae90 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
@@ -105,8 +105,8 @@ public String getId() {
 		if (reactorNettyRequestChannelOperationsIdPresent) {
 			id = ChannelOperationsIdHelper.getId(this.response);
 		}
-		if (id == null && this.response instanceof Connection) {
-			id = ((Connection) this.response).channel().id().asShortText();
+		if (id == null && this.response instanceof Connection connection) {
+			id = connection.channel().id().asShortText();
 		}
 		return (id != null ? id : ObjectUtils.getIdentityHexString(this));
 	}
@@ -163,8 +163,7 @@ public MultiValueMap<String, ResponseCookie> getCookies() {
 
 	@Nullable
 	private static String getSameSite(Cookie cookie) {
-		if (cookie instanceof DefaultCookie) {
-			DefaultCookie defaultCookie = (DefaultCookie) cookie;
+		if (cookie instanceof DefaultCookie defaultCookie) {
 			if (defaultCookie.sameSite() != null) {
 				return defaultCookie.sameSite().name();
 			}
@@ -206,10 +205,8 @@ private static class ChannelOperationsIdHelper {
 
 		@Nullable
 		public static String getId(HttpClientResponse response) {
-			if (response instanceof reactor.netty.ChannelOperationsId) {
-				return (logger.isDebugEnabled() ?
-						((reactor.netty.ChannelOperationsId) response).asLongText() :
-						((reactor.netty.ChannelOperationsId) response).asShortText());
+			if (response instanceof reactor.netty.ChannelOperationsId id) {
+				return (logger.isDebugEnabled() ? id.asLongText() : id.asShortText());
 			}
 			return null;
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
index 89644fecff9d..0eeaf5832e18 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
@@ -202,11 +202,10 @@ public DataBuffer encodeValue(Object value, DataBufferFactory bufferFactory,
 		}
 		Class<?> jsonView = null;
 		FilterProvider filters = null;
-		if (value instanceof MappingJacksonValue) {
-			MappingJacksonValue container = (MappingJacksonValue) value;
-			value = container.getValue();
-			jsonView = container.getSerializationView();
-			filters = container.getFilters();
+		if (value instanceof MappingJacksonValue mappingJacksonValue) {
+			value = mappingJacksonValue.getValue();
+			jsonView = mappingJacksonValue.getSerializationView();
+			filters = mappingJacksonValue.getFilters();
 		}
 		ObjectWriter writer = createObjectWriter(mapper, valueType, mimeType, jsonView, hints);
 		if (filters != null) {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java
index 3b34625e5a24..ce3eadc42bb8 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ protected boolean supports(Class<?> clazz) {
 
 	@Override
 	public boolean canRead(Type type, @Nullable Class<?> contextClass, @Nullable MediaType mediaType) {
-		return (type instanceof Class ? canRead((Class<?>) type, mediaType) : canRead(mediaType));
+		return (type instanceof Class<?> clazz ? canRead(clazz, mediaType) : canRead(mediaType));
 	}
 
 	@Override
@@ -87,8 +87,7 @@ public final void write(final T t, @Nullable final Type type, @Nullable MediaTyp
 		final HttpHeaders headers = outputMessage.getHeaders();
 		addDefaultHeaders(headers, t, contentType);
 
-		if (outputMessage instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) outputMessage;
+		if (outputMessage instanceof StreamingHttpOutputMessage streamingOutputMessage) {
 			streamingOutputMessage.setBody(outputStream -> writeInternal(t, type, new HttpOutputMessage() {
 				@Override
 				public OutputStream getBody() {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
index cf0674e06a1a..644be4f36e3b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -210,8 +210,7 @@ public final void write(final T t, @Nullable MediaType contentType, HttpOutputMe
 		final HttpHeaders headers = outputMessage.getHeaders();
 		addDefaultHeaders(headers, t, contentType);
 
-		if (outputMessage instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) outputMessage;
+		if (outputMessage instanceof StreamingHttpOutputMessage streamingOutputMessage) {
 			streamingOutputMessage.setBody(outputStream -> writeInternal(t, new HttpOutputMessage() {
 				@Override
 				public OutputStream getBody() {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
index cdfa5781c99d..c1cf744b808a 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -221,8 +221,7 @@ public void write(final BufferedImage image, @Nullable final MediaType contentTy
 		final MediaType selectedContentType = getContentType(contentType);
 		outputMessage.getHeaders().setContentType(selectedContentType);
 
-		if (outputMessage instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) outputMessage;
+		if (outputMessage instanceof StreamingHttpOutputMessage streamingOutputMessage) {
 			streamingOutputMessage.setBody(outputStream -> writeInternal(image, selectedContentType, outputStream));
 		}
 		else {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index c113194183e6..680da1ae2a10 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -274,8 +274,7 @@ public void setCharset(@Nullable Charset charset) {
 	 */
 	private void applyDefaultCharset() {
 		for (HttpMessageConverter<?> candidate : this.partConverters) {
-			if (candidate instanceof AbstractHttpMessageConverter) {
-				AbstractHttpMessageConverter<?> converter = (AbstractHttpMessageConverter<?>) candidate;
+			if (candidate instanceof AbstractHttpMessageConverter<?> converter) {
 				// Only override default charset if the converter operates with a charset to begin with...
 				if (converter.getDefaultCharset() != null) {
 					converter.setDefaultCharset(this.charset);
@@ -400,8 +399,7 @@ private void writeForm(MultiValueMap<String, Object> formData, @Nullable MediaTy
 		byte[] bytes = serializeForm(formData, charset).getBytes(charset);
 		outputMessage.getHeaders().setContentLength(bytes.length);
 
-		if (outputMessage instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) outputMessage;
+		if (outputMessage instanceof StreamingHttpOutputMessage streamingOutputMessage) {
 			streamingOutputMessage.setBody(outputStream -> StreamUtils.copy(bytes, outputStream));
 		}
 		else {
@@ -486,8 +484,7 @@ private void writeMultipart(
 		contentType = new MediaType(contentType, parameters);
 		outputMessage.getHeaders().setContentType(contentType);
 
-		if (outputMessage instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingOutputMessage = (StreamingHttpOutputMessage) outputMessage;
+		if (outputMessage instanceof StreamingHttpOutputMessage streamingOutputMessage) {
 			streamingOutputMessage.setBody(outputStream -> {
 				writeParts(outputStream, parts, boundary);
 				writeEnd(outputStream, boundary);
@@ -562,7 +559,7 @@ protected byte[] generateMultipartBoundary() {
 	 * or a newly built {@link HttpEntity} wrapper for that part
 	 */
 	protected HttpEntity<?> getHttpEntity(Object part) {
-		return (part instanceof HttpEntity ? (HttpEntity<?>) part : new HttpEntity<>(part));
+		return (part instanceof HttpEntity<?> httpEntity ? httpEntity : new HttpEntity<>(part));
 	}
 
 	/**
@@ -575,8 +572,7 @@ protected HttpEntity<?> getHttpEntity(Object part) {
 	 */
 	@Nullable
 	protected String getFilename(Object part) {
-		if (part instanceof Resource) {
-			Resource resource = (Resource) part;
+		if (part instanceof Resource resource) {
 			String filename = resource.getFilename();
 			if (filename != null && this.multipartCharset != null) {
 				filename = MimeDelegate.encode(filename, this.multipartCharset.name());
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
index b9dca7220413..08e0a55bded7 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,11 +37,12 @@
 import org.springframework.util.StreamUtils;
 
 /**
- * Implementation of {@link HttpMessageConverter} that can write a single {@link ResourceRegion},
- * or Collections of {@link ResourceRegion ResourceRegions}.
+ * Implementation of {@link HttpMessageConverter} that can write a single
+ * {@link ResourceRegion} or Collections of {@link ResourceRegion ResourceRegions}.
  *
  * @author Brian Clozel
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 4.3
  */
 public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessageConverter<Object> {
@@ -55,8 +56,8 @@ public ResourceRegionHttpMessageConverter() {
 	@SuppressWarnings("unchecked")
 	protected MediaType getDefaultContentType(Object object) {
 		Resource resource = null;
-		if (object instanceof ResourceRegion) {
-			resource = ((ResourceRegion) object).getResource();
+		if (object instanceof ResourceRegion resourceRegion) {
+			resource = resourceRegion.getResource();
 		}
 		else {
 			Collection<ResourceRegion> regions = (Collection<ResourceRegion>) object;
@@ -98,15 +99,12 @@ public boolean canWrite(Class<?> clazz, @Nullable MediaType mediaType) {
 
 	@Override
 	public boolean canWrite(@Nullable Type type, @Nullable Class<?> clazz, @Nullable MediaType mediaType) {
-		if (!(type instanceof ParameterizedType)) {
-			return (type instanceof Class && ResourceRegion.class.isAssignableFrom((Class<?>) type));
+		if (!(type instanceof ParameterizedType parameterizedType)) {
+			return (type instanceof Class<?> c && ResourceRegion.class.isAssignableFrom(c));
 		}
-
-		ParameterizedType parameterizedType = (ParameterizedType) type;
-		if (!(parameterizedType.getRawType() instanceof Class)) {
+		if (!(parameterizedType.getRawType() instanceof Class<?> rawType)) {
 			return false;
 		}
-		Class<?> rawType = (Class<?>) parameterizedType.getRawType();
 		if (!(Collection.class.isAssignableFrom(rawType))) {
 			return false;
 		}
@@ -114,11 +112,9 @@ public boolean canWrite(@Nullable Type type, @Nullable Class<?> clazz, @Nullable
 			return false;
 		}
 		Type typeArgument = parameterizedType.getActualTypeArguments()[0];
-		if (!(typeArgument instanceof Class)) {
+		if (!(typeArgument instanceof Class<?> typeArgumentClass)) {
 			return false;
 		}
-
-		Class<?> typeArgumentClass = (Class<?>) typeArgument;
 		return ResourceRegion.class.isAssignableFrom(typeArgumentClass);
 	}
 
@@ -127,8 +123,8 @@ public boolean canWrite(@Nullable Type type, @Nullable Class<?> clazz, @Nullable
 	protected void writeInternal(Object object, @Nullable Type type, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
 
-		if (object instanceof ResourceRegion) {
-			writeResourceRegion((ResourceRegion) object, outputMessage);
+		if (object instanceof ResourceRegion resourceRegion) {
+			writeResourceRegion(resourceRegion, outputMessage);
 		}
 		else {
 			Collection<ResourceRegion> regions = (Collection<ResourceRegion>) object;
@@ -136,7 +132,7 @@ protected void writeInternal(Object object, @Nullable Type type, HttpOutputMessa
 				writeResourceRegion(regions.iterator().next(), outputMessage);
 			}
 			else {
-				writeResourceRegionCollection((Collection<ResourceRegion>) object, outputMessage);
+				writeResourceRegionCollection(regions, outputMessage);
 			}
 		}
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
index 19b22fef2c81..3a547e62c59d 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
@@ -74,6 +74,7 @@
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
  * @author Sebastien Deleuze
+ * @author Sam Brannen
  * @since 4.1
  * @see MappingJackson2HttpMessageConverter
  */
@@ -107,7 +108,7 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
 	private Boolean prettyPrint;
 
 	@Nullable
-	private PrettyPrinter ssePrettyPrinter;
+	private final PrettyPrinter ssePrettyPrinter;
 
 
 	protected AbstractJackson2HttpMessageConverter(ObjectMapper objectMapper) {
@@ -361,8 +362,8 @@ private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) th
 				"UTF-16".equals(charset.name()) ||
 				"UTF-32".equals(charset.name());
 		try {
-			if (inputMessage instanceof MappingJacksonInputMessage) {
-				Class<?> deserializationView = ((MappingJacksonInputMessage) inputMessage).getDeserializationView();
+			if (inputMessage instanceof MappingJacksonInputMessage mappingJacksonInputMessage) {
+				Class<?> deserializationView = mappingJacksonInputMessage.getDeserializationView();
 				if (deserializationView != null) {
 					ObjectReader objectReader = objectMapper.readerWithView(deserializationView).forType(javaType);
 					if (isUnicode) {
@@ -414,8 +415,8 @@ protected void writeInternal(Object object, @Nullable Type type, HttpOutputMessa
 		MediaType contentType = outputMessage.getHeaders().getContentType();
 		JsonEncoding encoding = getJsonEncoding(contentType);
 
-		Class<?> clazz = (object instanceof MappingJacksonValue ?
-				((MappingJacksonValue) object).getValue().getClass() : object.getClass());
+		Class<?> clazz = (object instanceof MappingJacksonValue mappingJacksonValue ?
+				mappingJacksonValue.getValue().getClass() : object.getClass());
 		ObjectMapper objectMapper = selectObjectMapper(clazz, contentType);
 		Assert.state(objectMapper != null, "No ObjectMapper for " + clazz.getName());
 
@@ -428,11 +429,10 @@ protected void writeInternal(Object object, @Nullable Type type, HttpOutputMessa
 			FilterProvider filters = null;
 			JavaType javaType = null;
 
-			if (object instanceof MappingJacksonValue) {
-				MappingJacksonValue container = (MappingJacksonValue) object;
-				value = container.getValue();
-				serializationView = container.getSerializationView();
-				filters = container.getFilters();
+			if (object instanceof MappingJacksonValue mappingJacksonValue) {
+				value = mappingJacksonValue.getValue();
+				serializationView = mappingJacksonValue.getSerializationView();
+				filters = mappingJacksonValue.getFilters();
 			}
 			if (type != null && TypeUtils.isAssignable(type, value.getClass())) {
 				javaType = getJavaType(type, null);
@@ -510,16 +510,16 @@ protected JsonEncoding getJsonEncoding(@Nullable MediaType contentType) {
 	@Override
 	@Nullable
 	protected MediaType getDefaultContentType(Object object) throws IOException {
-		if (object instanceof MappingJacksonValue) {
-			object = ((MappingJacksonValue) object).getValue();
+		if (object instanceof MappingJacksonValue mappingJacksonValue) {
+			object = mappingJacksonValue.getValue();
 		}
 		return super.getDefaultContentType(object);
 	}
 
 	@Override
 	protected Long getContentLength(Object object, @Nullable MediaType contentType) throws IOException {
-		if (object instanceof MappingJacksonValue) {
-			object = ((MappingJacksonValue) object).getValue();
+		if (object instanceof MappingJacksonValue mappingJacksonValue) {
+			object = mappingJacksonValue.getValue();
 		}
 		return super.getContentLength(object, contentType);
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
index c2e3bfdc10ad..e1acb3a833b1 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 3.2
  * @param <T> the converted object type
  */
@@ -86,14 +87,12 @@ public boolean canRead(Class<?> clazz, @Nullable MediaType mediaType) {
 	 */
 	@Override
 	public boolean canRead(Type type, @Nullable Class<?> contextClass, @Nullable MediaType mediaType) {
-		if (!(type instanceof ParameterizedType)) {
+		if (!(type instanceof ParameterizedType parameterizedType)) {
 			return false;
 		}
-		ParameterizedType parameterizedType = (ParameterizedType) type;
-		if (!(parameterizedType.getRawType() instanceof Class)) {
+		if (!(parameterizedType.getRawType() instanceof Class<?> rawType)) {
 			return false;
 		}
-		Class<?> rawType = (Class<?>) parameterizedType.getRawType();
 		if (!(Collection.class.isAssignableFrom(rawType))) {
 			return false;
 		}
@@ -101,10 +100,9 @@ public boolean canRead(Type type, @Nullable Class<?> contextClass, @Nullable Med
 			return false;
 		}
 		Type typeArgument = parameterizedType.getActualTypeArguments()[0];
-		if (!(typeArgument instanceof Class)) {
+		if (!(typeArgument instanceof Class<?> typeArgumentClass)) {
 			return false;
 		}
-		Class<?> typeArgumentClass = (Class<?>) typeArgument;
 		return (typeArgumentClass.isAnnotationPresent(XmlRootElement.class) ||
 				typeArgumentClass.isAnnotationPresent(XmlType.class)) && canRead(mediaType);
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
index c41fb18b8545..a1acfda553e3 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
@@ -151,8 +151,7 @@ protected Object readFromSource(Class<?> clazz, HttpHeaders headers, Source sour
 
 	@SuppressWarnings("deprecation")
 	protected Source processSource(Source source) {
-		if (source instanceof StreamSource) {
-			StreamSource streamSource = (StreamSource) source;
+		if (source instanceof StreamSource streamSource) {
 			InputSource inputSource = new InputSource(streamSource.getInputStream());
 			try {
 				XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
index 0a0d1b4fa39a..7833b92bbb1d 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public class ServletServerHttpAsyncRequestControl implements ServerHttpAsyncRequ
 	@Nullable
 	private AsyncContext asyncContext;
 
-	private AtomicBoolean asyncCompleted = new AtomicBoolean();
+	private final AtomicBoolean asyncCompleted = new AtomicBoolean();
 
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index f7b3e9e99f0d..7bac4b70a94e 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -216,11 +216,10 @@ public InputStream getBody() throws IOException {
 	@Override
 	public ServerHttpAsyncRequestControl getAsyncRequestControl(ServerHttpResponse response) {
 		if (this.asyncRequestControl == null) {
-			if (!(response instanceof ServletServerHttpResponse)) {
+			if (!(response instanceof ServletServerHttpResponse servletServerResponse)) {
 				throw new IllegalArgumentException(
 						"Response must be a ServletServerHttpResponse: " + response.getClass());
 			}
-			ServletServerHttpResponse servletServerResponse = (ServletServerHttpResponse) response;
 			this.asyncRequestControl = new ServletServerHttpAsyncRequestControl(this, servletServerResponse);
 		}
 		return this.asyncRequestControl;
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java b/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
index d4398d76091b..956808e57ae1 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
@@ -45,7 +45,7 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
 
 	private URI uri;
 
-	private HttpHeaders headers;
+	private final HttpHeaders headers;
 
 	private String httpMethodValue;
 
@@ -61,7 +61,7 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
 	@Nullable
 	private InetSocketAddress remoteAddress;
 
-	private Flux<DataBuffer> body;
+	private final Flux<DataBuffer> body;
 
 	private final ServerHttpRequest originalRequest;
 
@@ -182,7 +182,7 @@ private static class MutatedServerHttpRequest extends AbstractServerHttpRequest
 		private final SslInfo sslInfo;
 
 		@Nullable
-		private InetSocketAddress remoteAddress;
+		private final InetSocketAddress remoteAddress;
 
 		private final Flux<DataBuffer> body;
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
index 8c1615e6d281..2862ce8e7a2f 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
@@ -89,11 +89,10 @@ private static MultiValueMap<String, String> createHeaders(HttpServletRequest se
 		}
 
 		private static Request getRequest(HttpServletRequest request) {
-			if (request instanceof Request) {
-				return (Request) request;
+			if (request instanceof Request jettyRequest) {
+				return jettyRequest;
 			}
-			else if (request instanceof HttpServletRequestWrapper) {
-				HttpServletRequestWrapper wrapper = (HttpServletRequestWrapper) request;
+			else if (request instanceof HttpServletRequestWrapper wrapper) {
 				HttpServletRequest wrappedRequest = (HttpServletRequest) wrapper.getRequest();
 				return getRequest(wrappedRequest);
 			}
@@ -121,11 +120,10 @@ private static HttpHeaders createHeaders(HttpServletResponse servletResponse) {
 		}
 
 		private static Response getResponse(HttpServletResponse response) {
-			if (response instanceof Response) {
-				return (Response) response;
+			if (response instanceof Response jettyResponse) {
+				return jettyResponse;
 			}
-			else if (response instanceof HttpServletResponseWrapper) {
-				HttpServletResponseWrapper wrapper = (HttpServletResponseWrapper) response;
+			else if (response instanceof HttpServletResponseWrapper wrapper) {
 				HttpServletResponse wrappedResponse = (HttpServletResponse) wrapper.getResponse();
 				return getResponse(wrappedResponse);
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java
index 08ae3207f91b..fdbdcacf5147 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java
@@ -107,7 +107,7 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.headers.contains((String) key));
+		return (key instanceof String headerName && this.headers.contains(headerName));
 	}
 
 	@Override
@@ -137,9 +137,9 @@ public List<String> put(String key, @Nullable List<String> value) {
 	@Nullable
 	@Override
 	public List<String> remove(Object key) {
-		if (key instanceof String) {
-			List<String> previousValues = this.headers.getAll((String) key);
-			this.headers.remove((String) key);
+		if (key instanceof String headerName) {
+			List<String> previousValues = this.headers.getAll(headerName);
+			this.headers.remove(headerName);
 			return previousValues;
 		}
 		return null;
@@ -168,7 +168,7 @@ public Collection<List<String>> values() {
 
 	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
-		return new AbstractSet<Entry<String, List<String>>>() {
+		return new AbstractSet<>() {
 			@Override
 			public Iterator<Entry<String, List<String>>> iterator() {
 				return new EntryIterator();
@@ -190,7 +190,7 @@ public String toString() {
 
 	private class EntryIterator implements Iterator<Entry<String, List<String>>> {
 
-		private Iterator<String> names = headers.names().iterator();
+		private final Iterator<String> names = headers.names().iterator();
 
 		@Override
 		public boolean hasNext() {
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java
index 6bde8a98a3cc..baaf0788c473 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java
@@ -38,6 +38,7 @@
  * {@code MultiValueMap} implementation for wrapping Tomcat HTTP headers.
  *
  * @author Brian Clozel
+ * @author Sam Brannen
  * @since 5.1.1
  */
 class TomcatHeadersAdapter implements MultiValueMap<String, String> {
@@ -105,19 +106,19 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		if (key instanceof String) {
-			return (this.headers.findHeader((String) key, 0) != -1);
+		if (key instanceof String headerName) {
+			return (this.headers.findHeader(headerName, 0) != -1);
 		}
 		return false;
 	}
 
 	@Override
 	public boolean containsValue(Object value) {
-		if (value instanceof String) {
-			MessageBytes needle = MessageBytes.newInstance();
-			needle.setString((String) value);
+		if (value instanceof String text) {
+			MessageBytes messageBytes = MessageBytes.newInstance();
+			messageBytes.setString(text);
 			for (int i = 0; i < this.headers.size(); i++) {
-				if (this.headers.getValue(i).equals(needle)) {
+				if (this.headers.getValue(i).equals(messageBytes)) {
 					return true;
 				}
 			}
@@ -146,9 +147,9 @@ public List<String> put(String key, List<String> value) {
 	@Override
 	@Nullable
 	public List<String> remove(Object key) {
-		if (key instanceof String) {
+		if (key instanceof String headerName) {
 			List<String> previousValues = get(key);
-			this.headers.removeHeader((String) key);
+			this.headers.removeHeader(headerName);
 			return previousValues;
 		}
 		return null;
@@ -176,7 +177,7 @@ public Collection<List<String>> values() {
 
 	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
-		return new AbstractSet<Entry<String, List<String>>>() {
+		return new AbstractSet<>() {
 			@Override
 			public Iterator<Entry<String, List<String>>> iterator() {
 				return new EntryIterator();
@@ -198,7 +199,7 @@ public String toString() {
 
 	private class EntryIterator implements Iterator<Entry<String, List<String>>> {
 
-		private Enumeration<String> names = headers.names();
+		private final Enumeration<String> names = headers.names();
 
 		@Override
 		public boolean hasNext() {
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
index f9a8e7277c5c..b34723afa013 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@
  *
  * @author Violeta Georgieva
  * @author Brian Clozel
+ * @author Sam Brannen
  * @since 5.0
  * @see org.springframework.web.server.adapter.AbstractReactiveWebInitializer
  */
@@ -115,11 +116,10 @@ private static MultiValueMap<String, String> createTomcatHttpHeaders(HttpServlet
 		}
 
 		private static RequestFacade getRequestFacade(HttpServletRequest request) {
-			if (request instanceof RequestFacade) {
-				return (RequestFacade) request;
+			if (request instanceof RequestFacade facade) {
+				return facade;
 			}
-			else if (request instanceof HttpServletRequestWrapper) {
-				HttpServletRequestWrapper wrapper = (HttpServletRequestWrapper) request;
+			else if (request instanceof HttpServletRequestWrapper wrapper) {
 				HttpServletRequest wrappedRequest = (HttpServletRequest) wrapper.getRequest();
 				return getRequestFacade(wrappedRequest);
 			}
@@ -132,7 +132,7 @@ else if (request instanceof HttpServletRequestWrapper) {
 		@Override
 		protected DataBuffer readFromInputStream() throws IOException {
 			ServletInputStream inputStream = ((ServletRequest) getNativeRequest()).getInputStream();
-			if (!(inputStream instanceof CoyoteInputStream)) {
+			if (!(inputStream instanceof CoyoteInputStream coyoteInputStream)) {
 				// It's possible InputStream can be wrapped, preventing use of CoyoteInputStream
 				return super.readFromInputStream();
 			}
@@ -141,7 +141,7 @@ protected DataBuffer readFromInputStream() throws IOException {
 			DataBuffer dataBuffer = this.factory.allocateBuffer(capacity);
 			try {
 				ByteBuffer byteBuffer = dataBuffer.asByteBuffer(0, capacity);
-				int read = ((CoyoteInputStream) inputStream).read(byteBuffer);
+				int read = coyoteInputStream.read(byteBuffer);
 				logBytesRead(read);
 				if (read > 0) {
 					dataBuffer.writePosition(read);
@@ -192,11 +192,10 @@ private static HttpHeaders createTomcatHttpHeaders(HttpServletResponse response)
 		}
 
 		private static ResponseFacade getResponseFacade(HttpServletResponse response) {
-			if (response instanceof ResponseFacade) {
-				return (ResponseFacade) response;
+			if (response instanceof ResponseFacade facade) {
+				return facade;
 			}
-			else if (response instanceof HttpServletResponseWrapper) {
-				HttpServletResponseWrapper wrapper = (HttpServletResponseWrapper) response;
+			else if (response instanceof HttpServletResponseWrapper wrapper) {
 				HttpServletResponse wrappedResponse = (HttpServletResponse) wrapper.getResponse();
 				return getResponseFacade(wrappedResponse);
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java
index fa197aa0c208..9e249031872b 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java
@@ -17,6 +17,7 @@
 package org.springframework.http.server.reactive;
 
 import java.util.AbstractSet;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -36,6 +37,7 @@
  * {@code MultiValueMap} implementation for wrapping Undertow HTTP headers.
  *
  * @author Brian Clozel
+ * @author Sam Brannen
  * @since 5.1.1
  */
 class UndertowHeadersAdapter implements MultiValueMap<String, String> {
@@ -99,7 +101,7 @@ public boolean isEmpty() {
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.headers.contains((String) key));
+		return (key instanceof String headerName && this.headers.contains(headerName));
 	}
 
 	@Override
@@ -113,10 +115,7 @@ public boolean containsValue(Object value) {
 	@Override
 	@Nullable
 	public List<String> get(Object key) {
-		if (key instanceof String) {
-			return this.headers.get((String) key);
-		}
-		return null;
+		return (key instanceof String headerName ? this.headers.get(headerName) : null);
 	}
 
 	@Override
@@ -130,8 +129,11 @@ public List<String> put(String key, List<String> value) {
 	@Override
 	@Nullable
 	public List<String> remove(Object key) {
-		if (key instanceof String) {
-			this.headers.remove((String) key);
+		if (key instanceof String headerName) {
+			Collection<String> removed = this.headers.remove(headerName);
+			if (removed != null) {
+				return new ArrayList<>(removed);
+			}
 		}
 		return null;
 	}
@@ -161,7 +163,7 @@ public Collection<List<String>> values() {
 
 	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
-		return new AbstractSet<Entry<String, List<String>>>() {
+		return new AbstractSet<>() {
 			@Override
 			public Iterator<Entry<String, List<String>>> iterator() {
 				return new EntryIterator();
@@ -183,7 +185,7 @@ public String toString() {
 
 	private class EntryIterator implements Iterator<Entry<String, List<String>>> {
 
-		private Iterator<HttpString> names = headers.getHeaderNames().iterator();
+		private final Iterator<HttpString> names = headers.getHeaderNames().iterator();
 
 		@Override
 		public boolean hasNext() {
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
index 4d87fa5f38e1..6de7dfb39996 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
@@ -175,7 +175,7 @@ protected void readingPaused() {
 		@Nullable
 		protected DataBuffer read() throws IOException {
 			PooledByteBuffer pooledByteBuffer = this.byteBufferPool.allocate();
-			try {
+			try (pooledByteBuffer) {
 				ByteBuffer byteBuffer = pooledByteBuffer.getBuffer();
 				int read = this.channel.read(byteBuffer);
 
@@ -194,9 +194,6 @@ else if (read == -1) {
 				}
 				return null;
 			}
-			finally {
-				pooledByteBuffer.close();
-			}
 		}
 
 		@Override
diff --git a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
index a7c2358dd5e9..a9fcb4d8dc90 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ public class ContentNegotiationManagerFactoryBean
 
 	private boolean favorPathExtension = false;
 
-	private Map<String, MediaType> mediaTypes = new HashMap<>();
+	private final Map<String, MediaType> mediaTypes = new HashMap<>();
 
 	private boolean ignoreUnknownPathExtensions = true;
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
index a2cb47e4787a..eb1166f9adea 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -204,7 +204,7 @@ public FieldError getFieldError(String field) {
 	@Nullable
 	public Object getFieldValue(String field) {
 		Object value = this.source.getFieldValue(field);
-		return (value instanceof String ? HtmlUtils.htmlEscape((String) value) : value);
+		return (value instanceof String text ? HtmlUtils.htmlEscape(text) : value);
 	}
 
 	@Override
@@ -223,11 +223,10 @@ private <T extends ObjectError> T escapeObjectError(@Nullable T source) {
 		if (defaultMessage != null) {
 			defaultMessage = HtmlUtils.htmlEscape(defaultMessage);
 		}
-		if (source instanceof FieldError) {
-			FieldError fieldError = (FieldError) source;
+		if (source instanceof FieldError fieldError) {
 			Object value = fieldError.getRejectedValue();
-			if (value instanceof String) {
-				value = HtmlUtils.htmlEscape((String) value);
+			if (value instanceof String text) {
+				value = HtmlUtils.htmlEscape(text);
 			}
 			return (T) new FieldError(
 					fieldError.getObjectName(), fieldError.getField(), value, fieldError.isBindingFailure(),
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
index 23e747a17c88..7be21a3db4ad 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
@@ -109,8 +109,7 @@ public WebRequestDataBinder(@Nullable Object target, String objectName) {
 	 */
 	public void bind(WebRequest request) {
 		MutablePropertyValues mpvs = new MutablePropertyValues(request.getParameterMap());
-		if (request instanceof NativeWebRequest) {
-			NativeWebRequest nativeRequest = (NativeWebRequest) request;
+		if (request instanceof NativeWebRequest nativeRequest) {
 			MultipartRequest multipartRequest = nativeRequest.getNativeRequest(MultipartRequest.class);
 			if (multipartRequest != null) {
 				bindMultipart(multipartRequest.getMultiFileMap(), mpvs);
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
index 722fb7a17000..45a4bb69a928 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -277,19 +277,16 @@ public WebApplicationContext initWebApplicationContext(ServletContext servletCon
 			if (this.context == null) {
 				this.context = createWebApplicationContext(servletContext);
 			}
-			if (this.context instanceof ConfigurableWebApplicationContext) {
-				ConfigurableWebApplicationContext cwac = (ConfigurableWebApplicationContext) this.context;
-				if (!cwac.isActive()) {
-					// The context has not yet been refreshed -> provide services such as
-					// setting the parent context, setting the application context id, etc
-					if (cwac.getParent() == null) {
-						// The context instance was injected without an explicit parent ->
-						// determine parent for root web application context, if any.
-						ApplicationContext parent = loadParentContext(servletContext);
-						cwac.setParent(parent);
-					}
-					configureAndRefreshWebApplicationContext(cwac, servletContext);
+			if (this.context instanceof ConfigurableWebApplicationContext cwac && !cwac.isActive()) {
+				// The context has not yet been refreshed -> provide services such as
+				// setting the parent context, setting the application context id, etc
+				if (cwac.getParent() == null) {
+					// The context instance was injected without an explicit parent ->
+					// determine parent for root web application context, if any.
+					ApplicationContext parent = loadParentContext(servletContext);
+					cwac.setParent(parent);
 				}
+				configureAndRefreshWebApplicationContext(cwac, servletContext);
 			}
 			servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.context);
 
@@ -392,8 +389,8 @@ protected void configureAndRefreshWebApplicationContext(ConfigurableWebApplicati
 		// is refreshed; do it eagerly here to ensure servlet property sources are in place for
 		// use in any post-processing or initialization that occurs below prior to #refresh
 		ConfigurableEnvironment env = wac.getEnvironment();
-		if (env instanceof ConfigurableWebEnvironment) {
-			((ConfigurableWebEnvironment) env).initPropertySources(sc, null);
+		if (env instanceof ConfigurableWebEnvironment cwe) {
+			cwe.initPropertySources(sc, null);
 		}
 
 		customizeContext(sc, wac);
@@ -512,8 +509,8 @@ protected ApplicationContext loadParentContext(ServletContext servletContext) {
 	public void closeWebApplicationContext(ServletContext servletContext) {
 		servletContext.log("Closing Spring root WebApplicationContext");
 		try {
-			if (this.context instanceof ConfigurableWebApplicationContext) {
-				((ConfigurableWebApplicationContext) this.context).close();
+			if (this.context instanceof ConfigurableWebApplicationContext cwac) {
+				cwac.close();
 			}
 		}
 		finally {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
index 18d29550bfd8..395166f84e92 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
 
 	private AsyncContext asyncContext;
 
-	private AtomicBoolean asyncCompleted = new AtomicBoolean();
+	private final AtomicBoolean asyncCompleted = new AtomicBoolean();
 
 	private final List<Runnable> timeoutHandlers = new ArrayList<>();
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
index 30d32153ebb0..4ee3ec2367a0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ public class RequestHandledEvent extends ApplicationEvent {
 
 	/** Session id that applied to the request, if any. */
 	@Nullable
-	private String sessionId;
+	private final String sessionId;
 
 	/** Usually the UserPrincipal. */
 	@Nullable
-	private String userName;
+	private final String userName;
 
 	/** Request processing time. */
 	private final long processingTimeMillis;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
index 3942fa0deab7..bf498cda8587 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -241,10 +241,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ServletContextResource)) {
+		if (!(other instanceof ServletContextResource otherRes)) {
 			return false;
 		}
-		ServletContextResource otherRes = (ServletContextResource) other;
 		return (this.servletContext.equals(otherRes.servletContext) && this.path.equals(otherRes.path));
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
index c9bd0c447e9a..e452d222ecc9 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,8 +80,7 @@ public ServletContextResourcePatternResolver(ResourceLoader resourceLoader) {
 	protected Set<Resource> doFindPathMatchingFileResources(Resource rootDirResource, String subPattern)
 			throws IOException {
 
-		if (rootDirResource instanceof ServletContextResource) {
-			ServletContextResource scResource = (ServletContextResource) rootDirResource;
+		if (rootDirResource instanceof ServletContextResource scResource) {
 			ServletContext sc = scResource.getServletContext();
 			String fullPattern = scResource.getPath() + subPattern;
 			Set<Resource> result = new LinkedHashSet<>(8);
diff --git a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
index dff469446ad2..8a85966ed353 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -300,12 +300,9 @@ public void destroy() {
 	protected WebApplicationContext findWebApplicationContext() {
 		if (this.webApplicationContext != null) {
 			// The user has injected a context at construction time -> use it...
-			if (this.webApplicationContext instanceof ConfigurableApplicationContext) {
-				ConfigurableApplicationContext cac = (ConfigurableApplicationContext) this.webApplicationContext;
-				if (!cac.isActive()) {
-					// The context has not yet been refreshed -> do so before returning it...
-					cac.refresh();
-				}
+			if (this.webApplicationContext instanceof ConfigurableApplicationContext cac && !cac.isActive()) {
+				// The context has not yet been refreshed -> do so before returning it...
+				cac.refresh();
 			}
 			return this.webApplicationContext;
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java
index a66a2ba49eca..bad214fb5d59 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/FormContentFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,7 +126,7 @@ private boolean shouldParse(HttpServletRequest request) {
 
 	private static class FormContentRequestWrapper extends HttpServletRequestWrapper {
 
-		private MultiValueMap<String, String> formParams;
+		private final MultiValueMap<String, String> formParams;
 
 		public FormContentRequestWrapper(HttpServletRequest request, MultiValueMap<String, String> params) {
 			super(request);
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
index acb0c0fbfe23..66745fc0cb1d 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,7 +132,7 @@ private boolean isFormContentType(HttpServletRequest request) {
 
 	private static class HttpPutFormContentRequestWrapper extends HttpServletRequestWrapper {
 
-		private MultiValueMap<String, String> formParameters;
+		private final MultiValueMap<String, String> formParameters;
 
 		public HttpPutFormContentRequestWrapper(HttpServletRequest request, MultiValueMap<String, String> parameters) {
 			super(request);
diff --git a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
index 953bda7f8692..6f505363829f 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
@@ -64,6 +64,7 @@
  *
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 06.12.2003
  */
 public abstract class OncePerRequestFilter extends GenericFilterBean {
@@ -88,22 +89,18 @@ public abstract class OncePerRequestFilter extends GenericFilterBean {
 	public final void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
 			throws ServletException, IOException {
 
-		if (!(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse)) {
+		if (!((request instanceof HttpServletRequest httpRequest) && (response instanceof HttpServletResponse httpResponse))) {
 			throw new ServletException("OncePerRequestFilter just supports HTTP requests");
 		}
-		HttpServletRequest httpRequest = (HttpServletRequest) request;
-		HttpServletResponse httpResponse = (HttpServletResponse) response;
 
 		String alreadyFilteredAttributeName = getAlreadyFilteredAttributeName();
 		boolean hasAlreadyFilteredAttribute = request.getAttribute(alreadyFilteredAttributeName) != null;
 
 		if (skipDispatch(httpRequest) || shouldNotFilter(httpRequest)) {
-
 			// Proceed without invoking this filter...
 			filterChain.doFilter(request, response);
 		}
 		else if (hasAlreadyFilteredAttribute) {
-
 			if (DispatcherType.ERROR.equals(request.getDispatcherType())) {
 				doFilterNestedErrorDispatch(httpRequest, httpResponse, filterChain);
 				return;
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java b/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
index 98dd6cce8a61..f80280f2234c 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,10 +135,9 @@ protected final void callNextHandlerInChain(FacesContext facesContext, @Nullable
 
 		NavigationHandler decoratedNavigationHandler = getDecoratedNavigationHandler();
 
-		if (decoratedNavigationHandler instanceof DecoratingNavigationHandler) {
+		if (decoratedNavigationHandler instanceof DecoratingNavigationHandler decHandler) {
 			// DecoratingNavigationHandler specified through constructor argument:
 			// Call it with original NavigationHandler passed in.
-			DecoratingNavigationHandler decHandler = (DecoratingNavigationHandler) decoratedNavigationHandler;
 			decHandler.handleNavigation(facesContext, fromAction, outcome, originalNavigationHandler);
 		}
 		else if (decoratedNavigationHandler != null) {
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
index 86babdf0a48b..a991ed8a1c42 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,8 +70,7 @@ public class WebApplicationContextFacesELResolver extends ELResolver {
 	@Nullable
 	public Object getValue(ELContext elContext, @Nullable Object base, Object property) throws ELException {
 		if (base != null) {
-			if (base instanceof WebApplicationContext) {
-				WebApplicationContext wac = (WebApplicationContext) base;
+			if (base instanceof WebApplicationContext wac) {
 				String beanName = property.toString();
 				if (logger.isTraceEnabled()) {
 					logger.trace("Attempting to resolve property '" + beanName + "' in root WebApplicationContext");
@@ -108,8 +107,7 @@ public Object getValue(ELContext elContext, @Nullable Object base, Object proper
 	@Nullable
 	public Class<?> getType(ELContext elContext, @Nullable Object base, Object property) throws ELException {
 		if (base != null) {
-			if (base instanceof WebApplicationContext) {
-				WebApplicationContext wac = (WebApplicationContext) base;
+			if (base instanceof WebApplicationContext wac) {
 				String beanName = property.toString();
 				if (logger.isDebugEnabled()) {
 					logger.debug("Attempting to resolve property '" + beanName + "' in root WebApplicationContext");
diff --git a/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java b/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java
index b8e2436d5160..f9b353ac0c2a 100644
--- a/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java
+++ b/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -176,16 +176,15 @@ public int getOrder() {
 				resolvedBean = resolveBean();
 			}
 
-			if (resolvedBean instanceof Ordered) {
-				this.order = ((Ordered) resolvedBean).getOrder();
+			if (resolvedBean instanceof Ordered ordered) {
+				this.order = ordered.getOrder();
 			}
 			else {
-				if (beanName != null && this.beanFactory instanceof ConfigurableBeanFactory) {
-					ConfigurableBeanFactory cbf = (ConfigurableBeanFactory) this.beanFactory;
+				if (beanName != null && this.beanFactory instanceof ConfigurableBeanFactory cbf) {
 					try {
 						BeanDefinition bd = cbf.getMergedBeanDefinition(beanName);
-						if (bd instanceof RootBeanDefinition) {
-							Method factoryMethod = ((RootBeanDefinition) bd).getResolvedFactoryMethod();
+						if (bd instanceof RootBeanDefinition rbd) {
+							Method factoryMethod = rbd.getResolvedFactoryMethod();
 							if (factoryMethod != null) {
 								this.order = OrderUtils.getOrder(factoryMethod);
 							}
@@ -261,10 +260,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ControllerAdviceBean)) {
+		if (!(other instanceof ControllerAdviceBean otherAdvice)) {
 			return false;
 		}
-		ControllerAdviceBean otherAdvice = (ControllerAdviceBean) other;
 		return (this.beanOrName.equals(otherAdvice.beanOrName) && this.beanFactory == otherAdvice.beanFactory);
 	}
 
@@ -291,9 +289,9 @@ public String toString() {
 	 */
 	public static List<ControllerAdviceBean> findAnnotatedBeans(ApplicationContext context) {
 		ListableBeanFactory beanFactory = context;
-		if (context instanceof ConfigurableApplicationContext) {
+		if (context instanceof ConfigurableApplicationContext cac) {
 			// Use internal BeanFactory for potential downcast to ConfigurableBeanFactory above
-			beanFactory = ((ConfigurableApplicationContext) context).getBeanFactory();
+			beanFactory = cac.getBeanFactory();
 		}
 		List<ControllerAdviceBean> adviceBeans = new ArrayList<>();
 		for (String name : BeanFactoryUtils.beanNamesForTypeIncludingAncestors(beanFactory, Object.class)) {
diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
index 80d6e7999eb4..541592c3363e 100644
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -370,9 +370,8 @@ public HandlerMethod getResolvedFromHandlerMethod() {
 	 */
 	public HandlerMethod createWithResolvedBean() {
 		Object handler = this.bean;
-		if (this.bean instanceof String) {
+		if (this.bean instanceof String beanName) {
 			Assert.state(this.beanFactory != null, "Cannot resolve bean name without BeanFactory");
-			String beanName = (String) this.bean;
 			handler = this.beanFactory.getBean(beanName);
 		}
 		return new HandlerMethod(this, handler);
@@ -428,10 +427,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof HandlerMethod)) {
+		if (!(other instanceof HandlerMethod otherMethod)) {
 			return false;
 		}
-		HandlerMethod otherMethod = (HandlerMethod) other;
 		return (this.bean.equals(otherMethod.bean) && this.method.equals(otherMethod.method));
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java b/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
index 9c20b6f3bbd4..2e2ffaf8fb48 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
@@ -36,6 +36,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 4.0
  */
 public class CompositeUriComponentsContributor implements UriComponentsContributor {
@@ -104,13 +105,13 @@ public boolean hasContributors() {
 	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		for (Object contributor : this.contributors) {
-			if (contributor instanceof UriComponentsContributor) {
-				if (((UriComponentsContributor) contributor).supportsParameter(parameter)) {
+			if (contributor instanceof UriComponentsContributor ucc) {
+				if (ucc.supportsParameter(parameter)) {
 					return true;
 				}
 			}
-			else if (contributor instanceof HandlerMethodArgumentResolver) {
-				if (((HandlerMethodArgumentResolver) contributor).supportsParameter(parameter)) {
+			else if (contributor instanceof HandlerMethodArgumentResolver resolver) {
+				if (resolver.supportsParameter(parameter)) {
 					return false;
 				}
 			}
@@ -123,15 +124,14 @@ public void contributeMethodArgument(MethodParameter parameter, Object value,
 			UriComponentsBuilder builder, Map<String, Object> uriVariables, ConversionService conversionService) {
 
 		for (Object contributor : this.contributors) {
-			if (contributor instanceof UriComponentsContributor) {
-				UriComponentsContributor ucc = (UriComponentsContributor) contributor;
+			if (contributor instanceof UriComponentsContributor ucc) {
 				if (ucc.supportsParameter(parameter)) {
 					ucc.contributeMethodArgument(parameter, value, builder, uriVariables, conversionService);
 					break;
 				}
 			}
-			else if (contributor instanceof HandlerMethodArgumentResolver) {
-				if (((HandlerMethodArgumentResolver) contributor).supportsParameter(parameter)) {
+			else if (contributor instanceof HandlerMethodArgumentResolver resolver) {
+				if (resolver.supportsParameter(parameter)) {
 					break;
 				}
 			}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java b/spring-web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java
index b5439e55899a..71068c296042 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditor.java
@@ -33,8 +33,7 @@ public class ByteArrayMultipartFileEditor extends ByteArrayPropertyEditor {
 
 	@Override
 	public void setValue(@Nullable Object value) {
-		if (value instanceof MultipartFile) {
-			MultipartFile multipartFile = (MultipartFile) value;
+		if (value instanceof MultipartFile multipartFile) {
 			try {
 				super.setValue(multipartFile.getBytes());
 			}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
index 015663c274df..32bb903a9780 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,7 @@ public void setAsText(String text) {
 
 	@Override
 	public void setValue(Object value) {
-		if (value instanceof MultipartFile) {
-			MultipartFile multipartFile = (MultipartFile) value;
+		if (value instanceof MultipartFile multipartFile) {
 			try {
 				super.setValue(this.charsetName != null ?
 						new String(multipartFile.getBytes(), this.charsetName) :
diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java b/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java
index 93db78699c2c..6e18bec9bbeb 100644
--- a/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/server/adapter/AbstractReactiveWebInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
  * the {@link ServletHttpHandlerAdapter}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 5.0.2
  */
 public abstract class AbstractReactiveWebInitializer implements WebApplicationInitializer {
@@ -108,11 +109,8 @@ protected ApplicationContext createApplicationContext() {
 	 * Refresh the given application context, if necessary.
 	 */
 	protected void refreshApplicationContext(ApplicationContext context) {
-		if (context instanceof ConfigurableApplicationContext) {
-			ConfigurableApplicationContext cac = (ConfigurableApplicationContext) context;
-			if (!cac.isActive()) {
-				cac.refresh();
-			}
+		if (context instanceof ConfigurableApplicationContext cac && !cac.isActive()) {
+			cac.refresh();
 		}
 	}
 
@@ -124,10 +122,8 @@ protected void refreshApplicationContext(ApplicationContext context) {
 	 * closed when {@code servletContext} is destroyed
 	 */
 	protected void registerCloseListener(ServletContext servletContext, ApplicationContext applicationContext) {
-		if (applicationContext instanceof ConfigurableApplicationContext) {
-			ConfigurableApplicationContext cac = (ConfigurableApplicationContext) applicationContext;
-			ServletContextDestroyedListener listener = new ServletContextDestroyedListener(cac);
-			servletContext.addListener(listener);
+		if (applicationContext instanceof ConfigurableApplicationContext cac) {
+			servletContext.addListener(new ServletContextDestroyedListener(cac));
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
index a037452b6061..1d5c5843cc73 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
@@ -46,6 +46,7 @@
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
  * @author Phillip Webb
+ * @author Sam Brannen
  * @since 3.1.3
  * @see <a href="https://tools.ietf.org/html/rfc3986#section-1.2.3">Hierarchical URIs</a>
  */
@@ -552,10 +553,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof HierarchicalUriComponents)) {
+		if (!(other instanceof HierarchicalUriComponents otherComp)) {
 			return false;
 		}
-		HierarchicalUriComponents otherComp = (HierarchicalUriComponents) other;
 		return (ObjectUtils.nullSafeEquals(getScheme(), otherComp.getScheme()) &&
 				ObjectUtils.nullSafeEquals(getUserInfo(), otherComp.getUserInfo()) &&
 				ObjectUtils.nullSafeEquals(getHost(), otherComp.getHost()) &&
@@ -925,8 +925,8 @@ public void copyToUriComponentsBuilder(UriComponentsBuilder builder) {
 
 		@Override
 		public boolean equals(@Nullable Object other) {
-			return (this == other || (other instanceof FullPathComponent &&
-					getPath().equals(((FullPathComponent) other).getPath())));
+			return (this == other || (other instanceof FullPathComponent fullPathComponent &&
+					getPath().equals(fullPathComponent.getPath())));
 		}
 
 		@Override
@@ -999,8 +999,8 @@ public void copyToUriComponentsBuilder(UriComponentsBuilder builder) {
 
 		@Override
 		public boolean equals(@Nullable Object other) {
-			return (this == other || (other instanceof PathSegmentComponent &&
-					getPathSegments().equals(((PathSegmentComponent) other).getPathSegments())));
+			return (this == other || (other instanceof PathSegmentComponent pathSegmentComponent &&
+					getPathSegments().equals(pathSegmentComponent.getPathSegments())));
 		}
 
 		@Override
diff --git a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
index a588cffaf4dc..f6a231c47058 100644
--- a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -161,10 +161,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof OpaqueUriComponents)) {
+		if (!(other instanceof OpaqueUriComponents otherComp)) {
 			return false;
 		}
-		OpaqueUriComponents otherComp = (OpaqueUriComponents) other;
 		return (ObjectUtils.nullSafeEquals(getScheme(), otherComp.getScheme()) &&
 				ObjectUtils.nullSafeEquals(this.ssp, otherComp.ssp) &&
 				ObjectUtils.nullSafeEquals(getFragment(), otherComp.getFragment()));
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
index 6b2532a2a312..e2f44487490a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,11 +48,12 @@
 
 /**
  * Miscellaneous utilities for web applications.
- * Used by various framework classes.
+ * <p>Used by various framework classes.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Sebastien Deleuze
+ * @author Sam Brannen
  */
 public abstract class WebUtils {
 
@@ -460,8 +461,8 @@ public static <T> T getNativeRequest(ServletRequest request, @Nullable Class<T>
 			if (requiredType.isInstance(request)) {
 				return (T) request;
 			}
-			else if (request instanceof ServletRequestWrapper) {
-				return getNativeRequest(((ServletRequestWrapper) request).getRequest(), requiredType);
+			else if (request instanceof ServletRequestWrapper wrapper) {
+				return getNativeRequest(wrapper.getRequest(), requiredType);
 			}
 		}
 		return null;
@@ -482,8 +483,8 @@ public static <T> T getNativeResponse(ServletResponse response, @Nullable Class<
 			if (requiredType.isInstance(response)) {
 				return (T) response;
 			}
-			else if (response instanceof ServletResponseWrapper) {
-				return getNativeResponse(((ServletResponseWrapper) response).getResponse(), requiredType);
+			else if (response instanceof ServletResponseWrapper wrapper) {
+				return getNativeResponse(wrapper.getResponse(), requiredType);
 			}
 		}
 		return null;
@@ -649,8 +650,7 @@ public static String findParameterValue(ServletRequest request, String name) {
 	public static String findParameterValue(Map<String, ?> parameters, String name) {
 		// First try to get it as a normal name=value parameter
 		Object value = parameters.get(name);
-		if (value instanceof String[]) {
-			String[] values = (String[]) value;
+		if (value instanceof String[] values) {
 			return (values.length > 0 ? values[0] : null);
 		}
 		else if (value != null) {
@@ -801,9 +801,9 @@ public static boolean isSameOrigin(HttpRequest request) {
 		String scheme;
 		String host;
 		int port;
-		if (request instanceof ServletServerHttpRequest) {
+		if (request instanceof ServletServerHttpRequest servletServerHttpRequest) {
 			// Build more efficiently if we can: we only need scheme, host, port for origin comparison
-			HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
+			HttpServletRequest servletRequest = servletServerHttpRequest.getServletRequest();
 			scheme = servletRequest.getScheme();
 			host = servletRequest.getServerName();
 			port = servletRequest.getServerPort();
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
index ba87fd6b6f75..956aafe34a9b 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
@@ -430,10 +430,9 @@ else if (!StringUtils.hasLength(pattern2string.patternString)) {
 
 	@Override
 	public boolean equals(@Nullable Object other) {
-		if (!(other instanceof PathPattern)) {
+		if (!(other instanceof PathPattern otherPattern)) {
 			return false;
 		}
-		PathPattern otherPattern = (PathPattern) other;
 		return (this.patternString.equals(otherPattern.getPatternString()) &&
 				getSeparator() == otherPattern.getSeparator() &&
 				this.caseSensitive == otherPattern.caseSensitive);
@@ -726,10 +725,7 @@ boolean isSeparator(int pathIndex) {
 		 */
 		String pathElementValue(int pathIndex) {
 			Element element = (pathIndex < this.pathLength) ? this.pathElements.get(pathIndex) : null;
-			if (element instanceof PathContainer.PathSegment) {
-				return ((PathContainer.PathSegment)element).valueToMatch();
-			}
-			return "";
+			return (element instanceof PathContainer.PathSegment pathSegment ? pathSegment.valueToMatch() : "");
 		}
 	}
 

From 8135ae6d38b19f0e15d792709331cc17ce5a6701 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 17 Oct 2021 13:30:05 +0200
Subject: [PATCH 268/735] Apply "instanceof pattern matching" in spring-webflux

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes
- multi-catch

This has only been applied to `src/main/java`.
---
 .../client/DefaultClientResponseBuilder.java  |  8 +++----
 .../client/ExchangeFilterFunctions.java       |  8 +++----
 .../ChangePathPatternParserVisitor.java       |  5 ++---
 .../server/DefaultEntityResponseBuilder.java  |  2 +-
 .../server/DefaultServerRequestBuilder.java   |  4 ++--
 .../server/DefaultServerResponseBuilder.java  |  5 ++---
 .../handler/AbstractUrlHandlerMapping.java    |  6 ++----
 .../resource/CssLinkResourceTransformer.java  |  5 ++---
 .../resource/PathResourceResolver.java        | 21 +++++++++----------
 .../resource/ResourceUrlProvider.java         |  3 +--
 .../reactive/resource/ResourceWebHandler.java | 13 ++++--------
 .../resource/VersionResourceResolver.java     |  8 +++----
 .../method/AbstractHandlerMethodMapping.java  | 13 ++++++------
 .../result/method/InvocableHandlerMethod.java |  3 +--
 .../result/method/RequestMappingInfo.java     |  3 +--
 .../reactive/result/view/RequestContext.java  | 16 +++++++-------
 .../result/view/ViewResolverSupport.java      |  4 ++--
 .../web/reactive/socket/CloseStatus.java      |  5 ++---
 .../web/reactive/socket/WebSocketMessage.java |  5 ++---
 .../StandardWebSocketHandlerAdapter.java      | 17 ++++++++-------
 20 files changed, 68 insertions(+), 86 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java
index 055a1d9ed5c2..a63ba76bf7e0 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public HttpHeaders getHeaders() {
 	};
 
 
-	private ExchangeStrategies strategies;
+	private final ExchangeStrategies strategies;
 
 	private int statusCode = 200;
 
@@ -104,8 +104,8 @@ public HttpHeaders getHeaders() {
 			this.headers.addAll(other.headers().asHttpHeaders());
 		}
 		this.originalResponse = other;
-		this.request = (other instanceof DefaultClientResponse ?
-				((DefaultClientResponse) other).request() : EMPTY_REQUEST);
+		this.request = (other instanceof DefaultClientResponse defaultClientResponse ?
+				defaultClientResponse.request() : EMPTY_REQUEST);
 	}
 
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
index b7d6c3d72005..42ad43e22c4f 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,8 +116,7 @@ public static ExchangeFilterFunction basicAuthentication(String username, String
 	public static ExchangeFilterFunction basicAuthentication() {
 		return (request, next) -> {
 			Object attr = request.attributes().get(BASIC_AUTHENTICATION_CREDENTIALS_ATTRIBUTE);
-			if (attr instanceof Credentials) {
-				Credentials cred = (Credentials) attr;
+			if (attr instanceof Credentials cred) {
 				return next.exchange(ClientRequest.from(request)
 						.headers(headers -> headers.setBasicAuth(cred.username, cred.password))
 						.build());
@@ -174,10 +173,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof Credentials)) {
+			if (!(other instanceof Credentials otherCred)) {
 				return false;
 			}
-			Credentials otherCred = (Credentials) other;
 			return (this.username.equals(otherCred.username) && this.password.equals(otherCred.password));
 		}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ChangePathPatternParserVisitor.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ChangePathPatternParserVisitor.java
index 10f34a3e7656..dc971a467ac1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ChangePathPatternParserVisitor.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ChangePathPatternParserVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,8 +70,7 @@ public void unknown(RouterFunction<?> routerFunction) {
 	}
 
 	private void changeParser(RequestPredicate predicate) {
-		if (predicate instanceof Target) {
-			Target target = (Target) predicate;
+		if (predicate instanceof Target target) {
 			target.changeParser(this.parser);
 		}
 	}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java
index d43a4e71f1a5..461a82efd28d 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilder.java
@@ -195,7 +195,7 @@ public EntityResponse.Builder<T> varyBy(String... requestHeaders) {
 
 	@Override
 	public Mono<EntityResponse<T>> build() {
-		return Mono.just(new DefaultEntityResponse<T>(
+		return Mono.just(new DefaultEntityResponse<>(
 				this.status, this.headers, this.cookies, this.entity, this.inserter, this.hints));
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
index 940118866f4c..174899b88946 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
 
 	private final List<HttpMessageReader<?>> messageReaders;
 
-	private ServerWebExchange exchange;
+	private final ServerWebExchange exchange;
 
 	private String methodName;
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
index da71fbe565a1..cf4452b60eac 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,8 +78,7 @@ public DefaultServerResponseBuilder(ServerResponse other) {
 		Assert.notNull(other, "ServerResponse must not be null");
 		this.headers.addAll(other.headers());
 		this.cookies.addAll(other.cookies());
-		if (other instanceof AbstractServerResponse) {
-			AbstractServerResponse abstractOther = (AbstractServerResponse) other;
+		if (other instanceof AbstractServerResponse abstractOther) {
 			this.statusCode = abstractOther.statusCode;
 			this.hints.putAll(abstractOther.hints);
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java
index abaf4cf86f96..417d7f47c8fa 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java
@@ -153,8 +153,7 @@ protected Object lookupHandler(PathContainer lookupPath, ServerWebExchange excha
 		Object handler = this.handlerMap.get(pattern);
 
 		// Bean name or resolved handler?
-		if (handler instanceof String) {
-			String handlerName = (String) handler;
+		if (handler instanceof String handlerName) {
 			handler = obtainApplicationContext().getBean(handlerName);
 		}
 
@@ -223,8 +222,7 @@ protected void registerHandler(String urlPath, Object handler) throws BeansExcep
 		}
 
 		// Eagerly resolve handler if referencing singleton via name.
-		if (!this.lazyInitHandlers && handler instanceof String) {
-			String handlerName = (String) handler;
+		if (!this.lazyInitHandlers && handler instanceof String handlerName) {
 			if (obtainApplicationContext().isSingleton(handlerName)) {
 				resolvedHandler = obtainApplicationContext().getBean(handlerName);
 			}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
index 3d96ff0b571b..ab0dfd4c6c7b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -288,10 +288,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ContentChunkInfo)) {
+			if (!(other instanceof ContentChunkInfo otherCci)) {
 				return false;
 			}
-			ContentChunkInfo otherCci = (ContentChunkInfo) other;
 			return (this.start == otherCci.start && this.end == otherCci.end);
 		}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
index dd86b8e9a264..e99c3978790c 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
@@ -42,6 +42,7 @@
  * expected to be configured at the end in a chain of resolvers.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 5.0
  */
 public class PathResourceResolver extends AbstractResourceResolver {
@@ -119,11 +120,12 @@ protected Mono<Resource> getResource(String resourcePath, Resource location) {
 					return Mono.just(resource);
 				}
 				else if (logger.isWarnEnabled()) {
-					Resource[] allowedLocations = getAllowedLocations();
-					logger.warn("Resource path \"" + resourcePath + "\" was successfully resolved " +
-							"but resource \"" + resource.getURL() + "\" is neither under the " +
-							"current location \"" + location.getURL() + "\" nor under any of the " +
-							"allowed locations " + (allowedLocations != null ? Arrays.asList(allowedLocations) : "[]"));
+					Object allowedLocationsText = (getAllowedLocations() != null ? Arrays.asList(getAllowedLocations()) : "[]");
+					logger.warn("""
+							Resource path "%s" was successfully resolved, but resource \
+							"%s" is neither under the current location "%s" nor under any \
+							of the allowed locations %s"\
+							""".formatted(resourcePath, resource.getURL(),location.getURL(), allowedLocationsText));
 				}
 			}
 			return Mono.empty();
@@ -177,8 +179,8 @@ private boolean isResourceUnderLocation(Resource resource, Resource location) th
 			resourcePath = resource.getURL().toExternalForm();
 			locationPath = StringUtils.cleanPath(location.getURL().toString());
 		}
-		else if (resource instanceof ClassPathResource) {
-			resourcePath = ((ClassPathResource) resource).getPath();
+		else if (resource instanceof ClassPathResource classPathResource) {
+			resourcePath = classPathResource.getPath();
 			locationPath = StringUtils.cleanPath(((ClassPathResource) location).getPath());
 		}
 		else {
@@ -203,10 +205,7 @@ private boolean isInvalidEncodedPath(String resourcePath) {
 					return true;
 				}
 			}
-			catch (IllegalArgumentException ex) {
-				// May not be possible to decode...
-			}
-			catch (UnsupportedEncodingException ex) {
+			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
 				// Should never happen...
 			}
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
index b78d85320085..8f3e3b0bbf06 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
@@ -106,8 +106,7 @@ private void detectResourceHandlers(ApplicationContext context) {
 
 		mappings.forEach(mapping ->
 			mapping.getHandlerMap().forEach((pattern, handler) -> {
-				if (handler instanceof ResourceWebHandler) {
-					ResourceWebHandler resourceHandler = (ResourceWebHandler) handler;
+				if (handler instanceof ResourceWebHandler resourceHandler) {
 					this.handlerMap.put(pattern, resourceHandler);
 				}
 			}));
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index 75ac8ddd320e..50fe84bf2014 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -354,8 +354,7 @@ protected void initAllowedLocations() {
 			return;
 		}
 		for (int i = getResourceResolvers().size() - 1; i >= 0; i--) {
-			if (getResourceResolvers().get(i) instanceof PathResourceResolver) {
-				PathResourceResolver resolver = (PathResourceResolver) getResourceResolvers().get(i);
+			if (getResourceResolvers().get(i) instanceof PathResourceResolver resolver) {
 				if (ObjectUtils.isEmpty(resolver.getAllowedLocations())) {
 					resolver.setAllowedLocations(getLocations().toArray(new Resource[0]));
 				}
@@ -522,10 +521,7 @@ private boolean isInvalidEncodedPath(String path) {
 					return true;
 				}
 			}
-			catch (IllegalArgumentException ex) {
-				// May not be possible to decode...
-			}
-			catch (UnsupportedEncodingException ex) {
+			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
 				// Should never happen...
 			}
 		}
@@ -609,9 +605,8 @@ protected void setHeaders(ServerWebExchange exchange, Resource resource, @Nullab
 			headers.setContentType(mediaType);
 		}
 
-		if (resource instanceof HttpResource) {
-			HttpHeaders resourceHeaders = ((HttpResource) resource).getResponseHeaders();
-			exchange.getResponse().getHeaders().putAll(resourceHeaders);
+		if (resource instanceof HttpResource httpResource) {
+			exchange.getResponse().getHeaders().putAll(httpResource.getResponseHeaders());
 		}
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
index ff712f7068ba..d923e96024c8 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@
  */
 public class VersionResourceResolver extends AbstractResourceResolver {
 
-	private AntPathMatcher pathMatcher = new AntPathMatcher();
+	private final AntPathMatcher pathMatcher = new AntPathMatcher();
 
 	/** Map from path pattern -> VersionStrategy. */
 	private final Map<String, VersionStrategy> versionStrategyMap = new LinkedHashMap<>();
@@ -315,8 +315,8 @@ public InputStream getInputStream() throws IOException {
 
 		@Override
 		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers = (this.original instanceof HttpResource ?
-					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
+			HttpHeaders headers = (this.original instanceof HttpResource httpResource ?
+					httpResource.getResponseHeaders() : new HttpHeaders());
 			headers.setETag("W/\"" + this.version + "\"");
 			return headers;
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
index 7d59209955d6..f1210150d0f1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
@@ -200,8 +200,8 @@ protected void initHandlerMethods() {
 	 * @param handler the bean name of a handler or a handler instance
 	 */
 	protected void detectHandlerMethods(final Object handler) {
-		Class<?> handlerType = (handler instanceof String ?
-				obtainApplicationContext().getType((String) handler) : handler.getClass());
+		Class<?> handlerType = (handler instanceof String beanName ?
+				obtainApplicationContext().getType(beanName) : handler.getClass());
 
 		if (handlerType != null) {
 			final Class<?> userType = ClassUtils.getUserClass(handlerType);
@@ -258,8 +258,8 @@ protected void registerHandlerMethod(Object handler, Method method, T mapping) {
 	 * @return the created HandlerMethod
 	 */
 	protected HandlerMethod createHandlerMethod(Object handler, Method method) {
-		if (handler instanceof String) {
-			return new HandlerMethod((String) handler,
+		if (handler instanceof String beanName) {
+			return new HandlerMethod(beanName,
 					obtainApplicationContext().getAutowireCapableBeanFactory(),
 					obtainApplicationContext(),
 					method);
@@ -397,14 +397,13 @@ protected HandlerMethod handleNoMatch(Set<T> mappings, ServerWebExchange exchang
 	@Override
 	protected boolean hasCorsConfigurationSource(Object handler) {
 		return super.hasCorsConfigurationSource(handler) ||
-				(handler instanceof HandlerMethod && this.mappingRegistry.getCorsConfiguration((HandlerMethod) handler) != null);
+				(handler instanceof HandlerMethod handlerMethod && this.mappingRegistry.getCorsConfiguration(handlerMethod) != null);
 	}
 
 	@Override
 	protected CorsConfiguration getCorsConfiguration(Object handler, ServerWebExchange exchange) {
 		CorsConfiguration corsConfig = super.getCorsConfiguration(handler, exchange);
-		if (handler instanceof HandlerMethod) {
-			HandlerMethod handlerMethod = (HandlerMethod) handler;
+		if (handler instanceof HandlerMethod handlerMethod) {
 			if (handlerMethod.equals(PREFLIGHT_AMBIGUOUS_MATCH)) {
 				return ALLOW_CORS_CONFIG;
 			}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
index b117a197aa8e..4a2fee3ef118 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
@@ -224,8 +224,7 @@ private static boolean isAsyncVoidReturnType(MethodParameter returnType, @Nullab
 				return true;
 			}
 			Type parameterType = returnType.getGenericParameterType();
-			if (parameterType instanceof ParameterizedType) {
-				ParameterizedType type = (ParameterizedType) parameterType;
+			if (parameterType instanceof ParameterizedType type) {
 				if (type.getActualTypeArguments().length == 1) {
 					return Void.class.equals(type.getActualTypeArguments()[0]);
 				}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java
index 8782b9a5b831..2842d1213f4a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java
@@ -343,10 +343,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof RequestMappingInfo)) {
+		if (!(other instanceof RequestMappingInfo otherInfo)) {
 			return false;
 		}
-		RequestMappingInfo otherInfo = (RequestMappingInfo) other;
 		return (this.patternsCondition.equals(otherInfo.patternsCondition) &&
 				this.methodsCondition.equals(otherInfo.methodsCondition) &&
 				this.paramsCondition.equals(otherInfo.paramsCondition) &&
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java
index b964acb6ebde..b1dfca61f158 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ public class RequestContext {
 	private Map<String, Errors> errorsMap;
 
 	@Nullable
-	private RequestDataValueProcessor dataValueProcessor;
+	private final RequestDataValueProcessor dataValueProcessor;
 
 
 	public RequestContext(ServerWebExchange exchange, Map<String, Object> model, MessageSource messageSource) {
@@ -92,8 +92,8 @@ public RequestContext(ServerWebExchange exchange, Map<String, Object> model, Mes
 		LocaleContext localeContext = exchange.getLocaleContext();
 		Locale locale = localeContext.getLocale();
 		this.locale = (locale != null ? locale : Locale.getDefault());
-		TimeZone timeZone = (localeContext instanceof TimeZoneAwareLocaleContext ?
-				((TimeZoneAwareLocaleContext) localeContext).getTimeZone() : null);
+		TimeZone timeZone = (localeContext instanceof TimeZoneAwareLocaleContext tzaLocaleContext ?
+				tzaLocaleContext.getTimeZone() : null);
 		this.timeZone = (timeZone != null ? timeZone : TimeZone.getDefault());
 
 		this.defaultHtmlEscape = null;  // TODO
@@ -385,15 +385,15 @@ public Errors getErrors(String name, boolean htmlEscape) {
 			}
 		}
 
-		if (errors instanceof BindException) {
-			errors = ((BindException) errors).getBindingResult();
+		if (errors instanceof BindException bindException) {
+			errors = bindException.getBindingResult();
 		}
 
 		if (htmlEscape && !(errors instanceof EscapedErrors)) {
 			errors = new EscapedErrors(errors);
 		}
-		else if (!htmlEscape && errors instanceof EscapedErrors) {
-			errors = ((EscapedErrors) errors).getSource();
+		else if (!htmlEscape && errors instanceof EscapedErrors escapedErrors) {
+			errors = escapedErrors.getSource();
 		}
 
 		this.errorsMap.put(name, errors);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java
index e97a983af5c2..6d0db61d1498 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public abstract class ViewResolverSupport implements Ordered {
 	public static final MediaType DEFAULT_CONTENT_TYPE = MediaType.parseMediaType("text/html;charset=UTF-8");
 
 
-	private List<MediaType> mediaTypes = new ArrayList<>(4);
+	private final List<MediaType> mediaTypes = new ArrayList<>(4);
 
 	private Charset defaultCharset = StandardCharsets.UTF_8;
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java
index 304eb797d790..603f2ba16561 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -239,10 +239,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof CloseStatus)) {
+		if (!(other instanceof CloseStatus otherStatus)) {
 			return false;
 		}
-		CloseStatus otherStatus = (CloseStatus) other;
 		return (this.code == otherStatus.code &&
 				ObjectUtils.nullSafeEquals(this.reason, otherStatus.reason));
 	}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
index 32175f160b54..b7d4de6937d4 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,10 +151,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof WebSocketMessage)) {
+		if (!(other instanceof WebSocketMessage otherMessage)) {
 			return false;
 		}
-		WebSocketMessage otherMessage = (WebSocketMessage) other;
 		return (this.type.equals(otherMessage.type) &&
 				ObjectUtils.nullSafeEquals(this.payload, otherMessage.payload));
 	}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
index d4699ca32e0a..68fed3f2b5db 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,13 +41,14 @@
  *
  * @author Violeta Georgieva
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 5.0
  */
 public class StandardWebSocketHandlerAdapter extends Endpoint {
 
 	private final WebSocketHandler delegateHandler;
 
-	private Function<Session, StandardWebSocketSession> sessionFactory;
+	private final Function<Session, StandardWebSocketSession> sessionFactory;
 
 	@Nullable
 	private StandardWebSocketSession delegateSession;
@@ -89,16 +90,16 @@ public void onOpen(Session session, EndpointConfig config) {
 	private <T> WebSocketMessage toMessage(T message) {
 		WebSocketSession session = this.delegateSession;
 		Assert.state(session != null, "Cannot create message without a session");
-		if (message instanceof String) {
-			byte[] bytes = ((String) message).getBytes(StandardCharsets.UTF_8);
+		if (message instanceof String text) {
+			byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
 			return new WebSocketMessage(Type.TEXT, session.bufferFactory().wrap(bytes));
 		}
-		else if (message instanceof ByteBuffer) {
-			DataBuffer buffer = session.bufferFactory().wrap((ByteBuffer) message);
+		else if (message instanceof ByteBuffer byteBuffer) {
+			DataBuffer buffer = session.bufferFactory().wrap(byteBuffer);
 			return new WebSocketMessage(Type.BINARY, buffer);
 		}
-		else if (message instanceof PongMessage) {
-			DataBuffer buffer = session.bufferFactory().wrap(((PongMessage) message).getApplicationData());
+		else if (message instanceof PongMessage pongMessage) {
+			DataBuffer buffer = session.bufferFactory().wrap(pongMessage.getApplicationData());
 			return new WebSocketMessage(Type.PONG, buffer);
 		}
 		else {

From 1f248b34f6a39e7741eb30965bc8d4cb74051b0e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 17 Oct 2021 18:49:02 +0200
Subject: [PATCH 269/735] Apply "instanceof pattern matching" in spring-webmvc

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes
- try with resources
- multi-catch

This has only been applied to `src/main/java`.
---
 .../springframework/web/servlet/FlashMap.java |  5 +-
 .../web/servlet/FrameworkServlet.java         | 35 +++++------
 .../web/servlet/HandlerExecutionChain.java    |  8 +--
 .../AnnotationDrivenBeanDefinitionParser.java |  5 +-
 .../annotation/ViewControllerRegistry.java    |  4 +-
 .../annotation/ViewResolverRegistry.java      |  6 +-
 .../ChangePathPatternParserVisitor.java       |  5 +-
 .../DefaultEntityResponseBuilder.java         | 11 ++--
 .../function/DefaultServerRequest.java        | 19 +++---
 .../servlet/function/RequestPredicates.java   | 23 ++++----
 .../handler/AbstractHandlerMapping.java       | 59 +++++++++----------
 ...bstractHandlerMethodExceptionResolver.java |  5 +-
 .../handler/AbstractHandlerMethodMapping.java | 15 +++--
 .../handler/AbstractUrlHandlerMapping.java    | 15 ++---
 .../SimpleMappingExceptionResolver.java       |  4 +-
 .../WebRequestHandlerInterceptorAdapter.java  |  5 +-
 .../mvc/ParameterizableViewController.java    |  3 +-
 .../servlet/mvc/WebContentInterceptor.java    | 14 ++---
 .../mvc/method/RequestMappingInfo.java        |  3 +-
 .../annotation/HttpEntityMethodProcessor.java | 20 +++----
 .../RequestResponseBodyAdviceChain.java       |  9 ++-
 .../ResponseEntityExceptionHandler.java       |  6 +-
 .../ViewMethodReturnValueHandler.java         |  3 +-
 .../resource/CssLinkResourceTransformer.java  |  5 +-
 .../resource/PathResourceResolver.java        | 15 ++---
 .../resource/ResourceHttpRequestHandler.java  | 14 ++---
 .../servlet/resource/ResourceUrlProvider.java |  3 +-
 .../resource/VersionResourceResolver.java     |  8 +--
 .../support/JspAwareRequestContext.java       |  8 +--
 .../web/servlet/support/RequestContext.java   | 10 ++--
 .../tags/form/SelectedValueComparator.java    | 15 +++--
 .../view/AbstractCachingViewResolver.java     |  4 +-
 .../view/ContentNegotiatingViewResolver.java  |  5 +-
 .../view/json/AbstractJackson2View.java       |  5 +-
 .../view/script/ScriptTemplateView.java       |  5 +-
 .../web/servlet/view/xslt/XsltView.java       | 34 +++++------
 36 files changed, 185 insertions(+), 228 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
index c1a814589afd..d0904bb8ac1b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,10 +165,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof FlashMap)) {
+		if (!(other instanceof FlashMap otherFlashMap)) {
 			return false;
 		}
-		FlashMap otherFlashMap = (FlashMap) other;
 		return (super.equals(otherFlashMap) &&
 				ObjectUtils.nullSafeEquals(this.targetRequestPath, otherFlashMap.targetRequestPath) &&
 				this.targetRequestParams.equals(otherFlashMap.targetRequestParams));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index ea0f30431854..36510490adee 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -507,8 +507,8 @@ public boolean isEnableLoggingRequestDetails() {
 	 */
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
-		if (this.webApplicationContext == null && applicationContext instanceof WebApplicationContext) {
-			this.webApplicationContext = (WebApplicationContext) applicationContext;
+		if (this.webApplicationContext == null && applicationContext instanceof WebApplicationContext wac) {
+			this.webApplicationContext = wac;
 			this.webApplicationContextInjected = true;
 		}
 	}
@@ -565,18 +565,15 @@ protected WebApplicationContext initWebApplicationContext() {
 		if (this.webApplicationContext != null) {
 			// A context instance was injected at construction time -> use it
 			wac = this.webApplicationContext;
-			if (wac instanceof ConfigurableWebApplicationContext) {
-				ConfigurableWebApplicationContext cwac = (ConfigurableWebApplicationContext) wac;
-				if (!cwac.isActive()) {
-					// The context has not yet been refreshed -> provide services such as
-					// setting the parent context, setting the application context id, etc
-					if (cwac.getParent() == null) {
-						// The context instance was injected without an explicit parent -> set
-						// the root application context (if any; may be null) as the parent
-						cwac.setParent(rootContext);
-					}
-					configureAndRefreshWebApplicationContext(cwac);
+			if (wac instanceof ConfigurableWebApplicationContext cwac && !cwac.isActive()) {
+				// The context has not yet been refreshed -> provide services such as
+				// setting the parent context, setting the application context id, etc
+				if (cwac.getParent() == null) {
+					// The context instance was injected without an explicit parent -> set
+					// the root application context (if any; may be null) as the parent
+					cwac.setParent(rootContext);
 				}
+				configureAndRefreshWebApplicationContext(cwac);
 			}
 		}
 		if (wac == null) {
@@ -693,8 +690,8 @@ protected void configureAndRefreshWebApplicationContext(ConfigurableWebApplicati
 		// is refreshed; do it eagerly here to ensure servlet property sources are in place for
 		// use in any post-processing or initialization that occurs below prior to #refresh
 		ConfigurableEnvironment env = wac.getEnvironment();
-		if (env instanceof ConfigurableWebEnvironment) {
-			((ConfigurableWebEnvironment) env).initPropertySources(getServletContext(), getServletConfig());
+		if (env instanceof ConfigurableWebEnvironment cwe) {
+			cwe.initPropertySources(getServletContext(), getServletConfig());
 		}
 
 		postProcessWebApplicationContext(wac);
@@ -824,10 +821,10 @@ protected void initFrameworkServlet() throws ServletException {
 	 */
 	public void refresh() {
 		WebApplicationContext wac = getWebApplicationContext();
-		if (!(wac instanceof ConfigurableApplicationContext)) {
+		if (!(wac instanceof ConfigurableApplicationContext cac)) {
 			throw new IllegalStateException("WebApplicationContext does not support refresh: " + wac);
 		}
-		((ConfigurableApplicationContext) wac).refresh();
+		cac.refresh();
 	}
 
 	/**
@@ -862,8 +859,8 @@ protected void onRefresh(ApplicationContext context) {
 	public void destroy() {
 		getServletContext().log("Destroying Spring FrameworkServlet '" + getServletName() + "'");
 		// Only call close() on WebApplicationContext if locally managed...
-		if (this.webApplicationContext instanceof ConfigurableApplicationContext && !this.webApplicationContextInjected) {
-			((ConfigurableApplicationContext) this.webApplicationContext).close();
+		if (!this.webApplicationContextInjected && this.webApplicationContext instanceof ConfigurableApplicationContext cac) {
+			cac.close();
 		}
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
index 76f5cb357712..f90bf35cc012 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,8 +74,7 @@ public HandlerExecutionChain(Object handler, @Nullable HandlerInterceptor... int
 	 * @since 5.3
 	 */
 	public HandlerExecutionChain(Object handler, List<HandlerInterceptor> interceptorList) {
-		if (handler instanceof HandlerExecutionChain) {
-			HandlerExecutionChain originalChain = (HandlerExecutionChain) handler;
+		if (handler instanceof HandlerExecutionChain originalChain) {
 			this.handler = originalChain.getHandler();
 			this.interceptorList.addAll(originalChain.interceptorList);
 		}
@@ -188,9 +187,8 @@ void triggerAfterCompletion(HttpServletRequest request, HttpServletResponse resp
 	void applyAfterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response) {
 		for (int i = this.interceptorList.size() - 1; i >= 0; i--) {
 			HandlerInterceptor interceptor = this.interceptorList.get(i);
-			if (interceptor instanceof AsyncHandlerInterceptor) {
+			if (interceptor instanceof AsyncHandlerInterceptor asyncInterceptor) {
 				try {
-					AsyncHandlerInterceptor asyncInterceptor = (AsyncHandlerInterceptor) interceptor;
 					asyncInterceptor.afterConcurrentHandlingStarted(request, response, this.handler);
 				}
 				catch (Throwable ex) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
index 2684d24e5ea7..a4e4fa85eebf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -514,8 +514,7 @@ private ManagedList<?> getArgumentResolvers(Element element, ParserContext conte
 	private ManagedList<Object> wrapLegacyResolvers(List<Object> list, ParserContext context) {
 		ManagedList<Object> result = new ManagedList<>();
 		for (Object object : list) {
-			if (object instanceof BeanDefinitionHolder) {
-				BeanDefinitionHolder beanDef = (BeanDefinitionHolder) object;
+			if (object instanceof BeanDefinitionHolder beanDef) {
 				String className = beanDef.getBeanDefinition().getBeanClassName();
 				Assert.notNull(className, "No resolver class");
 				Class<?> clazz = ClassUtils.resolveClassName(className, context.getReaderContext().getBeanClassLoader());
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
index 3cedaf21449b..1bfdd3d65c7b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
 public class ViewControllerRegistry {
 
 	@Nullable
-	private ApplicationContext applicationContext;
+	private final ApplicationContext applicationContext;
 
 	private final List<ViewControllerRegistration> registrations = new ArrayList<>(4);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
index 87c414d27792..14443da995fe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,10 +53,10 @@
 public class ViewResolverRegistry {
 
 	@Nullable
-	private ContentNegotiationManager contentNegotiationManager;
+	private final ContentNegotiationManager contentNegotiationManager;
 
 	@Nullable
-	private ApplicationContext applicationContext;
+	private final ApplicationContext applicationContext;
 
 	@Nullable
 	private ContentNegotiatingViewResolver contentNegotiatingResolver;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ChangePathPatternParserVisitor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ChangePathPatternParserVisitor.java
index 264a30bf6793..9fbc37e01340 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ChangePathPatternParserVisitor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ChangePathPatternParserVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,8 +69,7 @@ public void unknown(RouterFunction<?> routerFunction) {
 	}
 
 	private void changeParser(RequestPredicate predicate) {
-		if (predicate instanceof Target) {
-			Target target = (Target) predicate;
+		if (predicate instanceof Target target) {
 			target.changeParser(this.parser);
 		}
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
index cf674214be4b..68326e0027c3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java
@@ -202,8 +202,7 @@ public EntityResponse.Builder<T> varyBy(String... requestHeaders) {
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	@Override
 	public EntityResponse<T> build() {
-		if (this.entity instanceof CompletionStage) {
-			CompletionStage completionStage = (CompletionStage) this.entity;
+		if (this.entity instanceof CompletionStage completionStage) {
 			return new CompletionStageEntityResponse(this.status, this.headers, this.cookies,
 					completionStage, this.entityType);
 		}
@@ -264,7 +263,7 @@ protected ModelAndView writeToInternal(HttpServletRequest servletRequest,
 			return null;
 		}
 
-		@SuppressWarnings({ "unchecked", "resource" })
+		@SuppressWarnings({ "unchecked", "resource", "rawtypes" })
 		protected void writeEntityWithMessageConverters(Object entity, HttpServletRequest request,
 				HttpServletResponse response, ServerResponse.Context context)
 				throws ServletException, IOException {
@@ -294,16 +293,14 @@ protected void writeEntityWithMessageConverters(Object entity, HttpServletReques
 			}
 
 			for (HttpMessageConverter<?> messageConverter : context.messageConverters()) {
-				if (messageConverter instanceof GenericHttpMessageConverter<?>) {
-					GenericHttpMessageConverter<Object> genericMessageConverter =
-							(GenericHttpMessageConverter<Object>) messageConverter;
+				if (messageConverter instanceof GenericHttpMessageConverter genericMessageConverter) {
 					if (genericMessageConverter.canWrite(entityType, entityClass, contentType)) {
 						genericMessageConverter.write(entity, entityType, contentType, serverResponse);
 						return;
 					}
 				}
 				if (messageConverter.canWrite(entityClass, contentType)) {
-					((HttpMessageConverter<Object>)messageConverter).write(entity, contentType, serverResponse);
+					((HttpMessageConverter<Object>) messageConverter).write(entity, contentType, serverResponse);
 					return;
 				}
 			}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
index c874c05d7a63..81f3700daee0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
@@ -70,6 +70,7 @@
  * {@code ServerRequest} implementation based on a {@link HttpServletRequest}.
  *
  * @author Arjen Poutsma
+ * @author Sam Brannen
  * @since 5.2
  */
 class DefaultServerRequest implements ServerRequest {
@@ -171,14 +172,12 @@ public <T> T body(ParameterizedTypeReference<T> bodyType) throws IOException, Se
 	}
 
 	static Class<?> bodyClass(Type type) {
-		if (type instanceof Class) {
-			return (Class<?>) type;
+		if (type instanceof Class<?> clazz) {
+			return clazz;
 		}
-		if (type instanceof ParameterizedType) {
-			ParameterizedType parameterizedType = (ParameterizedType) type;
-			if (parameterizedType.getRawType() instanceof Class) {
-				return (Class<?>) parameterizedType.getRawType();
-			}
+		if (type instanceof ParameterizedType parameterizedType &&
+				parameterizedType.getRawType() instanceof Class<?> rawType) {
+			return rawType;
 		}
 		return Object.class;
 	}
@@ -188,11 +187,9 @@ private <T> T bodyInternal(Type bodyType, Class<?> bodyClass) throws ServletExce
 		MediaType contentType = this.headers.contentType().orElse(MediaType.APPLICATION_OCTET_STREAM);
 
 		for (HttpMessageConverter<?> messageConverter : this.messageConverters) {
-			if (messageConverter instanceof GenericHttpMessageConverter) {
-				GenericHttpMessageConverter<T> genericMessageConverter =
-						(GenericHttpMessageConverter<T>) messageConverter;
+			if (messageConverter instanceof GenericHttpMessageConverter<?> genericMessageConverter) {
 				if (genericMessageConverter.canRead(bodyType, bodyClass, contentType)) {
-					return genericMessageConverter.read(bodyType, bodyClass, this.serverHttpRequest);
+					return (T) genericMessageConverter.read(bodyType, bodyClass, this.serverHttpRequest);
 				}
 			}
 			if (messageConverter.canRead(bodyClass, contentType)) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
index e25a624599a0..d29a96271e9c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
@@ -65,6 +65,7 @@
  * request matching operations, such as matching based on path, HTTP method, etc.
  *
  * @author Arjen Poutsma
+ * @author Sam Brannen
  * @since 5.2
  */
 public abstract class RequestPredicates {
@@ -792,11 +793,11 @@ public void accept(Visitor visitor) {
 
 		@Override
 		public void changeParser(PathPatternParser parser) {
-			if (this.left instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
+			if (this.left instanceof ChangePathPatternParserVisitor.Target target) {
+				target.changeParser(parser);
 			}
-			if (this.right instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
+			if (this.right instanceof ChangePathPatternParserVisitor.Target target) {
+				target.changeParser(parser);
 			}
 		}
 
@@ -837,8 +838,8 @@ public void accept(Visitor visitor) {
 
 		@Override
 		public void changeParser(PathPatternParser parser) {
-			if (this.delegate instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) this.delegate).changeParser(parser);
+			if (this.delegate instanceof ChangePathPatternParserVisitor.Target target) {
+				target.changeParser(parser);
 			}
 		}
 
@@ -904,11 +905,11 @@ public void accept(Visitor visitor) {
 
 		@Override
 		public void changeParser(PathPatternParser parser) {
-			if (this.left instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
+			if (this.left instanceof ChangePathPatternParserVisitor.Target target) {
+				target.changeParser(parser);
 			}
-			if (this.right instanceof ChangePathPatternParserVisitor.Target) {
-				((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
+			if (this.right instanceof ChangePathPatternParserVisitor.Target target) {
+				target.changeParser(parser);
 			}
 		}
 
@@ -923,7 +924,7 @@ private static class SubPathServerRequestWrapper implements ServerRequest {
 
 		private final ServerRequest request;
 
-		private RequestPath requestPath;
+		private final RequestPath requestPath;
 
 		private final Map<String, Object> attributes;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
index f100a8ad33ae..0f4f30ae3293 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
@@ -68,6 +68,7 @@
  *
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 07.04.2003
  * @see #getHandlerInternal
  * @see #setDefaultHandler
@@ -179,8 +180,8 @@ public PathPatternParser getPatternParser() {
 	@SuppressWarnings("deprecation")
 	public void setAlwaysUseFullPath(boolean alwaysUseFullPath) {
 		this.urlPathHelper.setAlwaysUseFullPath(alwaysUseFullPath);
-		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource) {
-			((UrlBasedCorsConfigurationSource) this.corsConfigurationSource).setAlwaysUseFullPath(alwaysUseFullPath);
+		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
+			urlConfigSource.setAlwaysUseFullPath(alwaysUseFullPath);
 		}
 	}
 
@@ -193,8 +194,8 @@ public void setAlwaysUseFullPath(boolean alwaysUseFullPath) {
 	@SuppressWarnings("deprecation")
 	public void setUrlDecode(boolean urlDecode) {
 		this.urlPathHelper.setUrlDecode(urlDecode);
-		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource) {
-			((UrlBasedCorsConfigurationSource) this.corsConfigurationSource).setUrlDecode(urlDecode);
+		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
+			urlConfigSource.setUrlDecode(urlDecode);
 		}
 	}
 
@@ -207,8 +208,8 @@ public void setUrlDecode(boolean urlDecode) {
 	@SuppressWarnings("deprecation")
 	public void setRemoveSemicolonContent(boolean removeSemicolonContent) {
 		this.urlPathHelper.setRemoveSemicolonContent(removeSemicolonContent);
-		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource) {
-			((UrlBasedCorsConfigurationSource) this.corsConfigurationSource).setRemoveSemicolonContent(removeSemicolonContent);
+		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
+			urlConfigSource.setRemoveSemicolonContent(removeSemicolonContent);
 		}
 	}
 
@@ -220,8 +221,8 @@ public void setRemoveSemicolonContent(boolean removeSemicolonContent) {
 	public void setUrlPathHelper(UrlPathHelper urlPathHelper) {
 		Assert.notNull(urlPathHelper, "UrlPathHelper must not be null");
 		this.urlPathHelper = urlPathHelper;
-		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource) {
-			((UrlBasedCorsConfigurationSource) this.corsConfigurationSource).setUrlPathHelper(urlPathHelper);
+		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
+			urlConfigSource.setUrlPathHelper(urlPathHelper);
 		}
 	}
 
@@ -242,8 +243,8 @@ public UrlPathHelper getUrlPathHelper() {
 	public void setPathMatcher(PathMatcher pathMatcher) {
 		Assert.notNull(pathMatcher, "PathMatcher must not be null");
 		this.pathMatcher = pathMatcher;
-		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource) {
-			((UrlBasedCorsConfigurationSource) this.corsConfigurationSource).setPathMatcher(pathMatcher);
+		if (this.corsConfigurationSource instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
+			urlConfigSource.setPathMatcher(pathMatcher);
 		}
 	}
 
@@ -311,8 +312,8 @@ public void setCorsConfigurations(Map<String, CorsConfiguration> corsConfigurati
 	public void setCorsConfigurationSource(CorsConfigurationSource source) {
 		Assert.notNull(source, "CorsConfigurationSource must not be null");
 		this.corsConfigurationSource = source;
-		if (source instanceof UrlBasedCorsConfigurationSource) {
-			((UrlBasedCorsConfigurationSource) source).setAllowInitLookupPath(false);
+		if (source instanceof UrlBasedCorsConfigurationSource urlConfigSource) {
+			urlConfigSource.setAllowInitLookupPath(false);
 		}
 	}
 
@@ -437,11 +438,11 @@ protected void initInterceptors() {
 	 * @see WebRequestHandlerInterceptorAdapter
 	 */
 	protected HandlerInterceptor adaptInterceptor(Object interceptor) {
-		if (interceptor instanceof HandlerInterceptor) {
-			return (HandlerInterceptor) interceptor;
+		if (interceptor instanceof HandlerInterceptor handlerInterceptor) {
+			return handlerInterceptor;
 		}
-		else if (interceptor instanceof WebRequestInterceptor) {
-			return new WebRequestHandlerInterceptorAdapter((WebRequestInterceptor) interceptor);
+		else if (interceptor instanceof WebRequestInterceptor webRequestInterceptor) {
+			return new WebRequestHandlerInterceptorAdapter(webRequestInterceptor);
 		}
 		else {
 			throw new IllegalArgumentException("Interceptor type not supported: " + interceptor.getClass().getName());
@@ -467,8 +468,8 @@ protected final HandlerInterceptor[] getAdaptedInterceptors() {
 	protected final MappedInterceptor[] getMappedInterceptors() {
 		List<MappedInterceptor> mappedInterceptors = new ArrayList<>(this.adaptedInterceptors.size());
 		for (HandlerInterceptor interceptor : this.adaptedInterceptors) {
-			if (interceptor instanceof MappedInterceptor) {
-				mappedInterceptors.add((MappedInterceptor) interceptor);
+			if (interceptor instanceof MappedInterceptor mappedInterceptor) {
+				mappedInterceptors.add(mappedInterceptor);
 			}
 		}
 		return (!mappedInterceptors.isEmpty() ? mappedInterceptors.toArray(new MappedInterceptor[0]) : null);
@@ -502,8 +503,7 @@ public final HandlerExecutionChain getHandler(HttpServletRequest request) throws
 			return null;
 		}
 		// Bean name or resolved handler?
-		if (handler instanceof String) {
-			String handlerName = (String) handler;
+		if (handler instanceof String handlerName) {
 			handler = obtainApplicationContext().getBean(handlerName);
 		}
 
@@ -600,12 +600,11 @@ protected String initLookupPath(HttpServletRequest request) {
 	 * @see #getAdaptedInterceptors()
 	 */
 	protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpServletRequest request) {
-		HandlerExecutionChain chain = (handler instanceof HandlerExecutionChain ?
-				(HandlerExecutionChain) handler : new HandlerExecutionChain(handler));
+		HandlerExecutionChain chain = (handler instanceof HandlerExecutionChain handlerExecutionChain ?
+				handlerExecutionChain : new HandlerExecutionChain(handler));
 
 		for (HandlerInterceptor interceptor : this.adaptedInterceptors) {
-			if (interceptor instanceof MappedInterceptor) {
-				MappedInterceptor mappedInterceptor = (MappedInterceptor) interceptor;
+			if (interceptor instanceof MappedInterceptor mappedInterceptor) {
 				if (mappedInterceptor.matches(request)) {
 					chain.addInterceptor(mappedInterceptor.getInterceptor());
 				}
@@ -622,8 +621,8 @@ protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpSer
 	 * @since 5.2
 	 */
 	protected boolean hasCorsConfigurationSource(Object handler) {
-		if (handler instanceof HandlerExecutionChain) {
-			handler = ((HandlerExecutionChain) handler).getHandler();
+		if (handler instanceof HandlerExecutionChain handlerExecutionChain) {
+			handler = handlerExecutionChain.getHandler();
 		}
 		return (handler instanceof CorsConfigurationSource || this.corsConfigurationSource != null);
 	}
@@ -638,11 +637,11 @@ protected boolean hasCorsConfigurationSource(Object handler) {
 	@Nullable
 	protected CorsConfiguration getCorsConfiguration(Object handler, HttpServletRequest request) {
 		Object resolvedHandler = handler;
-		if (handler instanceof HandlerExecutionChain) {
-			resolvedHandler = ((HandlerExecutionChain) handler).getHandler();
+		if (handler instanceof HandlerExecutionChain handlerExecutionChain) {
+			resolvedHandler = handlerExecutionChain.getHandler();
 		}
-		if (resolvedHandler instanceof CorsConfigurationSource) {
-			return ((CorsConfigurationSource) resolvedHandler).getCorsConfiguration(request);
+		if (resolvedHandler instanceof CorsConfigurationSource configSource) {
+			return configSource.getCorsConfiguration(request);
 		}
 		return null;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
index 47acaf4bc526..00ecd4f6909b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,8 +43,7 @@ protected boolean shouldApplyTo(HttpServletRequest request, @Nullable Object han
 		if (handler == null) {
 			return super.shouldApplyTo(request, null);
 		}
-		else if (handler instanceof HandlerMethod) {
-			HandlerMethod handlerMethod = (HandlerMethod) handler;
+		else if (handler instanceof HandlerMethod handlerMethod) {
 			handler = handlerMethod.getBean();
 			return super.shouldApplyTo(request, handler);
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
index 2073087a1508..39480d914744 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
@@ -273,8 +273,8 @@ protected void processCandidateBean(String beanName) {
 	 * @see #getMappingForMethod
 	 */
 	protected void detectHandlerMethods(Object handler) {
-		Class<?> handlerType = (handler instanceof String ?
-				obtainApplicationContext().getType((String) handler) : handler.getClass());
+		Class<?> handlerType = (handler instanceof String beanName ?
+				obtainApplicationContext().getType(beanName) : handler.getClass());
 
 		if (handlerType != null) {
 			Class<?> userType = ClassUtils.getUserClass(handlerType);
@@ -339,8 +339,8 @@ protected void registerHandlerMethod(Object handler, Method method, T mapping) {
 	 * @return the created HandlerMethod
 	 */
 	protected HandlerMethod createHandlerMethod(Object handler, Method method) {
-		if (handler instanceof String) {
-			return new HandlerMethod((String) handler,
+		if (handler instanceof String beanName) {
+			return new HandlerMethod(beanName,
 					obtainApplicationContext().getAutowireCapableBeanFactory(),
 					obtainApplicationContext(),
 					method);
@@ -479,15 +479,14 @@ protected HandlerMethod handleNoMatch(Set<T> mappings, String lookupPath, HttpSe
 	@Override
 	protected boolean hasCorsConfigurationSource(Object handler) {
 		return super.hasCorsConfigurationSource(handler) ||
-				(handler instanceof HandlerMethod &&
-						this.mappingRegistry.getCorsConfiguration((HandlerMethod) handler) != null);
+				(handler instanceof HandlerMethod handerMethod &&
+						this.mappingRegistry.getCorsConfiguration(handerMethod) != null);
 	}
 
 	@Override
 	protected CorsConfiguration getCorsConfiguration(Object handler, HttpServletRequest request) {
 		CorsConfiguration corsConfig = super.getCorsConfiguration(handler, request);
-		if (handler instanceof HandlerMethod) {
-			HandlerMethod handlerMethod = (HandlerMethod) handler;
+		if (handler instanceof HandlerMethod handlerMethod) {
 			if (handlerMethod.equals(PREFLIGHT_AMBIGUOUS_MATCH)) {
 				return AbstractHandlerMethodMapping.ALLOW_CORS_CONFIG;
 			}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
index f244dfdada25..812855a1f19a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
@@ -163,8 +163,7 @@ protected Object getHandlerInternal(HttpServletRequest request) throws Exception
 			}
 			if (rawHandler != null) {
 				// Bean name or resolved handler?
-				if (rawHandler instanceof String) {
-					String handlerName = (String) rawHandler;
+				if (rawHandler instanceof String handlerName) {
 					rawHandler = obtainApplicationContext().getBean(handlerName);
 				}
 				validateHandler(rawHandler, request);
@@ -211,8 +210,7 @@ protected Object lookupHandler(
 		}
 		PathPattern pattern = matches.get(0);
 		handler = this.pathPatternHandlerMap.get(pattern);
-		if (handler instanceof String) {
-			String handlerName = (String) handler;
+		if (handler instanceof String handlerName) {
 			handler = obtainApplicationContext().getBean(handlerName);
 		}
 		validateHandler(handler, request);
@@ -270,8 +268,7 @@ else if (useTrailingSlashMatch()) {
 				}
 			}
 			// Bean name or resolved handler?
-			if (handler instanceof String) {
-				String handlerName = (String) handler;
+			if (handler instanceof String handlerName) {
 				handler = obtainApplicationContext().getBean(handlerName);
 			}
 			validateHandler(handler, request);
@@ -302,8 +299,7 @@ private Object getDirectMatch(String urlPath, HttpServletRequest request) throws
 		Object handler = this.handlerMap.get(urlPath);
 		if (handler != null) {
 			// Bean name or resolved handler?
-			if (handler instanceof String) {
-				String handlerName = (String) handler;
+			if (handler instanceof String handlerName) {
 				handler = obtainApplicationContext().getBean(handlerName);
 			}
 			validateHandler(handler, request);
@@ -413,8 +409,7 @@ protected void registerHandler(String urlPath, Object handler) throws BeansExcep
 		Object resolvedHandler = handler;
 
 		// Eagerly resolve handler if referencing singleton via name.
-		if (!this.lazyInitHandlers && handler instanceof String) {
-			String handlerName = (String) handler;
+		if (!this.lazyInitHandlers && handler instanceof String handlerName) {
 			ApplicationContext applicationContext = obtainApplicationContext();
 			if (applicationContext.isSingleton(handlerName)) {
 				resolvedHandler = applicationContext.getBean(handlerName);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
index 61645c5c8de5..c6f90e8c64fa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	@Nullable
 	private Integer defaultStatusCode;
 
-	private Map<String, Integer> statusCodes = new HashMap<>();
+	private final Map<String, Integer> statusCodes = new HashMap<>();
 
 	@Nullable
 	private String exceptionAttribute = DEFAULT_EXCEPTION_ATTRIBUTE;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
index a3028dcb27d7..80ff163790ad 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,8 +75,7 @@ public void afterCompletion(HttpServletRequest request, HttpServletResponse resp
 
 	@Override
 	public void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler) {
-		if (this.requestInterceptor instanceof AsyncWebRequestInterceptor) {
-			AsyncWebRequestInterceptor asyncInterceptor = (AsyncWebRequestInterceptor) this.requestInterceptor;
+		if (this.requestInterceptor instanceof AsyncWebRequestInterceptor asyncInterceptor) {
 			DispatcherServletWebRequest webRequest = new DispatcherServletWebRequest(request, response);
 			asyncInterceptor.afterConcurrentHandlingStarted(webRequest);
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
index 6cf029898ce2..dd43a0ae3ab4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
@@ -67,8 +67,7 @@ public void setViewName(@Nullable String viewName) {
 	 */
 	@Nullable
 	public String getViewName() {
-		if (this.view instanceof String) {
-			String viewName = (String) this.view;
+		if (this.view instanceof String viewName) {
 			if (getStatusCode() != null && getStatusCode().is3xxRedirection()) {
 				return viewName.startsWith("redirect:") ? viewName : "redirect:" + viewName;
 			}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
index 450ec25c9a81..b0e94f7f0b2c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,9 +80,9 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
 
 	private PathMatcher pathMatcher = defaultPathMatcher;
 
-	private Map<PathPattern, Integer> cacheMappings = new HashMap<>();
+	private final Map<PathPattern, Integer> cacheMappings = new HashMap<>();
 
-	private Map<PathPattern, CacheControl> cacheControlMappings = new HashMap<>();
+	private final Map<PathPattern, CacheControl> cacheControlMappings = new HashMap<>();
 
 
 	/**
@@ -215,8 +215,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 		}
 
 		if (!ObjectUtils.isEmpty(this.cacheControlMappings)) {
-			CacheControl control = (path instanceof PathContainer ?
-					lookupCacheControl((PathContainer) path) : lookupCacheControl((String) path));
+			CacheControl control = (path instanceof PathContainer pathContainer ?
+					lookupCacheControl(pathContainer) : lookupCacheControl((String) path));
 			if (control != null) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("Applying " + control);
@@ -227,8 +227,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 		}
 
 		if (!ObjectUtils.isEmpty(this.cacheMappings)) {
-			Integer cacheSeconds = (path instanceof PathContainer ?
-					lookupCacheSeconds((PathContainer) path) : lookupCacheSeconds((String) path));
+			Integer cacheSeconds = (path instanceof PathContainer pathContainer ?
+					lookupCacheSeconds(pathContainer) : lookupCacheSeconds((String) path));
 			if (cacheSeconds != null) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("Applying cacheSeconds " + cacheSeconds);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
index 615ce1149414..3adf3ca633d7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
@@ -470,10 +470,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof RequestMappingInfo)) {
+		if (!(other instanceof RequestMappingInfo otherInfo)) {
 			return false;
 		}
-		RequestMappingInfo otherInfo = (RequestMappingInfo) other;
 		return (getActivePatternsCondition().equals(otherInfo.getActivePatternsCondition()) &&
 				this.methodsCondition.equals(otherInfo.methodsCondition) &&
 				this.paramsCondition.equals(otherInfo.paramsCondition) &&
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
index f498494a3a21..6aa15c723521 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,6 +63,7 @@
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @author Brian Clozel
+ * @author Sam Brannen
  * @since 3.1
  */
 public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodProcessor {
@@ -149,8 +150,7 @@ public Object resolveArgument(MethodParameter parameter, @Nullable ModelAndViewC
 	private Type getHttpEntityType(MethodParameter parameter) {
 		Assert.isAssignable(HttpEntity.class, parameter.getParameterType());
 		Type parameterType = parameter.getGenericParameterType();
-		if (parameterType instanceof ParameterizedType) {
-			ParameterizedType type = (ParameterizedType) parameterType;
+		if (parameterType instanceof ParameterizedType type) {
 			if (type.getActualTypeArguments().length != 1) {
 				throw new IllegalArgumentException("Expected single generic parameter on '" +
 						parameter.getParameterName() + "' in method " + parameter.getMethod());
@@ -178,10 +178,10 @@ public void handleReturnValue(@Nullable Object returnValue, MethodParameter retu
 		ServletServerHttpResponse outputMessage = createOutputMessage(webRequest);
 
 		Assert.isInstanceOf(HttpEntity.class, returnValue);
-		HttpEntity<?> responseEntity = (HttpEntity<?>) returnValue;
+		HttpEntity<?> httpEntity = (HttpEntity<?>) returnValue;
 
 		HttpHeaders outputHeaders = outputMessage.getHeaders();
-		HttpHeaders entityHeaders = responseEntity.getHeaders();
+		HttpHeaders entityHeaders = httpEntity.getHeaders();
 		if (!entityHeaders.isEmpty()) {
 			entityHeaders.forEach((key, value) -> {
 				if (HttpHeaders.VARY.equals(key) && outputHeaders.containsKey(HttpHeaders.VARY)) {
@@ -196,8 +196,8 @@ public void handleReturnValue(@Nullable Object returnValue, MethodParameter retu
 			});
 		}
 
-		if (responseEntity instanceof ResponseEntity) {
-			int returnStatus = ((ResponseEntity<?>) responseEntity).getStatusCodeValue();
+		if (httpEntity instanceof ResponseEntity<?> responseEntity) {
+			int returnStatus = responseEntity.getStatusCodeValue();
 			outputMessage.getServletResponse().setStatus(returnStatus);
 			if (returnStatus == 200) {
 				HttpMethod method = inputMessage.getMethod();
@@ -216,7 +216,7 @@ else if (returnStatus / 100 == 3) {
 		}
 
 		// Try even with null body. ResponseBodyAdvice could get involved.
-		writeWithMessageConverters(responseEntity.getBody(), returnType, inputMessage, outputMessage);
+		writeWithMessageConverters(httpEntity.getBody(), returnType, inputMessage, outputMessage);
 
 		// Ensure headers are flushed even if no body was written.
 		outputMessage.flush();
@@ -261,8 +261,8 @@ private boolean isResourceNotModified(ServletServerHttpRequest request, ServletS
 	private void saveFlashAttributes(ModelAndViewContainer mav, NativeWebRequest request, String location) {
 		mav.setRedirectModelScenario(true);
 		ModelMap model = mav.getModel();
-		if (model instanceof RedirectAttributes) {
-			Map<String, ?> flashAttributes = ((RedirectAttributes) model).getFlashAttributes();
+		if (model instanceof RedirectAttributes redirectAttributes) {
+			Map<String, ?> flashAttributes = redirectAttributes.getFlashAttributes();
 			if (!CollectionUtils.isEmpty(flashAttributes)) {
 				HttpServletRequest req = request.getNativeRequest(HttpServletRequest.class);
 				HttpServletResponse res = request.getNativeResponse(HttpServletResponse.class);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChain.java
index f72115ab8289..f5e483490781 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyAdviceChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,8 +61,8 @@ static <T> List<T> getAdviceByType(@Nullable List<Object> requestResponseBodyAdv
 		if (requestResponseBodyAdvice != null) {
 			List<T> result = new ArrayList<>();
 			for (Object advice : requestResponseBodyAdvice) {
-				Class<?> beanType = (advice instanceof ControllerAdviceBean ?
-						((ControllerAdviceBean) advice).getBeanType() : advice.getClass());
+				Class<?> beanType = (advice instanceof ControllerAdviceBean adviceBean ?
+						adviceBean.getBeanType() : advice.getClass());
 				if (beanType != null && adviceType.isAssignableFrom(beanType)) {
 					result.add((T) advice);
 				}
@@ -153,8 +153,7 @@ private <A> List<A> getMatchingAdvice(MethodParameter parameter, Class<? extends
 		}
 		List<A> result = new ArrayList<>(availableAdvice.size());
 		for (Object advice : availableAdvice) {
-			if (advice instanceof ControllerAdviceBean) {
-				ControllerAdviceBean adviceBean = (ControllerAdviceBean) advice;
+			if (advice instanceof ControllerAdviceBean adviceBean) {
 				if (!adviceBean.isApplicableToBeanType(parameter.getContainingClass())) {
 					continue;
 				}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
index 2c96722b14ef..c4f3076efa55 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
@@ -230,8 +230,7 @@ protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(
 		List<MediaType> mediaTypes = ex.getSupportedMediaTypes();
 		if (!CollectionUtils.isEmpty(mediaTypes)) {
 			headers.setAccept(mediaTypes);
-			if (request instanceof ServletWebRequest) {
-				ServletWebRequest servletWebRequest = (ServletWebRequest) request;
+			if (request instanceof ServletWebRequest servletWebRequest) {
 				if (HttpMethod.PATCH.equals(servletWebRequest.getHttpMethod())) {
 					headers.setAcceptPatch(mediaTypes);
 				}
@@ -437,8 +436,7 @@ protected ResponseEntity<Object> handleNoHandlerFoundException(
 	protected ResponseEntity<Object> handleAsyncRequestTimeoutException(
 			AsyncRequestTimeoutException ex, HttpHeaders headers, HttpStatus status, WebRequest webRequest) {
 
-		if (webRequest instanceof ServletWebRequest) {
-			ServletWebRequest servletWebRequest = (ServletWebRequest) webRequest;
+		if (webRequest instanceof ServletWebRequest servletWebRequest) {
 			HttpServletResponse response = servletWebRequest.getResponse();
 			if (response != null && response.isCommitted()) {
 				if (logger.isWarnEnabled()) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
index 4934ea9a52ed..80d63ad1f113 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
@@ -50,8 +50,7 @@ public boolean supportsReturnType(MethodParameter returnType) {
 	public void handleReturnValue(@Nullable Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception {
 
-		if (returnValue instanceof View) {
-			View view = (View) returnValue;
+		if (returnValue instanceof View view) {
 			mavContainer.setView(view);
 			if (view instanceof SmartView && ((SmartView) view).isRedirectView()) {
 				mavContainer.setRedirectModelScenario(true);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
index e27e2ac1dab6..319381462562 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -235,10 +235,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ContentChunkInfo)) {
+			if (!(other instanceof ContentChunkInfo otherCci)) {
 				return false;
 			}
-			ContentChunkInfo otherCci = (ContentChunkInfo) other;
 			return (this.start == otherCci.start && this.end == otherCci.end);
 		}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
index 34c782c52990..002705603f6d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
@@ -237,12 +237,12 @@ private boolean isResourceUnderLocation(Resource resource, Resource location) th
 			resourcePath = resource.getURL().toExternalForm();
 			locationPath = StringUtils.cleanPath(location.getURL().toString());
 		}
-		else if (resource instanceof ClassPathResource) {
-			resourcePath = ((ClassPathResource) resource).getPath();
+		else if (resource instanceof ClassPathResource classPathResource) {
+			resourcePath = classPathResource.getPath();
 			locationPath = StringUtils.cleanPath(((ClassPathResource) location).getPath());
 		}
-		else if (resource instanceof ServletContextResource) {
-			resourcePath = ((ServletContextResource) resource).getPath();
+		else if (resource instanceof ServletContextResource servletContextResource) {
+			resourcePath = servletContextResource.getPath();
 			locationPath = StringUtils.cleanPath(((ServletContextResource) location).getPath());
 		}
 		else {
@@ -301,11 +301,8 @@ private boolean isInvalidEncodedPath(String resourcePath) {
 					return true;
 				}
 			}
-			catch (IllegalArgumentException ex) {
-				// May not be possible to decode...
-			}
-			catch (UnsupportedEncodingException ex) {
-				// Should never happen...
+			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
+				// May not be possible to decode... | Should never happen...
 			}
 		}
 		return false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 87cf98da13b1..f0455d303c40 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -484,8 +484,7 @@ protected void initAllowedLocations() {
 			return;
 		}
 		for (int i = getResourceResolvers().size() - 1; i >= 0; i--) {
-			if (getResourceResolvers().get(i) instanceof PathResourceResolver) {
-				PathResourceResolver pathResolver = (PathResourceResolver) getResourceResolvers().get(i);
+			if (getResourceResolvers().get(i) instanceof PathResourceResolver pathResolver) {
 				if (ObjectUtils.isEmpty(pathResolver.getAllowedLocations())) {
 					pathResolver.setAllowedLocations(getLocations().toArray(new Resource[0]));
 				}
@@ -681,11 +680,8 @@ private boolean isInvalidEncodedPath(String path) {
 					return true;
 				}
 			}
-			catch (IllegalArgumentException ex) {
-				// May not be possible to decode...
-			}
-			catch (UnsupportedEncodingException ex) {
-				// Should never happen...
+			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
+				// May not be possible to decode... | Should never happen...
 			}
 		}
 		return false;
@@ -788,8 +784,8 @@ protected void setHeaders(HttpServletResponse response, Resource resource, @Null
 			response.setContentType(mediaType.toString());
 		}
 
-		if (resource instanceof HttpResource) {
-			HttpHeaders resourceHeaders = ((HttpResource) resource).getResponseHeaders();
+		if (resource instanceof HttpResource httpResource) {
+			HttpHeaders resourceHeaders = httpResource.getResponseHeaders();
 			resourceHeaders.forEach((headerName, headerValues) -> {
 				boolean first = true;
 				for (String headerValue : headerValues) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
index 7a2a6e2a67c6..afd47b83b3c0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -154,8 +154,7 @@ protected void detectResourceHandlers(ApplicationContext appContext) {
 		for (SimpleUrlHandlerMapping mapping : mappings) {
 			for (String pattern : mapping.getHandlerMap().keySet()) {
 				Object handler = mapping.getHandlerMap().get(pattern);
-				if (handler instanceof ResourceHttpRequestHandler) {
-					ResourceHttpRequestHandler resourceHandler = (ResourceHttpRequestHandler) handler;
+				if (handler instanceof ResourceHttpRequestHandler resourceHandler) {
 					this.handlerMap.put(pattern, resourceHandler);
 				}
 			}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
index f4800afc4d24..f2469483abc3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@
  */
 public class VersionResourceResolver extends AbstractResourceResolver {
 
-	private AntPathMatcher pathMatcher = new AntPathMatcher();
+	private final AntPathMatcher pathMatcher = new AntPathMatcher();
 
 	/** Map from path pattern -> VersionStrategy. */
 	private final Map<String, VersionStrategy> versionStrategyMap = new LinkedHashMap<>();
@@ -311,8 +311,8 @@ public InputStream getInputStream() throws IOException {
 
 		@Override
 		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers = (this.original instanceof HttpResource ?
-					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
+			HttpHeaders headers = (this.original instanceof HttpResource httpResource ?
+					httpResource.getResponseHeaders() : new HttpHeaders());
 			headers.setETag("W/\"" + this.version + "\"");
 			return headers;
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
index b02d169ea8d0..b0f3e2bd04a6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
  */
 public class JspAwareRequestContext extends RequestContext {
 
-	private PageContext pageContext;
+	private final PageContext pageContext;
 
 
 	/**
@@ -115,13 +115,13 @@ private static class JstlPageLocaleResolver {
 		@Nullable
 		public static Locale getJstlLocale(PageContext pageContext) {
 			Object localeObject = Config.find(pageContext, Config.FMT_LOCALE);
-			return (localeObject instanceof Locale ? (Locale) localeObject : null);
+			return (localeObject instanceof Locale locale ? locale : null);
 		}
 
 		@Nullable
 		public static TimeZone getJstlTimeZone(PageContext pageContext) {
 			Object timeZoneObject = Config.find(pageContext, Config.FMT_TIME_ZONE);
-			return (timeZoneObject instanceof TimeZone ? (TimeZone) timeZoneObject : null);
+			return (timeZoneObject instanceof TimeZone timeZone ? timeZone : null);
 		}
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
index db97efc2bae6..2de52f3cbca5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
@@ -95,15 +95,15 @@ public class RequestContext {
 	protected static final boolean jstlPresent = ClassUtils.isPresent(
 			"jakarta.servlet.jsp.jstl.core.Config", RequestContext.class.getClassLoader());
 
-	private HttpServletRequest request;
+	private final HttpServletRequest request;
 
 	@Nullable
-	private HttpServletResponse response;
+	private final HttpServletResponse response;
 
 	@Nullable
-	private Map<String, Object> model;
+	private final Map<String, Object> model;
 
-	private WebApplicationContext webApplicationContext;
+	private final WebApplicationContext webApplicationContext;
 
 	@Nullable
 	private Locale locale;
@@ -118,7 +118,7 @@ public class RequestContext {
 	private Boolean defaultHtmlEscape;
 
 	@Nullable
-	private Boolean responseEncodedHtmlEscape;
+	private final Boolean responseEncodedHtmlEscape;
 
 	private UrlPathHelper urlPathHelper;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
index 3ad6c33b9c6e..f8b41e029527 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
  *
  * <p><h1><a name="equality-contract">Equality Contract</a></h1>
  * For single-valued objects equality is first tested using standard {@link Object#equals Java equality}. As
- * such, user code should endeavour to implement {@link Object#equals} to speed up the comparison process. If
+ * such, user code should endeavor to implement {@link Object#equals} to speed up the comparison process. If
  * {@link Object#equals} returns {@code false} then an attempt is made at an
  * {@link #exhaustiveCompare exhaustive comparison} with the aim being to <strong>prove</strong> equality rather
  * than disprove it.
@@ -86,11 +86,11 @@ else if (boundValue == null) {
 			if (boundValue.getClass().isArray()) {
 				selected = collectionCompare(CollectionUtils.arrayToList(boundValue), candidateValue, bindStatus);
 			}
-			else if (boundValue instanceof Collection) {
-				selected = collectionCompare((Collection<?>) boundValue, candidateValue, bindStatus);
+			else if (boundValue instanceof Collection<?> collection) {
+				selected = collectionCompare(collection, candidateValue, bindStatus);
 			}
-			else if (boundValue instanceof Map) {
-				selected = mapCompare((Map<?, ?>) boundValue, candidateValue, bindStatus);
+			else if (boundValue instanceof Map<?, ?> map) {
+				selected = mapCompare(map, candidateValue, bindStatus);
 			}
 		}
 		if (!selected) {
@@ -163,9 +163,8 @@ else if (ObjectUtils.getDisplayString(boundValue).equals(candidateDisplayString)
 			return true;
 		}
 
-		if (editor != null && candidate instanceof String) {
+		if (editor != null && candidate instanceof String candidateAsString) {
 			// Try PE-based comparison (PE should *not* be allowed to escape creating thread)
-			String candidateAsString = (String) candidate;
 			Object candidateAsValue;
 			if (convertedValueCache != null && convertedValueCache.containsKey(editor)) {
 				candidateAsValue = convertedValueCache.get(editor);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
index d7bf2fa33762..53cfc10f27d6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public void render(@Nullable Map<String, ?> model, HttpServletRequest request, H
 	/** Map from view key to View instance, synchronized for View creation. */
 	@SuppressWarnings("serial")
 	private final Map<Object, View> viewCreationCache =
-			new LinkedHashMap<Object, View>(DEFAULT_CACHE_LIMIT, 0.75f, true) {
+			new LinkedHashMap<>(DEFAULT_CACHE_LIMIT, 0.75f, true) {
 				@Override
 				protected boolean removeEldestEntry(Map.Entry<Object, View> eldest) {
 					if (size() > getCacheLimit()) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
index 3c1699a5abd4..4fdb0a2c8835 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -332,8 +332,7 @@ private List<View> getCandidateViews(String viewName, Locale locale, List<MediaT
 	@Nullable
 	private View getBestView(List<View> candidateViews, List<MediaType> requestedMediaTypes, RequestAttributes attrs) {
 		for (View candidateView : candidateViews) {
-			if (candidateView instanceof SmartView) {
-				SmartView smartView = (SmartView) candidateView;
+			if (candidateView instanceof SmartView smartView) {
 				if (smartView.isRedirectView()) {
 					return candidateView;
 				}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
index e85cea4415e6..176cf840a526 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,8 +212,7 @@ protected void writeContent(OutputStream stream, Object object) throws IOExcepti
 			Class<?> serializationView = null;
 			FilterProvider filters = null;
 
-			if (value instanceof MappingJacksonValue) {
-				MappingJacksonValue container = (MappingJacksonValue) value;
+			if (value instanceof MappingJacksonValue container) {
 				value = container.getValue();
 				serializationView = container.getSerializationView();
 				filters = container.getFilters();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
index 57e627e89cb4..f7626a9debba 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/script/ScriptTemplateView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -470,10 +470,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof EngineKey)) {
+			if (!(other instanceof EngineKey otherKey)) {
 				return false;
 			}
-			EngineKey otherKey = (EngineKey) other;
 			return (this.engineName.equals(otherKey.engineName) && Arrays.equals(this.scripts, otherKey.scripts));
 		}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
index 1d3c29b9395e..e80d827832b0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -302,32 +302,31 @@ protected Class<?>[] getSourceTypes() {
 	/**
 	 * Convert the supplied {@link Object} into an XSLT {@link Source} if the
 	 * {@link Object} type is {@link #getSourceTypes() supported}.
-	 * @param source the original source object
+	 * @param sourceObject the original source object
 	 * @return the adapted XSLT Source
 	 * @throws IllegalArgumentException if the given Object is not of a supported type
 	 */
-	protected Source convertSource(Object source) throws Exception {
-		if (source instanceof Source) {
-			return (Source) source;
+	protected Source convertSource(Object sourceObject) throws Exception {
+		if (sourceObject instanceof Source source) {
+			return source;
 		}
-		else if (source instanceof Document) {
-			return new DOMSource(((Document) source).getDocumentElement());
+		else if (sourceObject instanceof Document document) {
+			return new DOMSource(document.getDocumentElement());
 		}
-		else if (source instanceof Node) {
-			return new DOMSource((Node) source);
+		else if (sourceObject instanceof Node node) {
+			return new DOMSource(node);
 		}
-		else if (source instanceof Reader) {
-			return new StreamSource((Reader) source);
+		else if (sourceObject instanceof Reader reader) {
+			return new StreamSource(reader);
 		}
-		else if (source instanceof InputStream) {
-			return new StreamSource((InputStream) source);
+		else if (sourceObject instanceof InputStream inputStream) {
+			return new StreamSource(inputStream);
 		}
-		else if (source instanceof Resource) {
-			Resource resource = (Resource) source;
+		else if (sourceObject instanceof Resource resource) {
 			return new StreamSource(resource.getInputStream(), resource.getURI().toASCIIString());
 		}
 		else {
-			throw new IllegalArgumentException("Value '" + source + "' cannot be converted to XSLT Source");
+			throw new IllegalArgumentException("Value '" + sourceObject + "' cannot be converted to XSLT Source");
 		}
 	}
 
@@ -481,8 +480,7 @@ protected Source getStylesheetSource() {
 	 * @param source the XSLT Source to close (may be {@code null})
 	 */
 	private void closeSourceIfNecessary(@Nullable Source source) {
-		if (source instanceof StreamSource) {
-			StreamSource streamSource = (StreamSource) source;
+		if (source instanceof StreamSource streamSource) {
 			if (streamSource.getReader() != null) {
 				try {
 					streamSource.getReader().close();

From b51813e40853af56ffeca37db08408d02d6c60a5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 17 Oct 2021 19:04:32 +0200
Subject: [PATCH 270/735] Apply "instanceof pattern matching" in
 spring-websocket

This commit also applies additional clean-up tasks such as the following.

- final fields
- diamond operator (<>) for anonymous inner classes

This has only been applied to `src/main/java`.
---
 .../web/socket/CloseStatus.java               |  5 ++---
 .../web/socket/WebSocketHttpHeaders.java      |  5 ++---
 .../client/WebSocketConnectionManager.java    | 13 ++++++------
 .../messaging/DefaultSimpUserRegistry.java    | 14 ++++++-------
 .../HttpSessionHandshakeInterceptor.java      |  9 ++++----
 .../client/DefaultTransportRequest.java       |  4 ++--
 .../socket/sockjs/client/SockJsClient.java    | 21 +++++++------------
 .../sockjs/client/UndertowXhrTransport.java   |  8 +++----
 .../sockjs/client/XhrClientSockJsSession.java |  6 +++---
 .../web/socket/sockjs/frame/SockJsFrame.java  |  5 ++---
 10 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java b/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java
index 493f009283a4..fe9972e7c875 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -209,10 +209,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof CloseStatus)) {
+		if (!(other instanceof CloseStatus otherStatus)) {
 			return false;
 		}
-		CloseStatus otherStatus = (CloseStatus) other;
 		return (this.code == otherStatus.code && ObjectUtils.nullSafeEquals(this.reason, otherStatus.reason));
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java
index 84a3503bfc93..cb30c423bbcf 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -311,10 +311,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof WebSocketHttpHeaders)) {
+		if (!(other instanceof WebSocketHttpHeaders otherHeaders)) {
 			return false;
 		}
-		WebSocketHttpHeaders otherHeaders = (WebSocketHttpHeaders) other;
 		return this.headers.equals(otherHeaders.headers);
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java
index 989100f93598..c2ad134e8e98 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
  * this will be done automatically when the Spring ApplicationContext is refreshed.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 4.0
  */
 public class WebSocketConnectionManager extends ConnectionManagerSupport {
@@ -46,7 +47,7 @@ public class WebSocketConnectionManager extends ConnectionManagerSupport {
 	@Nullable
 	private WebSocketSession webSocketSession;
 
-	private WebSocketHttpHeaders headers = new WebSocketHttpHeaders();
+	private final WebSocketHttpHeaders headers = new WebSocketHttpHeaders();
 
 
 	public WebSocketConnectionManager(WebSocketClient client,
@@ -116,16 +117,16 @@ public HttpHeaders getHeaders() {
 
 	@Override
 	public void startInternal() {
-		if (this.client instanceof Lifecycle && !((Lifecycle) this.client).isRunning()) {
-			((Lifecycle) this.client).start();
+		if (this.client instanceof Lifecycle lifecycle && !lifecycle.isRunning()) {
+			lifecycle.start();
 		}
 		super.startInternal();
 	}
 
 	@Override
 	public void stopInternal() throws Exception {
-		if (this.client instanceof Lifecycle && ((Lifecycle) this.client).isRunning()) {
-			((Lifecycle) this.client).stop();
+		if (this.client instanceof Lifecycle lifecycle && lifecycle.isRunning()) {
+			lifecycle.stop();
 		}
 		super.stopInternal();
 	}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java
index 5bef6ac61fc4..ba9d1f9e5401 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
  * track of connected users and their subscriptions.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 4.2
  */
 public class DefaultSimpUserRegistry implements SimpUserRegistry, SmartApplicationListener {
@@ -105,8 +106,8 @@ else if (event instanceof SessionConnectedEvent) {
 				return;
 			}
 			String name = user.getName();
-			if (user instanceof DestinationUserNameProvider) {
-				name = ((DestinationUserNameProvider) user).getDestinationUserName();
+			if (user instanceof DestinationUserNameProvider destinationUserNameProvider) {
+				name = destinationUserNameProvider.getDestinationUserName();
 			}
 			synchronized (this.sessionLock) {
 				LocalSimpUser simpUser = this.users.get(name);
@@ -238,7 +239,7 @@ void removeSession(String sessionId) {
 		@Override
 		public boolean equals(@Nullable Object other) {
 			return (this == other ||
-					(other instanceof SimpUser && getName().equals(((SimpUser) other).getName())));
+					(other instanceof SimpUser otherSimpUser && getName().equals(otherSimpUser.getName())));
 		}
 
 		@Override
@@ -294,7 +295,7 @@ void removeSubscription(String id) {
 		@Override
 		public boolean equals(@Nullable Object other) {
 			return (this == other ||
-					(other instanceof SimpSubscription && getId().equals(((SimpSubscription) other).getId())));
+					(other instanceof SimpSubscription otherSubscription && getId().equals(otherSubscription.getId())));
 		}
 
 		@Override
@@ -346,10 +347,9 @@ public boolean equals(@Nullable Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof SimpSubscription)) {
+			if (!(other instanceof SimpSubscription otherSubscription)) {
 				return false;
 			}
-			SimpSubscription otherSubscription = (SimpSubscription) other;
 			return (getId().equals(otherSubscription.getId()) &&
 					getSession().getId().equals(otherSubscription.getSession().getId()));
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java
index ba020c32fe82..8ce26a371123 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@
 
 /**
  * An interceptor to copy information from the HTTP session to the "handshake
- * attributes" map to made available via{@link WebSocketSession#getAttributes()}.
+ * attributes" map to be made available via {@link WebSocketSession#getAttributes()}.
  *
- * <p>Copies a subset or all HTTP session attributes and/or the HTTP session id
+ * <p>Copies a subset or all HTTP session attributes and/or the HTTP session ID
  * under the key {@link #HTTP_SESSION_ID_ATTR_NAME}.
  *
  * @author Rossen Stoyanchev
@@ -164,8 +164,7 @@ public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse res
 
 	@Nullable
 	private HttpSession getSession(ServerHttpRequest request) {
-		if (request instanceof ServletServerHttpRequest) {
-			ServletServerHttpRequest serverRequest = (ServletServerHttpRequest) request;
+		if (request instanceof ServletServerHttpRequest serverRequest) {
 			return serverRequest.getServletRequest().getSession(isCreateSession());
 		}
 		return null;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java
index 32eb9c0f4c3a..e69f0e2ce60b 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ class DefaultTransportRequest implements TransportRequest {
 
 	private final TransportType serverTransportType;
 
-	private SockJsMessageCodec codec;
+	private final SockJsMessageCodec codec;
 
 	@Nullable
 	private Principal user;
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java
index 1ac4bc8fba40..6f59483348ea 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,7 @@
  * the transports it is configured with.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 4.1
  * @see <a href="https://github.com/sockjs/sockjs-client">https://github.com/sockjs/sockjs-client</a>
  * @see org.springframework.web.socket.sockjs.client.Transport
@@ -114,8 +115,8 @@ public SockJsClient(List<Transport> transports) {
 
 	private static InfoReceiver initInfoReceiver(List<Transport> transports) {
 		for (Transport transport : transports) {
-			if (transport instanceof InfoReceiver) {
-				return ((InfoReceiver) transport);
+			if (transport instanceof InfoReceiver infoReceiver) {
+				return infoReceiver;
 			}
 		}
 		return new RestTemplateXhrTransport();
@@ -202,11 +203,8 @@ public void start() {
 		if (!isRunning()) {
 			this.running = true;
 			for (Transport transport : this.transports) {
-				if (transport instanceof Lifecycle) {
-					Lifecycle lifecycle = (Lifecycle) transport;
-					if (!lifecycle.isRunning()) {
-						lifecycle.start();
-					}
+				if (transport instanceof Lifecycle lifecycle && !lifecycle.isRunning()) {
+					lifecycle.start();
 				}
 			}
 		}
@@ -217,11 +215,8 @@ public void stop() {
 		if (isRunning()) {
 			this.running = false;
 			for (Transport transport : this.transports) {
-				if (transport instanceof Lifecycle) {
-					Lifecycle lifecycle = (Lifecycle) transport;
-					if (lifecycle.isRunning()) {
-						lifecycle.stop();
-					}
+				if (transport instanceof Lifecycle lifecycle && lifecycle.isRunning()) {
+					lifecycle.stop();
 				}
 			}
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java
index 6d2ace34418e..1e12b914a654 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,7 +148,7 @@ private void executeReceiveRequest(final TransportRequest transportRequest,
 			logger.trace("Starting XHR receive request for " + url);
 		}
 
-		ClientCallback<ClientConnection> clientCallback = new ClientCallback<ClientConnection>() {
+		ClientCallback<ClientConnection> clientCallback = new ClientCallback<>() {
 			@Override
 			public void completed(ClientConnection connection) {
 				ClientRequest request = new ClientRequest().setMethod(Methods.POST).setPath(url.getPath());
@@ -182,7 +182,7 @@ private ClientCallback<ClientExchange> createReceiveCallback(final TransportRequ
 			final URI url, final HttpHeaders headers, final XhrClientSockJsSession sockJsSession,
 			final SettableListenableFuture<WebSocketSession> connectFuture) {
 
-		return new ClientCallback<ClientExchange>() {
+		return new ClientCallback<>() {
 			@Override
 			public void completed(final ClientExchange exchange) {
 				exchange.setResponseListener(new ClientCallback<ClientExchange>() {
@@ -309,7 +309,7 @@ protected ResponseEntity<String> executeRequest(
 	private ClientCallback<ClientExchange> createRequestCallback(final @Nullable String body,
 			final List<ClientResponse> responses, final CountDownLatch latch) {
 
-		return new ClientCallback<ClientExchange>() {
+		return new ClientCallback<>() {
 			@Override
 			public void completed(ClientExchange result) {
 				result.setResponseListener(new ClientCallback<ClientExchange>() {
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrClientSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrClientSockJsSession.java
index 9137473fbf8e..4c3954aa2765 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrClientSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrClientSockJsSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,9 +43,9 @@ public class XhrClientSockJsSession extends AbstractClientSockJsSession {
 
 	private final XhrTransport transport;
 
-	private HttpHeaders headers;
+	private final HttpHeaders headers;
 
-	private HttpHeaders sendHeaders;
+	private final HttpHeaders sendHeaders;
 
 	private final URI sendUrl;
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsFrame.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsFrame.java
index 55580318bec2..35cf0fbff675 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsFrame.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,10 +125,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof SockJsFrame)) {
+		if (!(other instanceof SockJsFrame otherFrame)) {
 			return false;
 		}
-		SockJsFrame otherFrame = (SockJsFrame) other;
 		return (this.type.equals(otherFrame.type) && this.content.equals(otherFrame.content));
 	}
 

From 052ed50f480d290d1d4e4d3721a1425fa33e0e62 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 17 Oct 2021 19:32:53 +0200
Subject: [PATCH 271/735] Fix copy-and-paste error in Javadoc

---
 .../web/reactive/function/client/ClientRequest.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
index 2b61dba1836a..5c24b2ab30d6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
@@ -209,8 +209,8 @@ interface Builder {
 		/**
 		 * Manipulate this request's cookies with the given consumer. The
 		 * map provided to the consumer is "live", so that the consumer can be used to
-		 * {@linkplain MultiValueMap#set(Object, Object) overwrite} existing header values,
-		 * {@linkplain MultiValueMap#remove(Object) remove} values, or use any of the other
+		 * {@linkplain MultiValueMap#set(Object, Object) overwrite} existing cookie values,
+		 * {@linkplain MultiValueMap#remove(Object) remove} cookies, or use any of the other
 		 * {@link MultiValueMap} methods.
 		 * @param cookiesConsumer a function that consumes the cookies map
 		 * @return this builder

From 4978eeff7fe399dff75a800679e50fee4afba130 Mon Sep 17 00:00:00 2001
From: Smile <smile.pabby@gmail.com>
Date: Mon, 18 Oct 2021 10:26:55 +0530
Subject: [PATCH 272/735] Update Javadoc in DefaultResponseErrorHandler

Closes gh-27569
---
 .../web/client/DefaultResponseErrorHandler.java               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index 70e1038871a5..a12095d88fac 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -123,9 +123,9 @@ public void handleError(ClientHttpResponse response) throws IOException {
 	}
 
 	/**
-	 * Return error message with details from the response body, possibly truncated:
+	 * Return error message with details from the response body:
 	 * <pre>
-	 * 404 Not Found: [{'id': 123, 'message': 'my very long... (500 bytes)]
+	 * 404 Not Found: [{'id': 123, 'message': 'my message'}]
 	 * </pre>
 	 */
 	private String getErrorMessage(

From 346b75580267dc5d8d257be198d5841ce4e1add5 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 18 Oct 2021 16:53:39 +0100
Subject: [PATCH 273/735] Fix assertion message in DefaultDataBuffer

Closes gh-27567
---
 .../springframework/core/io/buffer/DefaultDataBuffer.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
index be2155f34332..19346e00c56d 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -462,9 +462,9 @@ public String toString() {
 
 	private void checkIndex(int index, int length) {
 		assertIndex(index >= 0, "index %d must be >= 0", index);
-		assertIndex(length >= 0, "length %d must be >= 0", index);
+		assertIndex(length >= 0, "length %d must be >= 0", length);
 		assertIndex(index <= this.capacity, "index %d must be <= %d", index, this.capacity);
-		assertIndex(length <= this.capacity, "length %d must be <= %d", index, this.capacity);
+		assertIndex(length <= this.capacity, "length %d must be <= %d", length, this.capacity);
 	}
 
 	private void assertIndex(boolean expression, String format, Object... args) {

From bad87be30630b9a3283e092ea70b5579a8c6a9ad Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 18 Oct 2021 17:04:11 +0100
Subject: [PATCH 274/735] Fix checkstyle warning

See gh-27569
---
 .../springframework/web/client/DefaultResponseErrorHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index a12095d88fac..505c51fff699 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -123,7 +123,7 @@ public void handleError(ClientHttpResponse response) throws IOException {
 	}
 
 	/**
-	 * Return error message with details from the response body:
+	 * Return error message with details from the response body. For example:
 	 * <pre>
 	 * 404 Not Found: [{'id': 123, 'message': 'my message'}]
 	 * </pre>

From 2a3c9e403f7cf016c90949eb7fc1f8bcf0db1f98 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Tue, 19 Oct 2021 10:16:27 +0200
Subject: [PATCH 275/735] Revert "Polishing"

This reverts commit bfa01b35df42c526253866a4b601e8be83746a4b.
---
 .../src/main/java/org/springframework/util/MimeType.java      | 4 ++--
 .../src/main/java/org/springframework/http/MediaType.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
index aa4ef6f53a31..b6e1ff2ff3de 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeType.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -637,14 +637,14 @@ public int compare(T mimeType1, T mimeType2) {
 			else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) {  // audio/* > */*
 				return -1;
 			}
-			else {
+			else {  // mediaType1.getType().equals(mediaType2.getType())
 				if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) {  // audio/* < audio/basic
 					return 1;
 				}
 				else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) {  // audio/basic > audio/*
 					return -1;
 				}
-				else {
+				else {  // mediaType2.getSubtype().equals(mediaType2.getSubtype())
 					return compareParameters(mimeType1, mimeType2);
 				}
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index ec57d77a5ac2..34d05d41d329 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -798,7 +798,7 @@ else if (mediaType1.isWildcardType() && !mediaType2.isWildcardType()) {  // */*
 		else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) {  // audio/* > */*
 			return -1;
 		}
-		else {
+		else {  // mediaType1.getType().equals(mediaType2.getType())
 			if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) {  // audio/* < audio/basic
 				return 1;
 			}

From a248a525756923e20e159b56fee7eddb8a709a29 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Tue, 19 Oct 2021 11:53:22 +0200
Subject: [PATCH 276/735] Revert transitive MediaType comparators

The fix made for gh-27488 resulted in a change of the default order
of codecs. This commit reverts these changes, so that the previous
order is restored.

Closes gh-27573
---
 .../src/main/java/org/springframework/util/MimeType.java    | 6 ++++++
 .../src/main/java/org/springframework/http/MediaType.java   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
index b6e1ff2ff3de..de29040b07f6 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeType.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -637,6 +637,9 @@ public int compare(T mimeType1, T mimeType2) {
 			else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) {  // audio/* > */*
 				return -1;
 			}
+			else if (!mimeType1.getType().equals(mimeType2.getType())) {  // audio/basic == text/html
+				return 0;
+			}
 			else {  // mediaType1.getType().equals(mediaType2.getType())
 				if (mimeType1.isWildcardSubtype() && !mimeType2.isWildcardSubtype()) {  // audio/* < audio/basic
 					return 1;
@@ -644,6 +647,9 @@ else if (mimeType2.isWildcardType() && !mimeType1.isWildcardType()) {  // audio/
 				else if (mimeType2.isWildcardSubtype() && !mimeType1.isWildcardSubtype()) {  // audio/basic > audio/*
 					return -1;
 				}
+				else if (!mimeType1.getSubtype().equals(mimeType2.getSubtype())) {  // audio/basic == audio/wave
+					return 0;
+				}
 				else {  // mediaType2.getSubtype().equals(mediaType2.getSubtype())
 					return compareParameters(mimeType1, mimeType2);
 				}
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index 34d05d41d329..729555add951 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -798,6 +798,9 @@ else if (mediaType1.isWildcardType() && !mediaType2.isWildcardType()) {  // */*
 		else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) {  // audio/* > */*
 			return -1;
 		}
+		else if (!mediaType1.getType().equals(mediaType2.getType())) {  // audio/basic == text/html
+			return 0;
+		}
 		else {  // mediaType1.getType().equals(mediaType2.getType())
 			if (mediaType1.isWildcardSubtype() && !mediaType2.isWildcardSubtype()) {  // audio/* < audio/basic
 				return 1;
@@ -805,6 +808,9 @@ else if (mediaType2.isWildcardType() && !mediaType1.isWildcardType()) {  // audi
 			else if (mediaType2.isWildcardSubtype() && !mediaType1.isWildcardSubtype()) {  // audio/basic > audio/*
 				return -1;
 			}
+			else if (!mediaType1.getSubtype().equals(mediaType2.getSubtype())) {  // audio/basic == audio/wave
+				return 0;
+			}
 			else {
 				int paramsSize1 = mediaType1.getParameters().size();
 				int paramsSize2 = mediaType2.getParameters().size();

From 05ea991d6220069f089a190a86f0f3105c26c049 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 19 Oct 2021 12:25:11 +0100
Subject: [PATCH 277/735] Removing locations logging in
 ResourceHttpRequestHandler

See gh-27575
---
 .../web/reactive/resource/ResourceWebHandler.java           | 6 ------
 .../web/servlet/resource/ResourceHttpRequestHandler.java    | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index 75ac8ddd320e..c2ba1b234bf1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -336,12 +336,6 @@ private void resolveResourceLocations() {
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
-
-		if (logger.isInfoEnabled()) {
-			logger.info(!this.locationsToUse.isEmpty() ?
-					"Locations in use: " + locationToString(this.locationsToUse) :
-					"0 locations in use.");
-		}
 	}
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 7456f37f0318..22f06ccf58d7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -467,12 +467,6 @@ private void resolveResourceLocations() {
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
-
-		if (logger.isInfoEnabled()) {
-			logger.info(!this.locationsToUse.isEmpty() ?
-					"Locations in use: " + locationToString(this.locationsToUse) :
-					"0 locations in use.");
-		}
 	}
 
 	/**

From aa5a2a860045b84457f8b6e596ebb54cf8863d36 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 19 Oct 2021 16:42:22 +0200
Subject: [PATCH 278/735] Disable custom stylesheet for Javadoc

The custom stylesheet used with JDK 8 no longer works with JDK 17.

Thus in order to make the generated Javadoc usable, we are disabling
the custom stylesheet for the time being.

See gh-27496
---
 gradle/docs.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index c9bc9053031f..fb7ad3d0069a 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -43,7 +43,8 @@ task api(type: Javadoc) {
 		header = rootProject.description
 		use = true
 		overview = "src/docs/api/overview.html"
-		stylesheetFile = file("src/docs/api/stylesheet.css")
+		// Disable custom stylesheet until we resolve https://github.com/spring-projects/spring-framework/issues/27496
+		// stylesheetFile = file("src/docs/api/stylesheet.css")
 		splitIndex = true
 		links(project.ext.javadocLinks)
 		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint

From 6fa6bfe421e0ca41e8dfe5fc0701ba2291dd376e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 19 Oct 2021 16:46:01 +0200
Subject: [PATCH 279/735] Fix link to Spring Framework project page in Javadoc
 overview

---
 src/docs/api/overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/api/overview.html b/src/docs/api/overview.html
index f37932935e5c..e6086dc458d1 100644
--- a/src/docs/api/overview.html
+++ b/src/docs/api/overview.html
@@ -1,7 +1,7 @@
 <html>
 <body>
 <p>
-This is the public API documentation for the <a href="https://github.com/SpringSource/spring-framework" target="_top">Spring Framework</a>.
+This is the public API documentation for the <a href="https://github.com/spring-projects/spring-framework" target="_top">Spring Framework</a>.
 </p>
 </body>
 </html>

From f78d9cdf22252134c2fdc43add52eebd6bca6737 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 19 Oct 2021 16:58:36 +0200
Subject: [PATCH 280/735] Remove configuration of obsolete html5 javadoc option

---
 gradle/docs.gradle | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index fb7ad3d0069a..043282176abf 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -49,9 +49,6 @@ task api(type: Javadoc) {
 		links(project.ext.javadocLinks)
 		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
 		addBooleanOption('Werror', true) // fail build on Javadoc warnings
-		if (JavaVersion.current().isJava9Compatible()) {
-			addBooleanOption('html5', true)
-		}
 	}
 	source moduleProjects.collect { project ->
 		project.sourceSets.main.allJava

From 8e245e4410f0d017794828660c05b448efb3cd4e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 20 Oct 2021 13:07:45 +0200
Subject: [PATCH 281/735] Remove commented-out custom stylesheet for Javadoc

The team has decided to use the default Javadoc stylesheet with JDK 17.

Closes gh-27496
---
 gradle/docs.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 043282176abf..470c854cc9b7 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -43,8 +43,6 @@ task api(type: Javadoc) {
 		header = rootProject.description
 		use = true
 		overview = "src/docs/api/overview.html"
-		// Disable custom stylesheet until we resolve https://github.com/spring-projects/spring-framework/issues/27496
-		// stylesheetFile = file("src/docs/api/stylesheet.css")
 		splitIndex = true
 		links(project.ext.javadocLinks)
 		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint

From 3d6d8a947a8e1f252ae64306244ed4f4204cc627 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 20 Oct 2021 14:48:51 +0200
Subject: [PATCH 282/735] Update "Reporting a Vulnerability" link

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 8ed0ff412377..038a36b56539 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -8,4 +8,4 @@ wiki page.
 
 ## Reporting a Vulnerability
 
-Please see https://pivotal.io/security.
+Please see https://spring.io/security-policy.

From e4b493456b6f2bae10748e02a5663b1bb46bd21d Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Wed, 20 Oct 2021 18:29:33 +0200
Subject: [PATCH 283/735] Remove custom EnumerationIterator

This commit removes our custom EnumerationIterator, in favor of
Enumeration::asIterator (since JDK 9).
---
 .../springframework/util/CollectionUtils.java | 35 ++-----------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
index d1e9354abda9..530e5222ba08 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -233,15 +233,14 @@ public static boolean containsAny(Collection<?> source, Collection<?> candidates
 	 * @param candidates the candidates to search for
 	 * @return the first present object, or {@code null} if not found
 	 */
-	@SuppressWarnings("unchecked")
 	@Nullable
 	public static <E> E findFirstMatch(Collection<?> source, Collection<E> candidates) {
 		if (isEmpty(source) || isEmpty(candidates)) {
 			return null;
 		}
-		for (Object candidate : candidates) {
+		for (E candidate : candidates) {
 			if (source.contains(candidate)) {
-				return (E) candidate;
+				return candidate;
 			}
 		}
 		return null;
@@ -447,7 +446,7 @@ public static <A, E extends A> A[] toArray(Enumeration<E> enumeration, A[] array
 	 * @return the adapted {@code Iterator}
 	 */
 	public static <E> Iterator<E> toIterator(@Nullable Enumeration<E> enumeration) {
-		return (enumeration != null ? new EnumerationIterator<>(enumeration) : Collections.emptyIterator());
+		return (enumeration != null ? enumeration.asIterator() : Collections.emptyIterator());
 	}
 
 	/**
@@ -481,32 +480,4 @@ public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(
 	}
 
 
-	/**
-	 * Iterator wrapping an Enumeration.
-	 */
-	private static class EnumerationIterator<E> implements Iterator<E> {
-
-		private final Enumeration<E> enumeration;
-
-		public EnumerationIterator(Enumeration<E> enumeration) {
-			this.enumeration = enumeration;
-		}
-
-		@Override
-		public boolean hasNext() {
-			return this.enumeration.hasMoreElements();
-		}
-
-		@Override
-		public E next() {
-			return this.enumeration.nextElement();
-		}
-
-		@Override
-		public void remove() throws UnsupportedOperationException {
-			throw new UnsupportedOperationException("Not supported");
-		}
-	}
-
-
 }

From bce850aa12ee678a98a44b1074c7fc5a2f2f8e96 Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Thu, 21 Oct 2021 05:57:00 +0000
Subject: [PATCH 284/735] Next development version (v5.3.13-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index aea3f16f967a..b46dbd487055 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.12-SNAPSHOT
+version=5.3.13-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From b3eb1a2ad725ab4e8c9af7e1fe51840fa01289d0 Mon Sep 17 00:00:00 2001
From: no-brand <do.dream.david@gmail.com>
Date: Thu, 21 Oct 2021 07:19:26 +0000
Subject: [PATCH 285/735] Improve example in Javadoc for HttpEntity

Closes gh-27586
---
 .../src/main/java/org/springframework/http/HttpEntity.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
index 7b7fe9af6002..d6493c4bed06 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
@@ -28,7 +28,7 @@
  * <pre class="code">
  * HttpHeaders headers = new HttpHeaders();
  * headers.setContentType(MediaType.TEXT_PLAIN);
- * HttpEntity&lt;String&gt; entity = new HttpEntity&lt;String&gt;(helloWorld, headers);
+ * HttpEntity&lt;String&gt; entity = new HttpEntity&lt;String&gt;("helloWorld", headers);
  * URI location = template.postForLocation("https://example.com", entity);
  * </pre>
  * or

From ec3f857bda2ffbba5d96787215cc99565d95c3cf Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 21 Oct 2021 12:40:10 +0200
Subject: [PATCH 286/735] Polish contribution

See gh-27586
---
 .../main/java/org/springframework/http/HttpEntity.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
index d6493c4bed06..9b5be7c625ae 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,12 @@
 /**
  * Represents an HTTP request or response entity, consisting of headers and body.
  *
- * <p>Typically used in combination with the {@link org.springframework.web.client.RestTemplate},
+ * <p>Often used in combination with the {@link org.springframework.web.client.RestTemplate},
  * like so:
  * <pre class="code">
  * HttpHeaders headers = new HttpHeaders();
  * headers.setContentType(MediaType.TEXT_PLAIN);
- * HttpEntity&lt;String&gt; entity = new HttpEntity&lt;String&gt;("helloWorld", headers);
+ * HttpEntity&lt;String&gt; entity = new HttpEntity&lt;&gt;("Hello World", headers);
  * URI location = template.postForLocation("https://example.com", entity);
  * </pre>
  * or
@@ -39,11 +39,11 @@
  * </pre>
  * Can also be used in Spring MVC, as a return value from a @Controller method:
  * <pre class="code">
- * &#64;RequestMapping("/handle")
+ * &#64;GetMapping("/handle")
  * public HttpEntity&lt;String&gt; handle() {
  *   HttpHeaders responseHeaders = new HttpHeaders();
  *   responseHeaders.set("MyResponseHeader", "MyValue");
- *   return new HttpEntity&lt;String&gt;("Hello World", responseHeaders);
+ *   return new HttpEntity&lt;&gt;("Hello World", responseHeaders);
  * }
  * </pre>
  *

From 7a54ff2d21ad7e1900ce603ea1a814d8021bacb9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 21 Oct 2021 14:07:17 +0200
Subject: [PATCH 287/735] Extract public TypeFilterUtils from
 ComponentScanAnnotationParser

Prior to this commit, third parties using @ComponentScan's @Filter
annotation had to implement their own parsing for @Filter
AnnotationAttributes as well as instantiation of the corresponding
TypeFilters. In such cases the various *Aware callbacks
(BeanFactoryAware, EnvironmentAware, etc.) should also be supported.

This commit therefore extracts a new public TypeFilterUtils class from
ComponentScanAnnotationParser so that third parties can benefit from
consistent TypeFilter creation from @ComponentScan @Filter annotations.

Closes gh-27553
---
 .../ComponentScanAnnotationParser.java        |  65 ++--------
 .../context/annotation/TypeFilterUtils.java   | 119 ++++++++++++++++++
 2 files changed, 127 insertions(+), 57 deletions(-)
 create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
index 90575862c6bd..27e879bfb338 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
@@ -16,13 +16,10 @@
 
 package org.springframework.context.annotation;
 
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -33,12 +30,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.core.type.filter.AspectJTypeFilter;
-import org.springframework.core.type.filter.AssignableTypeFilter;
-import org.springframework.core.type.filter.RegexPatternTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
@@ -93,13 +85,17 @@ public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, final
 
 		scanner.setResourcePattern(componentScan.getString("resourcePattern"));
 
-		for (AnnotationAttributes filter : componentScan.getAnnotationArray("includeFilters")) {
-			for (TypeFilter typeFilter : typeFiltersFor(filter)) {
+		for (AnnotationAttributes includeFilterAttributes : componentScan.getAnnotationArray("includeFilters")) {
+			List<TypeFilter> typeFilters = TypeFilterUtils.createTypeFiltersFor(includeFilterAttributes, this.environment,
+					this.resourceLoader, this.registry);
+			for (TypeFilter typeFilter : typeFilters) {
 				scanner.addIncludeFilter(typeFilter);
 			}
 		}
-		for (AnnotationAttributes filter : componentScan.getAnnotationArray("excludeFilters")) {
-			for (TypeFilter typeFilter : typeFiltersFor(filter)) {
+		for (AnnotationAttributes excludeFilterAttributes : componentScan.getAnnotationArray("excludeFilters")) {
+			List<TypeFilter> typeFilters = TypeFilterUtils.createTypeFiltersFor(excludeFilterAttributes, this.environment,
+				this.resourceLoader, this.registry);
+			for (TypeFilter typeFilter : typeFilters) {
 				scanner.addExcludeFilter(typeFilter);
 			}
 		}
@@ -132,49 +128,4 @@ protected boolean matchClassName(String className) {
 		return scanner.doScan(StringUtils.toStringArray(basePackages));
 	}
 
-	private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
-		List<TypeFilter> typeFilters = new ArrayList<>();
-		FilterType filterType = filterAttributes.getEnum("type");
-
-		for (Class<?> filterClass : filterAttributes.getClassArray("classes")) {
-			switch (filterType) {
-				case ANNOTATION:
-					Assert.isAssignable(Annotation.class, filterClass,
-							"@ComponentScan ANNOTATION type filter requires an annotation type");
-					@SuppressWarnings("unchecked")
-					Class<Annotation> annotationType = (Class<Annotation>) filterClass;
-					typeFilters.add(new AnnotationTypeFilter(annotationType));
-					break;
-				case ASSIGNABLE_TYPE:
-					typeFilters.add(new AssignableTypeFilter(filterClass));
-					break;
-				case CUSTOM:
-					Assert.isAssignable(TypeFilter.class, filterClass,
-							"@ComponentScan CUSTOM type filter requires a TypeFilter implementation");
-
-					TypeFilter filter = ParserStrategyUtils.instantiateClass(filterClass, TypeFilter.class,
-							this.environment, this.resourceLoader, this.registry);
-					typeFilters.add(filter);
-					break;
-				default:
-					throw new IllegalArgumentException("Filter type not supported with Class value: " + filterType);
-			}
-		}
-
-		for (String expression : filterAttributes.getStringArray("pattern")) {
-			switch (filterType) {
-				case ASPECTJ:
-					typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader()));
-					break;
-				case REGEX:
-					typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
-					break;
-				default:
-					throw new IllegalArgumentException("Filter type not supported with String pattern: " + filterType);
-			}
-		}
-
-		return typeFilters;
-	}
-
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
new file mode 100644
index 000000000000..340c232f60f1
--- /dev/null
+++ b/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.core.annotation.AnnotationAttributes;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.core.type.filter.AspectJTypeFilter;
+import org.springframework.core.type.filter.AssignableTypeFilter;
+import org.springframework.core.type.filter.RegexPatternTypeFilter;
+import org.springframework.core.type.filter.TypeFilter;
+import org.springframework.util.Assert;
+
+/**
+ * Collection of utilities for working with {@link ComponentScan @ComponentScan}
+ * {@linkplain ComponentScan.Filter type filters}.
+ *
+ * @author Chris Beams
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @since 5.3.13
+ * @see ComponentScan.Filter
+ * @see org.springframework.core.type.filter.TypeFilter
+ */
+public abstract class TypeFilterUtils {
+
+	/**
+	 * Create {@linkplain TypeFilter type filters} from the supplied
+	 * {@link AnnotationAttributes}, such as those sourced from
+	 * {@link ComponentScan#includeFilters()} or {@link ComponentScan#excludeFilters()}.
+	 * <p>Each {@link TypeFilter} will be instantiated using an appropriate
+	 * constructor, with {@code BeanClassLoaderAware}, {@code BeanFactoryAware},
+	 * {@code EnvironmentAware}, and {@code ResourceLoaderAware} contracts
+	 * invoked if they are implemented by the type filter.
+	 * @param filterAttributes {@code AnnotationAttributes} for a
+	 * {@link ComponentScan.Filter @Filter} declaration
+	 * @param environment the {@code Environment} to make available to filters
+	 * @param resourceLoader the {@code ResourceLoader} to make available to filters
+	 * @param registry the {@code BeanDefinitionRegistry} to make available to filters
+	 * as a {@link org.springframework.beans.factory.BeanFactory} if applicable
+	 * @return a list of instantiated and configured type filters
+	 * @see TypeFilter
+	 * @see AnnotationTypeFilter
+	 * @see AssignableTypeFilter
+	 * @see AspectJTypeFilter
+	 * @see RegexPatternTypeFilter
+	 * @see org.springframework.beans.factory.BeanClassLoaderAware
+	 * @see org.springframework.beans.factory.BeanFactoryAware
+	 * @see org.springframework.context.EnvironmentAware
+	 * @see org.springframework.context.ResourceLoaderAware
+	 */
+	public static List<TypeFilter> createTypeFiltersFor(AnnotationAttributes filterAttributes, Environment environment,
+			ResourceLoader resourceLoader, BeanDefinitionRegistry registry) {
+
+		List<TypeFilter> typeFilters = new ArrayList<>();
+		FilterType filterType = filterAttributes.getEnum("type");
+
+		for (Class<?> filterClass : filterAttributes.getClassArray("classes")) {
+			switch (filterType) {
+				case ANNOTATION:
+					Assert.isAssignable(Annotation.class, filterClass,
+							"@ComponentScan ANNOTATION type filter requires an annotation type");
+					@SuppressWarnings("unchecked")
+					Class<Annotation> annotationType = (Class<Annotation>) filterClass;
+					typeFilters.add(new AnnotationTypeFilter(annotationType));
+					break;
+				case ASSIGNABLE_TYPE:
+					typeFilters.add(new AssignableTypeFilter(filterClass));
+					break;
+				case CUSTOM:
+					Assert.isAssignable(TypeFilter.class, filterClass,
+							"@ComponentScan CUSTOM type filter requires a TypeFilter implementation");
+					TypeFilter filter = ParserStrategyUtils.instantiateClass(filterClass, TypeFilter.class,
+							environment, resourceLoader, registry);
+					typeFilters.add(filter);
+					break;
+				default:
+					throw new IllegalArgumentException("Filter type not supported with Class value: " + filterType);
+			}
+		}
+
+		for (String expression : filterAttributes.getStringArray("pattern")) {
+			switch (filterType) {
+				case ASPECTJ:
+					typeFilters.add(new AspectJTypeFilter(expression, resourceLoader.getClassLoader()));
+					break;
+				case REGEX:
+					typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
+					break;
+				default:
+					throw new IllegalArgumentException("Filter type not supported with String pattern: " + filterType);
+			}
+		}
+
+		return typeFilters;
+	}
+
+}

From 9af11ad5ce137e8fe71f0ce9e980745e4c840818 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 22 Oct 2021 11:08:33 +0200
Subject: [PATCH 288/735] Fix Javadoc formatting issues

---
 .../core/convert/TypeDescriptor.java               | 14 +++++++-------
 .../springframework/expression/TypeConverter.java  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
index 1bc8cb281b1f..f6e25824e004 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -37,7 +37,7 @@
 
 /**
  * Contextual descriptor about a type to convert from or to.
- * Capable of representing arrays and generic collection types.
+ * <p>Capable of representing arrays and generic collection types.
  *
  * @author Keith Donald
  * @author Andy Clement
@@ -345,9 +345,9 @@ public TypeDescriptor getElementTypeDescriptor() {
 	 * from the provided collection or array element.
 	 * <p>Narrows the {@link #getElementTypeDescriptor() elementType} property to the class
 	 * of the provided collection or array element. For example, if this describes a
-	 * {@code java.util.List&lt;java.lang.Number&lt;} and the element argument is an
+	 * {@code java.util.List<java.lang.Number>} and the element argument is a
 	 * {@code java.lang.Integer}, the returned TypeDescriptor will be {@code java.lang.Integer}.
-	 * If this describes a {@code java.util.List&lt;?&gt;} and the element argument is an
+	 * If this describes a {@code java.util.List<?>} and the element argument is a
 	 * {@code java.lang.Integer}, the returned TypeDescriptor will be {@code java.lang.Integer}
 	 * as well.
 	 * <p>Annotation and nested type context will be preserved in the narrowed
@@ -388,9 +388,9 @@ public TypeDescriptor getMapKeyTypeDescriptor() {
 	 * from the provided map key.
 	 * <p>Narrows the {@link #getMapKeyTypeDescriptor() mapKeyType} property
 	 * to the class of the provided map key. For example, if this describes a
-	 * {@code java.util.Map&lt;java.lang.Number, java.lang.String&lt;} and the key
+	 * {@code java.util.Map<java.lang.Number, java.lang.String>} and the key
 	 * argument is a {@code java.lang.Integer}, the returned TypeDescriptor will be
-	 * {@code java.lang.Integer}. If this describes a {@code java.util.Map&lt;?, ?&gt;}
+	 * {@code java.lang.Integer}. If this describes a {@code java.util.Map<?, ?>}
 	 * and the key argument is a {@code java.lang.Integer}, the returned
 	 * TypeDescriptor will be {@code java.lang.Integer} as well.
 	 * <p>Annotation and nested type context will be preserved in the narrowed
@@ -425,9 +425,9 @@ public TypeDescriptor getMapValueTypeDescriptor() {
 	 * from the provided map value.
 	 * <p>Narrows the {@link #getMapValueTypeDescriptor() mapValueType} property
 	 * to the class of the provided map value. For example, if this describes a
-	 * {@code java.util.Map&lt;java.lang.String, java.lang.Number&lt;} and the value
+	 * {@code java.util.Map<java.lang.String, java.lang.Number>} and the value
 	 * argument is a {@code java.lang.Integer}, the returned TypeDescriptor will be
-	 * {@code java.lang.Integer}. If this describes a {@code java.util.Map&lt;?, ?&gt;}
+	 * {@code java.lang.Integer}. If this describes a {@code java.util.Map<?, ?>}
 	 * and the value argument is a {@code java.lang.Integer}, the returned
 	 * TypeDescriptor will be {@code java.lang.Integer} as well.
 	 * <p>Annotation and nested type context will be preserved in the narrowed
diff --git a/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java b/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
index f2f67c0965c8..6974d6b8747c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public interface TypeConverter {
 	 * Convert (or coerce) a value from one type to another, for example from a
 	 * {@code boolean} to a {@code String}.
 	 * <p>The {@link TypeDescriptor} parameters enable support for typed collections:
-	 * A caller may prefer a {@code List&lt;Integer&gt;}, for example, rather than
+	 * A caller may prefer a {@code List<Integer>}, for example, rather than
 	 * simply any {@code List}.
 	 * @param value the value to be converted
 	 * @param sourceType a type descriptor that supplies extra information about the

From 9b967775ede2d885746d734347a356abb8b3d1db Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 22 Oct 2021 10:45:34 +0200
Subject: [PATCH 289/735] Polish Spel's
 ReflectionHelper.setupArgumentsForVarargsInvocation()

---
 .../spel/support/ReflectionHelper.java        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
index d8af41170d67..65e3cff83a86 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
@@ -332,8 +332,8 @@ private static boolean isFirstEntryInArray(Object value, @Nullable Object possib
 	}
 
 	/**
-	 * Package up the arguments so that they correctly match what is expected in parameterTypes.
-	 * For example, if parameterTypes is {@code (int, String[])} because the second parameter
+	 * Package up the arguments so that they correctly match what is expected in requiredParameterTypes.
+	 * <p>For example, if requiredParameterTypes is {@code (int, String[])} because the second parameter
 	 * was declared {@code String...}, then if arguments is {@code [1,"a","b"]} then it must be
 	 * repackaged as {@code [1,new String[]{"a","b"}]} in order to match the expected types.
 	 * @param requiredParameterTypes the types of the parameters for the invocation
@@ -350,23 +350,24 @@ public static Object[] setupArgumentsForVarargsInvocation(Class<?>[] requiredPar
 				requiredParameterTypes[parameterCount - 1] !=
 						(args[argumentCount - 1] != null ? args[argumentCount - 1].getClass() : null)) {
 
-			int arraySize = 0;  // zero size array if nothing to pass as the varargs parameter
-			if (argumentCount >= parameterCount) {
-				arraySize = argumentCount - (parameterCount - 1);
-			}
-
-			// Create an array for the varargs arguments
+			// Create an array for the leading arguments plus the varargs array argument.
 			Object[] newArgs = new Object[parameterCount];
+			// Copy all leading arguments to the new array, omitting the varargs array argument.
 			System.arraycopy(args, 0, newArgs, 0, newArgs.length - 1);
 
 			// Now sort out the final argument, which is the varargs one. Before entering this method,
 			// the arguments should have been converted to the box form of the required type.
+			int varargsArraySize = 0;  // zero size array if nothing to pass as the varargs parameter
+			if (argumentCount >= parameterCount) {
+				varargsArraySize = argumentCount - (parameterCount - 1);
+			}
 			Class<?> componentType = requiredParameterTypes[parameterCount - 1].getComponentType();
-			Object repackagedArgs = Array.newInstance(componentType, arraySize);
-			for (int i = 0; i < arraySize; i++) {
-				Array.set(repackagedArgs, i, args[parameterCount - 1 + i]);
+			Object varargsArray = Array.newInstance(componentType, varargsArraySize);
+			for (int i = 0; i < varargsArraySize; i++) {
+				Array.set(varargsArray, i, args[parameterCount - 1 + i]);
 			}
-			newArgs[newArgs.length - 1] = repackagedArgs;
+			// Finally, add the varargs array to the new arguments array.
+			newArgs[newArgs.length - 1] = varargsArray;
 			return newArgs;
 		}
 		return args;

From bc657eb4d5babccf5065ef26fca8c9723675a083 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 21 Oct 2021 14:50:34 +0200
Subject: [PATCH 290/735] Fix SpEL vararg method invocation for strings
 containing commas

Prior to this commit, if a SpEL expression invoked a method or
registered function that declares a String varargs argument, there were
sometimes issues with converting the input arguments into the varargs
array argument. Specifically, if the expression supplied a single
String argument containing a comma for the varargs (such as "a,b"),
SpEL's ReflectionHelper.convertArguments() method incorrectly converted
that single String to an array via the ConversionService, which
indirectly converted that String using the StringToArrayConverter,
which converts a comma-delimited String to an array. Thus, "a,b"
effectively got converted to a two-dimensional array ["a", "b"] instead
of simply ["a,b"].

This commit fixes this bug by avoiding use of the TypeConverter and
ConversionService for single arguments supplied as varargs when the
single argument's type matches the varargs array component type.

Closes gh-27582
---
 .../spel/support/ReflectionHelper.java        | 28 +++++++-----
 .../spel/MethodInvocationTests.java           | 43 ++++++++++++++++---
 .../spel/testresources/Inventor.java          | 11 ++++-
 3 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
index 65e3cff83a86..821c0b246ae6 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
  *
  * @author Andy Clement
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.0
  */
 public abstract class ReflectionHelper {
@@ -281,25 +282,32 @@ static boolean convertArguments(TypeConverter converter, Object[] arguments, Exe
 				arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
 				conversionOccurred |= (argument != arguments[i]);
 			}
+
 			MethodParameter methodParam = MethodParameter.forExecutable(executable, varargsPosition);
+
+			// If the target is varargs and there is just one more argument, then convert it here.
 			if (varargsPosition == arguments.length - 1) {
-				// If the target is varargs and there is just one more argument
-				// then convert it here
-				TypeDescriptor targetType = new TypeDescriptor(methodParam);
 				Object argument = arguments[varargsPosition];
+				TypeDescriptor targetType = new TypeDescriptor(methodParam);
 				TypeDescriptor sourceType = TypeDescriptor.forObject(argument);
-				arguments[varargsPosition] = converter.convertValue(argument, sourceType, targetType);
-				// Three outcomes of that previous line:
-				// 1) the input argument was already compatible (ie. array of valid type) and nothing was done
-				// 2) the input argument was correct type but not in an array so it was made into an array
-				// 3) the input argument was the wrong type and got converted and put into an array
+				// If the argument type is equal to the varargs element type, there is no need
+				// to convert it or wrap it in an array. For example, using StringToArrayConverter
+				// to convert a String containing a comma would result in the String being split
+				// and repackaged in an array when it should be used as-is.
+				if (!sourceType.equals(targetType.getElementTypeDescriptor())) {
+					arguments[varargsPosition] = converter.convertValue(argument, sourceType, targetType);
+				}
+				// Three outcomes of the above if-block:
+				// 1) the input argument was correct type but not wrapped in an array, and nothing was done.
+				// 2) the input argument was already compatible (i.e., array of valid type), and nothing was done.
+				// 3) the input argument was the wrong type and got converted and wrapped in an array.
 				if (argument != arguments[varargsPosition] &&
 						!isFirstEntryInArray(argument, arguments[varargsPosition])) {
 					conversionOccurred = true; // case 3
 				}
 			}
+			// Otherwise, convert remaining arguments to the varargs element type.
 			else {
-				// Convert remaining arguments to the varargs element type
 				TypeDescriptor targetType = new TypeDescriptor(methodParam).getElementTypeDescriptor();
 				Assert.state(targetType != null, "No element type");
 				for (int i = varargsPosition; i < arguments.length; i++) {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
index 0a025acf723f..b2cde1f10ff3 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
  *
  * @author Andy Clement
  * @author Phillip Webb
+ * @author Sam Brannen
  */
 public class MethodInvocationTests extends AbstractExpressionTests {
 
@@ -233,26 +234,54 @@ public void testAddingMethodResolvers() {
 
 	@Test
 	public void testVarargsInvocation01() {
-		// Calling 'public int aVarargsMethod(String... strings)'
-		//evaluate("aVarargsMethod('a','b','c')", 3, Integer.class);
-		//evaluate("aVarargsMethod('a')", 1, Integer.class);
+		// Calling 'public int aVarargsMethod(String... strings)' - returns number of arguments
+		evaluate("aVarargsMethod('a','b','c')", 3, Integer.class);
+		evaluate("aVarargsMethod('a')", 1, Integer.class);
 		evaluate("aVarargsMethod()", 0, Integer.class);
 		evaluate("aVarargsMethod(1,2,3)", 3, Integer.class); // all need converting to strings
 		evaluate("aVarargsMethod(1)", 1, Integer.class); // needs string conversion
 		evaluate("aVarargsMethod(1,'a',3.0d)", 3, Integer.class); // first and last need conversion
-		// evaluate("aVarargsMethod(new String[]{'a','b','c'})", 3, Integer.class);
+		evaluate("aVarargsMethod(new String[]{'a','b','c'})", 3, Integer.class);
 	}
 
 	@Test
 	public void testVarargsInvocation02() {
-		// Calling 'public int aVarargsMethod2(int i, String... strings)' - returns int+length_of_strings
+		// Calling 'public int aVarargsMethod2(int i, String... strings)' - returns int + length_of_strings
 		evaluate("aVarargsMethod2(5,'a','b','c')", 8, Integer.class);
 		evaluate("aVarargsMethod2(2,'a')", 3, Integer.class);
 		evaluate("aVarargsMethod2(4)", 4, Integer.class);
 		evaluate("aVarargsMethod2(8,2,3)", 10, Integer.class);
 		evaluate("aVarargsMethod2(9)", 9, Integer.class);
 		evaluate("aVarargsMethod2(2,'a',3.0d)", 4, Integer.class);
-		// evaluate("aVarargsMethod2(8,new String[]{'a','b','c'})", 11, Integer.class);
+		evaluate("aVarargsMethod2(8,new String[]{'a','b','c'})", 11, Integer.class);
+	}
+
+	@Test
+	public void testVarargsInvocation03() {
+		// Calling 'public int aVarargsMethod3(String str1, String... strings)' - returns all strings concatenated with "-"
+
+		// No conversion necessary
+		evaluate("aVarargsMethod3('x')", "x", String.class);
+		evaluate("aVarargsMethod3('x', 'a')", "x-a", String.class);
+		evaluate("aVarargsMethod3('x', 'a', 'b', 'c')", "x-a-b-c", String.class);
+
+		// Conversion necessary
+		evaluate("aVarargsMethod3(9)", "9", String.class);
+		evaluate("aVarargsMethod3(8,2,3)", "8-2-3", String.class);
+		evaluate("aVarargsMethod3('2','a',3.0d)", "2-a-3.0", String.class);
+		evaluate("aVarargsMethod3('8',new String[]{'a','b','c'})", "8-a-b-c", String.class);
+
+		// Individual string contains a comma with multiple varargs arguments
+		evaluate("aVarargsMethod3('foo', ',', 'baz')", "foo-,-baz", String.class);
+		evaluate("aVarargsMethod3('foo', 'bar', ',baz')", "foo-bar-,baz", String.class);
+		evaluate("aVarargsMethod3('foo', 'bar,', 'baz')", "foo-bar,-baz", String.class);
+
+		// Individual string contains a comma with single varargs argument.
+		// Reproduces https://github.com/spring-projects/spring-framework/issues/27582
+		evaluate("aVarargsMethod3('foo', ',')", "foo-,", String.class);
+		evaluate("aVarargsMethod3('foo', ',bar')", "foo-,bar", String.class);
+		evaluate("aVarargsMethod3('foo', 'bar,')", "foo-bar,", String.class);
+		evaluate("aVarargsMethod3('foo', 'bar,baz')", "foo-bar,baz", String.class);
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
index bdf6d79c1ddc..34960d982fe3 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 ///CLOVER:OFF
 @SuppressWarnings("unused")
 public class Inventor {
+
 	private String name;
 	public String _name;
 	public String _name_;
@@ -202,8 +203,14 @@ public int aVarargsMethod2(int i, String... strings) {
 		return strings.length + i;
 	}
 
-	public Inventor(String... strings) {
+	public String aVarargsMethod3(String str1, String... strings) {
+		if (ObjectUtils.isEmpty(strings)) {
+			return str1;
+		}
+		return str1 + "-" + String.join("-", strings);
+	}
 
+	public Inventor(String... strings) {
 	}
 
 	public boolean getSomeProperty() {

From b728b4640b70c293c18ca1290ee303dee1f0d413 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 22 Oct 2021 13:46:11 +0200
Subject: [PATCH 291/735] Add explicit tests for SpEL functions for fix for
 gh-27582

---
 .../expression/spel/VariableAndFunctionTests.java         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
index 0333e20ff961..3271e45ea6d1 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
  * Tests the evaluation of expressions that access variables and functions (lambda/java).
  *
  * @author Andy Clement
+ * @author Sam Brannen
  */
 public class VariableAndFunctionTests extends AbstractExpressionTests {
 
@@ -58,12 +59,17 @@ public void testFunctionAccess02() {
 
 	@Test
 	public void testCallVarargsFunction() {
+		evaluate("#varargsFunctionReverseStringsAndMerge('a,b')", "a,b", String.class);
+		evaluate("#varargsFunctionReverseStringsAndMerge('a', 'b,c', 'd')", "db,ca", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge('a','b','c')", "cba", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge('a')", "a", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge()", "", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge('b',25)", "25b", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge(25)", "25", String.class);
+
+		evaluate("#varargsFunctionReverseStringsAndMerge2(1, 'a,b')", "1a,b", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge2(1,'a','b','c')", "1cba", String.class);
+		evaluate("#varargsFunctionReverseStringsAndMerge2(1, 'a', 'b,c', 'd')", "1db,ca", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge2(2,'a')", "2a", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge2(3)", "3", String.class);
 		evaluate("#varargsFunctionReverseStringsAndMerge2(4,'b',25)", "425b", String.class);

From e5475d698a8a861a03a18c24de16e3e4f0d22f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <sergei.tsypanov@yandex.ru>
Date: Fri, 22 Oct 2021 14:38:13 +0300
Subject: [PATCH 292/735] Iterate over Map's entrySet() instead of keySet() in
 PropertyEditorRegistrySupport

Closes gh-27591
---
 .../beans/PropertyEditorRegistrySupport.java          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

From a603779f33d47cd9ac87919ccc26f8c2d279fa40 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 22 Oct 2021 14:57:12 +0200
Subject: [PATCH 293/735] Return previous value in UndertowHeadersAdapter's
 remove() method

Prior to this commit, UndertowHeadersAdapter's remove() method violated
the java.util.Map contract by always returning null.

This commit fixes this by returning the previous list stored under the
specified key, and otherwise returning null if no previous value was
present.

Closes gh-27592
---
 .../http/server/reactive/UndertowHeadersAdapter.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java
index fa197aa0c208..8b7c6aed14dd 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowHeadersAdapter.java
@@ -17,6 +17,7 @@
 package org.springframework.http.server.reactive;
 
 import java.util.AbstractSet;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -36,6 +37,7 @@
  * {@code MultiValueMap} implementation for wrapping Undertow HTTP headers.
  *
  * @author Brian Clozel
+ * @author Sam Brannen
  * @since 5.1.1
  */
 class UndertowHeadersAdapter implements MultiValueMap<String, String> {
@@ -131,7 +133,10 @@ public List<String> put(String key, List<String> value) {
 	@Nullable
 	public List<String> remove(Object key) {
 		if (key instanceof String) {
-			this.headers.remove((String) key);
+			Collection<String> removed = this.headers.remove((String) key);
+			if (removed != null) {
+				return new ArrayList<>(removed);
+			}
 		}
 		return null;
 	}

From 66826ac960be20aa0df25f22f1a47612c5b91845 Mon Sep 17 00:00:00 2001
From: xxpain <supermannopain@gmail.com>
Date: Fri, 22 Oct 2021 15:47:13 +0800
Subject: [PATCH 294/735] Fix typo in Javadoc in HeaderAssertions

Closes gh-27589
---
 .../test/web/reactive/server/HeaderAssertions.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
index dfd8ce89c7e4..aa20066960d0 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
@@ -115,7 +115,7 @@ public WebTestClient.ResponseSpec valueMatches(String name, String pattern) {
 	/**
 	 * Match all values of the response header with the given regex
 	 * patterns which are applied to the values of the header in the
-	 * same order. Note that the number of pattenrs must match the
+	 * same order. Note that the number of patterns must match the
 	 * number of actual values.
 	 * @param name the header name
 	 * @param patterns one or more regex patterns, one per expected value

From c58853f5e5891147c43487fac3a249ba5c98de0c Mon Sep 17 00:00:00 2001
From: Daniil Pozdeev <daniilpozdeev@yandex-team.ru>
Date: Thu, 14 Oct 2021 17:20:41 +0300
Subject: [PATCH 295/735] Use LocalDataSourceJobStore only if one is not set
 via Quartz properties

Prior to this commit, Spring's SchedulerFactoryBean always set the
"org.quartz.jobStore.class" property to LocalDataSourceJobStore even if
the user had already specified a custom JobStore implementation via the
Quartz properties file or Properties object, thereby effectively
ignoring the user configuration.

This commit addresses this by configuring Quartz to use Spring's
LocalDataSourceJobStore only if a JobStore has not already been
specified via user configuration.

Closes gh-27560
---
 .../quartz/SchedulerFactoryBean.java          |  2 +-
 .../scheduling/quartz/QuartzSupportTests.java | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
index 50ef456cfc9a..cb4c0d2a3adb 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
@@ -570,7 +570,7 @@ private void initSchedulerFactory(StdSchedulerFactory schedulerFactory) throws S
 
 		CollectionUtils.mergePropertiesIntoMap(this.quartzProperties, mergedProps);
 		if (this.dataSource != null) {
-			mergedProps.setProperty(StdSchedulerFactory.PROP_JOB_STORE_CLASS, LocalDataSourceJobStore.class.getName());
+			mergedProps.putIfAbsent(StdSchedulerFactory.PROP_JOB_STORE_CLASS, LocalDataSourceJobStore.class.getName());
 		}
 
 		// Determine scheduler name across local settings and Quartz properties...
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 6c7d5b8691c7..a300ce010aeb 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -18,6 +18,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.sql.DataSource;
 
@@ -30,6 +31,7 @@
 import org.quartz.SchedulerFactory;
 import org.quartz.impl.JobDetailImpl;
 import org.quartz.impl.SchedulerRepository;
+import org.quartz.impl.jdbcjobstore.JobStoreTX;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -40,6 +42,8 @@
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.core.testfixture.EnabledForTestGroups;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -396,6 +400,29 @@ public void schedulerWithHsqlDataSource() throws Exception {
 		}
 	}
 
+	@Test
+	public void schedulerFactoryBeanWithCustomJobStore() throws Exception {
+		StaticApplicationContext context = new StaticApplicationContext();
+
+		final String dbName = "mydb";
+		final EmbeddedDatabase database = new EmbeddedDatabaseBuilder().setName(dbName).build();
+
+		final Properties properties = new Properties();
+		properties.setProperty("org.quartz.jobStore.class", JobStoreTX.class.getName());
+		properties.setProperty("org.quartz.jobStore.dataSource", dbName);
+
+		BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SchedulerFactoryBean.class)
+				.addPropertyValue("autoStartup", false)
+				.addPropertyValue("dataSource", database)
+				.addPropertyValue("quartzProperties", properties)
+				.getBeanDefinition();
+		context.registerBeanDefinition("scheduler", beanDefinition);
+
+		Scheduler bean = context.getBean("scheduler", Scheduler.class);
+
+		assertThat(bean.getMetaData().getJobStoreClass()).isEqualTo(JobStoreTX.class);
+	}
+
 	private ClassPathXmlApplicationContext context(String path) {
 		return new ClassPathXmlApplicationContext(path, getClass());
 	}

From 2c89ff934ddd5b7efa14f715c4ec6a67bab7fd69 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 23 Oct 2021 15:59:46 +0200
Subject: [PATCH 296/735] Update copyright date

See gh-27560
---
 .../springframework/scheduling/quartz/SchedulerFactoryBean.java | 2 +-
 .../springframework/scheduling/quartz/QuartzSupportTests.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
index cb4c0d2a3adb..e0982a2e5ff9 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index a300ce010aeb..71cd93810e52 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 995aaa6159957222b189f352672e20e3626ac442 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 23 Oct 2021 16:00:26 +0200
Subject: [PATCH 297/735] Polishing

---
 .../scheduling/quartz/QuartzSupportTests.java | 64 ++++++++++---------
 ...ipleAnonymousMethodInvokingJobDetailFB.xml |  4 +-
 .../quartz/schedulerAccessorBean.xml          |  4 +-
 .../client/DefaultWebClientTests.java         |  3 +-
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 71cd93810e52..9d461d2e400f 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -61,10 +61,10 @@
  * @author Sam Brannen
  * @since 20.02.2004
  */
-public class QuartzSupportTests {
+class QuartzSupportTests {
 
 	@Test
-	public void schedulerFactoryBeanWithApplicationContext() throws Exception {
+	void schedulerFactoryBeanWithApplicationContext() throws Exception {
 		TestBean tb = new TestBean("tb", 99);
 		StaticApplicationContext ac = new StaticApplicationContext();
 
@@ -101,7 +101,7 @@ protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String sc
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void schedulerWithTaskExecutor() throws Exception {
+	void schedulerWithTaskExecutor() throws Exception {
 		CountingTaskExecutor taskExecutor = new CountingTaskExecutor();
 		DummyJob.count = 0;
 
@@ -134,7 +134,7 @@ public void schedulerWithTaskExecutor() throws Exception {
 
 	@Test
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void jobDetailWithRunnableInsteadOfJob() {
+	void jobDetailWithRunnableInsteadOfJob() {
 		JobDetailImpl jobDetail = new JobDetailImpl();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				jobDetail.setJobClass((Class) DummyRunnable.class));
@@ -142,7 +142,7 @@ public void jobDetailWithRunnableInsteadOfJob() {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void schedulerWithQuartzJobBean() throws Exception {
+	void schedulerWithQuartzJobBean() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -175,7 +175,7 @@ public void schedulerWithQuartzJobBean() throws Exception {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void schedulerWithSpringBeanJobFactory() throws Exception {
+	void schedulerWithSpringBeanJobFactory() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -210,7 +210,7 @@ public void schedulerWithSpringBeanJobFactory() throws Exception {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void schedulerWithSpringBeanJobFactoryAndParamMismatchNotIgnored() throws Exception {
+	void schedulerWithSpringBeanJobFactoryAndParamMismatchNotIgnored() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -246,7 +246,7 @@ public void schedulerWithSpringBeanJobFactoryAndParamMismatchNotIgnored() throws
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void schedulerWithSpringBeanJobFactoryAndQuartzJobBean() throws Exception {
+	void schedulerWithSpringBeanJobFactoryAndQuartzJobBean() throws Exception {
 		DummyJobBean.param = 0;
 		DummyJobBean.count = 0;
 
@@ -280,7 +280,7 @@ public void schedulerWithSpringBeanJobFactoryAndQuartzJobBean() throws Exception
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void schedulerWithSpringBeanJobFactoryAndJobSchedulingData() throws Exception {
+	void schedulerWithSpringBeanJobFactoryAndJobSchedulingData() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -298,7 +298,7 @@ public void schedulerWithSpringBeanJobFactoryAndJobSchedulingData() throws Excep
 	}
 
 	@Test  // SPR-772
-	public void multipleSchedulers() throws Exception {
+	void multipleSchedulers() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("multipleSchedulers.xml")) {
 			Scheduler scheduler1 = (Scheduler) ctx.getBean("scheduler1");
 			Scheduler scheduler2 = (Scheduler) ctx.getBean("scheduler2");
@@ -309,7 +309,7 @@ public void multipleSchedulers() throws Exception {
 	}
 
 	@Test  // SPR-16884
-	public void multipleSchedulersWithQuartzProperties() throws Exception {
+	void multipleSchedulersWithQuartzProperties() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("multipleSchedulersWithQuartzProperties.xml")) {
 			Scheduler scheduler1 = (Scheduler) ctx.getBean("scheduler1");
 			Scheduler scheduler2 = (Scheduler) ctx.getBean("scheduler2");
@@ -321,12 +321,13 @@ public void multipleSchedulersWithQuartzProperties() throws Exception {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void twoAnonymousMethodInvokingJobDetailFactoryBeans() throws Exception {
-		Thread.sleep(3000);
+	void twoAnonymousMethodInvokingJobDetailFactoryBeans() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("multipleAnonymousMethodInvokingJobDetailFB.xml")) {
 			QuartzTestBean exportService = (QuartzTestBean) ctx.getBean("exportService");
 			QuartzTestBean importService = (QuartzTestBean) ctx.getBean("importService");
 
+			Thread.sleep(400);
+
 			assertThat(exportService.getImportCount()).as("doImport called exportService").isEqualTo(0);
 			assertThat(exportService.getExportCount()).as("doExport not called on exportService").isEqualTo(2);
 			assertThat(importService.getImportCount()).as("doImport not called on importService").isEqualTo(2);
@@ -336,12 +337,13 @@ public void twoAnonymousMethodInvokingJobDetailFactoryBeans() throws Exception {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void schedulerAccessorBean() throws Exception {
-		Thread.sleep(3000);
+	void schedulerAccessorBean() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("schedulerAccessorBean.xml")) {
 			QuartzTestBean exportService = (QuartzTestBean) ctx.getBean("exportService");
 			QuartzTestBean importService = (QuartzTestBean) ctx.getBean("importService");
 
+			Thread.sleep(400);
+
 			assertThat(exportService.getImportCount()).as("doImport called exportService").isEqualTo(0);
 			assertThat(exportService.getExportCount()).as("doExport not called on exportService").isEqualTo(2);
 			assertThat(importService.getImportCount()).as("doImport not called on importService").isEqualTo(2);
@@ -351,7 +353,7 @@ public void schedulerAccessorBean() throws Exception {
 
 	@Test
 	@SuppressWarnings("resource")
-	public void schedulerAutoStartsOnContextRefreshedEventByDefault() throws Exception {
+	void schedulerAutoStartsOnContextRefreshedEventByDefault() throws Exception {
 		StaticApplicationContext context = new StaticApplicationContext();
 		context.registerBeanDefinition("scheduler", new RootBeanDefinition(SchedulerFactoryBean.class));
 		Scheduler bean = context.getBean("scheduler", Scheduler.class);
@@ -362,7 +364,7 @@ public void schedulerAutoStartsOnContextRefreshedEventByDefault() throws Excepti
 
 	@Test
 	@SuppressWarnings("resource")
-	public void schedulerAutoStartupFalse() throws Exception {
+	void schedulerAutoStartupFalse() throws Exception {
 		StaticApplicationContext context = new StaticApplicationContext();
 		BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SchedulerFactoryBean.class)
 				.addPropertyValue("autoStartup", false).getBeanDefinition();
@@ -374,7 +376,7 @@ public void schedulerAutoStartupFalse() throws Exception {
 	}
 
 	@Test
-	public void schedulerRepositoryExposure() throws Exception {
+	void schedulerRepositoryExposure() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("schedulerRepositoryExposure.xml")) {
 			assertThat(ctx.getBean("scheduler")).isSameAs(SchedulerRepository.getInstance().lookup("myScheduler"));
 		}
@@ -385,7 +387,7 @@ public void schedulerRepositoryExposure() throws Exception {
 	 * TODO: Against Quartz 2.2, this test's job doesn't actually execute anymore...
 	 */
 	@Test
-	public void schedulerWithHsqlDataSource() throws Exception {
+	void schedulerWithHsqlDataSource() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -401,13 +403,14 @@ public void schedulerWithHsqlDataSource() throws Exception {
 	}
 
 	@Test
-	public void schedulerFactoryBeanWithCustomJobStore() throws Exception {
+	@SuppressWarnings("resource")
+	void schedulerFactoryBeanWithCustomJobStore() throws Exception {
 		StaticApplicationContext context = new StaticApplicationContext();
 
-		final String dbName = "mydb";
-		final EmbeddedDatabase database = new EmbeddedDatabaseBuilder().setName(dbName).build();
+		String dbName = "mydb";
+		EmbeddedDatabase database = new EmbeddedDatabaseBuilder().setName(dbName).build();
 
-		final Properties properties = new Properties();
+		Properties properties = new Properties();
 		properties.setProperty("org.quartz.jobStore.class", JobStoreTX.class.getName());
 		properties.setProperty("org.quartz.jobStore.dataSource", dbName);
 
@@ -418,9 +421,9 @@ public void schedulerFactoryBeanWithCustomJobStore() throws Exception {
 				.getBeanDefinition();
 		context.registerBeanDefinition("scheduler", beanDefinition);
 
-		Scheduler bean = context.getBean("scheduler", Scheduler.class);
+		Scheduler scheduler = context.getBean(Scheduler.class);
 
-		assertThat(bean.getMetaData().getJobStoreClass()).isEqualTo(JobStoreTX.class);
+		assertThat(scheduler.getMetaData().getJobStoreClass()).isEqualTo(JobStoreTX.class);
 	}
 
 	private ClassPathXmlApplicationContext context(String path) {
@@ -428,7 +431,7 @@ private ClassPathXmlApplicationContext context(String path) {
 	}
 
 
-	public static class CountingTaskExecutor implements TaskExecutor {
+	private static class CountingTaskExecutor implements TaskExecutor {
 
 		private int count;
 
@@ -440,12 +443,14 @@ public void execute(Runnable task) {
 	}
 
 
-	public static class DummyJob implements Job {
+	private static class DummyJob implements Job {
 
 		private static int param;
 
 		private static int count;
 
+		@SuppressWarnings("unused")
+		// Must be public
 		public void setParam(int value) {
 			if (param > 0) {
 				throw new IllegalStateException("Param already set");
@@ -460,12 +465,13 @@ public synchronized void execute(JobExecutionContext jobExecutionContext) throws
 	}
 
 
-	public static class DummyJobBean extends QuartzJobBean {
+	private static class DummyJobBean extends QuartzJobBean {
 
 		private static int param;
 
 		private static int count;
 
+		@SuppressWarnings("unused")
 		public void setParam(int value) {
 			if (param > 0) {
 				throw new IllegalStateException("Param already set");
@@ -480,7 +486,7 @@ protected synchronized void executeInternal(JobExecutionContext jobExecutionCont
 	}
 
 
-	public static class DummyRunnable implements Runnable {
+	private static class DummyRunnable implements Runnable {
 
 		@Override
 		public void run() {
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
index e45ccd195feb..58e771f3ad4a 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml
@@ -19,7 +19,7 @@
 				<property name="targetMethod" value="doExport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="1000"/>
+		<property name="repeatInterval" value="200"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 
@@ -30,7 +30,7 @@
 				<property name="targetMethod" value="doImport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="1000"/>
+		<property name="repeatInterval" value="200"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 
diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
index 0ba9c4a57a84..3634002664cc 100644
--- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
+++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml
@@ -21,7 +21,7 @@
 				<property name="targetMethod" value="doExport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="1000"/>
+		<property name="repeatInterval" value="200"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 
@@ -32,7 +32,7 @@
 				<property name="targetMethod" value="doImport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="1000"/>
+		<property name="repeatInterval" value="200"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
index 37928d2fb1b7..a33a24c01647 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,6 +133,7 @@ public void requestHeaderAndCookie() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void contextFromThreadLocal() {
 		WebClient client = this.builder
 				.filter((request, next) ->

From 4ec8ae42f48da6415a3be29507c9e327dec94538 Mon Sep 17 00:00:00 2001
From: Kenzo Spaulding <kenzo.spaulding@gmail.com>
Date: Wed, 26 May 2021 22:33:51 -0700
Subject: [PATCH 298/735] Add test cases to SpEL's MapAccessorTests

Closes gh-26981
---
 .../context/expression/MapAccessorTests.java        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java b/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java
index df73adaa36d1..8fd4d2fb9a99 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,6 +67,17 @@ public void mapAccessorCompilable() {
 		assertThat(ex.getValue(sec,mapGetter)).isEqualTo("bar");
 		assertThat(SpelCompiler.compile(ex)).isTrue();
 		assertThat(ex.getValue(sec,mapGetter)).isEqualTo("bar");
+
+		// basic isWritable
+		ex = sep.parseExpression("foo");
+		assertThat(ex.isWritable(sec,testMap)).isTrue();
+
+		// basic write
+		ex = sep.parseExpression("foo2");
+		ex.setValue(sec, testMap, "bar2");
+		assertThat(ex.getValue(sec,testMap)).isEqualTo("bar2");
+		assertThat(SpelCompiler.compile(ex)).isTrue();
+		assertThat(ex.getValue(sec,testMap)).isEqualTo("bar2");
 	}
 
 	public static class MapGetter {

From e4e667acdb774b45164f3ec345bfdf9e406e537f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 23 Oct 2021 18:02:55 +0200
Subject: [PATCH 299/735] Polishing

---
 .../org/springframework/context/expression/MapAccessor.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
index 5acc804d2a01..e7374fe305fc 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public Class<?>[] getSpecificTargetClasses() {
 
 	@Override
 	public boolean canRead(EvaluationContext context, @Nullable Object target, String name) throws AccessException {
-		return (target instanceof Map && ((Map<?, ?>) target).containsKey(name));
+		return (target instanceof Map<?, ?> map && map.containsKey(name));
 	}
 
 	@Override

From 65bf5f7c81fb35f3291a548e9d326a65e331e5eb Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 25 Oct 2021 09:58:04 +0200
Subject: [PATCH 300/735] Add JDK18 variant to CI pipeline

This commit adds a new JDK 18 variant to the CI build image and
configures a JDK18 build (sources compiled with JDK17, tests compiled
and run with JDK18) to the CI pipeline.

Closes gh-27607
---
 ci/images/ci-image/Dockerfile |  3 ++-
 ci/images/get-jdk-url.sh      | 13 ++++++----
 ci/pipeline.yml               | 45 ++++++++++++++++++++++++++++++++++-
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index 548a7cd7c233..6ddd3a38eb31 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210827
+FROM ubuntu:focal-20211006
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
@@ -6,5 +6,6 @@ RUN ./setup.sh
 
 ENV JAVA_HOME /opt/openjdk/java17
 ENV JDK17 /opt/openjdk/java17
+ENV JDK18 /opt/openjdk/java18
 
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index a3babd3ae7d4..783b8bb3c758 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -2,10 +2,13 @@
 set -e
 
 case "$1" in
-	java17)
-		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz"
-	;;
+  java17)
+    echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz"
+  ;;
+  java18)
+    echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-2021-10-22-05-05-beta/OpenJDK-jdk_x64_linux_hotspot_2021-10-21-23-30.tar.gz"
+  ;;
   *)
-		echo $"Unknown java version"
-		exit 1
+    echo $"Unknown java version"
+    exit 1
 esac
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 53f168b105e9..8596734ed611 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -85,6 +85,13 @@ resources:
   source:
     <<: *docker-resource-source
     repository: ((docker-hub-organization))/spring-framework-ci-jdk17
+- name: every-morning
+  type: time
+  icon: alarm
+  source:
+    start: 8:00 AM
+    stop: 9:00 AM
+    location: Europe/Vienna
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -109,6 +116,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: build
+- name: repo-status-jdk18-build
+  type: github-status-resource
+  icon: eye-check-outline
+  source:
+    repository: ((github-repo-name))
+    access_token: ((github-ci-status-token))
+    branch: ((branch))
+    context: jdk18-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -198,6 +213,34 @@ jobs:
           "zip.type": "schema"
     get_params:
       threads: 8
+- name: jdk18-build
+  serial: true
+  public: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+    - get: every-morning
+      trigger: true
+    - put: repo-status-jdk18-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: 18
+            <<: *build-project-task-params
+      on_failure:
+        do:
+          - put: repo-status-jdk18-build
+            params: { state: "failure", commit: "git-repo" }
+          - put: slack-alert
+            params:
+              <<: *slack-fail-params
+    - put: repo-status-jdk18-build
+      params: { state: "success", commit: "git-repo" }
 - name: build-pull-requests
   serial: true
   public: true
@@ -379,7 +422,7 @@ jobs:
 
 groups:
 - name: "builds"
-  jobs: ["build"]
+  jobs: ["build", "jdk18-build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"

From 683bdf2675c2a2a9664e913579cfdb883bfc186f Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 25 Oct 2021 10:06:06 +0200
Subject: [PATCH 301/735] Polish JDK 18 CI pipeline

This commit ensures that JDK 18 is properly installed in the CI image.

See gh-27607
---
 ci/images/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index 43af1979a261..4ede919fe303 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -22,7 +22,7 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java17
+for jdk in java17 java18
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk

From 0268e762980f302e251a92743dd6724403660399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <sergei.tsypanov@yandex.ru>
Date: Thu, 23 Sep 2021 14:48:04 +0300
Subject: [PATCH 302/735] Improve mapping function in
 ExtendedEntityManagerCreator.createProxy()

Closes gh-27456
---
 .../orm/jpa/ExtendedEntityManagerCreator.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
index 8e9173a94bfd..55431d805f3e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -230,10 +230,10 @@ private static EntityManager createProxy(
 
 		if (emIfc != null) {
 			interfaces = cachedEntityManagerInterfaces.computeIfAbsent(emIfc, key -> {
-				Set<Class<?>> ifcs = new LinkedHashSet<>(4);
-				ifcs.add(key);
-				ifcs.add(EntityManagerProxy.class);
-				return ClassUtils.toClassArray(ifcs);
+				if (EntityManagerProxy.class.equals(key)) {
+					return new Class<?>[] {key};
+				}
+				return new Class<?>[] {key, EntityManagerProxy.class};
 			});
 		}
 		else {

From c4c3d59d07bfe7775f0df88f40babebd27975ca2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 25 Oct 2021 17:02:58 +0200
Subject: [PATCH 303/735] Remove unused code in
 FormattingConversionServiceTests

---
 .../FormattingConversionServiceTests.java     | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
index eeb6895eddea..8aff305f22fa 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -321,28 +321,6 @@ public Date convert(MyDate source) {
 				TypeDescriptor.valueOf(String.class));
 	}
 
-	@Test
-	public void registerDefaultValueViaFormatter() {
-		registerDefaultValue(Date.class, new Date());
-	}
-
-	private <T> void registerDefaultValue(Class<T> clazz, final T defaultValue) {
-		formattingService.addFormatterForFieldType(clazz, new Formatter<T>() {
-			@Override
-			public T parse(String text, Locale locale) {
-				return defaultValue;
-			}
-			@Override
-			public String print(T t, Locale locale) {
-				return defaultValue.toString();
-			}
-			@Override
-			public String toString() {
-				return defaultValue.toString();
-			}
-		});
-	}
-
 	@Test
 	public void introspectedFormatter() {
 		formattingService.addFormatter(new NumberStyleFormatter("#,#00.0#"));

From c989470f94926ee5c7474bead278b00e9aaac787 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 25 Oct 2021 17:12:55 +0200
Subject: [PATCH 304/735] Remove unused code in
 FormattingConversionServiceTests

This commit removes test code that became obsolete with the removal of
Joda Time support.
---
 .../FormattingConversionServiceTests.java     | 92 -------------------
 1 file changed, 92 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
index 07cc3ecffcd4..00a56960ef01 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
@@ -16,10 +16,6 @@
 
 package org.springframework.format.support;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.Date;
-import java.util.List;
 import java.util.Locale;
 
 import org.junit.jupiter.api.AfterEach;
@@ -27,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
@@ -35,7 +30,6 @@
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.format.Formatter;
-import org.springframework.format.annotation.NumberFormat;
 import org.springframework.format.number.NumberStyleFormatter;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -187,80 +181,6 @@ public void proxiedConverterFactory() {
 	}
 
 
-	public static class ValueBean {
-
-		@Value("10-31-09")
-		@org.springframework.format.annotation.DateTimeFormat(pattern="MM-d-yy")
-		public Date date;
-	}
-
-
-	public static class MetaValueBean {
-
-		@MyDateAnn
-		public Date date;
-
-		@MyNumberAnn
-		public Double number;
-	}
-
-
-	@Value("${myDate}")
-	@org.springframework.format.annotation.DateTimeFormat(pattern="MM-d-yy")
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface MyDateAnn {
-	}
-
-
-	@Value("${myNumber}")
-	@NumberFormat(style = NumberFormat.Style.PERCENT)
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface MyNumberAnn {
-	}
-
-
-	public static class Model {
-
-		@org.springframework.format.annotation.DateTimeFormat(style="S-")
-		public Date date;
-
-		@org.springframework.format.annotation.DateTimeFormat(pattern="M-d-yy")
-		public List<Date> dates;
-
-		public List<Date> getDates() {
-			return dates;
-		}
-
-		public void setDates(List<Date> dates) {
-			this.dates = dates;
-		}
-	}
-
-
-	public static class ModelWithPlaceholders {
-
-		@org.springframework.format.annotation.DateTimeFormat(style="${dateStyle}")
-		public Date date;
-
-		@MyDatePattern
-		public List<Date> dates;
-
-		public List<Date> getDates() {
-			return dates;
-		}
-
-		public void setDates(List<Date> dates) {
-			this.dates = dates;
-		}
-	}
-
-
-	@org.springframework.format.annotation.DateTimeFormat(pattern="${datePattern}")
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface MyDatePattern {
-	}
-
-
 	public static class NullReturningFormatter implements Formatter<Integer> {
 
 		@Override
@@ -275,18 +195,6 @@ public Integer parse(String text, Locale locale) {
 	}
 
 
-	@SuppressWarnings("serial")
-	public static class MyDate extends Date {
-	}
-
-
-	private static class ModelWithSubclassField {
-
-		@org.springframework.format.annotation.DateTimeFormat(style = "S-")
-		public MyDate date;
-	}
-
-
 	private static class IntegerConverter implements Converter<String, Integer> {
 
 		@Override

From 6fd0615be9003a86c4ac5a0cb89e78aac4cc83f6 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 26 Oct 2021 09:12:30 +0200
Subject: [PATCH 305/735] Fix JDK18 declaration in CI pipeline

See gh-27607
---
 ci/scripts/check-project.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/scripts/check-project.sh b/ci/scripts/check-project.sh
index 0620dc17164d..c0b66efc7d3d 100755
--- a/ci/scripts/check-project.sh
+++ b/ci/scripts/check-project.sh
@@ -4,6 +4,6 @@ set -e
 source $(dirname $0)/common.sh
 
 pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17 \
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK18 \
   -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
 popd > /dev/null

From 0a58419df4fee5e50b6831c065c1a14bedc5f5f8 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Mon, 25 Oct 2021 15:25:39 +0200
Subject: [PATCH 306/735] Add immutable MultiValueMap wrapper

This commit introduces UnmodifiableMultiValueMap, an immutable wrapper
around a MultiValueMap, similar to what is returned by
Collections.unmodifiable*.
CollectionUtils::unmodifiableMultiValueMap now returns
UnmodifiableMultiValueMap.

Closes gh-27608
---
 .../springframework/util/CollectionUtils.java |  11 +-
 .../util/UnmodifiableMultiValueMap.java       | 732 ++++++++++++++++++
 .../util/UnmodifiableMultiValueMapTests.java  | 179 +++++
 .../web/util/UriComponentsBuilder.java        |   3 +-
 4 files changed, 917 insertions(+), 8 deletions(-)
 create mode 100644 spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java
 create mode 100644 spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java

diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
index 530e5222ba08..a574fff2674b 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -470,13 +470,10 @@ public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(
 			MultiValueMap<? extends K, ? extends V> targetMap) {
 
 		Assert.notNull(targetMap, "'targetMap' must not be null");
-		Map<K, List<V>> result = newLinkedHashMap(targetMap.size());
-		targetMap.forEach((key, value) -> {
-			List<? extends V> values = Collections.unmodifiableList(value);
-			result.put(key, (List<V>) values);
-		});
-		Map<K, List<V>> unmodifiableMap = Collections.unmodifiableMap(result);
-		return toMultiValueMap(unmodifiableMap);
+		if (targetMap instanceof UnmodifiableMultiValueMap) {
+			return (MultiValueMap<K, V>) targetMap;
+		}
+		return new UnmodifiableMultiValueMap<>(targetMap);
 	}
 
 
diff --git a/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java b/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java
new file mode 100644
index 000000000000..7623ff8770f8
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java
@@ -0,0 +1,732 @@
+/*
+ * 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.util;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * Unmodifiable wrapper for {@link MultiValueMap}.
+ *
+ * @author Arjen Poutsma
+ * @since 6.0
+ * @param <K> the key type
+ * @param <V> the value element type
+ */
+final class UnmodifiableMultiValueMap<K,V> implements MultiValueMap<K,V>, Serializable {
+
+	private static final long serialVersionUID = -8697084563854098920L;
+
+
+	private final MultiValueMap<K, V> delegate;
+
+	@Nullable
+	private transient Set<K> keySet;
+
+	@Nullable
+	private transient Set<Entry<K, List<V>>> entrySet;
+
+	@Nullable
+	private transient Collection<List<V>> values;
+
+
+	@SuppressWarnings("unchecked")
+	public UnmodifiableMultiValueMap(MultiValueMap<? extends K, ? extends V> delegate) {
+		Assert.notNull(delegate, "Delegate must not be null");
+		this.delegate = (MultiValueMap<K, V>) delegate;
+	}
+
+	// delegation
+
+	@Override
+	public int size() {
+		return this.delegate.size();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return this.delegate.isEmpty();
+	}
+
+	@Override
+	public boolean containsKey(Object key) {
+		return this.delegate.containsKey(key);
+	}
+
+	@Override
+	public boolean containsValue(Object value) {
+		return this.delegate.containsValue(value);
+	}
+
+	@Override
+	@Nullable
+	public List<V> get(Object key) {
+		List<V> result = this.delegate.get(key);
+		return result != null ? Collections.unmodifiableList(result) : null;
+	}
+
+	@Override
+	public V getFirst(K key) {
+		return this.delegate.getFirst(key);
+	}
+
+	@Override
+	public List<V> getOrDefault(Object key, List<V> defaultValue) {
+		List<V> result = this.delegate.getOrDefault(key, defaultValue);
+		if (result != defaultValue) {
+			result = Collections.unmodifiableList(result);
+		}
+		return result;
+	}
+
+	@Override
+	public void forEach(BiConsumer<? super K, ? super List<V>> action) {
+		this.delegate.forEach((k, vs) -> action.accept(k, Collections.unmodifiableList(vs)));
+	}
+
+	@Override
+	public Map<K, V> toSingleValueMap() {
+		return this.delegate.toSingleValueMap();
+	}
+
+	@Override
+	public int hashCode() {
+		return this.delegate.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return this == obj || this.delegate.equals(obj);
+	}
+
+	@Override
+	public String toString() {
+		return this.delegate.toString();
+	}
+
+	// lazy init
+
+	@Override
+	public Set<K> keySet() {
+		if (this.keySet == null) {
+			this.keySet = Collections.unmodifiableSet(this.delegate.keySet());
+		}
+		return this.keySet;
+	}
+
+	@Override
+	public Set<Entry<K, List<V>>> entrySet() {
+		if (this.entrySet == null) {
+			this.entrySet = new UnmodifiableEntrySet<>(this.delegate.entrySet());
+		}
+		return this.entrySet;
+	}
+
+	@Override
+	public Collection<List<V>> values() {
+		if (this.values == null) {
+			this.values = new UnmodifiableValueCollection<>(this.delegate.values());
+		}
+		return this.values;
+	}
+
+	// unsupported
+
+	@Nullable
+	@Override
+	public List<V> put(K key, List<V> value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<V> putIfAbsent(K key, List<V> value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void putAll(Map<? extends K, ? extends List<V>> m) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<V> remove(Object key) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void add(K key, @Nullable V value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void addAll(K key, List<? extends V> values) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void addAll(MultiValueMap<K, V> values) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void addIfAbsent(K key, @Nullable V value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void set(K key, @Nullable V value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void setAll(Map<K, V> values) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void replaceAll(BiFunction<? super K, ? super List<V>, ? extends List<V>> function) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public boolean remove(Object key, Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public boolean replace(K key, List<V> oldValue, List<V> newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<V> replace(K key, List<V> value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<V> computeIfAbsent(K key, Function<? super K, ? extends List<V>> mappingFunction) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<V> computeIfPresent(K key,
+			BiFunction<? super K, ? super List<V>, ? extends List<V>> remappingFunction) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<V> compute(K key,
+			BiFunction<? super K, ? super List<V>, ? extends List<V>> remappingFunction) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public List<V> merge(K key, List<V> value,
+			BiFunction<? super List<V>, ? super List<V>, ? extends List<V>> remappingFunction) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void clear() {
+		throw new UnsupportedOperationException();
+	}
+
+
+	private static class UnmodifiableEntrySet<K,V> implements Set<Map.Entry<K, List<V>>>, Serializable {
+
+		private static final long serialVersionUID = 2407578793783925203L;
+
+
+		private final Set<Entry<K, List<V>>> delegate;
+
+
+		@SuppressWarnings("unchecked")
+		public UnmodifiableEntrySet(Set<? extends Entry<? extends K, ? extends List<? extends V>>> delegate) {
+			this.delegate = (Set<Entry<K, List<V>>>) delegate;
+		}
+
+		// delegation
+
+		@Override
+		public int size() {
+			return this.delegate.size();
+		}
+
+		@Override
+		public boolean isEmpty() {
+			return this.delegate.isEmpty();
+		}
+
+		@Override
+		public boolean contains(Object o) {
+			return this.delegate.contains(o);
+		}
+
+		@Override
+		public boolean containsAll(Collection<?> c) {
+			return this.delegate.containsAll(c);
+		}
+
+		@Override
+		public Iterator<Entry<K, List<V>>> iterator() {
+			Iterator<? extends Entry<? extends K, ? extends List<? extends V>>> iterator = this.delegate.iterator();
+			return new Iterator<>() {
+				@Override
+				public boolean hasNext() {
+					return iterator.hasNext();
+				}
+
+				@Override
+				public Entry<K, List<V>> next() {
+					return new UnmodifiableEntry<>(iterator.next());
+				}
+			};
+		}
+
+		@Override
+		public Object[] toArray() {
+			Object[] result = this.delegate.toArray();
+			filterArray(result);
+			return result;
+		}
+
+		@Override
+		public <T> T[] toArray(T[] a) {
+			T[] result = this.delegate.toArray(a);
+			filterArray(result);
+			return result;
+		}
+
+		@SuppressWarnings("unchecked")
+		private void filterArray(Object[] result) {
+			for (int i = 0; i < result.length; i++) {
+				if (result[i] instanceof Map.Entry<?,?> entry) {
+					result[i] = new UnmodifiableEntry<>((Entry<K, List<V>>) entry);
+				}
+			}
+		}
+
+		@Override
+		public void forEach(Consumer<? super Entry<K, List<V>>> action) {
+			this.delegate.forEach(e -> action.accept(new UnmodifiableEntry<>(e)));
+		}
+
+		@Override
+		public Stream<Entry<K, List<V>>> stream() {
+			return StreamSupport.stream(spliterator(), false);
+		}
+
+		@Override
+		public Stream<Entry<K, List<V>>> parallelStream() {
+			return StreamSupport.stream(spliterator(), true);
+		}
+
+		@Override
+		public Spliterator<Entry<K, List<V>>> spliterator() {
+			return new UnmodifiableEntrySpliterator<>(this.delegate.spliterator());
+		}
+
+		@Override
+		public int hashCode() {
+			return this.delegate.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			else if (obj instanceof Set<?> other) {
+				return other.size() == this.delegate.size() &&
+						containsAll(other);
+			}
+			return false;
+		}
+
+		@Override
+		public String toString() {
+			return this.delegate.toString();
+		}
+
+		// unsupported
+
+		@Override
+		public boolean add(Entry<K, List<V>> kListEntry) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean remove(Object o) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean removeIf(Predicate<? super Entry<K, List<V>>> filter) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean addAll(Collection<? extends Entry<K, List<V>>> c) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean retainAll(Collection<?> c) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean removeAll(Collection<?> c) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void clear() {
+			throw new UnsupportedOperationException();
+		}
+
+
+		private static class UnmodifiableEntrySpliterator<K,V> implements Spliterator<Entry<K,List<V>>> {
+
+			private final Spliterator<Entry<K, List<V>>> delegate;
+
+
+			@SuppressWarnings("unchecked")
+			public UnmodifiableEntrySpliterator(
+					Spliterator<? extends Entry<? extends K, ? extends List<? extends V>>> delegate) {
+				this.delegate = (Spliterator<Entry<K, List<V>>>) delegate;
+			}
+
+			@Override
+			public boolean tryAdvance(Consumer<? super Entry<K, List<V>>> action) {
+				return this.delegate.tryAdvance(entry -> action.accept(new UnmodifiableEntry<>(entry)));
+			}
+
+			@Override
+			public void forEachRemaining(Consumer<? super Entry<K, List<V>>> action) {
+				this.delegate.forEachRemaining(entry -> action.accept(new UnmodifiableEntry<>(entry)));
+			}
+
+			@Override
+			@Nullable
+			public Spliterator<Entry<K, List<V>>> trySplit() {
+				Spliterator<? extends Entry<? extends K, ? extends List<? extends V>>> split = this.delegate.trySplit();
+				if (split != null) {
+					return new UnmodifiableEntrySpliterator<>(split);
+				}
+				else {
+					return null;
+				}
+			}
+
+			@Override
+			public long estimateSize() {
+				return this.delegate.estimateSize();
+			}
+
+			@Override
+			public long getExactSizeIfKnown() {
+				return this.delegate.getExactSizeIfKnown();
+			}
+
+			@Override
+			public int characteristics() {
+				return this.delegate.characteristics();
+			}
+
+			@Override
+			public boolean hasCharacteristics(int characteristics) {
+				return this.delegate.hasCharacteristics(characteristics);
+			}
+
+			@Override
+			public Comparator<? super Entry<K, List<V>>> getComparator() {
+				return this.delegate.getComparator();
+			}
+		}
+
+
+		private static class UnmodifiableEntry<K,V> implements Map.Entry<K,List<V>> {
+
+			private final Entry<K, List<V>> delegate;
+
+
+			@SuppressWarnings("unchecked")
+			public UnmodifiableEntry(Entry<? extends K, ? extends List<? extends V>> delegate) {
+				Assert.notNull(delegate, "Delegate must not be null");
+				this.delegate = (Entry<K, List<V>>) delegate;
+			}
+
+			@Override
+			public K getKey() {
+				return this.delegate.getKey();
+			}
+
+			@Override
+			public List<V> getValue() {
+				return Collections.unmodifiableList(this.delegate.getValue());
+			}
+
+			@Override
+			public List<V> setValue(List<V> value) {
+				throw new UnsupportedOperationException();
+			}
+
+			@Override
+			public int hashCode() {
+				return this.delegate.hashCode();
+			}
+
+			@Override
+			public boolean equals(Object obj) {
+				if (this == obj) {
+					return true;
+				}
+				else if (obj instanceof Map.Entry<?, ?> other) {
+					return getKey().equals(other.getKey()) &&
+							getValue().equals(other.getValue());
+				}
+				return false;
+			}
+
+			@Override
+			public String toString() {
+				return this.delegate.toString();
+			}
+		}
+	}
+
+
+	private static class UnmodifiableValueCollection<T> implements Collection<List<T>>, Serializable {
+
+		private static final long serialVersionUID = 5518377583904339588L;
+
+		private final Collection<List<T>> delegate;
+
+
+		public UnmodifiableValueCollection(Collection<List<T>> delegate) {
+			this.delegate = delegate;
+		}
+
+		 // delegation
+
+		@Override
+		public int size() {
+			return this.delegate.size();
+		}
+
+		@Override
+		public boolean isEmpty() {
+			return this.delegate.isEmpty();
+		}
+
+		@Override
+		public boolean contains(Object o) {
+			return this.delegate.contains(o);
+		}
+
+		@Override
+		public boolean containsAll(Collection<?> c) {
+			return this.delegate.containsAll(c);
+		}
+
+		@Override
+		public Object[] toArray() {
+			Object[] result = this.delegate.toArray();
+			filterArray(result);
+			return result;
+		}
+
+		@Override
+		public <T> T[] toArray(T[] a) {
+			T[] result = this.delegate.toArray(a);
+			filterArray(result);
+			return result;
+		}
+
+		private void filterArray(Object[] array) {
+			for (int i = 0; i < array.length; i++) {
+				if (array[i] instanceof List<?> list) {
+					array[i] = Collections.unmodifiableList(list);
+				}
+			}
+		}
+
+		@Override
+		public Iterator<List<T>> iterator() {
+			Iterator<List<T>> iterator = this.delegate.iterator();
+			return new Iterator<>() {
+				@Override
+				public boolean hasNext() {
+					return iterator.hasNext();
+				}
+
+				@Override
+				public List<T> next() {
+					return Collections.unmodifiableList(iterator.next());
+				}
+			};
+		}
+
+		@Override
+		public void forEach(Consumer<? super List<T>> action) {
+			this.delegate.forEach(list -> action.accept(Collections.unmodifiableList(list)));
+		}
+
+		@Override
+		public Spliterator<List<T>> spliterator() {
+			return new UnmodifiableValueSpliterator<>(this.delegate.spliterator());
+		}
+
+		@Override
+		public Stream<List<T>> stream() {
+			return StreamSupport.stream(spliterator(), false);
+		}
+
+		@Override
+		public Stream<List<T>> parallelStream() {
+			return StreamSupport.stream(spliterator(), true);
+		}
+
+		@Override
+		public int hashCode() {
+			return this.delegate.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			return this == obj || this.delegate.equals(obj);
+		}
+
+		@Override
+		public String toString() {
+			return this.delegate.toString();
+		}
+
+		// unsupported
+
+		@Override
+		public boolean add(List<T> ts) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean remove(Object o) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean addAll(Collection<? extends List<T>> c) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean removeAll(Collection<?> c) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean retainAll(Collection<?> c) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean removeIf(Predicate<? super List<T>> filter) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void clear() {
+			throw new UnsupportedOperationException();
+		}
+
+
+		private static class UnmodifiableValueSpliterator<T> implements Spliterator<List<T>> {
+
+			private final Spliterator<List<T>> delegate;
+
+
+			public UnmodifiableValueSpliterator(Spliterator<List<T>> delegate) {
+				this.delegate = delegate;
+			}
+
+			@Override
+			public boolean tryAdvance(Consumer<? super List<T>> action) {
+				return this.delegate.tryAdvance(l -> action.accept(Collections.unmodifiableList(l)));
+			}
+
+			@Override
+			public void forEachRemaining(Consumer<? super List<T>> action) {
+				this.delegate.forEachRemaining(l -> action.accept(Collections.unmodifiableList(l)));
+			}
+
+			@Override
+			@Nullable
+			public Spliterator<List<T>> trySplit() {
+				Spliterator<List<T>> split = this.delegate.trySplit();
+				if (split != null) {
+					return new UnmodifiableValueSpliterator<>(split);
+				}
+				else {
+					return null;
+				}
+			}
+
+			@Override
+			public long estimateSize() {
+				return this.delegate.estimateSize();
+			}
+
+			@Override
+			public long getExactSizeIfKnown() {
+				return this.delegate.getExactSizeIfKnown();
+			}
+
+			@Override
+			public int characteristics() {
+				return this.delegate.characteristics();
+			}
+
+			@Override
+			public boolean hasCharacteristics(int characteristics) {
+				return this.delegate.hasCharacteristics(characteristics);
+			}
+
+			@Override
+			public Comparator<? super List<T>> getComparator() {
+				return this.delegate.getComparator();
+			}
+		}
+
+	}
+}
diff --git a/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java
new file mode 100644
index 000000000000..27c856eb5640
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java
@@ -0,0 +1,179 @@
+/*
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.assertj.core.api.ThrowableTypeAssert;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.entry;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+/**
+ * @author Arjen Poutsma
+ */
+class UnmodifiableMultiValueMapTests {
+
+	@Test
+	void delegation() {
+		MultiValueMap<String, String> mock = mock(MultiValueMap.class);
+		UnmodifiableMultiValueMap<String, String> map = new UnmodifiableMultiValueMap<>(mock);
+
+		given(mock.size()).willReturn(1);
+		assertThat(map.size()).isEqualTo(1);
+
+		given(mock.isEmpty()).willReturn(false);
+		assertThat(map.isEmpty()).isFalse();
+
+		given(mock.containsKey("foo")).willReturn(true);
+		assertThat(map.containsKey("foo")).isTrue();
+
+		given(mock.containsValue(List.of("bar"))).willReturn(true);
+		assertThat(map.containsValue(List.of("bar"))).isTrue();
+
+		List<String> list = new ArrayList<>();
+		list.add("bar");
+		given(mock.get("foo")).willReturn(list);
+		List<String> result = map.get("foo");
+		assertThat(result).isNotNull().containsExactly("bar");
+		assertThatUnsupportedOperationException().isThrownBy(() -> result.add("baz"));
+
+		given(mock.getOrDefault("foo", List.of("bar"))).willReturn(List.of("baz"));
+		assertThat(map.getOrDefault("foo", List.of("bar"))).containsExactly("baz");
+
+		given(mock.toSingleValueMap()).willReturn(Map.of("foo", "bar"));
+		assertThat(map.toSingleValueMap()).containsExactly(entry("foo", "bar"));
+	}
+
+	@Test
+	void unsupported() {
+		UnmodifiableMultiValueMap<String, String> map = new UnmodifiableMultiValueMap<>(new LinkedMultiValueMap<>());
+
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.put("foo", List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.putIfAbsent("foo", List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.putAll(Map.of("foo", List.of("bar"))));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.remove("foo"));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.add("foo", "bar"));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.addAll("foo", List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.addAll(new LinkedMultiValueMap<>()));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.addIfAbsent("foo", "baz"));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.set("foo", "baz"));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.setAll(Map.of("foo", "baz")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.replaceAll((s, strings) -> strings));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.remove("foo", List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.replace("foo", List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.replace("foo", List.of("bar"), List.of("baz")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.computeIfAbsent("foo", s -> List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(
+				() -> map.computeIfPresent("foo", (s1, s2) -> List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.compute("foo", (s1, s2) -> List.of("bar")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.merge("foo", List.of("bar"), (s1, s2) -> s1));
+		assertThatUnsupportedOperationException().isThrownBy(() -> map.clear());
+	}
+
+	@Test
+	void entrySetDelegation() {
+		MultiValueMap<String, String> mockMap = mock(MultiValueMap.class);
+		Set<Map.Entry<String, List<String>>> mockSet = mock(Set.class);
+		given(mockMap.entrySet()).willReturn(mockSet);
+		Set<Map.Entry<String, List<String>>> set = new UnmodifiableMultiValueMap<>(mockMap).entrySet();
+
+		given(mockSet.size()).willReturn(1);
+		assertThat(set.size()).isEqualTo(1);
+
+		given(mockSet.isEmpty()).willReturn(false);
+		assertThat(set.isEmpty()).isFalse();
+
+		given(mockSet.contains("foo")).willReturn(true);
+		assertThat(set.contains("foo")).isTrue();
+
+		List<Map.Entry<String, List<String>>> mockEntries = List.of(mock(Map.Entry.class));
+		given(mockSet.containsAll(mockEntries)).willReturn(true);
+		assertThat(set.containsAll(mockEntries)).isTrue();
+
+		Iterator<Map.Entry<String, List<String>>> mockIterator = mock(Iterator.class);
+		given(mockSet.iterator()).willReturn(mockIterator);
+		given(mockIterator.hasNext()).willReturn(false);
+		assertThat(set.iterator()).isExhausted();
+	}
+
+	@Test
+	void entrySetUnsupported() {
+		Set<Map.Entry<String, List<String>>> set = new UnmodifiableMultiValueMap<String, String>(new LinkedMultiValueMap<>()).entrySet();
+
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.add(mock(Map.Entry.class)));
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.remove("foo"));
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.removeIf(e -> true));
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.addAll(mock(List.class)));
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.retainAll(mock(List.class)));
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.removeAll(mock(List.class)));
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.clear());
+	}
+
+	@Test
+	void valuesDelegation() {
+		MultiValueMap<String, String> mockMap = mock(MultiValueMap.class);
+		Collection<List<String>> mockValues = mock(Collection.class);
+		given(mockMap.values()).willReturn(mockValues);
+		Collection<List<String>> values = new UnmodifiableMultiValueMap<>(mockMap).values();
+
+		given(mockValues.size()).willReturn(1);
+		assertThat(values.size()).isEqualTo(1);
+
+		given(mockValues.isEmpty()).willReturn(false);
+		assertThat(values.isEmpty()).isFalse();
+
+		given(mockValues.contains(List.of("foo"))).willReturn(true);
+		assertThat(mockValues.contains(List.of("foo"))).isTrue();
+
+		given(mockValues.containsAll(List.of(List.of("foo")))).willReturn(true);
+		assertThat(mockValues.containsAll(List.of(List.of("foo")))).isTrue();
+
+		Iterator<List<String>> mockIterator = mock(Iterator.class);
+		given(mockValues.iterator()).willReturn(mockIterator);
+		given(mockIterator.hasNext()).willReturn(false);
+		assertThat(values.iterator()).isExhausted();
+	}
+
+	@Test
+	void valuesUnsupported() {
+		Collection<List<String>> values =
+				new UnmodifiableMultiValueMap<String, String>(new LinkedMultiValueMap<>()).values();
+
+		assertThatUnsupportedOperationException().isThrownBy(() -> values.add(List.of("foo")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> values.remove(List.of("foo")));
+		assertThatUnsupportedOperationException().isThrownBy(() -> values.addAll(List.of(List.of("foo"))));
+		assertThatUnsupportedOperationException().isThrownBy(() -> values.removeAll(List.of(List.of("foo"))));
+		assertThatUnsupportedOperationException().isThrownBy(() -> values.retainAll(List.of(List.of("foo"))));
+		assertThatUnsupportedOperationException().isThrownBy(() -> values.removeIf(s -> true));
+		assertThatUnsupportedOperationException().isThrownBy(() -> values.clear());
+	}
+
+	private static ThrowableTypeAssert<UnsupportedOperationException> assertThatUnsupportedOperationException() {
+		return assertThatExceptionOfType(UnsupportedOperationException.class);
+	}
+
+}
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index 68c98562a280..37fbf44b7b9e 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -479,8 +479,9 @@ private UriComponents buildInternal(EncodingHint hint) {
 			result = new OpaqueUriComponents(this.scheme, this.ssp, this.fragment);
 		}
 		else {
+			MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(this.queryParams);
 			HierarchicalUriComponents uric = new HierarchicalUriComponents(this.scheme, this.fragment,
-					this.userInfo, this.host, this.port, this.pathBuilder.build(), this.queryParams,
+					this.userInfo, this.host, this.port, this.pathBuilder.build(), queryParams,
 					hint == EncodingHint.FULLY_ENCODED);
 			result = (hint == EncodingHint.ENCODE_TEMPLATE ? uric.encodeTemplate(this.charset) : uric);
 		}

From 0416168d0edfaa8f321e318bd4129df7b425ee79 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Wed, 27 Oct 2021 15:07:15 +0200
Subject: [PATCH 307/735] Fix bug in max header calculation in
 DefaultPartHttpMessageReader

This commit fixes a bug in the DefaultPartHttpMessageReader, in the
check for exceeding the maximum header size. Before this commit, the
entire buffer size was considered, thus triggering an exception even
though the max header limit was not exceeded. After this commit, we only
consider the size up until the end-of-header mark (CRLFCRLF).

Furthermore, this commit increases the default maximum header size to
10k, the same default as Commons File upload.

Closes gh-27612
---
 .../DefaultPartHttpMessageReader.java         |  2 +-
 .../http/codec/multipart/MultipartParser.java | 71 +++++++++++--------
 .../DefaultPartHttpMessageReaderTests.java    | 25 +++++++
 .../http/codec/multipart/files.multipart      |  2 -
 4 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java
index d4248c8442d3..6e94678cef11 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java
@@ -63,7 +63,7 @@ public class DefaultPartHttpMessageReader extends LoggingCodecSupport implements
 
 	private int maxInMemorySize = 256 * 1024;
 
-	private int maxHeadersSize = 8 * 1024;
+	private int maxHeadersSize = 10 * 1024;
 
 	private long maxDiskUsagePerPart = -1;
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
index d2057f53d627..d797b99f4b1b 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
@@ -342,33 +342,23 @@ private final class HeadersState implements State {
 
 		/**
 		 * First checks whether the multipart boundary leading to this state
-		 * was the final boundary, or whether {@link #maxHeadersSize} is
-		 * exceeded. Then looks for the header-body boundary
-		 * ({@code CR LF CR LF}) in the given buffer. If found, convert
-		 * all buffers collected so far into a {@link HttpHeaders} object
+		 * was the final boundary. Then looks for the header-body boundary
+		 * ({@code CR LF CR LF}) in the given buffer. If found, checks whether
+		 * the size of all header buffers does not exceed {@link #maxHeadersSize},
+		 * converts all buffers collected so far into a {@link HttpHeaders} object
 		 * and changes to {@link BodyState}, passing the remainder of the
-		 * buffer. If the boundary is not found, the buffer is collected.
+		 * buffer. If the boundary is not found, the buffer is collected if
+		 * its size does not exceed {@link #maxHeadersSize}.
 		 */
 		@Override
 		public void onNext(DataBuffer buf) {
-			long prevCount = this.byteCount.get();
-			long count = this.byteCount.addAndGet(buf.readableByteCount());
-			if (prevCount < 2 && count >= 2) {
-				if (isLastBoundary(buf)) {
-					if (logger.isTraceEnabled()) {
-						logger.trace("Last boundary found in " + buf);
-					}
-
-					if (changeState(this, DisposedState.INSTANCE, buf)) {
-						emitComplete();
-					}
-					return;
+			if (isLastBoundary(buf)) {
+				if (logger.isTraceEnabled()) {
+					logger.trace("Last boundary found in " + buf);
 				}
-			}
-			else if (count > MultipartParser.this.maxHeadersSize) {
+
 				if (changeState(this, DisposedState.INSTANCE, buf)) {
-					emitError(new DataBufferLimitException("Part headers exceeded the memory usage limit of " +
-							MultipartParser.this.maxHeadersSize + " bytes"));
+					emitComplete();
 				}
 				return;
 			}
@@ -377,17 +367,23 @@ else if (count > MultipartParser.this.maxHeadersSize) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("End of headers found @" + endIdx + " in " + buf);
 				}
-				DataBuffer headerBuf = MultipartUtils.sliceTo(buf, endIdx);
-				this.buffers.add(headerBuf);
-				DataBuffer bodyBuf = MultipartUtils.sliceFrom(buf, endIdx);
-				DataBufferUtils.release(buf);
-
-				emitHeaders(parseHeaders());
-				changeState(this, new BodyState(), bodyBuf);
+				long count = this.byteCount.addAndGet(endIdx);
+				if (belowMaxHeaderSize(count)) {
+					DataBuffer headerBuf = MultipartUtils.sliceTo(buf, endIdx);
+					this.buffers.add(headerBuf);
+					DataBuffer bodyBuf = MultipartUtils.sliceFrom(buf, endIdx);
+					DataBufferUtils.release(buf);
+
+					emitHeaders(parseHeaders());
+					changeState(this, new BodyState(), bodyBuf);
+				}
 			}
 			else {
-				this.buffers.add(buf);
-				requestBuffer();
+				long count = this.byteCount.addAndGet(buf.readableByteCount());
+				if (belowMaxHeaderSize(count)) {
+					this.buffers.add(buf);
+					requestBuffer();
+				}
 			}
 		}
 
@@ -407,6 +403,21 @@ private boolean isLastBoundary(DataBuffer buf) {
 							buf.getByte(0) == HYPHEN);
 		}
 
+		/**
+		 * Checks whether the given {@code count} is below or equal to {@link #maxHeadersSize}
+		 * and emits a {@link DataBufferLimitException} if not.
+		 */
+		private boolean belowMaxHeaderSize(long count) {
+			if (count <= MultipartParser.this.maxHeadersSize) {
+				return true;
+			}
+			else {
+				emitError(new DataBufferLimitException("Part headers exceeded the memory usage limit of " +
+						MultipartParser.this.maxHeadersSize + " bytes"));
+				return false;
+			}
+		}
+
 		/**
 		 * Parses the list of buffers into a {@link HttpHeaders} instance.
 		 * Converts the joined buffers into a string using ISO=8859-1, and parses
diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java
index 8e812e720fb0..9179a546820f 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java
@@ -270,6 +270,31 @@ public void utf8Headers(String displayName, DefaultPartHttpMessageReader reader)
 		latch.await();
 	}
 
+	// gh-27612
+	@Test
+	public void exceedHeaderLimit() throws InterruptedException {
+		Flux<DataBuffer> body = DataBufferUtils
+				.readByteChannel((new ClassPathResource("files.multipart", getClass()))::readableChannel, bufferFactory, 282);
+
+		MediaType contentType = new MediaType("multipart", "form-data", singletonMap("boundary", "----WebKitFormBoundaryG8fJ50opQOML0oGD"));
+		MockServerHttpRequest request = MockServerHttpRequest.post("/")
+				.contentType(contentType)
+				.body(body);
+
+		DefaultPartHttpMessageReader reader = new DefaultPartHttpMessageReader();
+
+		reader.setMaxHeadersSize(230);
+
+		Flux<Part> result = reader.read(forClass(Part.class), request, emptyMap());
+
+		CountDownLatch latch = new CountDownLatch(2);
+		StepVerifier.create(result)
+				.consumeNextWith(part -> testPart(part, null, LOREM_IPSUM, latch))
+				.consumeNextWith(part -> testPart(part, null, MUSPI_MEROL, latch))
+				.verifyComplete();
+
+		latch.await();
+	}
 
 	private void testBrowser(DefaultPartHttpMessageReader reader, Resource resource, String boundary)
 			throws InterruptedException {
diff --git a/spring-web/src/test/resources/org/springframework/http/codec/multipart/files.multipart b/spring-web/src/test/resources/org/springframework/http/codec/multipart/files.multipart
index 03b41190647e..bd10aea6b0a3 100644
--- a/spring-web/src/test/resources/org/springframework/http/codec/multipart/files.multipart
+++ b/spring-web/src/test/resources/org/springframework/http/codec/multipart/files.multipart
@@ -3,11 +3,9 @@ Content-Disposition: form-data; name="file2"; filename="a.txt"
 Content-Type: text/plain
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer iaculis metus id vestibulum nullam.
-
 ------WebKitFormBoundaryG8fJ50opQOML0oGD
 Content-Disposition: form-data; name="file2"; filename="b.txt"
 Content-Type: text/plain
 
 .mallun mulubitsev di sutem silucai regetnI .tile gnicsipida rutetcesnoc ,tema tis rolod muspi meroL
-
 ------WebKitFormBoundaryG8fJ50opQOML0oGD--

From 40d84c297bd88a2c4b7979b14eb7925e5fce0170 Mon Sep 17 00:00:00 2001
From: Xjzon <1070809335@qq.com>
Date: Thu, 28 Oct 2021 00:11:59 +0800
Subject: [PATCH 308/735] Add support for custom expression parsing

See gh-27604
---
 .../context/expression/CachedExpressionEvaluator.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java b/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
index 7b868fc9871e..13a04440d542 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
@@ -86,7 +86,7 @@ protected Expression getExpression(Map<ExpressionKey, Expression> cache,
 		ExpressionKey expressionKey = createKey(elementKey, expression);
 		Expression expr = cache.get(expressionKey);
 		if (expr == null) {
-			expr = getParser().parseExpression(expression);
+			expr = parseExpression(expression);
 			cache.put(expressionKey, expr);
 		}
 		return expr;
@@ -96,6 +96,13 @@ private ExpressionKey createKey(AnnotatedElementKey elementKey, String expressio
 		return new ExpressionKey(elementKey, expression);
 	}
 
+	/**
+	 * Parse the expression
+	 * @param expression the expression to parse
+	 */
+	protected Expression parseExpression(String expression) {
+		return getParser().parseExpression(expression);
+	}
 
 	/**
 	 * An expression key.

From f295c8b2fbb8ac61f570c9b35abb45f0837fdd66 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 28 Oct 2021 14:10:21 +0200
Subject: [PATCH 309/735] Polish "Add support for custom expression parsing"

See gh-27604
---
 .../expression/CachedExpressionEvaluator.java      | 14 ++++++++------
 .../expression/CachedExpressionEvaluatorTests.java |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java b/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
index 13a04440d542..c2d197a122e0 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java
@@ -75,7 +75,7 @@ protected ParameterNameDiscoverer getParameterNameDiscoverer() {
 
 	/**
 	 * Return the {@link Expression} for the specified SpEL value
-	 * <p>Parse the expression if it hasn't been already.
+	 * <p>{@link #parseExpression(String) Parse the expression} if it hasn't been already.
 	 * @param cache the cache to use
 	 * @param elementKey the element on which the expression is defined
 	 * @param expression the expression to parse
@@ -92,18 +92,20 @@ protected Expression getExpression(Map<ExpressionKey, Expression> cache,
 		return expr;
 	}
 
-	private ExpressionKey createKey(AnnotatedElementKey elementKey, String expression) {
-		return new ExpressionKey(elementKey, expression);
-	}
-
 	/**
-	 * Parse the expression
+	 * Parse the specified {@code expression}.
 	 * @param expression the expression to parse
+	 * @since 5.3.13
 	 */
 	protected Expression parseExpression(String expression) {
 		return getParser().parseExpression(expression);
 	}
 
+	private ExpressionKey createKey(AnnotatedElementKey elementKey, String expression) {
+		return new ExpressionKey(elementKey, expression);
+	}
+
+
 	/**
 	 * An expression key.
 	 */
diff --git a/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java b/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java
index f81a7945d738..1594137c0411 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 8dd385b440cb2e432ce7151be08d313982d3b00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=9C=A0=EC=A7=84=28Yujin=20Choi=29/Platform=20E?=
 =?UTF-8?q?ngineering=ED=8C=80/11ST?= <choi.yujin@sk.com>
Date: Thu, 28 Oct 2021 10:58:11 +0900
Subject: [PATCH 310/735] Use toUnmodifiableSet and toList instead of
 collectingAndThen

Since Spring Framework 6 uses JDK 17 for its baseline, we can make use
of toList() and toUnmodifiableSet() which were introduced in JDK 16 and
JDK 10, respectively.

Closes gh-27618
---
 .../springframework/beans/factory/config/YamlProcessor.java | 2 +-
 .../core/io/support/SpringFactoriesLoader.java              | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
index 7949003c68bd..140370b56504 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
@@ -146,7 +146,7 @@ public void setSupportedTypes(Class<?>... supportedTypes) {
 		else {
 			Assert.noNullElements(supportedTypes, "'supportedTypes' must not contain null elements");
 			this.supportedTypes = Arrays.stream(supportedTypes).map(Class::getName)
-					.collect(Collectors.collectingAndThen(Collectors.toSet(), Collections::unmodifiableSet));
+					.collect(Collectors.toUnmodifiableSet());
 		}
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
index c73e775b39c2..abba0cbd86e3 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -157,8 +156,7 @@ private static Map<String, List<String>> loadSpringFactories(ClassLoader classLo
 			}
 
 			// Replace all lists with unmodifiable lists containing unique elements
-			result.replaceAll((factoryType, implementations) -> implementations.stream().distinct()
-					.collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList)));
+			result.replaceAll((factoryType, implementations) -> implementations.stream().distinct().toList());
 			cache.put(classLoader, result);
 		}
 		catch (IOException ex) {

From 32c14a2b4218005048ff26fdf8ad43ddef071db8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 29 Oct 2021 11:04:01 +0200
Subject: [PATCH 311/735] Update Javadoc regarding repeatable annotation
 support

---
 .../jmx/export/annotation/ManagedNotification.java       | 5 +++--
 .../jmx/export/annotation/ManagedOperationParameter.java | 6 +++---
 .../springframework/scheduling/annotation/Scheduled.java | 3 +++
 .../org/springframework/jms/annotation/JmsListener.java  | 5 ++++-
 .../springframework/test/context/TestPropertySource.java | 6 +++---
 .../java/org/springframework/test/context/jdbc/Sql.java  | 9 ++++-----
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
index 1a4f933e942b..2543a359505a 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,8 @@
 /**
  * Type-level annotation that indicates a JMX notification emitted by a bean.
  *
- * <p>As of Spring Framework 4.2.4, this annotation is declared as repeatable.
+ * <p>This annotation can be used as a <em>{@linkplain Repeatable repeatable}</em>
+ * annotation.
  *
  * @author Rob Harrop
  * @since 2.0
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
index 1b9843608065..5f2366fdd5d0 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@
 /**
  * Method-level annotation used to provide metadata about operation parameters,
  * corresponding to a {@code ManagedOperationParameter} attribute.
- * Used as part of a {@link ManagedOperationParameters} annotation.
  *
- * <p>As of Spring Framework 4.2.4, this annotation is declared as repeatable.
+ * <p>This annotation can be used as a <em>{@linkplain Repeatable repeatable}</em>
+ * annotation.
  *
  * @author Rob Harrop
  * @since 1.2
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index f3aa81296a23..e3f4de5408cf 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -40,6 +40,9 @@
  * done manually or, more conveniently, through the {@code <task:annotation-driven/>}
  * XML element or {@link EnableScheduling @EnableScheduling} annotation.
  *
+ * <p>This annotation can be used as a <em>{@linkplain Repeatable repeatable}</em>
+ * annotation.
+ *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em> with attribute overrides.
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java
index 7fee7e70935c..72faf09e8166 100644
--- a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,6 +72,9 @@
  * {@link org.springframework.messaging.handler.annotation.SendTo @SendTo} to the
  * method declaration.
  *
+ * <p>This annotation can be used as a <em>{@linkplain Repeatable repeatable}</em>
+ * annotation.
+ *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em> with attribute overrides.
  *
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java b/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java
index f74b9c5c6262..27bbc81c5f8b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,8 +70,8 @@
  * <ul>
  * <li>Typically, {@code @TestPropertySource} will be used in conjunction with
  * {@link ContextConfiguration @ContextConfiguration}.</li>
- * <li>As of Spring Framework 5.2, {@code @TestPropertySource} can be used as a
- * <em>{@linkplain Repeatable repeatable}</em> annotation.</li>
+ * <li>{@code @TestPropertySource} can be used as a <em>{@linkplain Repeatable
+ * repeatable}</em> annotation.</li>
  * <li>This annotation may be used as a <em>meta-annotation</em> to create
  * custom <em>composed annotations</em>; however, caution should be taken if
  * this annotation and {@code @ContextConfiguration} are combined on a composed
diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java
index fb69e925c0bb..50322c463397 100644
--- a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java
+++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,10 +45,9 @@
  * XML namespace element. Consult the javadocs of individual attributes in this
  * annotation and {@link SqlConfig @SqlConfig} for details.
  *
- * <p>Beginning with Java 8, {@code @Sql} can be used as a
- * <em>{@linkplain Repeatable repeatable}</em> annotation. Otherwise,
- * {@link SqlGroup @SqlGroup} can be used as an explicit container for declaring
- * multiple instances of {@code @Sql}.
+ * <p>{@code @Sql} can be used as a <em>{@linkplain Repeatable repeatable}</em>
+ * annotation. Otherwise, {@link SqlGroup @SqlGroup} can be used as an explicit
+ * container for declaring multiple instances of {@code @Sql}.
  *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em> with attribute overrides.

From 44644684652d1eaeabaa79b05235a58e6fa1643b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 29 Oct 2021 11:27:38 +0200
Subject: [PATCH 312/735] Clean up warnings in UnmodifiableMultiValueMapTests

---
 .../util/UnmodifiableMultiValueMapTests.java       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java
index 27c856eb5640..a489ccf41106 100644
--- a/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java
+++ b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java
@@ -33,11 +33,15 @@
 import static org.mockito.Mockito.mock;
 
 /**
+ * Unit tests for {@link UnmodifiableMultiValueMap}.
+ *
  * @author Arjen Poutsma
+ * @since 6.0
  */
 class UnmodifiableMultiValueMapTests {
 
 	@Test
+	@SuppressWarnings("unchecked")
 	void delegation() {
 		MultiValueMap<String, String> mock = mock(MultiValueMap.class);
 		UnmodifiableMultiValueMap<String, String> map = new UnmodifiableMultiValueMap<>(mock);
@@ -95,6 +99,7 @@ void unsupported() {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	void entrySetDelegation() {
 		MultiValueMap<String, String> mockMap = mock(MultiValueMap.class);
 		Set<Map.Entry<String, List<String>>> mockSet = mock(Set.class);
@@ -107,8 +112,9 @@ void entrySetDelegation() {
 		given(mockSet.isEmpty()).willReturn(false);
 		assertThat(set.isEmpty()).isFalse();
 
-		given(mockSet.contains("foo")).willReturn(true);
-		assertThat(set.contains("foo")).isTrue();
+		Map.Entry<String, List<String>> mockedEntry = mock(Map.Entry.class);
+		given(mockSet.contains(mockedEntry)).willReturn(true);
+		assertThat(set.contains(mockedEntry)).isTrue();
 
 		List<Map.Entry<String, List<String>>> mockEntries = List.of(mock(Map.Entry.class));
 		given(mockSet.containsAll(mockEntries)).willReturn(true);
@@ -121,11 +127,12 @@ void entrySetDelegation() {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	void entrySetUnsupported() {
 		Set<Map.Entry<String, List<String>>> set = new UnmodifiableMultiValueMap<String, String>(new LinkedMultiValueMap<>()).entrySet();
 
 		assertThatUnsupportedOperationException().isThrownBy(() -> set.add(mock(Map.Entry.class)));
-		assertThatUnsupportedOperationException().isThrownBy(() -> set.remove("foo"));
+		assertThatUnsupportedOperationException().isThrownBy(() -> set.remove(mock(Map.Entry.class)));
 		assertThatUnsupportedOperationException().isThrownBy(() -> set.removeIf(e -> true));
 		assertThatUnsupportedOperationException().isThrownBy(() -> set.addAll(mock(List.class)));
 		assertThatUnsupportedOperationException().isThrownBy(() -> set.retainAll(mock(List.class)));
@@ -134,6 +141,7 @@ void entrySetUnsupported() {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	void valuesDelegation() {
 		MultiValueMap<String, String> mockMap = mock(MultiValueMap.class);
 		Collection<List<String>> mockValues = mock(Collection.class);

From 56fd97184c8ca26c90c6ba1b76565f4e1c49dbc7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 29 Oct 2021 11:32:44 +0200
Subject: [PATCH 313/735] Avoid generic type parameter hiding in
 UnmodifiableValueCollection

---
 .../util/UnmodifiableMultiValueMap.java       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java b/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java
index 7623ff8770f8..067a64250a20 100644
--- a/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java
+++ b/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java
@@ -527,14 +527,14 @@ public String toString() {
 	}
 
 
-	private static class UnmodifiableValueCollection<T> implements Collection<List<T>>, Serializable {
+	private static class UnmodifiableValueCollection<V> implements Collection<List<V>>, Serializable {
 
 		private static final long serialVersionUID = 5518377583904339588L;
 
-		private final Collection<List<T>> delegate;
+		private final Collection<List<V>> delegate;
 
 
-		public UnmodifiableValueCollection(Collection<List<T>> delegate) {
+		public UnmodifiableValueCollection(Collection<List<V>> delegate) {
 			this.delegate = delegate;
 		}
 
@@ -583,8 +583,8 @@ private void filterArray(Object[] array) {
 		}
 
 		@Override
-		public Iterator<List<T>> iterator() {
-			Iterator<List<T>> iterator = this.delegate.iterator();
+		public Iterator<List<V>> iterator() {
+			Iterator<List<V>> iterator = this.delegate.iterator();
 			return new Iterator<>() {
 				@Override
 				public boolean hasNext() {
@@ -592,29 +592,29 @@ public boolean hasNext() {
 				}
 
 				@Override
-				public List<T> next() {
+				public List<V> next() {
 					return Collections.unmodifiableList(iterator.next());
 				}
 			};
 		}
 
 		@Override
-		public void forEach(Consumer<? super List<T>> action) {
+		public void forEach(Consumer<? super List<V>> action) {
 			this.delegate.forEach(list -> action.accept(Collections.unmodifiableList(list)));
 		}
 
 		@Override
-		public Spliterator<List<T>> spliterator() {
+		public Spliterator<List<V>> spliterator() {
 			return new UnmodifiableValueSpliterator<>(this.delegate.spliterator());
 		}
 
 		@Override
-		public Stream<List<T>> stream() {
+		public Stream<List<V>> stream() {
 			return StreamSupport.stream(spliterator(), false);
 		}
 
 		@Override
-		public Stream<List<T>> parallelStream() {
+		public Stream<List<V>> parallelStream() {
 			return StreamSupport.stream(spliterator(), true);
 		}
 
@@ -636,7 +636,7 @@ public String toString() {
 		// unsupported
 
 		@Override
-		public boolean add(List<T> ts) {
+		public boolean add(List<V> ts) {
 			throw new UnsupportedOperationException();
 		}
 
@@ -646,7 +646,7 @@ public boolean remove(Object o) {
 		}
 
 		@Override
-		public boolean addAll(Collection<? extends List<T>> c) {
+		public boolean addAll(Collection<? extends List<V>> c) {
 			throw new UnsupportedOperationException();
 		}
 
@@ -661,7 +661,7 @@ public boolean retainAll(Collection<?> c) {
 		}
 
 		@Override
-		public boolean removeIf(Predicate<? super List<T>> filter) {
+		public boolean removeIf(Predicate<? super List<V>> filter) {
 			throw new UnsupportedOperationException();
 		}
 

From 694db2273f24be1152914c9f5bb849a8c0ccbb12 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Tue, 2 Nov 2021 16:13:35 +0100
Subject: [PATCH 314/735] Add Part::delete method

This commit introduces the Part::delete method, that deletes its
underlying storage.

Closes gh-27612
---
 .../http/codec/multipart/Content.java         | 129 ++++++++++++++++++
 .../http/codec/multipart/DefaultParts.java    |  17 ++-
 .../http/codec/multipart/Part.java            |  10 ++
 .../http/codec/multipart/PartGenerator.java   |  16 +--
 .../SynchronossPartHttpMessageReader.java     |  35 +++++
 5 files changed, 189 insertions(+), 18 deletions(-)
 create mode 100644 spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java

diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java
new file mode 100644
index 000000000000..28178c8c8ee4
--- /dev/null
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java
@@ -0,0 +1,129 @@
+/*
+ * 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.http.codec.multipart;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+
+/**
+ * Part content abstraction used by {@link DefaultParts}.
+ *
+ * @author Arjen Poutsma
+ * @since 5.3.13
+ */
+abstract class Content {
+
+
+	protected Content() {
+	}
+
+	/**
+	 * Return the content.
+	 */
+	public abstract Flux<DataBuffer> content();
+
+	/**
+	 * Delete this content. Default implementation does nothing.
+	 */
+	public Mono<Void> delete() {
+		return Mono.empty();
+	}
+
+	/**
+	 * Returns a new {@code Content} based on the given flux of data buffers.
+	 */
+	public static Content fromFlux(Flux<DataBuffer> content) {
+		return new FluxContent(content);
+	}
+
+	/**
+	 * Return a new {@code Content} based on the given file path.
+	 */
+	public static Content fromFile(Path file, Scheduler scheduler) {
+		return new FileContent(file, scheduler);
+	}
+
+
+	/**
+	 * {@code Content} implementation based on a flux of data buffers.
+	 */
+	private static final class FluxContent extends Content {
+
+		private final Flux<DataBuffer> content;
+
+
+		public FluxContent(Flux<DataBuffer> content) {
+			this.content = content;
+		}
+
+
+		@Override
+		public Flux<DataBuffer> content() {
+			return this.content;
+		}
+	}
+
+
+	/**
+	 * {@code Content} implementation based on a file.
+	 */
+	private static final class FileContent extends Content {
+
+		private final Path file;
+
+		private final Scheduler scheduler;
+
+
+		public FileContent(Path file, Scheduler scheduler) {
+			this.file = file;
+			this.scheduler = scheduler;
+		}
+
+
+		@Override
+		public Flux<DataBuffer> content() {
+			return DataBufferUtils.readByteChannel(
+					() -> Files.newByteChannel(this.file, StandardOpenOption.READ),
+							DefaultDataBufferFactory.sharedInstance, 1024)
+					.subscribeOn(this.scheduler);
+		}
+
+		@Override
+		public Mono<Void> delete() {
+			return Mono.<Void>fromRunnable(() -> {
+						try {
+							Files.delete(this.file);
+						}
+						catch (IOException ex) {
+							throw new UncheckedIOException(ex);
+						}
+					})
+					.subscribeOn(this.scheduler);
+		}
+	}
+}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java
index 77044db0a8dc..f18ec157b9ad 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java
@@ -57,7 +57,7 @@ public static FormFieldPart formFieldPart(HttpHeaders headers, String value) {
 	 * @param content the content of the part
 	 * @return {@link Part} or {@link FilePart}, depending on {@link HttpHeaders#getContentDisposition()}
 	 */
-	public static Part part(HttpHeaders headers, Flux<DataBuffer> content) {
+	public static Part part(HttpHeaders headers, Content content) {
 		Assert.notNull(headers, "Headers must not be null");
 		Assert.notNull(content, "Content must not be null");
 
@@ -142,16 +142,21 @@ public String toString() {
 	 */
 	private static class DefaultPart extends AbstractPart {
 
-		private final Flux<DataBuffer> content;
+		private final Content content;
 
-		public DefaultPart(HttpHeaders headers, Flux<DataBuffer> content) {
+		public DefaultPart(HttpHeaders headers, Content content) {
 			super(headers);
 			this.content = content;
 		}
 
 		@Override
 		public Flux<DataBuffer> content() {
-			return this.content;
+			return this.content.content();
+		}
+
+		@Override
+		public Mono<Void> delete() {
+			return this.content.delete();
 		}
 
 		@Override
@@ -171,9 +176,9 @@ public String toString() {
 	/**
 	 * Default implementation of {@link FilePart}.
 	 */
-	private static class DefaultFilePart extends DefaultPart implements FilePart {
+	private static final class DefaultFilePart extends DefaultPart implements FilePart {
 
-		public DefaultFilePart(HttpHeaders headers, Flux<DataBuffer> content) {
+		public DefaultFilePart(HttpHeaders headers, Content content) {
 			super(headers, content);
 		}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/Part.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/Part.java
index c611adf22ae6..c39b36ff5faf 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/Part.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/Part.java
@@ -17,6 +17,7 @@
 package org.springframework.http.codec.multipart;
 
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
@@ -57,4 +58,13 @@ public interface Part {
 	 */
 	Flux<DataBuffer> content();
 
+	/**
+	 * Return a mono that, when subscribed to, deletes the underlying storage
+	 * for this part.
+	 * @since 5.3.13
+	 */
+	default Mono<Void> delete() {
+		return Mono.empty();
+	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
index 32a923d8a7d5..42b43e2eb5ef 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
@@ -160,7 +160,7 @@ else if (!this.streaming) {
 					requestToken();
 				}
 			});
-			emitPart(DefaultParts.part(headers, streamingContent));
+			emitPart(DefaultParts.part(headers, Content.fromFlux(streamingContent)));
 		}
 	}
 
@@ -518,7 +518,7 @@ private void emitMemoryPart() {
 			}
 			this.content.clear();
 			Flux<DataBuffer> content = Flux.just(DefaultDataBufferFactory.sharedInstance.wrap(bytes));
-			emitPart(DefaultParts.part(this.headers, content));
+			emitPart(DefaultParts.part(this.headers, Content.fromFlux(content)));
 		}
 
 		@Override
@@ -674,21 +674,13 @@ public void body(DataBuffer dataBuffer) {
 		@Override
 		public void partComplete(boolean finalPart) {
 			MultipartUtils.closeChannel(this.channel);
-			Flux<DataBuffer> content = partContent();
-			emitPart(DefaultParts.part(this.headers, content));
+			emitPart(DefaultParts.part(this.headers,
+					Content.fromFile(this.file, PartGenerator.this.blockingOperationScheduler)));
 			if (finalPart) {
 				emitComplete();
 			}
 		}
 
-		private Flux<DataBuffer> partContent() {
-			return DataBufferUtils
-					.readByteChannel(
-							() -> Files.newByteChannel(this.file, StandardOpenOption.READ),
-							DefaultDataBufferFactory.sharedInstance, 1024)
-					.subscribeOn(PartGenerator.this.blockingOperationScheduler);
-		}
-
 		@Override
 		public void dispose() {
 			if (this.closeOnDispose) {
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
index 032b787d887b..a35c9d5712de 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
@@ -16,7 +16,9 @@
 
 package org.springframework.http.codec.multipart;
 
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
@@ -40,6 +42,7 @@
 import org.synchronoss.cloud.nio.multipart.NioMultipartParser;
 import org.synchronoss.cloud.nio.multipart.NioMultipartParserListener;
 import org.synchronoss.cloud.nio.multipart.PartBodyStreamStorageFactory;
+import org.synchronoss.cloud.nio.stream.storage.NameAwarePurgableFileInputStream;
 import org.synchronoss.cloud.nio.stream.storage.StreamStorage;
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;
@@ -497,6 +500,38 @@ public Flux<DataBuffer> content() {
 		protected StreamStorage getStorage() {
 			return this.storage;
 		}
+
+		@Override
+		public Mono<Void> delete() {
+			return Mono.fromRunnable(() -> {
+				File file = getFile();
+				if (file != null) {
+					file.delete();
+				}
+			});
+		}
+
+		@Nullable
+		private File getFile() {
+			InputStream inputStream = null;
+			try {
+				inputStream = getStorage().getInputStream();
+				if (inputStream instanceof NameAwarePurgableFileInputStream) {
+					NameAwarePurgableFileInputStream stream = (NameAwarePurgableFileInputStream) inputStream;
+					return stream.getFile();
+				}
+			}
+			finally {
+				if (inputStream != null) {
+					try {
+						inputStream.close();
+					}
+					catch (IOException ignore) {
+					}
+				}
+			}
+			return null;
+		}
 	}
 
 

From 0c7e0002504f728d3ca3e182406d19ed3c4c9973 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Wed, 3 Nov 2021 15:02:12 +0100
Subject: [PATCH 315/735] Refactor Contents to DefaultParts

This commit moves the Contents abstraction into DefaultParts

See gh-27613
---
 .../http/codec/multipart/Content.java         | 129 ----------------
 .../http/codec/multipart/DefaultParts.java    | 139 +++++++++++++++++-
 .../http/codec/multipart/PartGenerator.java   |   7 +-
 3 files changed, 135 insertions(+), 140 deletions(-)
 delete mode 100644 spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java

diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java
deleted file mode 100644
index 28178c8c8ee4..000000000000
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/Content.java
+++ /dev/null
@@ -1,129 +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.http.codec.multipart;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Scheduler;
-
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.core.io.buffer.DefaultDataBufferFactory;
-
-/**
- * Part content abstraction used by {@link DefaultParts}.
- *
- * @author Arjen Poutsma
- * @since 5.3.13
- */
-abstract class Content {
-
-
-	protected Content() {
-	}
-
-	/**
-	 * Return the content.
-	 */
-	public abstract Flux<DataBuffer> content();
-
-	/**
-	 * Delete this content. Default implementation does nothing.
-	 */
-	public Mono<Void> delete() {
-		return Mono.empty();
-	}
-
-	/**
-	 * Returns a new {@code Content} based on the given flux of data buffers.
-	 */
-	public static Content fromFlux(Flux<DataBuffer> content) {
-		return new FluxContent(content);
-	}
-
-	/**
-	 * Return a new {@code Content} based on the given file path.
-	 */
-	public static Content fromFile(Path file, Scheduler scheduler) {
-		return new FileContent(file, scheduler);
-	}
-
-
-	/**
-	 * {@code Content} implementation based on a flux of data buffers.
-	 */
-	private static final class FluxContent extends Content {
-
-		private final Flux<DataBuffer> content;
-
-
-		public FluxContent(Flux<DataBuffer> content) {
-			this.content = content;
-		}
-
-
-		@Override
-		public Flux<DataBuffer> content() {
-			return this.content;
-		}
-	}
-
-
-	/**
-	 * {@code Content} implementation based on a file.
-	 */
-	private static final class FileContent extends Content {
-
-		private final Path file;
-
-		private final Scheduler scheduler;
-
-
-		public FileContent(Path file, Scheduler scheduler) {
-			this.file = file;
-			this.scheduler = scheduler;
-		}
-
-
-		@Override
-		public Flux<DataBuffer> content() {
-			return DataBufferUtils.readByteChannel(
-					() -> Files.newByteChannel(this.file, StandardOpenOption.READ),
-							DefaultDataBufferFactory.sharedInstance, 1024)
-					.subscribeOn(this.scheduler);
-		}
-
-		@Override
-		public Mono<Void> delete() {
-			return Mono.<Void>fromRunnable(() -> {
-						try {
-							Files.delete(this.file);
-						}
-						catch (IOException ex) {
-							throw new UncheckedIOException(ex);
-						}
-					})
-					.subscribeOn(this.scheduler);
-		}
-	}
-}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java
index f18ec157b9ad..284c82497b96 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultParts.java
@@ -16,10 +16,15 @@
 
 package org.springframework.http.codec.multipart;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.util.concurrent.Callable;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
@@ -50,17 +55,40 @@ public static FormFieldPart formFieldPart(HttpHeaders headers, String value) {
 	}
 
 	/**
-	 * Create a new {@link Part} or {@link FilePart} with the given parameters.
+	 * Create a new {@link Part} or {@link FilePart} based on a flux of data
+	 * buffers. Returns {@link FilePart} if the {@code Content-Disposition} of
+	 * the given headers contains a filename, or a "normal" {@link Part}
+	 * otherwise.
+	 * @param headers the part headers
+	 * @param dataBuffers the content of the part
+	 * @return {@link Part} or {@link FilePart}, depending on {@link HttpHeaders#getContentDisposition()}
+	 */
+	public static Part part(HttpHeaders headers, Flux<DataBuffer> dataBuffers) {
+		Assert.notNull(headers, "Headers must not be null");
+		Assert.notNull(dataBuffers, "DataBuffers must not be null");
+
+		return partInternal(headers, new FluxContent(dataBuffers));
+	}
+
+	/**
+	 * Create a new {@link Part} or {@link FilePart} based on the given file.
 	 * Returns {@link FilePart} if the {@code Content-Disposition} of the given
 	 * headers contains a filename, or a "normal" {@link Part} otherwise
 	 * @param headers the part headers
-	 * @param content the content of the part
+	 * @param file  the file
+	 * @param scheduler the scheduler used for reading the file
 	 * @return {@link Part} or {@link FilePart}, depending on {@link HttpHeaders#getContentDisposition()}
 	 */
-	public static Part part(HttpHeaders headers, Content content) {
+	public static Part part(HttpHeaders headers, Path file, Scheduler scheduler) {
 		Assert.notNull(headers, "Headers must not be null");
-		Assert.notNull(content, "Content must not be null");
+		Assert.notNull(file, "File must not be null");
+		Assert.notNull(scheduler, "Scheduler must not be null");
+
+		return partInternal(headers, new FileContent(file, scheduler));
+	}
+
 
+	private static Part partInternal(HttpHeaders headers, Content content) {
 		String filename = headers.getContentDisposition().getFilename();
 		if (filename != null) {
 			return new DefaultFilePart(headers, content);
@@ -142,7 +170,8 @@ public String toString() {
 	 */
 	private static class DefaultPart extends AbstractPart {
 
-		private final Content content;
+		protected final Content content;
+
 
 		public DefaultPart(HttpHeaders headers, Content content) {
 			super(headers);
@@ -191,7 +220,7 @@ public String filename() {
 
 		@Override
 		public Mono<Void> transferTo(Path dest) {
-			return DataBufferUtils.write(content(), dest);
+			return this.content.transferTo(dest);
 		}
 
 		@Override
@@ -200,7 +229,7 @@ public String toString() {
 			String name = contentDisposition.getName();
 			String filename = contentDisposition.getFilename();
 			if (name != null) {
-				return "DefaultFilePart{" + name() + " (" + filename + ")}";
+				return "DefaultFilePart{" + name + " (" + filename + ")}";
 			}
 			else {
 				return "DefaultFilePart{(" + filename + ")}";
@@ -209,4 +238,100 @@ public String toString() {
 
 	}
 
+
+	/**
+	 * Part content abstraction.
+	 */
+	private interface Content {
+
+		Flux<DataBuffer> content();
+
+		Mono<Void> transferTo(Path dest);
+
+		Mono<Void> delete();
+
+	}
+
+	/**
+	 * {@code Content} implementation based on a flux of data buffers.
+	 */
+	private static final class FluxContent implements Content {
+
+		private final Flux<DataBuffer> content;
+
+
+		public FluxContent(Flux<DataBuffer> content) {
+			this.content = content;
+		}
+
+
+		@Override
+		public Flux<DataBuffer> content() {
+			return this.content;
+		}
+
+		@Override
+		public Mono<Void> transferTo(Path dest) {
+			return DataBufferUtils.write(this.content, dest);
+		}
+
+		@Override
+		public Mono<Void> delete() {
+			return Mono.empty();
+		}
+
+	}
+
+
+	/**
+	 * {@code Content} implementation based on a file.
+	 */
+	private static final class FileContent implements Content {
+
+		private final Path file;
+
+		private final Scheduler scheduler;
+
+
+		public FileContent(Path file, Scheduler scheduler) {
+			this.file = file;
+			this.scheduler = scheduler;
+		}
+
+
+		@Override
+		public Flux<DataBuffer> content() {
+			return DataBufferUtils.readByteChannel(
+					() -> Files.newByteChannel(this.file, StandardOpenOption.READ),
+							DefaultDataBufferFactory.sharedInstance, 1024)
+					.subscribeOn(this.scheduler);
+		}
+
+		@Override
+		public Mono<Void> transferTo(Path dest) {
+			return blockingOperation(() -> Files.copy(this.file, dest, StandardCopyOption.REPLACE_EXISTING));
+		}
+
+		@Override
+		public Mono<Void> delete() {
+			return blockingOperation(() -> {
+				Files.delete(this.file);
+				return null;
+			});
+		}
+
+		private Mono<Void> blockingOperation(Callable<?> callable) {
+			return Mono.<Void>create(sink -> {
+						try {
+							callable.call();
+							sink.success();
+						}
+						catch (Exception ex) {
+							sink.error(ex);
+						}
+					})
+					.subscribeOn(this.scheduler);
+		}
+	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
index 42b43e2eb5ef..88d689d90e9b 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
@@ -160,7 +160,7 @@ else if (!this.streaming) {
 					requestToken();
 				}
 			});
-			emitPart(DefaultParts.part(headers, Content.fromFlux(streamingContent)));
+			emitPart(DefaultParts.part(headers, streamingContent));
 		}
 	}
 
@@ -518,7 +518,7 @@ private void emitMemoryPart() {
 			}
 			this.content.clear();
 			Flux<DataBuffer> content = Flux.just(DefaultDataBufferFactory.sharedInstance.wrap(bytes));
-			emitPart(DefaultParts.part(this.headers, Content.fromFlux(content)));
+			emitPart(DefaultParts.part(this.headers, content));
 		}
 
 		@Override
@@ -674,8 +674,7 @@ public void body(DataBuffer dataBuffer) {
 		@Override
 		public void partComplete(boolean finalPart) {
 			MultipartUtils.closeChannel(this.channel);
-			emitPart(DefaultParts.part(this.headers,
-					Content.fromFile(this.file, PartGenerator.this.blockingOperationScheduler)));
+			emitPart(DefaultParts.part(this.headers, this.file, PartGenerator.this.blockingOperationScheduler));
 			if (finalPart) {
 				emitComplete();
 			}

From 1b4438caacee097238de7e7713a2a50bf73ed216 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 4 Nov 2021 14:47:37 +0100
Subject: [PATCH 316/735] Start building against Reactor 2020.0.13 snapshots

See gh-27636
---
 build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e5aa6b6b7d1d..d954fa16003d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.69.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.12"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.13-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,6 +292,8 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
+			maven { url "https://repo.spring.io/snapshot" } // reactor
+
 		}
 	}
 	configurations.all {

From ff1485fd8d6581edce2ad9bfbe2eb36d2efae8cc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 5 Nov 2021 10:31:10 +0100
Subject: [PATCH 317/735] Fix log message formatting in
 CandidateComponentsIndexLoader

---
 .../context/index/CandidateComponentsIndexLoader.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndexLoader.java b/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndexLoader.java
index af068373d8c9..ee95954b10ee 100644
--- a/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndexLoader.java
+++ b/spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndexLoader.java
@@ -107,7 +107,7 @@ private static CandidateComponentsIndex doLoadIndex(ClassLoader classLoader) {
 				result.add(properties);
 			}
 			if (logger.isDebugEnabled()) {
-				logger.debug("Loaded " + result.size() + "] index(es)");
+				logger.debug("Loaded " + result.size() + " index(es)");
 			}
 			int totalCount = result.stream().mapToInt(Properties::size).sum();
 			return (totalCount > 0 ? new CandidateComponentsIndex(result) : null);

From 5acc3228f772630b44113286b9c0f2ab3768ab4a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 8 Nov 2021 17:42:02 +0100
Subject: [PATCH 318/735] Upgrade to Hibernate ORM 5.6.1, Tomcat 10.0.12, Netty
 4.1.70, HtmlUnit 2.54, XMLUnit 2.8.3

---
 build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index b01dde861908..203844d724b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.13.0"
-			mavenBom "io.netty:netty-bom:4.1.69.Final"
+			mavenBom "io.netty:netty-bom:4.1.70.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.13-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
@@ -112,19 +112,19 @@ configure(allprojects) { project ->
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core-jakarta:5.6.0.Final"
+			dependency "org.hibernate:hibernate-core-jakarta:5.6.1.Final"
 			dependency "org.hibernate:hibernate-validator:7.0.1.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '10.0.11') {
+			dependencySet(group: 'org.apache.tomcat', version: '10.0.12') {
 				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: '10.0.11') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '10.0.12') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
@@ -175,7 +175,7 @@ configure(allprojects) { project ->
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
 			dependency "org.assertj:assertj-core:3.21.0"
-			dependencySet(group: 'org.xmlunit', version: '2.8.2') {
+			dependencySet(group: 'org.xmlunit', version: '2.8.3') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
@@ -189,10 +189,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.53.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.54.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.53.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.54.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {

From c5de5c99390a69f23e7682b7748c273b01a63907 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 8 Nov 2021 21:21:54 +0000
Subject: [PATCH 319/735] Update Javadoc of LogFormatUtils

Closes gh-27632
---
 .../java/org/springframework/core/log/LogFormatUtils.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
index e3ae033e9f22..51ffd98cf0ab 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
@@ -36,8 +36,9 @@
 public abstract class LogFormatUtils {
 
 	/**
-	 * Variant of {@link #formatValue(Object, int, boolean)} and a convenience
-	 * method that truncates at 100 characters when {@code limitLength} is set.
+	 * Convenience variant of {@link #formatValue(Object, int, boolean)} that
+	 * limits the length of a log message to 100 characters and also replaces
+	 * newline characters if {@code limitLength} is set to "true".
 	 * @param value the value to format
 	 * @param limitLength whether to truncate the value at a length of 100
 	 * @return the formatted value

From b5743966d6d926ed9b146ca4c34713b406628038 Mon Sep 17 00:00:00 2001
From: happyWilliam0 <springhw@huawei.com>
Date: Fri, 29 Oct 2021 14:14:05 +0800
Subject: [PATCH 320/735] Improve efficiency of UrlPathHelper#getSanitizedPath

See gh-27623
---
 .../web/util/UrlPathHelper.java               | 19 ++++++++++---------
 .../web/util/UrlPathHelperTests.java          |  6 ++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index e38fdff9b53c..a4a85e707b8b 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -405,16 +405,17 @@ else if (index1 == requestUri.length()) {
 	 * </ul>
 	 */
 	private static String getSanitizedPath(final String path) {
-		int index = path.indexOf("//");
-		if (index >= 0) {
-			StringBuilder sanitized = new StringBuilder(path);
-			while (index != -1) {
-				sanitized.deleteCharAt(index);
-				index = sanitized.indexOf("//", index);
+		if (path.length() == 0) {
+			return path;
+		}
+		char[] arr = path.toCharArray();
+		int slowIndex = 0;
+		for (int fastIndex = 1; fastIndex < arr.length; fastIndex++) {
+			if (arr[fastIndex] != '/' || arr[slowIndex] != '/') {
+				arr[++slowIndex] = arr[fastIndex];
 			}
-			return sanitized.toString();
 		}
-		return path;
+		return new String(arr, 0, slowIndex + 1);
 	}
 
 	/**
@@ -532,7 +533,7 @@ public String getOriginatingServletPath(HttpServletRequest request) {
 	 */
 	public String getOriginatingQueryString(HttpServletRequest request) {
 		if ((request.getAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE) != null) ||
-			(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null)) {
+				(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null)) {
 			return (String) request.getAttribute(WebUtils.FORWARD_QUERY_STRING_ATTRIBUTE);
 		}
 		else {
diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index e3281e55273f..49d8ed6a079a 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -246,6 +246,12 @@ void removeDuplicateSlashesInPath() {
 		request.setRequestURI("/SPR-12372/foo/bar//");
 
 		assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar//");
+
+		// "enhance" case
+		request.setServletPath("/foo/bar//");
+		request.setRequestURI("/SPR-12372////////////////////////foo//////////////////bar////////////////////");
+
+		assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar//");
 	}
 
 	@Test

From c6ce65ef564dfb89944ae07dd3a2c25f28fc287f Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 9 Nov 2021 09:45:35 +0000
Subject: [PATCH 321/735] Polishing contribution

Closes gh-27623
---
 .../springframework/web/util/UrlPathHelper.java   | 15 ++++++++-------
 .../web/util/UrlPathHelperTests.java              |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index a4a85e707b8b..685f376b426a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -405,17 +405,18 @@ else if (index1 == requestUri.length()) {
 	 * </ul>
 	 */
 	private static String getSanitizedPath(final String path) {
-		if (path.length() == 0) {
+		int start = path.indexOf("//");
+		if (start == -1) {
 			return path;
 		}
-		char[] arr = path.toCharArray();
-		int slowIndex = 0;
-		for (int fastIndex = 1; fastIndex < arr.length; fastIndex++) {
-			if (arr[fastIndex] != '/' || arr[slowIndex] != '/') {
-				arr[++slowIndex] = arr[fastIndex];
+		char[] content = path.toCharArray();
+		int slowIndex = start;
+		for (int fastIndex = start + 1; fastIndex < content.length; fastIndex++) {
+			if (content[fastIndex] != '/' || content[slowIndex] != '/') {
+				content[++slowIndex] = content[fastIndex];
 			}
 		}
-		return new String(arr, 0, slowIndex + 1);
+		return new String(content, 0, slowIndex + 1);
 	}
 
 	/**
diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 49d8ed6a079a..e7ef05083780 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -232,12 +232,12 @@ void removeDuplicateSlashesInPath() {
 		request.setContextPath("/SPR-12372");
 		request.setPathInfo(null);
 		request.setServletPath("/foo/bar/");
-		request.setRequestURI("/SPR-12372/foo//bar/");
+		request.setRequestURI("/SPR-12372/foo///bar/");
 
 		assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar/");
 
 		request.setServletPath("/foo/bar/");
-		request.setRequestURI("/SPR-12372/foo/bar//");
+		request.setRequestURI("////SPR-12372/foo/bar//");
 
 		assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/foo/bar/");
 

From 6ac780d595b9a661d6ec357183f0d5bd0028981b Mon Sep 17 00:00:00 2001
From: Abdullah Khan <abeiy4u@gmail.com>
Date: Tue, 9 Nov 2021 17:47:15 +0530
Subject: [PATCH 322/735] Fix grammar in webflux-webclient.adoc

Closes gh-27657
---
 src/docs/asciidoc/web/webflux-webclient.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index 22e0d265136e..3099ecb02d26 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -89,7 +89,7 @@ modified copy as follows:
 === MaxInMemorySize
 
 Codecs have <<web-reactive.adoc#webflux-codecs-limits,limits>> for buffering data in
-memory to avoid application memory issues. By the default those are set to 256KB.
+memory to avoid application memory issues. By default those are set to 256KB.
 If that's not enough you'll get the following error:
 
 ----

From 39be572a7a70b7db24d0a0c4fd9a74a200ca6e3f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 9 Nov 2021 19:38:10 +0100
Subject: [PATCH 323/735] Upgrade to Reactor 2020.0.13

Closes gh-27636
---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d954fa16003d..98c85c3d008b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.69.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.13-SNAPSHOT"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.13"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,7 +292,6 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
-			maven { url "https://repo.spring.io/snapshot" } // reactor
 
 		}
 	}

From 9bc09631d61e2d011972232a5b32c1edc51c6dcf Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 9 Nov 2021 22:29:56 +0100
Subject: [PATCH 324/735] Recommend ObjectProvider as alternative to @Lazy for
 optional dependencies

Closes gh-27649
---
 .../org/springframework/context/annotation/Lazy.java   |  7 ++++++-
 src/docs/asciidoc/core/core-beans.adoc                 | 10 ++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java b/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
index 9d04a9df26ee..8369957f5917 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,11 @@
  * or {@link javax.inject.Inject}: In that context, it leads to the creation of a
  * lazy-resolution proxy for all affected dependencies, as an alternative to using
  * {@link org.springframework.beans.factory.ObjectFactory} or {@link javax.inject.Provider}.
+ * Please note that such a lazy-resolution proxy will always be injected; if the target
+ * dependency does not exist, you will only be able to find out through an exception on
+ * invocation. As a consequence, such an injection point results in unintuitive behavior
+ * for optional dependencies. For a programmatic equivalent, allowing for lazy references
+ * with more sophistication, consider {@link org.springframework.beans.factory.ObjectProvider}.
  *
  * @author Chris Beams
  * @author Juergen Hoeller
diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 5ba741761f28..8d701befcbcc 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -3039,7 +3039,7 @@ constructor or setter argument or autowired field) as `ObjectFactory<MyTargetBea
 allowing for a `getObject()` call to retrieve the current instance on demand every
 time it is needed -- without holding on to the instance or storing it separately.
 
-As an extended variant, you may declare `ObjectProvider<MyTargetBean>`, which delivers
+As an extended variant, you may declare `ObjectProvider<MyTargetBean>` which delivers
 several additional access variants, including `getIfAvailable` and `getIfUnique`.
 
 The JSR-330 variant of this is called `Provider` and is used with a `Provider<MyTargetBean>`
@@ -6675,9 +6675,11 @@ factory method and other bean definition properties, such as a qualifier value t
 the `@Qualifier` annotation. Other method-level annotations that can be specified are
 `@Scope`, `@Lazy`, and custom qualifier annotations.
 
-TIP: In addition to its role for component initialization, you can also place the `@Lazy` annotation
-on injection points marked with `@Autowired` or `@Inject`. In this context, it
-leads to the injection of a lazy-resolution proxy.
+TIP: In addition to its role for component initialization, you can also place the `@Lazy`
+annotation on injection points marked with `@Autowired` or `@Inject`. In this context,
+it leads to the injection of a lazy-resolution proxy. However, such a proxy approach
+is rather limited. For sophisticated lazy interactions, in particular in combination
+with optional dependencies, we recommend `ObjectProvider<MyTargetBean>` instead.
 
 Autowired fields and methods are supported, as previously discussed, with additional
 support for autowiring of `@Bean` methods. The following example shows how to do so:

From 8d735e6e605737f561252bb4e629c8fb160b9ddf Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 9 Nov 2021 22:30:44 +0100
Subject: [PATCH 325/735] Note on PersistenceExceptionTranslator sorting and
 non-singleton retrieval

Closes gh-26412
---
 .../PersistenceExceptionTranslationPostProcessor.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
index c975e9ec6b05..a612fe808d09 100644
--- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
  * PersistenceExceptionTranslator} interface, which are subsequently asked to translate
  * candidate exceptions.
  *
-
  * <p>All of Spring's applicable resource factories (e.g.
  * {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean})
  * implement the {@code PersistenceExceptionTranslator} interface out of the box.
@@ -47,6 +46,11 @@
  * with the {@code @Repository} annotation, along with defining this post-processor
  * as a bean in the application context.
  *
+ * <p>As of 5.3, {@code PersistenceExceptionTranslator} beans will be sorted according
+ * to Spring's dependency ordering rules: see {@link org.springframework.core.Ordered}
+ * and {@link org.springframework.core.annotation.Order}. Note that such beans will
+ * get retrieved from any scope, not just singleton scope, as of this 5.3 revision.
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 2.0

From b167e1a93fe299b19f339896d86e65337b05b78f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 9 Nov 2021 22:35:24 +0100
Subject: [PATCH 326/735] Remove unnecessary final declarations (for
 consistency)

---
 .../AutowiredAnnotationBeanPostProcessor.java      |  2 +-
 .../CommonAnnotationBeanPostProcessor.java         |  4 ++--
 .../annotation/ComponentScanAnnotationParser.java  |  4 ++--
 .../annotation/ConfigurationClassEnhancer.java     | 14 +++++++-------
 .../PersistenceAnnotationBeanPostProcessor.java    |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index e7131a562ef7..37f5884e671e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -459,7 +459,7 @@ private InjectionMetadata findAutowiringMetadata(String beanName, Class<?> clazz
 		return metadata;
 	}
 
-	private InjectionMetadata buildAutowiringMetadata(final Class<?> clazz) {
+	private InjectionMetadata buildAutowiringMetadata(Class<?> clazz) {
 		if (!AnnotationUtils.isCandidateClass(clazz, this.autowiredAnnotationTypes)) {
 			return InjectionMetadata.EMPTY;
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index 8a3ca5a9f889..ecfdf8f83a9a 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -343,7 +343,7 @@ public PropertyValues postProcessPropertyValues(
 	}
 
 
-	private InjectionMetadata findResourceMetadata(String beanName, final Class<?> clazz, @Nullable PropertyValues pvs) {
+	private InjectionMetadata findResourceMetadata(String beanName, Class<?> clazz, @Nullable PropertyValues pvs) {
 		// Fall back to class name as cache key, for backwards compatibility with custom callers.
 		String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
 		// Quick check on the concurrent map first, with minimal locking.
@@ -363,7 +363,7 @@ private InjectionMetadata findResourceMetadata(String beanName, final Class<?> c
 		return metadata;
 	}
 
-	private InjectionMetadata buildResourceMetadata(final Class<?> clazz) {
+	private InjectionMetadata buildResourceMetadata(Class<?> clazz) {
 		if (!AnnotationUtils.isCandidateClass(clazz, resourceAnnotationTypes)) {
 			return InjectionMetadata.EMPTY;
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
index 27e879bfb338..0a3c751ff395 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ public ComponentScanAnnotationParser(Environment environment, ResourceLoader res
 	}
 
 
-	public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, final String declaringClass) {
+	public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, String declaringClass) {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(this.registry,
 				componentScan.getBoolean("useDefaultFilters"), this.environment, this.resourceLoader);
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
index 17079522c7f6..1b215e524cc9 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -453,8 +453,8 @@ private boolean isCurrentlyInvokedFactoryMethod(Method method) {
 		 * instance directly. If a FactoryBean instance is fetched through the container via &-dereferencing,
 		 * it will not be proxied. This too is aligned with the way XML configuration works.
 		 */
-		private Object enhanceFactoryBean(final Object factoryBean, Class<?> exposedType,
-				final ConfigurableBeanFactory beanFactory, final String beanName) {
+		private Object enhanceFactoryBean(Object factoryBean, Class<?> exposedType,
+				ConfigurableBeanFactory beanFactory, String beanName) {
 
 			try {
 				Class<?> clazz = factoryBean.getClass();
@@ -489,8 +489,8 @@ private Object enhanceFactoryBean(final Object factoryBean, Class<?> exposedType
 			return createCglibProxyForFactoryBean(factoryBean, beanFactory, beanName);
 		}
 
-		private Object createInterfaceProxyForFactoryBean(final Object factoryBean, Class<?> interfaceType,
-				final ConfigurableBeanFactory beanFactory, final String beanName) {
+		private Object createInterfaceProxyForFactoryBean(Object factoryBean, Class<?> interfaceType,
+				ConfigurableBeanFactory beanFactory, String beanName) {
 
 			return Proxy.newProxyInstance(
 					factoryBean.getClass().getClassLoader(), new Class<?>[] {interfaceType},
@@ -502,8 +502,8 @@ private Object createInterfaceProxyForFactoryBean(final Object factoryBean, Clas
 					});
 		}
 
-		private Object createCglibProxyForFactoryBean(final Object factoryBean,
-				final ConfigurableBeanFactory beanFactory, final String beanName) {
+		private Object createCglibProxyForFactoryBean(Object factoryBean,
+				ConfigurableBeanFactory beanFactory, String beanName) {
 
 			Enhancer enhancer = new Enhancer();
 			enhancer.setSuperclass(factoryBean.getClass());
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
index d9ff7afc1414..61582bee1180 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -373,7 +373,7 @@ public boolean requiresDestruction(Object bean) {
 	}
 
 
-	private InjectionMetadata findPersistenceMetadata(String beanName, final Class<?> clazz, @Nullable PropertyValues pvs) {
+	private InjectionMetadata findPersistenceMetadata(String beanName, Class<?> clazz, @Nullable PropertyValues pvs) {
 		// Fall back to class name as cache key, for backwards compatibility with custom callers.
 		String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
 		// Quick check on the concurrent map first, with minimal locking.
@@ -393,7 +393,7 @@ private InjectionMetadata findPersistenceMetadata(String beanName, final Class<?
 		return metadata;
 	}
 
-	private InjectionMetadata buildPersistenceMetadata(final Class<?> clazz) {
+	private InjectionMetadata buildPersistenceMetadata(Class<?> clazz) {
 		if (!AnnotationUtils.isCandidateClass(clazz, Arrays.asList(PersistenceContext.class, PersistenceUnit.class))) {
 			return InjectionMetadata.EMPTY;
 		}

From 11a0df3fd144a8c792cd2f9d5a721d21abe52f2b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 9 Nov 2021 22:36:11 +0100
Subject: [PATCH 327/735] Upgrade to Tomcat 9.0.54, Netty 4.1.70, HtmlUnit
 2.54, XMLUnit 2.8.3

---
 build.gradle | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 98c85c3d008b..6021fa574ddf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
-			mavenBom "io.netty:netty-bom:4.1.69.Final"
+			mavenBom "io.netty:netty-bom:4.1.70.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.13"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
@@ -128,14 +128,14 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.53') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.54') {
 				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.53') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.54') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
@@ -192,7 +192,7 @@ configure(allprojects) { project ->
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
 			dependency "org.assertj:assertj-core:3.21.0"
-			dependencySet(group: 'org.xmlunit', version: '2.8.2') {
+			dependencySet(group: 'org.xmlunit', version: '2.8.3') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
@@ -206,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.53.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.54.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.53.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.54.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -292,7 +292,6 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
-
 		}
 	}
 	configurations.all {

From 2a268701c41aaa1324a6c2fcf0e7e71c40f91ec2 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 10 Nov 2021 14:21:48 +0100
Subject: [PATCH 328/735] Introduce optimizeLocations flag for resource
 location filtering on startup

This flag is off by default since it requires jar files with directory entries.

Closes gh-27624
---
 .../config/ResourceHandlerRegistration.java   |  25 +++-
 .../reactive/resource/ResourceWebHandler.java | 122 +++++++++++-------
 .../resource/ResourceWebHandlerTests.java     |   4 +-
 .../ResourceHandlerRegistration.java          |  23 +++-
 .../resource/ResourceHttpRequestHandler.java  |  77 +++++++----
 .../ResourceHttpRequestHandlerTests.java      |   3 +-
 src/docs/asciidoc/web/webflux.adoc            |   7 +-
 src/docs/asciidoc/web/webmvc.adoc             |   7 +-
 8 files changed, 188 insertions(+), 80 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
index 8ee0e87eafb1..9734347cc665 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
@@ -54,6 +54,8 @@ public class ResourceHandlerRegistration {
 
 	private boolean useLastModified = true;
 
+	private boolean optimizeLocations = false;
+
 	@Nullable
 	private Map<String, MediaType> mediaTypes;
 
@@ -105,15 +107,33 @@ public ResourceHandlerRegistration setCacheControl(CacheControl cacheControl) {
 	/**
 	 * Set whether the {@link Resource#lastModified()} information should be used to drive HTTP responses.
 	 * <p>This configuration is set to {@code true} by default.
-	 * @param useLastModified whether the "last modified" resource information should be used.
+	 * @param useLastModified whether the "last modified" resource information should be used
 	 * @return the same {@link ResourceHandlerRegistration} instance, for chained method invocation
 	 * @since 5.3
+	 * @see ResourceWebHandler#setUseLastModified
 	 */
 	public ResourceHandlerRegistration setUseLastModified(boolean useLastModified) {
 		this.useLastModified = useLastModified;
 		return this;
 	}
 
+	/**
+	 * Set whether to optimize the specified locations through an existence check on startup,
+	 * filtering non-existing directories upfront so that they do not have to be checked
+	 * on every resource access.
+	 * <p>The default is {@code false}, for defensiveness against zip files without directory
+	 * entries which are unable to expose the existence of a directory upfront. Switch this flag to
+	 * {@code true} for optimized access in case of a consistent jar layout with directory entries.
+	 * @param optimizeLocations whether to optimize the locations through an existence check on startup
+	 * @return the same {@link ResourceHandlerRegistration} instance, for chained method invocation
+	 * @since 5.3.13
+	 * @see ResourceWebHandler#setOptimizeLocations
+	 */
+	public ResourceHandlerRegistration setOptimizeLocations(boolean optimizeLocations) {
+		this.optimizeLocations = optimizeLocations;
+		return this;
+	}
+
 	/**
 	 * Configure a chain of resource resolvers and transformers to use. This
 	 * can be useful, for example, to apply a version strategy to resource URLs.
@@ -181,8 +201,8 @@ protected String[] getPathPatterns() {
 	 */
 	protected ResourceWebHandler getRequestHandler() {
 		ResourceWebHandler handler = new ResourceWebHandler();
-		handler.setLocationValues(this.locationValues);
 		handler.setResourceLoader(this.resourceLoader);
+		handler.setLocationValues(this.locationValues);
 		if (this.resourceChainRegistration != null) {
 			handler.setResourceResolvers(this.resourceChainRegistration.getResourceResolvers());
 			handler.setResourceTransformers(this.resourceChainRegistration.getResourceTransformers());
@@ -191,6 +211,7 @@ protected ResourceWebHandler getRequestHandler() {
 			handler.setCacheControl(this.cacheControl);
 		}
 		handler.setUseLastModified(this.useLastModified);
+		handler.setOptimizeLocations(this.optimizeLocations);
 		if (this.mediaTypes != null) {
 			handler.setMediaTypes(this.mediaTypes);
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index c2ba1b234bf1..e6f0640a7022 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -72,8 +72,8 @@
  * <p>This request handler may also be configured with a
  * {@link #setResourceResolvers(List) resourcesResolver} and
  * {@link #setResourceTransformers(List) resourceTransformer} chains to support
- * arbitrary resolution and transformation of resources being served. By default a
- * {@link PathResourceResolver} simply finds resources based on the configured
+ * arbitrary resolution and transformation of resources being served. By default
+ * a {@link PathResourceResolver} simply finds resources based on the configured
  * "locations". An application can configure additional resolvers and
  * transformers such as the {@link VersionResourceResolver} which can resolve
  * and prepare URLs for resources with a version in the URL.
@@ -85,6 +85,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Brian Clozel
+ * @author Juergen Hoeller
  * @since 5.0
  */
 public class ResourceWebHandler implements WebHandler, InitializingBean {
@@ -94,6 +95,9 @@ public class ResourceWebHandler implements WebHandler, InitializingBean {
 	private static final Log logger = LogFactory.getLog(ResourceWebHandler.class);
 
 
+	@Nullable
+	private ResourceLoader resourceLoader;
+
 	private final List<String> locationValues = new ArrayList<>(4);
 
 	private final List<Resource> locationResources = new ArrayList<>(4);
@@ -119,11 +123,18 @@ public class ResourceWebHandler implements WebHandler, InitializingBean {
 	@Nullable
 	private Map<String, MediaType> mediaTypes;
 
-	@Nullable
-	private ResourceLoader resourceLoader;
-
 	private boolean useLastModified = true;
 
+	private boolean optimizeLocations = false;
+
+
+	/**
+	 * Provide the ResourceLoader to load {@link #setLocationValues location values} with.
+	 * @since 5.1
+	 */
+	public void setResourceLoader(ResourceLoader resourceLoader) {
+		this.resourceLoader = resourceLoader;
+	}
 
 	/**
 	 * Accepts a list of String-based location values to be resolved into
@@ -161,9 +172,9 @@ public void setLocations(@Nullable List<Resource> locations) {
 	 * <p>Note that if {@link #setLocationValues(List) locationValues} are provided,
 	 * instead of loaded Resource-based locations, this method will return
 	 * empty until after initialization via {@link #afterPropertiesSet()}.
-	 * <p><strong>Note:</strong> As of 5.3.11 the list of locations is filtered
-	 * to exclude those that don't actually exist and therefore the list returned
-	 * from this method may be a subset of all given locations.
+	 * <p><strong>Note:</strong> As of 5.3.11 the list of locations may be filtered to
+	 * exclude those that don't actually exist and therefore the list returned from this
+	 * method may be a subset of all given locations. See {@link #setOptimizeLocations}.
 	 * @see #setLocationValues
 	 * @see #setLocations
 	 */
@@ -212,6 +223,22 @@ public List<ResourceTransformer> getResourceTransformers() {
 		return this.resourceTransformers;
 	}
 
+	/**
+	 * Configure the {@link ResourceHttpMessageWriter} to use.
+	 * <p>By default a {@link ResourceHttpMessageWriter} will be configured.
+	 */
+	public void setResourceHttpMessageWriter(@Nullable ResourceHttpMessageWriter httpMessageWriter) {
+		this.resourceHttpMessageWriter = httpMessageWriter;
+	}
+
+	/**
+	 * Return the configured resource message writer.
+	 */
+	@Nullable
+	public ResourceHttpMessageWriter getResourceHttpMessageWriter() {
+		return this.resourceHttpMessageWriter;
+	}
+
 	/**
 	 * Set the {@link org.springframework.http.CacheControl} instance to build
 	 * the Cache-Control HTTP response header.
@@ -230,19 +257,48 @@ public CacheControl getCacheControl() {
 	}
 
 	/**
-	 * Configure the {@link ResourceHttpMessageWriter} to use.
-	 * <p>By default a {@link ResourceHttpMessageWriter} will be configured.
+	 * Set whether we should look at the {@link Resource#lastModified()}
+	 * when serving resources and use this information to drive {@code "Last-Modified"}
+	 * HTTP response headers.
+	 * <p>This option is enabled by default and should be turned off if the metadata of
+	 * the static files should be ignored.
+	 * @since 5.3
 	 */
-	public void setResourceHttpMessageWriter(@Nullable ResourceHttpMessageWriter httpMessageWriter) {
-		this.resourceHttpMessageWriter = httpMessageWriter;
+	public void setUseLastModified(boolean useLastModified) {
+		this.useLastModified = useLastModified;
 	}
 
 	/**
-	 * Return the configured resource message writer.
+	 * Return whether the {@link Resource#lastModified()} information is used
+	 * to drive HTTP responses when serving static resources.
+	 * @since 5.3
 	 */
-	@Nullable
-	public ResourceHttpMessageWriter getResourceHttpMessageWriter() {
-		return this.resourceHttpMessageWriter;
+	public boolean isUseLastModified() {
+		return this.useLastModified;
+	}
+
+	/**
+	 * Set whether to optimize the specified locations through an existence
+	 * check on startup, filtering non-existing directories upfront so that
+	 * they do not have to be checked on every resource access.
+	 * <p>The default is {@code false}, for defensiveness against zip files
+	 * without directory entries which are unable to expose the existence of
+	 * a directory upfront. Switch this flag to {@code true} for optimized
+	 * access in case of a consistent jar layout with directory entries.
+	 * @since 5.3.13
+	 */
+	public void setOptimizeLocations(boolean optimizeLocations) {
+		this.optimizeLocations = optimizeLocations;
+	}
+
+	/**
+	 * Return whether to optimize the specified locations through an existence
+	 * check on startup, filtering non-existing directories upfront so that
+	 * they do not have to be checked on every resource access.
+	 * @since 5.3.13
+	 */
+	public boolean isOptimizeLocations() {
+		return this.optimizeLocations;
 	}
 
 	/**
@@ -269,36 +325,6 @@ public Map<String, MediaType> getMediaTypes() {
 		return (this.mediaTypes != null ? this.mediaTypes : Collections.emptyMap());
 	}
 
-	/**
-	 * Provide the ResourceLoader to load {@link #setLocationValues(List)
-	 * location values} with.
-	 * @since 5.1
-	 */
-	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourceLoader = resourceLoader;
-	}
-
-	/**
-	 * Return whether the {@link Resource#lastModified()} information is used
-	 * to drive HTTP responses when serving static resources.
-	 * @since 5.3
-	 */
-	public boolean isUseLastModified() {
-		return this.useLastModified;
-	}
-
-	/**
-	 * Set whether we should look at the {@link Resource#lastModified()}
-	 * when serving resources and use this information to drive {@code "Last-Modified"}
-	 * HTTP response headers.
-	 * <p>This option is enabled by default and should be turned off if the metadata of
-	 * the static files should be ignored.
-	 * @param useLastModified whether to use the resource last-modified information.
-	 * @since 5.3
-	 */
-	public void setUseLastModified(boolean useLastModified) {
-		this.useLastModified = useLastModified;
-	}
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
@@ -332,7 +358,9 @@ private void resolveResourceLocations() {
 			}
 		}
 
-		result = result.stream().filter(Resource::exists).collect(Collectors.toList());
+		if (isOptimizeLocations()) {
+			result = result.stream().filter(Resource::exists).collect(Collectors.toList());
+		}
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
index b668172197d6..c213b1672ac4 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
@@ -74,6 +74,7 @@ public class ResourceWebHandlerTests {
 
 	private ResourceWebHandler handler;
 
+
 	@BeforeEach
 	public void setup() throws Exception {
 		List<Resource> locations = new ArrayList<>(2);
@@ -253,7 +254,7 @@ public void getResourceFromFileSystem() throws Exception {
 		assertResponseBody(exchange, "h1 { color:red; }");
 	}
 
-	@Test  // gh-27538
+	@Test  // gh-27538, gh-27624
 	public void filterNonExistingLocations() throws Exception {
 		List<Resource> inputLocations = Arrays.asList(
 				new ClassPathResource("test/", getClass()),
@@ -262,6 +263,7 @@ public void filterNonExistingLocations() throws Exception {
 
 		ResourceWebHandler handler = new ResourceWebHandler();
 		handler.setLocations(inputLocations);
+		handler.setOptimizeLocations(true);
 		handler.afterPropertiesSet();
 
 		List<Resource> actual = handler.getLocations();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
index fd822bedd55b..c173f602455e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
@@ -55,6 +55,8 @@ public class ResourceHandlerRegistration {
 
 	private boolean useLastModified = true;
 
+	private boolean optimizeLocations = false;
+
 
 	/**
 	 * Create a {@link ResourceHandlerRegistration} instance.
@@ -130,15 +132,33 @@ public ResourceHandlerRegistration setCacheControl(CacheControl cacheControl) {
 	/**
 	 * Set whether the {@link Resource#lastModified()} information should be used to drive HTTP responses.
 	 * <p>This configuration is set to {@code true} by default.
-	 * @param useLastModified whether the "last modified" resource information should be used.
+	 * @param useLastModified whether the "last modified" resource information should be used
 	 * @return the same {@link ResourceHandlerRegistration} instance, for chained method invocation
 	 * @since 5.3
+	 * @see ResourceHttpRequestHandler#setUseLastModified
 	 */
 	public ResourceHandlerRegistration setUseLastModified(boolean useLastModified) {
 		this.useLastModified = useLastModified;
 		return this;
 	}
 
+	/**
+	 * Set whether to optimize the specified locations through an existence check on startup,
+	 * filtering non-existing directories upfront so that they do not have to be checked
+	 * on every resource access.
+	 * <p>The default is {@code false}, for defensiveness against zip files without directory
+	 * entries which are unable to expose the existence of a directory upfront. Switch this flag to
+	 * {@code true} for optimized access in case of a consistent jar layout with directory entries.
+	 * @param optimizeLocations whether to optimize the locations through an existence check on startup
+	 * @return the same {@link ResourceHandlerRegistration} instance, for chained method invocation
+	 * @since 5.3.13
+	 * @see ResourceHttpRequestHandler#setOptimizeLocations
+	 */
+	public ResourceHandlerRegistration setOptimizeLocations(boolean optimizeLocations) {
+		this.optimizeLocations = optimizeLocations;
+		return this;
+	}
+
 	/**
 	 * Configure a chain of resource resolvers and transformers to use. This
 	 * can be useful, for example, to apply a version strategy to resource URLs.
@@ -204,6 +224,7 @@ else if (this.cachePeriod != null) {
 			handler.setCacheSeconds(this.cachePeriod);
 		}
 		handler.setUseLastModified(this.useLastModified);
+		handler.setOptimizeLocations(this.optimizeLocations);
 		return handler;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 22f06ccf58d7..7855a1171cb3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -140,11 +140,13 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
 	@Nullable
 	private UrlPathHelper urlPathHelper;
 
+	private boolean useLastModified = true;
+
+	private boolean optimizeLocations = false;
+
 	@Nullable
 	private StringValueResolver embeddedValueResolver;
 
-	private boolean useLastModified = true;
-
 
 	public ResourceHttpRequestHandler() {
 		super(HttpMethod.GET.name(), HttpMethod.HEAD.name());
@@ -185,13 +187,13 @@ public void setLocations(List<Resource> locations) {
 	/**
 	 * Return the configured {@code List} of {@code Resource} locations including
 	 * both String-based locations provided via
-	 * {@link #setLocationValues(List) setLocationValues} and pre-resolved {@code Resource}
-	 * locations provided via {@link #setLocations(List) setLocations}.
+	 * {@link #setLocationValues(List) setLocationValues} and pre-resolved
+	 * {@code Resource} locations provided via {@link #setLocations(List) setLocations}.
 	 * <p>Note that the returned list is fully initialized only after
 	 * initialization via {@link #afterPropertiesSet()}.
-	 * <p><strong>Note:</strong> As of 5.3.11 the list of locations is filtered
-	 * to exclude those that don't actually exist and therefore the list returned
-	 * from this method may be a subset of all given locations.
+	 * <p><strong>Note:</strong> As of 5.3.11 the list of locations may be filtered to
+	 * exclude those that don't actually exist and therefore the list returned from this
+	 * method may be a subset of all given locations. See {@link #setOptimizeLocations}.
 	 * @see #setLocationValues
 	 * @see #setLocations
 	 */
@@ -293,7 +295,7 @@ public void setContentNegotiationManager(@Nullable ContentNegotiationManager con
 	/**
 	 * Return the configured content negotiation manager.
 	 * @since 4.3
-	 * @deprecated as of 5.2.4.
+	 * @deprecated as of 5.2.4
 	 */
 	@Nullable
 	@Deprecated
@@ -303,7 +305,7 @@ public ContentNegotiationManager getContentNegotiationManager() {
 
 	/**
 	 * Add mappings between file extensions, extracted from the filename of a
-	 * static {@link Resource}, and corresponding media type  to set on the
+	 * static {@link Resource}, and corresponding media type to set on the
 	 * response.
 	 * <p>Use of this method is typically not necessary since mappings are
 	 * otherwise determined via
@@ -361,9 +363,16 @@ public UrlPathHelper getUrlPathHelper() {
 		return this.urlPathHelper;
 	}
 
-	@Override
-	public void setEmbeddedValueResolver(StringValueResolver resolver) {
-		this.embeddedValueResolver = resolver;
+	/**
+	 * Set whether we should look at the {@link Resource#lastModified()} when
+	 * serving resources and use this information to drive {@code "Last-Modified"}
+	 * HTTP response headers.
+	 * <p>This option is enabled by default and should be turned off if the metadata
+	 * of the static files should be ignored.
+	 * @since 5.3
+	 */
+	public void setUseLastModified(boolean useLastModified) {
+		this.useLastModified = useLastModified;
 	}
 
 	/**
@@ -376,18 +385,35 @@ public boolean isUseLastModified() {
 	}
 
 	/**
-	 * Set whether we should look at the {@link Resource#lastModified()}
-	 * when serving resources and use this information to drive {@code "Last-Modified"}
-	 * HTTP response headers.
-	 * <p>This option is enabled by default and should be turned off if the metadata of
-	 * the static files should be ignored.
-	 * @param useLastModified whether to use the resource last-modified information.
-	 * @since 5.3
+	 * Set whether to optimize the specified locations through an existence
+	 * check on startup, filtering non-existing directories upfront so that
+	 * they do not have to be checked on every resource access.
+	 * <p>The default is {@code false}, for defensiveness against zip files
+	 * without directory entries which are unable to expose the existence of
+	 * a directory upfront. Switch this flag to {@code true} for optimized
+	 * access in case of a consistent jar layout with directory entries.
+	 * @since 5.3.13
 	 */
-	public void setUseLastModified(boolean useLastModified) {
-		this.useLastModified = useLastModified;
+	public void setOptimizeLocations(boolean optimizeLocations) {
+		this.optimizeLocations = optimizeLocations;
+	}
+
+	/**
+	 * Return whether to optimize the specified locations through an existence
+	 * check on startup, filtering non-existing directories upfront so that
+	 * they do not have to be checked on every resource access.
+	 * @since 5.3.13
+	 */
+	public boolean isOptimizeLocations() {
+		return this.optimizeLocations;
 	}
 
+	@Override
+	public void setEmbeddedValueResolver(StringValueResolver resolver) {
+		this.embeddedValueResolver = resolver;
+	}
+
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		resolveResourceLocations();
@@ -449,8 +475,8 @@ private void resolveResourceLocations() {
 				if (location.equals("/") && !(resource instanceof ServletContextResource)) {
 					throw new IllegalStateException(
 							"The String-based location \"/\" should be relative to the web application root " +
-									"but resolved to a Resource of type: " + resource.getClass() + ". " +
-									"If this is intentional, please pass it as a pre-configured Resource via setLocations.");
+							"but resolved to a Resource of type: " + resource.getClass() + ". " +
+							"If this is intentional, please pass it as a pre-configured Resource via setLocations.");
 				}
 				result.add(resource);
 				if (charset != null) {
@@ -463,7 +489,9 @@ private void resolveResourceLocations() {
 		}
 
 		result.addAll(this.locationResources);
-		result = result.stream().filter(Resource::exists).collect(Collectors.toList());
+		if (isOptimizeLocations()) {
+			result = result.stream().filter(Resource::exists).collect(Collectors.toList());
+		}
 
 		this.locationsToUse.clear();
 		this.locationsToUse.addAll(result);
@@ -508,6 +536,7 @@ protected org.springframework.web.accept.PathExtensionContentNegotiationStrategy
 		return null;
 	}
 
+
 	/**
 	 * Processes a resource request.
 	 * <p>Checks for the existence of the requested resource in the configured list of locations.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
index 9aefd7f9d07b..834aab2694a6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -311,7 +311,7 @@ public String getMimeType(String filePath) {
 		assertThat(this.response.getContentAsString()).isEqualTo("h1 { color:red; }");
 	}
 
-	@Test  // gh-27538
+	@Test  // gh-27538, gh-27624
 	public void filterNonExistingLocations() throws Exception {
 		List<Resource> inputLocations = Arrays.asList(
 				new ClassPathResource("test/", getClass()),
@@ -321,6 +321,7 @@ public void filterNonExistingLocations() throws Exception {
 		ResourceHttpRequestHandler handler = new ResourceHttpRequestHandler();
 		handler.setServletContext(new MockServletContext());
 		handler.setLocations(inputLocations);
+		handler.setOptimizeLocations(true);
 		handler.afterPropertiesSet();
 
 		List<Resource> actual = handler.getLocations();
diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc
index 3b601ea4c885..1cc302102126 100644
--- a/src/docs/asciidoc/web/webflux.adoc
+++ b/src/docs/asciidoc/web/webflux.adoc
@@ -4170,8 +4170,8 @@ the example:
 		@Override
 		public void addResourceHandlers(ResourceHandlerRegistry registry) {
 			registry.addResourceHandler("/resources/**")
-				.addResourceLocations("/public", "classpath:/static/")
-				.setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS));
+					.addResourceLocations("/public", "classpath:/static/")
+					.setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS));
 		}
 
 	}
@@ -4259,6 +4259,9 @@ re-write URLs to include the version of the jar and can also match against incom
 without versions -- for example, from `/jquery/jquery.min.js` to
 `/jquery/1.2.0/jquery.min.js`.
 
+TIP: The Java configuration based on `ResourceHandlerRegistry` provides further options
+for fine-grained control, e.g. last-modified behavior and optimized resource resolution.
+
 
 
 [[webflux-config-path-matching]]
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index b49666303e98..33b49bef56a5 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -5738,8 +5738,8 @@ The following listing shows how to do so with Java configuration:
 		@Override
 		public void addResourceHandlers(ResourceHandlerRegistry registry) {
 			registry.addResourceHandler("/resources/**")
-				.addResourceLocations("/public", "classpath:/static/")
-				.setCacheControl(CacheControl.maxAge(Duration.ofDays(365)));
+					.addResourceLocations("/public", "classpath:/static/")
+					.setCacheControl(CacheControl.maxAge(Duration.ofDays(365)));
 		}
 	}
 ----
@@ -5846,6 +5846,9 @@ re-write URLs to include the version of the jar and can also match against incom
 without versions -- for example, from `/jquery/jquery.min.js` to
 `/jquery/1.2.0/jquery.min.js`.
 
+TIP: The Java configuration based on `ResourceHandlerRegistry` provides further options
+for fine-grained control, e.g. last-modified behavior and optimized resource resolution.
+
 
 
 [[mvc-default-servlet-handler]]

From 15a6373fed1b8acf6dcda7cc2a144de34e32f4cd Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 10 Nov 2021 14:22:06 +0100
Subject: [PATCH 329/735] Avoid nullability warnings

---
 .../test/web/reactive/server/CookieAssertions.java         | 7 ++++---
 .../test/web/reactive/server/HeaderAssertions.java         | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
index 26b28b486a41..f9804915f72b 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java
@@ -17,6 +17,7 @@
 package org.springframework.test.web.reactive.server;
 
 import java.time.Duration;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import org.hamcrest.Matcher;
@@ -210,10 +211,10 @@ public WebTestClient.ResponseSpec sameSite(String name, String expected) {
 	private ResponseCookie getCookie(String name) {
 		ResponseCookie cookie = this.exchangeResult.getResponseCookies().getFirst(name);
 		if (cookie == null) {
-			String message = "No cookie with name '" + name + "'";
-			this.exchangeResult.assertWithDiagnostics(() -> AssertionErrors.fail(message));
+			this.exchangeResult.assertWithDiagnostics(() ->
+					AssertionErrors.fail("No cookie with name '" + name + "'"));
 		}
-		return cookie;
+		return Objects.requireNonNull(cookie);
 	}
 
 	private String getMessage(String cookie) {
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
index aa20066960d0..c3750d27c3c4 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import org.hamcrest.Matcher;
@@ -73,7 +74,7 @@ public WebTestClient.ResponseSpec valueEquals(String headerName, long value) {
 		String actual = getHeaders().getFirst(headerName);
 		this.exchangeResult.assertWithDiagnostics(() ->
 				assertTrue("Response does not contain header '" + headerName + "'", actual != null));
-		return assertHeader(headerName, value, Long.parseLong(actual));
+		return assertHeader(headerName, value, Long.parseLong(Objects.requireNonNull(actual)));
 	}
 
 	/**
@@ -203,7 +204,7 @@ private List<String> getRequiredValues(String name) {
 			this.exchangeResult.assertWithDiagnostics(() ->
 					AssertionErrors.fail(getMessage(name) + " not found"));
 		}
-		return values;
+		return Objects.requireNonNull(values);
 	}
 
 	/**

From 32af39d6e6daaac2d5860b4b806f1fc2128f57db Mon Sep 17 00:00:00 2001
From: SungMin <honggasm@gmail.com>
Date: Wed, 10 Nov 2021 23:11:33 +0900
Subject: [PATCH 330/735] Use 'toString(Charset)' instead of 'toString(String)'
 for encodings (#27646)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 홍성민(SungMin Hong)/Platform Engineering팀/11ST <devmonster@11stcorp.com>
---
 .../index/processor/SortedProperties.java     |  2 +-
 .../core/SortedProperties.java                |  2 +-
 .../support/PropertiesToStringConverter.java  |  3 ++-
 .../org/springframework/util/StreamUtils.java | 11 ++-------
 .../converter/ProtobufMessageConverter.java   |  2 +-
 .../mock/web/MockHttpServletResponse.java     |  7 ++++--
 .../http/codec/FormHttpMessageReader.java     | 24 +++++++------------
 .../http/codec/FormHttpMessageWriter.java     | 18 +++++---------
 .../converter/FormHttpMessageConverter.java   | 23 +++++++-----------
 .../http/server/ServletServerHttpRequest.java |  4 ++--
 .../servlet/MockHttpServletResponse.java      |  7 ++++--
 .../client/RestTemplateXhrTransport.java      |  4 ++--
 12 files changed, 45 insertions(+), 62 deletions(-)

diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/SortedProperties.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/SortedProperties.java
index 127a1a2b9614..816ec3ea3ee7 100644
--- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/SortedProperties.java
+++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/SortedProperties.java
@@ -88,7 +88,7 @@ class SortedProperties extends Properties {
 	public void store(OutputStream out, String comments) throws IOException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		super.store(baos, (this.omitComments ? null : comments));
-		String contents = baos.toString(StandardCharsets.ISO_8859_1.name());
+		String contents = baos.toString(StandardCharsets.ISO_8859_1);
 		for (String line : contents.split(EOL)) {
 			if (!(this.omitComments && line.startsWith("#"))) {
 				out.write((line + EOL).getBytes(StandardCharsets.ISO_8859_1));
diff --git a/spring-core/src/main/java/org/springframework/core/SortedProperties.java b/spring-core/src/main/java/org/springframework/core/SortedProperties.java
index 63f87ac28c5d..cb3e7a93e28b 100644
--- a/spring-core/src/main/java/org/springframework/core/SortedProperties.java
+++ b/spring-core/src/main/java/org/springframework/core/SortedProperties.java
@@ -90,7 +90,7 @@ class SortedProperties extends Properties {
 	public void store(OutputStream out, @Nullable String comments) throws IOException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		super.store(baos, (this.omitComments ? null : comments));
-		String contents = baos.toString(StandardCharsets.ISO_8859_1.name());
+		String contents = baos.toString(StandardCharsets.ISO_8859_1);
 		for (String line : contents.split(EOL)) {
 			if (!(this.omitComments && line.startsWith("#"))) {
 				out.write((line + EOL).getBytes(StandardCharsets.ISO_8859_1));
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
index c953280ba316..02a61515ceae 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
@@ -18,6 +18,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
 import org.springframework.core.convert.converter.Converter;
@@ -36,7 +37,7 @@ public String convert(Properties source) {
 		try {
 			ByteArrayOutputStream os = new ByteArrayOutputStream(256);
 			source.store(os, null);
-			return os.toString("ISO-8859-1");
+			return os.toString(StandardCharsets.ISO_8859_1);
 		}
 		catch (IOException ex) {
 			// Should never happen.
diff --git a/spring-core/src/main/java/org/springframework/util/StreamUtils.java b/spring-core/src/main/java/org/springframework/util/StreamUtils.java
index 272abd9f8e25..f57943a29e8d 100644
--- a/spring-core/src/main/java/org/springframework/util/StreamUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StreamUtils.java
@@ -25,7 +25,6 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.nio.charset.Charset;
 
@@ -105,14 +104,8 @@ public static String copyToString(@Nullable InputStream in, Charset charset) thr
 	public static String copyToString(ByteArrayOutputStream baos, Charset charset) {
 		Assert.notNull(baos, "No ByteArrayOutputStream specified");
 		Assert.notNull(charset, "No Charset specified");
-		try {
-			// Can be replaced with toString(Charset) call in Java 10+
-			return baos.toString(charset.name());
-		}
-		catch (UnsupportedEncodingException ex) {
-			// Should never happen
-			throw new IllegalArgumentException("Invalid charset name: " + charset, ex);
-		}
+
+		return baos.toString(charset);
 	}
 
 	/**
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java
index 085957e4d4b9..179ae215528c 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java
@@ -183,7 +183,7 @@ protected Object convertToInternal(
 			else if (this.protobufFormatSupport != null) {
 				ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 				this.protobufFormatSupport.print(message, outputStream, contentType, charset);
-				payload = outputStream.toString(charset.name());
+				payload = outputStream.toString(charset);
 			}
 		}
 		catch (IOException ex) {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index 981f3a515ad3..397cec961678 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -279,8 +279,11 @@ public String getContentAsString() throws UnsupportedEncodingException {
 	 * @see #setContentType(String)
 	 */
 	public String getContentAsString(Charset fallbackCharset) throws UnsupportedEncodingException {
-		String charsetName = (this.characterEncodingSet ? getCharacterEncoding() : fallbackCharset.name());
-		return this.content.toString(charsetName);
+		if (this.characterEncodingSet) {
+			return this.content.toString(getCharacterEncoding());
+		}
+
+		return this.content.toString(fallbackCharset);
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
index 63e4a10259fa..cc08b15628b9 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
@@ -16,7 +16,6 @@
 
 package org.springframework.http.codec;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -158,21 +157,16 @@ private Charset getMediaTypeCharset(@Nullable MediaType mediaType) {
 	private MultiValueMap<String, String> parseFormData(Charset charset, String body) {
 		String[] pairs = StringUtils.tokenizeToStringArray(body, "&");
 		MultiValueMap<String, String> result = new LinkedMultiValueMap<>(pairs.length);
-		try {
-			for (String pair : pairs) {
-				int idx = pair.indexOf('=');
-				if (idx == -1) {
-					result.add(URLDecoder.decode(pair, charset.name()), null);
-				}
-				else {
-					String name = URLDecoder.decode(pair.substring(0, idx),  charset.name());
-					String value = URLDecoder.decode(pair.substring(idx + 1), charset.name());
-					result.add(name, value);
-				}
+		for (String pair : pairs) {
+			int idx = pair.indexOf('=');
+			if (idx == -1) {
+				result.add(URLDecoder.decode(pair, charset), null);
+			}
+			else {
+				String name = URLDecoder.decode(pair.substring(0, idx),  charset);
+				String value = URLDecoder.decode(pair.substring(idx + 1), charset);
+				result.add(name, value);
 			}
-		}
-		catch (UnsupportedEncodingException ex) {
-			throw new IllegalStateException(ex);
 		}
 		return result;
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
index 81c68d847bfd..a36705f37692 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
@@ -16,7 +16,6 @@
 
 package org.springframework.http.codec;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -162,18 +161,13 @@ protected String serializeForm(MultiValueMap<String, String> formData, Charset c
 		StringBuilder builder = new StringBuilder();
 		formData.forEach((name, values) ->
 				values.forEach(value -> {
-					try {
-						if (builder.length() != 0) {
-							builder.append('&');
-						}
-						builder.append(URLEncoder.encode(name, charset.name()));
-						if (value != null) {
-							builder.append('=');
-							builder.append(URLEncoder.encode(value, charset.name()));
-						}
+					if (builder.length() != 0) {
+						builder.append('&');
 					}
-					catch (UnsupportedEncodingException ex) {
-						throw new IllegalStateException(ex);
+					builder.append(URLEncoder.encode(name, charset));
+					if (value != null) {
+						builder.append('=');
+						builder.append(URLEncoder.encode(value, charset));
 					}
 				}));
 		return builder.toString();
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index 680da1ae2a10..732546474153 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -348,11 +348,11 @@ public MultiValueMap<String, String> read(@Nullable Class<? extends MultiValueMa
 		for (String pair : pairs) {
 			int idx = pair.indexOf('=');
 			if (idx == -1) {
-				result.add(URLDecoder.decode(pair, charset.name()), null);
+				result.add(URLDecoder.decode(pair, charset), null);
 			}
 			else {
-				String name = URLDecoder.decode(pair.substring(0, idx), charset.name());
-				String value = URLDecoder.decode(pair.substring(idx + 1), charset.name());
+				String name = URLDecoder.decode(pair.substring(0, idx), charset);
+				String value = URLDecoder.decode(pair.substring(idx + 1), charset);
 				result.add(name, value);
 			}
 		}
@@ -438,18 +438,13 @@ protected String serializeForm(MultiValueMap<String, Object> formData, Charset c
 					return;
 				}
 				values.forEach(value -> {
-					try {
-						if (builder.length() != 0) {
-							builder.append('&');
-						}
-						builder.append(URLEncoder.encode(name, charset.name()));
-						if (value != null) {
-							builder.append('=');
-							builder.append(URLEncoder.encode(String.valueOf(value), charset.name()));
-						}
+					if (builder.length() != 0) {
+						builder.append('&');
 					}
-					catch (UnsupportedEncodingException ex) {
-						throw new IllegalStateException(ex);
+					builder.append(URLEncoder.encode(name, charset));
+					if (value != null) {
+						builder.append('=');
+						builder.append(URLEncoder.encode(String.valueOf(value), charset));
 					}
 				});
 		});
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index 7bac4b70a94e..478ae10542ca 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -249,10 +249,10 @@ private static InputStream getBodyFromServletRequestParameters(HttpServletReques
 			List<String> values = Arrays.asList(entry.getValue());
 			for (Iterator<String> valueIterator = values.iterator(); valueIterator.hasNext();) {
 				String value = valueIterator.next();
-				writer.write(URLEncoder.encode(name, FORM_CHARSET.name()));
+				writer.write(URLEncoder.encode(name, FORM_CHARSET));
 				if (value != null) {
 					writer.write('=');
-					writer.write(URLEncoder.encode(value, FORM_CHARSET.name()));
+					writer.write(URLEncoder.encode(value, FORM_CHARSET));
 					if (valueIterator.hasNext()) {
 						writer.write('&');
 					}
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
index 00763fa97465..af9773ce330c 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -279,8 +279,11 @@ public String getContentAsString() throws UnsupportedEncodingException {
 	 * @see #setContentType(String)
 	 */
 	public String getContentAsString(Charset fallbackCharset) throws UnsupportedEncodingException {
-		String charsetName = (this.characterEncodingSet ? getCharacterEncoding() : fallbackCharset.name());
-		return this.content.toString(charsetName);
+		if (this.characterEncodingSet) {
+			return this.content.toString(getCharacterEncoding());
+		}
+
+		return this.content.toString(fallbackCharset);
 	}
 
 	@Override
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java
index 7d47173b03da..41afb4f671a8 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java
@@ -252,8 +252,8 @@ public Object extractData(ClientHttpResponse response) throws IOException {
 			return null;
 		}
 
-		private void handleFrame(ByteArrayOutputStream os) throws IOException {
-			String content = os.toString(SockJsFrame.CHARSET.name());
+		private void handleFrame(ByteArrayOutputStream os) {
+			String content = os.toString(SockJsFrame.CHARSET);
 			os.reset();
 			if (logger.isTraceEnabled()) {
 				logger.trace("XHR receive content: " + content);

From 54bd66755c12b7dc7f353796ebe128da98e2831e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 10 Nov 2021 15:19:51 +0100
Subject: [PATCH 331/735] Consistently replace String encoding names with
 StandardCharset arguments

Closes gh-27664
---
 .../scripting/support/ResourceScriptSource.java           | 5 +++--
 .../org/springframework/oxm/jaxb/Jaxb2Marshaller.java     | 8 ++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
index 8f345085a2b2..0cdceadfe7f2 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -72,7 +73,7 @@ public ResourceScriptSource(EncodedResource resource) {
 	 */
 	public ResourceScriptSource(Resource resource) {
 		Assert.notNull(resource, "Resource must not be null");
-		this.resource = new EncodedResource(resource, "UTF-8");
+		this.resource = new EncodedResource(resource, StandardCharsets.UTF_8);
 	}
 
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 4b30aad1e06d..41d967aaf3a3 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -32,6 +32,7 @@
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -972,12 +973,7 @@ public String addMtomAttachment(DataHandler dataHandler, String elementNamespace
 			String host = getHost(elementNamespace, dataHandler);
 			String contentId = UUID.randomUUID() + "@" + host;
 			this.mimeContainer.addAttachment("<" + contentId + ">", dataHandler);
-			try {
-				contentId = URLEncoder.encode(contentId, "UTF-8");
-			}
-			catch (UnsupportedEncodingException ex) {
-				// ignore
-			}
+			contentId = URLEncoder.encode(contentId, StandardCharsets.UTF_8);
 			return CID + contentId;
 		}
 

From 2fba0bc27268d863f04734b96bdce331dad57438 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 10 Nov 2021 15:20:56 +0100
Subject: [PATCH 332/735] Allow BeanUtils#instantiateClass inlining with native

Closes gh-27072
---
 .../java/org/springframework/beans/BeanUtils.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 77aff7ffe08e..d908dbde63ae 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -142,19 +142,20 @@ public static <T> T instantiateClass(Class<T> clazz) throws BeanInstantiationExc
 		if (clazz.isInterface()) {
 			throw new BeanInstantiationException(clazz, "Specified class is an interface");
 		}
+		Constructor<T> ctor;
 		try {
-			return instantiateClass(clazz.getDeclaredConstructor());
+			ctor = clazz.getDeclaredConstructor();
 		}
 		catch (NoSuchMethodException ex) {
-			Constructor<T> ctor = findPrimaryConstructor(clazz);
-			if (ctor != null) {
-				return instantiateClass(ctor);
+			ctor = findPrimaryConstructor(clazz);
+			if (ctor == null) {
+				throw new BeanInstantiationException(clazz, "No default constructor found", ex);
 			}
-			throw new BeanInstantiationException(clazz, "No default constructor found", ex);
 		}
 		catch (LinkageError err) {
 			throw new BeanInstantiationException(clazz, "Unresolvable class definition", err);
 		}
+		return instantiateClass(ctor);
 	}
 
 	/**

From 5c972fcc548ce537ac706a5b2b8d4d8703140684 Mon Sep 17 00:00:00 2001
From: Christoph Dreis <christoph.dreis@freenet.de>
Date: Wed, 13 Oct 2021 14:38:58 +0200
Subject: [PATCH 333/735] Use Charset variants of URLEncoder and URLDecoder
 methods

---
 .../beans/factory/xml/ResourceEntityResolver.java   |  5 +++--
 .../springframework/oxm/jaxb/Jaxb2Marshaller.java   |  8 +-------
 .../servlet/htmlunit/HtmlUnitRequestBuilder.java    |  8 +-------
 .../http/codec/FormHttpMessageReader.java           |  2 +-
 .../http/codec/FormHttpMessageWriter.java           |  2 +-
 .../server/reactive/AbstractServerHttpRequest.java  | 13 +++----------
 .../web/reactive/resource/PathResourceResolver.java |  7 +++----
 .../web/reactive/resource/ResourceWebHandler.java   |  8 ++++----
 .../web/servlet/resource/PathResourceResolver.java  |  7 +++----
 .../resource/ResourceHttpRequestHandler.java        |  8 ++++----
 .../web/servlet/support/FlashMapManagerTests.java   |  5 +++--
 11 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
index b74e0133263a..eea87d5524b4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -80,7 +81,7 @@ public InputSource resolveEntity(@Nullable String publicId, @Nullable String sys
 		if (source == null && systemId != null) {
 			String resourcePath = null;
 			try {
-				String decodedSystemId = URLDecoder.decode(systemId, "UTF-8");
+				String decodedSystemId = URLDecoder.decode(systemId, StandardCharsets.UTF_8);
 				String givenUrl = new URL(decodedSystemId).toString();
 				String systemRootUrl = new File("").toURI().toURL().toString();
 				// Try relative to resource base if currently in system root.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 41d967aaf3a3..78b4ca23e4a5 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -22,7 +22,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -1025,12 +1024,7 @@ public byte[] getAttachmentAsByteArray(String cid) {
 		public DataHandler getAttachmentAsDataHandler(String contentId) {
 			if (contentId.startsWith(CID)) {
 				contentId = contentId.substring(CID.length());
-				try {
-					contentId = URLDecoder.decode(contentId, "UTF-8");
-				}
-				catch (UnsupportedEncodingException ex) {
-					// ignore
-				}
+				contentId = URLDecoder.decode(contentId, StandardCharsets.UTF_8);
 				contentId = '<' + contentId + '>';
 			}
 			DataHandler dataHandler = this.mimeContainer.getAttachment(contentId);
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index 81bde230655b..e897ae5aa80c 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -18,7 +18,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
@@ -396,12 +395,7 @@ private void params(MockHttpServletRequest request, UriComponents uriComponents)
 	}
 
 	private String urlDecode(String value) {
-		try {
-			return URLDecoder.decode(value, "UTF-8");
-		}
-		catch (UnsupportedEncodingException ex) {
-			throw new IllegalStateException(ex);
-		}
+		return URLDecoder.decode(value, StandardCharsets.UTF_8);
 	}
 
 	private byte[] readAllBytes(File file) {
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
index cc08b15628b9..c797232b9c03 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
index a36705f37692..f4867dcb82ec 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java
index 3b8bb8ad7046..c33ae2c3c0d5 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 
 package org.springframework.http.server.reactive;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -158,15 +158,8 @@ protected MultiValueMap<String, String> initQueryParams() {
 		return queryParams;
 	}
 
-	@SuppressWarnings("deprecation")
 	private String decodeQueryParam(String value) {
-		try {
-			return URLDecoder.decode(value, "UTF-8");
-		}
-		catch (UnsupportedEncodingException ex) {
-			// Should never happen but we got a platform default fallback anyway.
-			return URLDecoder.decode(value);
-		}
+		return URLDecoder.decode(value, StandardCharsets.UTF_8);
 	}
 
 	@Override
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
index e99c3978790c..8d27a77ac74f 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
@@ -17,7 +17,6 @@
 package org.springframework.web.reactive.resource;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -199,14 +198,14 @@ private boolean isInvalidEncodedPath(String resourcePath) {
 		if (resourcePath.contains("%")) {
 			// Use URLDecoder (vs UriUtils) to preserve potentially decoded UTF-8 chars...
 			try {
-				String decodedPath = URLDecoder.decode(resourcePath, "UTF-8");
+				String decodedPath = URLDecoder.decode(resourcePath, StandardCharsets.UTF_8);
 				if (decodedPath.contains("../") || decodedPath.contains("..\\")) {
 					logger.warn("Resolved resource path contains encoded \"../\" or \"..\\\": " + resourcePath);
 					return true;
 				}
 			}
-			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
-				// Should never happen...
+			catch (IllegalArgumentException ex) {
+				// May not be possible to decode...
 			}
 		}
 		return false;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index 6553f86394d9..8a8ba5894d1b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -17,8 +17,8 @@
 package org.springframework.web.reactive.resource;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -534,7 +534,7 @@ private boolean isInvalidEncodedPath(String path) {
 		if (path.contains("%")) {
 			try {
 				// Use URLDecoder (vs UriUtils) to preserve potentially decoded UTF-8 chars
-				String decodedPath = URLDecoder.decode(path, "UTF-8");
+				String decodedPath = URLDecoder.decode(path, StandardCharsets.UTF_8);
 				if (isInvalidPath(decodedPath)) {
 					return true;
 				}
@@ -543,8 +543,8 @@ private boolean isInvalidEncodedPath(String path) {
 					return true;
 				}
 			}
-			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
-				// Should never happen...
+			catch (IllegalArgumentException ex) {
+				// May not be possible to decode...
 			}
 		}
 		return false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
index 002705603f6d..13daebdd9bd2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.resource;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -295,14 +294,14 @@ private boolean isInvalidEncodedPath(String resourcePath) {
 		if (resourcePath.contains("%")) {
 			// Use URLDecoder (vs UriUtils) to preserve potentially decoded UTF-8 chars...
 			try {
-				String decodedPath = URLDecoder.decode(resourcePath, "UTF-8");
+				String decodedPath = URLDecoder.decode(resourcePath, StandardCharsets.UTF_8);
 				if (decodedPath.contains("../") || decodedPath.contains("..\\")) {
 					logger.warn("Resolved resource path contains encoded \"../\" or \"..\\\": " + resourcePath);
 					return true;
 				}
 			}
-			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
-				// May not be possible to decode... | Should never happen...
+			catch (IllegalArgumentException ex) {
+				// May not be possible to decode...
 			}
 		}
 		return false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 85eb4e8d51b8..824a9aa6b677 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -17,9 +17,9 @@
 package org.springframework.web.servlet.resource;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -694,7 +694,7 @@ private boolean isInvalidEncodedPath(String path) {
 		if (path.contains("%")) {
 			try {
 				// Use URLDecoder (vs UriUtils) to preserve potentially decoded UTF-8 chars
-				String decodedPath = URLDecoder.decode(path, "UTF-8");
+				String decodedPath = URLDecoder.decode(path, StandardCharsets.UTF_8);
 				if (isInvalidPath(decodedPath)) {
 					return true;
 				}
@@ -703,8 +703,8 @@ private boolean isInvalidEncodedPath(String path) {
 					return true;
 				}
 			}
-			catch (IllegalArgumentException | UnsupportedEncodingException ex) {
-				// May not be possible to decode... | Should never happen...
+			catch (IllegalArgumentException ex) {
+				// May not be possible to decode...
 			}
 		}
 		return false;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
index 46be451297ef..de19d49f6f03 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.web.servlet.support;
 
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -291,7 +292,7 @@ public void saveOutputFlashMapDecodeParameters() throws Exception {
 
 	@Test // SPR-12569
 	public void flashAttributesWithQueryParamsWithSpace() throws Exception {
-		String encodedValue = URLEncoder.encode("1 2", "UTF-8");
+		String encodedValue = URLEncoder.encode("1 2", StandardCharsets.UTF_8);
 
 		FlashMap flashMap = new FlashMap();
 		flashMap.put("key", "value");

From 9197f15a306a497b3aa10c6ed48c581b3e938f58 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Wed, 10 Nov 2021 16:23:41 +0100
Subject: [PATCH 334/735] Use ByteArrayDecoder in
 DefaultClientResponse::createException

This commit changes DefaultClientResponse::createException to use
the ByteArrayDecoder, instead of converting to DataBuffers and
turning these into a byte array.

Closes gh-27666
---
 .../client/DefaultClientResponse.java         |  8 +-----
 .../client/DefaultClientResponseTests.java    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
index 0931bf214072..37f14f34ae0b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
@@ -195,13 +195,7 @@ public <T> Mono<ResponseEntity<List<T>>> toEntityList(ParameterizedTypeReference
 
 	@Override
 	public Mono<WebClientResponseException> createException() {
-		return DataBufferUtils.join(body(BodyExtractors.toDataBuffers()))
-				.map(dataBuffer -> {
-					byte[] bytes = new byte[dataBuffer.readableByteCount()];
-					dataBuffer.read(bytes);
-					DataBufferUtils.release(dataBuffer);
-					return bytes;
-				})
+		return bodyToMono(byte[].class)
 				.defaultIfEmpty(EMPTY)
 				.onErrorReturn(ex -> !(ex instanceof Error), EMPTY)
 				.map(bodyBytes -> {
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
index 0b21511feab1..f9b626a60c79 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
@@ -30,6 +30,7 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.codec.ByteArrayDecoder;
 import org.springframework.core.codec.StringDecoder;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DefaultDataBuffer;
@@ -48,6 +49,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.springframework.web.reactive.function.BodyExtractors.toMono;
@@ -328,6 +330,29 @@ public void toEntityListTypeReference() {
 		assertThat(result.getHeaders().getContentType()).isEqualTo(MediaType.TEXT_PLAIN);
 	}
 
+	@Test
+	public void createException() {
+		byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8);
+		DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes));
+		Flux<DataBuffer> body = Flux.just(dataBuffer);
+		httpHeaders.setContentType(MediaType.TEXT_PLAIN);
+		given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND);
+		given(mockResponse.getRawStatusCode()).willReturn(HttpStatus.NOT_FOUND.value());
+		given(mockResponse.getBody()).willReturn(body);
+
+		List<HttpMessageReader<?>> messageReaders = Collections.singletonList(
+				new DecoderHttpMessageReader<>(new ByteArrayDecoder()));
+		given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders);
+
+		Mono<WebClientResponseException> resultMono = defaultClientResponse.createException();
+		WebClientResponseException exception = resultMono.block();
+		assertThat(exception.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+		assertThat(exception.getMessage()).isEqualTo("404 Not Found");
+		assertThat(exception.getHeaders()).containsExactly(entry("Content-Type",
+				Collections.singletonList("text/plain")));
+		assertThat(exception.getResponseBodyAsByteArray()).isEqualTo(bytes);
+	}
+
 
 	private void mockTextPlainResponse(Flux<DataBuffer> body) {
 		httpHeaders.setContentType(MediaType.TEXT_PLAIN);

From ac694eeac82da01b6da3e017a099c3af65b55bb7 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 10 Nov 2021 19:40:39 +0100
Subject: [PATCH 335/735] Upgrade to Gradle 7.3

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a254e91..e750102e0926 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From aaf626a53725f5cc6f63424f1095ef5e02b86108 Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Thu, 11 Nov 2021 07:42:44 +0000
Subject: [PATCH 336/735] Next development version (v5.3.14-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b46dbd487055..bc834bbefe0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.13-SNAPSHOT
+version=5.3.14-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From 29572600dcb442ffdc7f95dced84e1c8d137bbc1 Mon Sep 17 00:00:00 2001
From: d4ksn <wcb_dks@163.com>
Date: Tue, 16 Nov 2021 15:01:28 +0100
Subject: [PATCH 337/735] Ensure that references > MAX_REFERENCE_SIZE are not
 processed

This commit ensures that only HTML references of length <
MAX_REFERENCE_SIZE are considered as potential references. This check is
possible because reference longer than 10 digits are out of bounds for
Integers.

Closes gh-1249
---
 .../web/util/HtmlCharacterEntityDecoder.java           |  4 ++--
 .../org/springframework/web/util/HtmlUtilsTests.java   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
index 2277edfff3ad..2d6db518b20a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ private void findNextPotentialReference(int startPosition) {
 
 			boolean isPotentialReference = (this.nextPotentialReferencePosition != -1 &&
 					this.nextSemicolonPosition != -1 &&
-					this.nextPotentialReferencePosition - this.nextSemicolonPosition < MAX_REFERENCE_SIZE);
+					this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE);
 
 			if (isPotentialReference) {
 				break;
diff --git a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
index 68d31898f54f..232a436e503c 100644
--- a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
@@ -28,7 +28,7 @@
 public class HtmlUtilsTests {
 
 	@Test
-	public void testHtmlEscape() {
+	void testHtmlEscape() {
 		String unescaped = "\"This is a quote'";
 		String escaped = HtmlUtils.htmlEscape(unescaped);
 		assertThat(escaped).isEqualTo("&quot;This is a quote&#39;");
@@ -39,14 +39,14 @@ public void testHtmlEscape() {
 	}
 
 	@Test
-	public void testHtmlUnescape() {
+	void testHtmlUnescape() {
 		String escaped = "&quot;This is a quote&#39;";
 		String unescaped = HtmlUtils.htmlUnescape(escaped);
 		assertThat(unescaped).isEqualTo("\"This is a quote'");
 	}
 
 	@Test
-	public void testEncodeIntoHtmlCharacterSet() {
+	void testEncodeIntoHtmlCharacterSet() {
 		assertThat(HtmlUtils.htmlEscape("")).as("An empty string should be converted to an empty string").isEqualTo("");
 		assertThat(HtmlUtils.htmlEscape("A sentence containing no special characters.")).as("A string containing no special characters should not be affected").isEqualTo("A sentence containing no special characters.");
 
@@ -62,7 +62,7 @@ public void testEncodeIntoHtmlCharacterSet() {
 
 	// SPR-9293
 	@Test
-	public void testEncodeIntoHtmlCharacterSetFromUtf8() {
+	void testEncodeIntoHtmlCharacterSetFromUtf8() {
 		String utf8 = ("UTF-8");
 		assertThat(HtmlUtils.htmlEscape("", utf8)).as("An empty string should be converted to an empty string").isEqualTo("");
 		assertThat(HtmlUtils.htmlEscape("A sentence containing no special characters.")).as("A string containing no special characters should not be affected").isEqualTo("A sentence containing no special characters.");
@@ -74,7 +74,7 @@ public void testEncodeIntoHtmlCharacterSetFromUtf8() {
 	}
 
 	@Test
-	public void testDecodeFromHtmlCharacterSet() {
+	void testDecodeFromHtmlCharacterSet() {
 		assertThat(HtmlUtils.htmlUnescape("")).as("An empty string should be converted to an empty string").isEqualTo("");
 		assertThat(HtmlUtils.htmlUnescape("This is a sentence containing no special characters.")).as("A string containing no special characters should not be affected").isEqualTo("This is a sentence containing no special characters.");
 

From 5593e1e40679592c16cc1ae0f707ae6d47fc1aac Mon Sep 17 00:00:00 2001
From: xixingya <2679431923@qq.com>
Date: Wed, 17 Nov 2021 18:29:54 +0800
Subject: [PATCH 338/735] Fix javax.servlet doc to jakarta.servlet (#27692)

---
 gradle/docs-dokka.gradle                      |  2 +-
 .../asciidoc/languages/dynamic-languages.adoc |  4 +--
 src/docs/asciidoc/web/webmvc.adoc             | 28 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
index dfe137d9cfe6..147c39497f2a 100644
--- a/gradle/docs-dokka.gradle
+++ b/gradle/docs-dokka.gradle
@@ -20,7 +20,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"))
 			}
 			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
+				url.set(new URL("https://javadoc.io/doc/jakarta.servlet/jakarta.servlet-api/latest/"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
diff --git a/src/docs/asciidoc/languages/dynamic-languages.adoc b/src/docs/asciidoc/languages/dynamic-languages.adoc
index ce35eb55e0fc..7362adaa7e92 100644
--- a/src/docs/asciidoc/languages/dynamic-languages.adoc
+++ b/src/docs/asciidoc/languages/dynamic-languages.adoc
@@ -686,8 +686,8 @@ by using the Groovy dynamic language:
 	import org.springframework.web.servlet.ModelAndView
 	import org.springframework.web.servlet.mvc.Controller
 
-	import javax.servlet.http.HttpServletRequest
-	import javax.servlet.http.HttpServletResponse
+	import jakarta.servlet.http.HttpServletRequest
+	import jakarta.servlet.http.HttpServletResponse
 
 	class FortuneController implements Controller {
 
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 33b49bef56a5..805a2f853c07 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -736,8 +736,8 @@ or to render a JSON response, as the following example shows:
 		@RequestMapping(path = "/error")
 		public Map<String, Object> handle(HttpServletRequest request) {
 			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("status", request.getAttribute("javax.servlet.error.status_code"));
-			map.put("reason", request.getAttribute("javax.servlet.error.message"));
+			map.put("status", request.getAttribute("jakarta.servlet.error.status_code"));
+			map.put("reason", request.getAttribute("jakarta.servlet.error.message"));
 			return map;
 		}
 	}
@@ -751,8 +751,8 @@ or to render a JSON response, as the following example shows:
 		@RequestMapping(path = ["/error"])
 		fun handle(request: HttpServletRequest): Map<String, Any> {
 			val map = HashMap<String, Any>()
-			map["status"] = request.getAttribute("javax.servlet.error.status_code")
-			map["reason"] = request.getAttribute("javax.servlet.error.message")
+			map["status"] = request.getAttribute("jakarta.servlet.error.status_code")
+			map["reason"] = request.getAttribute("jakarta.servlet.error.message")
 			return map
 		}
 	}
@@ -1932,7 +1932,7 @@ instead.
 
 `@GetMapping` (and `@RequestMapping(method=HttpMethod.GET)`) support HTTP HEAD
 transparently for request mapping. Controller methods do not need to change.
-A response wrapper, applied in `javax.servlet.http.HttpServlet`, ensures a `Content-Length`
+A response wrapper, applied in `jakarta.servlet.http.HttpServlet`, ensures a `Content-Length`
 header is set to the number of bytes written (without actually writing to the response).
 
 `@GetMapping` (and `@RequestMapping(method=HttpMethod.GET)`) are implicitly mapped to
@@ -2053,17 +2053,17 @@ and others) and is equivalent to `required=false`.
 | Generic access to request parameters and request and session attributes, without direct
   use of the Servlet API.
 
-| `javax.servlet.ServletRequest`, `javax.servlet.ServletResponse`
+| `jakarta.servlet.ServletRequest`, `jakarta.servlet.ServletResponse`
 | Choose any specific request or response type -- for example, `ServletRequest`, `HttpServletRequest`,
   or Spring's `MultipartRequest`, `MultipartHttpServletRequest`.
 
-| `javax.servlet.http.HttpSession`
+| `jakarta.servlet.http.HttpSession`
 | Enforces the presence of a session. As a consequence, such an argument is never `null`.
   Note that session access is not thread-safe. Consider setting the
   `RequestMappingHandlerAdapter` instance's `synchronizeOnSession` flag to `true` if multiple
   requests are allowed to concurrently access a session.
 
-| `javax.servlet.http.PushBuilder`
+| `jakarta.servlet.http.PushBuilder`
 | Servlet 4.0 push builder API for programmatic HTTP/2 resource pushes.
   Note that, per the Servlet specification, the injected `PushBuilder` instance can be null if the client
   does not support that HTTP/2 feature.
@@ -2927,7 +2927,7 @@ as the following example shows:
 
 For use cases that require adding or removing session attributes, consider injecting
 `org.springframework.web.context.request.WebRequest` or
-`javax.servlet.http.HttpSession` into the controller method.
+`jakarta.servlet.http.HttpSession` into the controller method.
 
 For temporary storage of model attributes in the session as part of a controller
 workflow, consider using `@SessionAttributes` as described in
@@ -3116,7 +3116,7 @@ When the `@RequestParam` annotation is declared as a `Map<String, MultipartFile>
 `MultiValueMap<String, MultipartFile>`, without a parameter name specified in the annotation,
 then the map is populated with the multipart files for each given parameter name.
 
-NOTE: With Servlet 3.0 multipart parsing, you may also declare `javax.servlet.http.Part`
+NOTE: With Servlet 3.0 multipart parsing, you may also declare `jakarta.servlet.http.Part`
 instead of Spring's `MultipartFile`, as a method argument or collection value type.
 
 You can also use multipart content as part of data binding to a
@@ -3891,11 +3891,11 @@ level, <<mvc-exceptionhandlers, HandlerExceptionResolver>> mechanism.
 | Generic access to request parameters and request and session attributes without direct
   use of the Servlet API.
 
-| `javax.servlet.ServletRequest`, `javax.servlet.ServletResponse`
+| `jakarta.servlet.ServletRequest`, `jakarta.servlet.ServletResponse`
 | Choose any specific request or response type (for example, `ServletRequest` or
   `HttpServletRequest` or Spring's `MultipartRequest` or `MultipartHttpServletRequest`).
 
-| `javax.servlet.http.HttpSession`
+| `jakarta.servlet.http.HttpSession`
 | Enforces the presence of a session. As a consequence, such an argument is never `null`. +
   Note that session access is not thread-safe. Consider setting the
   `RequestMappingHandlerAdapter` instance's `synchronizeOnSession` flag to `true` if multiple
@@ -4768,7 +4768,7 @@ The MVC configuration also exposes several options for asynchronous requests.
 
 Filter and Servlet declarations have an `asyncSupported` flag that needs to be set to `true`
 to enable asynchronous request processing. In addition, Filter mappings should be
-declared to handle the `ASYNC` `javax.servlet.DispatchType`.
+declared to handle the `ASYNC` `jakarta.servlet.DispatchType`.
 
 In Java configuration, when you use `AbstractAnnotationConfigDispatcherServletInitializer`
 to initialize the Servlet container, this is done automatically.
@@ -6097,5 +6097,5 @@ For more details, see the
 https://github.com/spring-projects/spring-framework/wiki/HTTP-2-support[HTTP/2 wiki page].
 
 The Servlet API does expose one construct related to HTTP/2. You can use the
-`javax.servlet.http.PushBuilder` to proactively push resources to clients, and it
+`jakarta.servlet.http.PushBuilder` to proactively push resources to clients, and it
 is supported as a <<mvc-ann-arguments, method argument>> to `@RequestMapping` methods.

From 555807ea9c632522240b871b025dd9448e837c58 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 17 Nov 2021 12:38:58 +0100
Subject: [PATCH 339/735] Update ServletContainerInitializer filename for
 Jakarta EE 9

Closes gh-27690
See gh-25354
---
 ...nerInitializer => jakarta.servlet.ServletContainerInitializer} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spring-web/src/main/resources/META-INF/services/{javax.servlet.ServletContainerInitializer => jakarta.servlet.ServletContainerInitializer} (100%)

diff --git a/spring-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/spring-web/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
similarity index 100%
rename from spring-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
rename to spring-web/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer

From b88ed7f4bb719a71a4a6fb9442e8dc731159c331 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 17 Nov 2021 12:39:23 +0100
Subject: [PATCH 340/735] Update API version and package references for Jakarta
 EE 9

Closes gh-27689
See gh-25354
---
 build.gradle                                  |   6 +-
 spring-aspects/spring-aspects.gradle          |   2 +-
 .../ServletServerHttpAsyncRequestControl.java |   4 +-
 .../AbstractListenerReadPublisher.java        |   2 +-
 .../AbstractListenerServerHttpResponse.java   |   3 +-
 .../AbstractListenerWriteProcessor.java       |   2 +-
 .../reactive/ServletHttpHandlerAdapter.java   |   2 +-
 .../http/server/reactive/package-info.java    |   2 +-
 .../SpringServletContainerInitializer.java    |  27 +++--
 .../web/WebApplicationInitializer.java        |  36 ++-----
 .../web/bind/annotation/RequestPart.java      |   4 +-
 .../web/context/ContextLoader.java            |   7 +-
 .../web/context/ContextLoaderListener.java    |   9 +-
 .../async/StandardServletAsyncWebRequest.java |   2 +-
 .../web/filter/DelegatingFilterProxy.java     |  20 ++--
 .../web/filter/OncePerRequestFilter.java      |  24 ++---
 .../web/filter/ShallowEtagHeaderFilter.java   |   5 +-
 .../RequestParamMethodArgumentResolver.java   |   2 +-
 .../web/multipart/MultipartFile.java          |   2 +-
 .../web/multipart/MultipartResolver.java      |   2 +-
 .../multipart/support/MultipartFilter.java    |   6 +-
 .../RequestPartServletServerHttpRequest.java  |   4 +-
 .../StandardMultipartHttpServletRequest.java  |  12 +--
 .../StandardServletMultipartResolver.java     |  10 +-
 .../util/ContentCachingRequestWrapper.java    |   2 -
 .../util/ContentCachingResponseWrapper.java   |   4 +-
 .../function/server/RouterFunctions.java      |  12 +--
 .../web/servlet/DispatcherServlet.java        |   2 +-
 .../web/servlet/FrameworkServlet.java         |   2 +-
 .../RequestPartMethodArgumentResolver.java    |   2 +-
 .../servlet/support/RequestContextUtils.java  |   4 +-
 src/docs/asciidoc/core/core-aop.adoc          |   2 +-
 src/docs/asciidoc/core/core-appendix.adoc     |   4 +-
 src/docs/asciidoc/core/core-beans.adoc        | 100 +++++++++---------
 src/docs/asciidoc/core/core-validation.adoc   |  20 ++--
 src/docs/asciidoc/data-access.adoc            |  67 +++++-------
 src/docs/asciidoc/integration.adoc            |  86 +++++++--------
 .../integration/integration-appendix.adoc     |   2 +-
 src/docs/asciidoc/overview.adoc               |  35 +++---
 src/docs/asciidoc/testing.adoc                |  28 ++---
 src/docs/asciidoc/web-reactive.adoc           |   2 +-
 src/docs/asciidoc/web/integration.adoc        |   4 +-
 src/docs/asciidoc/web/webflux.adoc            |  50 ++++-----
 src/docs/asciidoc/web/webmvc.adoc             |  34 +++---
 src/docs/asciidoc/web/websocket.adoc          |   2 +-
 45 files changed, 305 insertions(+), 354 deletions(-)

diff --git a/build.gradle b/build.gradle
index 73223bac3723..a6d25090556f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -120,8 +120,8 @@ configure(allprojects) { project ->
 			dependencySet(group: 'org.apache.tomcat', version: '10.0.12') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
-					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
+					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 				}
 			}
 			dependencySet(group: 'org.apache.tomcat.embed', version: '10.0.12') {
@@ -130,9 +130,7 @@ configure(allprojects) { project ->
 			}
 			dependencySet(group: 'io.undertow', version: '2.2.12.Final') {
 				entry 'undertow-core'
-				entry('undertow-servlet-jakartaee9') {
-					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec"
-				}
+				entry 'undertow-servlet-jakartaee9'
 				entry 'undertow-websockets-jsr-jakartaee9'
 			}
 
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 0461a8be3fb2..6b319135dba0 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -29,7 +29,7 @@ dependencies {
 	optional(project(":spring-orm"))  // for JPA exception translation support
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
 	optional("javax.cache:cache-api")  // for JCache aspect
-	optional("jakarta.transaction:jakarta.transaction-api")  // for @javax.transaction.Transactional support
+	optional("jakarta.transaction:jakarta.transaction-api")  // for @jakarta.transaction.Transactional support
 	testImplementation(project(":spring-core"))  // for CodeStyleAspect
 	testImplementation(project(":spring-test"))
 	testImplementation(testFixtures(project(":spring-context")))
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
index 7833b92bbb1d..db87ffb8e4ff 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
@@ -29,7 +29,7 @@
 import org.springframework.util.Assert;
 
 /**
- * A {@link ServerHttpAsyncRequestControl} to use on Servlet containers (Servlet 3.0+).
+ * A {@link ServerHttpAsyncRequestControl} to use on Servlet containers.
  *
  * @author Rossen Stoyanchev
  * @since 4.0
@@ -62,7 +62,7 @@ public ServletServerHttpAsyncRequestControl(ServletServerHttpRequest request, Se
 				"Async support must be enabled on a servlet and for all filters involved " +
 				"in async request processing. This is done in Java code using the Servlet API " +
 				"or by adding \"<async-supported>true</async-supported>\" to servlet and " +
-				"filter declarations in web.xml. Also you must use a Servlet 3.0+ container");
+				"filter declarations in web.xml.");
 
 		this.request = request;
 		this.response = response;
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
index 0845a9f25f04..210035f57f35 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
@@ -35,7 +35,7 @@
  * event-listener read APIs and Reactive Streams.
  *
  * <p>Specifically a base class for reading from the HTTP request body with
- * Servlet 3.1 non-blocking I/O and Undertow XNIO as well as handling incoming
+ * Servlet non-blocking I/O and Undertow XNIO as well as handling incoming
  * WebSocket messages with standard Java WebSocket (JSR-356), Jetty, and
  * Undertow.
  *
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.java
index 75c9bc7113ba..45cc2f7787f4 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.java
@@ -27,8 +27,7 @@
 import org.springframework.http.HttpHeaders;
 
 /**
- * Abstract base class for listener-based server responses, e.g. Servlet 3.1
- * and Undertow.
+ * Abstract base class for listener-based server responses.
  *
  * @author Arjen Poutsma
  * @since 5.0
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
index 92d7b41846b5..defd6d6302a6 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
@@ -34,7 +34,7 @@
  * event-listener write APIs and Reactive Streams.
  *
  * <p>Specifically a base class for writing to the HTTP response body with
- * Servlet 3.1 non-blocking I/O and Undertow XNIO as well for writing WebSocket
+ * Servlet non-blocking I/O and Undertow XNIO as well for writing WebSocket
  * messages through the Java WebSocket API (JSR-356), Jetty, and Undertow.
  *
  * @author Arjen Poutsma
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
index 0fe306911e78..8918aa568f69 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
@@ -47,7 +47,7 @@
 
 /**
  * Adapt {@link HttpHandler} to an {@link HttpServlet} using Servlet Async support
- * and Servlet 3.1 non-blocking I/O.
+ * and Servlet non-blocking I/O.
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java b/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java
index f2025bc49324..25e89a1f036b 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/package-info.java
@@ -5,7 +5,7 @@
  * {@link org.springframework.http.server.reactive.HttpHandler} for processing.
  *
  * <p>Also provides implementations adapting to different runtimes
- * including Servlet 3.1 containers, Netty + Reactor IO, and Undertow.
+ * including Servlet containers, Netty + Reactor IO, and Undertow.
  */
 @NonNullApi
 @NonNullFields
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index 6ce5e8fa83f9..3c0d69c46d81 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,21 +33,18 @@
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Servlet 3.0 {@link ServletContainerInitializer} designed to support code-based
+ * A Spring-provided {@link ServletContainerInitializer} designed to support code-based
  * configuration of the servlet container using Spring's {@link WebApplicationInitializer}
  * SPI as opposed to (or possibly in combination with) the traditional
  * {@code web.xml}-based approach.
  *
  * <h2>Mechanism of Operation</h2>
  * This class will be loaded and instantiated and have its {@link #onStartup}
- * method invoked by any Servlet 3.0-compliant container during container startup assuming
+ * method invoked by any Servlet-compliant container during container startup assuming
  * that the {@code spring-web} module JAR is present on the classpath. This occurs through
  * the JAR Services API {@link ServiceLoader#load(Class)} method detecting the
  * {@code spring-web} module's {@code META-INF/services/jakarta.servlet.ServletContainerInitializer}
- * service provider configuration file. See the
- * <a href="https://download.oracle.com/javase/6/docs/technotes/guides/jar/jar.html#Service%20Provider">
- * JAR Services API documentation</a> as well as section <em>8.2.4</em> of the Servlet 3.0
- * Final Draft specification for complete details.
+ * service provider configuration file.
  *
  * <h3>In combination with {@code web.xml}</h3>
  * A web application can choose to limit the amount of classpath scanning the Servlet
@@ -80,12 +77,12 @@
  * <h2>General Notes</h2>
  * In general, this class should be viewed as <em>supporting infrastructure</em> for
  * the more important and user-facing {@code WebApplicationInitializer} SPI. Taking
- * advantage of this container initializer is also completely <em>optional</em>: while
- * it is true that this initializer will be loaded and invoked under all Servlet 3.0+
- * runtimes, it remains the user's choice whether to make any
- * {@code WebApplicationInitializer} implementations available on the classpath. If no
- * {@code WebApplicationInitializer} types are detected, this container initializer will
- * have no effect.
+ * advantage of this container initializer is also completely <em>optional</em>:
+ * while it is true that this initializer will be loaded and invoked under all
+ * Servlet runtimes, it remains the user's choice whether to make any
+ * {@code WebApplicationInitializer} implementations available on the classpath.
+ * If no {@code WebApplicationInitializer} types are detected, this container
+ * initializer will have no effect.
  *
  * <p>Note that use of this container initializer and of {@code WebApplicationInitializer}
  * is not in any way "tied" to Spring MVC other than the fact that the types are shipped
@@ -117,8 +114,8 @@ public class SpringServletContainerInitializer implements ServletContainerInitia
 	 * Delegate the {@code ServletContext} to any {@link WebApplicationInitializer}
 	 * implementations present on the application classpath.
 	 * <p>Because this class declares @{@code HandlesTypes(WebApplicationInitializer.class)},
-	 * Servlet 3.0+ containers will automatically scan the classpath for implementations
-	 * of Spring's {@code WebApplicationInitializer} interface and provide the set of all
+	 * Servlet containers will automatically scan the classpath for implementations of
+	 * Spring's {@code WebApplicationInitializer} interface and provide the set of all
 	 * such types to the {@code webAppInitializerClasses} parameter of this method.
 	 * <p>If no {@code WebApplicationInitializer} implementations are found on the classpath,
 	 * this method is effectively a no-op. An INFO-level log message will be issued notifying
diff --git a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
index 736e5031a646..6ee0811cb8ed 100644
--- a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,13 @@
 import jakarta.servlet.ServletException;
 
 /**
- * Interface to be implemented in Servlet 3.0+ environments in order to configure the
+ * Interface to be implemented in Servlet environments in order to configure the
  * {@link ServletContext} programmatically -- as opposed to (or possibly in conjunction
  * with) the traditional {@code web.xml}-based approach.
  *
  * <p>Implementations of this SPI will be detected automatically by {@link
  * SpringServletContainerInitializer}, which itself is bootstrapped automatically
- * by any Servlet 3.0 container. See {@linkplain SpringServletContainerInitializer its
+ * by any Servlet container. See {@linkplain SpringServletContainerInitializer its
  * Javadoc} for details on this bootstrapping mechanism.
  *
  * <h2>Example</h2>
@@ -74,10 +74,10 @@
  * As an alternative to the above, you can also extend from {@link
  * org.springframework.web.servlet.support.AbstractDispatcherServletInitializer}.
  *
- * As you can see, thanks to Servlet 3.0's new {@link ServletContext#addServlet} method
- * we're actually registering an <em>instance</em> of the {@code DispatcherServlet}, and
- * this means that the {@code DispatcherServlet} can now be treated like any other object
- * -- receiving constructor injection of its application context in this case.
+ * As you can see, thanks to the Servlet container's {@link ServletContext#addServlet}
+ * method we're actually registering an <em>instance</em> of the {@code DispatcherServlet},
+ * and this means that the {@code DispatcherServlet} can now be treated like any other
+ * object -- receiving constructor injection of its application context in this case.
  *
  * <p>This style is both simpler and more concise. There is no concern for dealing with
  * init-params, etc, just normal JavaBean-style properties and constructor arguments. You
@@ -89,8 +89,8 @@
  * {@code ContextLoaderListener} and {@code DelegatingFilterProxy} all now support
  * constructor arguments. Even if a component (e.g. non-Spring, other third party) has not
  * been specifically updated for use within {@code WebApplicationInitializers}, they still
- * may be used in any case. The Servlet 3.0 {@code ServletContext} API allows for setting
- * init-params, context-params, etc programmatically.
+ * may be used in any case. The {@code ServletContext} API allows for setting init-params,
+ * context-params, etc programmatically.
  *
  * <h2>A 100% code-based approach to configuration</h2>
  * In the example above, {@code WEB-INF/web.xml} was successfully replaced with code in
@@ -149,24 +149,6 @@
  * occurs. Use of this feature is expected to be rare, as typical applications will likely
  * centralize all container initialization within a single {@code WebApplicationInitializer}.
  *
- * <h2>Caveats</h2>
- *
- * <h3>web.xml versioning</h3>
- * <p>{@code WEB-INF/web.xml} and {@code WebApplicationInitializer} use are not mutually
- * exclusive; for example, web.xml can register one servlet, and a {@code
- * WebApplicationInitializer} can register another. An initializer can even
- * <em>modify</em> registrations performed in {@code web.xml} through methods such as
- * {@link ServletContext#getServletRegistration(String)}. <strong>However, if
- * {@code WEB-INF/web.xml} is present in the application, its {@code version} attribute
- * must be set to "3.0" or greater, otherwise {@code ServletContainerInitializer}
- * bootstrapping will be ignored by the servlet container.</strong>
- *
- * <h3>Mapping to '/' under Tomcat</h3>
- * <p>Apache Tomcat maps its internal {@code DefaultServlet} to "/", and on Tomcat versions
- * &lt;= 7.0.14, this servlet mapping <em>cannot be overridden programmatically</em>.
- * 7.0.15 fixes this issue. Overriding the "/" servlet mapping has also been tested
- * successfully under GlassFish 3.1.<p>
- *
  * @author Chris Beams
  * @since 3.1
  * @see SpringServletContainerInitializer
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
index b84f09ffd72f..e7c576b73c20 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
  *
  * <p>Supported method argument types include {@link MultipartFile} in conjunction with
  * Spring's {@link MultipartResolver} abstraction, {@code jakarta.servlet.http.Part} in
- * conjunction with Servlet 3.0 multipart requests, or otherwise for any other method
+ * conjunction with Servlet multipart requests, or otherwise for any other method
  * argument, the content of the part is passed through an {@link HttpMessageConverter}
  * taking into consideration the 'Content-Type' header of the request part. This is
  * analogous to what @{@link RequestBody} does to resolve an argument based on the
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
index 45a4bb69a928..e7c3d8a0f41d 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
@@ -72,7 +72,7 @@
  *
  * <p>As of Spring 3.1, {@code ContextLoader} supports injecting the root web
  * application context via the {@link #ContextLoader(WebApplicationContext)}
- * constructor, allowing for programmatic configuration in Servlet 3.0+ environments.
+ * constructor, allowing for programmatic configuration in Servlet initializers.
  * See {@link org.springframework.web.WebApplicationInitializer} for usage examples.
  *
  * @author Juergen Hoeller
@@ -193,9 +193,8 @@ public ContextLoader() {
 
 	/**
 	 * Create a new {@code ContextLoader} with the given application context. This
-	 * constructor is useful in Servlet 3.0+ environments where instance-based
-	 * registration of listeners is possible through the {@link ServletContext#addListener}
-	 * API.
+	 * constructor is useful in Servlet initializers where instance-based registration
+	 * of listeners is possible through the {@link ServletContext#addListener} API.
 	 * <p>The context may or may not yet be {@linkplain
 	 * ConfigurableApplicationContext#refresh() refreshed}. If it (a) is an implementation
 	 * of {@link ConfigurableWebApplicationContext} and (b) has <strong>not</strong>
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
index 3f57d6764536..62518ce8659f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
  *
  * <p>As of Spring 3.1, {@code ContextLoaderListener} supports injecting the root web
  * application context via the {@link #ContextLoaderListener(WebApplicationContext)}
- * constructor, allowing for programmatic configuration in Servlet 3.0+ environments.
+ * constructor, allowing for programmatic configuration in Servlet initializers.
  * See {@link org.springframework.web.WebApplicationInitializer} for usage examples.
  *
  * @author Juergen Hoeller
@@ -58,9 +58,8 @@ public ContextLoaderListener() {
 
 	/**
 	 * Create a new {@code ContextLoaderListener} with the given application context. This
-	 * constructor is useful in Servlet 3.0+ environments where instance-based
-	 * registration of listeners is possible through the {@link jakarta.servlet.ServletContext#addListener}
-	 * API.
+	 * constructor is useful in Servlet initializers where instance-based registration of
+	 * listeners is possible through the {@link jakarta.servlet.ServletContext#addListener} API.
 	 * <p>The context may or may not yet be {@linkplain
 	 * org.springframework.context.ConfigurableApplicationContext#refresh() refreshed}. If it
 	 * (a) is an implementation of {@link ConfigurableWebApplicationContext} and
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
index 395166f84e92..bc7c6ed76275 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
@@ -32,7 +32,7 @@
 import org.springframework.web.context.request.ServletWebRequest;
 
 /**
- * A Servlet 3.0 implementation of {@link AsyncWebRequest}.
+ * A Servlet implementation of {@link AsyncWebRequest}.
  *
  * <p>The servlet and all filters involved in an async request must have async
  * support enabled using the Servlet API or by adding an
diff --git a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
index 8a85966ed353..96f773e78065 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
@@ -54,9 +54,9 @@
  * of the {@code Filter.init} and {@code Filter.destroy} lifecycle methods
  * on the target bean, letting the servlet container manage the filter lifecycle.
  *
- * <p>As of Spring 3.1, {@code DelegatingFilterProxy} has been updated to optionally accept
- * constructor parameters when using Servlet 3.0's instance-based filter registration
- * methods, usually in conjunction with Spring 3.1's
+ * <p>As of Spring 3.1, {@code DelegatingFilterProxy} has been updated to optionally
+ * accept constructor parameters when using a Servlet container's instance-based filter
+ * registration methods, usually in conjunction with Spring's
  * {@link org.springframework.web.WebApplicationInitializer} SPI. These constructors allow
  * for providing the delegate Filter bean directly, or providing the application context
  * and bean name to fetch, avoiding the need to look up the application context from the
@@ -100,8 +100,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
 
 
 	/**
-	 * Create a new {@code DelegatingFilterProxy}. For traditional (pre-Servlet 3.0) use
-	 * in {@code web.xml}.
+	 * Create a new {@code DelegatingFilterProxy}. For traditional use in {@code web.xml}.
 	 * @see #setTargetBeanName(String)
 	 */
 	public DelegatingFilterProxy() {
@@ -111,8 +110,7 @@ public DelegatingFilterProxy() {
 	 * Create a new {@code DelegatingFilterProxy} with the given {@link Filter} delegate.
 	 * Bypasses entirely the need for interacting with a Spring application context,
 	 * specifying the {@linkplain #setTargetBeanName target bean name}, etc.
-	 * <p>For use in Servlet 3.0+ environments where instance-based registration of
-	 * filters is supported.
+	 * <p>For use with instance-based registration of filters.
 	 * @param delegate the {@code Filter} instance that this proxy will delegate to and
 	 * manage the lifecycle for (must not be {@code null}).
 	 * @see #doFilter(ServletRequest, ServletResponse, FilterChain)
@@ -130,9 +128,8 @@ public DelegatingFilterProxy(Filter delegate) {
 	 * bean from the Spring {@code WebApplicationContext} found in the {@code ServletContext}
 	 * (either the 'root' application context or the context named by
 	 * {@link #setContextAttribute}).
-	 * <p>For use in Servlet 3.0+ environments where instance-based registration of
-	 * filters is supported.
-	 * <p>The target bean must implement the standard Servlet Filter.
+	 * <p>For use with instance-based registration of filters.
+	 * <p>The target bean must implement the standard Servlet Filter interface.
 	 * @param targetBeanName name of the target filter bean to look up in the Spring
 	 * application context (must not be {@code null}).
 	 * @see #findWebApplicationContext()
@@ -145,8 +142,7 @@ public DelegatingFilterProxy(String targetBeanName) {
 	/**
 	 * Create a new {@code DelegatingFilterProxy} that will retrieve the named target
 	 * bean from the given Spring {@code WebApplicationContext}.
-	 * <p>For use in Servlet 3.0+ environments where instance-based registration of
-	 * filters is supported.
+	 * <p>For use with instance-based registration of filters.
 	 * <p>The target bean must implement the standard Servlet Filter interface.
 	 * <p>The given {@code WebApplicationContext} may or may not be refreshed when passed
 	 * in. If it has not, and if the context implements {@link ConfigurableApplicationContext},
diff --git a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
index 6f505363829f..46d5163cc7c3 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
@@ -35,7 +35,7 @@
  * dispatch, on any servlet container. It provides a {@link #doFilterInternal}
  * method with HttpServletRequest and HttpServletResponse arguments.
  *
- * <p>As of Servlet 3.0, a filter may be invoked as part of a
+ * <p>A filter may be invoked as part of a
  * {@link jakarta.servlet.DispatcherType#REQUEST REQUEST} or
  * {@link jakarta.servlet.DispatcherType#ASYNC ASYNC} dispatches that occur in
  * separate threads. A filter can be configured in {@code web.xml} whether it
@@ -133,10 +133,10 @@ private boolean skipDispatch(HttpServletRequest request) {
 	}
 
 	/**
-	 * The dispatcher type {@code jakarta.servlet.DispatcherType.ASYNC} introduced
-	 * in Servlet 3.0 means a filter can be invoked in more than one thread over
-	 * the course of a single request. This method returns {@code true} if the
-	 * filter is currently executing within an asynchronous dispatch.
+	 * The dispatcher type {@code jakarta.servlet.DispatcherType.ASYNC} means a
+	 * filter can be invoked in more than one thread over the course of a single
+	 * request. This method returns {@code true} if the filter is currently
+	 * executing within an asynchronous dispatch.
 	 * @param request the current request
 	 * @since 3.2
 	 * @see WebAsyncManager#hasConcurrentResult()
@@ -186,15 +186,15 @@ protected boolean shouldNotFilter(HttpServletRequest request) throws ServletExce
 	}
 
 	/**
-	 * The dispatcher type {@code jakarta.servlet.DispatcherType.ASYNC} introduced
-	 * in Servlet 3.0 means a filter can be invoked in more than one thread
-	 * over the course of a single request. Some filters only need to filter
-	 * the initial thread (e.g. request wrapping) while others may need
-	 * to be invoked at least once in each additional thread for example for
-	 * setting up thread locals or to perform final processing at the very end.
+	 * The dispatcher type {@code jakarta.servlet.DispatcherType.ASYNC} means a
+	 * filter can be invoked in more than one thread over the course of a single
+	 * request. Some filters only need to filter the initial thread (e.g. request
+	 * wrapping) while others may need to be invoked at least once in each
+	 * additional thread for example for setting up thread locals or to perform
+	 * final processing at the very end.
 	 * <p>Note that although a filter can be mapped to handle specific dispatcher
 	 * types via {@code web.xml} or in Java through the {@code ServletContext},
-	 * servlet containers may enforce different defaults with regards to
+	 * servlet containers may enforce different defaults with respect to
 	 * dispatcher types. This flag enforces the design intent of the filter.
 	 * <p>The default return value is "true", which means the filter will not be
 	 * invoked during subsequent async dispatches. If "false", the filter will
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
index 06e164297f8f..229beacf3ee9 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,9 +46,6 @@
  * (e.g. a {@link org.springframework.web.servlet.View}) is still rendered.
  * As such, this filter only saves bandwidth, not server performance.
  *
- * <p><b>NOTE:</b> As of Spring Framework 5.0, this filter uses request/response
- * decorators built on the Servlet 3.1 API.
- *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @author Brian Clozel
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
index ec1aeb1149d6..265d8cae47aa 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
@@ -53,7 +53,7 @@
  * Resolves method arguments annotated with @{@link RequestParam}, arguments of
  * type {@link MultipartFile} in conjunction with Spring's {@link MultipartResolver}
  * abstraction, and arguments of type {@code jakarta.servlet.http.Part} in conjunction
- * with Servlet 3.0 multipart requests. This resolver can also be created in default
+ * with Servlet multipart requests. This resolver can also be created in default
  * resolution mode in which simple types (int, long, etc.) not annotated with
  * {@link RequestParam @RequestParam} are also treated as request parameters with
  * the parameter name derived from the argument name.
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
index 25790e5f3d1e..90f41da86ece 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
@@ -124,7 +124,7 @@ default Resource getResource() {
 	 * in order to work with any storage mechanism.
 	 * <p><b>NOTE:</b> Depending on the underlying provider, temporary storage
 	 * may be container-dependent, including the base directory for relative
-	 * destinations specified here (e.g. with Servlet 3.0 multipart handling).
+	 * destinations specified here (e.g. with Servlet multipart handling).
 	 * For absolute destinations, the target file may get renamed/moved from its
 	 * temporary location or newly copied, even if a temporary copy already exists.
 	 * @param dest the destination file (typically absolute)
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
index a9c79dfbb82b..1c6ab8398052 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -27,7 +27,7 @@
  * <p>Spring provides the following concrete implementation:
  * <ul>
  * <li>{@link org.springframework.web.multipart.support.StandardServletMultipartResolver}
- * for the Servlet 3.0+ Part API
+ * for the Servlet Part API
  * </ul>
  *
  * <p>There is no default resolver implementation used for Spring
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
index 276c5a05e201..e1e799dcb7c7 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@
  * the default bean name is "filterMultipartResolver".
  *
  * <p>If no MultipartResolver bean is found, this filter falls back to a default
- * MultipartResolver: {@link StandardServletMultipartResolver} for Servlet 3.0,
- * based on a multipart-config section in {@code web.xml}.
+ * MultipartResolver: {@link StandardServletMultipartResolver} for Servlet
+ * oontainers, based on a multipart-config section in {@code web.xml}.
  * Note however that at present the Servlet specification only defines how to
  * enable multipart configuration on a Servlet and as a result multipart request
  * processing is likely not possible in a Filter unless the Servlet container
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
index aa1bfca3c3fc..424ea4e1d6dd 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 /**
  * {@link ServerHttpRequest} implementation that accesses one part of a multipart
  * request. If using {@link MultipartResolver} configuration the part is accessed
- * through a {@link MultipartFile}. Or if using Servlet 3.0 multipart processing
+ * through a {@link MultipartFile}. Or if using Servlet multipart processing
  * the part is accessed through {@code ServletRequest.getPart}.
  *
  * @author Rossen Stoyanchev
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
index 7f21e5e2775b..dffdf4890a96 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 /**
- * Spring MultipartHttpServletRequest adapter, wrapping a Servlet 3.0 HttpServletRequest
+ * Spring MultipartHttpServletRequest adapter, wrapping a Servlet HttpServletRequest
  * and its Part objects. Parameters get exposed through the native request's getParameter
  * methods - without any custom processing on our side.
  *
@@ -138,7 +138,7 @@ public Enumeration<String> getParameterNames() {
 			return super.getParameterNames();
 		}
 
-		// Servlet 3.0 getParameterNames() not guaranteed to include multipart form items
+		// Servlet getParameterNames() not guaranteed to include multipart form items
 		// (e.g. on WebLogic 12) -> need to merge them here to be on the safe side
 		Set<String> paramNames = new LinkedHashSet<>();
 		Enumeration<String> paramEnum = super.getParameterNames();
@@ -158,7 +158,7 @@ public Map<String, String[]> getParameterMap() {
 			return super.getParameterMap();
 		}
 
-		// Servlet 3.0 getParameterMap() not guaranteed to include multipart form items
+		// Servlet getParameterMap() not guaranteed to include multipart form items
 		// (e.g. on WebLogic 12) -> need to merge them here to be on the safe side
 		Map<String, String[]> paramMap = new LinkedHashMap<>(super.getParameterMap());
 		for (String paramName : this.multipartParameterNames) {
@@ -202,7 +202,7 @@ public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 
 
 	/**
-	 * Spring MultipartFile adapter, wrapping a Servlet 3.0 Part object.
+	 * Spring MultipartFile adapter, wrapping a Servlet Part object.
 	 */
 	@SuppressWarnings("serial")
 	private static class StandardMultipartFile implements MultipartFile, Serializable {
@@ -255,7 +255,7 @@ public InputStream getInputStream() throws IOException {
 		public void transferTo(File dest) throws IOException, IllegalStateException {
 			this.part.write(dest.getPath());
 			if (dest.isAbsolute() && !dest.exists()) {
-				// Servlet 3.0 Part.write is not guaranteed to support absolute file paths:
+				// Servlet Part.write is not guaranteed to support absolute file paths:
 				// may translate the given path to a relative location within a temp dir
 				// (e.g. on Jetty whereas Tomcat and Undertow detect absolute paths).
 				// At least we offloaded the file from memory storage; it'll get deleted
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
index b09dac0ba20a..7888b8bde0fd 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
@@ -28,7 +28,7 @@
 
 /**
  * Standard implementation of the {@link MultipartResolver} interface,
- * based on the Servlet 3.0 {@link jakarta.servlet.http.Part} API.
+ * based on the Servlet {@link jakarta.servlet.http.Part} API.
  * To be added as "multipartResolver" bean to a Spring DispatcherServlet context,
  * without any extra configuration at the bean level (see below).
  *
@@ -38,14 +38,14 @@
  * {@linkplain #setStrictServletCompliance strict Servlet compliance}, narrowing the
  * applicability of Spring's {@link MultipartHttpServletRequest} to form data only.
  *
- * <p><b>Note:</b> In order to use Servlet 3.0 based multipart parsing,
+ * <p><b>Note:</b> In order to use Servlet container based multipart parsing,
  * you need to mark the affected servlet with a "multipart-config" section in
  * {@code web.xml}, or with a {@link jakarta.servlet.MultipartConfigElement}
  * in programmatic servlet registration, or (in case of a custom servlet class)
  * possibly with a {@link jakarta.servlet.annotation.MultipartConfig} annotation
- * on your servlet class. Configuration settings such as maximum sizes or
- * storage locations need to be applied at that servlet registration level;
- * Servlet 3.0 does not allow for them to be set at the MultipartResolver level.
+ * on your servlet class. Configuration settings such as maximum sizes or storage
+ * locations need to be applied at that servlet registration level; a Servlet
+ * container does not allow for them to be set at the MultipartResolver level.
  *
  * <pre class="code">
  * public class AppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
index 64df59fb2738..562ab5b1cca5 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
@@ -46,8 +46,6 @@
  * retrieved via {@link #getContentAsByteArray()}.
  *
  * <p>Used e.g. by {@link org.springframework.web.filter.AbstractRequestLoggingFilter}.
- * Note: As of Spring Framework 5.0, this wrapper is built on the Servlet 3.1 API.
- *
  *
  * @author Juergen Hoeller
  * @author Brian Clozel
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
index d1de91db742d..d7fdb0e0e213 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@
  * and allows this content to be retrieved via a {@link #getContentAsByteArray() byte array}.
  *
  * <p>Used e.g. by {@link org.springframework.web.filter.ShallowEtagHeaderFilter}.
- * Note: As of Spring Framework 5.0, this wrapper is built on the Servlet 3.1 API.
  *
  * @author Juergen Hoeller
  * @since 4.1.3
@@ -128,7 +127,6 @@ public void setContentLength(int len) {
 		this.contentLength = len;
 	}
 
-	// Overrides Servlet 3.1 setContentLengthLong(long) at runtime
 	@Override
 	public void setContentLengthLong(long len) {
 		if (len > Integer.MAX_VALUE) {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
index 30157153d4ae..8e52bb25002c 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,9 +50,9 @@
  * {@linkplain #nest(RequestPredicate, RouterFunction) subrouting} on an existing routing
  * function.
  *
- * <p>Additionally, this class can {@linkplain #toHttpHandler(RouterFunction) transform} a
- * {@code RouterFunction} into an {@code HttpHandler}, which can be run in Servlet 3.1+,
- * Reactor, or Undertow.
+ * <p>Additionally, this class can {@linkplain #toHttpHandler(RouterFunction) transform}
+ * a {@code RouterFunction} into an {@code HttpHandler}, which can be run in Servlet
+ * environments, Reactor, or Undertow.
  *
  * @author Arjen Poutsma
  * @since 5.0
@@ -192,7 +192,7 @@ public static RouterFunction<ServerResponse> resources(Function<ServerRequest, M
 	 * This conversion uses {@linkplain HandlerStrategies#builder() default strategies}.
 	 * <p>The returned handler can be adapted to run in
 	 * <ul>
-	 * <li>Servlet 3.1+ using the
+	 * <li>Servlet environments using the
 	 * {@link org.springframework.http.server.reactive.ServletHttpHandlerAdapter},</li>
 	 * <li>Reactor using the
 	 * {@link org.springframework.http.server.reactive.ReactorHttpHandlerAdapter},</li>
@@ -214,7 +214,7 @@ public static HttpHandler toHttpHandler(RouterFunction<?> routerFunction) {
 	 * using the given strategies.
 	 * <p>The returned {@code HttpHandler} can be adapted to run in
 	 * <ul>
-	 * <li>Servlet 3.1+ using the
+	 * <li>Servlet environments using the
 	 * {@link org.springframework.http.server.reactive.ServletHttpHandlerAdapter},</li>
 	 * <li>Reactor using the
 	 * {@link org.springframework.http.server.reactive.ReactorHttpHandlerAdapter},</li>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index ecbdac818197..df838edaaba9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -364,7 +364,7 @@ public DispatcherServlet() {
 
 	/**
 	 * Create a new {@code DispatcherServlet} with the given web application context. This
-	 * constructor is useful in Servlet 3.0+ environments where instance-based registration
+	 * constructor is useful in Servlet environments where instance-based registration
 	 * of servlets is possible through the {@link ServletContext#addServlet} API.
 	 * <p>Using this constructor indicates that the following properties / init-params
 	 * will be ignored:
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 36510490adee..36dceaad6789 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -249,7 +249,7 @@ public FrameworkServlet() {
 
 	/**
 	 * Create a new {@code FrameworkServlet} with the given web application context. This
-	 * constructor is useful in Servlet 3.0+ environments where instance-based registration
+	 * constructor is useful in Servlet environments where instance-based registration
 	 * of servlets is possible through the {@link ServletContext#addServlet} API.
 	 * <p>Using this constructor indicates that the following properties / init-params
 	 * will be ignored:
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
index d32a396c4cfe..2a59915d557f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
@@ -46,7 +46,7 @@
  * <ul>
  * <li>Annotated with @{@link RequestPart}
  * <li>Of type {@link MultipartFile} in conjunction with Spring's {@link MultipartResolver} abstraction
- * <li>Of type {@code jakarta.servlet.http.Part} in conjunction with Servlet 3.0 multipart requests
+ * <li>Of type {@code jakarta.servlet.http.Part} in conjunction with Servlet multipart requests
  * </ul>
  *
  * <p>When a parameter is annotated with {@code @RequestPart}, the content of the part is
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
index 8f7e97acb1e1..12fc89aaf0c0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,8 +105,6 @@ public static WebApplicationContext findWebApplicationContext(
 	 * that has initiated request processing, and for the global context if none
 	 * was found associated with the current request. The global context will
 	 * be found via the ServletContext or via ContextLoader's current context.
-	 * <p>NOTE: This variant requires Servlet 3.0+ and is generally recommended
-	 * for forward-looking custom user code.
 	 * @param request current HTTP request
 	 * @return the request-specific WebApplicationContext, or the global one
 	 * if no request-specific context has been found, or {@code null} if none
diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc
index 6479f329b5d9..ac9341a2909d 100644
--- a/src/docs/asciidoc/core/core-aop.adoc
+++ b/src/docs/asciidoc/core/core-aop.adoc
@@ -3570,7 +3570,7 @@ visibility may be annotated, including private methods. Annotating non-public me
 directly is the only way to get transaction demarcation for the execution of such methods.
 
 TIP: Since Spring Framework 4.2, `spring-aspects` provides a similar aspect that offers the
-exact same features for the standard `javax.transaction.Transactional` annotation. Check
+exact same features for the standard `jakarta.transaction.Transactional` annotation. Check
 `JtaAnnotationTransactionAspect` for more details.
 
 For AspectJ programmers who want to use the Spring configuration and transaction
diff --git a/src/docs/asciidoc/core/core-appendix.adoc b/src/docs/asciidoc/core/core-appendix.adoc
index 53ef8e333583..8c636366d0d9 100644
--- a/src/docs/asciidoc/core/core-appendix.adoc
+++ b/src/docs/asciidoc/core/core-appendix.adoc
@@ -125,7 +125,7 @@ The following example enumeration shows how easy injecting an enum value is:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	package javax.persistence;
+	package jakarta.persistence;
 
 	public enum PersistenceContextType {
 
@@ -136,7 +136,7 @@ The following example enumeration shows how easy injecting an enum value is:
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	package javax.persistence
+	package jakarta.persistence
 
 	enum class PersistenceContextType {
 
diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 8d701befcbcc..76de24146673 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -2835,12 +2835,11 @@ If you access scoped beans within Spring Web MVC, in effect, within a request th
 processed by the Spring `DispatcherServlet`, no special setup is necessary.
 `DispatcherServlet` already exposes all relevant state.
 
-If you use a Servlet 2.5 web container, with requests processed outside of Spring's
+If you use a Servlet web container, with requests processed outside of Spring's
 `DispatcherServlet` (for example, when using JSF or Struts), you need to register the
 `org.springframework.web.context.request.RequestContextListener` `ServletRequestListener`.
-For Servlet 3.0+, this can be done programmatically by using the `WebApplicationInitializer`
-interface. Alternatively, or for older containers, add the following declaration to
-your web application's `web.xml` file:
+This can be done programmatically by using the `WebApplicationInitializer` interface.
+Alternatively, add the following declaration to your web application's `web.xml` file:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
 ----
@@ -4598,8 +4597,8 @@ injection. Essentially, the `@Autowired` annotation provides the same capabiliti
 described in <<beans-factory-autowire>> but with more fine-grained control and wider
 applicability. Spring 2.5 also added support for JSR-250 annotations, such as
 `@PostConstruct` and `@PreDestroy`. Spring 3.0 added support for JSR-330 (Dependency
-Injection for Java) annotations contained in the `javax.inject` package such as `@Inject`
-and `@Named`. Details about those annotations can be found in the
+Injection for Java) annotations contained in the `jakarta.inject` package such as
+`@Inject` and `@Named`. Details about those annotations can be found in the
 <<beans-standard-annotations,relevant section>>.
 
 [NOTE]
@@ -4938,7 +4937,7 @@ use the same bean class). `@Order` values may influence priorities at injection
 but be aware that they do not influence singleton startup order, which is an
 orthogonal concern determined by dependency relationships and `@DependsOn` declarations.
 
-Note that the standard `javax.annotation.Priority` annotation is not available at the
+Note that the standard `jakarta.annotation.Priority` annotation is not available at the
 `@Bean` level, since it cannot be declared on methods. Its semantics can be modeled
 through `@Order` values in combination with `@Primary` on a single bean for each type.
 ====
@@ -5863,8 +5862,8 @@ attribute set to `true`, it is selected.
 === Injection with `@Resource`
 
 Spring also supports injection by using the JSR-250 `@Resource` annotation
-(`javax.annotation.Resource`) on fields or bean property setter methods.
-This is a common pattern in Java EE: for example, in JSF-managed beans and JAX-WS
+(`jakarta.annotation.Resource`) on fields or bean property setter methods.
+This is a common pattern in Jakarta EE: for example, in JSF-managed beans and JAX-WS
 endpoints. Spring supports this pattern for Spring-managed objects as well.
 
 `@Resource` takes a name attribute. By default, Spring interprets that value as
@@ -6186,8 +6185,8 @@ SpEL also enables the use of more complex data structures:
 === Using `@PostConstruct` and `@PreDestroy`
 
 The `CommonAnnotationBeanPostProcessor` not only recognizes the `@Resource` annotation
-but also the JSR-250 lifecycle annotations: `javax.annotation.PostConstruct` and
-`javax.annotation.PreDestroy`. Introduced in Spring 2.5, the support for these
+but also the JSR-250 lifecycle annotations: `jakarta.annotation.PostConstruct` and
+`jakarta.annotation.PreDestroy`. Introduced in Spring 2.5, the support for these
 annotations offers an alternative to the lifecycle callback mechanism described in
 <<beans-factory-lifecycle-initializingbean,initialization callbacks>> and
 <<beans-factory-lifecycle-disposablebean,destruction callbacks>>. Provided that the
@@ -6238,8 +6237,9 @@ For details about the effects of combining various lifecycle mechanisms, see
 Like `@Resource`, the `@PostConstruct` and `@PreDestroy` annotation types were a part
 of the standard Java libraries from JDK 6 to 8. However, the entire `javax.annotation`
 package got separated from the core Java modules in JDK 9 and eventually removed in
-JDK 11. If needed, the `javax.annotation-api` artifact needs to be obtained via Maven
-Central now, simply to be added to the application's classpath like any other library.
+JDK 11. As of Jakarta EE 9, the package lives in `jakarta.annotation` now. If needed,
+the `jakarta.annotation-api` artifact needs to be obtained via Maven Central now,
+simply to be added to the application's classpath like any other library.
 ====
 
 
@@ -7192,16 +7192,16 @@ annotations. To use them, you need to have the relevant jars in your classpath.
 
 [NOTE]
 =====
-If you use Maven, the `javax.inject` artifact is available in the standard Maven
+If you use Maven, the `jakarta.inject` artifact is available in the standard Maven
 repository (
-https://repo1.maven.org/maven2/javax/inject/javax.inject/1/[https://repo1.maven.org/maven2/javax/inject/javax.inject/1/]).
+https://repo1.maven.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/[https://repo1.maven.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/]).
 You can add the following dependency to your file pom.xml:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
 ----
 	<dependency>
-		<groupId>javax.inject</groupId>
-		<artifactId>javax.inject</artifactId>
+		<groupId>jakarta.inject</groupId>
+		<artifactId>jakarta.inject-api</artifactId>
 		<version>1</version>
 	</dependency>
 ----
@@ -7212,12 +7212,12 @@ You can add the following dependency to your file pom.xml:
 [[beans-inject-named]]
 === Dependency Injection with `@Inject` and `@Named`
 
-Instead of `@Autowired`, you can use `@javax.inject.Inject` as follows:
+Instead of `@Autowired`, you can use `@jakarta.inject.Inject` as follows:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	import javax.inject.Inject;
+	import jakarta.inject.Inject;
 
 	public class SimpleMovieLister {
 
@@ -7237,7 +7237,7 @@ Instead of `@Autowired`, you can use `@javax.inject.Inject` as follows:
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	import javax.inject.Inject
+	import jakarta.inject.Inject
 
 	class SimpleMovieLister {
 
@@ -7261,8 +7261,8 @@ preceding example:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	import javax.inject.Inject;
-	import javax.inject.Provider;
+	import jakarta.inject.Inject;
+	import jakarta.inject.Provider;
 
 	public class SimpleMovieLister {
 
@@ -7282,7 +7282,7 @@ preceding example:
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	import javax.inject.Inject
+	import jakarta.inject.Inject
 
 	class SimpleMovieLister {
 
@@ -7303,8 +7303,8 @@ you should use the `@Named` annotation, as the following example shows:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	import javax.inject.Inject;
-	import javax.inject.Named;
+	import jakarta.inject.Inject;
+	import jakarta.inject.Named;
 
 	public class SimpleMovieLister {
 
@@ -7321,8 +7321,8 @@ you should use the `@Named` annotation, as the following example shows:
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	import javax.inject.Inject
-	import javax.inject.Named
+	import jakarta.inject.Inject
+	import jakarta.inject.Named
 
 	class SimpleMovieLister {
 
@@ -7379,14 +7379,14 @@ a `required` attribute. The following pair of examples show how to use `@Inject`
 [[beans-named]]
 === `@Named` and `@ManagedBean`: Standard Equivalents to the `@Component` Annotation
 
-Instead of `@Component`, you can use `@javax.inject.Named` or `javax.annotation.ManagedBean`,
+Instead of `@Component`, you can use `@jakarta.inject.Named` or `jakarta.annotation.ManagedBean`,
 as the following example shows:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	import javax.inject.Inject;
-	import javax.inject.Named;
+	import jakarta.inject.Inject;
+	import jakarta.inject.Named;
 
 	@Named("movieListener")  // @ManagedBean("movieListener") could be used as well
 	public class SimpleMovieLister {
@@ -7404,8 +7404,8 @@ as the following example shows:
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	import javax.inject.Inject
-	import javax.inject.Named
+	import jakarta.inject.Inject
+	import jakarta.inject.Named
 
 	@Named("movieListener")  // @ManagedBean("movieListener") could be used as well
 	class SimpleMovieLister {
@@ -7423,8 +7423,8 @@ It is very common to use `@Component` without specifying a name for the componen
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	import javax.inject.Inject;
-	import javax.inject.Named;
+	import jakarta.inject.Inject;
+	import jakarta.inject.Named;
 
 	@Named
 	public class SimpleMovieLister {
@@ -7442,8 +7442,8 @@ It is very common to use `@Component` without specifying a name for the componen
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	import javax.inject.Inject
-	import javax.inject.Named
+	import jakarta.inject.Inject
+	import jakarta.inject.Named
 
 	@Named
 	class SimpleMovieLister {
@@ -7492,7 +7492,7 @@ features are not available, as the following table shows:
 [[annotations-comparison]]
 .Spring component model elements versus JSR-330 variants
 |===
-| Spring| javax.inject.*| javax.inject restrictions / comments
+| Spring| jakarta.inject.*| jakarta.inject restrictions / comments
 
 | @Autowired
 | @Inject
@@ -7507,15 +7507,15 @@ features are not available, as the following table shows:
 | The JSR-330 default scope is like Spring's `prototype`. However, in order to keep it
   consistent with Spring's general defaults, a JSR-330 bean declared in the Spring
   container is a `singleton` by default. In order to use a scope other than `singleton`,
-  you should use Spring's `@Scope` annotation. `javax.inject` also provides a
-  https://download.oracle.com/javaee/6/api/javax/inject/Scope.html[@Scope] annotation.
-  Nevertheless, this one is only intended to be used for creating your own annotations.
+  you should use Spring's `@Scope` annotation. `jakarta.inject` also provides a
+  `jakarta.inject.Scope` annotation: however, this one is only intended to be used
+  for creating custom annotations.
 
 | @Qualifier
 | @Qualifier / @Named
-| `javax.inject.Qualifier` is just a meta-annotation for building custom qualifiers.
+| `jakarta.inject.Qualifier` is just a meta-annotation for building custom qualifiers.
   Concrete `String` qualifiers (like Spring's `@Qualifier` with a value) can be associated
-  through `javax.inject.Named`.
+  through `jakarta.inject.Named`.
 
 | @Value
 | -
@@ -7531,7 +7531,7 @@ features are not available, as the following table shows:
 
 | ObjectFactory
 | Provider
-| `javax.inject.Provider` is a direct alternative to Spring's `ObjectFactory`,
+| `jakarta.inject.Provider` is a direct alternative to Spring's `ObjectFactory`,
   only with a shorter `get()` method name. It can also be used in combination with
   Spring's `@Autowired` or with non-annotated constructors and setter methods.
 |===
@@ -8124,7 +8124,7 @@ default `(inferred)` mode.
 
 You may want to do that by default for a resource that you acquire with JNDI, as its
 lifecycle is managed outside the application. In particular, make sure to always do it
-for a `DataSource`, as it is known to be problematic on Java EE application servers.
+for a `DataSource`, as it is known to be problematic on Jakarta EE application servers.
 
 The following example shows how to prevent an automatic destruction callback for a
 `DataSource`:
@@ -10178,7 +10178,7 @@ interfaces to provide additional functionality in a more application
 framework-oriented style. Many people use the `ApplicationContext` in a completely
 declarative fashion, not even creating it programmatically, but instead relying on
 support classes such as `ContextLoader` to automatically instantiate an
-`ApplicationContext` as part of the normal startup process of a Java EE web application.
+`ApplicationContext` as part of the normal startup process of a Jakarta EE web application.
 
 To enhance `BeanFactory` functionality in a more framework-oriented style, the context
 package also provides the following functionality:
@@ -11071,15 +11071,15 @@ Examples are `/WEB-INF/{asterisk}Context.xml` (for all files with names that end
 
 
 [[context-deploy-rar]]
-=== Deploying a Spring `ApplicationContext` as a Java EE RAR File
+=== Deploying a Spring `ApplicationContext` as a Jakarta EE RAR File
 
 It is possible to deploy a Spring `ApplicationContext` as a RAR file, encapsulating the
-context and all of its required bean classes and library JARs in a Java EE RAR deployment
+context and all of its required bean classes and library JARs in a Jakarta EE RAR deployment
 unit. This is the equivalent of bootstrapping a stand-alone `ApplicationContext` (only hosted
-in Java EE environment) being able to access the Java EE servers facilities. RAR deployment
+in Jakarta EE environment) being able to access the Jakarta EE servers facilities. RAR deployment
 is a more natural alternative to a scenario of deploying a headless WAR file -- in effect,
 a WAR file without any HTTP entry points that is used only for bootstrapping a Spring
-`ApplicationContext` in a Java EE environment.
+`ApplicationContext` in a Jakarta EE environment.
 
 RAR deployment is ideal for application contexts that do not need HTTP entry points but
 rather consist only of message endpoints and scheduled jobs. Beans in such a context can
@@ -11093,7 +11093,7 @@ See the javadoc of the
 {api-spring-framework}/jca/context/SpringContextResourceAdapter.html[`SpringContextResourceAdapter`]
 class for the configuration details involved in RAR deployment.
 
-For a simple deployment of a Spring ApplicationContext as a Java EE RAR file:
+For a simple deployment of a Spring ApplicationContext as a Jakarta EE RAR file:
 
 . Package
 all application classes into a RAR file (which is a standard JAR file with a different
diff --git a/src/docs/asciidoc/core/core-validation.adoc b/src/docs/asciidoc/core/core-validation.adoc
index cded5e664ee0..e316f58835dc 100644
--- a/src/docs/asciidoc/core/core-validation.adoc
+++ b/src/docs/asciidoc/core/core-validation.adoc
@@ -1738,8 +1738,8 @@ bean, keep reading.
 
 Spring provides full support for the Bean Validation API including the bootstrapping of a
 Bean Validation provider as a Spring bean. This lets you inject a
-`javax.validation.ValidatorFactory` or `javax.validation.Validator` wherever validation is
-needed in your application.
+`jakarta.validation.ValidatorFactory` or `jakarta.validation.Validator` wherever validation
+is needed in your application.
 
 You can use the `LocalValidatorFactoryBean` to configure a default Validator as a Spring
 bean, as the following example shows:
@@ -1773,18 +1773,18 @@ Validator, is expected to be present in the classpath and is automatically detec
 [[validation-beanvalidation-spring-inject]]
 ==== Injecting a Validator
 
-`LocalValidatorFactoryBean` implements both `javax.validation.ValidatorFactory` and
-`javax.validation.Validator`, as well as Spring's `org.springframework.validation.Validator`.
+`LocalValidatorFactoryBean` implements both `jakarta.validation.ValidatorFactory` and
+`jakarta.validation.Validator`, as well as Spring's `org.springframework.validation.Validator`.
 You can inject a reference to either of these interfaces into beans that need to invoke
 validation logic.
 
-You can inject a reference to `javax.validation.Validator` if you prefer to work with the Bean
+You can inject a reference to `jakarta.validation.Validator` if you prefer to work with the Bean
 Validation API directly, as the following example shows:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	import javax.validation.Validator;
+	import jakarta.validation.Validator;
 
 	@Service
 	public class MyService {
@@ -1796,7 +1796,7 @@ Validation API directly, as the following example shows:
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	import javax.validation.Validator;
+	import jakarta.validation.Validator;
 
 	@Service
 	class MyService(@Autowired private val validator: Validator)
@@ -1833,7 +1833,7 @@ requires the Spring Validation API, as the following example shows:
 Each bean validation constraint consists of two parts:
 
 * A `@Constraint` annotation that declares the constraint and its configurable properties.
-* An implementation of the `javax.validation.ConstraintValidator` interface that implements
+* An implementation of the `jakarta.validation.ConstraintValidator` interface that implements
 the constraint's behavior.
 
 To associate a declaration with an implementation, each `@Constraint` annotation
@@ -1869,7 +1869,7 @@ The following example shows a custom `@Constraint` declaration followed by an as
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	import javax.validation.ConstraintValidator;
+	import jakarta.validation.ConstraintValidator;
 
 	public class MyConstraintValidator implements ConstraintValidator {
 
@@ -1882,7 +1882,7 @@ The following example shows a custom `@Constraint` declaration followed by an as
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	import javax.validation.ConstraintValidator
+	import jakarta.validation.ConstraintValidator
 
 	class MyConstraintValidator(private val aDependency: Foo) : ConstraintValidator {
 
diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index edf4ccbe5636..1d2ff27d5942 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -58,7 +58,7 @@ and <<transaction-solutions-to-common-problems, solutions to common problems>>.
 [[transaction-motivation]]
 === Advantages of the Spring Framework's Transaction Support Model
 
-Traditionally, Java EE developers have had two choices for transaction management:
+Traditionally, EE application developers have had two choices for transaction management:
 global or local transactions, both of which have profound limitations. Global
 and local transaction management is reviewed in the next two sections, followed by a
 discussion of how the Spring Framework's transaction management support addresses the
@@ -133,7 +133,7 @@ applications. Many high-end applications use a single, highly scalable database
 Oracle RAC) instead. Stand-alone transaction managers (such as
 https://www.atomikos.com/[Atomikos Transactions] and http://jotm.objectweb.org/[JOTM])
 are other options. Of course, you may need other application server capabilities, such as
-Java Message Service (JMS) and Java EE Connector Architecture (JCA).
+Java Message Service (JMS) and Jakarta EE Connector Architecture (JCA).
 
 The Spring Framework gives you the choice of when to scale your application to a fully
 loaded application server. Gone are the days when the only alternative to using EJB
@@ -189,7 +189,7 @@ The `getTransaction(..)` method returns a `TransactionStatus` object, depending
 `TransactionDefinition` parameter. The returned `TransactionStatus` might represent a
 new transaction or can represent an existing transaction, if a matching transaction
 exists in the current call stack. The implication in this latter case is that, as with
-Java EE transaction contexts, a `TransactionStatus` is associated with a thread of
+Jakarta EE transaction contexts, a `TransactionStatus` is associated with a thread of
 execution.
 
 As of Spring Framework 5.2, Spring also provides a transaction management abstraction for
@@ -295,7 +295,7 @@ The related `PlatformTransactionManager` bean definition then has a reference to
 	</bean>
 ----
 
-If you use JTA in a Java EE container, then you use a container `DataSource`, obtained
+If you use JTA in a Jakarta EE container, then you use a container `DataSource`, obtained
 through JNDI, in conjunction with Spring's `JtaTransactionManager`. The following example
 shows what the JTA and JNDI lookup version would look like:
 
@@ -349,8 +349,8 @@ The `DataSource` bean definition is similar to the local JDBC example shown prev
 and, thus, is not shown in the following example.
 
 NOTE: If the `DataSource` (used by any non-JTA transaction manager) is looked up through
-JNDI and managed by a Java EE container, it should be non-transactional, because the
-Spring Framework (rather than the Java EE container) manages the transactions.
+JNDI and managed by a Jakarta EE container, it should be non-transactional, because the
+Spring Framework (rather than the Jakarta EE container) manages the transactions.
 
 The `txManager` bean in this case is of the `HibernateTransactionManager` type. In the
 same way as the `DataSourceTransactionManager` needs a reference to the `DataSource`, the
@@ -378,7 +378,7 @@ example declares `sessionFactory` and `txManager` beans:
 	</bean>
 ----
 
-If you use Hibernate and Java EE container-managed JTA transactions, you should use the
+If you use Hibernate and Jakarta EE container-managed JTA transactions, you should use the
 same `JtaTransactionManager` as in the previous JTA example for JDBC, as the following
 example shows. Also, it is recommended to make Hibernate aware of JTA through its
 transaction coordinator and possibly also its connection release mode configuration:
@@ -502,7 +502,7 @@ behind the scenes and you need not write any special code.
 At the very lowest level exists the `TransactionAwareDataSourceProxy` class. This is a
 proxy for a target `DataSource`, which wraps the target `DataSource` to add awareness of
 Spring-managed transactions. In this respect, it is similar to a transactional JNDI
-`DataSource`, as provided by a Java EE server.
+`DataSource`, as provided by a Jakarta EE server.
 
 You should almost never need or want to use this class, except when existing
 code must be called and passed a standard JDBC `DataSource` interface implementation. In
@@ -1297,8 +1297,8 @@ source code puts the declarations much closer to the affected code. There is not
 danger of undue coupling, because code that is meant to be used transactionally is
 almost always deployed that way anyway.
 
-NOTE: The standard `javax.transaction.Transactional` annotation is also supported as a
-drop-in replacement to Spring's own annotation. Please refer to JTA 1.2 documentation
+NOTE: The standard `jakarta.transaction.Transactional` annotation is also supported as
+a drop-in replacement to Spring's own annotation. Please refer to the JTA documentation
 for more details.
 
 The ease-of-use afforded by the use of the `@Transactional` annotation is best
@@ -2750,7 +2750,7 @@ supporting transaction suspension. See the
 {api-spring-framework}/transaction/jta/JtaTransactionManager.html[`JtaTransactionManager`]
 javadoc for details.
 
-Spring's `JtaTransactionManager` is the standard choice to run on Java EE application
+Spring's `JtaTransactionManager` is the standard choice to run on Jakarta EE application
 servers and is known to work on all common servers. Advanced functionality, such as
 transaction suspension, works on many servers as well (including GlassFish, JBoss and
 Geronimo) without any special configuration required. However, for fully supported
@@ -3108,7 +3108,7 @@ class and the related support classes. See <<jdbc-core>>, <<jdbc-advanced-jdbc>>
 
 * `datasource`: The `org.springframework.jdbc.datasource` package contains a utility class for easy
 `DataSource` access and various simple `DataSource` implementations that you can use for
-testing and running unmodified JDBC code outside of a Java EE container. A subpackage
+testing and running unmodified JDBC code outside of a Jakarta EE container. A subpackage
 named `org.springfamework.jdbc.datasource.embedded` provides support for creating
 embedded databases by using Java database engines, such as HSQL, H2, and Derby. See
 <<jdbc-connections>> and <<jdbc-embedded-database-support>>.
@@ -4249,7 +4249,7 @@ The `DriverManagerDataSource` class is an implementation of the standard `DataSo
 interface that configures a plain JDBC driver through bean properties and returns a new
 `Connection` every time.
 
-This implementation is useful for test and stand-alone environments outside of a Java EE
+This implementation is useful for test and stand-alone environments outside of a Jakarta EE
 container, either as a `DataSource` bean in a Spring IoC container or in conjunction
 with a simple JNDI environment. Pool-assuming `Connection.close()` calls
 close the connection, so any `DataSource`-aware persistence code should work. However,
@@ -4263,7 +4263,7 @@ environment, that it is almost always preferable to use such a connection pool o
 
 `TransactionAwareDataSourceProxy` is a proxy for a target `DataSource`. The proxy wraps that
 target `DataSource` to add awareness of Spring-managed transactions. In this respect, it
-is similar to a transactional JNDI `DataSource`, as provided by a Java EE server.
+is similar to a transactional JNDI `DataSource`, as provided by a Jakarta EE server.
 
 NOTE: It is rarely desirable to use this class, except when already existing code must be
 called and passed a standard JDBC `DataSource` interface implementation. In this case,
@@ -4285,7 +4285,7 @@ specified data source to the currently executing thread, potentially allowing fo
 thread connection per data source.
 
 Application code is required to retrieve the JDBC connection through
-`DataSourceUtils.getConnection(DataSource)` instead of Java EE's standard
+`DataSourceUtils.getConnection(DataSource)` instead of Jakarta EE's standard
 `DataSource.getConnection`. It throws unchecked `org.springframework.dao` exceptions
 instead of checked `SQLExceptions`. All framework classes (such as `JdbcTemplate`) use this
 strategy implicitly. If not used with this transaction manager, the lookup strategy
@@ -7809,7 +7809,7 @@ resource definitions in the container or locally within the application is mainl
 matter of the transaction strategy that you use. Compared to a Spring-defined local
 `SessionFactory`, a manually registered JNDI `SessionFactory` does not provide any
 benefits. Deploying a `SessionFactory` through Hibernate's JCA connector provides the
-added value of participating in the Java EE server's management infrastructure, but does
+added value of participating in the Jakarta EE server's management infrastructure, but does
 not add actual value beyond that.
 
 Spring's transaction support is not bound to a container. When configured with any strategy
@@ -7819,11 +7819,7 @@ local transaction support is a lightweight and powerful alternative to JTA. When
 local EJB stateless session beans to drive transactions, you depend both on an EJB
 container and on JTA, even if you access only a single database and use only stateless
 session beans to provide declarative transactions through container-managed
-transactions. Direct use of JTA programmatically also requires a Java EE environment.
-JTA does not involve only container dependencies in terms of JTA itself and of
-JNDI `DataSource` instances. For non-Spring, JTA-driven Hibernate transactions, you have
-to use the Hibernate JCA connector or extra Hibernate transaction code with the
-`TransactionManagerLookup` configured for proper JVM-level caching.
+transactions. Direct use of JTA programmatically also requires a Jakarta EE environment.
 
 Spring-driven transactions can work as well with a locally defined Hibernate
 `SessionFactory` as they do with a local JDBC `DataSource`, provided they access a
@@ -7831,12 +7827,7 @@ single database. Thus, you need only use Spring's JTA transaction strategy when
 have distributed transaction requirements. A JCA connector requires container-specific
 deployment steps, and (obviously) JCA support in the first place. This configuration
 requires more work than deploying a simple web application with local resource
-definitions and Spring-driven transactions. Also, you often need the Enterprise Edition
-of your container if you use, for example, WebLogic Express, which does not
-provide JCA. A Spring application with local resources and transactions that span one
-single database works in any Java EE web container (without JTA, JCA, or EJB), such as
-Tomcat, Resin, or even plain Jetty. Additionally, you can easily reuse such a middle
-tier in desktop applications or test suites.
+definitions and Spring-driven transactions.
 
 All things considered, if you do not use EJBs, stick with local `SessionFactory` setup
 and Spring's `HibernateTransactionManager` or `JtaTransactionManager`. You get all of
@@ -7964,11 +7955,11 @@ the JPA specification is designed.
 [[orm-jpa-setup-jndi]]
 ===== Obtaining an EntityManagerFactory from JNDI
 
-You can use this option when deploying to a Java EE server. Check your server's documentation
+You can use this option when deploying to a Jakarta EE server. Check your server's documentation
 on how to deploy a custom JPA provider into your server, allowing for a different
 provider than the server's default.
 
-Obtaining an `EntityManagerFactory` from JNDI (for example in a Java EE environment),
+Obtaining an `EntityManagerFactory` from JNDI (for example in a Jakarta EE environment),
 is a matter of changing the XML configuration, as the following example shows:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -7978,13 +7969,13 @@ is a matter of changing the XML configuration, as the following example shows:
 	</beans>
 ----
 
-This action assumes standard Java EE bootstrapping. The Java EE server auto-detects
+This action assumes standard Jakarta EE bootstrapping. The Jakarta EE server auto-detects
 persistence units (in effect, `META-INF/persistence.xml` files in application jars) and
-`persistence-unit-ref` entries in the Java EE deployment descriptor (for example,
+`persistence-unit-ref` entries in the Jakarta EE deployment descriptor (for example,
 `web.xml`) and defines environment naming context locations for those persistence units.
 
 In such a scenario, the entire persistence unit deployment, including the weaving
-(byte-code transformation) of persistent classes, is up to the Java EE server. The JDBC
+(byte-code transformation) of persistent classes, is up to the Jakarta EE server. The JDBC
 `DataSource` is defined through a JNDI location in the `META-INF/persistence.xml` file.
 `EntityManager` transactions are integrated with the server's JTA subsystem. Spring merely
 uses the obtained `EntityManagerFactory`, passing it on to application objects through
@@ -8056,12 +8047,12 @@ so on. However, it also imposes requirements on the runtime environment, such as
 availability of a weaving-capable class loader if the persistence provider demands
 byte-code transformation.
 
-This option may conflict with the built-in JPA capabilities of a Java EE server. In a
-full Java EE environment, consider obtaining your `EntityManagerFactory` from JNDI.
+This option may conflict with the built-in JPA capabilities of a Jakarta EE server. In a
+full Jakarta EE environment, consider obtaining your `EntityManagerFactory` from JNDI.
 Alternatively, specify a custom `persistenceXmlLocation` on your
 `LocalContainerEntityManagerFactoryBean` definition (for example,
 META-INF/my-persistence.xml) and include only a descriptor with that name in your
-application jar files. Because the Java EE server looks only for default
+application jar files. Because the Jakarta EE server looks only for default
 `META-INF/persistence.xml` files, it ignores such custom persistence units and, hence,
 avoids conflicts with a Spring-driven JPA setup upfront. (This applies to Resin 3.1, for
 example.)
@@ -8343,7 +8334,7 @@ protected, or private) does not matter.
 
 What about class-level annotations?
 
-On the Java EE platform, they are used for dependency declaration and not for resource
+On the Jakarta EE platform, they are used for dependency declaration and not for resource
 injection.
 ****
 
@@ -8416,13 +8407,13 @@ more details of its operations and how they are used within Spring's JPA support
 ==== Setting up JPA with JTA Transaction Management
 
 As an alternative to `JpaTransactionManager`, Spring also allows for multi-resource
-transaction coordination through JTA, either in a Java EE environment or with a
+transaction coordination through JTA, either in a Jakarta EE environment or with a
 stand-alone transaction coordinator, such as Atomikos. Aside from choosing Spring's
 `JtaTransactionManager` instead of `JpaTransactionManager`, you need to take few further
 steps:
 
 * The underlying JDBC connection pools need to be XA-capable and be integrated with
-your transaction coordinator. This is usually straightforward in a Java EE environment,
+your transaction coordinator. This is usually straightforward in a Jakarta EE environment,
 exposing a different kind of `DataSource` through JNDI. See your application server
 documentation for details. Analogously, a standalone transaction coordinator usually
 comes with special XA-integrated `DataSource` variants. Again, check its documentation.
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index c895bb9c5a4e..e619d93fde11 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -534,7 +534,7 @@ shows our class that extends `SpringBeanAutowiringSupport`:
 	 * the @Autowired annotation) is the simplest JAX-WS compliant way.
 	 *
 	 * This is the class registered with the server-side JAX-WS implementation.
-	 * In the case of a Java EE server, this would simply be defined as a servlet
+	 * In the case of a Jakarta EE server, this would simply be defined as a servlet
 	 * in web.xml, with the server detecting that this is a JAX-WS endpoint and reacting
 	 * accordingly. The servlet name usually needs to match the specified WS service name.
 	 *
@@ -564,7 +564,7 @@ shows our class that extends `SpringBeanAutowiringSupport`:
 Our `AccountServiceEndpoint` needs to run in the same web application as the Spring
 context to allow for access to Spring's facilities. This is the case by default in Java
 EE environments, using the standard contract for JAX-WS servlet endpoint deployment.
-See the various Java EE web service tutorials for details.
+See the various Jakarta EE web service tutorials for details.
 
 
 [[remoting-web-services-jaxws-export-standalone]]
@@ -631,12 +631,12 @@ Spring-managed beans, similar to the standalone mode discussed in the
 <<remoting-web-services-jaxws-export-standalone, previous section>> --
 but this time in a Servlet environment.
 
-NOTE: This is not portable in a Java EE environment. It is mainly intended for non-EE
+NOTE: This is not portable in a Jakarta EE environment. It is mainly intended for non-EE
 environments, such as Tomcat, that embed the JAX-WS RI as part of the web application.
 
 The differences from the standard style of exporting servlet-based endpoints are that
 the lifecycle of the endpoint instances themselves are managed by Spring and that there
-is only one JAX-WS servlet defined in `web.xml`. With the standard Java EE style (as
+is only one JAX-WS servlet defined in `web.xml`. With the standard Jakarta EE style (as
 shown earlier), you have one servlet definition per service endpoint, with each endpoint
 typically delegating to Spring beans (through the use of `@Autowired`, as shown earlier).
 
@@ -1444,7 +1444,7 @@ the same way as Spring's integration does for the JDBC API.
 
 JMS can be roughly divided into two areas of functionality, namely the production and
 consumption of messages. The `JmsTemplate` class is used for message production and
-synchronous message reception. For asynchronous reception similar to Java EE's
+synchronous message reception. For asynchronous reception similar to Jakarta EE's
 message-driven bean style, Spring provides a number of message-listener containers that
 you can use to create Message-Driven POJOs (MDPs). Spring also provides a declarative way
 to create message listeners.
@@ -1461,8 +1461,8 @@ the user.
 
 The `org.springframework.jms.support` package provides `JMSException` translation
 functionality. The translation converts the checked `JMSException` hierarchy to a
-mirrored hierarchy of unchecked exceptions. If any provider-specific
-subclasses of the checked `javax.jms.JMSException` exist, this exception is wrapped in the
+mirrored hierarchy of unchecked exceptions. If any provider-specific subclasses
+of the checked `jakarta.jms.JMSException` exist, this exception is wrapped in the
 unchecked `UncategorizedJmsException`.
 
 The `org.springframework.jms.support.converter` package provides a `MessageConverter`
@@ -1562,7 +1562,7 @@ vendor-specific, such as SSL configuration options.
 
 When using JMS inside an EJB, the vendor provides implementations of the JMS interfaces
 so that they can participate in declarative transaction management and perform pooling
-of connections and sessions. In order to use this implementation, Java EE containers
+of connections and sessions. In order to use this implementation, Jakarta EE containers
 typically require that you declare a JMS connection factory as a `resource-ref` inside
 the EJB or servlet deployment descriptors. To ensure the use of these features with the
 `JmsTemplate` inside an EJB, the client application should ensure that it references the
@@ -1689,7 +1689,7 @@ the standard JMS `MessageConsumer.setMessageListener()` method, and leaves it up
 provider to perform listener callbacks. This variant does not allow for dynamic adaption
 to runtime demands or for participation in externally managed transactions.
 Compatibility-wise, it stays very close to the spirit of the standalone JMS
-specification, but is generally not compatible with Java EE's JMS restrictions.
+specification, but is generally not compatible with Jakarta EE's JMS restrictions.
 
 NOTE: While `SimpleMessageListenerContainer` does not allow for participation in externally
 managed transactions, it does support native JMS transactions. To enable this feature,
@@ -1717,7 +1717,7 @@ Each received message is registered with an XA transaction when configured with
 `JtaTransactionManager`. As a result, processing may take advantage of XA transaction
 semantics. This listener container strikes a good balance between low requirements on
 the JMS provider, advanced functionality (such as participation in externally managed
-transactions), and compatibility with Java EE environments.
+transactions), and compatibility with Jakarta EE environments.
 
 You can customize the cache level of the container. Note that, when no caching is enabled,
 a new connection and a new session is created for each message reception. Combining this
@@ -1762,7 +1762,7 @@ Connection/Session pair from the specified `ConnectionFactory` to the thread.
 `JmsTemplate` automatically detects such transactional resources and operates
 on them accordingly.
 
-In a Java EE environment, the `ConnectionFactory` pools Connection and Session instances,
+In a Jakarta EE environment, the `ConnectionFactory` pools Connection and Session instances,
 so those resources are efficiently reused across transactions. In a standalone environment,
 using Spring's `SingleConnectionFactory` result in a shared JMS `Connection`, with
 each transaction having its own independent `Session`. Alternatively, consider the use
@@ -1772,7 +1772,7 @@ class.
 You can also use `JmsTemplate` with the `JtaTransactionManager` and an XA-capable JMS
 `ConnectionFactory` to perform distributed transactions. Note that this requires the
 use of a JTA transaction manager as well as a properly XA-configured ConnectionFactory.
-(Check your Java EE server's or JMS provider's documentation.)
+(Check your Jakarta EE server's or JMS provider's documentation.)
 
 Reusing code across a managed and unmanaged transactional environment can be confusing
 when using the JMS API to create a `Session` from a `Connection`. This is because the
@@ -1791,7 +1791,7 @@ transactional JMS `Session`.
 === Sending a Message
 
 The `JmsTemplate` contains many convenience methods to send a message. Send
-methods specify the destination by using a `javax.jms.Destination` object, and others
+methods specify the destination by using a `jakarta.jms.Destination` object, and others
 specify the destination by using a `String` in a JNDI lookup. The `send` method
 that takes no destination argument uses the default destination.
 
@@ -1800,11 +1800,11 @@ supplied `Session` object:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	import javax.jms.ConnectionFactory;
-	import javax.jms.JMSException;
-	import javax.jms.Message;
-	import javax.jms.Queue;
-	import javax.jms.Session;
+	import jakarta.jms.ConnectionFactory;
+	import jakarta.jms.JMSException;
+	import jakarta.jms.Message;
+	import jakarta.jms.Queue;
+	import jakarta.jms.Session;
 
 	import org.springframework.jms.core.MessageCreator;
 	import org.springframework.jms.core.JmsTemplate;
@@ -1949,17 +1949,17 @@ See <<jms-annotated-support>> for more details.
 In a fashion similar to a Message-Driven Bean (MDB) in the EJB world, the Message-Driven
 POJO (MDP) acts as a receiver for JMS messages. The one restriction (but see
 <<jms-receiving-async-message-listener-adapter>>) on an MDP is that it must implement
-the `javax.jms.MessageListener` interface. Note that, if your POJO receives messages
+the `jakarta.jms.MessageListener` interface. Note that, if your POJO receives messages
 on multiple threads, it is important to ensure that your implementation is thread-safe.
 
 The following example shows a simple implementation of an MDP:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	import javax.jms.JMSException;
-	import javax.jms.Message;
-	import javax.jms.MessageListener;
-	import javax.jms.TextMessage;
+	import jakarta.jms.JMSException;
+	import jakarta.jms.Message;
+	import jakarta.jms.MessageListener;
+	import jakarta.jms.TextMessage;
 
 	public class ExampleListener implements MessageListener {
 
@@ -2202,10 +2202,10 @@ transaction manager and use a listener container that supports externally manage
 transactions (typically, `DefaultMessageListenerContainer`).
 
 To configure a message listener container for XA transaction participation, you want
-to configure a `JtaTransactionManager` (which, by default, delegates to the Java EE
+to configure a `JtaTransactionManager` (which, by default, delegates to the Jakarta EE
 server's transaction subsystem). Note that the underlying JMS `ConnectionFactory` needs to
 be XA-capable and properly registered with your JTA transaction coordinator. (Check your
-Java EE server's configuration of JNDI resources.) This lets message reception as well
+Jakarta EE server's configuration of JNDI resources.) This lets message reception as well
 as (for example) database access be part of the same transaction (with unified commit
 semantics, at the expense of XA transaction log overhead).
 
@@ -2265,7 +2265,7 @@ Alternatively, you can set up a `JmsMessageEndpointManager` with a given
 		<property name="activationSpec">
 			<bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
 				<property name="destination" value="myQueue"/>
-				<property name="destinationType" value="javax.jms.Queue"/>
+				<property name="destinationType" value="jakarta.jms.Queue"/>
 			</bean>
 		</property>
 		<property name="messageListener" ref="myMessageListener"/>
@@ -2338,7 +2338,7 @@ bean as a JMS listener endpoint. The following example shows how to use it:
 ----
 
 The idea of the preceding example is that, whenever a message is available on the
-`javax.jms.Destination` `myDestination`, the `processOrder` method is invoked
+`jakarta.jms.Destination` `myDestination`, the `processOrder` method is invoked
 accordingly (in this case, with the content of the JMS message, similar to
 what the <<jms-receiving-async-message-listener-adapter, `MessageListenerAdapter`>>
 provides).
@@ -2462,9 +2462,9 @@ a custom header:
 
 The main elements you can inject in JMS listener endpoints are as follows:
 
-* The raw `javax.jms.Message` or any of its subclasses (provided that it
+* The raw `jakarta.jms.Message` or any of its subclasses (provided that it
   matches the incoming message type).
-* The `javax.jms.Session` for optional access to the native JMS API (for example, for sending
+* The `jakarta.jms.Session` for optional access to the native JMS API (for example, for sending
   a custom reply).
 * The `org.springframework.messaging.Message` that represents the incoming JMS message.
   Note that this message holds both the custom and the standard headers (as defined
@@ -2521,7 +2521,7 @@ annotate the payload with `@Valid` and configure the necessary validator, as the
 
 The existing support in <<jms-receiving-async-message-listener-adapter, `MessageListenerAdapter`>>
 already lets your method have a non-`void` return type. When that is the case, the result of
-the invocation is encapsulated in a `javax.jms.Message`, sent either in the destination specified
+the invocation is encapsulated in a `jakarta.jms.Message`, sent either in the destination specified
 in the `JMSReplyTo` header of the original message or in the default destination configured on
 the listener. You can now set that default destination by using the `@SendTo` annotation of the
 messaging abstraction.
@@ -2772,7 +2772,7 @@ also provides a discussion of transaction choices and message redelivery scenari
 | The cache level for JMS resources: `none`, `connection`, `session`, `consumer`, or
   `auto`. By default (`auto`), the cache level is effectively `consumer`, unless
   an external transaction manager has been specified -- in which case, the effective
-  default will be `none` (assuming Java EE-style transaction management, where the given
+  default will be `none` (assuming Jakarta EE-style transaction management, where the given
   ConnectionFactory is an XA-aware pool).
 
 | `acknowledge`
@@ -2884,7 +2884,7 @@ The following table describes the available configuration options for the JCA va
 
 | `transaction-manager`
 | A reference to a Spring `JtaTransactionManager` or a
-  `javax.transaction.TransactionManager` for kicking off an XA transaction for each
+  `jakarta.transaction.TransactionManager` for kicking off an XA transaction for each
   incoming message. If not specified, native acknowledging is used (see the
   `acknowledge` attribute).
 
@@ -4427,12 +4427,12 @@ callback interface. In the following example, the `mailSender` property is of ty
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	import javax.mail.Message;
-	import javax.mail.MessagingException;
-	import javax.mail.internet.InternetAddress;
-	import javax.mail.internet.MimeMessage;
+	import jakarta.mail.Message;
+	import jakarta.mail.MessagingException;
+	import jakarta.mail.internet.InternetAddress;
+	import jakarta.mail.internet.MimeMessage;
 
-	import javax.mail.internet.MimeMessage;
+	import jakarta.mail.internet.MimeMessage;
 	import org.springframework.mail.MailException;
 	import org.springframework.mail.javamail.JavaMailSender;
 	import org.springframework.mail.javamail.MimeMessagePreparator;
@@ -4604,7 +4604,7 @@ tasks with the `TaskExecutor` and `TaskScheduler` interfaces, respectively. Spri
 features implementations of those interfaces that support thread pools or delegation to
 CommonJ within an application server environment. Ultimately, the use of these
 implementations behind the common interfaces abstracts away the differences between Java
-SE 5, Java SE 6, and Java EE environments.
+SE 5, Java SE 6, and Jakarta EE environments.
 
 Spring also features integration classes to support scheduling with the `Timer`
 (part of the JDK since 1.3) and the Quartz Scheduler ( https://www.quartz-scheduler.org/[]).
@@ -4622,7 +4622,7 @@ operation).
 Executors are the JDK name for the concept of thread pools. The "`executor`" naming is
 due to the fact that there is no guarantee that the underlying implementation is
 actually a pool. An executor may be single-threaded or even synchronous. Spring's
-abstraction hides implementation details between the Java SE and Java EE environments.
+abstraction hides implementation details between the Java SE and Jakarta EE environments.
 
 Spring's `TaskExecutor` interface is identical to the `java.util.concurrent.Executor`
 interface. In fact, originally, its primary reason for existence was to abstract away
@@ -4664,13 +4664,9 @@ The variants that Spring provides are as follows:
   configuring a `java.util.concurrent.ThreadPoolExecutor` and wraps it in a `TaskExecutor`.
   If you need to adapt to a different kind of `java.util.concurrent.Executor`, we
   recommend that you use a `ConcurrentTaskExecutor` instead.
-* `WorkManagerTaskExecutor`:
-  This implementation uses a CommonJ `WorkManager` as its backing service provider
-  and is the central convenience class for setting up CommonJ-based thread pool
-  integration on WebLogic or WebSphere within a Spring application context.
 * `DefaultManagedTaskExecutor`:
   This implementation uses a JNDI-obtained `ManagedExecutorService` in a JSR-236
-  compatible runtime environment (such as a Java EE 7+ application server),
+  compatible runtime environment (such as a Jakarta EE application server),
   replacing a CommonJ WorkManager for that purpose.
 
 
@@ -4850,7 +4846,7 @@ application server environment where threads should not be created directly by t
 application itself. For such scenarios, Spring provides a `TimerManagerTaskScheduler`
 that delegates to a CommonJ `TimerManager` on WebLogic or WebSphere as well as a more recent
 `DefaultManagedTaskScheduler` that delegates to a JSR-236 `ManagedScheduledExecutorService`
-in a Java EE 7+ environment. Both are typically configured with a JNDI lookup.
+in a Jakarta EE environment. Both are typically configured with a JNDI lookup.
 
 Whenever external thread management is not a requirement, a simpler alternative is
 a local `ScheduledExecutorService` setup within the application, which can be adapted
diff --git a/src/docs/asciidoc/integration/integration-appendix.adoc b/src/docs/asciidoc/integration/integration-appendix.adoc
index a59c3b541bc4..6ec82b2db369 100644
--- a/src/docs/asciidoc/integration/integration-appendix.adoc
+++ b/src/docs/asciidoc/integration/integration-appendix.adoc
@@ -13,7 +13,7 @@ This part of the appendix lists XML schemas related to integration technologies.
 [[xsd-schemas-jee]]
 === The `jee` Schema
 
-The `jee` elements deal with issues related to Java EE (Java Enterprise Edition) configuration,
+The `jee` elements deal with issues related to Jakarta EE (Enterprise Edition) configuration,
 such as looking up a JNDI object and defining EJB references.
 
 To use the elements in the `jee` schema, you need to have the following preamble at the top
diff --git a/src/docs/asciidoc/overview.adoc b/src/docs/asciidoc/overview.adoc
index fb24ceef6352..79b48cb0e32d 100644
--- a/src/docs/asciidoc/overview.adoc
+++ b/src/docs/asciidoc/overview.adoc
@@ -56,9 +56,10 @@ Of course, Spring's framework jars keep working fine on the classpath on both JD
 
 Spring came into being in 2003 as a response to the complexity of the early
 https://en.wikipedia.org/wiki/Java_Platform,_Enterprise_Edition[J2EE] specifications.
-While some consider Java EE and Spring to be in competition, Spring is, in fact, complementary
-to Java EE. The Spring programming model does not embrace the Java EE platform specification;
-rather, it integrates with carefully selected individual specifications from the EE umbrella:
+While some consider Java EE and its modern-day successor Jakarta EE to be in
+competition with Spring, they are in fact complementary. The Spring programming
+model does not embrace the Jakarta EE platform specification; rather, it integrates
+with carefully selected individual specifications from the traditional EE umbrella:
 
 * Servlet API (https://jcp.org/en/jsr/detail?id=340[JSR 340])
 * WebSocket API (https://www.jcp.org/en/jsr/detail?id=356[JSR 356])
@@ -71,19 +72,21 @@ rather, it integrates with carefully selected individual specifications from the
 
 The Spring Framework also supports the Dependency Injection
 (https://www.jcp.org/en/jsr/detail?id=330[JSR 330]) and Common Annotations
-(https://jcp.org/en/jsr/detail?id=250[JSR 250]) specifications, which application developers
-may choose to use instead of the Spring-specific mechanisms provided by the Spring Framework.
-
-As of Spring Framework 5.0, Spring requires the Java EE 7 level (e.g. Servlet 3.1+, JPA 2.1+)
-as a minimum - while at the same time providing out-of-the-box integration with newer APIs
-at the Java EE 8 level (e.g. Servlet 4.0, JSON Binding API) when encountered at runtime.
-This keeps Spring fully compatible with e.g. Tomcat 8 and 9, WebSphere 9, and JBoss EAP 7.
-
-Over time, the role of Java EE in application development has evolved. In the early days of
-Java EE and Spring, applications were created to be deployed to an application server.
-Today, with the help of Spring Boot, applications are created in a devops- and
-cloud-friendly way, with the Servlet container embedded and trivial to change.
-As of Spring Framework 5, a WebFlux application does not even use the Servlet API directly
+(https://jcp.org/en/jsr/detail?id=250[JSR 250]) specifications, which application
+developers may choose to use instead of the Spring-specific mechanisms provided
+by the Spring Framework. Originally, those were based on common `javax` packages.
+
+As of Spring Framework 6.0, Spring has been upgraded to the Jakarta EE 9 level
+(e.g. Servlet 5.0+, JPA 3.0+), based on the `jakarta` namespace instead of the
+traditional `javax` packages. With EE 9 as the minimum, Spring is prepared to
+provide out-of-the-box support for further API evolution in EE 10+ once available.
+This makes Spring Framework 6 fully compatible with e.g. Tomcat 10+ and Jetty 11+.
+
+Over time, the role of Java/Jakarta EE in application development has evolved. In the
+early days of J2EE and Spring, applications were created to be deployed to an application
+server. Today, with the help of Spring Boot, applications are created in a devops- and
+cloud-friendly way, with the Servlet container embedded and trivial to change. As of
+Spring Framework 5, a WebFlux application does not even use the Servlet API directly
 and can run on servers (such as Netty) that are not Servlet containers.
 
 Spring continues to innovate and to evolve. Beyond the Spring Framework, there are other
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 6c03726905f5..d0e835f67c37 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -32,8 +32,8 @@ manual.)
 == Unit Testing
 
 Dependency injection should make your code less dependent on the container than it would
-be with traditional Java EE development. The POJOs that make up your application should
-be testable in JUnit or TestNG tests, with objects instantiated by using the `new`
+be with traditional J2EE / Java EE development. The POJOs that make up your application
+should be testable in JUnit or TestNG tests, with objects instantiated by using the `new`
 operator, without Spring or any other container. You can use <<mock-objects, mock objects>>
 (in conjunction with other valuable testing techniques) to test your code in isolation.
 If you follow the architecture recommendations for Spring, the resulting clean layering
@@ -78,7 +78,7 @@ out-of-container tests for code that depends on environment-specific properties.
 The `org.springframework.mock.jndi` package contains a partial implementation of the JNDI
 SPI, which you can use to set up a simple JNDI environment for test suites or stand-alone
 applications. If, for example, JDBC `DataSource` instances get bound to the same JNDI
-names in test code as they do in a Java EE container, you can reuse both application code
+names in test code as they do in a Jakarta EE container, you can reuse both application code
 and configuration in testing scenarios without modification.
 
 WARNING: The mock JNDI support in the `org.springframework.mock.jndi` package is
@@ -1476,12 +1476,12 @@ and can be used anywhere in the Spring Framework.
 * `@Autowired`
 * `@Qualifier`
 * `@Value`
-* `@Resource` (javax.annotation) if JSR-250 is present
-* `@ManagedBean` (javax.annotation) if JSR-250 is present
-* `@Inject` (javax.inject) if JSR-330 is present
-* `@Named` (javax.inject) if JSR-330 is present
-* `@PersistenceContext` (javax.persistence) if JPA is present
-* `@PersistenceUnit` (javax.persistence) if JPA is present
+* `@Resource` (jakarta.annotation) if JSR-250 is present
+* `@ManagedBean` (jakarta.annotation) if JSR-250 is present
+* `@Inject` (jakarta.inject) if JSR-330 is present
+* `@Named` (jakarta.inject) if JSR-330 is present
+* `@PersistenceContext` (jakarta.persistence) if JPA is present
+* `@PersistenceUnit` (jakarta.persistence) if JPA is present
 * `@Required`
 * `@Transactional` (org.springframework.transaction.annotation)
   _with <<testcontext-tx-attribute-support, limited attribute support>>_
@@ -3088,7 +3088,7 @@ The term "`component class`" can refer to any of the following:
 
 * A class annotated with `@Configuration`.
 * A component (that is, a class annotated with `@Component`, `@Service`, `@Repository`, or other stereotype annotations).
-* A JSR-330 compliant class that is annotated with `javax.inject` annotations.
+* A JSR-330 compliant class that is annotated with `jakarta.inject` annotations.
 * Any class that contains `@Bean`-methods.
 * Any other class that is intended to be registered as a Spring component (i.e., a Spring
   bean in the `ApplicationContext`), potentially taking advantage of automatic autowiring
@@ -7424,10 +7424,10 @@ If using MockMvc through the <<webtestclient>>, there is nothing special to do t
 asynchronous requests work as the `WebTestClient` automatically does what is described
 in this section.
 
-Servlet 3.0 asynchronous requests,
-<<web.adoc#mvc-ann-async,supported in Spring MVC>>, work by exiting the Servlet container
-thread and allowing the application to compute the response asynchronously, after which
-an async dispatch is made to complete processing on a Servlet container thread.
+Servlet asynchronous requests, <<web.adoc#mvc-ann-async,supported in Spring MVC>>,
+work by exiting the Servlet container thread and allowing the application to compute
+the response asynchronously, after which an async dispatch is made to complete
+processing on a Servlet container thread.
 
 In Spring MVC Test, async requests can be tested by asserting the produced async value
 first, then manually performing the async dispatch, and finally verifying the response.
diff --git a/src/docs/asciidoc/web-reactive.adoc b/src/docs/asciidoc/web-reactive.adoc
index c6bf754011f1..7e170bbd1815 100644
--- a/src/docs/asciidoc/web-reactive.adoc
+++ b/src/docs/asciidoc/web-reactive.adoc
@@ -7,7 +7,7 @@
 
 This part of the documentation covers support for reactive-stack web applications built
 on a https://www.reactive-streams.org/[Reactive Streams] API to run on non-blocking
-servers, such as Netty, Undertow, and Servlet 3.1+ containers. Individual chapters cover
+servers, such as Netty, Undertow, and Servlet containers. Individual chapters cover
 the <<webflux.adoc#webflux, Spring WebFlux>> framework,
 the reactive <<webflux-client, `WebClient`>>, support for <<webflux-test, testing>>,
 and <<webflux-reactive-libraries, reactive libraries>>. For Servlet-stack web applications,
diff --git a/src/docs/asciidoc/web/integration.adoc b/src/docs/asciidoc/web/integration.adoc
index 62d0ef27516b..42c53776662a 100644
--- a/src/docs/asciidoc/web/integration.adoc
+++ b/src/docs/asciidoc/web/integration.adoc
@@ -36,7 +36,7 @@ context`"). This section details how you can configure a Spring container (a
 
 Moving on to specifics, all you need to do is declare a
 {api-spring-framework}/web/context/ContextLoaderListener.html[`ContextLoaderListener`]
-in the standard Java EE servlet `web.xml` file of your web application and add a
+in the standard Jakarta EE servlet `web.xml` file of your web application and add a
 `contextConfigLocation`<context-param/> section (in the same file) that defines which
 set of Spring XML configuration files to load.
 
@@ -102,7 +102,7 @@ on its specific integration strategies.
 == JSF
 
 JavaServer Faces (JSF) is the JCP's standard component-based, event-driven web
-user interface framework. It is an official part of the Java EE umbrella but also
+user interface framework. It is an official part of the Jakarta EE umbrella but also
 individually usable, e.g. through embedding Mojarra or MyFaces within Tomcat.
 
 Please note that recent versions of JSF became closely tied to CDI infrastructure
diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc
index 1cc302102126..ac10e816b80b 100644
--- a/src/docs/asciidoc/web/webflux.adoc
+++ b/src/docs/asciidoc/web/webflux.adoc
@@ -6,7 +6,7 @@ The original web framework included in the Spring Framework, Spring Web MVC, was
 purpose-built for the Servlet API and Servlet containers. The reactive-stack web framework,
 Spring WebFlux, was added later in version 5.0. It is fully non-blocking, supports
 https://www.reactive-streams.org/[Reactive Streams] back pressure, and runs on such servers as
-Netty, Undertow, and Servlet 3.1+ containers.
+Netty, Undertow, and Servlet containers.
 
 Both web frameworks mirror the names of their source modules
 ({spring-framework-main-code}/spring-webmvc[spring-webmvc] and
@@ -23,16 +23,16 @@ in some cases, both -- for example, Spring MVC controllers with the reactive `We
 Why was Spring WebFlux created?
 
 Part of the answer is the need for a non-blocking web stack to handle concurrency with a
-small number of threads and scale with fewer hardware resources. Servlet 3.1 did provide
-an API for non-blocking I/O. However, using it leads away from the rest of the Servlet API,
-where contracts are synchronous (`Filter`, `Servlet`) or blocking (`getParameter`,
-`getPart`). This was the motivation for a new common API to serve as a foundation across
-any non-blocking runtime. That is important because of servers (such as Netty) that are
-well-established in the async, non-blocking space.
+small number of threads and scale with fewer hardware resources. Servlet non-blocking I/O
+leads away from the rest of the Servlet API, where contracts are synchronous
+(`Filter`, `Servlet`) or blocking (`getParameter`, `getPart`). This was the motivation
+for a new common API to serve as a foundation across any non-blocking runtime. That is
+important because of servers (such as Netty) that are well-established in the async,
+non-blocking space.
 
 The other part of the answer is functional programming. Much as the addition of annotations
-in Java 5 created opportunities (such as annotated REST controllers or unit tests), the addition
-of lambda expressions in Java 8 created opportunities for functional APIs in Java.
+in Java 5 created opportunities (such as annotated REST controllers or unit tests), the
+addition of lambda expressions in Java 8 created opportunities for functional APIs in Java.
 This is a boon for non-blocking applications and continuation-style APIs (as popularized
 by `CompletableFuture` and http://reactivex.io/[ReactiveX]) that allow declarative
 composition of asynchronous logic. At the programming-model level, Java 8 enabled Spring
@@ -149,7 +149,7 @@ You have maximum choice of libraries, since, historically, most are blocking.
 
 * If you are already shopping for a non-blocking web stack, Spring WebFlux offers the same
 execution model benefits as others in this space and also provides a choice of servers
-(Netty, Tomcat, Jetty, Undertow, and Servlet 3.1+ containers), a choice of programming models
+(Netty, Tomcat, Jetty, Undertow, and Servlet containers), a choice of programming models
 (annotated controllers and functional web endpoints), and a choice of reactive libraries
 (Reactor, RxJava, or other).
 
@@ -187,7 +187,7 @@ unsure what benefits to look for, start by learning about how non-blocking I/O w
 [[webflux-server-choice]]
 === Servers
 
-Spring WebFlux is supported on Tomcat, Jetty, Servlet 3.1+ containers, as well as on
+Spring WebFlux is supported on Tomcat, Jetty, Servlet containers, as well as on
 non-Servlet runtimes such as Netty and Undertow. All servers are adapted to a low-level,
 <<webflux-httphandler, common API>> so that higher-level
 <<webflux-programming-models, programming models>> can be supported across servers.
@@ -205,7 +205,7 @@ used in the asynchronous, non-blocking space and lets a client and a server shar
 Tomcat and Jetty can be used with both Spring MVC and WebFlux. Keep in mind, however, that
 the way they are used is very different. Spring MVC relies on Servlet blocking I/O and
 lets applications use the Servlet API directly if they need to. Spring WebFlux
-relies on Servlet 3.1 non-blocking I/O and uses the Servlet API behind a low-level
+relies on Servlet non-blocking I/O and uses the Servlet API behind a low-level
 adapter. It is not exposed for direct use.
 
 For Undertow, Spring WebFlux uses Undertow APIs directly without the Servlet API.
@@ -305,7 +305,7 @@ applications:
 * For server request processing there are two levels of support.
 ** <<webflux-httphandler, HttpHandler>>: Basic contract for HTTP request handling with
 non-blocking I/O and Reactive Streams back pressure, along with adapters for Reactor Netty,
-Undertow, Tomcat, Jetty, and any Servlet 3.1+ container.
+Undertow, Tomcat, Jetty, and any Servlet container.
 ** <<webflux-web-handler-api>>: Slightly higher level, general-purpose web API for
 request handling, on top of which concrete programming models such as annotated
 controllers and functional endpoints are built.
@@ -344,16 +344,16 @@ The following table describes the supported server APIs:
 | spring-web: Undertow to Reactive Streams bridge
 
 | Tomcat
-| Servlet 3.1 non-blocking I/O; Tomcat API to read and write ByteBuffers vs byte[]
-| spring-web: Servlet 3.1 non-blocking I/O to Reactive Streams bridge
+| Servlet non-blocking I/O; Tomcat API to read and write ByteBuffers vs byte[]
+| spring-web: Servlet non-blocking I/O to Reactive Streams bridge
 
 | Jetty
-| Servlet 3.1 non-blocking I/O; Jetty API to write ByteBuffers vs byte[]
-| spring-web: Servlet 3.1 non-blocking I/O to Reactive Streams bridge
+| Servlet non-blocking I/O; Jetty API to write ByteBuffers vs byte[]
+| spring-web: Servlet non-blocking I/O to Reactive Streams bridge
 
-| Servlet 3.1 container
-| Servlet 3.1 non-blocking I/O
-| spring-web: Servlet 3.1 non-blocking I/O to Reactive Streams bridge
+| Servlet container
+| Servlet non-blocking I/O
+| spring-web: Servlet non-blocking I/O to Reactive Streams bridge
 |===
 
 The following table describes server dependencies (also see
@@ -484,9 +484,9 @@ The code snippets below show using the `HttpHandler` adapters with each server A
 	server.start()
 ----
 
-*Servlet 3.1+ Container*
+*Servlet Container*
 
-To deploy as a WAR to any Servlet 3.1+ container, you can extend and include
+To deploy as a WAR to any Servlet container, you can extend and include
 {api-spring-framework}/web/server/adapter/AbstractReactiveWebInitializer.html[`AbstractReactiveWebInitializer`]
 in the WAR. That class wraps an `HttpHandler` with `ServletHttpHandlerAdapter` and registers
 that as a `Servlet`.
@@ -2400,7 +2400,7 @@ immediately next to the `@ModelAttribute`, as the following example shows:
 <1> Adding a `BindingResult`.
 
 You can automatically apply validation after data binding by adding the
-`javax.validation.Valid` annotation or Spring's `@Validated` annotation (see also
+`jakarta.validation.Valid` annotation or Spring's `@Validated` annotation (see also
 <<core.adoc#validation-beanvalidation, Bean Validation>> and
 <<core.adoc#validation, Spring validation>>). The following example uses the `@Valid` annotation:
 
@@ -2747,7 +2747,7 @@ you can declare a concrete target `Object`, instead of `Part`, as the following
 ----
 <1> Using `@RequestPart` to get the metadata.
 
-You can use `@RequestPart` in combination with `javax.validation.Valid` or Spring's
+You can use `@RequestPart` in combination with `jakarta.validation.Valid` or Spring's
 `@Validated` annotation, which causes Standard Bean Validation to be applied. Validation
 errors lead to a `WebExchangeBindException` that results in a 400 (BAD_REQUEST) response.
 The exception contains a `BindingResult` with the error details and can also be handled
@@ -2869,7 +2869,7 @@ and fully non-blocking reading and (client-to-server) streaming.
 You can use the <<webflux-config-message-codecs>> option of the <<webflux-config>> to
 configure or customize message readers.
 
-You can use `@RequestBody` in combination with `javax.validation.Valid` or Spring's
+You can use `@RequestBody` in combination with `jakarta.validation.Valid` or Spring's
 `@Validated` annotation, which causes Standard Bean Validation to be applied. Validation
 errors cause a `WebExchangeBindException`, which results in a 400 (BAD_REQUEST) response.
 The exception contains a `BindingResult` with error details and can be handled in the
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 805a2f853c07..e0237b498d7a 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -14,7 +14,7 @@ whose name, "`Spring WebFlux,`" is also based on its source module
 This section covers Spring Web MVC. The <<web-reactive.adoc#spring-web-reactive, next section>>
 covers Spring WebFlux.
 
-For baseline information and compatibility with Servlet container and Java EE version
+For baseline information and compatibility with Servlet container and Jakarta EE version
 ranges, see the Spring Framework
 https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Versions[Wiki].
 
@@ -315,9 +315,9 @@ provides many extra convenient options.
 [[mvc-container-config]]
 === Servlet Config
 
-In a Servlet 3.0+ environment, you have the option of configuring the Servlet container
-programmatically as an alternative or in combination with a `web.xml` file. The following
-example registers a `DispatcherServlet`:
+In a Servlet environment, you have the option of configuring the Servlet container
+programmatically as an alternative or in combination with a `web.xml` file.
+The following example registers a `DispatcherServlet`:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -1132,7 +1132,7 @@ request with a simple request parameter.
 `MultipartResolver` from the `org.springframework.web.multipart` package is a strategy
 for parsing multipart requests including file uploads. There is one implementation
 based on https://commons.apache.org/proper/commons-fileupload[Commons FileUpload] and
-another based on Servlet 3.0 multipart request parsing.
+another based on Servlet multipart request parsing.
 
 To enable multipart handling, you need to declare a `MultipartResolver` bean in your
 `DispatcherServlet` Spring configuration with a name of `multipartResolver`.
@@ -1163,9 +1163,9 @@ javadoc for details and configuration options.
 
 
 [[mvc-multipart-resolver-standard]]
-==== Servlet 3.0
+==== Servlet Multipart Parsing
 
-Servlet 3.0 multipart parsing needs to be enabled through Servlet container configuration.
+Servlet multipart parsing needs to be enabled through Servlet container configuration.
 To do so:
 
 * In Java, set a `MultipartConfigElement` on the Servlet registration.
@@ -1205,7 +1205,7 @@ The following example shows how to set a `MultipartConfigElement` on the Servlet
 	}
 ----
 
-Once the Servlet 3.0 configuration is in place, you can add a bean of type
+Once the Servlet multipart configuration is in place, you can add a bean of type
 `StandardServletMultipartResolver` with a name of `multipartResolver`.
 
 [NOTE]
@@ -2777,7 +2777,7 @@ alternatively, set `@ModelAttribute(binding=false)`, as the following example sh
 <1> Setting `@ModelAttribute(binding=false)`.
 
 You can automatically apply validation after data binding by adding the
-`javax.validation.Valid` annotation or Spring's `@Validated` annotation
+`jakarta.validation.Valid` annotation or Spring's `@Validated` annotation
 (<<core.adoc#validation-beanvalidation, Bean Validation>> and
 <<core.adoc#validation, Spring validation>>). The following example shows how to do so:
 
@@ -3116,7 +3116,7 @@ When the `@RequestParam` annotation is declared as a `Map<String, MultipartFile>
 `MultiValueMap<String, MultipartFile>`, without a parameter name specified in the annotation,
 then the map is populated with the multipart files for each given parameter name.
 
-NOTE: With Servlet 3.0 multipart parsing, you may also declare `jakarta.servlet.http.Part`
+NOTE: With Servlet multipart parsing, you may also declare `jakarta.servlet.http.Part`
 instead of Spring's `MultipartFile`, as a method argument or collection value type.
 
 You can also use multipart content as part of data binding to a
@@ -3218,7 +3218,7 @@ probably want it deserialized from JSON (similar to `@RequestBody`). Use the
 	}
 ----
 
-You can use `@RequestPart` in combination with `javax.validation.Valid` or use Spring's
+You can use `@RequestPart` in combination with `jakarta.validation.Valid` or use Spring's
 `@Validated` annotation, both of which cause Standard Bean Validation to be applied.
 By default, validation errors cause a `MethodArgumentNotValidException`, which is turned
 into a 400 (BAD_REQUEST) response. Alternatively, you can handle validation errors locally
@@ -3275,7 +3275,7 @@ The following example uses a `@RequestBody` argument:
 You can use the <<mvc-config-message-converters>> option of the <<mvc-config>> to
 configure or customize message conversion.
 
-You can use `@RequestBody` in combination with `javax.validation.Valid` or Spring's
+You can use `@RequestBody` in combination with `jakarta.validation.Valid` or Spring's
 `@Validated` annotation, both of which cause Standard Bean Validation to be applied.
 By default, validation errors cause a `MethodArgumentNotValidException`, which is turned
 into a 400 (BAD_REQUEST) response. Alternatively, you can handle validation errors locally
@@ -4350,7 +4350,7 @@ capital letters of the class and the method name (for example, the `getThing` me
 == Asynchronous Requests
 [.small]#<<mvc-ann-async-vs-webflux, Compared to WebFlux>>#
 
-Spring MVC has an extensive integration with Servlet 3.0 asynchronous request
+Spring MVC has an extensive integration with Servlet asynchronous request
 <<mvc-ann-async-processing,processing>>:
 
 * <<mvc-ann-async-deferredresult, `DeferredResult`>> and <<mvc-ann-async-callable, `Callable`>>
@@ -4524,10 +4524,10 @@ methods for timeout and completion callbacks.
 ==== Compared to WebFlux
 
 The Servlet API was originally built for making a single pass through the Filter-Servlet
-chain. Asynchronous request processing, added in Servlet 3.0, lets applications exit
-the Filter-Servlet chain but leave the response open for further processing. The Spring MVC
-asynchronous support is built around that mechanism. When a controller returns a `DeferredResult`,
-the Filter-Servlet chain is exited, and the Servlet container thread is released. Later, when
+chain. Asynchronous request processing lets applications exit the Filter-Servlet chain
+but leave the response open for further processing. The Spring MVC asynchronous support
+is built around that mechanism. When a controller returns a `DeferredResult`, the
+Filter-Servlet chain is exited, and the Servlet container thread is released. Later, when
 the `DeferredResult` is set, an `ASYNC` dispatch (to the same URL) is made, during which the
 controller is mapped again but, rather than invoking it, the `DeferredResult` value is used
 (as if the controller returned it) to resume processing.
diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index e4ee1e49c055..9889bec9e3af 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1258,7 +1258,7 @@ The following table describes the method arguments:
 The presence of this annotation is not required since it is, by default, assumed if no
 other argument is matched.
 
-You can annotate payload arguments with `@javax.validation.Valid` or Spring's `@Validated`,
+You can annotate payload arguments with `@jakarta.validation.Valid` or Spring's `@Validated`,
 to have the payload arguments be automatically validated.
 
 | `@Header`

From 62a4a4c0bf03a9ab534ef90d038007d0a5601cd4 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 17 Nov 2021 14:06:52 +0100
Subject: [PATCH 341/735] Upgrade JDK versions in CI images

---
 ci/images/get-jdk-url.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index 783b8bb3c758..6f37fa9be510 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -3,10 +3,10 @@ set -e
 
 case "$1" in
   java17)
-    echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz"
+    echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz"
   ;;
   java18)
-    echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-2021-10-22-05-05-beta/OpenJDK-jdk_x64_linux_hotspot_2021-10-21-23-30.tar.gz"
+    echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-2021-11-17-08-12-beta/OpenJDK-jdk_x64_linux_hotspot_2021-11-16-23-30.tar.gz"
   ;;
   *)
     echo $"Unknown java version"

From 5fbdd6dcfe7504327fe805971760f1b229d0cc62 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Wed, 17 Nov 2021 16:52:17 +0100
Subject: [PATCH 342/735] Throw exception using capturing patterns in
 AntPathMatcher

Closes gh-27688
---
 .../org/springframework/util/AntPathMatcher.java |  4 ++++
 .../PathMatchingUrlHandlerMappingTests.java      | 16 +++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
index d304f08d2c00..63eea1e9eab8 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -733,6 +733,10 @@ else if (this.pattern != null) {
 						}
 						for (int i = 1; i <= matcher.groupCount(); i++) {
 							String name = this.variableNames.get(i - 1);
+							if (name.startsWith("*")) {
+								throw new IllegalArgumentException("Capturing patterns (" + name + ") are not " +
+										"supported by the AntPathMatcher. Use the PathPatternParser instead.");
+							}
 							String value = matcher.group(i);
 							uriTemplateVariables.put(name, value);
 						}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
index 5e4e148c8511..4c988f1a7fd0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
@@ -155,13 +155,15 @@ void actualPathMatching(SimpleUrlHandlerMapping mapping, WebApplicationContext w
 		chain = getHandler(mapping, wac, request);
 		assertThat(chain.getHandler()).isSameAs(defaultBean);
 
-		request = new MockHttpServletRequest("GET", "/administrator/testing/longer/bla");
-		chain = getHandler(mapping, wac, request);
-		assertThat(chain.getHandler()).isSameAs(bean);
-
-		request = new MockHttpServletRequest("GET", "/administrator/testing/longer/test.jsp");
-		chain = getHandler(mapping, wac, request);
-		assertThat(chain.getHandler()).isSameAs(bean);
+		if (mapping.getPatternParser() != null) {
+			request = new MockHttpServletRequest("GET", "/administrator/testing/longer/bla");
+			chain = getHandler(mapping, wac, request);
+			assertThat(chain.getHandler()).isSameAs(bean);
+
+			request = new MockHttpServletRequest("GET", "/administrator/testing/longer/test.jsp");
+			chain = getHandler(mapping, wac, request);
+			assertThat(chain.getHandler()).isSameAs(bean);
+		}
 
 		request = new MockHttpServletRequest("GET", "/administrator/testing/longer2/notmatching/notmatching");
 		chain = getHandler(mapping, wac, request);

From 4750a9430cdae9156d1e7fc32cec2c11ba2b8514 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 18 Nov 2021 09:18:06 +0100
Subject: [PATCH 343/735] Early removal of 5.x-deprecated code

Closes gh-27686
---
 .../beans/annotation/AnnotationBeanUtils.java |  84 ---
 .../beans/annotation/package-info.java        |   9 -
 .../AutowiredAnnotationBeanPostProcessor.java |   8 -
 .../beans/factory/annotation/Required.java    |  42 --
 .../RequiredAnnotationBeanPostProcessor.java  | 230 -------
 .../factory/config/DependencyDescriptor.java  |  22 +-
 .../InstantiationAwareBeanPostProcessor.java  |  48 +-
 ...ntiationAwareBeanPostProcessorAdapter.java |  39 --
 .../AbstractAutowireCapableBeanFactory.java   |  31 +-
 .../factory/support/AbstractBeanFactory.java  |  22 -
 .../beans/factory/xml/XmlBeanFactory.java     |  82 ---
 ...wiredAnnotationBeanPostProcessorTests.java |  22 -
 ...njectAnnotationBeanPostProcessorTests.java |  24 +-
 ...uiredAnnotationBeanPostProcessorTests.java | 244 -------
 .../AnnotationProcessorBenchmark.java         |   4 +-
 .../cache/support/AbstractCacheManager.java   |  17 +-
 .../annotation/AnnotationConfigUtils.java     |   8 -
 .../context/annotation/Bean.java              |  18 +-
 .../CommonAnnotationBeanPostProcessor.java    |   8 -
 ...onfigurationClassBeanDefinitionReader.java |   9 -
 .../support/AbstractApplicationContext.java   |  21 -
 .../context/support/LiveBeansView.java        | 270 --------
 .../context/support/LiveBeansViewMBean.java   |  34 -
 ...anAnnotationAttributePropagationTests.java |  12 +-
 .../context/support/LiveBeansViewTests.java   | 122 ----
 .../core/codec/StringDecoder.java             |  24 +-
 .../core/io/ClassPathResource.java            |  16 -
 .../AbstractRecursiveAnnotationVisitor.java   | 105 ---
 .../AnnotationAttributesReadingVisitor.java   | 127 ----
 .../AnnotationMetadataReadingVisitor.java     | 200 ------
 .../AnnotationReadingVisitorUtils.java        | 172 -----
 .../ClassMetadataReadingVisitor.java          | 244 -------
 .../MethodMetadataReadingVisitor.java         | 174 -----
 .../RecursiveAnnotationArrayVisitor.java      | 110 ---
 .../RecursiveAnnotationAttributesVisitor.java |  53 --
 .../org/springframework/lang/UsesJava7.java   |  38 --
 .../org/springframework/lang/UsesJava8.java   |  38 --
 .../lang/UsesSunHttpServer.java               |  38 --
 .../org/springframework/lang/UsesSunMisc.java |  36 -
 .../org/springframework/util/ObjectUtils.java |  36 -
 .../org/springframework/util/StringUtils.java |  43 --
 .../util/comparator/CompoundComparator.java   | 206 ------
 .../util/comparator/InvertibleComparator.java | 133 ----
 .../AnnotationTypeMappingsTests.java          |  16 +-
 ...AnnotationMetadataReadingVisitorTests.java |  92 ---
 .../MethodMetadataReadingVisitorTests.java    |  92 ---
 .../util/ObjectUtilsTests.java                |  38 --
 .../util/StringUtilsTests.java                |  15 -
 .../comparator/CompoundComparatorTests.java   |  42 --
 .../comparator/InvertibleComparatorTests.java |  81 ---
 .../support/ReflectivePropertyAccessor.java   |  11 -
 .../jdbc/core/BatchUpdateUtils.java           |  81 ---
 .../core/metadata/CallParameterMetaData.java  |  12 +-
 .../core/metadata/TableMetaDataContext.java   |  12 -
 .../NamedParameterBatchUpdateUtils.java       |  61 --
 ...2MainframeSequenceMaxValueIncrementer.java |  57 --
 .../DB2SequenceMaxValueIncrementer.java       |  51 --
 ...PostgreSQLSequenceMaxValueIncrementer.java |  50 --
 .../support/PayloadArgumentResolver.java      |  74 --
 .../RSocketFrameTypeMessageCondition.java     |  17 +-
 .../AbstractMessageBrokerConfiguration.java   |  16 +-
 .../simp/config/ChannelRegistration.java      |  14 +-
 .../user/DefaultUserDestinationResolver.java  |  26 +-
 .../support/OpenSessionInterceptor.java       |  29 +-
 ...ersistenceAnnotationBeanPostProcessor.java |   8 -
 .../HibernateJpaSessionFactoryBean.java       |  92 ---
 .../mock/jndi/ExpectedLookupTemplate.java     |  84 ---
 .../mock/jndi/SimpleNamingContext.java        | 389 -----------
 .../mock/jndi/SimpleNamingContextBuilder.java | 236 -------
 .../mock/jndi/package-info.java               |  18 -
 .../function/server/MockServerRequest.java    |  15 +-
 .../test/util/MetaAnnotationUtils.java        | 409 -----------
 .../AbstractRequestExpectationManager.java    |  31 +-
 .../request/MockMvcRequestBuilders.java       |  24 +-
 .../mock/jndi/SimpleNamingContextTests.java   | 244 -------
 .../test/util/MetaAnnotationUtilsTests.java   | 639 ------------------
 ...erriddenMetaAnnotationAttributesTests.java | 158 -----
 .../reactive/TransactionContext.java          |  19 -
 .../BasicAuthorizationInterceptor.java        |  70 --
 .../AbstractJackson2HttpMessageConverter.java |   8 -
 .../ExtensionRegistryInitializer.java         |  43 --
 .../ProtobufHttpMessageConverter.java         |  16 +-
 ...rotobufJsonFormatHttpMessageConverter.java |  22 +-
 .../AbstractListenerWriteProcessor.java       |   2 +-
 .../reactive/AbstractServerHttpResponse.java  |  27 +-
 .../web/bind/annotation/CrossOrigin.java      |  17 -
 .../support/DefaultDataBinderFactory.java     |   5 +-
 .../bind/support/WebBindingInitializer.java   |  14 +-
 .../client/DefaultResponseErrorHandler.java   |  20 -
 .../web/client/RestTemplate.java              |  10 -
 .../context/support/LiveBeansViewServlet.java |  70 --
 .../support/ServletContextLiveBeansView.java  |  65 --
 .../web/filter/HttpPutFormContentFilter.java  | 189 ------
 .../reactive/ForwardedHeaderFilter.java       |  57 --
 .../MediaTypeNotSupportedStatusException.java |  65 --
 .../web/server/MethodNotAllowedException.java |  13 +-
 .../server/NotAcceptableStatusException.java  |  13 +-
 .../web/server/ResponseStatusException.java   |  23 +-
 .../web/server/ServerErrorException.java      |  22 +-
 .../server/handler/DefaultWebFilterChain.java |  15 +-
 .../web/util/AbstractUriTemplateHandler.java  | 143 ----
 .../util/ContentCachingResponseWrapper.java   |   9 -
 .../web/util/DefaultUriTemplateHandler.java   | 158 -----
 .../BasicAuthorizationInterceptorTests.java   |  76 ---
 .../ProtobufHttpMessageConverterTests.java    |  35 +-
 ...ufJsonFormatHttpMessageConverterTests.java |  29 +-
 .../web/cors/reactive/CorsUtilsTests.java     |  15 +-
 .../adapter/WebHttpHandlerBuilderTests.java   |  14 +-
 .../util/DefaultUriTemplateHandlerTests.java  | 151 -----
 .../client/ExchangeFilterFunctions.java       |   5 +-
 .../resource/AppCacheManifestTransformer.java | 252 -------
 .../resource/CssLinkResourceTransformer.java  |   3 +-
 .../resource/GzipResourceResolver.java        | 173 -----
 .../reactive/result/view/AbstractView.java    |  22 +-
 .../socket/server/RequestUpgradeStrategy.java |  26 +-
 .../config/ResourceHandlerRegistryTests.java  |  17 +-
 .../AppCacheManifestTransformerTests.java     | 123 ----
 .../handler/HandlerMappingIntrospector.java   |  33 +-
 .../servlet/i18n/LocaleChangeInterceptor.java |  30 +-
 .../resource/AppCacheManifestTransformer.java | 259 -------
 .../resource/CssLinkResourceTransformer.java  |   3 +-
 .../resource/GzipResourceResolver.java        | 174 -----
 .../servlet/support/WebContentGenerator.java  |  16 -
 .../DefaultRequestToViewNameTranslator.java   |  43 --
 .../web/servlet/config/MvcNamespaceTests.java |   6 +-
 .../ResourceHandlerRegistryTests.java         |  16 +-
 .../AppCacheManifestTransformerTests.java     | 122 ----
 .../mvc-config-resources-chain-no-auto.xml    |   1 -
 .../config/mvc-config-resources-chain.xml     |   3 -
 .../web/socket/WebSocketHttpHeaders.java      |  10 -
 .../MessageBrokerBeanDefinitionParser.java    |   6 +-
 ...tractWebSocketMessageBrokerConfigurer.java |  68 --
 132 files changed, 88 insertions(+), 9215 deletions(-)
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
 delete mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java
 delete mode 100644 spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
 delete mode 100644 spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java
 delete mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationAttributesVisitor.java
 delete mode 100644 spring-core/src/main/java/org/springframework/lang/UsesJava7.java
 delete mode 100644 spring-core/src/main/java/org/springframework/lang/UsesJava8.java
 delete mode 100644 spring-core/src/main/java/org/springframework/lang/UsesSunHttpServer.java
 delete mode 100644 spring-core/src/main/java/org/springframework/lang/UsesSunMisc.java
 delete mode 100644 spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
 delete mode 100644 spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
 delete mode 100644 spring-core/src/test/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitorTests.java
 delete mode 100644 spring-core/src/test/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitorTests.java
 delete mode 100644 spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java
 delete mode 100644 spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java
 delete mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
 delete mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
 delete mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java
 delete mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java
 delete mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java
 delete mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java
 delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
 delete mode 100644 spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
 delete mode 100644 spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
 delete mode 100644 spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
 delete mode 100644 spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
 delete mode 100644 spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java
 delete mode 100644 spring-test/src/test/java/org/springframework/mock/jndi/SimpleNamingContextTests.java
 delete mode 100644 spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java
 delete mode 100644 spring-test/src/test/java/org/springframework/test/util/OverriddenMetaAnnotationAttributesTests.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/client/support/BasicAuthorizationInterceptor.java
 delete mode 100644 spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/util/AbstractUriTemplateHandler.java
 delete mode 100644 spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/support/BasicAuthorizationInterceptorTests.java
 delete mode 100644 spring-web/src/test/java/org/springframework/web/util/DefaultUriTemplateHandlerTests.java
 delete mode 100644 spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
 delete mode 100644 spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java
 delete mode 100644 spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
 delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
 delete mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketMessageBrokerConfigurer.java

diff --git a/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
deleted file mode 100644
index c0b22ad47d37..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- * 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.beans.annotation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.PropertyAccessorFactory;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringValueResolver;
-
-/**
- * General utility methods for working with annotations in JavaBeans style.
- *
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @since 2.0
- * @deprecated as of 5.2, in favor of custom annotation attribute processing
- */
-@Deprecated
-public abstract class AnnotationBeanUtils {
-
-	/**
-	 * Copy the properties of the supplied {@link Annotation} to the supplied target bean.
-	 * Any properties defined in {@code excludedProperties} will not be copied.
-	 * @param ann the annotation to copy from
-	 * @param bean the bean instance to copy to
-	 * @param excludedProperties the names of excluded properties, if any
-	 * @see org.springframework.beans.BeanWrapper
-	 */
-	public static void copyPropertiesToBean(Annotation ann, Object bean, String... excludedProperties) {
-		copyPropertiesToBean(ann, bean, null, excludedProperties);
-	}
-
-	/**
-	 * Copy the properties of the supplied {@link Annotation} to the supplied target bean.
-	 * Any properties defined in {@code excludedProperties} will not be copied.
-	 * <p>A specified value resolver may resolve placeholders in property values, for example.
-	 * @param ann the annotation to copy from
-	 * @param bean the bean instance to copy to
-	 * @param valueResolver a resolve to post-process String property values (may be {@code null})
-	 * @param excludedProperties the names of excluded properties, if any
-	 * @see org.springframework.beans.BeanWrapper
-	 */
-	public static void copyPropertiesToBean(Annotation ann, Object bean, @Nullable StringValueResolver valueResolver,
-			String... excludedProperties) {
-
-		Set<String> excluded = (excludedProperties.length == 0 ? Collections.emptySet() :
-				new HashSet<>(Arrays.asList(excludedProperties)));
-		Method[] annotationProperties = ann.annotationType().getDeclaredMethods();
-		BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(bean);
-		for (Method annotationProperty : annotationProperties) {
-			String propertyName = annotationProperty.getName();
-			if (!excluded.contains(propertyName) && bw.isWritableProperty(propertyName)) {
-				Object value = ReflectionUtils.invokeMethod(annotationProperty, ann);
-				if (valueResolver != null && value instanceof String) {
-					value = valueResolver.resolveStringValue((String) value);
-				}
-				bw.setPropertyValue(propertyName, value);
-			}
-		}
-	}
-
-}
diff --git a/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java b/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
deleted file mode 100644
index d2667da96fd4..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/annotation/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Support package for beans-style handling of Java 5 annotations.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.beans.annotation;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 026790c361db..f11dcce9a33b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -419,14 +419,6 @@ public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, Str
 		return pvs;
 	}
 
-	@Deprecated
-	@Override
-	public PropertyValues postProcessPropertyValues(
-			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) {
-
-		return postProcessProperties(pvs, bean, beanName);
-	}
-
 	/**
 	 * 'Native' processing method for direct calls with an arbitrary target instance,
 	 * resolving all of its fields and methods which are annotated with one of the
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
deleted file mode 100644
index 4993cf25d4b4..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a method (typically a JavaBean setter method) as being 'required': that is,
- * the setter method must be configured to be dependency-injected with a value.
- *
- * <p>Please do consult the javadoc for the {@link RequiredAnnotationBeanPostProcessor}
- * class (which, by default, checks for the presence of this annotation).
- *
- * @author Rob Harrop
- * @since 2.0
- * @see RequiredAnnotationBeanPostProcessor
- * @deprecated as of 5.1, in favor of using constructor injection for required settings
- * (or a custom {@link org.springframework.beans.factory.InitializingBean} implementation)
- */
-@Deprecated
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Required {
-
-}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
deleted file mode 100644
index a4cf5f314ced..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
+++ /dev/null
@@ -1,230 +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.beans.factory.annotation;
-
-import java.beans.PropertyDescriptor;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.springframework.beans.PropertyValues;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanInitializationException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.core.Conventions;
-import org.springframework.core.Ordered;
-import org.springframework.core.PriorityOrdered;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
- * that enforces required JavaBean properties to have been configured.
- * Required bean properties are detected through a Java 5 annotation:
- * by default, Spring's {@link Required} annotation.
- *
- * <p>The motivation for the existence of this BeanPostProcessor is to allow
- * developers to annotate the setter properties of their own classes with an
- * arbitrary JDK 1.5 annotation to indicate that the container must check
- * for the configuration of a dependency injected value. This neatly pushes
- * responsibility for such checking onto the container (where it arguably belongs),
- * and obviates the need (<b>in part</b>) for a developer to code a method that
- * simply checks that all required properties have actually been set.
- *
- * <p>Please note that an 'init' method may still need to be implemented (and may
- * still be desirable), because all that this class does is enforcing that a
- * 'required' property has actually been configured with a value. It does
- * <b>not</b> check anything else... In particular, it does not check that a
- * configured value is not {@code null}.
- *
- * <p>Note: A default RequiredAnnotationBeanPostProcessor will be registered
- * by the "context:annotation-config" and "context:component-scan" XML tags.
- * Remove or turn off the default annotation configuration there if you intend
- * to specify a custom RequiredAnnotationBeanPostProcessor bean definition.
- *
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @since 2.0
- * @see #setRequiredAnnotationType
- * @see Required
- * @deprecated as of 5.1, in favor of using constructor injection for required settings
- * (or a custom {@link org.springframework.beans.factory.InitializingBean} implementation)
- */
-@Deprecated
-public class RequiredAnnotationBeanPostProcessor implements SmartInstantiationAwareBeanPostProcessor,
-		MergedBeanDefinitionPostProcessor, PriorityOrdered, BeanFactoryAware {
-
-	/**
-	 * Bean definition attribute that may indicate whether a given bean is supposed
-	 * to be skipped when performing this post-processor's required property check.
-	 * @see #shouldSkip
-	 */
-	public static final String SKIP_REQUIRED_CHECK_ATTRIBUTE =
-			Conventions.getQualifiedAttributeName(RequiredAnnotationBeanPostProcessor.class, "skipRequiredCheck");
-
-
-	private Class<? extends Annotation> requiredAnnotationType = Required.class;
-
-	private int order = Ordered.LOWEST_PRECEDENCE - 1;
-
-	@Nullable
-	private ConfigurableListableBeanFactory beanFactory;
-
-	/**
-	 * Cache for validated bean names, skipping re-validation for the same bean.
-	 */
-	private final Set<String> validatedBeanNames = Collections.newSetFromMap(new ConcurrentHashMap<>(64));
-
-
-	/**
-	 * Set the 'required' annotation type, to be used on bean property
-	 * setter methods.
-	 * <p>The default required annotation type is the Spring-provided
-	 * {@link Required} annotation.
-	 * <p>This setter property exists so that developers can provide their own
-	 * (non-Spring-specific) annotation type to indicate that a property value
-	 * is required.
-	 */
-	public void setRequiredAnnotationType(Class<? extends Annotation> requiredAnnotationType) {
-		Assert.notNull(requiredAnnotationType, "'requiredAnnotationType' must not be null");
-		this.requiredAnnotationType = requiredAnnotationType;
-	}
-
-	/**
-	 * Return the 'required' annotation type.
-	 */
-	protected Class<? extends Annotation> getRequiredAnnotationType() {
-		return this.requiredAnnotationType;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		if (beanFactory instanceof ConfigurableListableBeanFactory) {
-			this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
-		}
-	}
-
-	public void setOrder(int order) {
-		this.order = order;
-	}
-
-	@Override
-	public int getOrder() {
-		return this.order;
-	}
-
-
-	@Override
-	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
-	}
-
-	@Override
-	public PropertyValues postProcessPropertyValues(
-			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) {
-
-		if (!this.validatedBeanNames.contains(beanName)) {
-			if (!shouldSkip(this.beanFactory, beanName)) {
-				List<String> invalidProperties = new ArrayList<>();
-				for (PropertyDescriptor pd : pds) {
-					if (isRequiredProperty(pd) && !pvs.contains(pd.getName())) {
-						invalidProperties.add(pd.getName());
-					}
-				}
-				if (!invalidProperties.isEmpty()) {
-					throw new BeanInitializationException(buildExceptionMessage(invalidProperties, beanName));
-				}
-			}
-			this.validatedBeanNames.add(beanName);
-		}
-		return pvs;
-	}
-
-	/**
-	 * Check whether the given bean definition is not subject to the annotation-based
-	 * required property check as performed by this post-processor.
-	 * <p>The default implementations check for the presence of the
-	 * {@link #SKIP_REQUIRED_CHECK_ATTRIBUTE} attribute in the bean definition, if any.
-	 * It also suggests skipping in case of a bean definition with a "factory-bean"
-	 * reference set, assuming that instance-based factories pre-populate the bean.
-	 * @param beanFactory the BeanFactory to check against
-	 * @param beanName the name of the bean to check against
-	 * @return {@code true} to skip the bean; {@code false} to process it
-	 */
-	protected boolean shouldSkip(@Nullable ConfigurableListableBeanFactory beanFactory, String beanName) {
-		if (beanFactory == null || !beanFactory.containsBeanDefinition(beanName)) {
-			return false;
-		}
-		BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
-		if (beanDefinition.getFactoryBeanName() != null) {
-			return true;
-		}
-		Object value = beanDefinition.getAttribute(SKIP_REQUIRED_CHECK_ATTRIBUTE);
-		return (value != null && (Boolean.TRUE.equals(value) || Boolean.parseBoolean(value.toString())));
-	}
-
-	/**
-	 * Is the supplied property required to have a value (that is, to be dependency-injected)?
-	 * <p>This implementation looks for the existence of a
-	 * {@link #setRequiredAnnotationType "required" annotation}
-	 * on the supplied {@link PropertyDescriptor property}.
-	 * @param propertyDescriptor the target PropertyDescriptor (never {@code null})
-	 * @return {@code true} if the supplied property has been marked as being required;
-	 * {@code false} if not, or if the supplied property does not have a setter method
-	 */
-	protected boolean isRequiredProperty(PropertyDescriptor propertyDescriptor) {
-		Method setter = propertyDescriptor.getWriteMethod();
-		return (setter != null && AnnotationUtils.getAnnotation(setter, getRequiredAnnotationType()) != null);
-	}
-
-	/**
-	 * Build an exception message for the given list of invalid properties.
-	 * @param invalidProperties the list of names of invalid properties
-	 * @param beanName the name of the bean
-	 * @return the exception message
-	 */
-	private String buildExceptionMessage(List<String> invalidProperties, String beanName) {
-		int size = invalidProperties.size();
-		StringBuilder sb = new StringBuilder();
-		sb.append(size == 1 ? "Property" : "Properties");
-		for (int i = 0; i < size; i++) {
-			String propertyName = invalidProperties.get(i);
-			if (i > 0) {
-				if (i == (size - 1)) {
-					sb.append(" and");
-				}
-				else {
-					sb.append(',');
-				}
-			}
-			sb.append(" '").append(propertyName).append('\'');
-		}
-		sb.append(size == 1 ? " is" : " are");
-		sb.append(" required for bean '").append(beanName).append('\'');
-		return sb.toString();
-	}
-
-}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
index c16db6ca73ae..c808a8154124 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -220,26 +220,6 @@ public Object resolveNotUnique(ResolvableType type, Map<String, Object> matching
 		throw new NoUniqueBeanDefinitionException(type, matchingBeans.keySet());
 	}
 
-	/**
-	 * Resolve the specified not-unique scenario: by default,
-	 * throwing a {@link NoUniqueBeanDefinitionException}.
-	 * <p>Subclasses may override this to select one of the instances or
-	 * to opt out with no result at all through returning {@code null}.
-	 * @param type the requested bean type
-	 * @param matchingBeans a map of bean names and corresponding bean
-	 * instances which have been pre-selected for the given type
-	 * (qualifiers etc already applied)
-	 * @return a bean instance to proceed with, or {@code null} for none
-	 * @throws BeansException in case of the not-unique scenario being fatal
-	 * @since 4.3
-	 * @deprecated as of 5.1, in favor of {@link #resolveNotUnique(ResolvableType, Map)}
-	 */
-	@Deprecated
-	@Nullable
-	public Object resolveNotUnique(Class<?> type, Map<String, Object> matchingBeans) throws BeansException {
-		throw new NoUniqueBeanDefinitionException(type, matchingBeans.keySet());
-	}
-
 	/**
 	 * Resolve a shortcut for this dependency against the given factory, for example
 	 * taking some pre-resolved information into account.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
index c4e21122ed81..e842353cb55d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.beans.factory.config;
 
-import java.beans.PropertyDescriptor;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
 import org.springframework.lang.Nullable;
@@ -34,9 +32,7 @@
  *
  * <p><b>NOTE:</b> This interface is a special purpose interface, mainly for
  * internal use within the framework. It is recommended to implement the plain
- * {@link BeanPostProcessor} interface as far as possible, or to derive from
- * {@link InstantiationAwareBeanPostProcessorAdapter} in order to be shielded
- * from extensions to this interface.
+ * {@link BeanPostProcessor} interface as far as possible.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
@@ -96,54 +92,20 @@ default boolean postProcessAfterInstantiation(Object bean, String beanName) thro
 
 	/**
 	 * Post-process the given property values before the factory applies them
-	 * to the given bean, without any need for property descriptors.
-	 * <p>Implementations should return {@code null} (the default) if they provide a custom
-	 * {@link #postProcessPropertyValues} implementation, and {@code pvs} otherwise.
-	 * In a future version of this interface (with {@link #postProcessPropertyValues} removed),
-	 * the default implementation will return the given {@code pvs} as-is directly.
+	 * to the given bean.
+	 * <p>The default implementation returns the given {@code pvs} as-is.
 	 * @param pvs the property values that the factory is about to apply (never {@code null})
 	 * @param bean the bean instance created, but whose properties have not yet been set
 	 * @param beanName the name of the bean
 	 * @return the actual property values to apply to the given bean (can be the passed-in
-	 * PropertyValues instance), or {@code null} which proceeds with the existing properties
-	 * but specifically continues with a call to {@link #postProcessPropertyValues}
-	 * (requiring initialized {@code PropertyDescriptor}s for the current bean class)
+	 * PropertyValues instance), or {@code null} to skip property population
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @since 5.1
-	 * @see #postProcessPropertyValues
 	 */
 	@Nullable
 	default PropertyValues postProcessProperties(PropertyValues pvs, Object bean, String beanName)
 			throws BeansException {
 
-		return null;
-	}
-
-	/**
-	 * Post-process the given property values before the factory applies them
-	 * to the given bean. Allows for checking whether all dependencies have been
-	 * satisfied, for example based on a "Required" annotation on bean property setters.
-	 * <p>Also allows for replacing the property values to apply, typically through
-	 * creating a new MutablePropertyValues instance based on the original PropertyValues,
-	 * adding or removing specific values.
-	 * <p>The default implementation returns the given {@code pvs} as-is.
-	 * @param pvs the property values that the factory is about to apply (never {@code null})
-	 * @param pds the relevant property descriptors for the target bean (with ignored
-	 * dependency types - which the factory handles specifically - already filtered out)
-	 * @param bean the bean instance created, but whose properties have not yet been set
-	 * @param beanName the name of the bean
-	 * @return the actual property values to apply to the given bean (can be the passed-in
-	 * PropertyValues instance), or {@code null} to skip property population
-	 * @throws org.springframework.beans.BeansException in case of errors
-	 * @see #postProcessProperties
-	 * @see org.springframework.beans.MutablePropertyValues
-	 * @deprecated as of 5.1, in favor of {@link #postProcessProperties(PropertyValues, Object, String)}
-	 */
-	@Deprecated
-	@Nullable
-	default PropertyValues postProcessPropertyValues(
-			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
-
 		return pvs;
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
deleted file mode 100644
index b3c112c8be46..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.config;
-
-/**
- * Adapter that implements all methods on {@link SmartInstantiationAwareBeanPostProcessor}
- * as no-ops, which will not change normal processing of each bean instantiated
- * by the container. Subclasses may override merely those methods that they are
- * actually interested in.
- *
- * <p>Note that this base class is only recommendable if you actually require
- * {@link InstantiationAwareBeanPostProcessor} functionality. If all you need
- * is plain {@link BeanPostProcessor} functionality, prefer a straight
- * implementation of that (simpler) interface.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 2.0
- * @deprecated as of 5.3 in favor of implementing {@link InstantiationAwareBeanPostProcessor}
- * or {@link SmartInstantiationAwareBeanPostProcessor} directly.
- */
-@Deprecated
-public abstract class InstantiationAwareBeanPostProcessorAdapter implements SmartInstantiationAwareBeanPostProcessor {
-
-}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index 5ab6fb085a27..d7f32a8ac5b7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -936,24 +936,6 @@ private ResolvableType getTypeForFactoryBeanFromMethod(Class<?> beanClass, Strin
 		return finder.getResult();
 	}
 
-	/**
-	 * This implementation attempts to query the FactoryBean's generic parameter metadata
-	 * if present to determine the object type. If not present, i.e. the FactoryBean is
-	 * declared as a raw type, checks the FactoryBean's {@code getObjectType} method
-	 * on a plain instance of the FactoryBean, without bean properties applied yet.
-	 * If this doesn't return a type yet, a full creation of the FactoryBean is
-	 * used as fallback (through delegation to the superclass's implementation).
-	 * <p>The shortcut check for a FactoryBean is only applied in case of a singleton
-	 * FactoryBean. If the FactoryBean instance itself is not kept as singleton,
-	 * it will be fully created to check the type of its exposed object.
-	 */
-	@Override
-	@Deprecated
-	@Nullable
-	protected Class<?> getTypeForFactoryBean(String beanName, RootBeanDefinition mbd) {
-		return getTypeForFactoryBean(beanName, mbd, true).resolve();
-	}
-
 	/**
 	 * Obtain a reference for early access to the specified bean,
 	 * typically for the purpose of resolving a circular reference.
@@ -1398,7 +1380,6 @@ protected void populateBean(String beanName, RootBeanDefinition mbd, @Nullable B
 		boolean hasInstAwareBpps = hasInstantiationAwareBeanPostProcessors();
 		boolean needsDepCheck = (mbd.getDependencyCheck() != AbstractBeanDefinition.DEPENDENCY_CHECK_NONE);
 
-		PropertyDescriptor[] filteredPds = null;
 		if (hasInstAwareBpps) {
 			if (pvs == null) {
 				pvs = mbd.getPropertyValues();
@@ -1406,21 +1387,13 @@ protected void populateBean(String beanName, RootBeanDefinition mbd, @Nullable B
 			for (InstantiationAwareBeanPostProcessor bp : getBeanPostProcessorCache().instantiationAware) {
 				PropertyValues pvsToUse = bp.postProcessProperties(pvs, bw.getWrappedInstance(), beanName);
 				if (pvsToUse == null) {
-					if (filteredPds == null) {
-						filteredPds = filterPropertyDescriptorsForDependencyCheck(bw, mbd.allowCaching);
-					}
-					pvsToUse = bp.postProcessPropertyValues(pvs, filteredPds, bw.getWrappedInstance(), beanName);
-					if (pvsToUse == null) {
-						return;
-					}
+					return;
 				}
 				pvs = pvsToUse;
 			}
 		}
 		if (needsDepCheck) {
-			if (filteredPds == null) {
-				filteredPds = filterPropertyDescriptorsForDependencyCheck(bw, mbd.allowCaching);
-			}
+			PropertyDescriptor[] filteredPds = filterPropertyDescriptorsForDependencyCheck(bw, mbd.allowCaching);
 			checkDependencies(beanName, mbd, filteredPds, pvs);
 		}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index b33651f186d3..6c2e05068c26 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1694,28 +1694,6 @@ ResolvableType getTypeForFactoryBeanFromAttributes(AttributeAccessor attributes)
 		return ResolvableType.NONE;
 	}
 
-	/**
-	 * Determine the bean type for the given FactoryBean definition, as far as possible.
-	 * Only called if there is no singleton instance registered for the target bean already.
-	 * <p>The default implementation creates the FactoryBean via {@code getBean}
-	 * to call its {@code getObjectType} method. Subclasses are encouraged to optimize
-	 * this, typically by just instantiating the FactoryBean but not populating it yet,
-	 * trying whether its {@code getObjectType} method already returns a type.
-	 * If no type found, a full FactoryBean creation as performed by this implementation
-	 * should be used as fallback.
-	 * @param beanName the name of the bean
-	 * @param mbd the merged bean definition for the bean
-	 * @return the type for the bean if determinable, or {@code null} otherwise
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 * @see #getBean(String)
-	 * @deprecated since 5.2 in favor of {@link #getTypeForFactoryBean(String, RootBeanDefinition, boolean)}
-	 */
-	@Nullable
-	@Deprecated
-	protected Class<?> getTypeForFactoryBean(String beanName, RootBeanDefinition mbd) {
-		return getTypeForFactoryBean(beanName, mbd, true).resolve();
-	}
-
 	/**
 	 * Mark the specified bean as already created (or about to be created).
 	 * <p>This allows the bean factory to optimize its caching for repeated
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
deleted file mode 100644
index b762a4181002..000000000000
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.xml;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.core.io.Resource;
-
-/**
- * Convenience extension of {@link DefaultListableBeanFactory} that reads bean definitions
- * from an XML document. Delegates to {@link XmlBeanDefinitionReader} underneath; effectively
- * equivalent to using an XmlBeanDefinitionReader with a DefaultListableBeanFactory.
- *
- * <p>The structure, element and attribute names of the required XML document
- * are hard-coded in this class. (Of course a transform could be run if necessary
- * to produce this format). "beans" doesn't need to be the root element of the XML
- * document: This class will parse all bean definition elements in the XML file.
- *
- * <p>This class registers each bean definition with the {@link DefaultListableBeanFactory}
- * superclass, and relies on the latter's implementation of the {@link BeanFactory} interface.
- * It supports singletons, prototypes, and references to either of these kinds of bean.
- * See {@code "spring-beans-3.x.xsd"} (or historically, {@code "spring-beans-2.0.dtd"}) for
- * details on options and configuration style.
- *
- * <p><b>For advanced needs, consider using a {@link DefaultListableBeanFactory} with
- * an {@link XmlBeanDefinitionReader}.</b> The latter allows for reading from multiple XML
- * resources and is highly configurable in its actual XML parsing behavior.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Chris Beams
- * @since 15 April 2001
- * @see org.springframework.beans.factory.support.DefaultListableBeanFactory
- * @see XmlBeanDefinitionReader
- * @deprecated as of Spring 3.1 in favor of {@link DefaultListableBeanFactory} and
- * {@link XmlBeanDefinitionReader}
- */
-@Deprecated
-@SuppressWarnings({"serial", "all"})
-public class XmlBeanFactory extends DefaultListableBeanFactory {
-
-	private final XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this);
-
-
-	/**
-	 * Create a new XmlBeanFactory with the given resource,
-	 * which must be parsable using DOM.
-	 * @param resource the XML resource to load bean definitions from
-	 * @throws BeansException in case of loading or parsing errors
-	 */
-	public XmlBeanFactory(Resource resource) throws BeansException {
-		this(resource, null);
-	}
-
-	/**
-	 * Create a new XmlBeanFactory with the given input stream,
-	 * which must be parsable using DOM.
-	 * @param resource the XML resource to load bean definitions from
-	 * @param parentBeanFactory parent bean factory
-	 * @throws BeansException in case of loading or parsing errors
-	 */
-	public XmlBeanFactory(Resource resource, BeanFactory parentBeanFactory) throws BeansException {
-		super(parentBeanFactory);
-		this.reader.loadBeanDefinitions(resource);
-	}
-
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
index c746f21949e8..2d9571817210 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
@@ -250,27 +250,6 @@ public void testExtendedResourceInjectionWithDefaultMethod() {
 		assertThat(bean.subInjected).isTrue();
 	}
 
-	@Test
-	@SuppressWarnings("deprecation")
-	public void testExtendedResourceInjectionWithAtRequired() {
-		bf.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
-		RootBeanDefinition bd = new RootBeanDefinition(TypedExtendedResourceInjectionBean.class);
-		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("annotatedBean", bd);
-		TestBean tb = new TestBean();
-		bf.registerSingleton("testBean", tb);
-		NestedTestBean ntb = new NestedTestBean();
-		bf.registerSingleton("nestedTestBean", ntb);
-
-		TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isSameAs(tb);
-		assertThat(bean.getTestBean2()).isSameAs(tb);
-		assertThat(bean.getTestBean3()).isSameAs(tb);
-		assertThat(bean.getTestBean4()).isSameAs(tb);
-		assertThat(bean.getNestedTestBean()).isSameAs(ntb);
-		assertThat(bean.getBeanFactory()).isSameAs(bf);
-	}
-
 	@Test
 	public void testOptionalResourceInjection() {
 		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(OptionalResourceInjectionBean.class));
@@ -2401,7 +2380,6 @@ public NonPublicResourceInjectionBean() {
 
 		@Override
 		@Autowired
-		@Required
 		@SuppressWarnings("deprecation")
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index d4b97bdb19c2..079f39556036 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,27 +154,6 @@ public void testExtendedResourceInjectionWithOverriding() {
 		assertThat(bean.getBeanFactory()).isSameAs(bf);
 	}
 
-	@Test
-	@SuppressWarnings("deprecation")
-	public void testExtendedResourceInjectionWithAtRequired() {
-		bf.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
-		RootBeanDefinition bd = new RootBeanDefinition(TypedExtendedResourceInjectionBean.class);
-		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("annotatedBean", bd);
-		TestBean tb = new TestBean();
-		bf.registerSingleton("testBean", tb);
-		NestedTestBean ntb = new NestedTestBean();
-		bf.registerSingleton("nestedTestBean", ntb);
-
-		TypedExtendedResourceInjectionBean bean = (TypedExtendedResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isSameAs(tb);
-		assertThat(bean.getTestBean2()).isSameAs(tb);
-		assertThat(bean.getTestBean3()).isSameAs(tb);
-		assertThat(bean.getTestBean4()).isSameAs(tb);
-		assertThat(bean.getNestedTestBean()).isSameAs(ntb);
-		assertThat(bean.getBeanFactory()).isSameAs(bf);
-	}
-
 	@Test
 	public void testConstructorResourceInjection() {
 		RootBeanDefinition bd = new RootBeanDefinition(ConstructorResourceInjectionBean.class);
@@ -666,7 +645,6 @@ public ExtendedResourceInjectionBean() {
 
 		@Override
 		@Inject
-		@Required
 		@SuppressWarnings("deprecation")
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java
deleted file mode 100644
index a88a756029b8..000000000000
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * 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.
- * 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.beans.factory.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * @author Rob Harrop
- * @author Chris Beams
- * @since 2.0
- */
-@Deprecated
-public class RequiredAnnotationBeanPostProcessorTests {
-
-	@Test
-	public void testWithRequiredPropertyOmitted() {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
-		BeanDefinition beanDef = BeanDefinitionBuilder
-			.genericBeanDefinition(RequiredTestBean.class)
-			.addPropertyValue("name", "Rob Harrop")
-			.addPropertyValue("favouriteColour", "Blue")
-			.addPropertyValue("jobTitle", "Grand Poobah")
-			.getBeanDefinition();
-		factory.registerBeanDefinition("testBean", beanDef);
-		factory.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
-				factory::preInstantiateSingletons)
-			.withMessageContaining("Property")
-			.withMessageContaining("age")
-			.withMessageContaining("testBean");
-	}
-
-	@Test
-	public void testWithThreeRequiredPropertiesOmitted() {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
-		BeanDefinition beanDef = BeanDefinitionBuilder
-			.genericBeanDefinition(RequiredTestBean.class)
-			.addPropertyValue("name", "Rob Harrop")
-			.getBeanDefinition();
-		factory.registerBeanDefinition("testBean", beanDef);
-		factory.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
-				factory::preInstantiateSingletons)
-			.withMessageContaining("Properties")
-			.withMessageContaining("age")
-			.withMessageContaining("favouriteColour")
-			.withMessageContaining("jobTitle")
-			.withMessageContaining("testBean");
-	}
-
-	@Test
-	public void testWithAllRequiredPropertiesSpecified() {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
-		BeanDefinition beanDef = BeanDefinitionBuilder
-			.genericBeanDefinition(RequiredTestBean.class)
-			.addPropertyValue("age", "24")
-			.addPropertyValue("favouriteColour", "Blue")
-			.addPropertyValue("jobTitle", "Grand Poobah")
-			.getBeanDefinition();
-		factory.registerBeanDefinition("testBean", beanDef);
-		factory.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
-		factory.preInstantiateSingletons();
-		RequiredTestBean bean = (RequiredTestBean) factory.getBean("testBean");
-		assertThat(bean.getAge()).isEqualTo(24);
-		assertThat(bean.getFavouriteColour()).isEqualTo("Blue");
-	}
-
-	@Test
-	public void testWithCustomAnnotation() {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
-		BeanDefinition beanDef = BeanDefinitionBuilder
-			.genericBeanDefinition(RequiredTestBean.class)
-			.getBeanDefinition();
-		factory.registerBeanDefinition("testBean", beanDef);
-		RequiredAnnotationBeanPostProcessor rabpp = new RequiredAnnotationBeanPostProcessor();
-		rabpp.setRequiredAnnotationType(MyRequired.class);
-		factory.addBeanPostProcessor(rabpp);
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
-				factory::preInstantiateSingletons)
-			.withMessageContaining("Property")
-			.withMessageContaining("name")
-			.withMessageContaining("testBean");
-	}
-
-	@Test
-	public void testWithStaticFactoryMethod() {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
-		BeanDefinition beanDef = BeanDefinitionBuilder
-				.genericBeanDefinition(RequiredTestBean.class)
-				.setFactoryMethod("create")
-				.addPropertyValue("name", "Rob Harrop")
-				.addPropertyValue("favouriteColour", "Blue")
-				.addPropertyValue("jobTitle", "Grand Poobah")
-				.getBeanDefinition();
-		factory.registerBeanDefinition("testBean", beanDef);
-		factory.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
-		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
-				factory::preInstantiateSingletons)
-			.withMessageContaining("Property")
-			.withMessageContaining("age")
-			.withMessageContaining("testBean");
-	}
-
-	@Test
-	public void testWithStaticFactoryMethodAndRequiredPropertiesSpecified() {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
-		BeanDefinition beanDef = BeanDefinitionBuilder
-				.genericBeanDefinition(RequiredTestBean.class)
-				.setFactoryMethod("create")
-				.addPropertyValue("age", "24")
-				.addPropertyValue("favouriteColour", "Blue")
-				.addPropertyValue("jobTitle", "Grand Poobah")
-				.getBeanDefinition();
-		factory.registerBeanDefinition("testBean", beanDef);
-		factory.addBeanPostProcessor(new RequiredAnnotationBeanPostProcessor());
-		factory.preInstantiateSingletons();
-		RequiredTestBean bean = (RequiredTestBean) factory.getBean("testBean");
-		assertThat(bean.getAge()).isEqualTo(24);
-		assertThat(bean.getFavouriteColour()).isEqualTo("Blue");
-	}
-
-	@Test
-	public void testWithFactoryBean() {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
-		RootBeanDefinition beanDef = new RootBeanDefinition(RequiredTestBean.class);
-		beanDef.setFactoryBeanName("testBeanFactory");
-		beanDef.setFactoryMethodName("create");
-		factory.registerBeanDefinition("testBean", beanDef);
-		factory.registerBeanDefinition("testBeanFactory", new RootBeanDefinition(RequiredTestBeanFactory.class));
-		RequiredAnnotationBeanPostProcessor bpp = new RequiredAnnotationBeanPostProcessor();
-		bpp.setBeanFactory(factory);
-		factory.addBeanPostProcessor(bpp);
-		factory.preInstantiateSingletons();
-	}
-
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.METHOD)
-	public @interface MyRequired {
-	}
-
-
-	public static class RequiredTestBean implements BeanNameAware, BeanFactoryAware {
-
-		private String name;
-
-		private int age;
-
-		private String favouriteColour;
-
-		private String jobTitle;
-
-
-		public int getAge() {
-			return age;
-		}
-
-		@Required
-		public void setAge(int age) {
-			this.age = age;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		@MyRequired
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public String getFavouriteColour() {
-			return favouriteColour;
-		}
-
-		@Required
-		public void setFavouriteColour(String favouriteColour) {
-			this.favouriteColour = favouriteColour;
-		}
-
-		public String getJobTitle() {
-			return jobTitle;
-		}
-
-		@Required
-		public void setJobTitle(String jobTitle) {
-			this.jobTitle = jobTitle;
-		}
-
-		@Override
-		@Required
-		public void setBeanName(String name) {
-		}
-
-		@Override
-		@Required
-		public void setBeanFactory(BeanFactory beanFactory) {
-		}
-
-		public static RequiredTestBean create() {
-			return new RequiredTestBean();
-		}
-	}
-
-
-	public static class RequiredTestBeanFactory {
-
-		public RequiredTestBean create() {
-			return new RequiredTestBean();
-		}
-	}
-
-}
diff --git a/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java b/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java
index 3e19ca7e9781..f78c6718173b 100644
--- a/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java
+++ b/spring-context/src/jmh/java/org/springframework/context/annotation/AnnotationProcessorBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,6 @@ private static class ResourceAnnotatedTestBean extends org.springframework.beans
 		@Override
 		@Resource
 		@SuppressWarnings("deprecation")
-		@org.springframework.beans.factory.annotation.Required
 		public void setSpouse(ITestBean spouse) {
 			super.setSpouse(spouse);
 		}
@@ -95,7 +94,6 @@ private static class AutowiredAnnotatedTestBean extends TestBean {
 		@Override
 		@Autowired
 		@SuppressWarnings("deprecation")
-		@org.springframework.beans.factory.annotation.Required
 		public void setSpouse(ITestBean spouse) {
 			super.setSpouse(spouse);
 		}
diff --git a/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
index 50516d072743..c7f7ef5da0aa 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,21 +132,6 @@ protected final Cache lookupCache(String name) {
 		return this.cacheMap.get(name);
 	}
 
-	/**
-	 * Dynamically register an additional Cache with this manager.
-	 * @param cache the Cache to register
-	 * @deprecated as of Spring 4.3, in favor of {@link #getMissingCache(String)}
-	 */
-	@Deprecated
-	protected final void addCache(Cache cache) {
-		String name = cache.getName();
-		synchronized (this.cacheMap) {
-			if (this.cacheMap.put(name, decorateCache(cache)) == null) {
-				updateCacheNames(name);
-			}
-		}
-	}
-
 	/**
 	 * Update the exposed {@link #cacheNames} set with the given name.
 	 * <p>This will always be called within a full {@link #cacheMap} lock
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
index 20ed51eff6da..9a1a14629045 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
@@ -83,14 +83,6 @@ public abstract class AnnotationConfigUtils {
 	public static final String AUTOWIRED_ANNOTATION_PROCESSOR_BEAN_NAME =
 			"org.springframework.context.annotation.internalAutowiredAnnotationProcessor";
 
-	/**
-	 * The bean name of the internally managed Required annotation processor.
-	 * @deprecated as of 5.1, since no Required processor is registered by default anymore
-	 */
-	@Deprecated
-	public static final String REQUIRED_ANNOTATION_PROCESSOR_BEAN_NAME =
-			"org.springframework.context.annotation.internalRequiredAnnotationProcessor";
-
 	/**
 	 * The bean name of the internally managed common annotation processor.
 	 */
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
index 2f254d5a7117..14732b178339 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.core.annotation.AliasFor;
 
@@ -239,21 +238,6 @@
 	@AliasFor("value")
 	String[] name() default {};
 
-	/**
-	 * Are dependencies to be injected via convention-based autowiring by name or type?
-	 * <p>Note that this autowire mode is just about externally driven autowiring based
-	 * on bean property setter methods by convention, analogous to XML bean definitions.
-	 * <p>The default mode does allow for annotation-driven autowiring. "no" refers to
-	 * externally driven autowiring only, not affecting any autowiring demands that the
-	 * bean class itself expresses through annotations.
-	 * @see Autowire#BY_NAME
-	 * @see Autowire#BY_TYPE
-	 * @deprecated as of 5.1, since {@code @Bean} factory method argument resolution and
-	 * {@code @Autowired} processing supersede name/type-based bean property injection
-	 */
-	@Deprecated
-	Autowire autowire() default Autowire.NO;
-
 	/**
 	 * Is this bean a candidate for getting autowired into some other bean?
 	 * <p>Default is {@code true}; set this to {@code false} for internal delegates
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index db8c8e2c28d1..18a6245b64ef 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -306,14 +306,6 @@ public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, Str
 		return pvs;
 	}
 
-	@Deprecated
-	@Override
-	public PropertyValues postProcessPropertyValues(
-			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) {
-
-		return postProcessProperties(pvs, bean, beanName);
-	}
-
 
 	private InjectionMetadata findResourceMetadata(String beanName, Class<?> clazz, @Nullable PropertyValues pvs) {
 		// Fall back to class name as cache key, for backwards compatibility with custom callers.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
index 85b45e1574f1..86bcbb5e5bc6 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -30,7 +30,6 @@
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
-import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
@@ -244,16 +243,8 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 		}
 
 		beanDef.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
-		beanDef.setAttribute(org.springframework.beans.factory.annotation.RequiredAnnotationBeanPostProcessor.
-				SKIP_REQUIRED_CHECK_ATTRIBUTE, Boolean.TRUE);
-
 		AnnotationConfigUtils.processCommonDefinitionAnnotations(beanDef, metadata);
 
-		Autowire autowire = bean.getEnum("autowire");
-		if (autowire.isAutowire()) {
-			beanDef.setAutowireMode(autowire.value());
-		}
-
 		boolean autowireCandidate = bean.getBoolean("autowireCandidate");
 		if (!autowireCandidate) {
 			beanDef.setAutowireCandidate(false);
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
index dae989caa666..27b050838cd7 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -935,11 +935,6 @@ protected void finishRefresh() {
 
 		// Publish the final event.
 		publishEvent(new ContextRefreshedEvent(this));
-
-		// Participate in LiveBeansView MBean, if active.
-		if (!NativeDetector.inNativeImage()) {
-			LiveBeansView.registerApplicationContext(this);
-		}
 	}
 
 	/**
@@ -995,18 +990,6 @@ public void run() {
 		}
 	}
 
-	/**
-	 * Callback for destruction of this instance, originally attached
-	 * to a {@code DisposableBean} implementation (not anymore in 5.0).
-	 * <p>The {@link #close()} method is the native way to shut down
-	 * an ApplicationContext, which this method simply delegates to.
-	 * @deprecated as of Spring Framework 5.0, in favor of {@link #close()}
-	 */
-	@Deprecated
-	public void destroy() {
-		close();
-	}
-
 	/**
 	 * Close this application context, destroying all beans in its bean factory.
 	 * <p>Delegates to {@code doClose()} for the actual closing procedure.
@@ -1048,10 +1031,6 @@ protected void doClose() {
 				logger.debug("Closing " + this);
 			}
 
-			if (!NativeDetector.inNativeImage()) {
-				LiveBeansView.unregisterApplicationContext(this);
-			}
-
 			try {
 				// Publish shutdown event.
 				publishEvent(new ContextClosedEvent(this));
diff --git a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
deleted file mode 100644
index 96a9b212e39c..000000000000
--- a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright 2002-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context.support;
-
-import java.lang.management.ManagementFactory;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationContextException;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Adapter for live beans view exposure, building a snapshot of current beans
- * and their dependencies from either a local {@code ApplicationContext} (with a
- * local {@code LiveBeansView} bean definition) or all registered ApplicationContexts
- * (driven by the {@value #MBEAN_DOMAIN_PROPERTY_NAME} environment property).
- *
- * @author Juergen Hoeller
- * @author Stephane Nicoll
- * @since 3.2
- * @see #getSnapshotAsJson()
- * @see org.springframework.web.context.support.LiveBeansViewServlet
- * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs
- */
-@Deprecated
-public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAware {
-
-	/**
-	 * The "MBean Domain" property name.
-	 */
-	public static final String MBEAN_DOMAIN_PROPERTY_NAME = "spring.liveBeansView.mbeanDomain";
-
-	/**
-	 * The MBean application key.
-	 */
-	public static final String MBEAN_APPLICATION_KEY = "application";
-
-	private static final Set<ConfigurableApplicationContext> applicationContexts = new LinkedHashSet<>();
-
-	@Nullable
-	private static String applicationName;
-
-
-	static void registerApplicationContext(ConfigurableApplicationContext applicationContext) {
-		String mbeanDomain = applicationContext.getEnvironment().getProperty(MBEAN_DOMAIN_PROPERTY_NAME);
-		if (mbeanDomain != null) {
-			synchronized (applicationContexts) {
-				if (applicationContexts.isEmpty()) {
-					try {
-						MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-						applicationName = applicationContext.getApplicationName();
-						server.registerMBean(new LiveBeansView(),
-								new ObjectName(mbeanDomain, MBEAN_APPLICATION_KEY, applicationName));
-					}
-					catch (Throwable ex) {
-						throw new ApplicationContextException("Failed to register LiveBeansView MBean", ex);
-					}
-				}
-				applicationContexts.add(applicationContext);
-			}
-		}
-	}
-
-	static void unregisterApplicationContext(ConfigurableApplicationContext applicationContext) {
-		synchronized (applicationContexts) {
-			if (applicationContexts.remove(applicationContext) && applicationContexts.isEmpty()) {
-				try {
-					MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-					String mbeanDomain = applicationContext.getEnvironment().getProperty(MBEAN_DOMAIN_PROPERTY_NAME);
-					if (mbeanDomain != null) {
-						server.unregisterMBean(new ObjectName(mbeanDomain, MBEAN_APPLICATION_KEY, applicationName));
-					}
-				}
-				catch (Throwable ex) {
-					throw new ApplicationContextException("Failed to unregister LiveBeansView MBean", ex);
-				}
-				finally {
-					applicationName = null;
-				}
-			}
-		}
-	}
-
-
-	@Nullable
-	private ConfigurableApplicationContext applicationContext;
-
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) {
-		Assert.isTrue(applicationContext instanceof ConfigurableApplicationContext,
-				"ApplicationContext does not implement ConfigurableApplicationContext");
-		this.applicationContext = (ConfigurableApplicationContext) applicationContext;
-	}
-
-
-	/**
-	 * Generate a JSON snapshot of current beans and their dependencies,
-	 * finding all active ApplicationContexts through {@link #findApplicationContexts()},
-	 * then delegating to {@link #generateJson(java.util.Set)}.
-	 */
-	@Override
-	public String getSnapshotAsJson() {
-		Set<ConfigurableApplicationContext> contexts;
-		if (this.applicationContext != null) {
-			contexts = Collections.singleton(this.applicationContext);
-		}
-		else {
-			contexts = findApplicationContexts();
-		}
-		return generateJson(contexts);
-	}
-
-	/**
-	 * Find all applicable ApplicationContexts for the current application.
-	 * <p>Called if no specific ApplicationContext has been set for this LiveBeansView.
-	 * @return the set of ApplicationContexts
-	 */
-	protected Set<ConfigurableApplicationContext> findApplicationContexts() {
-		synchronized (applicationContexts) {
-			return new LinkedHashSet<>(applicationContexts);
-		}
-	}
-
-	/**
-	 * Actually generate a JSON snapshot of the beans in the given ApplicationContexts.
-	 * <p>This implementation doesn't use any JSON parsing libraries in order to avoid
-	 * third-party library dependencies. It produces an array of context description
-	 * objects, each containing a context and parent attribute as well as a beans
-	 * attribute with nested bean description objects. Each bean object contains a
-	 * bean, scope, type and resource attribute, as well as a dependencies attribute
-	 * with a nested array of bean names that the present bean depends on.
-	 * @param contexts the set of ApplicationContexts
-	 * @return the JSON document
-	 */
-	protected String generateJson(Set<ConfigurableApplicationContext> contexts) {
-		StringBuilder result = new StringBuilder("[\n");
-		for (Iterator<ConfigurableApplicationContext> it = contexts.iterator(); it.hasNext();) {
-			ConfigurableApplicationContext context = it.next();
-			result.append("{\n\"context\": \"").append(context.getId()).append("\",\n");
-			if (context.getParent() != null) {
-				result.append("\"parent\": \"").append(context.getParent().getId()).append("\",\n");
-			}
-			else {
-				result.append("\"parent\": null,\n");
-			}
-			result.append("\"beans\": [\n");
-			ConfigurableListableBeanFactory bf = context.getBeanFactory();
-			String[] beanNames = bf.getBeanDefinitionNames();
-			boolean elementAppended = false;
-			for (String beanName : beanNames) {
-				BeanDefinition bd = bf.getBeanDefinition(beanName);
-				if (isBeanEligible(beanName, bd, bf)) {
-					if (elementAppended) {
-						result.append(",\n");
-					}
-					result.append("{\n\"bean\": \"").append(beanName).append("\",\n");
-					result.append("\"aliases\": ");
-					appendArray(result, bf.getAliases(beanName));
-					result.append(",\n");
-					String scope = bd.getScope();
-					if (!StringUtils.hasText(scope)) {
-						scope = BeanDefinition.SCOPE_SINGLETON;
-					}
-					result.append("\"scope\": \"").append(scope).append("\",\n");
-					Class<?> beanType = bf.getType(beanName);
-					if (beanType != null) {
-						result.append("\"type\": \"").append(beanType.getName()).append("\",\n");
-					}
-					else {
-						result.append("\"type\": null,\n");
-					}
-					result.append("\"resource\": \"").append(getEscapedResourceDescription(bd)).append("\",\n");
-					result.append("\"dependencies\": ");
-					appendArray(result, bf.getDependenciesForBean(beanName));
-					result.append("\n}");
-					elementAppended = true;
-				}
-			}
-			result.append("]\n");
-			result.append('}');
-			if (it.hasNext()) {
-				result.append(",\n");
-			}
-		}
-		result.append(']');
-		return result.toString();
-	}
-
-	/**
-	 * Determine whether the specified bean is eligible for inclusion in the
-	 * LiveBeansView JSON snapshot.
-	 * @param beanName the name of the bean
-	 * @param bd the corresponding bean definition
-	 * @param bf the containing bean factory
-	 * @return {@code true} if the bean is to be included; {@code false} otherwise
-	 */
-	protected boolean isBeanEligible(String beanName, BeanDefinition bd, ConfigurableBeanFactory bf) {
-		return (bd.getRole() != BeanDefinition.ROLE_INFRASTRUCTURE &&
-				(!bd.isLazyInit() || bf.containsSingleton(beanName)));
-	}
-
-	/**
-	 * Determine a resource description for the given bean definition and
-	 * apply basic JSON escaping (backslashes, double quotes) to it.
-	 * @param bd the bean definition to build the resource description for
-	 * @return the JSON-escaped resource description
-	 */
-	@Nullable
-	protected String getEscapedResourceDescription(BeanDefinition bd) {
-		String resourceDescription = bd.getResourceDescription();
-		if (resourceDescription == null) {
-			return null;
-		}
-		StringBuilder result = new StringBuilder(resourceDescription.length() + 16);
-		for (int i = 0; i < resourceDescription.length(); i++) {
-			char character = resourceDescription.charAt(i);
-			if (character == '\\') {
-				result.append('/');
-			}
-			else if (character == '"') {
-				result.append("\\").append('"');
-			}
-			else {
-				result.append(character);
-			}
-		}
-		return result.toString();
-	}
-
-	private void appendArray(StringBuilder result, String[] arr) {
-		result.append('[');
-		if (arr.length > 0) {
-			result.append('\"');
-		}
-		result.append(StringUtils.arrayToDelimitedString(arr, "\", \""));
-		if (arr.length > 0) {
-			result.append('\"');
-		}
-		result.append(']');
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java b/spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java
deleted file mode 100644
index b8e0ba01bdf3..000000000000
--- a/spring-context/src/main/java/org/springframework/context/support/LiveBeansViewMBean.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context.support;
-
-/**
- * MBean operation interface for the {@link LiveBeansView} feature.
- *
- * @author Juergen Hoeller
- * @since 3.2
- * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs
- */
-@Deprecated
-public interface LiveBeansViewMBean {
-
-	/**
-	 * Generate a JSON snapshot of current beans and their dependencies.
-	 */
-	String getSnapshotAsJson();
-
-}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
index 0ba5a8726535..e334bddff55a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -46,15 +45,6 @@
  */
 public class BeanAnnotationAttributePropagationTests {
 
-	@Test
-	public void autowireMetadataIsPropagated() {
-		@Configuration class Config {
-			@Bean(autowire=Autowire.BY_TYPE) Object foo() { return null; }
-		}
-
-		assertThat(beanDef(Config.class).getAutowireMode()).as("autowire mode was not propagated").isEqualTo(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
-	}
-
 	@Test
 	public void autowireCandidateMetadataIsPropagated() {
 		@Configuration class Config {
diff --git a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java b/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
deleted file mode 100644
index 983fa9bc88c7..000000000000
--- a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2002-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context.support;
-
-import java.lang.management.ManagementFactory;
-import java.util.Set;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.mock.env.MockEnvironment;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
-/**
- * Tests for {@link LiveBeansView}
- *
- * @author Stephane Nicoll
- * @author Sam Brannen
- */
-@SuppressWarnings("deprecation")
-class LiveBeansViewTests {
-
-	private final MockEnvironment environment = new MockEnvironment();
-
-
-	@Test
-	void registerIgnoredIfPropertyIsNotSet(TestInfo testInfo) throws MalformedObjectNameException {
-		ConfigurableApplicationContext context = createApplicationContext("app");
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-		LiveBeansView.registerApplicationContext(context);
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-		LiveBeansView.unregisterApplicationContext(context);
-	}
-
-	@Test
-	void registerUnregisterSingleContext(TestInfo testInfo) throws MalformedObjectNameException {
-		this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME,
-			testInfo.getTestMethod().get().getName());
-		ConfigurableApplicationContext context = createApplicationContext("app");
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-		LiveBeansView.registerApplicationContext(context);
-		assertSingleLiveBeansViewMbean(testInfo, "app");
-		LiveBeansView.unregisterApplicationContext(context);
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-	}
-
-	@Test
-	void registerUnregisterSeveralContexts(TestInfo testInfo) throws MalformedObjectNameException {
-		this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME,
-			testInfo.getTestMethod().get().getName());
-		ConfigurableApplicationContext context = createApplicationContext("app");
-		ConfigurableApplicationContext childContext = createApplicationContext("child");
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-		LiveBeansView.registerApplicationContext(context);
-		assertSingleLiveBeansViewMbean(testInfo, "app");
-		LiveBeansView.registerApplicationContext(childContext);
-		// Only one MBean
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(1);
-		LiveBeansView.unregisterApplicationContext(childContext);
-		assertSingleLiveBeansViewMbean(testInfo, "app"); // Root context removes it
-		LiveBeansView.unregisterApplicationContext(context);
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-	}
-
-	@Test
-	void registerUnregisterSeveralContextsDifferentOrder(TestInfo testInfo) throws MalformedObjectNameException {
-		this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME,
-			testInfo.getTestMethod().get().getName());
-		ConfigurableApplicationContext context = createApplicationContext("app");
-		ConfigurableApplicationContext childContext = createApplicationContext("child");
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-		LiveBeansView.registerApplicationContext(context);
-		assertSingleLiveBeansViewMbean(testInfo, "app");
-		LiveBeansView.registerApplicationContext(childContext);
-		assertSingleLiveBeansViewMbean(testInfo, "app"); // Only one MBean
-		LiveBeansView.unregisterApplicationContext(context);
-		LiveBeansView.unregisterApplicationContext(childContext);
-		assertThat(searchLiveBeansViewMeans(testInfo).size()).isEqualTo(0);
-	}
-
-	private ConfigurableApplicationContext createApplicationContext(String applicationName) {
-		ConfigurableApplicationContext context = mock(ConfigurableApplicationContext.class);
-		given(context.getEnvironment()).willReturn(this.environment);
-		given(context.getApplicationName()).willReturn(applicationName);
-		return context;
-	}
-
-	private void assertSingleLiveBeansViewMbean(TestInfo testInfo, String applicationName) throws MalformedObjectNameException {
-		Set<ObjectName> objectNames = searchLiveBeansViewMeans(testInfo);
-		assertThat(objectNames.size()).isEqualTo(1);
-		assertThat(objectNames.iterator().next().getCanonicalName()).as("Wrong MBean name").isEqualTo(
-			String.format("%s:application=%s", testInfo.getTestMethod().get().getName(), applicationName));
-	}
-
-	private Set<ObjectName> searchLiveBeansViewMeans(TestInfo testInfo) throws MalformedObjectNameException {
-		String objectName = String.format("%s:*,%s=*", testInfo.getTestMethod().get().getName(),
-			LiveBeansView.MBEAN_APPLICATION_KEY);
-		return ManagementFactory.getPlatformMBeanServer().queryNames(new ObjectName(objectName), null);
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java
index e805414c1309..5749d859eb3a 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -207,17 +207,6 @@ private Charset getCharset(@Nullable MimeType mimeType) {
 		}
 	}
 
-	/**
-	 * Create a {@code StringDecoder} for {@code "text/plain"}.
-	 * @param stripDelimiter this flag is ignored
-	 * @deprecated as of Spring 5.0.4, in favor of {@link #textPlainOnly()} or
-	 * {@link #textPlainOnly(List, boolean)}
-	 */
-	@Deprecated
-	public static StringDecoder textPlainOnly(boolean stripDelimiter) {
-		return textPlainOnly();
-	}
-
 	/**
 	 * Create a {@code StringDecoder} for {@code "text/plain"}.
 	 */
@@ -235,17 +224,6 @@ public static StringDecoder textPlainOnly(List<String> delimiters, boolean strip
 		return new StringDecoder(delimiters, stripDelimiter, new MimeType("text", "plain", DEFAULT_CHARSET));
 	}
 
-	/**
-	 * Create a {@code StringDecoder} that supports all MIME types.
-	 * @param stripDelimiter this flag is ignored
-	 * @deprecated as of Spring 5.0.4, in favor of {@link #allMimeTypes()} or
-	 * {@link #allMimeTypes(List, boolean)}
-	 */
-	@Deprecated
-	public static StringDecoder allMimeTypes(boolean stripDelimiter) {
-		return allMimeTypes();
-	}
-
 	/**
 	 * Create a {@code StringDecoder} that supports all MIME types.
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
index cbaad7001b8c..2ba871bbc1e8 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
@@ -99,22 +99,6 @@ public ClassPathResource(String path, @Nullable Class<?> clazz) {
 		this.clazz = clazz;
 	}
 
-	/**
-	 * Create a new {@code ClassPathResource} with optional {@code ClassLoader}
-	 * and {@code Class}. Only for internal usage.
-	 * @param path relative or absolute path within the classpath
-	 * @param classLoader the class loader to load the resource with, if any
-	 * @param clazz the class to load resources with, if any
-	 * @deprecated as of 4.3.13, in favor of selective use of
-	 * {@link #ClassPathResource(String, ClassLoader)} vs {@link #ClassPathResource(String, Class)}
-	 */
-	@Deprecated
-	protected ClassPathResource(String path, @Nullable ClassLoader classLoader, @Nullable Class<?> clazz) {
-		this.path = StringUtils.cleanPath(path);
-		this.classLoader = classLoader;
-		this.clazz = clazz;
-	}
-
 
 	/**
 	 * Return the path for this resource (as resource path within the class path).
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java
deleted file mode 100644
index 356ab5b46159..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java
+++ /dev/null
@@ -1,105 +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.core.type.classreading;
-
-import java.lang.reflect.Field;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.asm.AnnotationVisitor;
-import org.springframework.asm.SpringAsmInfo;
-import org.springframework.asm.Type;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * {@link AnnotationVisitor} to recursively visit annotations.
- *
- * @author Chris Beams
- * @author Juergen Hoeller
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 3.1.1
- * @deprecated As of Spring Framework 5.2, this class and related classes in this
- * package have been replaced by {@link SimpleAnnotationMetadataReadingVisitor}
- * and related classes for internal use within the framework.
- */
-@Deprecated
-abstract class AbstractRecursiveAnnotationVisitor extends AnnotationVisitor {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	protected final AnnotationAttributes attributes;
-
-	@Nullable
-	protected final ClassLoader classLoader;
-
-
-	public AbstractRecursiveAnnotationVisitor(@Nullable ClassLoader classLoader, AnnotationAttributes attributes) {
-		super(SpringAsmInfo.ASM_VERSION);
-		this.classLoader = classLoader;
-		this.attributes = attributes;
-	}
-
-
-	@Override
-	public void visit(String attributeName, Object attributeValue) {
-		this.attributes.put(attributeName, attributeValue);
-	}
-
-	@Override
-	public AnnotationVisitor visitAnnotation(String attributeName, String asmTypeDescriptor) {
-		String annotationType = Type.getType(asmTypeDescriptor).getClassName();
-		AnnotationAttributes nestedAttributes = new AnnotationAttributes(annotationType, this.classLoader);
-		this.attributes.put(attributeName, nestedAttributes);
-		return new RecursiveAnnotationAttributesVisitor(annotationType, nestedAttributes, this.classLoader);
-	}
-
-	@Override
-	public AnnotationVisitor visitArray(String attributeName) {
-		return new RecursiveAnnotationArrayVisitor(attributeName, this.attributes, this.classLoader);
-	}
-
-	@Override
-	public void visitEnum(String attributeName, String asmTypeDescriptor, String attributeValue) {
-		Object newValue = getEnumValue(asmTypeDescriptor, attributeValue);
-		visit(attributeName, newValue);
-	}
-
-	protected Object getEnumValue(String asmTypeDescriptor, String attributeValue) {
-		Object valueToUse = attributeValue;
-		try {
-			Class<?> enumType = ClassUtils.forName(Type.getType(asmTypeDescriptor).getClassName(), this.classLoader);
-			Field enumConstant = ReflectionUtils.findField(enumType, attributeValue);
-			if (enumConstant != null) {
-				ReflectionUtils.makeAccessible(enumConstant);
-				valueToUse = enumConstant.get(null);
-			}
-		}
-		catch (ClassNotFoundException | NoClassDefFoundError ex) {
-			logger.debug("Failed to classload enum type while reading annotation metadata", ex);
-		}
-		catch (IllegalAccessException ex) {
-			logger.debug("Could not access enum value while reading annotation metadata", ex);
-		}
-		return valueToUse;
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
deleted file mode 100644
index ba1bfe06cfee..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.
- * 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.core.type.classreading;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Modifier;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.ObjectUtils;
-
-/**
- * ASM visitor which looks for annotations defined on a class or method,
- * including meta-annotations.
- *
- * <p>This visitor is fully recursive, taking into account any nested
- * annotations or nested annotation arrays.
- *
- * @author Juergen Hoeller
- * @author Chris Beams
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 3.0
- * @deprecated As of Spring Framework 5.2, this class and related classes in this
- * package have been replaced by {@link SimpleAnnotationMetadataReadingVisitor}
- * and related classes for internal use within the framework.
- */
-@Deprecated
-final class AnnotationAttributesReadingVisitor extends RecursiveAnnotationAttributesVisitor {
-
-	private final MultiValueMap<String, AnnotationAttributes> attributesMap;
-
-	private final Map<String, Set<String>> metaAnnotationMap;
-
-
-	public AnnotationAttributesReadingVisitor(String annotationType,
-			MultiValueMap<String, AnnotationAttributes> attributesMap, Map<String, Set<String>> metaAnnotationMap,
-			@Nullable ClassLoader classLoader) {
-
-		super(annotationType, new AnnotationAttributes(annotationType, classLoader), classLoader);
-		this.attributesMap = attributesMap;
-		this.metaAnnotationMap = metaAnnotationMap;
-	}
-
-
-	@Override
-	public void visitEnd() {
-		super.visitEnd();
-
-		Class<? extends Annotation> annotationClass = this.attributes.annotationType();
-		if (annotationClass != null) {
-			List<AnnotationAttributes> attributeList = this.attributesMap.get(this.annotationType);
-			if (attributeList == null) {
-				this.attributesMap.add(this.annotationType, this.attributes);
-			}
-			else {
-				attributeList.add(0, this.attributes);
-			}
-			if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotationClass.getName())) {
-				try {
-					Annotation[] metaAnnotations = annotationClass.getAnnotations();
-					if (!ObjectUtils.isEmpty(metaAnnotations)) {
-						Set<Annotation> visited = new LinkedHashSet<>();
-						for (Annotation metaAnnotation : metaAnnotations) {
-							recursivelyCollectMetaAnnotations(visited, metaAnnotation);
-						}
-						if (!visited.isEmpty()) {
-							Set<String> metaAnnotationTypeNames = new LinkedHashSet<>(visited.size());
-							for (Annotation ann : visited) {
-								metaAnnotationTypeNames.add(ann.annotationType().getName());
-							}
-							this.metaAnnotationMap.put(annotationClass.getName(), metaAnnotationTypeNames);
-						}
-					}
-				}
-				catch (Throwable ex) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Failed to introspect meta-annotations on " + annotationClass + ": " + ex);
-					}
-				}
-			}
-		}
-	}
-
-	private void recursivelyCollectMetaAnnotations(Set<Annotation> visited, Annotation annotation) {
-		Class<? extends Annotation> annotationType = annotation.annotationType();
-		String annotationName = annotationType.getName();
-		if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotationName) && visited.add(annotation)) {
-			try {
-				// Only do attribute scanning for public annotations.
-				if (Modifier.isPublic(annotationType.getModifiers())) {
-					this.attributesMap.add(annotationName,
-							AnnotationUtils.getAnnotationAttributes(annotation, false, true));
-				}
-				for (Annotation metaMetaAnnotation : annotationType.getAnnotations()) {
-					recursivelyCollectMetaAnnotations(visited, metaMetaAnnotation);
-				}
-			}
-			catch (Throwable ex) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Failed to introspect meta-annotations on " + annotation + ": " + ex);
-				}
-			}
-		}
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
deleted file mode 100644
index 9435af78ed7c..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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.
- * 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.core.type.classreading;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.asm.AnnotationVisitor;
-import org.springframework.asm.MethodVisitor;
-import org.springframework.asm.Opcodes;
-import org.springframework.asm.Type;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.annotation.MergedAnnotations;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.core.type.MethodMetadata;
-import org.springframework.lang.Nullable;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-/**
- * ASM class visitor which looks for the class name and implemented types as
- * well as for the annotations defined on the class, exposing them through
- * the {@link org.springframework.core.type.AnnotationMetadata} interface.
- *
- * @author Juergen Hoeller
- * @author Mark Fisher
- * @author Costin Leau
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 2.5
- * @deprecated As of Spring Framework 5.2, this class has been replaced by
- * {@link SimpleAnnotationMetadataReadingVisitor} for internal use within the
- * framework, but there is no public replacement for
- * {@code AnnotationMetadataReadingVisitor}.
- */
-@Deprecated
-public class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor implements AnnotationMetadata {
-
-	@Nullable
-	protected final ClassLoader classLoader;
-
-	protected final Set<String> annotationSet = new LinkedHashSet<>(4);
-
-	protected final Map<String, Set<String>> metaAnnotationMap = new LinkedHashMap<>(4);
-
-	/**
-	 * Declared as a {@link LinkedMultiValueMap} instead of a {@link MultiValueMap}
-	 * to ensure that the hierarchical ordering of the entries is preserved.
-	 * @see AnnotationReadingVisitorUtils#getMergedAnnotationAttributes
-	 */
-	protected final LinkedMultiValueMap<String, AnnotationAttributes> attributesMap = new LinkedMultiValueMap<>(3);
-
-	protected final Set<MethodMetadata> methodMetadataSet = new LinkedHashSet<>(4);
-
-
-	public AnnotationMetadataReadingVisitor(@Nullable ClassLoader classLoader) {
-		this.classLoader = classLoader;
-	}
-
-
-	@Override
-	public MergedAnnotations getAnnotations() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-		// Skip bridge methods - we're only interested in original annotation-defining user methods.
-		// On JDK 8, we'd otherwise run into double detection of the same annotated method...
-		if ((access & Opcodes.ACC_BRIDGE) != 0) {
-			return super.visitMethod(access, name, desc, signature, exceptions);
-		}
-		return new MethodMetadataReadingVisitor(name, access, getClassName(),
-				Type.getReturnType(desc).getClassName(), this.classLoader, this.methodMetadataSet);
-	}
-
-	@Override
-	@Nullable
-	public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-		if (!visible) {
-			return null;
-		}
-		String className = Type.getType(desc).getClassName();
-		if (AnnotationUtils.isInJavaLangAnnotationPackage(className)) {
-			return null;
-		}
-		this.annotationSet.add(className);
-		return new AnnotationAttributesReadingVisitor(
-				className, this.attributesMap, this.metaAnnotationMap, this.classLoader);
-	}
-
-
-	@Override
-	public Set<String> getAnnotationTypes() {
-		return this.annotationSet;
-	}
-
-	@Override
-	public Set<String> getMetaAnnotationTypes(String annotationName) {
-		Set<String> metaAnnotationTypes = this.metaAnnotationMap.get(annotationName);
-		return (metaAnnotationTypes != null ? metaAnnotationTypes : Collections.emptySet());
-	}
-
-	@Override
-	public boolean hasMetaAnnotation(String metaAnnotationType) {
-		if (AnnotationUtils.isInJavaLangAnnotationPackage(metaAnnotationType)) {
-			return false;
-		}
-		Collection<Set<String>> allMetaTypes = this.metaAnnotationMap.values();
-		for (Set<String> metaTypes : allMetaTypes) {
-			if (metaTypes.contains(metaAnnotationType)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isAnnotated(String annotationName) {
-		return (!AnnotationUtils.isInJavaLangAnnotationPackage(annotationName) &&
-				this.attributesMap.containsKey(annotationName));
-	}
-
-	@Override
-	public boolean hasAnnotation(String annotationName) {
-		return getAnnotationTypes().contains(annotationName);
-	}
-
-	@Override
-	@Nullable
-	public AnnotationAttributes getAnnotationAttributes(String annotationName, boolean classValuesAsString) {
-		AnnotationAttributes raw = AnnotationReadingVisitorUtils.getMergedAnnotationAttributes(
-				this.attributesMap, this.metaAnnotationMap, annotationName);
-		if (raw == null) {
-			return null;
-		}
-		return AnnotationReadingVisitorUtils.convertClassValues(
-				"class '" + getClassName() + "'", this.classLoader, raw, classValuesAsString);
-	}
-
-	@Override
-	@Nullable
-	public MultiValueMap<String, Object> getAllAnnotationAttributes(String annotationName, boolean classValuesAsString) {
-		MultiValueMap<String, Object> allAttributes = new LinkedMultiValueMap<>();
-		List<AnnotationAttributes> attributes = this.attributesMap.get(annotationName);
-		if (attributes == null) {
-			return null;
-		}
-		String annotatedElement = "class '" + getClassName() + "'";
-		for (AnnotationAttributes raw : attributes) {
-			for (Map.Entry<String, Object> entry : AnnotationReadingVisitorUtils.convertClassValues(
-					annotatedElement, this.classLoader, raw, classValuesAsString).entrySet()) {
-				allAttributes.add(entry.getKey(), entry.getValue());
-			}
-		}
-		return allAttributes;
-	}
-
-	@Override
-	public boolean hasAnnotatedMethods(String annotationName) {
-		for (MethodMetadata methodMetadata : this.methodMetadataSet) {
-			if (methodMetadata.isAnnotated(annotationName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public Set<MethodMetadata> getAnnotatedMethods(String annotationName) {
-		Set<MethodMetadata> annotatedMethods = new LinkedHashSet<>(4);
-		for (MethodMetadata methodMetadata : this.methodMetadataSet) {
-			if (methodMetadata.isAnnotated(annotationName)) {
-				annotatedMethods.add(methodMetadata);
-			}
-		}
-		return annotatedMethods;
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
deleted file mode 100644
index 98bb301ba40b..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
+++ /dev/null
@@ -1,172 +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.core.type.classreading;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.asm.Type;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Internal utility class used when reading annotations via ASM.
- *
- * @author Juergen Hoeller
- * @author Mark Fisher
- * @author Costin Leau
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 4.0
- * @deprecated As of Spring Framework 5.2, this class and related classes in this
- * package have been replaced by {@link SimpleAnnotationMetadataReadingVisitor}
- * and related classes for internal use within the framework.
- */
-@Deprecated
-abstract class AnnotationReadingVisitorUtils {
-
-	public static AnnotationAttributes convertClassValues(Object annotatedElement,
-			@Nullable ClassLoader classLoader, AnnotationAttributes original, boolean classValuesAsString) {
-
-		AnnotationAttributes result = new AnnotationAttributes(original);
-		AnnotationUtils.postProcessAnnotationAttributes(annotatedElement, result, classValuesAsString);
-
-		for (Map.Entry<String, Object> entry : result.entrySet()) {
-			try {
-				Object value = entry.getValue();
-				if (value instanceof AnnotationAttributes) {
-					value = convertClassValues(
-							annotatedElement, classLoader, (AnnotationAttributes) value, classValuesAsString);
-				}
-				else if (value instanceof AnnotationAttributes[] values) {
-					for (int i = 0; i < values.length; i++) {
-						values[i] = convertClassValues(annotatedElement, classLoader, values[i], classValuesAsString);
-					}
-					value = values;
-				}
-				else if (value instanceof Type) {
-					value = (classValuesAsString ? ((Type) value).getClassName() :
-							ClassUtils.forName(((Type) value).getClassName(), classLoader));
-				}
-				else if (value instanceof Type[] array) {
-					Object[] convArray =
-							(classValuesAsString ? new String[array.length] : new Class<?>[array.length]);
-					for (int i = 0; i < array.length; i++) {
-						convArray[i] = (classValuesAsString ? array[i].getClassName() :
-								ClassUtils.forName(array[i].getClassName(), classLoader));
-					}
-					value = convArray;
-				}
-				else if (classValuesAsString) {
-					if (value instanceof Class) {
-						value = ((Class<?>) value).getName();
-					}
-					else if (value instanceof Class[]) {
-						Class<?>[] clazzArray = (Class<?>[]) value;
-						String[] newValue = new String[clazzArray.length];
-						for (int i = 0; i < clazzArray.length; i++) {
-							newValue[i] = clazzArray[i].getName();
-						}
-						value = newValue;
-					}
-				}
-				entry.setValue(value);
-			}
-			catch (Throwable ex) {
-				// Class not found - can't resolve class reference in annotation attribute.
-				result.put(entry.getKey(), ex);
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Retrieve the merged attributes of the annotation of the given type,
-	 * if any, from the supplied {@code attributesMap}.
-	 * <p>Annotation attribute values appearing <em>lower</em> in the annotation
-	 * hierarchy (i.e., closer to the declaring class) will override those
-	 * defined <em>higher</em> in the annotation hierarchy.
-	 * @param attributesMap the map of annotation attribute lists, keyed by
-	 * annotation type name
-	 * @param metaAnnotationMap the map of meta annotation relationships,
-	 * keyed by annotation type name
-	 * @param annotationName the fully qualified class name of the annotation
-	 * type to look for
-	 * @return the merged annotation attributes, or {@code null} if no
-	 * matching annotation is present in the {@code attributesMap}
-	 * @since 4.0.3
-	 */
-	@Nullable
-	public static AnnotationAttributes getMergedAnnotationAttributes(
-			LinkedMultiValueMap<String, AnnotationAttributes> attributesMap,
-			Map<String, Set<String>> metaAnnotationMap, String annotationName) {
-
-		// Get the unmerged list of attributes for the target annotation.
-		List<AnnotationAttributes> attributesList = attributesMap.get(annotationName);
-		if (CollectionUtils.isEmpty(attributesList)) {
-			return null;
-		}
-
-		// To start with, we populate the result with a copy of all attribute values
-		// from the target annotation. A copy is necessary so that we do not
-		// inadvertently mutate the state of the metadata passed to this method.
-		AnnotationAttributes result = new AnnotationAttributes(attributesList.get(0));
-
-		Set<String> overridableAttributeNames = new HashSet<>(result.keySet());
-		overridableAttributeNames.remove(AnnotationUtils.VALUE);
-
-		// Since the map is a LinkedMultiValueMap, we depend on the ordering of
-		// elements in the map and reverse the order of the keys in order to traverse
-		// "down" the annotation hierarchy.
-		List<String> annotationTypes = new ArrayList<>(attributesMap.keySet());
-		Collections.reverse(annotationTypes);
-
-		// No need to revisit the target annotation type:
-		annotationTypes.remove(annotationName);
-
-		for (String currentAnnotationType : annotationTypes) {
-			List<AnnotationAttributes> currentAttributesList = attributesMap.get(currentAnnotationType);
-			if (!ObjectUtils.isEmpty(currentAttributesList)) {
-				Set<String> metaAnns = metaAnnotationMap.get(currentAnnotationType);
-				if (metaAnns != null && metaAnns.contains(annotationName)) {
-					AnnotationAttributes currentAttributes = currentAttributesList.get(0);
-					for (String overridableAttributeName : overridableAttributeNames) {
-						Object value = currentAttributes.get(overridableAttributeName);
-						if (value != null) {
-							// Store the value, potentially overriding a value from an attribute
-							// of the same name found higher in the annotation hierarchy.
-							result.put(overridableAttributeName, value);
-						}
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
deleted file mode 100644
index c80520cb5e77..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
+++ /dev/null
@@ -1,244 +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.core.type.classreading;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.springframework.asm.AnnotationVisitor;
-import org.springframework.asm.Attribute;
-import org.springframework.asm.ClassVisitor;
-import org.springframework.asm.FieldVisitor;
-import org.springframework.asm.MethodVisitor;
-import org.springframework.asm.Opcodes;
-import org.springframework.asm.SpringAsmInfo;
-import org.springframework.core.type.ClassMetadata;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * ASM class visitor which looks only for the class name and implemented types,
- * exposing them through the {@link org.springframework.core.type.ClassMetadata}
- * interface.
- *
- * @author Rod Johnson
- * @author Costin Leau
- * @author Mark Fisher
- * @author Ramnivas Laddad
- * @author Chris Beams
- * @since 2.5
- * @deprecated As of Spring Framework 5.2, this class and related classes in this
- * package have been replaced by {@link SimpleAnnotationMetadataReadingVisitor}
- * and related classes for internal use within the framework.
- */
-@Deprecated
-class ClassMetadataReadingVisitor extends ClassVisitor implements ClassMetadata {
-
-	private String className = "";
-
-	private boolean isInterface;
-
-	private boolean isAnnotation;
-
-	private boolean isAbstract;
-
-	private boolean isFinal;
-
-	@Nullable
-	private String enclosingClassName;
-
-	private boolean independentInnerClass;
-
-	@Nullable
-	private String superClassName;
-
-	private String[] interfaces = new String[0];
-
-	private final Set<String> memberClassNames = new LinkedHashSet<>(4);
-
-
-	public ClassMetadataReadingVisitor() {
-		super(SpringAsmInfo.ASM_VERSION);
-	}
-
-
-	@Override
-	public void visit(
-			int version, int access, String name, String signature, @Nullable String supername, String[] interfaces) {
-
-		this.className = ClassUtils.convertResourcePathToClassName(name);
-		this.isInterface = ((access & Opcodes.ACC_INTERFACE) != 0);
-		this.isAnnotation = ((access & Opcodes.ACC_ANNOTATION) != 0);
-		this.isAbstract = ((access & Opcodes.ACC_ABSTRACT) != 0);
-		this.isFinal = ((access & Opcodes.ACC_FINAL) != 0);
-		if (supername != null && !this.isInterface) {
-			this.superClassName = ClassUtils.convertResourcePathToClassName(supername);
-		}
-		this.interfaces = new String[interfaces.length];
-		for (int i = 0; i < interfaces.length; i++) {
-			this.interfaces[i] = ClassUtils.convertResourcePathToClassName(interfaces[i]);
-		}
-	}
-
-	@Override
-	public void visitOuterClass(String owner, String name, String desc) {
-		this.enclosingClassName = ClassUtils.convertResourcePathToClassName(owner);
-	}
-
-	@Override
-	public void visitInnerClass(String name, @Nullable String outerName, String innerName, int access) {
-		if (outerName != null) {
-			String fqName = ClassUtils.convertResourcePathToClassName(name);
-			String fqOuterName = ClassUtils.convertResourcePathToClassName(outerName);
-			if (this.className.equals(fqName)) {
-				this.enclosingClassName = fqOuterName;
-				this.independentInnerClass = ((access & Opcodes.ACC_STATIC) != 0);
-			}
-			else if (this.className.equals(fqOuterName)) {
-				this.memberClassNames.add(fqName);
-			}
-		}
-	}
-
-	@Override
-	public void visitSource(String source, String debug) {
-		// no-op
-	}
-
-	@Override
-	@Nullable
-	public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-		// no-op
-		return new EmptyAnnotationVisitor();
-	}
-
-	@Override
-	public void visitAttribute(Attribute attr) {
-		// no-op
-	}
-
-	@Override
-	public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
-		// no-op
-		return new EmptyFieldVisitor();
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-		// no-op
-		return new EmptyMethodVisitor();
-	}
-
-	@Override
-	public void visitEnd() {
-		// no-op
-	}
-
-
-	@Override
-	public String getClassName() {
-		return this.className;
-	}
-
-	@Override
-	public boolean isInterface() {
-		return this.isInterface;
-	}
-
-	@Override
-	public boolean isAnnotation() {
-		return this.isAnnotation;
-	}
-
-	@Override
-	public boolean isAbstract() {
-		return this.isAbstract;
-	}
-
-	@Override
-	public boolean isFinal() {
-		return this.isFinal;
-	}
-
-	@Override
-	public boolean isIndependent() {
-		return (this.enclosingClassName == null || this.independentInnerClass);
-	}
-
-	@Override
-	public boolean hasEnclosingClass() {
-		return (this.enclosingClassName != null);
-	}
-
-	@Override
-	@Nullable
-	public String getEnclosingClassName() {
-		return this.enclosingClassName;
-	}
-
-	@Override
-	@Nullable
-	public String getSuperClassName() {
-		return this.superClassName;
-	}
-
-	@Override
-	public String[] getInterfaceNames() {
-		return this.interfaces;
-	}
-
-	@Override
-	public String[] getMemberClassNames() {
-		return StringUtils.toStringArray(this.memberClassNames);
-	}
-
-
-	private static class EmptyAnnotationVisitor extends AnnotationVisitor {
-
-		public EmptyAnnotationVisitor() {
-			super(SpringAsmInfo.ASM_VERSION);
-		}
-
-		@Override
-		public AnnotationVisitor visitAnnotation(String name, String desc) {
-			return this;
-		}
-
-		@Override
-		public AnnotationVisitor visitArray(String name) {
-			return this;
-		}
-	}
-
-
-	private static class EmptyMethodVisitor extends MethodVisitor {
-
-		public EmptyMethodVisitor() {
-			super(SpringAsmInfo.ASM_VERSION);
-		}
-	}
-
-
-	private static class EmptyFieldVisitor extends FieldVisitor {
-
-		public EmptyFieldVisitor() {
-			super(SpringAsmInfo.ASM_VERSION);
-		}
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
deleted file mode 100644
index f352428b33d4..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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.
- * 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.core.type.classreading;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.asm.AnnotationVisitor;
-import org.springframework.asm.MethodVisitor;
-import org.springframework.asm.Opcodes;
-import org.springframework.asm.SpringAsmInfo;
-import org.springframework.asm.Type;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.annotation.MergedAnnotations;
-import org.springframework.core.type.MethodMetadata;
-import org.springframework.lang.Nullable;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-/**
- * ASM method visitor which looks for the annotations defined on a method,
- * exposing them through the {@link org.springframework.core.type.MethodMetadata}
- * interface.
- *
- * @author Juergen Hoeller
- * @author Mark Pollack
- * @author Costin Leau
- * @author Chris Beams
- * @author Phillip Webb
- * @since 3.0
- * @deprecated As of Spring Framework 5.2, this class and related classes in this
- * package have been replaced by {@link SimpleAnnotationMetadataReadingVisitor}
- * and related classes for internal use within the framework.
- */
-@Deprecated
-public class MethodMetadataReadingVisitor extends MethodVisitor implements MethodMetadata {
-
-	protected final String methodName;
-
-	protected final int access;
-
-	protected final String declaringClassName;
-
-	protected final String returnTypeName;
-
-	@Nullable
-	protected final ClassLoader classLoader;
-
-	protected final Set<MethodMetadata> methodMetadataSet;
-
-	protected final Map<String, Set<String>> metaAnnotationMap = new LinkedHashMap<>(4);
-
-	protected final LinkedMultiValueMap<String, AnnotationAttributes> attributesMap = new LinkedMultiValueMap<>(3);
-
-
-	public MethodMetadataReadingVisitor(String methodName, int access, String declaringClassName,
-			String returnTypeName, @Nullable ClassLoader classLoader, Set<MethodMetadata> methodMetadataSet) {
-
-		super(SpringAsmInfo.ASM_VERSION);
-		this.methodName = methodName;
-		this.access = access;
-		this.declaringClassName = declaringClassName;
-		this.returnTypeName = returnTypeName;
-		this.classLoader = classLoader;
-		this.methodMetadataSet = methodMetadataSet;
-	}
-
-
-	@Override
-	public MergedAnnotations getAnnotations() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	@Nullable
-	public AnnotationVisitor visitAnnotation(final String desc, boolean visible) {
-		if (!visible) {
-			return null;
-		}
-		this.methodMetadataSet.add(this);
-		String className = Type.getType(desc).getClassName();
-		return new AnnotationAttributesReadingVisitor(
-				className, this.attributesMap, this.metaAnnotationMap, this.classLoader);
-	}
-
-
-	@Override
-	public String getMethodName() {
-		return this.methodName;
-	}
-
-	@Override
-	public boolean isAbstract() {
-		return ((this.access & Opcodes.ACC_ABSTRACT) != 0);
-	}
-
-	@Override
-	public boolean isStatic() {
-		return ((this.access & Opcodes.ACC_STATIC) != 0);
-	}
-
-	@Override
-	public boolean isFinal() {
-		return ((this.access & Opcodes.ACC_FINAL) != 0);
-	}
-
-	@Override
-	public boolean isOverridable() {
-		return (!isStatic() && !isFinal() && ((this.access & Opcodes.ACC_PRIVATE) == 0));
-	}
-
-	@Override
-	public boolean isAnnotated(String annotationName) {
-		return this.attributesMap.containsKey(annotationName);
-	}
-
-	@Override
-	@Nullable
-	public AnnotationAttributes getAnnotationAttributes(String annotationName, boolean classValuesAsString) {
-		AnnotationAttributes raw = AnnotationReadingVisitorUtils.getMergedAnnotationAttributes(
-				this.attributesMap, this.metaAnnotationMap, annotationName);
-		if (raw == null) {
-			return null;
-		}
-		return AnnotationReadingVisitorUtils.convertClassValues(
-				"method '" + getMethodName() + "'", this.classLoader, raw, classValuesAsString);
-	}
-
-	@Override
-	@Nullable
-	public MultiValueMap<String, Object> getAllAnnotationAttributes(String annotationName, boolean classValuesAsString) {
-		if (!this.attributesMap.containsKey(annotationName)) {
-			return null;
-		}
-		MultiValueMap<String, Object> allAttributes = new LinkedMultiValueMap<>();
-		List<AnnotationAttributes> attributesList = this.attributesMap.get(annotationName);
-		if (attributesList != null) {
-			String annotatedElement = "method '" + getMethodName() + '\'';
-			for (AnnotationAttributes annotationAttributes : attributesList) {
-				AnnotationAttributes convertedAttributes = AnnotationReadingVisitorUtils.convertClassValues(
-						annotatedElement, this.classLoader, annotationAttributes, classValuesAsString);
-				convertedAttributes.forEach(allAttributes::add);
-			}
-		}
-		return allAttributes;
-	}
-
-	@Override
-	public String getDeclaringClassName() {
-		return this.declaringClassName;
-	}
-
-	@Override
-	public String getReturnTypeName() {
-		return this.returnTypeName;
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java
deleted file mode 100644
index 68bc0258aace..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.
- * 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.core.type.classreading;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.asm.AnnotationVisitor;
-import org.springframework.asm.Type;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ObjectUtils;
-
-/**
- * {@link AnnotationVisitor} to recursively visit annotation arrays.
- *
- * @author Chris Beams
- * @author Juergen Hoeller
- * @since 3.1.1
- * @deprecated As of Spring Framework 5.2, this class and related classes in this
- * package have been replaced by {@link SimpleAnnotationMetadataReadingVisitor}
- * and related classes for internal use within the framework.
- */
-@Deprecated
-class RecursiveAnnotationArrayVisitor extends AbstractRecursiveAnnotationVisitor {
-
-	private final String attributeName;
-
-	private final List<AnnotationAttributes> allNestedAttributes = new ArrayList<>();
-
-
-	public RecursiveAnnotationArrayVisitor(
-			String attributeName, AnnotationAttributes attributes, @Nullable ClassLoader classLoader) {
-
-		super(classLoader, attributes);
-		this.attributeName = attributeName;
-	}
-
-
-	@Override
-	public void visit(String attributeName, Object attributeValue) {
-		Object newValue = attributeValue;
-		Object existingValue = this.attributes.get(this.attributeName);
-		if (existingValue != null) {
-			newValue = ObjectUtils.addObjectToArray((Object[]) existingValue, newValue);
-		}
-		else {
-			Class<?> arrayClass = newValue.getClass();
-			if (Enum.class.isAssignableFrom(arrayClass)) {
-				while (arrayClass.getSuperclass() != null && !arrayClass.isEnum()) {
-					arrayClass = arrayClass.getSuperclass();
-				}
-			}
-			Object[] newArray = (Object[]) Array.newInstance(arrayClass, 1);
-			newArray[0] = newValue;
-			newValue = newArray;
-		}
-		this.attributes.put(this.attributeName, newValue);
-	}
-
-	@Override
-	public AnnotationVisitor visitAnnotation(String attributeName, String asmTypeDescriptor) {
-		String annotationType = Type.getType(asmTypeDescriptor).getClassName();
-		AnnotationAttributes nestedAttributes = new AnnotationAttributes(annotationType, this.classLoader);
-		this.allNestedAttributes.add(nestedAttributes);
-		return new RecursiveAnnotationAttributesVisitor(annotationType, nestedAttributes, this.classLoader);
-	}
-
-	@Override
-	public void visitEnd() {
-		if (!this.allNestedAttributes.isEmpty()) {
-			this.attributes.put(this.attributeName, this.allNestedAttributes.toArray(new AnnotationAttributes[0]));
-		}
-		else if (!this.attributes.containsKey(this.attributeName)) {
-			Class<? extends Annotation> annotationType = this.attributes.annotationType();
-			if (annotationType != null) {
-				try {
-					Class<?> attributeType = annotationType.getMethod(this.attributeName).getReturnType();
-					if (attributeType.isArray()) {
-						Class<?> elementType = attributeType.getComponentType();
-						if (elementType.isAnnotation()) {
-							elementType = AnnotationAttributes.class;
-						}
-						this.attributes.put(this.attributeName, Array.newInstance(elementType, 0));
-					}
-				}
-				catch (NoSuchMethodException ex) {
-					// Corresponding attribute method not found: cannot expose empty array.
-				}
-			}
-		}
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationAttributesVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationAttributesVisitor.java
deleted file mode 100644
index b5953c8dad58..000000000000
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationAttributesVisitor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- * 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.core.type.classreading;
-
-import org.springframework.asm.AnnotationVisitor;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.lang.Nullable;
-
-/**
- * {@link AnnotationVisitor} to recursively visit annotation attributes.
- *
- * @author Chris Beams
- * @author Juergen Hoeller
- * @since 3.1.1
- * @deprecated As of Spring Framework 5.2, this class and related classes in this
- * package have been replaced by {@link SimpleAnnotationMetadataReadingVisitor}
- * and related classes for internal use within the framework.
- */
-@Deprecated
-class RecursiveAnnotationAttributesVisitor extends AbstractRecursiveAnnotationVisitor {
-
-	protected final String annotationType;
-
-
-	public RecursiveAnnotationAttributesVisitor(
-			String annotationType, AnnotationAttributes attributes, @Nullable ClassLoader classLoader) {
-
-		super(classLoader, attributes);
-		this.annotationType = annotationType;
-	}
-
-
-	@Override
-	public void visitEnd() {
-		AnnotationUtils.registerDefaultValues(this.attributes);
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/lang/UsesJava7.java b/spring-core/src/main/java/org/springframework/lang/UsesJava7.java
deleted file mode 100644
index c59159c472e4..000000000000
--- a/spring-core/src/main/java/org/springframework/lang/UsesJava7.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- * 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.lang;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the annotated element uses Java 7 specific API constructs,
- * without implying that it strictly requires Java 7.
- *
- * @author Stephane Nicoll
- * @since 4.1
- * @deprecated as of 5.0 since the framework is based on Java 8+ now
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})
-@Documented
-@Deprecated
-public @interface UsesJava7 {
-}
diff --git a/spring-core/src/main/java/org/springframework/lang/UsesJava8.java b/spring-core/src/main/java/org/springframework/lang/UsesJava8.java
deleted file mode 100644
index 1c2416b57682..000000000000
--- a/spring-core/src/main/java/org/springframework/lang/UsesJava8.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- * 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.lang;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the annotated element uses Java 8 specific API constructs,
- * without implying that it strictly requires Java 8.
- *
- * @author Stephane Nicoll
- * @since 4.1
- * @deprecated as of 5.0 since the framework is based on Java 8+ now
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})
-@Documented
-@Deprecated
-public @interface UsesJava8 {
-}
diff --git a/spring-core/src/main/java/org/springframework/lang/UsesSunHttpServer.java b/spring-core/src/main/java/org/springframework/lang/UsesSunHttpServer.java
deleted file mode 100644
index 2147079f0a04..000000000000
--- a/spring-core/src/main/java/org/springframework/lang/UsesSunHttpServer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- * 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.lang;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the annotated element uses the Http Server available in
- * {@code com.sun.*} classes, which is only available on a Sun/Oracle JVM.
- *
- * @author Stephane Nicoll
- * @since 4.1
- * @deprecated as of 5.1, along with Spring's Sun HTTP Server support classes
- */
-@Deprecated
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})
-@Documented
-public @interface UsesSunHttpServer {
-}
diff --git a/spring-core/src/main/java/org/springframework/lang/UsesSunMisc.java b/spring-core/src/main/java/org/springframework/lang/UsesSunMisc.java
deleted file mode 100644
index f86ccd96360e..000000000000
--- a/spring-core/src/main/java/org/springframework/lang/UsesSunMisc.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- * 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.lang;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the annotated element uses an API from the {@code sun.misc}
- * package.
- *
- * @author Stephane Nicoll
- * @since 4.3
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE})
-@Documented
-public @interface UsesSunMisc {
-}
diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
index f5a703c30181..297789e3818d 100644
--- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -558,42 +558,6 @@ public static int nullSafeHashCode(@Nullable short[] array) {
 		return hash;
 	}
 
-	/**
-	 * Return the same value as {@link Boolean#hashCode(boolean)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(boolean bool) {
-		return Boolean.hashCode(bool);
-	}
-
-	/**
-	 * Return the same value as {@link Double#hashCode(double)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(double dbl) {
-		return Double.hashCode(dbl);
-	}
-
-	/**
-	 * Return the same value as {@link Float#hashCode(float)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(float flt) {
-		return Float.hashCode(flt);
-	}
-
-	/**
-	 * Return the same value as {@link Long#hashCode(long)}}.
-	 * @deprecated as of Spring Framework 5.0, in favor of the native JDK 8 variant
-	 */
-	@Deprecated
-	public static int hashCode(long lng) {
-		return Long.hashCode(lng);
-	}
-
 
 	//---------------------------------------------------------------------
 	// Convenience methods for toString output
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 5b5c762408fd..313979e87e03 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -886,18 +886,6 @@ private static void validateLocalePart(String localePart) {
 		}
 	}
 
-	/**
-	 * Determine the RFC 3066 compliant language tag,
-	 * as used for the HTTP "Accept-Language" header.
-	 * @param locale the Locale to transform to a language tag
-	 * @return the RFC 3066 compliant language tag as {@code String}
-	 * @deprecated as of 5.0.4, in favor of {@link Locale#toLanguageTag()}
-	 */
-	@Deprecated
-	public static String toLanguageTag(Locale locale) {
-		return locale.getLanguage() + (hasText(locale.getCountry()) ? "-" + locale.getCountry() : "");
-	}
-
 	/**
 	 * Parse the given {@code timeZoneString} value into a {@link TimeZone}.
 	 * @param timeZoneString the time zone {@code String}, following {@link TimeZone#getTimeZone(String)}
@@ -983,37 +971,6 @@ public static String[] concatenateStringArrays(@Nullable String[] array1, @Nulla
 		return newArr;
 	}
 
-	/**
-	 * Merge the given {@code String} arrays into one, with overlapping
-	 * array elements only included once.
-	 * <p>The order of elements in the original arrays is preserved
-	 * (with the exception of overlapping elements, which are only
-	 * included on their first occurrence).
-	 * @param array1 the first array (can be {@code null})
-	 * @param array2 the second array (can be {@code null})
-	 * @return the new array ({@code null} if both given arrays were {@code null})
-	 * @deprecated as of 4.3.15, in favor of manual merging via {@link LinkedHashSet}
-	 * (with every entry included at most once, even entries within the first array)
-	 */
-	@Deprecated
-	@Nullable
-	public static String[] mergeStringArrays(@Nullable String[] array1, @Nullable String[] array2) {
-		if (ObjectUtils.isEmpty(array1)) {
-			return array2;
-		}
-		if (ObjectUtils.isEmpty(array2)) {
-			return array1;
-		}
-
-		List<String> result = new ArrayList<>(Arrays.asList(array1));
-		for (String str : array2) {
-			if (!result.contains(str)) {
-				result.add(str);
-			}
-		}
-		return toStringArray(result);
-	}
-
 	/**
 	 * Sort the given {@code String} array if necessary.
 	 * @param array the original array (potentially empty)
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
deleted file mode 100644
index a7e3565c4429..000000000000
--- a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * 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.
- * 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.util.comparator;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * A comparator that chains a sequence of one or more Comparators.
- *
- * <p>A compound comparator calls each Comparator in sequence until a single
- * Comparator returns a non-zero result, or the comparators are exhausted and
- * zero is returned.
- *
- * <p>This facilitates in-memory sorting similar to multi-column sorting in SQL.
- * The order of any single Comparator in the list can also be reversed.
- *
- * @author Keith Donald
- * @author Juergen Hoeller
- * @since 1.2.2
- * @param <T> the type of objects that may be compared by this comparator
- * @deprecated as of Spring Framework 5.0, in favor of the standard JDK 8
- * {@link Comparator#thenComparing(Comparator)}
- */
-@Deprecated
-@SuppressWarnings({"serial", "rawtypes"})
-public class CompoundComparator<T> implements Comparator<T>, Serializable {
-
-	private final List<InvertibleComparator> comparators;
-
-
-	/**
-	 * Construct a CompoundComparator with initially no Comparators. Clients
-	 * must add at least one Comparator before calling the compare method or an
-	 * IllegalStateException is thrown.
-	 */
-	public CompoundComparator() {
-		this.comparators = new ArrayList<>();
-	}
-
-	/**
-	 * Construct a CompoundComparator from the Comparators in the provided array.
-	 * <p>All Comparators will default to ascending sort order,
-	 * unless they are InvertibleComparators.
-	 * @param comparators the comparators to build into a compound comparator
-	 * @see InvertibleComparator
-	 */
-	@SuppressWarnings("unchecked")
-	public CompoundComparator(Comparator... comparators) {
-		Assert.notNull(comparators, "Comparators must not be null");
-		this.comparators = new ArrayList<>(comparators.length);
-		for (Comparator comparator : comparators) {
-			addComparator(comparator);
-		}
-	}
-
-
-	/**
-	 * Add a Comparator to the end of the chain.
-	 * <p>The Comparator will default to ascending sort order,
-	 * unless it is a InvertibleComparator.
-	 * @param comparator the Comparator to add to the end of the chain
-	 * @see InvertibleComparator
-	 */
-	@SuppressWarnings("unchecked")
-	public void addComparator(Comparator<? extends T> comparator) {
-		if (comparator instanceof InvertibleComparator) {
-			this.comparators.add((InvertibleComparator) comparator);
-		}
-		else {
-			this.comparators.add(new InvertibleComparator(comparator));
-		}
-	}
-
-	/**
-	 * Add a Comparator to the end of the chain using the provided sort order.
-	 * @param comparator the Comparator to add to the end of the chain
-	 * @param ascending the sort order: ascending (true) or descending (false)
-	 */
-	@SuppressWarnings("unchecked")
-	public void addComparator(Comparator<? extends T> comparator, boolean ascending) {
-		this.comparators.add(new InvertibleComparator(comparator, ascending));
-	}
-
-	/**
-	 * Replace the Comparator at the given index.
-	 * <p>The Comparator will default to ascending sort order,
-	 * unless it is a InvertibleComparator.
-	 * @param index the index of the Comparator to replace
-	 * @param comparator the Comparator to place at the given index
-	 * @see InvertibleComparator
-	 */
-	@SuppressWarnings("unchecked")
-	public void setComparator(int index, Comparator<? extends T> comparator) {
-		if (comparator instanceof InvertibleComparator) {
-			this.comparators.set(index, (InvertibleComparator) comparator);
-		}
-		else {
-			this.comparators.set(index, new InvertibleComparator(comparator));
-		}
-	}
-
-	/**
-	 * Replace the Comparator at the given index using the given sort order.
-	 * @param index the index of the Comparator to replace
-	 * @param comparator the Comparator to place at the given index
-	 * @param ascending the sort order: ascending (true) or descending (false)
-	 */
-	public void setComparator(int index, Comparator<T> comparator, boolean ascending) {
-		this.comparators.set(index, new InvertibleComparator<>(comparator, ascending));
-	}
-
-	/**
-	 * Invert the sort order of each sort definition contained by this compound
-	 * comparator.
-	 */
-	public void invertOrder() {
-		for (InvertibleComparator comparator : this.comparators) {
-			comparator.invertOrder();
-		}
-	}
-
-	/**
-	 * Invert the sort order of the sort definition at the specified index.
-	 * @param index the index of the comparator to invert
-	 */
-	public void invertOrder(int index) {
-		this.comparators.get(index).invertOrder();
-	}
-
-	/**
-	 * Change the sort order at the given index to ascending.
-	 * @param index the index of the comparator to change
-	 */
-	public void setAscendingOrder(int index) {
-		this.comparators.get(index).setAscending(true);
-	}
-
-	/**
-	 * Change the sort order at the given index to descending sort.
-	 * @param index the index of the comparator to change
-	 */
-	public void setDescendingOrder(int index) {
-		this.comparators.get(index).setAscending(false);
-	}
-
-	/**
-	 * Returns the number of aggregated comparators.
-	 */
-	public int getComparatorCount() {
-		return this.comparators.size();
-	}
-
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public int compare(T o1, T o2) {
-		Assert.state(!this.comparators.isEmpty(),
-				"No sort definitions have been added to this CompoundComparator to compare");
-		for (InvertibleComparator comparator : this.comparators) {
-			int result = comparator.compare(o1, o2);
-			if (result != 0) {
-				return result;
-			}
-		}
-		return 0;
-	}
-
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof CompoundComparator &&
-				this.comparators.equals(((CompoundComparator<T>) other).comparators)));
-	}
-
-	@Override
-	public int hashCode() {
-		return this.comparators.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return "CompoundComparator: " + this.comparators;
-	}
-
-}
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
deleted file mode 100644
index 7da876615b9d..000000000000
--- a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.
- * 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.util.comparator;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * A decorator for a comparator, with an "ascending" flag denoting
- * whether comparison results should be treated in forward (standard
- * ascending) order or flipped for reverse (descending) order.
- *
- * @author Keith Donald
- * @author Juergen Hoeller
- * @since 1.2.2
- * @param <T> the type of objects that may be compared by this comparator
- * @deprecated as of Spring Framework 5.0, in favor of the standard JDK 8
- * {@link Comparator#reversed()}
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class InvertibleComparator<T> implements Comparator<T>, Serializable {
-
-	private final Comparator<T> comparator;
-
-	private boolean ascending = true;
-
-
-	/**
-	 * Create an InvertibleComparator that sorts ascending by default.
-	 * For the actual comparison, the specified Comparator will be used.
-	 * @param comparator the comparator to decorate
-	 */
-	public InvertibleComparator(Comparator<T> comparator) {
-		Assert.notNull(comparator, "Comparator must not be null");
-		this.comparator = comparator;
-	}
-
-	/**
-	 * Create an InvertibleComparator that sorts based on the provided order.
-	 * For the actual comparison, the specified Comparator will be used.
-	 * @param comparator the comparator to decorate
-	 * @param ascending the sort order: ascending (true) or descending (false)
-	 */
-	public InvertibleComparator(Comparator<T> comparator, boolean ascending) {
-		Assert.notNull(comparator, "Comparator must not be null");
-		this.comparator = comparator;
-		setAscending(ascending);
-	}
-
-
-	/**
-	 * Specify the sort order: ascending (true) or descending (false).
-	 */
-	public void setAscending(boolean ascending) {
-		this.ascending = ascending;
-	}
-
-	/**
-	 * Return the sort order: ascending (true) or descending (false).
-	 */
-	public boolean isAscending() {
-		return this.ascending;
-	}
-
-	/**
-	 * Invert the sort order: ascending &rarr; descending or
-	 * descending &rarr; ascending.
-	 */
-	public void invertOrder() {
-		this.ascending = !this.ascending;
-	}
-
-
-	@Override
-	public int compare(T o1, T o2) {
-		int result = this.comparator.compare(o1, o2);
-		if (result != 0) {
-			// Invert the order if it is a reverse sort.
-			if (!this.ascending) {
-				if (Integer.MIN_VALUE == result) {
-					result = Integer.MAX_VALUE;
-				}
-				else {
-					result *= -1;
-				}
-			}
-			return result;
-		}
-		return 0;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof InvertibleComparator)) {
-			return false;
-		}
-		InvertibleComparator<T> otherComp = (InvertibleComparator<T>) other;
-		return (this.comparator.equals(otherComp.comparator) && this.ascending == otherComp.ascending);
-	}
-
-	@Override
-	public int hashCode() {
-		return this.comparator.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return "InvertibleComparator: [" + this.comparator + "]; ascending=" + this.ascending;
-	}
-
-}
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
index a6baf3a8e71d..ce383eec49dc 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -36,7 +35,6 @@
 
 import org.springframework.core.annotation.AnnotationTypeMapping.MirrorSets;
 import org.springframework.core.annotation.AnnotationTypeMapping.MirrorSets.MirrorSet;
-import org.springframework.lang.UsesSunMisc;
 import org.springframework.util.ReflectionUtils;
 
 import static java.util.stream.Collectors.toList;
@@ -60,12 +58,6 @@ void forAnnotationTypeWhenNoMetaAnnotationsReturnsMappings() {
 				AnnotationTypeMapping::getAnnotationType).containsExactly(SimpleAnnotation.class);
 	}
 
-	@Test
-	void forAnnotationWhenHasSpringAnnotationReturnsFilteredMappings() {
-		AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(WithSpringLangAnnotation.class);
-		assertThat(mappings.size()).isEqualTo(1);
-	}
-
 	@Test
 	void forAnnotationTypeWhenMetaAnnotationsReturnsMappings() {
 		AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(MetaAnnotated.class);
@@ -526,12 +518,6 @@ private List<String> getNames(MirrorSet mirrorSet) {
 	@interface SimpleAnnotation {
 	}
 
-	@Retention(RetentionPolicy.RUNTIME)
-	@Inherited
-	@UsesSunMisc
-	@interface WithSpringLangAnnotation {
-	}
-
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface AA {
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitorTests.java b/spring-core/src/test/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitorTests.java
deleted file mode 100644
index 844f56b86d2d..000000000000
--- a/spring-core/src/test/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitorTests.java
+++ /dev/null
@@ -1,92 +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.core.type.classreading;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.asm.ClassReader;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AbstractAnnotationMetadataTests;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.ClassUtils;
-
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * Tests for {@link AnnotationMetadataReadingVisitor}.
- *
- * @author Phillip Webb
- * @author Sam Brannen
- */
-@SuppressWarnings("deprecation")
-class AnnotationMetadataReadingVisitorTests extends AbstractAnnotationMetadataTests {
-
-	@Override
-	protected AnnotationMetadata get(Class<?> source) {
-		try {
-			ClassLoader classLoader = source.getClassLoader();
-			String className = source.getName();
-			String resourcePath = ResourceLoader.CLASSPATH_URL_PREFIX
-					+ ClassUtils.convertClassNameToResourcePath(className)
-					+ ClassUtils.CLASS_FILE_SUFFIX;
-			Resource resource = new DefaultResourceLoader().getResource(resourcePath);
-			try (InputStream inputStream = new BufferedInputStream(
-					resource.getInputStream())) {
-				ClassReader classReader = new ClassReader(inputStream);
-				AnnotationMetadataReadingVisitor metadata = new AnnotationMetadataReadingVisitor(
-						classLoader);
-				classReader.accept(metadata, ClassReader.SKIP_DEBUG);
-				return metadata;
-			}
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException(ex);
-		}
-	}
-
-	@Test
-	@Disabled("equals() not implemented in deprecated AnnotationMetadataReadingVisitor")
-	@Override
-	public void verifyEquals() throws Exception {
-	}
-
-	@Test
-	@Disabled("hashCode() not implemented in deprecated AnnotationMetadataReadingVisitor")
-	@Override
-	public void verifyHashCode() throws Exception {
-	}
-
-	@Test
-	@Disabled("toString() not implemented in deprecated AnnotationMetadataReadingVisitor")
-	@Override
-	public void verifyToString() {
-	}
-
-	@Override
-	@Test
-	public void getAnnotationsReturnsDirectAnnotations() {
-		assertThatExceptionOfType(UnsupportedOperationException.class)
-			.isThrownBy(super::getAnnotationsReturnsDirectAnnotations);
-	}
-
-}
diff --git a/spring-core/src/test/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitorTests.java b/spring-core/src/test/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitorTests.java
deleted file mode 100644
index d303b031bf3c..000000000000
--- a/spring-core/src/test/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitorTests.java
+++ /dev/null
@@ -1,92 +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.core.type.classreading;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.asm.ClassReader;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AbstractMethodMetadataTests;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.ClassUtils;
-
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * Tests for {@link MethodMetadataReadingVisitor}.
- *
- * @author Phillip Webb
- * @author Sam Brannen
- */
-@SuppressWarnings("deprecation")
-class MethodMetadataReadingVisitorTests extends AbstractMethodMetadataTests {
-
-	@Override
-	protected AnnotationMetadata get(Class<?> source) {
-		try {
-			ClassLoader classLoader = source.getClassLoader();
-			String className = source.getName();
-			String resourcePath = ResourceLoader.CLASSPATH_URL_PREFIX
-					+ ClassUtils.convertClassNameToResourcePath(className)
-					+ ClassUtils.CLASS_FILE_SUFFIX;
-			Resource resource = new DefaultResourceLoader().getResource(resourcePath);
-			try (InputStream inputStream = new BufferedInputStream(
-					resource.getInputStream())) {
-				ClassReader classReader = new ClassReader(inputStream);
-				AnnotationMetadataReadingVisitor metadata = new AnnotationMetadataReadingVisitor(
-						classLoader);
-				classReader.accept(metadata, ClassReader.SKIP_DEBUG);
-				return metadata;
-			}
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException(ex);
-		}
-	}
-
-	@Test
-	@Disabled("equals() not implemented in deprecated MethodMetadataReadingVisitor")
-	@Override
-	public void verifyEquals() throws Exception {
-	}
-
-	@Test
-	@Disabled("hashCode() not implemented in deprecated MethodMetadataReadingVisitor")
-	@Override
-	public void verifyHashCode() throws Exception {
-	}
-
-	@Test
-	@Disabled("toString() not implemented in deprecated MethodMetadataReadingVisitor")
-	@Override
-	public void verifyToString() {
-	}
-
-	@Test
-	@Override
-	public void getAnnotationsReturnsDirectAnnotations() {
-		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(
-				super::getAnnotationsReturnsDirectAnnotations);
-	}
-
-}
diff --git a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
index c89286af88d0..5390d0178215 100644
--- a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
@@ -233,44 +233,6 @@ void nullSafeEqualsWithArrays() throws Exception {
 		assertThat(ObjectUtils.nullSafeEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3})).isTrue();
 	}
 
-	@Test
-	@Deprecated
-	void hashCodeWithBooleanFalse() {
-		int expected = Boolean.FALSE.hashCode();
-		assertThat(ObjectUtils.hashCode(false)).isEqualTo(expected);
-	}
-
-	@Test
-	@Deprecated
-	void hashCodeWithBooleanTrue() {
-		int expected = Boolean.TRUE.hashCode();
-		assertThat(ObjectUtils.hashCode(true)).isEqualTo(expected);
-	}
-
-	@Test
-	@Deprecated
-	void hashCodeWithDouble() {
-		double dbl = 9830.43;
-		int expected = Double.valueOf(dbl).hashCode();
-		assertThat(ObjectUtils.hashCode(dbl)).isEqualTo(expected);
-	}
-
-	@Test
-	@Deprecated
-	void hashCodeWithFloat() {
-		float flt = 34.8f;
-		int expected = (Float.valueOf(flt)).hashCode();
-		assertThat(ObjectUtils.hashCode(flt)).isEqualTo(expected);
-	}
-
-	@Test
-	@Deprecated
-	void hashCodeWithLong() {
-		long lng = 883L;
-		int expected = (Long.valueOf(lng)).hashCode();
-		assertThat(ObjectUtils.hashCode(lng)).isEqualTo(expected);
-	}
-
 	@Test
 	void identityToString() {
 		Object obj = new Object();
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index 2b46f73a56aa..24525c9f2d50 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -440,21 +440,6 @@ void concatenateStringArrays() {
 		assertThat(StringUtils.concatenateStringArrays(null, null)).isNull();
 	}
 
-	@Test
-	@Deprecated
-	void mergeStringArrays() {
-		String[] input1 = new String[] {"myString2"};
-		String[] input2 = new String[] {"myString1", "myString2"};
-		String[] result = StringUtils.mergeStringArrays(input1, input2);
-		assertThat(result.length).isEqualTo(2);
-		assertThat(result[0]).isEqualTo("myString2");
-		assertThat(result[1]).isEqualTo("myString1");
-
-		assertThat(StringUtils.mergeStringArrays(input1, null)).isEqualTo(input1);
-		assertThat(StringUtils.mergeStringArrays(null, input2)).isEqualTo(input2);
-		assertThat(StringUtils.mergeStringArrays(null, null)).isNull();
-	}
-
 	@Test
 	void sortStringArray() {
 		String[] input = new String[] {"myString2"};
diff --git a/spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java b/spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java
deleted file mode 100644
index bf60e2d81fb2..000000000000
--- a/spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- * 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.util.comparator;
-
-import java.util.Comparator;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-
-/**
- * Test for {@link CompoundComparator}.
- *
- * @author Keith Donald
- * @author Chris Beams
- * @author Phillip Webb
- */
-@Deprecated
-class CompoundComparatorTests {
-
-	@Test
-	void shouldNeedAtLeastOneComparator() {
-		Comparator<String> c = new CompoundComparator<>();
-		assertThatIllegalStateException().isThrownBy(() ->
-				c.compare("foo", "bar"));
-	}
-
-}
diff --git a/spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java b/spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java
deleted file mode 100644
index df3f1a25e662..000000000000
--- a/spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- * 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.util.comparator;
-
-import java.util.Comparator;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-
-
-/**
- * Tests for {@link InvertibleComparator}.
- *
- * @author Keith Donald
- * @author Chris Beams
- * @author Phillip Webb
- */
-@Deprecated
-class InvertibleComparatorTests {
-
-	private final Comparator<Integer> comparator = new ComparableComparator<>();
-
-
-	@Test
-	void shouldNeedComparator() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				new InvertibleComparator<>(null));
-	}
-
-	@Test
-	void shouldNeedComparatorWithAscending() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				new InvertibleComparator<>(null, true));
-	}
-
-	@Test
-	void shouldDefaultToAscending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator);
-		assertThat(invertibleComparator.isAscending()).isTrue();
-		assertThat(invertibleComparator.compare(1, 2)).isEqualTo(-1);
-	}
-
-	@Test
-	void shouldInvert() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator);
-		assertThat(invertibleComparator.isAscending()).isTrue();
-		assertThat(invertibleComparator.compare(1, 2)).isEqualTo(-1);
-		invertibleComparator.invertOrder();
-		assertThat(invertibleComparator.isAscending()).isFalse();
-		assertThat(invertibleComparator.compare(1, 2)).isEqualTo(1);
-	}
-
-	@Test
-	void shouldCompareAscending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator, true);
-		assertThat(invertibleComparator.compare(1, 2)).isEqualTo(-1);
-	}
-
-	@Test
-	void shouldCompareDescending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator, false);
-		assertThat(invertibleComparator.compare(1, 2)).isEqualTo(1);
-	}
-
-}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
index fae62e1d3791..f9fbd7b6385c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
@@ -332,17 +332,6 @@ public void write(EvaluationContext context, @Nullable Object target, String nam
 		throw new AccessException("Neither setter method nor field found for property '" + name + "'");
 	}
 
-	/**
-	 * Get the last read invoker pair.
-	 * @deprecated as of 4.3.15 since it is not used within the framework anymore
-	 */
-	@Deprecated
-	@Nullable
-	public Member getLastReadInvokerPair() {
-		InvokerPair lastReadInvoker = this.lastReadInvokerPair;
-		return (lastReadInvoker != null ? lastReadInvoker.member : null);
-	}
-
 
 	@Nullable
 	private TypeDescriptor getTypeDescriptor(EvaluationContext context, Object target, String name) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
deleted file mode 100644
index dcab3b2ca9b8..000000000000
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
+++ /dev/null
@@ -1,81 +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.jdbc.core;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.springframework.lang.Nullable;
-
-/**
- * Generic utility methods for working with JDBC batch statements.
- * Mainly for internal use within the framework.
- *
- * @author Thomas Risberg
- * @author Juergen Hoeller
- * @since 3.0
- * @deprecated as of 5.1.3, not used by {@link JdbcTemplate} anymore
- */
-@Deprecated
-public abstract class BatchUpdateUtils {
-
-	public static int[] executeBatchUpdate(
-			String sql, final List<Object[]> batchArgs, final int[] columnTypes, JdbcOperations jdbcOperations) {
-
-		if (batchArgs.isEmpty()) {
-			return new int[0];
-		}
-
-		return jdbcOperations.batchUpdate(
-				sql,
-				new BatchPreparedStatementSetter() {
-					@Override
-					public void setValues(PreparedStatement ps, int i) throws SQLException {
-						Object[] values = batchArgs.get(i);
-						setStatementParameters(values, ps, columnTypes);
-					}
-					@Override
-					public int getBatchSize() {
-						return batchArgs.size();
-					}
-				});
-	}
-
-	protected static void setStatementParameters(Object[] values, PreparedStatement ps, @Nullable int[] columnTypes)
-			throws SQLException {
-
-		int colIndex = 0;
-		for (Object value : values) {
-			colIndex++;
-			if (value instanceof SqlParameterValue paramValue) {
-				StatementCreatorUtils.setParameterValue(ps, colIndex, paramValue, paramValue.getValue());
-			}
-			else {
-				int colType;
-				if (columnTypes == null || columnTypes.length < colIndex) {
-					colType = SqlTypeValue.TYPE_UNKNOWN;
-				}
-				else {
-					colType = columnTypes[colIndex - 1];
-				}
-				StatementCreatorUtils.setParameterValue(ps, colIndex, colType, value);
-			}
-		}
-	}
-
-}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java
index 76d9cec68f4e..edce0df03657 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,16 +45,6 @@ public class CallParameterMetaData {
 	private final boolean nullable;
 
 
-	/**
-	 * Constructor taking all the properties except the function marker.
-	 */
-	@Deprecated
-	public CallParameterMetaData(
-			@Nullable String columnName, int columnType, int sqlType, @Nullable String typeName, boolean nullable) {
-
-		this(false, columnName, columnType, sqlType, typeName, nullable);
-	}
-
 	/**
 	 * Constructor taking all the properties including the function marker.
 	 * @since 5.2.9
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
index be0ef871bc40..6676d9d8df66 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
@@ -365,18 +365,6 @@ public boolean isGetGeneratedKeysSimulated() {
 		return obtainMetaDataProvider().isGetGeneratedKeysSimulated();
 	}
 
-	/**
-	 * Does this database support a simple query to retrieve generated keys
-	 * when the JDBC 3.0 feature is not supported:
-	 * {@link java.sql.DatabaseMetaData#supportsGetGeneratedKeys()}?
-	 * @deprecated as of 4.3.15, in favor of {@link #getSimpleQueryForGetGeneratedKey}
-	 */
-	@Deprecated
-	@Nullable
-	public String getSimulationQueryForGetGeneratedKey(String tableName, String keyColumnName) {
-		return getSimpleQueryForGetGeneratedKey(tableName, keyColumnName);
-	}
-
 	/**
 	 * Does this database support a simple query to retrieve generated keys
 	 * when the JDBC 3.0 feature is not supported:
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
deleted file mode 100644
index 8678bfb81128..000000000000
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- * 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.jdbc.core.namedparam;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcOperations;
-
-/**
- * Generic utility methods for working with JDBC batch statements using named parameters.
- * Mainly for internal use within the framework.
- *
- * @author Thomas Risberg
- * @author Juergen Hoeller
- * @since 3.0
- * @deprecated as of 5.1.3, not used by {@link NamedParameterJdbcTemplate} anymore
- */
-@Deprecated
-public abstract class NamedParameterBatchUpdateUtils extends org.springframework.jdbc.core.BatchUpdateUtils {
-
-	public static int[] executeBatchUpdateWithNamedParameters(
-			final ParsedSql parsedSql, final SqlParameterSource[] batchArgs, JdbcOperations jdbcOperations) {
-
-		if (batchArgs.length == 0) {
-			return new int[0];
-		}
-
-		String sqlToUse = NamedParameterUtils.substituteNamedParameters(parsedSql, batchArgs[0]);
-		return jdbcOperations.batchUpdate(
-				sqlToUse,
-				new BatchPreparedStatementSetter() {
-					@Override
-					public void setValues(PreparedStatement ps, int i) throws SQLException {
-						Object[] values = NamedParameterUtils.buildValueArray(parsedSql, batchArgs[i], null);
-						int[] columnTypes = NamedParameterUtils.buildSqlTypeArray(parsedSql, batchArgs[i]);
-						setStatementParameters(values, ps, columnTypes);
-					}
-					@Override
-					public int getBatchSize() {
-						return batchArgs.length;
-					}
-				});
-	}
-
-}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java
deleted file mode 100644
index de88a53593a6..000000000000
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2002-2008 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.jdbc.support.incrementer;
-
-import javax.sql.DataSource;
-
-/**
- * {@link DataFieldMaxValueIncrementer} that retrieves the next value
- * of a given sequence on DB2 for the mainframe (z/OS, DB2/390, DB2/400).
- *
- * <p>Thanks to Jens Eickmeyer for the suggestion!
- *
- * @author Juergen Hoeller
- * @since 2.5.3
- * @deprecated in favor of the differently named {@link Db2MainframeMaxValueIncrementer}
- */
-@Deprecated
-public class DB2MainframeSequenceMaxValueIncrementer extends AbstractSequenceMaxValueIncrementer {
-
-	/**
-	 * Default constructor for bean property style usage.
-	 * @see #setDataSource
-	 * @see #setIncrementerName
-	 */
-	public DB2MainframeSequenceMaxValueIncrementer() {
-	}
-
-	/**
-	 * Convenience constructor.
-	 * @param dataSource the DataSource to use
-	 * @param incrementerName the name of the sequence/table to use
-	 */
-	public DB2MainframeSequenceMaxValueIncrementer(DataSource dataSource, String incrementerName) {
-		super(dataSource, incrementerName);
-	}
-
-
-	@Override
-	protected String getSequenceQuery() {
-		return "select next value for " + getIncrementerName() + " from sysibm.sysdummy1";
-	}
-
-}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java
deleted file mode 100644
index bf6e1c9bfb90..000000000000
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2002-2008 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.jdbc.support.incrementer;
-
-import javax.sql.DataSource;
-
-/**
- * {@link DataFieldMaxValueIncrementer} that retrieves the next value
- * of a given sequence on DB2 LUW (for Linux, Unix and Windows).
- *
- * <p>Thanks to Mark MacMahon for the suggestion!
- *
- * @author Juergen Hoeller
- * @since 1.1.3
- * @deprecated in favor of the specifically named {@link Db2LuwMaxValueIncrementer}
- */
-@Deprecated
-public class DB2SequenceMaxValueIncrementer extends Db2LuwMaxValueIncrementer {
-
-	/**
-	 * Default constructor for bean property style usage.
-	 * @see #setDataSource
-	 * @see #setIncrementerName
-	 */
-	public DB2SequenceMaxValueIncrementer() {
-	}
-
-	/**
-	 * Convenience constructor.
-	 * @param dataSource the DataSource to use
-	 * @param incrementerName the name of the sequence/table to use
-	 */
-	public DB2SequenceMaxValueIncrementer(DataSource dataSource, String incrementerName) {
-		super(dataSource, incrementerName);
-	}
-
-}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java
deleted file mode 100644
index 0d029171051c..000000000000
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- * 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.jdbc.support.incrementer;
-
-import javax.sql.DataSource;
-
-/**
- * {@link DataFieldMaxValueIncrementer} that retrieves the next value
- * of a given PostgreSQL sequence.
- *
- * <p>Thanks to Tomislav Urban for the suggestion!
- *
- * @author Juergen Hoeller
- * @deprecated in favor of the differently named {@link PostgresSequenceMaxValueIncrementer}
- */
-@Deprecated
-public class PostgreSQLSequenceMaxValueIncrementer extends PostgresSequenceMaxValueIncrementer {
-
-	/**
-	 * Default constructor for bean property style usage.
-	 * @see #setDataSource
-	 * @see #setIncrementerName
-	 */
-	public PostgreSQLSequenceMaxValueIncrementer() {
-	}
-
-	/**
-	 * Convenience constructor.
-	 * @param dataSource the DataSource to use
-	 * @param incrementerName the name of the sequence/table to use
-	 */
-	public PostgreSQLSequenceMaxValueIncrementer(DataSource dataSource, String incrementerName) {
-		super(dataSource, incrementerName);
-	}
-
-}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java
deleted file mode 100644
index e2829b10bc18..000000000000
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- * 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.messaging.handler.annotation.support;
-
-import org.springframework.lang.Nullable;
-import org.springframework.messaging.converter.MessageConverter;
-import org.springframework.validation.Validator;
-
-/**
- * A resolver to extract and convert the payload of a message using a
- * {@link MessageConverter}. It also validates the payload using a
- * {@link Validator} if the argument is annotated with a Validation annotation.
- *
- * @author Rossen Stoyanchev
- * @author Juergen Hoeller
- * @author Brian Clozel
- * @author Stephane Nicoll
- * @since 4.0
- * @deprecated as of 5.2, in favor of {@link PayloadMethodArgumentResolver}
- */
-@Deprecated
-public class PayloadArgumentResolver extends PayloadMethodArgumentResolver {
-
-	/**
-	 * Create a new {@code PayloadArgumentResolver} with the given
-	 * {@link MessageConverter}.
-	 * @param messageConverter the MessageConverter to use (required)
-	 * @since 4.0.9
-	 */
-	public PayloadArgumentResolver(MessageConverter messageConverter) {
-		this(messageConverter, null);
-	}
-
-	/**
-	 * Create a new {@code PayloadArgumentResolver} with the given
-	 * {@link MessageConverter} and {@link Validator}.
-	 * @param messageConverter the MessageConverter to use (required)
-	 * @param validator the Validator to use (optional)
-	 */
-	public PayloadArgumentResolver(MessageConverter messageConverter, @Nullable Validator validator) {
-		this(messageConverter, validator, true);
-	}
-
-	/**
-	 * Create a new {@code PayloadArgumentResolver} with the given
-	 * {@link MessageConverter} and {@link Validator}.
-	 * @param messageConverter the MessageConverter to use (required)
-	 * @param validator the Validator to use (optional)
-	 * @param useDefaultResolution if "true" (the default) this resolver supports
-	 * all parameters; if "false" then only arguments with the {@code @Payload}
-	 * annotation are supported.
-	 */
-	public PayloadArgumentResolver(MessageConverter messageConverter, @Nullable Validator validator,
-			boolean useDefaultResolution) {
-
-
-		super(messageConverter, validator, useDefaultResolution);
-	}
-
-}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
index b8e1f303e8d8..12ab2ead21c2 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,21 +70,6 @@ public class RSocketFrameTypeMessageCondition extends AbstractMessageCondition<R
 	public static final RSocketFrameTypeMessageCondition EMPTY_CONDITION = new RSocketFrameTypeMessageCondition();
 
 
-	/**
-	 * Condition to match "REQUEST_FNF", "REQUEST_RESPONSE", "REQUEST_STREAM",
-	 * and "REQUEST_CHANNEL".
-	 * @deprecated as of 5.2.2 because matching to all interaction types is too
-	 * flexible. Please use one of the other constants in this class that match
-	 * to specific frames.
-	 */
-	@Deprecated
-	public static final RSocketFrameTypeMessageCondition REQUEST_CONDITION =
-			new RSocketFrameTypeMessageCondition(
-					FrameType.REQUEST_FNF,
-					FrameType.REQUEST_RESPONSE,
-					FrameType.REQUEST_STREAM,
-					FrameType.REQUEST_CHANNEL);
-
 	/** Per FrameType cache to return ready instances from getMatchingCondition. */
 	private static final Map<String, RSocketFrameTypeMessageCondition> frameTypeConditionCache;
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
index c44ff260103a..7c5cfed55021 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -504,29 +504,15 @@ public UserDestinationResolver userDestinationResolver(
 	}
 
 	@Bean
-	@SuppressWarnings("deprecation")
 	public SimpUserRegistry userRegistry(
 			AbstractSubscribableChannel clientInboundChannel, AbstractSubscribableChannel clientOutboundChannel) {
 
-		SimpUserRegistry userRegistry = createLocalUserRegistry();
 		MessageBrokerRegistry brokerRegistry = getBrokerRegistry(clientInboundChannel, clientOutboundChannel);
-		if (userRegistry == null) {
-			userRegistry = createLocalUserRegistry(brokerRegistry.getUserRegistryOrder());
-		}
+		SimpUserRegistry userRegistry = createLocalUserRegistry(brokerRegistry.getUserRegistryOrder());
 		boolean broadcast = brokerRegistry.getUserRegistryBroadcast() != null;
 		return (broadcast ? new MultiServerUserRegistry(userRegistry) : userRegistry);
 	}
 
-	/**
-	 * Create the user registry that provides access to local users.
-	 * @deprecated as of 5.1 in favor of {@link #createLocalUserRegistry(Integer)}
-	 */
-	@Deprecated
-	@Nullable
-	protected SimpUserRegistry createLocalUserRegistry() {
-		return null;
-	}
-
 	/**
 	 * Create the user registry that provides access to local users.
 	 * @param order the order to use as a {@link SmartApplicationListener}.
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/ChannelRegistration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/ChannelRegistration.java
index 58a1a2f4e2b3..baaa9f8bbd06 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/ChannelRegistration.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/ChannelRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,18 +69,6 @@ public ChannelRegistration interceptors(ChannelInterceptor... interceptors) {
 		return this;
 	}
 
-	/**
-	 * Configure interceptors for the message channel.
-	 * @deprecated as of 4.3.12, in favor of {@link #interceptors(ChannelInterceptor...)}
-	 */
-	@Deprecated
-	public ChannelRegistration setInterceptors(@Nullable ChannelInterceptor... interceptors) {
-		if (interceptors != null) {
-			this.interceptors.addAll(Arrays.asList(interceptors));
-		}
-		return this;
-	}
-
 
 	protected boolean hasTaskExecutor() {
 		return (this.registration != null);
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java
index 62729df07e93..86e59e73c25a 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.util.Assert;
-import org.springframework.util.PathMatcher;
 import org.springframework.util.StringUtils;
 
 /**
@@ -122,29 +121,6 @@ public boolean isRemoveLeadingSlash() {
 		return this.removeLeadingSlash;
 	}
 
-	/**
-	 * Provide the {@code PathMatcher} in use for working with destinations
-	 * which in turn helps to determine whether the leading slash should be
-	 * kept in actual destinations after removing the
-	 * {@link #setUserDestinationPrefix userDestinationPrefix}.
-	 * <p>By default actual destinations have a leading slash, e.g.
-	 * {@code /queue/position-updates} which makes sense with brokers that
-	 * support destinations with slash as separator. When a {@code PathMatcher}
-	 * is provided that supports an alternative separator, then resulting
-	 * destinations won't have a leading slash, e.g. {@code
-	 * jms.queue.position-updates}.
-	 * @param pathMatcher the PathMatcher used to work with destinations
-	 * @since 4.3
-	 * @deprecated as of 4.3.14 this property is no longer used and is replaced
-	 * by {@link #setRemoveLeadingSlash(boolean)} that indicates more explicitly
-	 * whether to keep the leading slash which may or may not be the case
-	 * regardless of how the {@code PathMatcher} is configured.
-	 */
-	@Deprecated
-	public void setPathMatcher(@Nullable PathMatcher pathMatcher) {
-		// Do nothing
-	}
-
 
 	@Override
 	@Nullable
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInterceptor.java
index 26a3a70af94d..a2016e8314a1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/OpenSessionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,27 +112,14 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 	 * @see FlushMode#MANUAL
 	 */
 	protected Session openSession(SessionFactory sessionFactory) throws DataAccessResourceFailureException {
-		Session session = openSession();
-		if (session == null) {
-			try {
-				session = sessionFactory.openSession();
-				session.setHibernateFlushMode(FlushMode.MANUAL);
-			}
-			catch (HibernateException ex) {
-				throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
-			}
+		try {
+			Session session = sessionFactory.openSession();
+			session.setHibernateFlushMode(FlushMode.MANUAL);
+			return session;
+		}
+		catch (HibernateException ex) {
+			throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
 		}
-		return session;
-	}
-
-	/**
-	 * Open a Session for the given SessionFactory.
-	 * @deprecated as of 5.0, in favor of {@link #openSession(SessionFactory)}
-	 */
-	@Deprecated
-	@Nullable
-	protected Session openSession() throws DataAccessResourceFailureException {
-		return null;
 	}
 
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
index 0f68a6ebcbf6..66971589a3b2 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
@@ -353,14 +353,6 @@ public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, Str
 		return pvs;
 	}
 
-	@Deprecated
-	@Override
-	public PropertyValues postProcessPropertyValues(
-			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) {
-
-		return postProcessProperties(pvs, bean, beanName);
-	}
-
 	@Override
 	public void postProcessBeforeDestruction(Object bean, String beanName) {
 		EntityManager emToClose = this.extendedEntityManagersToClose.remove(bean);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
deleted file mode 100644
index b02e90d04f86..000000000000
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.
- * 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.orm.jpa.vendor;
-
-import java.lang.reflect.Method;
-
-import jakarta.persistence.EntityManagerFactory;
-import org.hibernate.SessionFactory;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
-import org.springframework.orm.jpa.EntityManagerFactoryAccessor;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * Simple {@code FactoryBean} that exposes the underlying {@link SessionFactory}
- * behind a Hibernate-backed JPA {@link EntityManagerFactory}.
- *
- * <p>Primarily available for resolving a SessionFactory by JPA persistence unit name
- * via the {@link #setPersistenceUnitName "persistenceUnitName"} bean property.
- *
- * <p>Note that, for straightforward cases, you could also simply declare a factory method:
- *
- * <pre class="code">
- * &lt;bean id="sessionFactory" factory-bean="entityManagerFactory" factory-method="getSessionFactory"/&gt;
- * </pre>
- *
- * <p>And as of JPA 2.1, {@link EntityManagerFactory#unwrap} provides a nice approach as well,
- * in particular within configuration class arrangements:
- *
- * <pre class="code">
- * &#064;Bean
- * public SessionFactory sessionFactory(@Qualifier("entityManagerFactory") EntityManagerFactory emf) {
- *     return emf.unwrap(SessionFactory.class);
- * }
- * </pre>
- *
- * Please note: Since Hibernate 5.2 changed its {@code SessionFactory} interface to extend JPA's
- * {@code EntityManagerFactory}, you may get conflicts when injecting by type, with both the
- * original factory and your custom {@code SessionFactory} matching {@code EntityManagerFactory}.
- * An explicit qualifier for the original factory (as indicated above) is recommended here.
- *
- * @author Juergen Hoeller
- * @since 3.1
- * @see #setPersistenceUnitName
- * @see #setEntityManagerFactory
- * @deprecated as of Spring Framework 4.3.12 against Hibernate 5.2, in favor of a custom solution
- * based on {@link EntityManagerFactory#unwrap} with explicit qualifiers and/or primary markers
- */
-@Deprecated
-public class HibernateJpaSessionFactoryBean extends EntityManagerFactoryAccessor implements FactoryBean<SessionFactory> {
-
-	@Override
-	@Nullable
-	public SessionFactory getObject() {
-		EntityManagerFactory emf = getEntityManagerFactory();
-		Assert.state(emf != null, "EntityManagerFactory must not be null");
-		try {
-			Method getSessionFactory = emf.getClass().getMethod("getSessionFactory");
-			return (SessionFactory) ReflectionUtils.invokeMethod(getSessionFactory, emf);
-		}
-		catch (NoSuchMethodException ex) {
-			throw new IllegalStateException("No compatible Hibernate EntityManagerFactory found: " + ex);
-		}
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return SessionFactory.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-}
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
deleted file mode 100644
index c8887da9fd60..000000000000
--- a/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- * 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.mock.jndi;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.naming.NamingException;
-
-import org.springframework.jndi.JndiTemplate;
-
-/**
- * Simple extension of the JndiTemplate class that always returns a given object.
- *
- * <p>Very useful for testing. Effectively a mock object.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @deprecated Deprecated as of Spring Framework 5.2 in favor of complete solutions from
- * third parties such as <a href="https://github.com/h-thurow/Simple-JNDI">Simple-JNDI</a>
- */
-@Deprecated
-public class ExpectedLookupTemplate extends JndiTemplate {
-
-	private final Map<String, Object> jndiObjects = new ConcurrentHashMap<>(16);
-
-
-	/**
-	 * Construct a new JndiTemplate that will always return given objects for
-	 * given names. To be populated through {@code addObject} calls.
-	 * @see #addObject(String, Object)
-	 */
-	public ExpectedLookupTemplate() {
-	}
-
-	/**
-	 * Construct a new JndiTemplate that will always return the given object,
-	 * but honour only requests for the given name.
-	 * @param name the name the client is expected to look up
-	 * @param object the object that will be returned
-	 */
-	public ExpectedLookupTemplate(String name, Object object) {
-		addObject(name, object);
-	}
-
-
-	/**
-	 * Add the given object to the list of JNDI objects that this template will expose.
-	 * @param name the name the client is expected to look up
-	 * @param object the object that will be returned
-	 */
-	public void addObject(String name, Object object) {
-		this.jndiObjects.put(name, object);
-	}
-
-	/**
-	 * If the name is the expected name specified in the constructor, return the
-	 * object provided in the constructor. If the name is unexpected, a
-	 * respective NamingException gets thrown.
-	 */
-	@Override
-	public Object lookup(String name) throws NamingException {
-		Object object = this.jndiObjects.get(name);
-		if (object == null) {
-			throw new NamingException("Unexpected JNDI name '" + name + "': expecting " + this.jndiObjects.keySet());
-		}
-		return object;
-	}
-
-}
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
deleted file mode 100644
index 14c4881c80bf..000000000000
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * 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.
- * 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.mock.jndi;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.OperationNotSupportedException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
-
-/**
- * Simple implementation of a JNDI naming context.
- * Only supports binding plain Objects to String names.
- * Mainly for test environments, but also usable for standalone applications.
- *
- * <p>This class is not intended for direct usage by applications, although it
- * can be used for example to override JndiTemplate's {@code createInitialContext}
- * method in unit tests. Typically, SimpleNamingContextBuilder will be used to
- * set up a JVM-level JNDI environment.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @see SimpleNamingContextBuilder
- * @see org.springframework.jndi.JndiTemplate#createInitialContext
- * @deprecated Deprecated as of Spring Framework 5.2 in favor of complete solutions from
- * third parties such as <a href="https://github.com/h-thurow/Simple-JNDI">Simple-JNDI</a>
- */
-@Deprecated
-public class SimpleNamingContext implements Context {
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final String root;
-
-	private final Hashtable<String, Object> boundObjects;
-
-	private final Hashtable<String, Object> environment = new Hashtable<>();
-
-
-	/**
-	 * Create a new naming context.
-	 */
-	public SimpleNamingContext() {
-		this("");
-	}
-
-	/**
-	 * Create a new naming context with the given naming root.
-	 */
-	public SimpleNamingContext(String root) {
-		this.root = root;
-		this.boundObjects = new Hashtable<>();
-	}
-
-	/**
-	 * Create a new naming context with the given naming root,
-	 * the given name/object map, and the JNDI environment entries.
-	 */
-	public SimpleNamingContext(
-			String root, Hashtable<String, Object> boundObjects, @Nullable Hashtable<String, Object> env) {
-
-		this.root = root;
-		this.boundObjects = boundObjects;
-		if (env != null) {
-			this.environment.putAll(env);
-		}
-	}
-
-
-	// Actual implementations of Context methods follow
-
-	@Override
-	public NamingEnumeration<NameClassPair> list(String root) throws NamingException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Listing name/class pairs under [" + root + "]");
-		}
-		return new NameClassPairEnumeration(this, root);
-	}
-
-	@Override
-	public NamingEnumeration<Binding> listBindings(String root) throws NamingException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Listing bindings under [" + root + "]");
-		}
-		return new BindingEnumeration(this, root);
-	}
-
-	/**
-	 * Look up the object with the given name.
-	 * <p>Note: Not intended for direct use by applications.
-	 * Will be used by any standard InitialContext JNDI lookups.
-	 * @throws javax.naming.NameNotFoundException if the object could not be found
-	 */
-	@Override
-	public Object lookup(String lookupName) throws NameNotFoundException {
-		String name = this.root + lookupName;
-		if (logger.isDebugEnabled()) {
-			logger.debug("Static JNDI lookup: [" + name + "]");
-		}
-		if (name.isEmpty()) {
-			return new SimpleNamingContext(this.root, this.boundObjects, this.environment);
-		}
-		Object found = this.boundObjects.get(name);
-		if (found == null) {
-			if (!name.endsWith("/")) {
-				name = name + "/";
-			}
-			for (String boundName : this.boundObjects.keySet()) {
-				if (boundName.startsWith(name)) {
-					return new SimpleNamingContext(name, this.boundObjects, this.environment);
-				}
-			}
-			throw new NameNotFoundException(
-					"Name [" + this.root + lookupName + "] not bound; " + this.boundObjects.size() + " bindings: [" +
-					StringUtils.collectionToDelimitedString(this.boundObjects.keySet(), ",") + "]");
-		}
-		return found;
-	}
-
-	@Override
-	public Object lookupLink(String name) throws NameNotFoundException {
-		return lookup(name);
-	}
-
-	/**
-	 * Bind the given object to the given name.
-	 * Note: Not intended for direct use by applications
-	 * if setting up a JVM-level JNDI environment.
-	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
-	 * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind
-	 */
-	@Override
-	public void bind(String name, Object obj) {
-		if (logger.isInfoEnabled()) {
-			logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]");
-		}
-		this.boundObjects.put(this.root + name, obj);
-	}
-
-	@Override
-	public void unbind(String name) {
-		if (logger.isInfoEnabled()) {
-			logger.info("Static JNDI remove: [" + this.root + name + "]");
-		}
-		this.boundObjects.remove(this.root + name);
-	}
-
-	@Override
-	public void rebind(String name, Object obj) {
-		bind(name, obj);
-	}
-
-	@Override
-	public void rename(String oldName, String newName) throws NameNotFoundException {
-		Object obj = lookup(oldName);
-		unbind(oldName);
-		bind(newName, obj);
-	}
-
-	@Override
-	public Context createSubcontext(String name) {
-		String subcontextName = this.root + name;
-		if (!subcontextName.endsWith("/")) {
-			subcontextName += "/";
-		}
-		Context subcontext = new SimpleNamingContext(subcontextName, this.boundObjects, this.environment);
-		bind(name, subcontext);
-		return subcontext;
-	}
-
-	@Override
-	public void destroySubcontext(String name) {
-		unbind(name);
-	}
-
-	@Override
-	public String composeName(String name, String prefix) {
-		return prefix + name;
-	}
-
-	@Override
-	public Hashtable<String, Object> getEnvironment() {
-		return this.environment;
-	}
-
-	@Override
-	@Nullable
-	public Object addToEnvironment(String propName, Object propVal) {
-		return this.environment.put(propName, propVal);
-	}
-
-	@Override
-	public Object removeFromEnvironment(String propName) {
-		return this.environment.remove(propName);
-	}
-
-	@Override
-	public void close() {
-	}
-
-
-	// Unsupported methods follow: no support for javax.naming.Name
-
-	@Override
-	public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Object lookup(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Object lookupLink(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void bind(Name name, Object obj) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void unbind(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void rebind(Name name, Object obj) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void rename(Name oldName, Name newName) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Context createSubcontext(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void destroySubcontext(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public String getNameInNamespace() throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public NameParser getNameParser(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public NameParser getNameParser(String name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Name composeName(Name name, Name prefix) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-
-	private abstract static class AbstractNamingEnumeration<T> implements NamingEnumeration<T> {
-
-		private final Iterator<T> iterator;
-
-		private AbstractNamingEnumeration(SimpleNamingContext context, String proot) throws NamingException {
-			if (!proot.isEmpty() && !proot.endsWith("/")) {
-				proot = proot + "/";
-			}
-			String root = context.root + proot;
-			Map<String, T> contents = new HashMap<>();
-			for (String boundName : context.boundObjects.keySet()) {
-				if (boundName.startsWith(root)) {
-					int startIndex = root.length();
-					int endIndex = boundName.indexOf('/', startIndex);
-					String strippedName =
-							(endIndex != -1 ? boundName.substring(startIndex, endIndex) : boundName.substring(startIndex));
-					if (!contents.containsKey(strippedName)) {
-						try {
-							contents.put(strippedName, createObject(strippedName, context.lookup(proot + strippedName)));
-						}
-						catch (NameNotFoundException ex) {
-							// cannot happen
-						}
-					}
-				}
-			}
-			if (contents.size() == 0) {
-				throw new NamingException("Invalid root: [" + context.root + proot + "]");
-			}
-			this.iterator = contents.values().iterator();
-		}
-
-		protected abstract T createObject(String strippedName, Object obj);
-
-		@Override
-		public boolean hasMore() {
-			return this.iterator.hasNext();
-		}
-
-		@Override
-		public T next() {
-			return this.iterator.next();
-		}
-
-		@Override
-		public boolean hasMoreElements() {
-			return this.iterator.hasNext();
-		}
-
-		@Override
-		public T nextElement() {
-			return this.iterator.next();
-		}
-
-		@Override
-		public void close() {
-		}
-	}
-
-
-	private static final class NameClassPairEnumeration extends AbstractNamingEnumeration<NameClassPair> {
-
-		private NameClassPairEnumeration(SimpleNamingContext context, String root) throws NamingException {
-			super(context, root);
-		}
-
-		@Override
-		protected NameClassPair createObject(String strippedName, Object obj) {
-			return new NameClassPair(strippedName, obj.getClass().getName());
-		}
-	}
-
-
-	private static final class BindingEnumeration extends AbstractNamingEnumeration<Binding> {
-
-		private BindingEnumeration(SimpleNamingContext context, String root) throws NamingException {
-			super(context, root);
-		}
-
-		@Override
-		protected Binding createObject(String strippedName, Object obj) {
-			return new Binding(strippedName, obj);
-		}
-	}
-
-}
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
deleted file mode 100644
index 802dcaf32c43..000000000000
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * 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.
- * 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.mock.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.InitialContextFactoryBuilder;
-import javax.naming.spi.NamingManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * Simple implementation of a JNDI naming context builder.
- *
- * <p>Mainly targeted at test environments, where each test case can
- * configure JNDI appropriately, so that {@code new InitialContext()}
- * will expose the required objects. Also usable for standalone applications,
- * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
- * able to use traditional Jakarta EE data access code outside of a Jakarta EE
- * container.
- *
- * <p>There are various choices for DataSource implementations:
- * <ul>
- * <li>{@code SingleConnectionDataSource} (using the same Connection for all getConnection calls)
- * <li>{@code DriverManagerDataSource} (creating a new Connection on each getConnection call)
- * <li>Apache's Commons DBCP offers {@code org.apache.commons.dbcp.BasicDataSource} (a real pool)
- * </ul>
- *
- * <p>Typical usage in bootstrap code:
- *
- * <pre class="code">
- * SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
- * DataSource ds = new DriverManagerDataSource(...);
- * builder.bind("java:comp/env/jdbc/myds", ds);
- * builder.activate();</pre>
- *
- * Note that it's impossible to activate multiple builders within the same JVM,
- * due to JNDI restrictions. Thus to configure a fresh builder repeatedly, use
- * the following code to get a reference to either an already activated builder
- * or a newly activated one:
- *
- * <pre class="code">
- * SimpleNamingContextBuilder builder = SimpleNamingContextBuilder.emptyActivatedContextBuilder();
- * DataSource ds = new DriverManagerDataSource(...);
- * builder.bind("java:comp/env/jdbc/myds", ds);</pre>
- *
- * Note that you <i>should not</i> call {@code activate()} on a builder from
- * this factory method, as there will already be an activated one in any case.
- *
- * <p>An instance of this class is only necessary at setup time.
- * An application does not need to keep a reference to it after activation.
- *
- * @author Juergen Hoeller
- * @author Rod Johnson
- * @see #emptyActivatedContextBuilder()
- * @see #bind(String, Object)
- * @see #activate()
- * @see SimpleNamingContext
- * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
- * @see org.springframework.jdbc.datasource.DriverManagerDataSource
- * @deprecated Deprecated as of Spring Framework 5.2 in favor of complete solutions from
- * third parties such as <a href="https://github.com/h-thurow/Simple-JNDI">Simple-JNDI</a>
- */
-@Deprecated
-public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder {
-
-	/** An instance of this class bound to JNDI. */
-	@Nullable
-	private static volatile SimpleNamingContextBuilder activated;
-
-	private static boolean initialized = false;
-
-	private static final Object initializationLock = new Object();
-
-
-	/**
-	 * Checks if a SimpleNamingContextBuilder is active.
-	 * @return the current SimpleNamingContextBuilder instance,
-	 * or {@code null} if none
-	 */
-	@Nullable
-	public static SimpleNamingContextBuilder getCurrentContextBuilder() {
-		return activated;
-	}
-
-	/**
-	 * If no SimpleNamingContextBuilder is already configuring JNDI,
-	 * create and activate one. Otherwise take the existing activated
-	 * SimpleNamingContextBuilder, clear it and return it.
-	 * <p>This is mainly intended for test suites that want to
-	 * reinitialize JNDI bindings from scratch repeatedly.
-	 * @return an empty SimpleNamingContextBuilder that can be used
-	 * to control JNDI bindings
-	 */
-	public static SimpleNamingContextBuilder emptyActivatedContextBuilder() throws NamingException {
-		SimpleNamingContextBuilder builder = activated;
-		if (builder != null) {
-			// Clear already activated context builder.
-			builder.clear();
-		}
-		else {
-			// Create and activate new context builder.
-			builder = new SimpleNamingContextBuilder();
-			// The activate() call will cause an assignment to the activated variable.
-			builder.activate();
-		}
-		return builder;
-	}
-
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final Hashtable<String,Object> boundObjects = new Hashtable<>();
-
-
-	/**
-	 * Register the context builder by registering it with the JNDI NamingManager.
-	 * Note that once this has been done, {@code new InitialContext()} will always
-	 * return a context from this factory. Use the {@code emptyActivatedContextBuilder()}
-	 * static method to get an empty context (for example, in test methods).
-	 * @throws IllegalStateException if there's already a naming context builder
-	 * registered with the JNDI NamingManager
-	 */
-	public void activate() throws IllegalStateException, NamingException {
-		logger.info("Activating simple JNDI environment");
-		synchronized (initializationLock) {
-			if (!initialized) {
-				Assert.state(!NamingManager.hasInitialContextFactoryBuilder(),
-							"Cannot activate SimpleNamingContextBuilder: there is already a JNDI provider registered. " +
-							"Note that JNDI is a JVM-wide service, shared at the JVM system class loader level, " +
-							"with no reset option. As a consequence, a JNDI provider must only be registered once per JVM.");
-				NamingManager.setInitialContextFactoryBuilder(this);
-				initialized = true;
-			}
-		}
-		activated = this;
-	}
-
-	/**
-	 * Temporarily deactivate this context builder. It will remain registered with
-	 * the JNDI NamingManager but will delegate to the standard JNDI InitialContextFactory
-	 * (if configured) instead of exposing its own bound objects.
-	 * <p>Call {@code activate()} again in order to expose this context builder's own
-	 * bound objects again. Such activate/deactivate sequences can be applied any number
-	 * of times (e.g. within a larger integration test suite running in the same VM).
-	 * @see #activate()
-	 */
-	public void deactivate() {
-		logger.info("Deactivating simple JNDI environment");
-		activated = null;
-	}
-
-	/**
-	 * Clear all bindings in this context builder, while keeping it active.
-	 */
-	public void clear() {
-		this.boundObjects.clear();
-	}
-
-	/**
-	 * Bind the given object under the given name, for all naming contexts
-	 * that this context builder will generate.
-	 * @param name the JNDI name of the object (e.g. "java:comp/env/jdbc/myds")
-	 * @param obj the object to bind (e.g. a DataSource implementation)
-	 */
-	public void bind(String name, Object obj) {
-		if (logger.isInfoEnabled()) {
-			logger.info("Static JNDI binding: [" + name + "] = [" + obj + "]");
-		}
-		this.boundObjects.put(name, obj);
-	}
-
-
-	/**
-	 * Simple InitialContextFactoryBuilder implementation,
-	 * creating a new SimpleNamingContext instance.
-	 * @see SimpleNamingContext
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public InitialContextFactory createInitialContextFactory(@Nullable Hashtable<?,?> environment) {
-		if (activated == null && environment != null) {
-			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
-			if (icf != null) {
-				Class<?> icfClass;
-				if (icf instanceof Class) {
-					icfClass = (Class<?>) icf;
-				}
-				else if (icf instanceof String) {
-					icfClass = ClassUtils.resolveClassName((String) icf, getClass().getClassLoader());
-				}
-				else {
-					throw new IllegalArgumentException("Invalid value type for environment key [" +
-							Context.INITIAL_CONTEXT_FACTORY + "]: " + icf.getClass().getName());
-				}
-				if (!InitialContextFactory.class.isAssignableFrom(icfClass)) {
-					throw new IllegalArgumentException(
-							"Specified class does not implement [" + InitialContextFactory.class.getName() + "]: " + icf);
-				}
-				try {
-					return (InitialContextFactory) ReflectionUtils.accessibleConstructor(icfClass).newInstance();
-				}
-				catch (Throwable ex) {
-					throw new IllegalStateException("Unable to instantiate specified InitialContextFactory: " + icf, ex);
-				}
-			}
-		}
-
-		// Default case...
-		return env -> new SimpleNamingContext("", this.boundObjects, (Hashtable<String, Object>) env);
-	}
-
-}
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
deleted file mode 100644
index b2ec4eaacaa7..000000000000
--- a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * <strong>Deprecated</strong> as of Spring Framework 5.2 in favor of complete
- * solutions from third parties such as
- * <a href="https://github.com/h-thurow/Simple-JNDI">Simple-JNDI</a>.
- *
- * <p>The simplest implementation of the JNDI SPI that could possibly work.
- *
- * <p>Useful for setting up a simple JNDI environment for test suites
- * or stand-alone applications. If, for example, JDBC DataSources get bound to the
- * same JNDI names as within a Jakarta EE container, both application code and
- * configuration can be reused without changes.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.mock.jndi;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java b/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java
index 26f874aa33dc..21440f4a07bc 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -300,13 +300,6 @@ public interface Builder {
 
 		Builder session(WebSession session);
 
-		/**
-		 * Sets the request {@link Principal}.
-		 * @deprecated in favor of {@link #principal(Principal)}
-		 */
-		@Deprecated
-		Builder session(Principal principal);
-
 		Builder principal(Principal principal);
 
 		Builder remoteAddress(InetSocketAddress remoteAddress);
@@ -463,12 +456,6 @@ public Builder session(WebSession session) {
 			return this;
 		}
 
-		@Override
-		@Deprecated
-		public Builder session(Principal principal) {
-			return principal(principal);
-		}
-
 		@Override
 		public Builder principal(Principal principal) {
 			Assert.notNull(principal, "'principal' must not be null");
diff --git a/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java
deleted file mode 100644
index 6da1e6da85d2..000000000000
--- a/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * 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.
- * 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.test.util;
-
-import java.lang.annotation.Annotation;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-
-/**
- * {@code MetaAnnotationUtils} is a collection of utility methods that complements
- * the standard support already available in {@link AnnotationUtils}.
- *
- * <p>Whereas {@code AnnotationUtils} provides utilities for <em>getting</em> or
- * <em>finding</em> an annotation, {@code MetaAnnotationUtils} goes a step further
- * by providing support for determining the <em>root class</em> on which an
- * annotation is declared, either directly or indirectly via a <em>composed
- * annotation</em>. This additional information is encapsulated in an
- * {@link AnnotationDescriptor}.
- *
- * <p>The additional information provided by an {@code AnnotationDescriptor} is
- * required by the <em>Spring TestContext Framework</em> in order to be able to
- * support class hierarchy traversals for annotations such as
- * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration},
- * {@link org.springframework.test.context.TestExecutionListeners @TestExecutionListeners},
- * and {@link org.springframework.test.context.ActiveProfiles @ActiveProfiles}
- * which offer support for merging and overriding various <em>inherited</em>
- * annotation attributes (e.g.
- * {@link org.springframework.test.context.ContextConfiguration#inheritLocations}).
- *
- * @author Sam Brannen
- * @since 4.0
- * @see AnnotationUtils
- * @see AnnotationDescriptor
- * @deprecated as of Spring Framework 5.3 in favor of
- * {@link org.springframework.test.context.TestContextAnnotationUtils}
- */
-@Deprecated
-public abstract class MetaAnnotationUtils {
-
-	/**
-	 * Find the {@link AnnotationDescriptor} for the supplied {@code annotationType}
-	 * on the supplied {@link Class}, traversing its annotations, interfaces, and
-	 * superclasses if no annotation can be found on the given class itself.
-	 * <p>This method explicitly handles class-level annotations which are not
-	 * declared as {@linkplain java.lang.annotation.Inherited inherited} <em>as
-	 * well as meta-annotations</em>.
-	 * <p>The algorithm operates as follows:
-	 * <ol>
-	 * <li>Search for the annotation on the given class and return a corresponding
-	 * {@code AnnotationDescriptor} if found.
-	 * <li>Recursively search through all annotations that the given class declares.
-	 * <li>Recursively search through all interfaces implemented by the given class.
-	 * <li>Recursively search through the superclass hierarchy of the given class.
-	 * </ol>
-	 * <p>In this context, the term <em>recursively</em> means that the search
-	 * process continues by returning to step #1 with the current annotation,
-	 * interface, or superclass as the class to look for annotations on.
-	 * @param clazz the class to look for annotations on
-	 * @param annotationType the type of annotation to look for
-	 * @return the corresponding annotation descriptor if the annotation was found;
-	 * otherwise {@code null}
-	 * @see #findAnnotationDescriptorForTypes(Class, Class...)
-	 */
-	@Nullable
-	public static <T extends Annotation> AnnotationDescriptor<T> findAnnotationDescriptor(
-			Class<?> clazz, Class<T> annotationType) {
-
-		return findAnnotationDescriptor(clazz, new HashSet<>(), annotationType);
-	}
-
-	/**
-	 * Perform the search algorithm for {@link #findAnnotationDescriptor(Class, Class)},
-	 * avoiding endless recursion by tracking which annotations have already been
-	 * <em>visited</em>.
-	 * @param clazz the class to look for annotations on
-	 * @param visited the set of annotations that have already been visited
-	 * @param annotationType the type of annotation to look for
-	 * @return the corresponding annotation descriptor if the annotation was found;
-	 * otherwise {@code null}
-	 */
-	@Nullable
-	private static <T extends Annotation> AnnotationDescriptor<T> findAnnotationDescriptor(
-			@Nullable Class<?> clazz, Set<Annotation> visited, Class<T> annotationType) {
-
-		Assert.notNull(annotationType, "Annotation type must not be null");
-		if (clazz == null || Object.class == clazz) {
-			return null;
-		}
-
-		// Declared locally?
-		if (AnnotationUtils.isAnnotationDeclaredLocally(annotationType, clazz)) {
-			return new AnnotationDescriptor<>(clazz, clazz.getAnnotation(annotationType));
-		}
-
-		// Declared on a composed annotation (i.e., as a meta-annotation)?
-		for (Annotation composedAnn : clazz.getDeclaredAnnotations()) {
-			Class<? extends Annotation> composedType = composedAnn.annotationType();
-			if (!AnnotationUtils.isInJavaLangAnnotationPackage(composedType.getName()) && visited.add(composedAnn)) {
-				AnnotationDescriptor<T> descriptor = findAnnotationDescriptor(composedType, visited, annotationType);
-				if (descriptor != null) {
-					return new AnnotationDescriptor<>(
-							clazz, descriptor.getDeclaringClass(), composedAnn, descriptor.getAnnotation());
-				}
-			}
-		}
-
-		// Declared on an interface?
-		for (Class<?> ifc : clazz.getInterfaces()) {
-			AnnotationDescriptor<T> descriptor = findAnnotationDescriptor(ifc, visited, annotationType);
-			if (descriptor != null) {
-				return new AnnotationDescriptor<>(clazz, descriptor.getDeclaringClass(),
-						descriptor.getComposedAnnotation(), descriptor.getAnnotation());
-			}
-		}
-
-		// Declared on a superclass?
-		return findAnnotationDescriptor(clazz.getSuperclass(), visited, annotationType);
-	}
-
-	/**
-	 * Find the {@link UntypedAnnotationDescriptor} for the first {@link Class}
-	 * in the inheritance hierarchy of the specified {@code clazz} (including
-	 * the specified {@code clazz} itself) which declares at least one of the
-	 * specified {@code annotationTypes}.
-	 * <p>This method traverses the annotations, interfaces, and superclasses
-	 * of the specified {@code clazz} if no annotation can be found on the given
-	 * class itself.
-	 * <p>This method explicitly handles class-level annotations which are not
-	 * declared as {@linkplain java.lang.annotation.Inherited inherited} <em>as
-	 * well as meta-annotations</em>.
-	 * <p>The algorithm operates as follows:
-	 * <ol>
-	 * <li>Search for a local declaration of one of the annotation types on
-	 * the given class and return a corresponding {@code UntypedAnnotationDescriptor}
-	 * if found.
-	 * <li>Recursively search through all annotations that the given class declares.
-	 * <li>Recursively search through all interfaces implemented by the given class.
-	 * <li>Recursively search through the superclass hierarchy of the given class.
-	 * </ol>
-	 * <p>In this context, the term <em>recursively</em> means that the search
-	 * process continues by returning to step #1 with the current annotation,
-	 * interface, or superclass as the class to look for annotations on.
-	 * @param clazz the class to look for annotations on
-	 * @param annotationTypes the types of annotations to look for
-	 * @return the corresponding annotation descriptor if one of the annotations
-	 * was found; otherwise {@code null}
-	 * @see #findAnnotationDescriptor(Class, Class)
-	 */
-	@SuppressWarnings("unchecked")
-	@Nullable
-	public static UntypedAnnotationDescriptor findAnnotationDescriptorForTypes(
-			Class<?> clazz, Class<? extends Annotation>... annotationTypes) {
-
-		return findAnnotationDescriptorForTypes(clazz, new HashSet<>(), annotationTypes);
-	}
-
-	/**
-	 * Perform the search algorithm for {@link #findAnnotationDescriptorForTypes(Class, Class...)},
-	 * avoiding endless recursion by tracking which annotations have already been
-	 * <em>visited</em>.
-	 * @param clazz the class to look for annotations on
-	 * @param visited the set of annotations that have already been visited
-	 * @param annotationTypes the types of annotations to look for
-	 * @return the corresponding annotation descriptor if one of the annotations
-	 * was found; otherwise {@code null}
-	 */
-	@SuppressWarnings("unchecked")
-	@Nullable
-	private static UntypedAnnotationDescriptor findAnnotationDescriptorForTypes(@Nullable Class<?> clazz,
-			Set<Annotation> visited, Class<? extends Annotation>... annotationTypes) {
-
-		assertNonEmptyAnnotationTypeArray(annotationTypes, "The list of annotation types must not be empty");
-		if (clazz == null || Object.class == clazz) {
-			return null;
-		}
-
-		// Declared locally?
-		for (Class<? extends Annotation> annotationType : annotationTypes) {
-			if (AnnotationUtils.isAnnotationDeclaredLocally(annotationType, clazz)) {
-				return new UntypedAnnotationDescriptor(clazz, clazz.getAnnotation(annotationType));
-			}
-		}
-
-		// Declared on a composed annotation (i.e., as a meta-annotation)?
-		for (Annotation composedAnnotation : clazz.getDeclaredAnnotations()) {
-			if (!AnnotationUtils.isInJavaLangAnnotationPackage(composedAnnotation) && visited.add(composedAnnotation)) {
-				UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(
-						composedAnnotation.annotationType(), visited, annotationTypes);
-				if (descriptor != null) {
-					return new UntypedAnnotationDescriptor(clazz, descriptor.getDeclaringClass(),
-							composedAnnotation, descriptor.getAnnotation());
-				}
-			}
-		}
-
-		// Declared on an interface?
-		for (Class<?> ifc : clazz.getInterfaces()) {
-			UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(ifc, visited, annotationTypes);
-			if (descriptor != null) {
-				return new UntypedAnnotationDescriptor(clazz, descriptor.getDeclaringClass(),
-						descriptor.getComposedAnnotation(), descriptor.getAnnotation());
-			}
-		}
-
-		// Declared on a superclass?
-		return findAnnotationDescriptorForTypes(clazz.getSuperclass(), visited, annotationTypes);
-	}
-
-	private static void assertNonEmptyAnnotationTypeArray(Class<?>[] annotationTypes, String message) {
-		if (ObjectUtils.isEmpty(annotationTypes)) {
-			throw new IllegalArgumentException(message);
-		}
-		for (Class<?> clazz : annotationTypes) {
-			if (!Annotation.class.isAssignableFrom(clazz)) {
-				throw new IllegalArgumentException("Array elements must be of type Annotation");
-			}
-		}
-	}
-
-
-	/**
-	 * Descriptor for an {@link Annotation}, including the {@linkplain
-	 * #getDeclaringClass() class} on which the annotation is <em>declared</em>
-	 * as well as the actual {@linkplain #getAnnotation() annotation} instance.
-	 * <p>If the annotation is used as a meta-annotation, the descriptor also includes
-	 * the {@linkplain #getComposedAnnotation() composed annotation} on which the
-	 * annotation is present. In such cases, the <em>root declaring class</em> is
-	 * not directly annotated with the annotation but rather indirectly via the
-	 * composed annotation.
-	 * <p>Given the following example, if we are searching for the {@code @Transactional}
-	 * annotation <em>on</em> the {@code TransactionalTests} class, then the
-	 * properties of the {@code AnnotationDescriptor} would be as follows.
-	 * <ul>
-	 * <li>rootDeclaringClass: {@code TransactionalTests} class object</li>
-	 * <li>declaringClass: {@code TransactionalTests} class object</li>
-	 * <li>composedAnnotation: {@code null}</li>
-	 * <li>annotation: instance of the {@code Transactional} annotation</li>
-	 * </ul>
-	 * <p><pre style="code">
-	 * &#064;Transactional
-	 * &#064;ContextConfiguration({"/test-datasource.xml", "/repository-config.xml"})
-	 * public class TransactionalTests { }
-	 * </pre>
-	 * <p>Given the following example, if we are searching for the {@code @Transactional}
-	 * annotation <em>on</em> the {@code UserRepositoryTests} class, then the
-	 * properties of the {@code AnnotationDescriptor} would be as follows.
-	 * <ul>
-	 * <li>rootDeclaringClass: {@code UserRepositoryTests} class object</li>
-	 * <li>declaringClass: {@code RepositoryTests} class object</li>
-	 * <li>composedAnnotation: instance of the {@code RepositoryTests} annotation</li>
-	 * <li>annotation: instance of the {@code Transactional} annotation</li>
-	 * </ul>
-	 * <p><pre style="code">
-	 * &#064;Transactional
-	 * &#064;ContextConfiguration({"/test-datasource.xml", "/repository-config.xml"})
-	 * &#064;Retention(RetentionPolicy.RUNTIME)
-	 * public &#064;interface RepositoryTests { }
-	 *
-	 * &#064;RepositoryTests
-	 * public class UserRepositoryTests { }
-	 * </pre>
-	 *
-	 * @param <T> the annotation type
-	 */
-	public static class AnnotationDescriptor<T extends Annotation> {
-
-		private final Class<?> rootDeclaringClass;
-
-		private final Class<?> declaringClass;
-
-		@Nullable
-		private final Annotation composedAnnotation;
-
-		private final T annotation;
-
-		private final AnnotationAttributes annotationAttributes;
-
-		public AnnotationDescriptor(Class<?> rootDeclaringClass, T annotation) {
-			this(rootDeclaringClass, rootDeclaringClass, null, annotation);
-		}
-
-		public AnnotationDescriptor(Class<?> rootDeclaringClass, Class<?> declaringClass,
-				@Nullable Annotation composedAnnotation, T annotation) {
-
-			Assert.notNull(rootDeclaringClass, "'rootDeclaringClass' must not be null");
-			Assert.notNull(annotation, "Annotation must not be null");
-			this.rootDeclaringClass = rootDeclaringClass;
-			this.declaringClass = declaringClass;
-			this.composedAnnotation = composedAnnotation;
-			this.annotation = annotation;
-			AnnotationAttributes attributes = AnnotatedElementUtils.findMergedAnnotationAttributes(
-					rootDeclaringClass, annotation.annotationType().getName(), false, false);
-			Assert.state(attributes != null, "No annotation attributes");
-			this.annotationAttributes = attributes;
-		}
-
-		public Class<?> getRootDeclaringClass() {
-			return this.rootDeclaringClass;
-		}
-
-		public Class<?> getDeclaringClass() {
-			return this.declaringClass;
-		}
-
-		public T getAnnotation() {
-			return this.annotation;
-		}
-
-		/**
-		 * Synthesize the merged {@link #getAnnotationAttributes AnnotationAttributes}
-		 * in this descriptor back into an annotation of the target
-		 * {@linkplain #getAnnotationType annotation type}.
-		 * @since 4.2
-		 * @see #getAnnotationAttributes()
-		 * @see #getAnnotationType()
-		 * @see AnnotationUtils#synthesizeAnnotation(java.util.Map, Class, java.lang.reflect.AnnotatedElement)
-		 */
-		@SuppressWarnings("unchecked")
-		public T synthesizeAnnotation() {
-			return AnnotationUtils.synthesizeAnnotation(
-					getAnnotationAttributes(), (Class<T>) getAnnotationType(), getRootDeclaringClass());
-		}
-
-		public Class<? extends Annotation> getAnnotationType() {
-			return this.annotation.annotationType();
-		}
-
-		public AnnotationAttributes getAnnotationAttributes() {
-			return this.annotationAttributes;
-		}
-
-		@Nullable
-		public Annotation getComposedAnnotation() {
-			return this.composedAnnotation;
-		}
-
-		@Nullable
-		public Class<? extends Annotation> getComposedAnnotationType() {
-			return (this.composedAnnotation != null ? this.composedAnnotation.annotationType() : null);
-		}
-
-		/**
-		 * Provide a textual representation of this {@code AnnotationDescriptor}.
-		 */
-		@Override
-		public String toString() {
-			return new ToStringCreator(this)
-					.append("rootDeclaringClass", this.rootDeclaringClass)
-					.append("declaringClass", this.declaringClass)
-					.append("composedAnnotation", this.composedAnnotation)
-					.append("annotation", this.annotation)
-					.toString();
-		}
-	}
-
-
-	/**
-	 * <em>Untyped</em> extension of {@link AnnotationDescriptor} that is used
-	 * to describe the declaration of one of several candidate annotation types
-	 * where the actual annotation type cannot be predetermined.
-	 */
-	public static class UntypedAnnotationDescriptor extends AnnotationDescriptor<Annotation> {
-
-		public UntypedAnnotationDescriptor(Class<?> rootDeclaringClass, Annotation annotation) {
-			this(rootDeclaringClass, rootDeclaringClass, null, annotation);
-		}
-
-		public UntypedAnnotationDescriptor(Class<?> rootDeclaringClass, Class<?> declaringClass,
-				@Nullable Annotation composedAnnotation, Annotation annotation) {
-
-			super(rootDeclaringClass, declaringClass, composedAnnotation, annotation);
-		}
-
-		/**
-		 * Throws an {@link UnsupportedOperationException} since the type of annotation
-		 * represented by the {@link #getAnnotationAttributes AnnotationAttributes} in
-		 * an {@code UntypedAnnotationDescriptor} is unknown.
-		 * @since 4.2
-		 */
-		@Override
-		public Annotation synthesizeAnnotation() {
-			throw new UnsupportedOperationException(
-					"synthesizeAnnotation() is unsupported in UntypedAnnotationDescriptor");
-		}
-	}
-
-}
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
index bd57ec72fcd0..3796dc87ae32 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
@@ -88,14 +88,7 @@ public ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOEx
 				afterExpectationsDeclared();
 			}
 			try {
-				// Try this first for backwards compatibility
-				ClientHttpResponse response = validateRequestInternal(request);
-				if (response != null) {
-					return response;
-				}
-				else {
-					expectation = matchRequest(request);
-				}
+				expectation = matchRequest(request);
 			}
 			catch (Throwable ex) {
 				this.requestFailures.put(request, ex);
@@ -115,19 +108,6 @@ public ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOEx
 	protected void afterExpectationsDeclared() {
 	}
 
-	/**
-	 * Subclasses must implement the actual validation of the request
-	 * matching to declared expectations.
-	 * @deprecated as of 5.0.3, subclasses should implement {@link #matchRequest(ClientHttpRequest)}
-	 * instead and return only the matched expectation, leaving the call to create the response
-	 * as a separate step (to be invoked by this class).
-	 */
-	@Deprecated
-	@Nullable
-	protected ClientHttpResponse validateRequestInternal(ClientHttpRequest request) throws IOException {
-		return null;
-	}
-
 	/**
 	 * As of 5.0.3 subclasses should implement this method instead of
 	 * {@link #validateRequestInternal(ClientHttpRequest)} in order to match the
@@ -272,15 +252,6 @@ private void updateInternal(RequestExpectation expectation) {
 			}
 		}
 
-		/**
-		 * Add expectations to this group.
-		 * @deprecated as of 5.0.3, if favor of {@link #addAllExpectations}
-		 */
-		@Deprecated
-		public void updateAll(Collection<RequestExpectation> expectations) {
-			expectations.forEach(this::updateInternal);
-		}
-
 		/**
 		 * Reset all expectations for this group.
 		 */
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
index c9e7dbc74cc3..07830ac32766 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -223,28 +223,6 @@ public static MockMultipartHttpServletRequestBuilder multipart(URI uri) {
 		return new MockMultipartHttpServletRequestBuilder(uri);
 	}
 
-	/**
-	 * Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request.
-	 * @param urlTemplate a URL template; the resulting URL will be encoded
-	 * @param uriVars zero or more URI variables
-	 * @deprecated in favor of {@link #multipart(String, Object...)}
-	 */
-	@Deprecated
-	public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTemplate, Object... uriVars) {
-		return new MockMultipartHttpServletRequestBuilder(urlTemplate, uriVars);
-	}
-
-	/**
-	 * Create a {@link MockMultipartHttpServletRequestBuilder} for a multipart request.
-	 * @param uri the URL
-	 * @since 4.0.3
-	 * @deprecated in favor of {@link #multipart(URI)}
-	 */
-	@Deprecated
-	public static MockMultipartHttpServletRequestBuilder fileUpload(URI uri) {
-		return new MockMultipartHttpServletRequestBuilder(uri);
-	}
-
 
 	/**
 	 * Create a {@link RequestBuilder} for an async dispatch from the
diff --git a/spring-test/src/test/java/org/springframework/mock/jndi/SimpleNamingContextTests.java b/spring-test/src/test/java/org/springframework/mock/jndi/SimpleNamingContextTests.java
deleted file mode 100644
index 95b2a377be80..000000000000
--- a/spring-test/src/test/java/org/springframework/mock/jndi/SimpleNamingContextTests.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * 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.
- * 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.mock.jndi;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import javax.sql.DataSource;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-/**
- * Tests for {@link SimpleNamingContextBuilder} and {@link SimpleNamingContext}.
- *
- * @author Juergen Hoeller
- * @author Chris Beams
- */
-@SuppressWarnings("deprecation")
-class SimpleNamingContextTests {
-
-	@Test
-	void namingContextBuilder() throws NamingException {
-		SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
-		InitialContextFactory factory = builder.createInitialContextFactory(null);
-
-		DataSource ds = new StubDataSource();
-		builder.bind("java:comp/env/jdbc/myds", ds);
-		Object obj = new Object();
-		builder.bind("myobject", obj);
-
-		Context context1 = factory.getInitialContext(null);
-		assertThat(context1.lookup("java:comp/env/jdbc/myds") == ds).as("Correct DataSource registered").isTrue();
-		assertThat(context1.lookup("myobject") == obj).as("Correct Object registered").isTrue();
-
-		Hashtable<String, String> env2 = new Hashtable<>();
-		env2.put("key1", "value1");
-		Context context2 = factory.getInitialContext(env2);
-		assertThat(context2.lookup("java:comp/env/jdbc/myds") == ds).as("Correct DataSource registered").isTrue();
-		assertThat(context2.lookup("myobject") == obj).as("Correct Object registered").isTrue();
-		assertThat(context2.getEnvironment() != env2).as("Correct environment").isTrue();
-		assertThat("value1".equals(context2.getEnvironment().get("key1"))).as("Correct key1").isTrue();
-
-		Integer i = 0;
-		context1.rebind("myinteger", i);
-		String s = "";
-		context2.bind("mystring", s);
-
-		Context context3 = (Context) context2.lookup("");
-		context3.rename("java:comp/env/jdbc/myds", "jdbc/myds");
-		context3.unbind("myobject");
-
-		assertThat(context3.getEnvironment() != context2.getEnvironment()).as("Correct environment").isTrue();
-		context3.addToEnvironment("key2", "value2");
-		assertThat("value2".equals(context3.getEnvironment().get("key2"))).as("key2 added").isTrue();
-		context3.removeFromEnvironment("key1");
-		assertThat(context3.getEnvironment().get("key1") == null).as("key1 removed").isTrue();
-
-		assertThat(context1.lookup("jdbc/myds") == ds).as("Correct DataSource registered").isTrue();
-		assertThatExceptionOfType(NameNotFoundException.class).isThrownBy(() ->
-				context1.lookup("myobject"));
-		assertThat(context1.lookup("myinteger") == i).as("Correct Integer registered").isTrue();
-		assertThat(context1.lookup("mystring") == s).as("Correct String registered").isTrue();
-
-		assertThat(context2.lookup("jdbc/myds") == ds).as("Correct DataSource registered").isTrue();
-		assertThatExceptionOfType(NameNotFoundException.class).isThrownBy(() ->
-				context2.lookup("myobject"));
-		assertThat(context2.lookup("myinteger") == i).as("Correct Integer registered").isTrue();
-		assertThat(context2.lookup("mystring") == s).as("Correct String registered").isTrue();
-
-		assertThat(context3.lookup("jdbc/myds") == ds).as("Correct DataSource registered").isTrue();
-		assertThatExceptionOfType(NameNotFoundException.class).isThrownBy(() ->
-				context3.lookup("myobject"));
-		assertThat(context3.lookup("myinteger") == i).as("Correct Integer registered").isTrue();
-		assertThat(context3.lookup("mystring") == s).as("Correct String registered").isTrue();
-
-		Map<String, Binding> bindingMap = new HashMap<>();
-		NamingEnumeration<?> bindingEnum = context3.listBindings("");
-		while (bindingEnum.hasMoreElements()) {
-			Binding binding = (Binding) bindingEnum.nextElement();
-			bindingMap.put(binding.getName(), binding);
-		}
-		boolean condition = bindingMap.get("jdbc").getObject() instanceof Context;
-		assertThat(condition).as("Correct jdbc subcontext").isTrue();
-		assertThat(SimpleNamingContext.class.getName().equals(bindingMap.get("jdbc").getClassName())).as("Correct jdbc subcontext").isTrue();
-
-		Context jdbcContext = (Context) context3.lookup("jdbc");
-		jdbcContext.bind("mydsX", ds);
-		Map<String, Binding> subBindingMap = new HashMap<>();
-		NamingEnumeration<?> subBindingEnum = jdbcContext.listBindings("");
-		while (subBindingEnum.hasMoreElements()) {
-			Binding binding = (Binding) subBindingEnum.nextElement();
-			subBindingMap.put(binding.getName(), binding);
-		}
-
-		assertThat(ds.equals(subBindingMap.get("myds").getObject())).as("Correct DataSource registered").isTrue();
-		assertThat(StubDataSource.class.getName().equals(subBindingMap.get("myds").getClassName())).as("Correct DataSource registered").isTrue();
-		assertThat(ds.equals(subBindingMap.get("mydsX").getObject())).as("Correct DataSource registered").isTrue();
-		assertThat(StubDataSource.class.getName().equals(subBindingMap.get("mydsX").getClassName())).as("Correct DataSource registered").isTrue();
-		assertThat(i.equals(bindingMap.get("myinteger").getObject())).as("Correct Integer registered").isTrue();
-		assertThat(Integer.class.getName().equals(bindingMap.get("myinteger").getClassName())).as("Correct Integer registered").isTrue();
-		assertThat(s.equals(bindingMap.get("mystring").getObject())).as("Correct String registered").isTrue();
-		assertThat(String.class.getName().equals(bindingMap.get("mystring").getClassName())).as("Correct String registered").isTrue();
-
-		context1.createSubcontext("jdbc").bind("sub/subds", ds);
-
-		Map<String, String> pairMap = new HashMap<>();
-		NamingEnumeration<?> pairEnum = context2.list("jdbc");
-		while (pairEnum.hasMore()) {
-			NameClassPair pair = (NameClassPair) pairEnum.next();
-			pairMap.put(pair.getName(), pair.getClassName());
-		}
-		assertThat(SimpleNamingContext.class.getName().equals(pairMap.get("sub"))).as("Correct sub subcontext").isTrue();
-
-		Context subContext = (Context) context2.lookup("jdbc/sub");
-		Map<String, String> subPairMap = new HashMap<>();
-		NamingEnumeration<?> subPairEnum = subContext.list("");
-		while (subPairEnum.hasMoreElements()) {
-			NameClassPair pair = (NameClassPair) subPairEnum.next();
-			subPairMap.put(pair.getName(), pair.getClassName());
-		}
-
-		assertThat(StubDataSource.class.getName().equals(subPairMap.get("subds"))).as("Correct DataSource registered").isTrue();
-		assertThat(StubDataSource.class.getName().equals(pairMap.get("myds"))).as("Correct DataSource registered").isTrue();
-		assertThat(StubDataSource.class.getName().equals(pairMap.get("mydsX"))).as("Correct DataSource registered").isTrue();
-
-		pairMap.clear();
-		pairEnum = context1.list("jdbc/");
-		while (pairEnum.hasMore()) {
-			NameClassPair pair = (NameClassPair) pairEnum.next();
-			pairMap.put(pair.getName(), pair.getClassName());
-		}
-		assertThat(StubDataSource.class.getName().equals(pairMap.get("myds"))).as("Correct DataSource registered").isTrue();
-		assertThat(StubDataSource.class.getName().equals(pairMap.get("mydsX"))).as("Correct DataSource registered").isTrue();
-	}
-
-	/**
-	 * Demonstrates how emptyActivatedContextBuilder() method can be
-	 * used repeatedly, and how it affects creating a new InitialContext()
-	 */
-	@Test
-	void createInitialContext() throws Exception {
-		SimpleNamingContextBuilder builder = SimpleNamingContextBuilder.emptyActivatedContextBuilder();
-		String name = "foo";
-		Object o = new Object();
-		builder.bind(name, o);
-		// Check it affects JNDI
-		Context ctx = new InitialContext();
-		assertThat(ctx.lookup(name) == o).isTrue();
-		// Check it returns mutable contexts
-		ctx.unbind(name);
-		InitialContext badCtx1 = new InitialContext();
-		assertThatExceptionOfType(NamingException.class).isThrownBy(() ->
-				badCtx1.lookup(name));
-
-		// Check the same call will work again, but the context is empty
-		builder = SimpleNamingContextBuilder.emptyActivatedContextBuilder();
-		InitialContext badCtx2 = new InitialContext();
-		assertThatExceptionOfType(NamingException.class).isThrownBy(() ->
-				badCtx2.lookup(name));
-		Object o2 = new Object();
-		builder.bind(name, o2);
-		assertThat(o2).isEqualTo(badCtx2.lookup(name));
-	}
-
-
-	static class StubDataSource implements DataSource {
-
-		@Override
-		public Connection getConnection() throws SQLException {
-			return null;
-		}
-
-		@Override
-		public Connection getConnection(String username, String password) throws SQLException {
-			return null;
-		}
-
-		@Override
-		public PrintWriter getLogWriter() throws SQLException {
-			return null;
-		}
-
-		@Override
-		public int getLoginTimeout() throws SQLException {
-			return 0;
-		}
-
-		@Override
-		public void setLogWriter(PrintWriter arg0) throws SQLException {
-
-		}
-
-		@Override
-		public void setLoginTimeout(int arg0) throws SQLException {
-
-		}
-
-		@Override
-		public boolean isWrapperFor(Class<?> arg0) throws SQLException {
-			return false;
-		}
-
-		@Override
-		public <T> T unwrap(Class<T> arg0) throws SQLException {
-			return null;
-		}
-
-		@Override
-		public Logger getParentLogger() {
-			return null;
-		}
-	}
-
-}
diff --git a/spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java
deleted file mode 100644
index 4fd375f8c31c..000000000000
--- a/spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- * 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.
- * 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.test.util;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.util.MetaAnnotationUtils.AnnotationDescriptor;
-import org.springframework.test.util.MetaAnnotationUtils.UntypedAnnotationDescriptor;
-import org.springframework.transaction.annotation.Transactional;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.util.MetaAnnotationUtils.findAnnotationDescriptor;
-import static org.springframework.test.util.MetaAnnotationUtils.findAnnotationDescriptorForTypes;
-
-/**
- * Unit tests for {@link MetaAnnotationUtils}.
- *
- * @author Sam Brannen
- * @since 4.0
- * @see OverriddenMetaAnnotationAttributesTests
- */
-@SuppressWarnings("deprecation")
-class MetaAnnotationUtilsTests {
-
-	private void assertAtComponentOnComposedAnnotation(
-			Class<?> rootDeclaringClass, String name, Class<? extends Annotation> composedAnnotationType) {
-
-		assertAtComponentOnComposedAnnotation(rootDeclaringClass, rootDeclaringClass, name, composedAnnotationType);
-	}
-
-	private void assertAtComponentOnComposedAnnotation(
-			Class<?> startClass, Class<?> rootDeclaringClass, String name, Class<? extends Annotation> composedAnnotationType) {
-
-		assertAtComponentOnComposedAnnotation(startClass, rootDeclaringClass, composedAnnotationType, name, composedAnnotationType);
-	}
-
-	private void assertAtComponentOnComposedAnnotation(Class<?> startClass, Class<?> rootDeclaringClass,
-			Class<?> declaringClass, String name, Class<? extends Annotation> composedAnnotationType) {
-
-		AnnotationDescriptor<Component> descriptor = findAnnotationDescriptor(startClass, Component.class);
-		assertThat(descriptor).as("AnnotationDescriptor should not be null").isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).as("rootDeclaringClass").isEqualTo(rootDeclaringClass);
-		assertThat(descriptor.getDeclaringClass()).as("declaringClass").isEqualTo(declaringClass);
-		assertThat(descriptor.getAnnotationType()).as("annotationType").isEqualTo(Component.class);
-		assertThat(descriptor.getAnnotation().value()).as("component name").isEqualTo(name);
-		assertThat(descriptor.getComposedAnnotation()).as("composedAnnotation should not be null").isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).as("composedAnnotationType").isEqualTo(composedAnnotationType);
-	}
-
-	private void assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(
-			Class<?> startClass, String name, Class<? extends Annotation> composedAnnotationType) {
-
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(
-				startClass, startClass, name, composedAnnotationType);
-	}
-
-	private void assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(Class<?> startClass,
-			Class<?> rootDeclaringClass, String name, Class<? extends Annotation> composedAnnotationType) {
-
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(
-				startClass, rootDeclaringClass, composedAnnotationType, name, composedAnnotationType);
-	}
-
-	@SuppressWarnings("unchecked")
-	private void assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(Class<?> startClass,
-			Class<?> rootDeclaringClass, Class<?> declaringClass, String name,
-			Class<? extends Annotation> composedAnnotationType) {
-
-		Class<Component> annotationType = Component.class;
-		UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(
-				startClass, Service.class, annotationType, Order.class, Transactional.class);
-
-		assertThat(descriptor).as("UntypedAnnotationDescriptor should not be null").isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).as("rootDeclaringClass").isEqualTo(rootDeclaringClass);
-		assertThat(descriptor.getDeclaringClass()).as("declaringClass").isEqualTo(declaringClass);
-		assertThat(descriptor.getAnnotationType()).as("annotationType").isEqualTo(annotationType);
-		assertThat(((Component) descriptor.getAnnotation()).value()).as("component name").isEqualTo(name);
-		assertThat(descriptor.getComposedAnnotation()).as("composedAnnotation should not be null").isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).as("composedAnnotationType").isEqualTo(composedAnnotationType);
-	}
-
-	@Test
-	void findAnnotationDescriptorWithNoAnnotationPresent() {
-		assertThat(findAnnotationDescriptor(NonAnnotatedInterface.class, Transactional.class)).isNull();
-		assertThat(findAnnotationDescriptor(NonAnnotatedClass.class, Transactional.class)).isNull();
-	}
-
-	@Test
-	void findAnnotationDescriptorWithInheritedAnnotationOnClass() {
-		// Note: @Transactional is inherited
-		assertThat(findAnnotationDescriptor(InheritedAnnotationClass.class, Transactional.class).getRootDeclaringClass()).isEqualTo(InheritedAnnotationClass.class);
-		assertThat(findAnnotationDescriptor(SubInheritedAnnotationClass.class, Transactional.class).getRootDeclaringClass()).isEqualTo(InheritedAnnotationClass.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorWithInheritedAnnotationOnInterface() {
-		// Note: @Transactional is inherited
-		Transactional rawAnnotation = InheritedAnnotationInterface.class.getAnnotation(Transactional.class);
-
-		AnnotationDescriptor<Transactional> descriptor =
-				findAnnotationDescriptor(InheritedAnnotationInterface.class, Transactional.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-
-		descriptor = findAnnotationDescriptor(SubInheritedAnnotationInterface.class, Transactional.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(SubInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-
-		descriptor = findAnnotationDescriptor(SubSubInheritedAnnotationInterface.class, Transactional.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(SubSubInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-	}
-
-	@Test
-	void findAnnotationDescriptorForNonInheritedAnnotationOnClass() {
-		// Note: @Order is not inherited.
-		assertThat(findAnnotationDescriptor(NonInheritedAnnotationClass.class, Order.class).getRootDeclaringClass()).isEqualTo(NonInheritedAnnotationClass.class);
-		assertThat(findAnnotationDescriptor(SubNonInheritedAnnotationClass.class, Order.class).getRootDeclaringClass()).isEqualTo(NonInheritedAnnotationClass.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorForNonInheritedAnnotationOnInterface() {
-		// Note: @Order is not inherited.
-		Order rawAnnotation = NonInheritedAnnotationInterface.class.getAnnotation(Order.class);
-
-		AnnotationDescriptor<Order> descriptor =
-				findAnnotationDescriptor(NonInheritedAnnotationInterface.class, Order.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(NonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(NonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-
-		descriptor = findAnnotationDescriptor(SubNonInheritedAnnotationInterface.class, Order.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(SubNonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(NonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-	}
-
-	@Test
-	void findAnnotationDescriptorWithMetaComponentAnnotation() {
-		assertAtComponentOnComposedAnnotation(HasMetaComponentAnnotation.class, "meta1", Meta1.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorWithLocalAndMetaComponentAnnotation() {
-		Class<Component> annotationType = Component.class;
-		AnnotationDescriptor<Component> descriptor = findAnnotationDescriptor(
-				HasLocalAndMetaComponentAnnotation.class, annotationType);
-
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(HasLocalAndMetaComponentAnnotation.class);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(annotationType);
-		assertThat(descriptor.getComposedAnnotation()).isNull();
-		assertThat(descriptor.getComposedAnnotationType()).isNull();
-	}
-
-	@Test
-	void findAnnotationDescriptorForInterfaceWithMetaAnnotation() {
-		assertAtComponentOnComposedAnnotation(InterfaceWithMetaAnnotation.class, "meta1", Meta1.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorForClassWithMetaAnnotatedInterface() {
-		Component rawAnnotation = AnnotationUtils.findAnnotation(ClassWithMetaAnnotatedInterface.class, Component.class);
-		AnnotationDescriptor<Component> descriptor =
-				findAnnotationDescriptor(ClassWithMetaAnnotatedInterface.class, Component.class);
-
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(ClassWithMetaAnnotatedInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(Meta1.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-		assertThat(descriptor.getComposedAnnotation().annotationType()).isEqualTo(Meta1.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorForClassWithLocalMetaAnnotationAndAnnotatedSuperclass() {
-		AnnotationDescriptor<ContextConfiguration> descriptor = findAnnotationDescriptor(
-				MetaAnnotatedAndSuperAnnotatedContextConfigClass.class, ContextConfiguration.class);
-
-		assertThat(descriptor).as("AnnotationDescriptor should not be null").isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).as("rootDeclaringClass").isEqualTo(MetaAnnotatedAndSuperAnnotatedContextConfigClass.class);
-		assertThat(descriptor.getDeclaringClass()).as("declaringClass").isEqualTo(MetaConfig.class);
-		assertThat(descriptor.getAnnotationType()).as("annotationType").isEqualTo(ContextConfiguration.class);
-		assertThat(descriptor.getComposedAnnotation()).as("composedAnnotation should not be null").isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).as("composedAnnotationType").isEqualTo(MetaConfig.class);
-
-		assertThat(descriptor.getAnnotationAttributes().getClassArray("classes")).as("configured classes").isEqualTo(new Class<?>[] {String.class});
-	}
-
-	@Test
-	void findAnnotationDescriptorForClassWithLocalMetaAnnotationAndMetaAnnotatedInterface() {
-		assertAtComponentOnComposedAnnotation(ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class, "meta2", Meta2.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorForSubClassWithLocalMetaAnnotationAndMetaAnnotatedInterface() {
-		assertAtComponentOnComposedAnnotation(SubClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class,
-				ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class, "meta2", Meta2.class);
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	void findAnnotationDescriptorOnMetaMetaAnnotatedClass() {
-		Class<MetaMetaAnnotatedClass> startClass = MetaMetaAnnotatedClass.class;
-		assertAtComponentOnComposedAnnotation(startClass, startClass, Meta2.class, "meta2", MetaMeta.class);
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	void findAnnotationDescriptorOnMetaMetaMetaAnnotatedClass() {
-		Class<MetaMetaMetaAnnotatedClass> startClass = MetaMetaMetaAnnotatedClass.class;
-		assertAtComponentOnComposedAnnotation(startClass, startClass, Meta2.class, "meta2", MetaMetaMeta.class);
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	void findAnnotationDescriptorOnAnnotatedClassWithMissingTargetMetaAnnotation() {
-		// InheritedAnnotationClass is NOT annotated or meta-annotated with @Component
-		AnnotationDescriptor<Component> descriptor = findAnnotationDescriptor(
-				InheritedAnnotationClass.class, Component.class);
-		assertThat(descriptor).as("Should not find @Component on InheritedAnnotationClass").isNull();
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	void findAnnotationDescriptorOnMetaCycleAnnotatedClassWithMissingTargetMetaAnnotation() {
-		AnnotationDescriptor<Component> descriptor = findAnnotationDescriptor(
-				MetaCycleAnnotatedClass.class, Component.class);
-		assertThat(descriptor).as("Should not find @Component on MetaCycleAnnotatedClass").isNull();
-	}
-
-	// -------------------------------------------------------------------------
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesWithNoAnnotationPresent() {
-		assertThat(findAnnotationDescriptorForTypes(NonAnnotatedInterface.class, Transactional.class, Component.class)).isNull();
-		assertThat(findAnnotationDescriptorForTypes(NonAnnotatedClass.class, Transactional.class, Order.class)).isNull();
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesWithInheritedAnnotationOnClass() {
-		// Note: @Transactional is inherited
-		assertThat(findAnnotationDescriptorForTypes(InheritedAnnotationClass.class, Transactional.class).getRootDeclaringClass()).isEqualTo(InheritedAnnotationClass.class);
-		assertThat(findAnnotationDescriptorForTypes(SubInheritedAnnotationClass.class, Transactional.class).getRootDeclaringClass()).isEqualTo(InheritedAnnotationClass.class);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesWithInheritedAnnotationOnInterface() {
-		// Note: @Transactional is inherited
-		Transactional rawAnnotation = InheritedAnnotationInterface.class.getAnnotation(Transactional.class);
-
-		UntypedAnnotationDescriptor descriptor =
-				findAnnotationDescriptorForTypes(InheritedAnnotationInterface.class, Transactional.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-
-		descriptor = findAnnotationDescriptorForTypes(SubInheritedAnnotationInterface.class, Transactional.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(SubInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-
-		descriptor = findAnnotationDescriptorForTypes(SubSubInheritedAnnotationInterface.class, Transactional.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(SubSubInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(InheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesForNonInheritedAnnotationOnClass() {
-		// Note: @Order is not inherited.
-		assertThat(findAnnotationDescriptorForTypes(NonInheritedAnnotationClass.class, Order.class).getRootDeclaringClass()).isEqualTo(NonInheritedAnnotationClass.class);
-		assertThat(findAnnotationDescriptorForTypes(SubNonInheritedAnnotationClass.class, Order.class).getRootDeclaringClass()).isEqualTo(NonInheritedAnnotationClass.class);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesForNonInheritedAnnotationOnInterface() {
-		// Note: @Order is not inherited.
-		Order rawAnnotation = NonInheritedAnnotationInterface.class.getAnnotation(Order.class);
-
-		UntypedAnnotationDescriptor descriptor =
-				findAnnotationDescriptorForTypes(NonInheritedAnnotationInterface.class, Order.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(NonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(NonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-
-		descriptor = findAnnotationDescriptorForTypes(SubNonInheritedAnnotationInterface.class, Order.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(SubNonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(NonInheritedAnnotationInterface.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesWithLocalAndMetaComponentAnnotation() {
-		Class<Component> annotationType = Component.class;
-		UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(
-				HasLocalAndMetaComponentAnnotation.class, Transactional.class, annotationType, Order.class);
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(HasLocalAndMetaComponentAnnotation.class);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(annotationType);
-		assertThat(descriptor.getComposedAnnotation()).isNull();
-		assertThat(descriptor.getComposedAnnotationType()).isNull();
-	}
-
-	@Test
-	void findAnnotationDescriptorForTypesWithMetaComponentAnnotation() {
-		Class<HasMetaComponentAnnotation> startClass = HasMetaComponentAnnotation.class;
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(startClass, "meta1", Meta1.class);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesWithMetaAnnotationWithDefaultAttributes() {
-		Class<?> startClass = MetaConfigWithDefaultAttributesTestCase.class;
-		Class<ContextConfiguration> annotationType = ContextConfiguration.class;
-
-		UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(startClass,
-				Service.class, ContextConfiguration.class, Order.class, Transactional.class);
-
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(startClass);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(annotationType);
-		assertThat(((ContextConfiguration) descriptor.getAnnotation()).value()).isEqualTo(new Class<?>[] {});
-		assertThat(descriptor.getAnnotationAttributes().getClassArray("classes")).isEqualTo(new Class<?>[] {MetaConfig.DevConfig.class, MetaConfig.ProductionConfig.class});
-		assertThat(descriptor.getComposedAnnotation()).isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaConfig.class);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesWithMetaAnnotationWithOverriddenAttributes() {
-		Class<?> startClass = MetaConfigWithOverriddenAttributesTestCase.class;
-		Class<ContextConfiguration> annotationType = ContextConfiguration.class;
-
-		UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(
-				startClass, Service.class, ContextConfiguration.class, Order.class, Transactional.class);
-
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(startClass);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(annotationType);
-		assertThat(((ContextConfiguration) descriptor.getAnnotation()).value()).isEqualTo(new Class<?>[] {});
-		assertThat(descriptor.getAnnotationAttributes().getClassArray("classes")).isEqualTo(new Class<?>[] {MetaAnnotationUtilsTests.class});
-		assertThat(descriptor.getComposedAnnotation()).isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaConfig.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorForTypesForInterfaceWithMetaAnnotation() {
-		Class<InterfaceWithMetaAnnotation> startClass = InterfaceWithMetaAnnotation.class;
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(startClass, "meta1", Meta1.class);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesForClassWithMetaAnnotatedInterface() {
-		Component rawAnnotation = AnnotationUtils.findAnnotation(ClassWithMetaAnnotatedInterface.class, Component.class);
-
-		UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(
-				ClassWithMetaAnnotatedInterface.class, Service.class, Component.class, Order.class, Transactional.class);
-
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(ClassWithMetaAnnotatedInterface.class);
-		assertThat(descriptor.getDeclaringClass()).isEqualTo(Meta1.class);
-		assertThat(descriptor.getAnnotation()).isEqualTo(rawAnnotation);
-		assertThat(descriptor.getComposedAnnotation().annotationType()).isEqualTo(Meta1.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorForTypesForClassWithLocalMetaAnnotationAndMetaAnnotatedInterface() {
-		Class<ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface> startClass = ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class;
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(startClass, "meta2", Meta2.class);
-	}
-
-	@Test
-	void findAnnotationDescriptorForTypesForSubClassWithLocalMetaAnnotationAndMetaAnnotatedInterface() {
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(
-				SubClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class,
-				ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class, "meta2", Meta2.class);
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	void findAnnotationDescriptorForTypesOnMetaMetaAnnotatedClass() {
-		Class<MetaMetaAnnotatedClass> startClass = MetaMetaAnnotatedClass.class;
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(
-				startClass, startClass, Meta2.class, "meta2", MetaMeta.class);
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	void findAnnotationDescriptorForTypesOnMetaMetaMetaAnnotatedClass() {
-		Class<MetaMetaMetaAnnotatedClass> startClass = MetaMetaMetaAnnotatedClass.class;
-		assertAtComponentOnComposedAnnotationForMultipleCandidateTypes(
-				startClass, startClass, Meta2.class, "meta2", MetaMetaMeta.class);
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesOnAnnotatedClassWithMissingTargetMetaAnnotation() {
-		// InheritedAnnotationClass is NOT annotated or meta-annotated with @Component,
-		// @Service, or @Order, but it is annotated with @Transactional.
-		UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(
-				InheritedAnnotationClass.class, Service.class, Component.class, Order.class);
-		assertThat(descriptor).as("Should not find @Component on InheritedAnnotationClass").isNull();
-	}
-
-	/**
-	 * @since 4.0.3
-	 */
-	@Test
-	@SuppressWarnings("unchecked")
-	void findAnnotationDescriptorForTypesOnMetaCycleAnnotatedClassWithMissingTargetMetaAnnotation() {
-		UntypedAnnotationDescriptor descriptor = findAnnotationDescriptorForTypes(
-				MetaCycleAnnotatedClass.class, Service.class, Component.class, Order.class);
-		assertThat(descriptor).as("Should not find @Component on MetaCycleAnnotatedClass").isNull();
-	}
-
-
-	// -------------------------------------------------------------------------
-
-	@Component(value = "meta1")
-	@Order
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Documented
-	static @interface Meta1 {
-	}
-
-	@Component(value = "meta2")
-	@Transactional
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Documented
-	static @interface Meta2 {
-	}
-
-	@Meta2
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Documented
-	@interface MetaMeta {
-	}
-
-	@MetaMeta
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Documented
-	@interface MetaMetaMeta {
-	}
-
-	@MetaCycle3
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.ANNOTATION_TYPE)
-	@Documented
-	@interface MetaCycle1 {
-	}
-
-	@MetaCycle1
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.ANNOTATION_TYPE)
-	@Documented
-	@interface MetaCycle2 {
-	}
-
-	@MetaCycle2
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Documented
-	@interface MetaCycle3 {
-	}
-
-	@ContextConfiguration
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Documented
-	static @interface MetaConfig {
-
-		static class DevConfig {
-		}
-
-		static class ProductionConfig {
-		}
-
-
-		Class<?>[] classes() default { DevConfig.class, ProductionConfig.class };
-	}
-
-	// -------------------------------------------------------------------------
-
-	@Meta1
-	static class HasMetaComponentAnnotation {
-	}
-
-	@Meta1
-	@Component(value = "local")
-	@Meta2
-	static class HasLocalAndMetaComponentAnnotation {
-	}
-
-	@Meta1
-	static interface InterfaceWithMetaAnnotation {
-	}
-
-	static class ClassWithMetaAnnotatedInterface implements InterfaceWithMetaAnnotation {
-	}
-
-	@Meta2
-	static class ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface implements InterfaceWithMetaAnnotation {
-	}
-
-	static class SubClassWithLocalMetaAnnotationAndMetaAnnotatedInterface extends
-			ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface {
-	}
-
-	@MetaMeta
-	static class MetaMetaAnnotatedClass {
-	}
-
-	@MetaMetaMeta
-	static class MetaMetaMetaAnnotatedClass {
-	}
-
-	@MetaCycle3
-	static class MetaCycleAnnotatedClass {
-	}
-
-	@MetaConfig
-	class MetaConfigWithDefaultAttributesTestCase {
-	}
-
-	@MetaConfig(classes = MetaAnnotationUtilsTests.class)
-	class MetaConfigWithOverriddenAttributesTestCase {
-	}
-
-	// -------------------------------------------------------------------------
-
-	@Transactional
-	static interface InheritedAnnotationInterface {
-	}
-
-	static interface SubInheritedAnnotationInterface extends InheritedAnnotationInterface {
-	}
-
-	static interface SubSubInheritedAnnotationInterface extends SubInheritedAnnotationInterface {
-	}
-
-	@Order
-	static interface NonInheritedAnnotationInterface {
-	}
-
-	static interface SubNonInheritedAnnotationInterface extends NonInheritedAnnotationInterface {
-	}
-
-	static class NonAnnotatedClass {
-	}
-
-	static interface NonAnnotatedInterface {
-	}
-
-	@Transactional
-	static class InheritedAnnotationClass {
-	}
-
-	static class SubInheritedAnnotationClass extends InheritedAnnotationClass {
-	}
-
-	@Order
-	static class NonInheritedAnnotationClass {
-	}
-
-	static class SubNonInheritedAnnotationClass extends NonInheritedAnnotationClass {
-	}
-
-	@ContextConfiguration(classes = Number.class)
-	static class AnnotatedContextConfigClass {
-	}
-
-	@MetaConfig(classes = String.class)
-	static class MetaAnnotatedAndSuperAnnotatedContextConfigClass extends AnnotatedContextConfigClass {
-	}
-
-}
diff --git a/spring-test/src/test/java/org/springframework/test/util/OverriddenMetaAnnotationAttributesTests.java b/spring-test/src/test/java/org/springframework/test/util/OverriddenMetaAnnotationAttributesTests.java
deleted file mode 100644
index e95d8a83d31d..000000000000
--- a/spring-test/src/test/java/org/springframework/test/util/OverriddenMetaAnnotationAttributesTests.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.
- * 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.test.util;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.util.MetaAnnotationUtils.AnnotationDescriptor;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.util.MetaAnnotationUtils.findAnnotationDescriptor;
-
-/**
- * Unit tests for {@link MetaAnnotationUtils} that verify support for overridden
- * meta-annotation attributes.
- *
- * <p>See <a href="https://jira.spring.io/browse/SPR-10181">SPR-10181</a>.
- *
- * @author Sam Brannen
- * @since 4.0
- * @see MetaAnnotationUtilsTests
- */
-@SuppressWarnings("deprecation")
-class OverriddenMetaAnnotationAttributesTests {
-
-	@Test
-	void contextConfigurationValue() throws Exception {
-		Class<MetaValueConfigTestCase> declaringClass = MetaValueConfigTestCase.class;
-		AnnotationDescriptor<ContextConfiguration> descriptor = findAnnotationDescriptor(declaringClass,
-			ContextConfiguration.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(declaringClass);
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaValueConfig.class);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(ContextConfiguration.class);
-		assertThat(descriptor.getComposedAnnotation()).isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaValueConfig.class);
-
-		// direct access to annotation value:
-		assertThat(descriptor.getAnnotation().value()).isEqualTo(new String[] { "foo.xml" });
-	}
-
-	@Test
-	void overriddenContextConfigurationValue() throws Exception {
-		Class<?> declaringClass = OverriddenMetaValueConfigTestCase.class;
-		AnnotationDescriptor<ContextConfiguration> descriptor = findAnnotationDescriptor(declaringClass,
-			ContextConfiguration.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(declaringClass);
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaValueConfig.class);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(ContextConfiguration.class);
-		assertThat(descriptor.getComposedAnnotation()).isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaValueConfig.class);
-
-		// direct access to annotation value:
-		assertThat(descriptor.getAnnotation().value()).isEqualTo(new String[] { "foo.xml" });
-
-		// overridden attribute:
-		AnnotationAttributes attributes = descriptor.getAnnotationAttributes();
-
-		// NOTE: we would like to be able to override the 'value' attribute; however,
-		// Spring currently does not allow overrides for the 'value' attribute.
-		// See SPR-11393 for related discussions.
-		assertThat(attributes.getStringArray("value")).isEqualTo(new String[] { "foo.xml" });
-	}
-
-	@Test
-	void contextConfigurationLocationsAndInheritLocations() throws Exception {
-		Class<MetaLocationsConfigTestCase> declaringClass = MetaLocationsConfigTestCase.class;
-		AnnotationDescriptor<ContextConfiguration> descriptor = findAnnotationDescriptor(declaringClass,
-			ContextConfiguration.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(declaringClass);
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaLocationsConfig.class);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(ContextConfiguration.class);
-		assertThat(descriptor.getComposedAnnotation()).isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaLocationsConfig.class);
-
-		// direct access to annotation attributes:
-		assertThat(descriptor.getAnnotation().locations()).isEqualTo(new String[] { "foo.xml" });
-		assertThat(descriptor.getAnnotation().inheritLocations()).isFalse();
-	}
-
-	@Test
-	void overriddenContextConfigurationLocationsAndInheritLocations() throws Exception {
-		Class<?> declaringClass = OverriddenMetaLocationsConfigTestCase.class;
-		AnnotationDescriptor<ContextConfiguration> descriptor = findAnnotationDescriptor(declaringClass,
-			ContextConfiguration.class);
-		assertThat(descriptor).isNotNull();
-		assertThat(descriptor.getRootDeclaringClass()).isEqualTo(declaringClass);
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaLocationsConfig.class);
-		assertThat(descriptor.getAnnotationType()).isEqualTo(ContextConfiguration.class);
-		assertThat(descriptor.getComposedAnnotation()).isNotNull();
-		assertThat(descriptor.getComposedAnnotationType()).isEqualTo(MetaLocationsConfig.class);
-
-		// direct access to annotation attributes:
-		assertThat(descriptor.getAnnotation().locations()).isEqualTo(new String[] { "foo.xml" });
-		assertThat(descriptor.getAnnotation().inheritLocations()).isFalse();
-
-		// overridden attributes:
-		AnnotationAttributes attributes = descriptor.getAnnotationAttributes();
-		assertThat(attributes.getStringArray("locations")).isEqualTo(new String[] { "bar.xml" });
-		assertThat(attributes.getBoolean("inheritLocations")).isTrue();
-	}
-
-
-	// -------------------------------------------------------------------------
-
-	@ContextConfiguration("foo.xml")
-	@Retention(RetentionPolicy.RUNTIME)
-	static @interface MetaValueConfig {
-
-		String[] value() default {};
-	}
-
-	@MetaValueConfig
-	static class MetaValueConfigTestCase {
-	}
-
-	@MetaValueConfig("bar.xml")
-	static class OverriddenMetaValueConfigTestCase {
-	}
-
-	@ContextConfiguration(locations = "foo.xml", inheritLocations = false)
-	@Retention(RetentionPolicy.RUNTIME)
-	static @interface MetaLocationsConfig {
-
-		String[] locations() default {};
-
-		boolean inheritLocations();
-	}
-
-	@MetaLocationsConfig(inheritLocations = true)
-	static class MetaLocationsConfigTestCase {
-	}
-
-	@MetaLocationsConfig(locations = "bar.xml", inheritLocations = true)
-	static class OverriddenMetaLocationsConfigTestCase {
-	}
-
-}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContext.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContext.java
index 280669b83f04..3fe4ad088d4b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContext.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionContext.java
@@ -19,11 +19,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 
 import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
-import org.springframework.util.function.SingletonSupplier;
 
 /**
  * Mutable transaction context that encapsulates transactional synchronizations and
@@ -41,8 +38,6 @@ public class TransactionContext {
 
 	private final @Nullable TransactionContext parent;
 
-	private final SingletonSupplier<UUID> contextId = SingletonSupplier.of(UUID::randomUUID);
-
 	private final Map<Object, Object> resources = new LinkedHashMap<>();
 
 	@Nullable
@@ -71,20 +66,6 @@ public TransactionContext getParent() {
 		return this.parent;
 	}
 
-	@Deprecated
-	public String getName() {
-		String name = getCurrentTransactionName();
-		if (StringUtils.hasText(name)) {
-			return getContextId() + ": " + name;
-		}
-		return getContextId().toString();
-	}
-
-	@Deprecated
-	public UUID getContextId() {
-		return this.contextId.obtain();
-	}
-
 	public Map<Object, Object> getResources() {
 		return this.resources;
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/BasicAuthorizationInterceptor.java b/spring-web/src/main/java/org/springframework/http/client/support/BasicAuthorizationInterceptor.java
deleted file mode 100644
index 87936fb0003f..000000000000
--- a/spring-web/src/main/java/org/springframework/http/client/support/BasicAuthorizationInterceptor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- * 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.http.client.support;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import org.springframework.http.HttpRequest;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.Base64Utils;
-
-/**
- * {@link ClientHttpRequestInterceptor} to apply a BASIC authorization header.
- *
- * @author Phillip Webb
- * @since 4.3.1
- * @deprecated as of 5.1.1, in favor of {@link BasicAuthenticationInterceptor}
- * which reuses {@link org.springframework.http.HttpHeaders#setBasicAuth},
- * sharing its default charset ISO-8859-1 instead of UTF-8 as used here
- */
-@Deprecated
-public class BasicAuthorizationInterceptor implements ClientHttpRequestInterceptor {
-
-	private final String username;
-
-	private final String password;
-
-
-	/**
-	 * Create a new interceptor which adds a BASIC authorization header
-	 * for the given username and password.
-	 * @param username the username to use
-	 * @param password the password to use
-	 */
-	public BasicAuthorizationInterceptor(@Nullable String username, @Nullable String password) {
-		Assert.doesNotContain(username, ":", "Username must not contain a colon");
-		this.username = (username != null ? username : "");
-		this.password = (password != null ? password : "");
-	}
-
-
-	@Override
-	public ClientHttpResponse intercept(
-			HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
-
-		String token = Base64Utils.encodeToString(
-				(this.username + ":" + this.password).getBytes(StandardCharsets.UTF_8));
-		request.getHeaders().add("Authorization", "Basic " + token);
-		return execution.execute(request, body);
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
index 3a547e62c59d..9be9d73ef786 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
@@ -91,14 +91,6 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
 	}
 
 
-	/**
-	 * The default charset used by the converter.
-	 */
-	@Nullable
-	@Deprecated
-	public static final Charset DEFAULT_CHARSET = null;
-
-
 	protected ObjectMapper defaultObjectMapper;
 
 	@Nullable
diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java
deleted file mode 100644
index 9f11533c7964..000000000000
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- * 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.http.converter.protobuf;
-
-import com.google.protobuf.ExtensionRegistry;
-
-/**
- * Google Protocol Messages can contain message extensions that can be parsed if
- * the appropriate configuration has been registered in the {@code ExtensionRegistry}.
- *
- * <p>This interface provides a facility to populate the {@code ExtensionRegistry}.
- *
- * @author Alex Antonov
- * @author Sebastien Deleuze
- * @since 4.1
- * @see <a href="https://developers.google.com/protocol-buffers/docs/reference/java/com/google/protobuf/ExtensionRegistry">
- * com.google.protobuf.ExtensionRegistry</a>
- * @deprecated as of Spring Framework 5.1, use {@link ExtensionRegistry} based constructors instead
- */
-@Deprecated
-public interface ExtensionRegistryInitializer {
-
-	/**
-	 * Initializes the {@code ExtensionRegistry} with Protocol Message extensions.
-	 * @param registry the registry to populate
-	 */
-	void initializeExtensionRegistry(ExtensionRegistry registry);
-
-}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
index ba064669483b..ec4ad27ee001 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -121,20 +121,6 @@ public ProtobufHttpMessageConverter() {
 		this(null, null);
 	}
 
-	/**
-	 * Construct a new {@code ProtobufHttpMessageConverter} with an
-	 * initializer that allows the registration of message extensions.
-	 * @param registryInitializer an initializer for message extensions
-	 * @deprecated as of Spring Framework 5.1, use {@link #ProtobufHttpMessageConverter(ExtensionRegistry)} instead
-	 */
-	@Deprecated
-	public ProtobufHttpMessageConverter(@Nullable ExtensionRegistryInitializer registryInitializer) {
-		this(null, null);
-		if (registryInitializer != null) {
-			registryInitializer.initializeExtensionRegistry(this.extensionRegistry);
-		}
-	}
-
 	/**
 	 * Construct a new {@code ProtobufHttpMessageConverter} with a registry that specifies
 	 * protocol message extensions.
diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java
index 80e4a8297246..cd406682d2a7 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,24 +75,4 @@ public ProtobufJsonFormatHttpMessageConverter(@Nullable JsonFormat.Parser parser
 		super(new ProtobufJavaUtilSupport(parser, printer), extensionRegistry);
 	}
 
-	/**
-	 * Construct a new {@code ProtobufJsonFormatHttpMessageConverter} with the given
-	 * {@code JsonFormat.Parser} and {@code JsonFormat.Printer} configuration, also
-	 * accepting an initializer that allows the registration of message extensions.
-	 * @param parser the JSON parser configuration
-	 * @param printer the JSON printer configuration
-	 * @param registryInitializer an initializer for message extensions
-	 * @deprecated as of 5.1, in favor of
-	 * {@link #ProtobufJsonFormatHttpMessageConverter(com.google.protobuf.util.JsonFormat.Parser, com.google.protobuf.util.JsonFormat.Printer, ExtensionRegistry)}
-	 */
-	@Deprecated
-	public ProtobufJsonFormatHttpMessageConverter(@Nullable JsonFormat.Parser parser,
-			@Nullable JsonFormat.Printer printer, @Nullable ExtensionRegistryInitializer registryInitializer) {
-
-		super(new ProtobufJavaUtilSupport(parser, printer), null);
-		if (registryInitializer != null) {
-			registryInitializer.initializeExtensionRegistry(this.extensionRegistry);
-		}
-	}
-
 }
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
index defd6d6302a6..f28c5956f565 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
@@ -254,7 +254,7 @@ protected void dataReceived(T data) {
 	 * the next item from the upstream, write Publisher.
 	 * <p>The default implementation is a no-op.
 	 * @deprecated originally introduced for Undertow to stop write notifications
-	 * when no data is available, but deprecated as of as of 5.0.6 since constant
+	 * when no data is available, but deprecated as of 5.0.6 since constant
 	 * switching on every requested item causes a significant slowdown.
 	 */
 	@Deprecated
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java
index 5a0ee5aba56d..3e6120e67a32 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,31 +128,6 @@ public Integer getRawStatusCode() {
 		return this.statusCode;
 	}
 
-	/**
-	 * Set the HTTP status code of the response.
-	 * @param statusCode the HTTP status as an integer value
-	 * @since 5.0.1
-	 * @deprecated as of 5.2.4 in favor of {@link ServerHttpResponse#setRawStatusCode(Integer)}.
-	 */
-	@Deprecated
-	public void setStatusCodeValue(@Nullable Integer statusCode) {
-		if (this.state.get() != State.COMMITTED) {
-			this.statusCode = statusCode;
-		}
-	}
-
-	/**
-	 * Return the HTTP status code of the response.
-	 * @return the HTTP status as an integer value
-	 * @since 5.0.1
-	 * @deprecated as of 5.2.4 in favor of {@link ServerHttpResponse#getRawStatusCode()}.
-	 */
-	@Nullable
-	@Deprecated
-	public Integer getStatusCodeValue() {
-		return this.statusCode;
-	}
-
 	@Override
 	public HttpHeaders getHeaders() {
 		if (this.readOnlyHeaders != null) {
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
index 0a568d25db2b..122c55d2e21c 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
@@ -54,23 +54,6 @@
 @Documented
 public @interface CrossOrigin {
 
-	/** @deprecated as of Spring 5.0, in favor of {@link CorsConfiguration#applyPermitDefaultValues} */
-	@Deprecated
-	String[] DEFAULT_ORIGINS = {"*"};
-
-	/** @deprecated as of Spring 5.0, in favor of {@link CorsConfiguration#applyPermitDefaultValues} */
-	@Deprecated
-	String[] DEFAULT_ALLOWED_HEADERS = {"*"};
-
-	/** @deprecated as of Spring 5.0, in favor of {@link CorsConfiguration#applyPermitDefaultValues} */
-	@Deprecated
-	boolean DEFAULT_ALLOW_CREDENTIALS = false;
-
-	/** @deprecated as of Spring 5.0, in favor of {@link CorsConfiguration#applyPermitDefaultValues} */
-	@Deprecated
-	long DEFAULT_MAX_AGE = 1800;
-
-
 	/**
 	 * Alias for {@link #origins}.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
index c6482d8b4683..abca503604c8 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,13 +49,12 @@ public DefaultDataBinderFactory(@Nullable WebBindingInitializer initializer) {
 	 * @throws Exception in case of invalid state or arguments
 	 */
 	@Override
-	@SuppressWarnings("deprecation")
 	public final WebDataBinder createBinder(
 			NativeWebRequest webRequest, @Nullable Object target, String objectName) throws Exception {
 
 		WebDataBinder dataBinder = createBinderInstance(target, objectName, webRequest);
 		if (this.initializer != null) {
-			this.initializer.initBinder(dataBinder, webRequest);
+			this.initializer.initBinder(dataBinder);
 		}
 		initBinder(dataBinder, webRequest);
 		return dataBinder;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java
index 58d5df5f73d5..a0048af1b3f1 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebBindingInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.bind.support;
 
 import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.context.request.WebRequest;
 
 /**
  * Callback interface for initializing a {@link WebDataBinder} for performing
@@ -36,15 +35,4 @@ public interface WebBindingInitializer {
 	 */
 	void initBinder(WebDataBinder binder);
 
-	/**
-	 * Initialize the given DataBinder for the given (Servlet) request.
-	 * @param binder the DataBinder to initialize
-	 * @param request the web request that the data binding happens within
-	 * @deprecated as of 5.0 in favor of {@link #initBinder(WebDataBinder)}
-	 */
-	@Deprecated
-	default void initBinder(WebDataBinder binder, WebRequest request) {
-		initBinder(binder);
-	}
-
 }
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index 505c51fff699..70664a2e4c27 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -173,26 +173,6 @@ protected void handleError(ClientHttpResponse response, HttpStatus statusCode) t
 		}
 	}
 
-	/**
-	 * Determine the HTTP status of the given response.
-	 * @param response the response to inspect
-	 * @return the associated HTTP status
-	 * @throws IOException in case of I/O errors
-	 * @throws UnknownHttpStatusCodeException in case of an unknown status code
-	 * that cannot be represented with the {@link HttpStatus} enum
-	 * @since 4.3.8
-	 * @deprecated as of 5.0, in favor of {@link #handleError(ClientHttpResponse, HttpStatus)}
-	 */
-	@Deprecated
-	protected HttpStatus getHttpStatusCode(ClientHttpResponse response) throws IOException {
-		HttpStatus statusCode = HttpStatus.resolve(response.getRawStatusCode());
-		if (statusCode == null) {
-			throw new UnknownHttpStatusCodeException(response.getRawStatusCode(), response.getStatusText(),
-					response.getHeaders(), getResponseBody(response), getCharset(response));
-		}
-		return statusCode;
-	}
-
 	/**
 	 * Read the body of the given response (for inclusion in a status exception).
 	 * @param response the response to inspect
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index 3d1bcb5b0a71..b38076727a26 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -282,15 +282,10 @@ public ResponseErrorHandler getErrorHandler() {
 	 * @param uriVars the default URI variable values
 	 * @since 4.3
 	 */
-	@SuppressWarnings("deprecation")
 	public void setDefaultUriVariables(Map<String, ?> uriVars) {
 		if (this.uriTemplateHandler instanceof DefaultUriBuilderFactory) {
 			((DefaultUriBuilderFactory) this.uriTemplateHandler).setDefaultUriVariables(uriVars);
 		}
-		else if (this.uriTemplateHandler instanceof org.springframework.web.util.AbstractUriTemplateHandler) {
-			((org.springframework.web.util.AbstractUriTemplateHandler) this.uriTemplateHandler)
-					.setDefaultUriVariables(uriVars);
-		}
 		else {
 			throw new IllegalArgumentException(
 					"This property is not supported with the configured UriTemplateHandler.");
@@ -303,11 +298,6 @@ else if (this.uriTemplateHandler instanceof org.springframework.web.util.Abstrac
 	 * backwards compatibility, the encoding mode is set to
 	 * {@link EncodingMode#URI_COMPONENT URI_COMPONENT}. As of 5.0.8, prefer
 	 * using {@link EncodingMode#TEMPLATE_AND_VALUES TEMPLATE_AND_VALUES}.
-	 * <p><strong>Note:</strong> in 5.0 the switch from
-	 * {@link org.springframework.web.util.DefaultUriTemplateHandler
-	 * DefaultUriTemplateHandler} (deprecated in 4.3), as the default to use, to
-	 * {@link DefaultUriBuilderFactory} brings in a different default for the
-	 * {@code parsePath} property (switching from false to true).
 	 * @param handler the URI template handler to use
 	 */
 	public void setUriTemplateHandler(UriTemplateHandler handler) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java
deleted file mode 100644
index 0a500097f143..000000000000
--- a/spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- * 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.web.context.support;
-
-import java.io.IOException;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Servlet variant of {@link org.springframework.context.support.LiveBeansView}'s
- * MBean exposure.
- *
- * <p>Generates a JSON snapshot for current beans and their dependencies in
- * all ApplicationContexts that live within the current web application.
- *
- * @author Juergen Hoeller
- * @since 3.2
- * @see org.springframework.context.support.LiveBeansView#getSnapshotAsJson()
- * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class LiveBeansViewServlet extends HttpServlet {
-
-	@Nullable
-	private org.springframework.context.support.LiveBeansView liveBeansView;
-
-
-	@Override
-	public void init() throws ServletException {
-		this.liveBeansView = buildLiveBeansView();
-	}
-
-	protected org.springframework.context.support.LiveBeansView buildLiveBeansView() {
-		return new ServletContextLiveBeansView(getServletContext());
-	}
-
-
-	@Override
-	protected void doGet(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-
-		Assert.state(this.liveBeansView != null, "No LiveBeansView available");
-		String content = this.liveBeansView.getSnapshotAsJson();
-		response.setContentType("application/json");
-		response.setContentLength(content.length());
-		response.getWriter().write(content);
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java
deleted file mode 100644
index f8da1abc2dcb..000000000000
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextLiveBeansView.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- * 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.web.context.support;
-
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import jakarta.servlet.ServletContext;
-
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.util.Assert;
-
-/**
- * {@link org.springframework.context.support.LiveBeansView} subclass
- * which looks for all ApplicationContexts in the web application,
- * as exposed in ServletContext attributes.
- *
- * @author Juergen Hoeller
- * @since 3.2
- * @deprecated as of 5.3, in favor of using Spring Boot actuators for such needs
- */
-@Deprecated
-public class ServletContextLiveBeansView extends org.springframework.context.support.LiveBeansView {
-
-	private final ServletContext servletContext;
-
-	/**
-	 * Create a new LiveBeansView for the given ServletContext.
-	 * @param servletContext current ServletContext
-	 */
-	public ServletContextLiveBeansView(ServletContext servletContext) {
-		Assert.notNull(servletContext, "ServletContext must not be null");
-		this.servletContext = servletContext;
-	}
-
-	@Override
-	protected Set<ConfigurableApplicationContext> findApplicationContexts() {
-		Set<ConfigurableApplicationContext> contexts = new LinkedHashSet<>();
-		Enumeration<String> attrNames = this.servletContext.getAttributeNames();
-		while (attrNames.hasMoreElements()) {
-			String attrName = attrNames.nextElement();
-			Object attrValue = this.servletContext.getAttribute(attrName);
-			if (attrValue instanceof ConfigurableApplicationContext) {
-				contexts.add((ConfigurableApplicationContext) attrValue);
-			}
-		}
-		return contexts;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
deleted file mode 100644
index 66745fc0cb1d..000000000000
--- a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
+++ /dev/null
@@ -1,189 +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.web.filter;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.FormHttpMessageConverter;
-import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
-import org.springframework.http.server.ServletServerHttpRequest;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
-
-/**
- * {@link jakarta.servlet.Filter} that makes form encoded data available through
- * the {@code ServletRequest.getParameter*()} family of methods during HTTP PUT
- * or PATCH requests.
- *
- * <p>The Servlet spec requires form data to be available for HTTP POST but
- * not for HTTP PUT or PATCH requests. This filter intercepts HTTP PUT and PATCH
- * requests where content type is {@code 'application/x-www-form-urlencoded'},
- * reads form encoded content from the body of the request, and wraps the ServletRequest
- * in order to make the form data available as request parameters just like
- * it is for HTTP POST requests.
- *
- * @author Rossen Stoyanchev
- * @since 3.1
- * @deprecated as of 5.1 in favor of {@link FormContentFilter} which is the same
- * but also handles DELETE.
- */
-@Deprecated
-public class HttpPutFormContentFilter extends OncePerRequestFilter {
-
-	private FormHttpMessageConverter formConverter = new AllEncompassingFormHttpMessageConverter();
-
-
-	/**
-	 * Set the converter to use for parsing form content.
-	 * <p>By default this is an instance of {@link AllEncompassingFormHttpMessageConverter}.
-	 */
-	public void setFormConverter(FormHttpMessageConverter converter) {
-		Assert.notNull(converter, "FormHttpMessageConverter is required.");
-		this.formConverter = converter;
-	}
-
-	public FormHttpMessageConverter getFormConverter() {
-		return this.formConverter;
-	}
-
-	/**
-	 * The default character set to use for reading form data.
-	 * This is a shortcut for:<br>
-	 * {@code getFormConverter.setCharset(charset)}.
-	 */
-	public void setCharset(Charset charset) {
-		this.formConverter.setCharset(charset);
-	}
-
-
-	@Override
-	protected void doFilterInternal(final HttpServletRequest request, HttpServletResponse response,
-			FilterChain filterChain) throws ServletException, IOException {
-
-		if (("PUT".equals(request.getMethod()) || "PATCH".equals(request.getMethod())) && isFormContentType(request)) {
-			HttpInputMessage inputMessage = new ServletServerHttpRequest(request) {
-				@Override
-				public InputStream getBody() throws IOException {
-					return request.getInputStream();
-				}
-			};
-			MultiValueMap<String, String> formParameters = this.formConverter.read(null, inputMessage);
-			if (!formParameters.isEmpty()) {
-				HttpServletRequest wrapper = new HttpPutFormContentRequestWrapper(request, formParameters);
-				filterChain.doFilter(wrapper, response);
-				return;
-			}
-		}
-
-		filterChain.doFilter(request, response);
-	}
-
-	private boolean isFormContentType(HttpServletRequest request) {
-		String contentType = request.getContentType();
-		if (contentType != null) {
-			try {
-				MediaType mediaType = MediaType.parseMediaType(contentType);
-				return (MediaType.APPLICATION_FORM_URLENCODED.includes(mediaType));
-			}
-			catch (IllegalArgumentException ex) {
-				return false;
-			}
-		}
-		else {
-			return false;
-		}
-	}
-
-
-	private static class HttpPutFormContentRequestWrapper extends HttpServletRequestWrapper {
-
-		private final MultiValueMap<String, String> formParameters;
-
-		public HttpPutFormContentRequestWrapper(HttpServletRequest request, MultiValueMap<String, String> parameters) {
-			super(request);
-			this.formParameters = parameters;
-		}
-
-		@Override
-		@Nullable
-		public String getParameter(String name) {
-			String queryStringValue = super.getParameter(name);
-			String formValue = this.formParameters.getFirst(name);
-			return (queryStringValue != null ? queryStringValue : formValue);
-		}
-
-		@Override
-		public Map<String, String[]> getParameterMap() {
-			Map<String, String[]> result = new LinkedHashMap<>();
-			Enumeration<String> names = getParameterNames();
-			while (names.hasMoreElements()) {
-				String name = names.nextElement();
-				result.put(name, getParameterValues(name));
-			}
-			return result;
-		}
-
-		@Override
-		public Enumeration<String> getParameterNames() {
-			Set<String> names = new LinkedHashSet<>();
-			names.addAll(Collections.list(super.getParameterNames()));
-			names.addAll(this.formParameters.keySet());
-			return Collections.enumeration(names);
-		}
-
-		@Override
-		@Nullable
-		public String[] getParameterValues(String name) {
-			String[] parameterValues = super.getParameterValues(name);
-			List<String> formParam = this.formParameters.get(name);
-			if (formParam == null) {
-				return parameterValues;
-			}
-			if (parameterValues == null || getQueryString() == null) {
-				return StringUtils.toStringArray(formParam);
-			}
-			else {
-				List<String> result = new ArrayList<>(parameterValues.length + formParam.size());
-				result.addAll(Arrays.asList(parameterValues));
-				result.addAll(formParam);
-				return StringUtils.toStringArray(result);
-			}
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
deleted file mode 100644
index 85e7215b4e24..000000000000
--- a/spring-web/src/main/java/org/springframework/web/filter/reactive/ForwardedHeaderFilter.java
+++ /dev/null
@@ -1,57 +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.web.filter.reactive;
-
-import reactor.core.publisher.Mono;
-
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
-import org.springframework.web.server.adapter.ForwardedHeaderTransformer;
-
-/**
- * Extract values from "Forwarded" and "X-Forwarded-*" headers to override the
- * request URI (i.e. {@link ServerHttpRequest#getURI()}) so it reflects the
- * client-originated protocol and address.
- *
- * <p>Alternatively if {@link #setRemoveOnly removeOnly} is set to "true", then
- * "Forwarded" and "X-Forwarded-*" headers are only removed and not used.
- *
- * @author Arjen Poutsma
- * @author Rossen Stoyanchev
- * @since 5.0
- * @see <a href="https://tools.ietf.org/html/rfc7239">https://tools.ietf.org/html/rfc7239</a>
- * @deprecated as of 5.1 this filter is deprecated in favor of using
- * {@link ForwardedHeaderTransformer} which can be declared as a bean with the
- * name "forwardedHeaderTransformer" or registered explicitly in
- * {@link org.springframework.web.server.adapter.WebHttpHandlerBuilder
- * WebHttpHandlerBuilder}.
- */
-@Deprecated
-public class ForwardedHeaderFilter extends ForwardedHeaderTransformer implements WebFilter {
-
-	@Override
-	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
-		ServerHttpRequest request = exchange.getRequest();
-		if (hasForwardedHeaders(request)) {
-			exchange = exchange.mutate().request(apply(request)).build();
-		}
-		return chain.filter(exchange);
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java b/spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
deleted file mode 100644
index 690e7a136b0f..000000000000
--- a/spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- * 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.web.server;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-
-/**
- * Exception for errors that fit response status 415 (unsupported media type).
- *
- * @author Rossen Stoyanchev
- * @since 5.0
- * @deprecated in favor of {@link UnsupportedMediaTypeStatusException},
- * with this class never thrown by Spring code and to be removed in 5.3
- */
-@Deprecated
-@SuppressWarnings("serial")
-public class MediaTypeNotSupportedStatusException extends ResponseStatusException {
-
-	private final List<MediaType> supportedMediaTypes;
-
-
-	/**
-	 * Constructor for when the Content-Type is invalid.
-	 */
-	public MediaTypeNotSupportedStatusException(String reason) {
-		super(HttpStatus.UNSUPPORTED_MEDIA_TYPE, reason);
-		this.supportedMediaTypes = Collections.emptyList();
-	}
-
-	/**
-	 * Constructor for when the Content-Type is not supported.
-	 */
-	public MediaTypeNotSupportedStatusException(List<MediaType> supportedMediaTypes) {
-		super(HttpStatus.UNSUPPORTED_MEDIA_TYPE, "Unsupported media type", null);
-		this.supportedMediaTypes = Collections.unmodifiableList(supportedMediaTypes);
-	}
-
-
-	/**
-	 * Return the list of supported content types in cases when the Accept
-	 * header is parsed but not supported, or an empty list otherwise.
-	 */
-	public List<MediaType> getSupportedMediaTypes() {
-		return this.supportedMediaTypes;
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java b/spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java
index e6e78dd88363..40f78ed70e10 100644
--- a/spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java
+++ b/spring-web/src/main/java/org/springframework/web/server/MethodNotAllowedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
-import java.util.Map;
 import java.util.Set;
 
 import org.springframework.http.HttpHeaders;
@@ -58,16 +57,6 @@ public MethodNotAllowedException(String method, @Nullable Collection<HttpMethod>
 	}
 
 
-	/**
-	 * Return a Map with an "Allow" header.
-	 * @since 5.1.11
-	 */
-	@SuppressWarnings("deprecation")
-	@Override
-	public Map<String, String> getHeaders() {
-		return getResponseHeaders().toSingleValueMap();
-	}
-
 	/**
 	 * Return HttpHeaders with an "Allow" header.
 	 * @since 5.1.13
diff --git a/spring-web/src/main/java/org/springframework/web/server/NotAcceptableStatusException.java b/spring-web/src/main/java/org/springframework/web/server/NotAcceptableStatusException.java
index 6045dbd51693..7874fe1a2d5f 100644
--- a/spring-web/src/main/java/org/springframework/web/server/NotAcceptableStatusException.java
+++ b/spring-web/src/main/java/org/springframework/web/server/NotAcceptableStatusException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -54,16 +53,6 @@ public NotAcceptableStatusException(List<MediaType> supportedMediaTypes) {
 	}
 
 
-	/**
-	 * Return a Map with an "Accept" header.
-	 * @since 5.1.11
-	 */
-	@SuppressWarnings("deprecation")
-	@Override
-	public Map<String, String> getHeaders() {
-		return getResponseHeaders().toSingleValueMap();
-	}
-
 	/**
 	 * Return HttpHeaders with an "Accept" header, or an empty instance.
 	 * @since 5.1.13
diff --git a/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java b/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
index 73f41c48c71b..9aefb133343e 100644
--- a/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
+++ b/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
@@ -16,9 +16,6 @@
 
 package org.springframework.web.server;
 
-import java.util.Collections;
-import java.util.Map;
-
 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.http.HttpHeaders;
@@ -114,18 +111,6 @@ public int getRawStatusCode() {
 		return this.status;
 	}
 
-	/**
-	 * Return headers associated with the exception that should be added to the
-	 * error response, e.g. "Allow", "Accept", etc.
-	 * <p>The default implementation in this class returns an empty map.
-	 * @since 5.1.11
-	 * @deprecated as of 5.1.13 in favor of {@link #getResponseHeaders()}
-	 */
-	@Deprecated
-	public Map<String, String> getHeaders() {
-		return Collections.emptyMap();
-	}
-
 	/**
 	 * Return headers associated with the exception that should be added to the
 	 * error response, e.g. "Allow", "Accept", etc.
@@ -133,13 +118,7 @@ public Map<String, String> getHeaders() {
 	 * @since 5.1.13
 	 */
 	public HttpHeaders getResponseHeaders() {
-		Map<String, String> headers = getHeaders();
-		if (headers.isEmpty()) {
-			return HttpHeaders.EMPTY;
-		}
-		HttpHeaders result = new HttpHeaders();
-		getHeaders().forEach(result::add);
-		return result;
+		return HttpHeaders.EMPTY;
 	}
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/server/ServerErrorException.java b/spring-web/src/main/java/org/springframework/web/server/ServerErrorException.java
index 8f994f81db87..5e4a8d63539f 100644
--- a/spring-web/src/main/java/org/springframework/web/server/ServerErrorException.java
+++ b/spring-web/src/main/java/org/springframework/web/server/ServerErrorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,26 +69,6 @@ public ServerErrorException(String reason, MethodParameter parameter, @Nullable
 		this.parameter = parameter;
 	}
 
-	/**
-	 * Constructor for a 500 error linked to a specific {@code MethodParameter}.
-	 * @deprecated in favor of {@link #ServerErrorException(String, MethodParameter, Throwable)}
-	 */
-	@Deprecated
-	public ServerErrorException(String reason, MethodParameter parameter) {
-		this(reason, parameter, null);
-	}
-
-	/**
-	 * Constructor for a 500 error with a reason only.
-	 * @deprecated in favor of {@link #ServerErrorException(String, Throwable)}
-	 */
-	@Deprecated
-	public ServerErrorException(String reason) {
-		super(HttpStatus.INTERNAL_SERVER_ERROR, reason, null);
-		this.handlerMethod = null;
-		this.parameter = null;
-	}
-
 
 	/**
 	 * Return the handler method associated with the error, if any.
diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/DefaultWebFilterChain.java b/spring-web/src/main/java/org/springframework/web/server/handler/DefaultWebFilterChain.java
index deca3c2e2315..c255dd0688f6 100644
--- a/spring-web/src/main/java/org/springframework/web/server/handler/DefaultWebFilterChain.java
+++ b/spring-web/src/main/java/org/springframework/web/server/handler/DefaultWebFilterChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.web.server.handler;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
@@ -92,18 +91,6 @@ private DefaultWebFilterChain(List<WebFilter> allFilters, WebHandler handler,
 		this.chain = chain;
 	}
 
-	/**
-	 * Public constructor with the list of filters and the target handler to use.
-	 * @param handler the target handler
-	 * @param filters the filters ahead of the handler
-	 * @deprecated as of 5.1 this constructor is deprecated in favor of
-	 * {@link #DefaultWebFilterChain(WebHandler, List)}.
-	 */
-	@Deprecated
-	public DefaultWebFilterChain(WebHandler handler, WebFilter... filters) {
-		this(handler, Arrays.asList(filters));
-	}
-
 
 	public List<WebFilter> getFilters() {
 		return this.allFilters;
diff --git a/spring-web/src/main/java/org/springframework/web/util/AbstractUriTemplateHandler.java b/spring-web/src/main/java/org/springframework/web/util/AbstractUriTemplateHandler.java
deleted file mode 100644
index 19066ea4ad7a..000000000000
--- a/spring-web/src/main/java/org/springframework/web/util/AbstractUriTemplateHandler.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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.
- * 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.web.util;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Abstract base class for {@link UriTemplateHandler} implementations.
- *
- * <p>Support {@link #setBaseUrl} and {@link #setDefaultUriVariables} properties
- * that should be relevant regardless of the URI template expand and encode
- * mechanism used in sub-classes.
- *
- * @author Rossen Stoyanchev
- * @since 4.3
- * @deprecated as of 5.0 in favor of {@link DefaultUriBuilderFactory}
- */
-@Deprecated
-public abstract class AbstractUriTemplateHandler implements UriTemplateHandler {
-
-	@Nullable
-	private String baseUrl;
-
-	private final Map<String, Object> defaultUriVariables = new HashMap<>();
-
-
-	/**
-	 * Configure a base URL to prepend URI templates with. The base URL must
-	 * have a scheme and host but may optionally contain a port and a path.
-	 * The base URL must be fully expanded and encoded which can be done via
-	 * {@link UriComponentsBuilder}.
-	 * @param baseUrl the base URL.
-	 */
-	public void setBaseUrl(@Nullable String baseUrl) {
-		if (baseUrl != null) {
-			UriComponents uriComponents = UriComponentsBuilder.fromUriString(baseUrl).build();
-			Assert.hasText(uriComponents.getScheme(), "'baseUrl' must have a scheme");
-			Assert.hasText(uriComponents.getHost(), "'baseUrl' must have a host");
-			Assert.isNull(uriComponents.getQuery(), "'baseUrl' cannot have a query");
-			Assert.isNull(uriComponents.getFragment(), "'baseUrl' cannot have a fragment");
-		}
-		this.baseUrl = baseUrl;
-	}
-
-	/**
-	 * Return the configured base URL.
-	 */
-	@Nullable
-	public String getBaseUrl() {
-		return this.baseUrl;
-	}
-
-	/**
-	 * Configure default URI variable values to use with every expanded URI
-	 * template. These default values apply only when expanding with a Map, and
-	 * not with an array, where the Map supplied to {@link #expand(String, Map)}
-	 * can override the default values.
-	 * @param defaultUriVariables the default URI variable values
-	 * @since 4.3
-	 */
-	public void setDefaultUriVariables(@Nullable Map<String, ?> defaultUriVariables) {
-		this.defaultUriVariables.clear();
-		if (defaultUriVariables != null) {
-			this.defaultUriVariables.putAll(defaultUriVariables);
-		}
-	}
-
-	/**
-	 * Return a read-only copy of the configured default URI variables.
-	 */
-	public Map<String, ?> getDefaultUriVariables() {
-		return Collections.unmodifiableMap(this.defaultUriVariables);
-	}
-
-
-	@Override
-	public URI expand(String uriTemplate, Map<String, ?> uriVariables) {
-		if (!getDefaultUriVariables().isEmpty()) {
-			Map<String, Object> map = new HashMap<>();
-			map.putAll(getDefaultUriVariables());
-			map.putAll(uriVariables);
-			uriVariables = map;
-		}
-		URI url = expandInternal(uriTemplate, uriVariables);
-		return insertBaseUrl(url);
-	}
-
-	@Override
-	public URI expand(String uriTemplate, Object... uriVariables) {
-		URI url = expandInternal(uriTemplate, uriVariables);
-		return insertBaseUrl(url);
-	}
-
-
-	/**
-	 * Actually expand and encode the URI template.
-	 */
-	protected abstract URI expandInternal(String uriTemplate, Map<String, ?> uriVariables);
-
-	/**
-	 * Actually expand and encode the URI template.
-	 */
-	protected abstract URI expandInternal(String uriTemplate, Object... uriVariables);
-
-
-	/**
-	 * Insert a base URL (if configured) unless the given URL has a host already.
-	 */
-	private URI insertBaseUrl(URI url) {
-		try {
-			String baseUrl = getBaseUrl();
-			if (baseUrl != null && url.getHost() == null) {
-				url = new URI(baseUrl + url.toString());
-			}
-			return url;
-		}
-		catch (URISyntaxException ex) {
-			throw new IllegalArgumentException("Invalid URL after inserting base URL: " + url, ex);
-		}
-	}
-
-}
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
index d7fdb0e0e213..ab13b1c88fb1 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
@@ -158,15 +158,6 @@ public void reset() {
 		this.content.reset();
 	}
 
-	/**
-	 * Return the status code as specified on the response.
-	 * @deprecated as of 5.2 in favor of {@link HttpServletResponse#getStatus()}
-	 */
-	@Deprecated
-	public int getStatusCode() {
-		return getStatus();
-	}
-
 	/**
 	 * Return the cached response content as a byte array.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java b/spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java
deleted file mode 100644
index 385608dc84c6..000000000000
--- a/spring-web/src/main/java/org/springframework/web/util/DefaultUriTemplateHandler.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.
- * 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.web.util;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Default implementation of {@link UriTemplateHandler} based on the use of
- * {@link UriComponentsBuilder} for expanding and encoding variables.
- *
- * <p>There are also several properties to customize how URI template handling
- * is performed, including a {@link #setBaseUrl baseUrl} to be used as a prefix
- * for all URI templates and a couple of encoding related options &mdash;
- * {@link #setParsePath parsePath} and {@link #setStrictEncoding strictEncoding}
- * respectively.
- *
- * @author Rossen Stoyanchev
- * @since 4.2
- * @deprecated as of 5.0 in favor of {@link DefaultUriBuilderFactory}.
- * <p><strong>Note:</strong> {@link DefaultUriBuilderFactory} has a different
- * default for the {@link #setParsePath(boolean) parsePath} property (from
- * false to true).
- */
-@Deprecated
-public class DefaultUriTemplateHandler extends AbstractUriTemplateHandler {
-
-	private boolean parsePath;
-
-	private boolean strictEncoding;
-
-
-	/**
-	 * Whether to parse the path of a URI template string into path segments.
-	 * <p>If set to {@code true} the URI template path is immediately decomposed
-	 * into path segments any URI variables expanded into it are then subject to
-	 * path segment encoding rules. In effect URI variables in the path have any
-	 * "/" characters percent encoded.
-	 * <p>By default this is set to {@code false} in which case the path is kept
-	 * as a full path and expanded URI variables will preserve "/" characters.
-	 * @param parsePath whether to parse the path into path segments
-	 */
-	public void setParsePath(boolean parsePath) {
-		this.parsePath = parsePath;
-	}
-
-	/**
-	 * Whether the handler is configured to parse the path into path segments.
-	 */
-	public boolean shouldParsePath() {
-		return this.parsePath;
-	}
-
-	/**
-	 * Whether to encode characters outside the unreserved set as defined in
-	 * <a href="https://tools.ietf.org/html/rfc3986#section-2">RFC 3986 Section 2</a>.
-	 * This ensures a URI variable value will not contain any characters with a
-	 * reserved purpose.
-	 * <p>By default this is set to {@code false} in which case only characters
-	 * illegal for the given URI component are encoded. For example when expanding
-	 * a URI variable into a path segment the "/" character is illegal and
-	 * encoded. The ";" character however is legal and not encoded even though
-	 * it has a reserved purpose.
-	 * <p><strong>Note:</strong> this property supersedes the need to also set
-	 * the {@link #setParsePath parsePath} property.
-	 * @param strictEncoding whether to perform strict encoding
-	 * @since 4.3
-	 */
-	public void setStrictEncoding(boolean strictEncoding) {
-		this.strictEncoding = strictEncoding;
-	}
-
-	/**
-	 * Whether to strictly encode any character outside the unreserved set.
-	 */
-	public boolean isStrictEncoding() {
-		return this.strictEncoding;
-	}
-
-
-	@Override
-	protected URI expandInternal(String uriTemplate, Map<String, ?> uriVariables) {
-		UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
-		UriComponents uriComponents = expandAndEncode(uriComponentsBuilder, uriVariables);
-		return createUri(uriComponents);
-	}
-
-	@Override
-	protected URI expandInternal(String uriTemplate, Object... uriVariables) {
-		UriComponentsBuilder uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
-		UriComponents uriComponents = expandAndEncode(uriComponentsBuilder, uriVariables);
-		return createUri(uriComponents);
-	}
-
-	/**
-	 * Create a {@code UriComponentsBuilder} from the URI template string.
-	 * This implementation also breaks up the path into path segments depending
-	 * on whether {@link #setParsePath parsePath} is enabled.
-	 */
-	protected UriComponentsBuilder initUriComponentsBuilder(String uriTemplate) {
-		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(uriTemplate);
-		if (shouldParsePath() && !isStrictEncoding()) {
-			List<String> pathSegments = builder.build().getPathSegments();
-			builder.replacePath(null);
-			for (String pathSegment : pathSegments) {
-				builder.pathSegment(pathSegment);
-			}
-		}
-		return builder;
-	}
-
-	protected UriComponents expandAndEncode(UriComponentsBuilder builder, Map<String, ?> uriVariables) {
-		if (!isStrictEncoding()) {
-			return builder.buildAndExpand(uriVariables).encode();
-		}
-		else {
-			Map<String, ?> encodedUriVars = UriUtils.encodeUriVariables(uriVariables);
-			return builder.buildAndExpand(encodedUriVars);
-		}
-	}
-
-	protected UriComponents expandAndEncode(UriComponentsBuilder builder, Object[] uriVariables) {
-		if (!isStrictEncoding()) {
-			return builder.buildAndExpand(uriVariables).encode();
-		}
-		else {
-			Object[] encodedUriVars = UriUtils.encodeUriVariables(uriVariables);
-			return builder.buildAndExpand(encodedUriVars);
-		}
-	}
-
-	private URI createUri(UriComponents uriComponents) {
-		try {
-			// Avoid further encoding (in the case of strictEncoding=true)
-			return new URI(uriComponents.toUriString());
-		}
-		catch (URISyntaxException ex) {
-			throw new IllegalStateException("Could not create URI object: " + ex.getMessage(), ex);
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/client/support/BasicAuthorizationInterceptorTests.java b/spring-web/src/test/java/org/springframework/http/client/support/BasicAuthorizationInterceptorTests.java
deleted file mode 100644
index 133051e07761..000000000000
--- a/spring-web/src/test/java/org/springframework/http/client/support/BasicAuthorizationInterceptorTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- * 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.http.client.support;
-
-import java.net.URI;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.DirectFieldAccessor;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.ClientHttpRequest;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Tests for {@link BasicAuthorizationInterceptor}.
- *
- * @author Phillip Webb
- * @author Stephane Nicoll
- */
-@SuppressWarnings("deprecation")
-public class BasicAuthorizationInterceptorTests {
-
-	@Test
-	public void createWhenUsernameContainsColonShouldThrowException() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				new BasicAuthorizationInterceptor("username:", "password"))
-			.withMessageContaining("Username must not contain a colon");
-	}
-
-	@Test
-	public void createWhenUsernameIsNullShouldUseEmptyUsername() throws Exception {
-		BasicAuthorizationInterceptor interceptor = new BasicAuthorizationInterceptor(
-				null, "password");
-		assertThat(new DirectFieldAccessor(interceptor).getPropertyValue("username")).isEqualTo("");
-	}
-
-	@Test
-	public void createWhenPasswordIsNullShouldUseEmptyPassword() throws Exception {
-		BasicAuthorizationInterceptor interceptor = new BasicAuthorizationInterceptor(
-				"username", null);
-		assertThat(new DirectFieldAccessor(interceptor).getPropertyValue("password")).isEqualTo("");
-	}
-
-	@Test
-	public void interceptShouldAddHeader() throws Exception {
-		SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
-		ClientHttpRequestExecution execution = mock(ClientHttpRequestExecution.class);
-		byte[] body = new byte[] {};
-		new BasicAuthorizationInterceptor("spring", "boot").intercept(request, body,
-				execution);
-		verify(execution).execute(request, body);
-		assertThat(request.getHeaders().getFirst("Authorization")).isEqualTo("Basic c3ByaW5nOmJvb3Q=");
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
index 26106e13d3d2..6d89057ea85d 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
@@ -32,10 +33,7 @@
 import org.springframework.protobuf.SecondMsg;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 /**
  * Test suite for {@link ProtobufHttpMessageConverter}.
@@ -45,44 +43,23 @@
  * @author Andreas Ahlenstorf
  * @author Sebastien Deleuze
  */
-@SuppressWarnings("deprecation")
 public class ProtobufHttpMessageConverterTests {
 
 	private ProtobufHttpMessageConverter converter;
 
 	private ExtensionRegistry extensionRegistry;
 
-	private ExtensionRegistryInitializer registryInitializer;
-
 	private Msg testMsg;
 
 
 	@BeforeEach
 	public void setup() {
-		this.registryInitializer = mock(ExtensionRegistryInitializer.class);
 		this.extensionRegistry = mock(ExtensionRegistry.class);
-		this.converter = new ProtobufHttpMessageConverter(this.registryInitializer);
+		this.converter = new ProtobufHttpMessageConverter();
 		this.testMsg = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build();
 	}
 
 
-	@Test
-	public void extensionRegistryInitialized() {
-		verify(this.registryInitializer, times(1)).initializeExtensionRegistry(any());
-	}
-
-	@Test
-	public void extensionRegistryInitializerNull() {
-		ProtobufHttpMessageConverter converter = new ProtobufHttpMessageConverter((ExtensionRegistryInitializer)null);
-		assertThat(converter.extensionRegistry).isNotNull();
-	}
-
-	@Test
-	public void extensionRegistryNull() {
-		ProtobufHttpMessageConverter converter = new ProtobufHttpMessageConverter((ExtensionRegistry)null);
-		assertThat(converter.extensionRegistry).isNotNull();
-	}
-
 	@Test
 	public void canRead() {
 		assertThat(this.converter.canRead(Msg.class, null)).isTrue();
@@ -175,7 +152,7 @@ public void writeJsonWithJavaFormat() throws IOException {
 
 		assertThat(outputMessage.getHeaders().getContentType()).isEqualTo(contentType);
 
-		final String body = outputMessage.getBodyAsString(Charset.forName("UTF-8"));
+		String body = outputMessage.getBodyAsString(StandardCharsets.UTF_8);
 		assertThat(body.isEmpty()).as("body is empty").isFalse();
 
 		Msg.Builder builder = Msg.newBuilder();
@@ -189,12 +166,12 @@ public void writeJsonWithJavaFormat() throws IOException {
 	}
 
 	@Test
-	public void defaultContentType() throws Exception {
+	public void defaultContentType() {
 		assertThat(this.converter.getDefaultContentType(this.testMsg)).isEqualTo(ProtobufHttpMessageConverter.PROTOBUF);
 	}
 
 	@Test
-	public void getContentLength() throws Exception {
+	public void getContentLength() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		MediaType contentType = ProtobufHttpMessageConverter.PROTOBUF;
 		this.converter.write(this.testMsg, contentType, outputMessage);
diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java
index 296efbd8b3b1..a2d549daab55 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 
-import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;
 import org.junit.jupiter.api.Test;
@@ -30,10 +29,6 @@
 import org.springframework.protobuf.SecondMsg;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 /**
  * Test suite for {@link ProtobufJsonFormatHttpMessageConverter}.
@@ -41,34 +36,14 @@
  * @author Juergen Hoeller
  * @author Sebastien Deleuze
  */
-@SuppressWarnings("deprecation")
 public class ProtobufJsonFormatHttpMessageConverterTests {
 
-	private final ExtensionRegistryInitializer registryInitializer = mock(ExtensionRegistryInitializer.class);
-
 	private final ProtobufHttpMessageConverter converter = new ProtobufJsonFormatHttpMessageConverter(
-			JsonFormat.parser(), JsonFormat.printer(), this.registryInitializer);
+			JsonFormat.parser(), JsonFormat.printer());
 
 	private final Msg testMsg = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build();
 
 
-	@Test
-	public void extensionRegistryInitialized() {
-		verify(this.registryInitializer, times(1)).initializeExtensionRegistry(any());
-	}
-
-	@Test
-	public void extensionRegistryInitializerNull() {
-		ProtobufHttpMessageConverter converter = new ProtobufHttpMessageConverter((ExtensionRegistryInitializer)null);
-		assertThat(converter).isNotNull();
-	}
-
-	@Test
-	public void extensionRegistryInitializer() {
-		ProtobufHttpMessageConverter converter = new ProtobufHttpMessageConverter((ExtensionRegistry)null);
-		assertThat(converter).isNotNull();
-	}
-
 	@Test
 	public void canRead() {
 		assertThat(this.converter.canRead(Msg.class, null)).isTrue();
diff --git a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java
index 617655643d52..7780a1f7f940 100644
--- a/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/cors/reactive/CorsUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,11 @@
 
 package org.springframework.web.cors.reactive;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 import org.junit.jupiter.api.Test;
-import reactor.core.publisher.Mono;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.web.server.adapter.ForwardedHeaderTransformer;
 import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest;
 import org.springframework.web.testfixture.server.MockServerWebExchange;
 
@@ -32,6 +30,7 @@
 
 /**
  * Test case for reactive {@link CorsUtils}.
+ *
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
  */
@@ -141,15 +140,9 @@ private void testWithForwardedHeader(String serverName, int port,
 	}
 
 	// SPR-16668
-	@SuppressWarnings("deprecation")
 	private ServerHttpRequest adaptFromForwardedHeaders(MockServerHttpRequest.BaseBuilder<?> builder) {
-		AtomicReference<ServerHttpRequest> requestRef = new AtomicReference<>();
 		MockServerWebExchange exchange = MockServerWebExchange.from(builder);
-		new org.springframework.web.filter.reactive.ForwardedHeaderFilter().filter(exchange, exchange2 -> {
-			requestRef.set(exchange2.getRequest());
-			return Mono.empty();
-		}).block();
-		return requestRef.get();
+		return new ForwardedHeaderTransformer().apply(exchange.getRequest());
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java
index 18c4dc8cc54e..a5c36cf84242 100644
--- a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java
@@ -48,6 +48,7 @@
 
 /**
  * Unit tests for {@link WebHttpHandlerBuilder}.
+ *
  * @author Rossen Stoyanchev
  */
 public class WebHttpHandlerBuilderTests {
@@ -73,7 +74,7 @@ void orderedWebFilterBeans() {
 	@Test
 	void forwardedHeaderTransformer() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(ForwardedHeaderFilterConfig.class);
+		context.register(ForwardedHeaderTransformerConfig.class);
 		context.refresh();
 
 		WebHttpHandlerBuilder builder = WebHttpHandlerBuilder.applicationContext(context);
@@ -199,7 +200,6 @@ public WebHandler webHandler() {
 
 
 	@Configuration
-	@SuppressWarnings("unused")
 	static class OrderedWebFilterBeanConfig {
 
 		private static final String ATTRIBUTE = "attr";
@@ -234,7 +234,6 @@ public WebHandler webHandler() {
 
 
 	@Configuration
-	@SuppressWarnings("unused")
 	static class OrderedExceptionHandlerBeanConfig {
 
 		@Bean
@@ -256,13 +255,11 @@ public WebHandler webHandler() {
 	}
 
 	@Configuration
-	@SuppressWarnings("unused")
-	static class ForwardedHeaderFilterConfig {
+	static class ForwardedHeaderTransformerConfig {
 
 		@Bean
-		@SuppressWarnings("deprecation")
-		public WebFilter forwardedHeaderFilter() {
-			return new org.springframework.web.filter.reactive.ForwardedHeaderFilter();
+		public ForwardedHeaderTransformer forwardedHeaderTransformer() {
+			return new ForwardedHeaderTransformer();
 		}
 
 		@Bean
@@ -272,7 +269,6 @@ public WebHandler webHandler() {
 	}
 
 	@Configuration
-	@SuppressWarnings("unused")
 	static class NoFilterConfig {
 
 		@Bean
diff --git a/spring-web/src/test/java/org/springframework/web/util/DefaultUriTemplateHandlerTests.java b/spring-web/src/test/java/org/springframework/web/util/DefaultUriTemplateHandlerTests.java
deleted file mode 100644
index edb284c9c131..000000000000
--- a/spring-web/src/test/java/org/springframework/web/util/DefaultUriTemplateHandlerTests.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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.
- * 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.web.util;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Unit tests for {@link DefaultUriTemplateHandler}.
- *
- * @author Rossen Stoyanchev
- */
-@SuppressWarnings("deprecation")
-public class DefaultUriTemplateHandlerTests {
-
-	private final DefaultUriTemplateHandler handler = new DefaultUriTemplateHandler();
-
-
-	@Test
-	public void baseUrlWithoutPath() throws Exception {
-		this.handler.setBaseUrl("http://localhost:8080");
-		URI actual = this.handler.expand("/myapiresource");
-
-		assertThat(actual.toString()).isEqualTo("http://localhost:8080/myapiresource");
-	}
-
-	@Test
-	public void baseUrlWithPath() throws Exception {
-		this.handler.setBaseUrl("http://localhost:8080/context");
-		URI actual = this.handler.expand("/myapiresource");
-
-		assertThat(actual.toString()).isEqualTo("http://localhost:8080/context/myapiresource");
-	}
-
-	@Test	// SPR-14147
-	public void defaultUriVariables() throws Exception {
-		Map<String, String> defaultVars = new HashMap<>(2);
-		defaultVars.put("host", "api.example.com");
-		defaultVars.put("port", "443");
-		this.handler.setDefaultUriVariables(defaultVars);
-
-		Map<String, Object> vars = new HashMap<>(1);
-		vars.put("id", 123L);
-
-		String template = "https://{host}:{port}/v42/customers/{id}";
-		URI actual = this.handler.expand(template, vars);
-
-		assertThat(actual.toString()).isEqualTo("https://api.example.com:443/v42/customers/123");
-	}
-
-	@Test
-	public void parsePathIsOff() throws Exception {
-		this.handler.setParsePath(false);
-		Map<String, String> vars = new HashMap<>(2);
-		vars.put("hotel", "1");
-		vars.put("publicpath", "pics/logo.png");
-		String template = "https://example.com/hotels/{hotel}/pic/{publicpath}";
-		URI actual = this.handler.expand(template, vars);
-
-		assertThat(actual.toString()).isEqualTo("https://example.com/hotels/1/pic/pics/logo.png");
-	}
-
-	@Test
-	public void parsePathIsOn() throws Exception {
-		this.handler.setParsePath(true);
-		Map<String, String> vars = new HashMap<>(2);
-		vars.put("hotel", "1");
-		vars.put("publicpath", "pics/logo.png");
-		vars.put("scale", "150x150");
-		String template = "https://example.com/hotels/{hotel}/pic/{publicpath}/size/{scale}";
-		URI actual = this.handler.expand(template, vars);
-
-		assertThat(actual.toString()).isEqualTo("https://example.com/hotels/1/pic/pics%2Flogo.png/size/150x150");
-	}
-
-	@Test
-	public void strictEncodingIsOffWithMap() throws Exception {
-		this.handler.setStrictEncoding(false);
-		Map<String, String> vars = new HashMap<>(2);
-		vars.put("userId", "john;doe");
-		String template = "https://www.example.com/user/{userId}/dashboard";
-		URI actual = this.handler.expand(template, vars);
-
-		assertThat(actual.toString()).isEqualTo("https://www.example.com/user/john;doe/dashboard");
-	}
-
-	@Test
-	public void strictEncodingOffWithArray() throws Exception {
-		this.handler.setStrictEncoding(false);
-		String template = "https://www.example.com/user/{userId}/dashboard";
-		URI actual = this.handler.expand(template, "john;doe");
-
-		assertThat(actual.toString()).isEqualTo("https://www.example.com/user/john;doe/dashboard");
-	}
-
-	@Test
-	public void strictEncodingOnWithMap() throws Exception {
-		this.handler.setStrictEncoding(true);
-		Map<String, String> vars = new HashMap<>(2);
-		vars.put("userId", "john;doe");
-		String template = "https://www.example.com/user/{userId}/dashboard";
-		URI actual = this.handler.expand(template, vars);
-
-		assertThat(actual.toString()).isEqualTo("https://www.example.com/user/john%3Bdoe/dashboard");
-	}
-
-	@Test
-	public void strictEncodingOnWithArray() throws Exception {
-		this.handler.setStrictEncoding(true);
-		String template = "https://www.example.com/user/{userId}/dashboard";
-		URI actual = this.handler.expand(template, "john;doe");
-
-		assertThat(actual.toString()).isEqualTo("https://www.example.com/user/john%3Bdoe/dashboard");
-	}
-
-	@Test	// SPR-14147
-	public void strictEncodingAndDefaultUriVariables() throws Exception {
-		Map<String, String> defaultVars = new HashMap<>(1);
-		defaultVars.put("host", "www.example.com");
-		this.handler.setDefaultUriVariables(defaultVars);
-		this.handler.setStrictEncoding(true);
-
-		Map<String, Object> vars = new HashMap<>(1);
-		vars.put("userId", "john;doe");
-
-		String template = "https://{host}/user/{userId}/dashboard";
-		URI actual = this.handler.expand(template, vars);
-
-		assertThat(actual.toString()).isEqualTo("https://www.example.com/user/john%3Bdoe/dashboard");
-	}
-
-}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
index 42ad43e22c4f..f79635e5fd2e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
@@ -43,11 +43,8 @@ public abstract class ExchangeFilterFunctions {
 
 	/**
 	 * Name of the request attribute with {@link Credentials} for {@link #basicAuthentication()}.
-	 * @deprecated as of Spring 5.1 in favor of using
-	 * {@link HttpHeaders#setBasicAuth(String, String)} while building the request.
 	 */
-	@Deprecated
-	public static final String BASIC_AUTHENTICATION_CREDENTIALS_ATTRIBUTE =
+	private static final String BASIC_AUTHENTICATION_CREDENTIALS_ATTRIBUTE =
 			ExchangeFilterFunctions.class.getName() + ".basicAuthenticationCredentials";
 
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
deleted file mode 100644
index 95fbce8734f3..000000000000
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * 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.
- * 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.web.reactive.resource;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Scanner;
-import java.util.function.Consumer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import reactor.core.Exceptions;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.publisher.SynchronousSink;
-
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferFactory;
-import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.util.DigestUtils;
-import org.springframework.util.StreamUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.server.ServerWebExchange;
-
-/**
- * A {@link ResourceTransformer} HTML5 AppCache manifests.
- *
- * <p>This transformer:
- * <ul>
- * <li>modifies links to match the public URL paths that should be exposed to
- * clients, using configured {@code ResourceResolver} strategies
- * <li>appends a comment in the manifest, containing a Hash
- * (e.g. "# Hash: 9de0f09ed7caf84e885f1f0f11c7e326"), thus changing the content
- * of the manifest in order to trigger an appcache reload in the browser.
- * </ul>
- *
- * <p>All files with an ".appcache" file extension (or the extension given
- * to the constructor) will be transformed by this class. The hash is computed
- * using the content of the appcache manifest so that changes in the manifest
- * should invalidate the browser cache. This should also work with changes in
- * referenced resources whose links are also versioned.
- *
- * @author Rossen Stoyanchev
- * @author Brian Clozel
- * @since 5.0
- * @see <a href="https://html.spec.whatwg.org/multipage/browsers.html#offline">HTML5 offline applications spec</a>
- * @deprecated as of 5.3 since browser support is going away
- */
-@Deprecated
-public class AppCacheManifestTransformer extends ResourceTransformerSupport {
-
-	private static final String MANIFEST_HEADER = "CACHE MANIFEST";
-
-	private static final String CACHE_HEADER = "CACHE:";
-
-	private static final Collection<String> MANIFEST_SECTION_HEADERS =
-			Arrays.asList(MANIFEST_HEADER, "NETWORK:", "FALLBACK:", CACHE_HEADER);
-
-	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
-
-	private static final Log logger = LogFactory.getLog(AppCacheManifestTransformer.class);
-
-
-	private final String fileExtension;
-
-
-	/**
-	 * Create an AppCacheResourceTransformer that transforms files with extension ".appcache".
-	 */
-	public AppCacheManifestTransformer() {
-		this("appcache");
-	}
-
-	/**
-	 * Create an AppCacheResourceTransformer that transforms files with the extension
-	 * given as a parameter.
-	 */
-	public AppCacheManifestTransformer(String fileExtension) {
-		this.fileExtension = fileExtension;
-	}
-
-
-	@Override
-	public Mono<Resource> transform(ServerWebExchange exchange, Resource inputResource,
-			ResourceTransformerChain chain) {
-
-		return chain.transform(exchange, inputResource)
-				.flatMap(outputResource -> {
-					String name = outputResource.getFilename();
-					if (!this.fileExtension.equals(StringUtils.getFilenameExtension(name))) {
-						return Mono.just(outputResource);
-					}
-					DataBufferFactory bufferFactory = exchange.getResponse().bufferFactory();
-					Flux<DataBuffer> flux = DataBufferUtils
-							.read(outputResource, bufferFactory, StreamUtils.BUFFER_SIZE);
-					return DataBufferUtils.join(flux)
-							.flatMap(dataBuffer -> {
-								CharBuffer charBuffer = DEFAULT_CHARSET.decode(dataBuffer.asByteBuffer());
-								DataBufferUtils.release(dataBuffer);
-								String content = charBuffer.toString();
-								return transform(content, outputResource, chain, exchange);
-							});
-				});
-	}
-
-	private Mono<? extends Resource> transform(String content, Resource resource,
-			ResourceTransformerChain chain, ServerWebExchange exchange) {
-
-		if (!content.startsWith(MANIFEST_HEADER)) {
-			if (logger.isTraceEnabled()) {
-				logger.trace(exchange.getLogPrefix() +
-						"Skipping " + resource + ": Manifest does not start with 'CACHE MANIFEST'");
-			}
-			return Mono.just(resource);
-		}
-		return Flux.generate(new LineInfoGenerator(content))
-				.concatMap(info -> processLine(info, exchange, resource, chain))
-				.reduce(new ByteArrayOutputStream(), (out, line) -> {
-					writeToByteArrayOutputStream(out, line + "\n");
-					return out;
-				})
-				.map(out -> {
-					String hash = DigestUtils.md5DigestAsHex(out.toByteArray());
-					writeToByteArrayOutputStream(out, "\n" + "# Hash: " + hash);
-					return new TransformedResource(resource, out.toByteArray());
-				});
-	}
-
-	private static void writeToByteArrayOutputStream(ByteArrayOutputStream out, String toWrite) {
-		try {
-			byte[] bytes = toWrite.getBytes(DEFAULT_CHARSET);
-			out.write(bytes);
-		}
-		catch (IOException ex) {
-			throw Exceptions.propagate(ex);
-		}
-	}
-
-	private Mono<String> processLine(LineInfo info, ServerWebExchange exchange,
-			Resource resource, ResourceTransformerChain chain) {
-
-		if (!info.isLink()) {
-			return Mono.just(info.getLine());
-		}
-
-		String link = toAbsolutePath(info.getLine(), exchange);
-		return resolveUrlPath(link, exchange, resource, chain);
-	}
-
-
-	private static class LineInfoGenerator implements Consumer<SynchronousSink<LineInfo>> {
-
-		private final Scanner scanner;
-
-		@Nullable
-		private LineInfo previous;
-
-
-		LineInfoGenerator(String content) {
-			this.scanner = new Scanner(content);
-		}
-
-
-		@Override
-		public void accept(SynchronousSink<LineInfo> sink) {
-			if (this.scanner.hasNext()) {
-				String line = this.scanner.nextLine();
-				LineInfo current = new LineInfo(line, this.previous);
-				sink.next(current);
-				this.previous = current;
-			}
-			else {
-				sink.complete();
-			}
-		}
-	}
-
-
-	private static class LineInfo {
-
-		private final String line;
-
-		private final boolean cacheSection;
-
-		private final boolean link;
-
-
-		LineInfo(String line, @Nullable LineInfo previousLine) {
-			this.line = line;
-			this.cacheSection = initCacheSectionFlag(line, previousLine);
-			this.link = iniLinkFlag(line, this.cacheSection);
-		}
-
-
-		private static boolean initCacheSectionFlag(String line, @Nullable LineInfo previousLine) {
-			String trimmedLine = line.trim();
-			if (MANIFEST_SECTION_HEADERS.contains(trimmedLine)) {
-				return trimmedLine.equals(CACHE_HEADER);
-			}
-			else if (previousLine != null) {
-				return previousLine.isCacheSection();
-			}
-			throw new IllegalStateException(
-					"Manifest does not start with " + MANIFEST_HEADER + ": " + line);
-		}
-
-		private static boolean iniLinkFlag(String line, boolean isCacheSection) {
-			return (isCacheSection && StringUtils.hasText(line) && !line.startsWith("#")
-					&& !line.startsWith("//") && !hasScheme(line));
-		}
-
-		private static boolean hasScheme(String line) {
-			int index = line.indexOf(':');
-			return (line.startsWith("//") || (index > 0 && !line.substring(0, index).contains("/")));
-		}
-
-
-		public String getLine() {
-			return this.line;
-		}
-
-		public boolean isCacheSection() {
-			return this.cacheSection;
-		}
-
-		public boolean isLink() {
-			return this.link;
-		}
-	}
-
-}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
index ab0dfd4c6c7b..0e0e36c433ca 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
@@ -79,8 +79,7 @@ public Mono<Resource> transform(ServerWebExchange exchange, Resource inputResour
 				.flatMap(outputResource -> {
 					String filename = outputResource.getFilename();
 					if (!"css".equals(StringUtils.getFilenameExtension(filename)) ||
-							inputResource instanceof EncodedResourceResolver.EncodedResource ||
-							inputResource instanceof GzipResourceResolver.GzippedResource) {
+							inputResource instanceof EncodedResourceResolver.EncodedResource) {
 						return Mono.just(outputResource);
 					}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java
deleted file mode 100644
index 74a7a628bb9b..000000000000
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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.
- * 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.web.reactive.resource;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import reactor.core.publisher.Mono;
-
-import org.springframework.core.io.AbstractResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
-import org.springframework.web.server.ServerWebExchange;
-
-/**
- * A {@code ResourceResolver} that delegates to the chain to locate a resource
- * and then attempts to find a variation with the ".gz" extension.
- *
- * <p>The resolver gets involved only if the "Accept-Encoding" request header
- * contains the value "gzip" indicating the client accepts gzipped responses.
- *
- * @author Rossen Stoyanchev
- * @since 5.0
- * @deprecated as of 5.1, in favor of using {@link EncodedResourceResolver}
- */
-@Deprecated
-public class GzipResourceResolver extends AbstractResourceResolver {
-
-	@Override
-	protected Mono<Resource> resolveResourceInternal(@Nullable ServerWebExchange exchange,
-			String requestPath, List<? extends Resource> locations, ResourceResolverChain chain) {
-
-		return chain.resolveResource(exchange, requestPath, locations)
-				.map(resource -> {
-					if (exchange == null || isGzipAccepted(exchange)) {
-						try {
-							Resource gzipped = new GzippedResource(resource);
-							if (gzipped.exists()) {
-								resource = gzipped;
-							}
-						}
-						catch (IOException ex) {
-							String logPrefix = exchange != null ? exchange.getLogPrefix() : "";
-							logger.trace(logPrefix + "No gzip resource for [" + resource.getFilename() + "]", ex);
-						}
-					}
-					return resource;
-				});
-	}
-
-	private boolean isGzipAccepted(ServerWebExchange exchange) {
-		String value = exchange.getRequest().getHeaders().getFirst("Accept-Encoding");
-		return (value != null && value.toLowerCase().contains("gzip"));
-	}
-
-	@Override
-	protected Mono<String> resolveUrlPathInternal(String resourceUrlPath,
-			List<? extends Resource> locations, ResourceResolverChain chain) {
-
-		return chain.resolveUrlPath(resourceUrlPath, locations);
-	}
-
-
-	/**
-	 * A gzipped {@link HttpResource}.
-	 */
-	static final class GzippedResource extends AbstractResource implements HttpResource {
-
-		private final Resource original;
-
-		private final Resource gzipped;
-
-		public GzippedResource(Resource original) throws IOException {
-			this.original = original;
-			this.gzipped = original.createRelative(original.getFilename() + ".gz");
-		}
-
-		@Override
-		public InputStream getInputStream() throws IOException {
-			return this.gzipped.getInputStream();
-		}
-
-		@Override
-		public boolean exists() {
-			return this.gzipped.exists();
-		}
-
-		@Override
-		public boolean isReadable() {
-			return this.gzipped.isReadable();
-		}
-
-		@Override
-		public boolean isOpen() {
-			return this.gzipped.isOpen();
-		}
-
-		@Override
-		public boolean isFile() {
-			return this.gzipped.isFile();
-		}
-
-		@Override
-		public URL getURL() throws IOException {
-			return this.gzipped.getURL();
-		}
-
-		@Override
-		public URI getURI() throws IOException {
-			return this.gzipped.getURI();
-		}
-
-		@Override
-		public File getFile() throws IOException {
-			return this.gzipped.getFile();
-		}
-
-		@Override
-		public long contentLength() throws IOException {
-			return this.gzipped.contentLength();
-		}
-
-		@Override
-		public long lastModified() throws IOException {
-			return this.gzipped.lastModified();
-		}
-
-		@Override
-		public Resource createRelative(String relativePath) throws IOException {
-			return this.gzipped.createRelative(relativePath);
-		}
-
-		@Override
-		@Nullable
-		public String getFilename() {
-			return this.original.getFilename();
-		}
-
-		@Override
-		public String getDescription() {
-			return this.gzipped.getDescription();
-		}
-
-		@Override
-		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers = (this.original instanceof HttpResource ?
-					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
-			headers.add(HttpHeaders.CONTENT_ENCODING, "gzip");
-			headers.add(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING);
-			return headers;
-		}
-	}
-
-}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java
index 4090982ae656..5e88cd487e63 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -230,9 +230,7 @@ protected Mono<Map<String, Object>> getModelAttributes(
 			attributes = new ConcurrentHashMap<>(0);
 		}
 
-		//noinspection deprecation
-		return resolveAsyncAttributes(attributes)
-				.then(resolveAsyncAttributes(attributes, exchange))
+		return resolveAsyncAttributes(attributes, exchange)
 				.doOnTerminate(() -> exchange.getAttributes().remove(BINDING_CONTEXT_ATTRIBUTE))
 				.thenReturn(attributes);
 	}
@@ -293,22 +291,6 @@ private void addBindingResult(String name, Object value, Map<String, Object> mod
 		model.put(BindingResult.MODEL_KEY_PREFIX + name, result);
 	}
 
-	/**
-	 * Use the configured {@link ReactiveAdapterRegistry} to adapt asynchronous
-	 * attributes to {@code Mono<T>} or {@code Mono<List<T>>} and then wait to
-	 * resolve them into actual values. When the returned {@code Mono<Void>}
-	 * completes, the asynchronous attributes in the model would have been
-	 * replaced with their corresponding resolved values.
-	 * @return result {@code Mono} that completes when the model is ready
-	 * @deprecated as of 5.1.8 this method is still invoked but it is a no-op.
-	 * Please use {@link #resolveAsyncAttributes(Map, ServerWebExchange)}
-	 * instead. It is invoked after this one and does the actual work.
-	 */
-	@Deprecated
-	protected Mono<Void> resolveAsyncAttributes(Map<String, Object> model) {
-		return Mono.empty();
-	}
-
 	/**
 	 * Create a {@link RequestContext} to expose under the
 	 * {@linkplain #setRequestContextAttribute specified attribute name}.
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java
index a50fe279ecb8..059e52376dc1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,23 +41,6 @@
  */
 public interface RequestUpgradeStrategy {
 
-	/**
-	 * Upgrade to a WebSocket session and handle it with the given handler.
-	 * @param exchange the current exchange
-	 * @param webSocketHandler handler for the WebSocket session
-	 * @param subProtocol the selected sub-protocol got the handler
-	 * @return completion {@code Mono<Void>} to indicate the outcome of the
-	 * WebSocket session handling.
-	 * @deprecated as of 5.1 in favor of
-	 * {@link #upgrade(ServerWebExchange, WebSocketHandler, String, Supplier)}
-	 */
-	@Deprecated
-	default Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler webSocketHandler,
-			@Nullable String subProtocol) {
-
-		return Mono.error(new UnsupportedOperationException());
-	}
-
 	/**
 	 * Upgrade to a WebSocket session and handle it with the given handler.
 	 * @param exchange the current exchange
@@ -68,10 +51,7 @@ default Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler webSocke
 	 * WebSocket session handling.
 	 * @since 5.1
 	 */
-	default Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler webSocketHandler,
-			@Nullable String subProtocol, Supplier<HandshakeInfo> handshakeInfoFactory) {
-
-		return upgrade(exchange, webSocketHandler, subProtocol);
-	}
+	Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler webSocketHandler,
+			@Nullable String subProtocol, Supplier<HandshakeInfo> handshakeInfoFactory);
 
 }
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java
index 21b493829dd6..64934cf08c33 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,14 +165,12 @@ void resourceChainWithoutCaching() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	void resourceChainWithVersionResolver() {
 		VersionResourceResolver versionResolver = new VersionResourceResolver()
 				.addFixedVersionStrategy("fixed", "/**/*.js")
 				.addContentVersionStrategy("/**");
 
-		this.registration.resourceChain(true).addResolver(versionResolver)
-				.addTransformer(new org.springframework.web.reactive.resource.AppCacheManifestTransformer());
+		this.registration.resourceChain(true).addResolver(versionResolver);
 
 		ResourceWebHandler handler = getHandler("/resources/**");
 		List<ResourceResolver> resolvers = handler.getResourceResolvers();
@@ -183,10 +181,9 @@ void resourceChainWithVersionResolver() {
 		assertThat(resolvers.get(3)).isInstanceOf(PathResourceResolver.class);
 
 		List<ResourceTransformer> transformers = handler.getResourceTransformers();
-		assertThat(transformers).hasSize(3);
+		assertThat(transformers).hasSize(2);
 		assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
 		assertThat(transformers.get(1)).isInstanceOf(CssLinkResourceTransformer.class);
-		assertThat(transformers.get(2)).isInstanceOf(org.springframework.web.reactive.resource.AppCacheManifestTransformer.class);
 	}
 
 	@Test
@@ -197,8 +194,6 @@ void resourceChainWithOverrides() {
 		WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class);
 		PathResourceResolver pathResourceResolver = new PathResourceResolver();
 		CachingResourceTransformer cachingTransformer = Mockito.mock(CachingResourceTransformer.class);
-		org.springframework.web.reactive.resource.AppCacheManifestTransformer appCacheTransformer =
-				Mockito.mock(org.springframework.web.reactive.resource.AppCacheManifestTransformer.class);
 		CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer();
 
 		this.registration.setCacheControl(CacheControl.maxAge(3600, TimeUnit.MILLISECONDS))
@@ -208,7 +203,6 @@ void resourceChainWithOverrides() {
 					.addResolver(webjarsResolver)
 					.addResolver(pathResourceResolver)
 					.addTransformer(cachingTransformer)
-					.addTransformer(appCacheTransformer)
 					.addTransformer(cssLinkTransformer);
 
 		ResourceWebHandler handler = getHandler("/resources/**");
@@ -220,10 +214,9 @@ void resourceChainWithOverrides() {
 		assertThat(resolvers.get(3)).isSameAs(pathResourceResolver);
 
 		List<ResourceTransformer> transformers = handler.getResourceTransformers();
-		assertThat(transformers).hasSize(3);
+		assertThat(transformers).hasSize(2);
 		assertThat(transformers.get(0)).isSameAs(cachingTransformer);
-		assertThat(transformers.get(1)).isSameAs(appCacheTransformer);
-		assertThat(transformers.get(2)).isSameAs(cssLinkTransformer);
+		assertThat(transformers.get(1)).isSameAs(cssLinkTransformer);
 	}
 
 	@Test
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
deleted file mode 100644
index 24ce532e492b..000000000000
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
+++ /dev/null
@@ -1,123 +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.web.reactive.resource;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.testfixture.server.MockServerWebExchange;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest.get;
-
-/**
- * Unit tests for {@link AppCacheManifestTransformer}.
- * @author Rossen Stoyanchev
- * @author Brian Clozel
- */
-@SuppressWarnings("deprecation")
-public class AppCacheManifestTransformerTests {
-
-	private static final Duration TIMEOUT = Duration.ofSeconds(5);
-
-
-	private final AppCacheManifestTransformer transformer = new AppCacheManifestTransformer();
-
-	private ResourceTransformerChain chain;
-
-
-	@BeforeEach
-	public void setup() {
-		VersionResourceResolver versionResolver = new VersionResourceResolver();
-		versionResolver.setStrategyMap(Collections.singletonMap("/**", new ContentVersionStrategy()));
-		List<ResourceResolver> resolvers = new ArrayList<>();
-		resolvers.add(versionResolver);
-		resolvers.add(new PathResourceResolver());
-		ResourceResolverChain resolverChain = new DefaultResourceResolverChain(resolvers);
-
-		this.chain = new DefaultResourceTransformerChain(resolverChain, Collections.emptyList());
-		this.transformer.setResourceUrlProvider(createUrlProvider(resolvers));
-	}
-
-	private ResourceUrlProvider createUrlProvider(List<ResourceResolver> resolvers) {
-		ResourceWebHandler handler = new ResourceWebHandler();
-		handler.setLocations(Collections.singletonList(new ClassPathResource("test/", getClass())));
-		handler.setResourceResolvers(resolvers);
-
-		ResourceUrlProvider urlProvider = new ResourceUrlProvider();
-		urlProvider.registerHandlers(Collections.singletonMap("/static/**", handler));
-		return urlProvider;
-	}
-
-
-	@Test
-	public void noTransformIfExtensionDoesNotMatch() {
-		MockServerWebExchange exchange = MockServerWebExchange.from(get("/static/foo.css"));
-		Resource expected = getResource("foo.css");
-		Resource actual = this.transformer.transform(exchange, expected, this.chain).block(TIMEOUT);
-
-		assertThat(actual).isSameAs(expected);
-	}
-
-	@Test
-	public void syntaxErrorInManifest() {
-		MockServerWebExchange exchange = MockServerWebExchange.from(get("/static/error.appcache"));
-		Resource expected = getResource("error.appcache");
-		Resource actual = this.transformer.transform(exchange, expected, this.chain).block(TIMEOUT);
-
-		assertThat(actual).isEqualTo(expected);
-	}
-
-	@Test
-	public void transformManifest() throws Exception {
-		MockServerWebExchange exchange = MockServerWebExchange.from(get("/static/test.appcache"));
-		Resource resource = getResource("test.appcache");
-		Resource actual = this.transformer.transform(exchange, resource, this.chain).block(TIMEOUT);
-
-		assertThat(actual).isNotNull();
-		byte[] bytes = FileCopyUtils.copyToByteArray(actual.getInputStream());
-		String content = new String(bytes, "UTF-8");
-
-		assertThat(content).as("rewrite resource links")
-				.contains("/static/foo-e36d2e05253c6c7085a91522ce43a0b4.css")
-				.contains("/static/bar-11e16cf79faee7ac698c805cf28248d2.css")
-				.contains("/static/js/bar-bd508c62235b832d960298ca6c0b7645.js");
-
-		assertThat(content).as("not rewrite external resources")
-				.contains("//example.org/style.css")
-				.contains("https://example.org/image.png");
-
-		// Not the same hash as Spring MVC
-		// Hash is computed from links, and not from the linked content
-
-		assertThat(content).as("generate fingerprint")
-				.contains("# Hash: d4437f1d7ae9530ab3ae71d5375b46ff");
-	}
-
-	private Resource getResource(String filePath) {
-		return new ClassPathResource("test/" + filePath, getClass());
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
index 76d90f320bb6..a10055bfa84f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
@@ -85,32 +85,6 @@ public class HandlerMappingIntrospector
 	private Map<HandlerMapping, PathPatternMatchableHandlerMapping> pathPatternHandlerMappings = Collections.emptyMap();
 
 
-	/**
-	 * Constructor for use with {@link ApplicationContextAware}.
-	 */
-	public HandlerMappingIntrospector() {
-	}
-
-	/**
-	 * Constructor that detects the configured {@code HandlerMapping}s in the
-	 * given {@code ApplicationContext} or falls back on
-	 * "DispatcherServlet.properties" like the {@code DispatcherServlet}.
-	 * @deprecated as of 4.3.12, in favor of {@link #setApplicationContext}
-	 */
-	@Deprecated
-	public HandlerMappingIntrospector(ApplicationContext context) {
-		this.handlerMappings = initHandlerMappings(context);
-	}
-
-
-	/**
-	 * Return the configured or detected {@code HandlerMapping}s.
-	 */
-	public List<HandlerMapping> getHandlerMappings() {
-		return (this.handlerMappings != null ? this.handlerMappings : Collections.emptyList());
-	}
-
-
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
@@ -125,6 +99,13 @@ public void afterPropertiesSet() {
 		}
 	}
 
+	/**
+	 * Return the configured or detected {@code HandlerMapping}s.
+	 */
+	public List<HandlerMapping> getHandlerMappings() {
+		return (this.handlerMappings != null ? this.handlerMappings : Collections.emptyList());
+	}
+
 
 	/**
 	 * Find the {@link HandlerMapping} that would handle the given request and
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
index 6f118374a275..93996c9b946e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -108,34 +108,6 @@ public boolean isIgnoreInvalidLocale() {
 		return this.ignoreInvalidLocale;
 	}
 
-	/**
-	 * Specify whether to parse request parameter values as BCP 47 language tags
-	 * instead of Java's legacy locale specification format.
-	 * <p><b>NOTE: As of 5.1, this resolver leniently accepts the legacy
-	 * {@link Locale#toString} format as well as BCP 47 language tags.</b>
-	 * @since 4.3
-	 * @see Locale#forLanguageTag(String)
-	 * @see Locale#toLanguageTag()
-	 * @deprecated as of 5.1 since it only accepts {@code true} now
-	 */
-	@Deprecated
-	public void setLanguageTagCompliant(boolean languageTagCompliant) {
-		if (!languageTagCompliant) {
-			throw new IllegalArgumentException("LocaleChangeInterceptor always accepts BCP 47 language tags");
-		}
-	}
-
-	/**
-	 * Return whether to use BCP 47 language tags instead of Java's legacy
-	 * locale specification format.
-	 * @since 4.3
-	 * @deprecated as of 5.1 since it always returns {@code true} now
-	 */
-	@Deprecated
-	public boolean isLanguageTagCompliant() {
-		return true;
-	}
-
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
deleted file mode 100644
index 4c0d9b4d3bb4..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.resource;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Scanner;
-
-import jakarta.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.io.Resource;
-import org.springframework.lang.Nullable;
-import org.springframework.util.DigestUtils;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * A {@link ResourceTransformer} implementation that helps handling resources
- * within HTML5 AppCache manifests for HTML5 offline applications.
- *
- * <p>This transformer:
- * <ul>
- * <li>modifies links to match the public URL paths that should be exposed to clients,
- * using configured {@code ResourceResolver} strategies
- * <li>appends a comment in the manifest, containing a Hash (e.g. "# Hash: 9de0f09ed7caf84e885f1f0f11c7e326"),
- * thus changing the content of the manifest in order to trigger an appcache reload in the browser.
- * </ul>
- *
- * <p>All files that have the ".appcache" file extension, or the extension given in the constructor,
- * will be transformed by this class. This hash is computed using the content of the appcache manifest
- * and the content of the linked resources; so changing a resource linked in the manifest
- * or the manifest itself should invalidate the browser cache.
- *
- * <p>In order to serve manifest files with the proper {@code "text/manifest"} content type,
- * it is required to configure it with
- * {@code contentNegotiationConfigurer.mediaType("appcache", MediaType.valueOf("text/manifest")}
- * in a {@code WebMvcConfigurer}.
- *
- * @author Brian Clozel
- * @since 4.1
- * @see <a href="https://html.spec.whatwg.org/multipage/browsers.html#offline">HTML5 offline applications spec</a>
- * @deprecated as of 5.3 since browser support is going away
- */
-@Deprecated
-public class AppCacheManifestTransformer extends ResourceTransformerSupport {
-
-	private static final String MANIFEST_HEADER = "CACHE MANIFEST";
-
-	private static final String CACHE_HEADER = "CACHE:";
-
-	private static final Collection<String> MANIFEST_SECTION_HEADERS =
-			Arrays.asList(MANIFEST_HEADER, "NETWORK:", "FALLBACK:", CACHE_HEADER);
-
-	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
-
-	private static final Log logger = LogFactory.getLog(AppCacheManifestTransformer.class);
-
-
-	private final String fileExtension;
-
-
-	/**
-	 * Create an AppCacheResourceTransformer that transforms files with extension ".appcache".
-	 */
-	public AppCacheManifestTransformer() {
-		this("appcache");
-	}
-
-	/**
-	 * Create an AppCacheResourceTransformer that transforms files with the extension
-	 * given as a parameter.
-	 */
-	public AppCacheManifestTransformer(String fileExtension) {
-		this.fileExtension = fileExtension;
-	}
-
-
-	@Override
-	public Resource transform(HttpServletRequest request, Resource resource,
-			ResourceTransformerChain chain) throws IOException {
-
-		resource = chain.transform(request, resource);
-		if (!this.fileExtension.equals(StringUtils.getFilenameExtension(resource.getFilename()))) {
-			return resource;
-		}
-
-		byte[] bytes = FileCopyUtils.copyToByteArray(resource.getInputStream());
-		String content = new String(bytes, DEFAULT_CHARSET);
-
-		if (!content.startsWith(MANIFEST_HEADER)) {
-			if (logger.isTraceEnabled()) {
-				logger.trace("Skipping " + resource + ": Manifest does not start with 'CACHE MANIFEST'");
-			}
-			return resource;
-		}
-
-		@SuppressWarnings("resource")
-		Scanner scanner = new Scanner(content);
-		LineInfo previous = null;
-		LineAggregator aggregator = new LineAggregator(resource, content);
-
-		while (scanner.hasNext()) {
-			String line = scanner.nextLine();
-			LineInfo current = new LineInfo(line, previous);
-			LineOutput lineOutput = processLine(current, request, resource, chain);
-			aggregator.add(lineOutput);
-			previous = current;
-		}
-
-		return aggregator.createResource();
-	}
-
-	private static byte[] getResourceBytes(Resource resource) throws IOException {
-		return FileCopyUtils.copyToByteArray(resource.getInputStream());
-	}
-
-	private LineOutput processLine(LineInfo info, HttpServletRequest request,
-			Resource resource, ResourceTransformerChain transformerChain) {
-
-		if (!info.isLink()) {
-			return new LineOutput(info.getLine(), null);
-		}
-
-		Resource appCacheResource = transformerChain.getResolverChain()
-				.resolveResource(null, info.getLine(), Collections.singletonList(resource));
-
-		String path = info.getLine();
-		String absolutePath = toAbsolutePath(path, request);
-		String newPath = resolveUrlPath(absolutePath, request, resource, transformerChain);
-
-		return new LineOutput((newPath != null ? newPath : path), appCacheResource);
-	}
-
-
-	private static class LineInfo {
-
-		private final String line;
-
-		private final boolean cacheSection;
-
-		private final boolean link;
-
-		public LineInfo(String line, @Nullable LineInfo previous) {
-			this.line = line;
-			this.cacheSection = initCacheSectionFlag(line, previous);
-			this.link = iniLinkFlag(line, this.cacheSection);
-		}
-
-		private static boolean initCacheSectionFlag(String line, @Nullable LineInfo previousLine) {
-			String trimmedLine = line.trim();
-			if (MANIFEST_SECTION_HEADERS.contains(trimmedLine)) {
-				return trimmedLine.equals(CACHE_HEADER);
-			}
-			else if (previousLine != null) {
-				return previousLine.isCacheSection();
-			}
-			throw new IllegalStateException(
-					"Manifest does not start with " + MANIFEST_HEADER + ": " + line);
-		}
-
-		private static boolean iniLinkFlag(String line, boolean isCacheSection) {
-			return (isCacheSection && StringUtils.hasText(line) && !line.startsWith("#")
-					&& !line.startsWith("//") && !hasScheme(line));
-		}
-
-		private static boolean hasScheme(String line) {
-			int index = line.indexOf(':');
-			return (line.startsWith("//") || (index > 0 && !line.substring(0, index).contains("/")));
-		}
-
-		public String getLine() {
-			return this.line;
-		}
-
-		public boolean isCacheSection() {
-			return this.cacheSection;
-		}
-
-		public boolean isLink() {
-			return this.link;
-		}
-	}
-
-
-	private static class LineOutput {
-
-		private final String line;
-
-		@Nullable
-		private final Resource resource;
-
-		public LineOutput(String line, @Nullable Resource resource) {
-			this.line = line;
-			this.resource = resource;
-		}
-
-		public String getLine() {
-			return this.line;
-		}
-
-		@Nullable
-		public Resource getResource() {
-			return this.resource;
-		}
-	}
-
-
-	private static class LineAggregator {
-
-		private final StringWriter writer = new StringWriter();
-
-		private final ByteArrayOutputStream baos;
-
-		private final Resource resource;
-
-		public LineAggregator(Resource resource, String content) {
-			this.resource = resource;
-			this.baos = new ByteArrayOutputStream(content.length());
-		}
-
-		public void add(LineOutput lineOutput) throws IOException {
-			this.writer.write(lineOutput.getLine() + "\n");
-			byte[] bytes = (lineOutput.getResource() != null ?
-					DigestUtils.md5Digest(getResourceBytes(lineOutput.getResource())) :
-					lineOutput.getLine().getBytes(DEFAULT_CHARSET));
-			this.baos.write(bytes);
-		}
-
-		public TransformedResource createResource() {
-			String hash = DigestUtils.md5DigestAsHex(this.baos.toByteArray());
-			this.writer.write("\n" + "# Hash: " + hash);
-			byte[] bytes = this.writer.toString().getBytes(DEFAULT_CHARSET);
-			return new TransformedResource(this.resource, bytes);
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
index 319381462562..26548d8c5f48 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java
@@ -72,8 +72,7 @@ public Resource transform(HttpServletRequest request, Resource resource, Resourc
 
 		String filename = resource.getFilename();
 		if (!"css".equals(StringUtils.getFilenameExtension(filename)) ||
-				resource instanceof EncodedResourceResolver.EncodedResource ||
-				resource instanceof GzipResourceResolver.GzippedResource) {
+				resource instanceof EncodedResourceResolver.EncodedResource) {
 			return resource;
 		}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java
deleted file mode 100644
index e38cea0bf29a..000000000000
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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.
- * 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.web.servlet.resource;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.springframework.core.io.AbstractResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
-
-/**
- * A {@code ResourceResolver} that delegates to the chain to locate a resource
- * and then attempts to find a variation with the ".gz" extension.
- *
- * <p>The resolver gets involved only if the "Accept-Encoding" request header
- * contains the value "gzip" indicating the client accepts gzipped responses.
- *
- * @author Jeremy Grelle
- * @author Rossen Stoyanchev
- * @author Sam Brannen
- * @since 4.1
- * @deprecated as of 5.1, in favor of using {@link EncodedResourceResolver}
- */
-@Deprecated
-public class GzipResourceResolver extends AbstractResourceResolver {
-
-	@Override
-	protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
-			List<? extends Resource> locations, ResourceResolverChain chain) {
-
-		Resource resource = chain.resolveResource(request, requestPath, locations);
-		if (resource == null || (request != null && !isGzipAccepted(request))) {
-			return resource;
-		}
-
-		try {
-			Resource gzipped = new GzippedResource(resource);
-			if (gzipped.exists()) {
-				return gzipped;
-			}
-		}
-		catch (IOException ex) {
-			logger.trace("No gzip resource for [" + resource.getFilename() + "]", ex);
-		}
-
-		return resource;
-	}
-
-	private boolean isGzipAccepted(HttpServletRequest request) {
-		String value = request.getHeader("Accept-Encoding");
-		return (value != null && value.toLowerCase().contains("gzip"));
-	}
-
-	@Override
-	protected String resolveUrlPathInternal(String resourceUrlPath,
-			List<? extends Resource> locations, ResourceResolverChain chain) {
-
-		return chain.resolveUrlPath(resourceUrlPath, locations);
-	}
-
-
-	/**
-	 * A gzipped {@link HttpResource}.
-	 */
-	static final class GzippedResource extends AbstractResource implements HttpResource {
-
-		private final Resource original;
-
-		private final Resource gzipped;
-
-		public GzippedResource(Resource original) throws IOException {
-			this.original = original;
-			this.gzipped = original.createRelative(original.getFilename() + ".gz");
-		}
-
-		@Override
-		public InputStream getInputStream() throws IOException {
-			return this.gzipped.getInputStream();
-		}
-
-		@Override
-		public boolean exists() {
-			return this.gzipped.exists();
-		}
-
-		@Override
-		public boolean isReadable() {
-			return this.gzipped.isReadable();
-		}
-
-		@Override
-		public boolean isOpen() {
-			return this.gzipped.isOpen();
-		}
-
-		@Override
-		public boolean isFile() {
-			return this.gzipped.isFile();
-		}
-
-		@Override
-		public URL getURL() throws IOException {
-			return this.gzipped.getURL();
-		}
-
-		@Override
-		public URI getURI() throws IOException {
-			return this.gzipped.getURI();
-		}
-
-		@Override
-		public File getFile() throws IOException {
-			return this.gzipped.getFile();
-		}
-
-		@Override
-		public long contentLength() throws IOException {
-			return this.gzipped.contentLength();
-		}
-
-		@Override
-		public long lastModified() throws IOException {
-			return this.gzipped.lastModified();
-		}
-
-		@Override
-		public Resource createRelative(String relativePath) throws IOException {
-			return this.gzipped.createRelative(relativePath);
-		}
-
-		@Override
-		@Nullable
-		public String getFilename() {
-			return this.original.getFilename();
-		}
-
-		@Override
-		public String getDescription() {
-			return this.gzipped.getDescription();
-		}
-
-		@Override
-		public HttpHeaders getResponseHeaders() {
-			HttpHeaders headers = (this.original instanceof HttpResource ?
-					((HttpResource) this.original).getResponseHeaders() : new HttpHeaders());
-			headers.add(HttpHeaders.CONTENT_ENCODING, "gzip");
-			headers.add(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING);
-			return headers;
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
index 25913228d9b1..52acc16047d8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
@@ -475,22 +475,6 @@ else if (cacheSeconds == 0) {
 	}
 
 
-	/**
-	 * Check and prepare the given request and response according to the settings
-	 * of this generator.
-	 * @see #checkRequest(HttpServletRequest)
-	 * @see #prepareResponse(HttpServletResponse)
-	 * @deprecated as of 4.2, since the {@code lastModified} flag is effectively ignored,
-	 * with a must-revalidate header only generated if explicitly configured
-	 */
-	@Deprecated
-	protected final void checkAndPrepare(
-			HttpServletRequest request, HttpServletResponse response, boolean lastModified) throws ServletException {
-
-		checkRequest(request);
-		prepareResponse(response);
-	}
-
 	/**
 	 * Check and prepare the given request and response according to the settings
 	 * of this generator.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
index 7178edc4914c..df59805bd7fb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
@@ -23,7 +23,6 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.RequestToViewNameTranslator;
 import org.springframework.web.util.ServletRequestPathUtils;
-import org.springframework.web.util.UrlPathHelper;
 
 /**
  * {@link RequestToViewNameTranslator} that simply transforms the URI of
@@ -122,48 +121,6 @@ public void setStripExtension(boolean stripExtension) {
 		this.stripExtension = stripExtension;
 	}
 
-	/**
-	 * Shortcut to same property on underlying {@link #setUrlPathHelper UrlPathHelper}.
-	 * @see org.springframework.web.util.UrlPathHelper#setAlwaysUseFullPath
-	 * @deprecated as of 5.3, the path is resolved externally and obtained with
-	 * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
-	 */
-	@Deprecated
-	public void setAlwaysUseFullPath(boolean alwaysUseFullPath) {
-	}
-
-	/**
-	 * Shortcut to same property on underlying {@link #setUrlPathHelper UrlPathHelper}.
-	 * @see org.springframework.web.util.UrlPathHelper#setUrlDecode
-	 * @deprecated as of 5.3, the path is resolved externally and obtained with
-	 * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
-	 */
-	@Deprecated
-	public void setUrlDecode(boolean urlDecode) {
-	}
-
-	/**
-	 * Set if ";" (semicolon) content should be stripped from the request URI.
-	 * @see org.springframework.web.util.UrlPathHelper#setRemoveSemicolonContent(boolean)
-	 * @deprecated as of 5.3, the path is resolved externally and obtained with
-	 * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
-	 */
-	@Deprecated
-	public void setRemoveSemicolonContent(boolean removeSemicolonContent) {
-	}
-
-	/**
-	 * Set the {@link org.springframework.web.util.UrlPathHelper} to use for
-	 * the resolution of lookup paths.
-	 * <p>Use this to override the default UrlPathHelper with a custom subclass,
-	 * or to share common UrlPathHelper settings across multiple web components.
-	 * @deprecated as of 5.3, the path is resolved externally and obtained with
-	 * {@link ServletRequestPathUtils#getCachedPathValue(ServletRequest)}
-	 */
-	@Deprecated
-	public void setUrlPathHelper(UrlPathHelper urlPathHelper) {
-	}
-
 
 	/**
 	 * Translates the request URI of the incoming {@link HttpServletRequest}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
index 60406a002623..01b23847faf6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -467,10 +467,9 @@ public void testResourcesWithResolversTransformers() throws Exception {
 		assertThat(locationCharsets.values().iterator().next()).isEqualTo(StandardCharsets.ISO_8859_1);
 
 		List<ResourceTransformer> transformers = handler.getResourceTransformers();
-		assertThat(transformers).hasSize(3);
+		assertThat(transformers).hasSize(2);
 		assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
 		assertThat(transformers.get(1)).isInstanceOf(CssLinkResourceTransformer.class);
-		assertThat(transformers.get(2)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
 
 		CachingResourceTransformer cachingTransformer = (CachingResourceTransformer) transformers.get(0);
 		assertThat(cachingTransformer.getCache()).isInstanceOf(ConcurrentMapCache.class);
@@ -506,9 +505,8 @@ public void testResourcesWithResolversTransformersCustom() throws Exception {
 				.isInstanceOf(ContentVersionStrategy.class);
 
 		List<ResourceTransformer> transformers = handler.getResourceTransformers();
-		assertThat(transformers).hasSize(2);
+		assertThat(transformers).hasSize(1);
 		assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
-		assertThat(transformers.get(1)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
index fccde83979de..7cbedbfd00cd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
@@ -167,14 +167,12 @@ public void resourceChainWithoutCaching() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void resourceChainWithVersionResolver() {
 		VersionResourceResolver versionResolver = new VersionResourceResolver()
 				.addFixedVersionStrategy("fixed", "/**/*.js")
 				.addContentVersionStrategy("/**");
 
-		this.registration.resourceChain(true).addResolver(versionResolver)
-				.addTransformer(new org.springframework.web.servlet.resource.AppCacheManifestTransformer());
+		this.registration.resourceChain(true).addResolver(versionResolver);
 
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
 		List<ResourceResolver> resolvers = handler.getResourceResolvers();
@@ -185,22 +183,18 @@ public void resourceChainWithVersionResolver() {
 		assertThat(resolvers.get(3)).isInstanceOf(PathResourceResolver.class);
 
 		List<ResourceTransformer> transformers = handler.getResourceTransformers();
-		assertThat(transformers).hasSize(3);
+		assertThat(transformers).hasSize(2);
 		assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
 		assertThat(transformers.get(1)).isInstanceOf(CssLinkResourceTransformer.class);
-		assertThat(transformers.get(2)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void resourceChainWithOverrides() {
 		CachingResourceResolver cachingResolver = Mockito.mock(CachingResourceResolver.class);
 		VersionResourceResolver versionResolver = Mockito.mock(VersionResourceResolver.class);
 		WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class);
 		PathResourceResolver pathResourceResolver = new PathResourceResolver();
 		CachingResourceTransformer cachingTransformer = Mockito.mock(CachingResourceTransformer.class);
-		org.springframework.web.servlet.resource.AppCacheManifestTransformer appCacheTransformer =
-				Mockito.mock(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class);
 		CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer();
 
 		this.registration.setCachePeriod(3600)
@@ -210,7 +204,6 @@ public void resourceChainWithOverrides() {
 					.addResolver(webjarsResolver)
 					.addResolver(pathResourceResolver)
 					.addTransformer(cachingTransformer)
-					.addTransformer(appCacheTransformer)
 					.addTransformer(cssLinkTransformer);
 
 		ResourceHttpRequestHandler handler = getHandler("/resources/**");
@@ -222,10 +215,9 @@ public void resourceChainWithOverrides() {
 		assertThat(resolvers.get(3)).isSameAs(pathResourceResolver);
 
 		List<ResourceTransformer> transformers = handler.getResourceTransformers();
-		assertThat(transformers).hasSize(3);
+		assertThat(transformers).hasSize(2);
 		assertThat(transformers.get(0)).isSameAs(cachingTransformer);
-		assertThat(transformers.get(1)).isSameAs(appCacheTransformer);
-		assertThat(transformers.get(2)).isSameAs(cssLinkTransformer);
+		assertThat(transformers.get(1)).isSameAs(cssLinkTransformer);
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
deleted file mode 100644
index 9132e8c23775..000000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
+++ /dev/null
@@ -1,122 +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.web.servlet.resource;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import jakarta.servlet.http.HttpServletRequest;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Unit tests for {@link AppCacheManifestTransformer}.
- *
- * @author Brian Clozel
- * @author Rossen Stoyanchev
- */
-@SuppressWarnings("deprecation")
-public class AppCacheManifestTransformerTests {
-
-	private final AppCacheManifestTransformer transformer = new AppCacheManifestTransformer();
-
-	private ResourceTransformerChain chain;
-
-	private HttpServletRequest request;
-
-
-	@BeforeEach
-	public void setup() {
-		VersionResourceResolver versionResolver = new VersionResourceResolver();
-		versionResolver.setStrategyMap(Collections.singletonMap("/**", new ContentVersionStrategy()));
-		PathResourceResolver pathResolver = new PathResourceResolver();
-		pathResolver.setAllowedLocations(new ClassPathResource("test/", getClass()));
-		List<ResourceResolver> resolvers = new ArrayList<>();
-		resolvers.add(versionResolver);
-		resolvers.add(pathResolver);
-		ResourceResolverChain resolverChain = new DefaultResourceResolverChain(resolvers);
-
-		this.chain = new DefaultResourceTransformerChain(resolverChain, Collections.emptyList());
-		this.transformer.setResourceUrlProvider(createUrlProvider(resolvers));
-	}
-
-	private ResourceUrlProvider createUrlProvider(List<ResourceResolver> resolvers) {
-		ClassPathResource allowedLocation = new ClassPathResource("test/", getClass());
-		ResourceHttpRequestHandler resourceHandler = new ResourceHttpRequestHandler();
-
-		resourceHandler.setResourceResolvers(resolvers);
-		resourceHandler.setLocations(Collections.singletonList(allowedLocation));
-
-		ResourceUrlProvider resourceUrlProvider = new ResourceUrlProvider();
-		resourceUrlProvider.setHandlerMap(Collections.singletonMap("/static/**", resourceHandler));
-		return resourceUrlProvider;
-	}
-
-
-	@Test
-	public void noTransformIfExtensionDoesNotMatch() throws Exception {
-		this.request = new MockHttpServletRequest("GET", "/static/foo.css");
-		Resource resource = getResource("foo.css");
-		Resource result = this.transformer.transform(this.request, resource, this.chain);
-
-		assertThat(result).isEqualTo(resource);
-	}
-
-	@Test
-	public void syntaxErrorInManifest() throws Exception {
-		this.request = new MockHttpServletRequest("GET", "/static/error.appcache");
-		Resource resource = getResource("error.appcache");
-		Resource result = this.transformer.transform(this.request, resource, this.chain);
-
-		assertThat(result).isEqualTo(resource);
-	}
-
-	@Test
-	public void transformManifest() throws Exception {
-		this.request = new MockHttpServletRequest("GET", "/static/test.appcache");
-		Resource resource = getResource("test.appcache");
-		Resource actual = this.transformer.transform(this.request, resource, this.chain);
-
-		byte[] bytes = FileCopyUtils.copyToByteArray(actual.getInputStream());
-		String content = new String(bytes, "UTF-8");
-
-		assertThat(content).as("rewrite resource links")
-				.contains("/static/foo-e36d2e05253c6c7085a91522ce43a0b4.css")
-				.contains("/static/bar-11e16cf79faee7ac698c805cf28248d2.css")
-				.contains("/static/js/bar-bd508c62235b832d960298ca6c0b7645.js");
-
-		assertThat(content).as("not rewrite external resources")
-				.contains("//example.org/style.css")
-				.contains("https://example.org/image.png");
-
-		assertThat(content).as("generate fingerprint")
-				.contains("# Hash: 65ebc023e50b2b731fcace2871f0dae3");
-	}
-
-	private Resource getResource(String filePath) {
-		return new ClassPathResource("test/" + filePath, getClass());
-	}
-
-}
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain-no-auto.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain-no-auto.xml
index d58def13abbf..d6a7870f5d1c 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain-no-auto.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain-no-auto.xml
@@ -22,7 +22,6 @@
 				<bean class="org.springframework.web.servlet.resource.CachingResourceTransformer">
 					<constructor-arg name="cache" ref="resourceCache" />
 				</bean>
-				<bean class="org.springframework.web.servlet.resource.AppCacheManifestTransformer"/>
 			</mvc:transformers>
 		</mvc:resource-chain>
 	</mvc:resources>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain.xml
index 122d520db3df..5ab96045b807 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources-chain.xml
@@ -35,9 +35,6 @@
 					<mvc:content-version-strategy patterns="/**"/>
 				</mvc:version-resolver>
 			</mvc:resolvers>
-			<mvc:transformers>
-				<bean class="org.springframework.web.servlet.resource.AppCacheManifestTransformer"/>
-			</mvc:transformers>
 		</mvc:resource-chain>
 	</mvc:resources>
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java
index cb30c423bbcf..9198a8d5d634 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java
@@ -68,16 +68,6 @@ public WebSocketHttpHeaders(HttpHeaders headers) {
 		this.headers = headers;
 	}
 
-	/**
-	 * Returns {@code WebSocketHttpHeaders} object that can only be read, not written to.
-	 * @deprecated as of 5.1.16, in favor of calling {@link #WebSocketHttpHeaders(HttpHeaders)}
-	 * with a read-only wrapper from {@link HttpHeaders#readOnlyHttpHeaders(HttpHeaders)}
-	 */
-	@Deprecated
-	public static WebSocketHttpHeaders readOnlyWebSocketHttpHeaders(WebSocketHttpHeaders headers) {
-		return new WebSocketHttpHeaders(HttpHeaders.readOnlyHttpHeaders(headers));
-	}
-
 
 	/**
 	 * Sets the (new) value of the {@code Sec-WebSocket-Accept} header.
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
index 1c9fd553eef3..b06c9a800386 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -626,10 +626,6 @@ private RuntimeBeanReference registerUserDestResolver(Element brokerElem,
 		if (brokerElem.hasAttribute("user-destination-prefix")) {
 			beanDef.getPropertyValues().add("userDestinationPrefix", brokerElem.getAttribute("user-destination-prefix"));
 		}
-		if (brokerElem.hasAttribute("path-matcher")) {
-			String pathMatcherRef = brokerElem.getAttribute("path-matcher");
-			beanDef.getPropertyValues().add("pathMatcher", new RuntimeBeanReference(pathMatcherRef));
-		}
 		return new RuntimeBeanReference(registerBeanDef(beanDef, context, source));
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketMessageBrokerConfigurer.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketMessageBrokerConfigurer.java
deleted file mode 100644
index 07ec4f1903c5..000000000000
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketMessageBrokerConfigurer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.
- * 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.web.socket.config.annotation;
-
-import java.util.List;
-
-import org.springframework.messaging.converter.MessageConverter;
-import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver;
-import org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler;
-import org.springframework.messaging.simp.config.ChannelRegistration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-
-/**
- * A convenient abstract base class for {@link WebSocketMessageBrokerConfigurer}
- * implementations providing empty method implementations for optional methods.
- *
- * @author Rossen Stoyanchev
- * @since 4.0.1
- * @deprecated as of 5.0 in favor of simply using {@link WebSocketMessageBrokerConfigurer}
- * which has default methods, made possible by a Java 8 baseline.
- */
-@Deprecated
-public abstract class AbstractWebSocketMessageBrokerConfigurer implements WebSocketMessageBrokerConfigurer {
-
-	@Override
-	public void configureWebSocketTransport(WebSocketTransportRegistration registration) {
-	}
-
-	@Override
-	public void configureClientInboundChannel(ChannelRegistration registration) {
-	}
-
-	@Override
-	public void configureClientOutboundChannel(ChannelRegistration registration) {
-	}
-
-	@Override
-	public boolean configureMessageConverters(List<MessageConverter> messageConverters) {
-		return true;
-	}
-
-	@Override
-	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-	}
-
-	@Override
-	public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
-	}
-
-	@Override
-	public void configureMessageBroker(MessageBrokerRegistry registry) {
-	}
-
-}

From c37d6c30a0ef03aebf536cdf555dbf0e55563ef8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 18 Nov 2021 19:23:28 +0100
Subject: [PATCH 344/735] Fix nullability declarations in
 MergedContextConfiguration

---
 .../test/context/MergedContextConfiguration.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
index 2ae169bd2959..318d9d0f8c2c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
@@ -112,8 +112,8 @@ public class MergedContextConfiguration implements Serializable {
 	 * @param activeProfiles the merged active bean definition profiles
 	 * @param contextLoader the resolved {@code ContextLoader}
 	 */
-	public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
-			String[] activeProfiles, ContextLoader contextLoader) {
+	public MergedContextConfiguration(Class<?> testClass, @Nullable String[] locations, @Nullable Class<?>[] classes,
+			@Nullable String[] activeProfiles, @Nullable ContextLoader contextLoader) {
 
 		this(testClass, locations, classes, null, activeProfiles, contextLoader);
 	}
@@ -128,9 +128,9 @@ public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<
 	 * @param activeProfiles the merged active bean definition profiles
 	 * @param contextLoader the resolved {@code ContextLoader}
 	 */
-	public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
+	public MergedContextConfiguration(Class<?> testClass, @Nullable String[] locations, @Nullable Class<?>[] classes,
 			@Nullable Set<Class<? extends ApplicationContextInitializer<?>>> contextInitializerClasses,
-			String[] activeProfiles, ContextLoader contextLoader) {
+			@Nullable String[] activeProfiles, @Nullable ContextLoader contextLoader) {
 
 		this(testClass, locations, classes, contextInitializerClasses, activeProfiles, contextLoader, null, null);
 	}
@@ -149,9 +149,9 @@ public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<
 	 * @param parent the parent configuration or {@code null} if there is no parent
 	 * @since 3.2.2
 	 */
-	public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
+	public MergedContextConfiguration(Class<?> testClass, @Nullable String[] locations, @Nullable Class<?>[] classes,
 			@Nullable Set<Class<? extends ApplicationContextInitializer<?>>> contextInitializerClasses,
-			String[] activeProfiles, ContextLoader contextLoader,
+			@Nullable String[] activeProfiles, @Nullable ContextLoader contextLoader,
 			@Nullable CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate,
 			@Nullable MergedContextConfiguration parent) {
 
@@ -197,7 +197,7 @@ public MergedContextConfiguration(MergedContextConfiguration mergedConfig) {
 	public MergedContextConfiguration(Class<?> testClass, @Nullable String[] locations, @Nullable Class<?>[] classes,
 			@Nullable Set<Class<? extends ApplicationContextInitializer<?>>> contextInitializerClasses,
 			@Nullable String[] activeProfiles, @Nullable String[] propertySourceLocations,
-			@Nullable String[] propertySourceProperties, ContextLoader contextLoader,
+			@Nullable String[] propertySourceProperties, @Nullable ContextLoader contextLoader,
 			@Nullable CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate,
 			@Nullable MergedContextConfiguration parent) {
 
@@ -235,7 +235,7 @@ public MergedContextConfiguration(Class<?> testClass, @Nullable String[] locatio
 			@Nullable Set<Class<? extends ApplicationContextInitializer<?>>> contextInitializerClasses,
 			@Nullable String[] activeProfiles, @Nullable String[] propertySourceLocations,
 			@Nullable String[] propertySourceProperties, @Nullable Set<ContextCustomizer> contextCustomizers,
-			ContextLoader contextLoader, @Nullable CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate,
+			@Nullable ContextLoader contextLoader, @Nullable CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate,
 			@Nullable MergedContextConfiguration parent) {
 
 		this.testClass = testClass;

From 722ab25f27ed096e04e0aedc93602d2e104c1de4 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Fri, 19 Nov 2021 12:37:00 +0100
Subject: [PATCH 345/735] Support empty file names in
 UriUtils::extractFileExtension

Closes gh-27639
---
 .../src/main/java/org/springframework/web/util/UriUtils.java    | 2 +-
 .../test/java/org/springframework/web/util/UriUtilsTests.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
index a67be402e567..d6653c24f148 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
@@ -407,7 +407,7 @@ public static String extractFileExtension(String path) {
 		int paramIndex = path.indexOf(';', begin);
 		end = (paramIndex != -1 && paramIndex < end ? paramIndex : end);
 		int extIndex = path.lastIndexOf('.', end);
-		if (extIndex != -1 && extIndex > begin) {
+		if (extIndex != -1 && extIndex >= begin) {
 			return path.substring(extIndex + 1, end);
 		}
 		return null;
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
index 019107a535c4..f9dae3a38362 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
@@ -133,6 +133,7 @@ public void extractFileExtension() {
 		assertThat(UriUtils.extractFileExtension("/products;q=11/view.html?param=/path/a.do")).isEqualTo("html");
 		assertThat(UriUtils.extractFileExtension("/products;q=11/view.html;r=22?param=/path/a.do")).isEqualTo("html");
 		assertThat(UriUtils.extractFileExtension("/products;q=11/view.html;r=22;s=33?param=/path/a.do")).isEqualTo("html");
+		assertThat(UriUtils.extractFileExtension("/products/.html")).isEqualTo("html");
 	}
 
 }

From dfd5374f024d844e8f9d5a2082692c2ec2b5a3a9 Mon Sep 17 00:00:00 2001
From: Jerome Prinet <jprinet@gradle.com>
Date: Fri, 19 Nov 2021 14:36:27 +0100
Subject: [PATCH 346/735] Upgrade Gradle enterprise plugin to 3.7.2

Closes gh-27704
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 811aa851d64e..0f97d1fcaa87 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.6.1"
+	id "com.gradle.enterprise" version "3.7.2"
 	id "io.spring.ge.conventions" version "0.0.7"
 }
 

From b4b3c2ead681520509cc0b03a598e2ec566b78e8 Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Fri, 19 Nov 2021 08:58:58 +0800
Subject: [PATCH 347/735] Fix typo

See gh-27699
---
 src/docs/asciidoc/data-access.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index edf4ccbe5636..55d6be79646d 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -6788,20 +6788,20 @@ You can take control over result mapping by supplying a `Function<Row, T>` that
 called for each `Row` so it can can return arbitrary values (singular values,
 collections and maps, and objects).
 
-The following example extracts the `id` column and emits its value:
+The following example extracts the `name` column and emits its value:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	Flux<String> names = client.sql("SELECT name FROM person")
-	        .map(row -> row.get("id", String.class))
+	        .map(row -> row.get("name", String.class))
 	        .all();
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	val names = client.sql("SELECT name FROM person")
-	        .map{ row: Row -> row.get("id", String.class) }
+	        .map{ row: Row -> row.get("name", String.class) }
 	        .flow()
 ----
 

From 767299c6dd607c7d540310fb9db9832ebaff659c Mon Sep 17 00:00:00 2001
From: Thomas Darimont <tdarimont@pivotal.io>
Date: Thu, 2 Apr 2015 13:52:49 +0200
Subject: [PATCH 348/735] Document @Bean definitions via default methods

See gh-767

Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
---
 src/docs/asciidoc/core/core-beans.adoc | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 8d701befcbcc..22cdf42ce530 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -7953,6 +7953,26 @@ following text image shows:
 transferService -> com.acme.TransferServiceImpl
 ----
 
+You can also use default methods to define beans. This allows composition of bean
+configurations by implementing interfaces with bean definitions on default methods.
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+	public interface BaseConfig {
+
+		@Bean
+		default TransferServiceImpl transferService() {
+			return new TransferServiceImpl();
+		}
+	}
+
+	@Configuration
+	public class AppConfig implements BaseConfig {
+
+	}
+----
+
 You can also declare your `@Bean` method with an interface (or base class)
 return type, as the following example shows:
 

From ca4f338d75dbdda3db1c4068c2718ebd8b04f9f3 Mon Sep 17 00:00:00 2001
From: awgtek <adamwg@hotmail.com>
Date: Fri, 11 Mar 2016 10:35:31 -0600
Subject: [PATCH 349/735] Refine StoredProcedure#declareParameter Javadoc

See gh-1000
---
 .../java/org/springframework/jdbc/object/StoredProcedure.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
index d6a24e5d8b07..03677ae44561 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
@@ -87,6 +87,8 @@ protected boolean allowsUnusedParameters() {
 	 * they appear in the database's stored procedure parameter list.</b>
 	 * <p>Names are purely used to help mapping.
 	 * @param param the parameter object
+	 * @throws InvalidDataAccessApiUsageException if the parameter has no name; or if the operation is
+	 * already compiled, and hence cannot be configured further
 	 */
 	@Override
 	public void declareParameter(SqlParameter param) throws InvalidDataAccessApiUsageException {

From 544f35766119b2541963dae796365db2f7527fda Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 22 Nov 2021 13:20:16 +0100
Subject: [PATCH 350/735] Polish "Refine StoredProcedure#declareParameter
 Javadoc"

See gh-1000
---
 .../org/springframework/jdbc/object/StoredProcedure.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
index 03677ae44561..f740eb4b792f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,8 +87,8 @@ protected boolean allowsUnusedParameters() {
 	 * they appear in the database's stored procedure parameter list.</b>
 	 * <p>Names are purely used to help mapping.
 	 * @param param the parameter object
-	 * @throws InvalidDataAccessApiUsageException if the parameter has no name; or if the operation is
-	 * already compiled, and hence cannot be configured further
+	 * @throws InvalidDataAccessApiUsageException if the parameter has no name, or if the
+	 * operation is already compiled, and hence cannot be configured further
 	 */
 	@Override
 	public void declareParameter(SqlParameter param) throws InvalidDataAccessApiUsageException {

From d930617442fcf049bba952c21e0a5212eac124bc Mon Sep 17 00:00:00 2001
From: Julien Eyraud <julien.eyraud@sigfox.com>
Date: Wed, 7 Aug 2019 21:40:44 +0200
Subject: [PATCH 351/735] JDK HttpClient connector for WebClient

See gh-21014
---
 .../reactive/JdkClientHttpConnector.java      |  64 +++++++
 .../client/reactive/JdkClientHttpRequest.java | 157 ++++++++++++++++++
 .../reactive/JdkClientHttpResponse.java       | 107 ++++++++++++
 .../client/WebClientIntegrationTests.java     |   4 +-
 .../annotation/SseIntegrationTests.java       |   7 +-
 src/docs/asciidoc/web/webflux-webclient.adoc  |  50 +++++-
 6 files changed, 381 insertions(+), 8 deletions(-)
 create mode 100644 spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
 create mode 100644 spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
 create mode 100644 spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
new file mode 100644
index 000000000000..1cc8e13be93e
--- /dev/null
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ * 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.http.client.reactive;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.util.function.Function;
+
+import reactor.core.publisher.Mono;
+
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+import org.springframework.http.HttpMethod;
+
+/**
+ * {@link ClientHttpConnector} for the Java 11 HTTP client.
+ *
+ * @author Julien Eyraud
+ * @since 5.2
+ * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">Java HttpClient</a>
+ */
+public class JdkClientHttpConnector implements ClientHttpConnector {
+
+	private final HttpClient httpClient;
+
+	private final DataBufferFactory dataBufferFactory;
+
+
+	/**
+	 * Default constructor that creates a new instance of {@link HttpClient} and a {@link DataBufferFactory}.
+	 */
+	public JdkClientHttpConnector() {
+		this(HttpClient.newHttpClient(), new DefaultDataBufferFactory());
+	}
+
+	/**
+	 * Constructor with an initialized {@link HttpClient} and a initialized {@link DataBufferFactory}.
+	 */
+	public JdkClientHttpConnector(final HttpClient httpClient, final DataBufferFactory dataBufferFactory) {
+		this.httpClient = httpClient;
+		this.dataBufferFactory = dataBufferFactory;
+	}
+
+	@Override
+	public Mono<ClientHttpResponse> connect(final HttpMethod method, final URI uri, final Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
+		final JdkClientHttpRequest request = new JdkClientHttpRequest(this.httpClient, method, uri, this.dataBufferFactory);
+		return requestCallback.apply(request).then(Mono.defer(request::getResponse));
+	}
+
+}
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
new file mode 100644
index 000000000000..567e88827795
--- /dev/null
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
@@ -0,0 +1,157 @@
+/*
+ * 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.
+ * 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.http.client.reactive;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Flow;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.reactivestreams.Publisher;
+import reactor.adapter.JdkFlowAdapter;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.util.Assert;
+
+/**
+ * {@link ClientHttpRequest} implementation for the Java 11 HTTP client.
+ *
+ * @author Julien Eyraud
+ * @since 5.2
+ * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">Java HttpClient</a>
+ */
+class JdkClientHttpRequest extends AbstractClientHttpRequest {
+
+	private static final Set<String> DISALLOWED_HEADERS = Set.of("connection", "content-length", "date", "expect", "from", "host", "upgrade", "via", "warning");
+
+	private final HttpClient httpClient;
+
+	private final HttpMethod method;
+
+	private final URI uri;
+
+	private final HttpRequest.Builder builder;
+
+	private final DataBufferFactory bufferFactory;
+
+	private Mono<ClientHttpResponse> response;
+
+
+	public JdkClientHttpRequest(final HttpClient httpClient, final HttpMethod httpMethod, final URI uri, final DataBufferFactory bufferFactory) {
+		Assert.notNull(httpClient, "HttpClient should not be null");
+		Assert.notNull(httpMethod, "HttpMethod should not be null");
+		Assert.notNull(uri, "URI should not be null");
+		Assert.notNull(bufferFactory, "DataBufferFactory should not be null");
+		this.httpClient = httpClient;
+		this.method = httpMethod;
+		this.uri = uri;
+		this.builder = HttpRequest.newBuilder(uri);
+		this.bufferFactory = bufferFactory;
+	}
+
+	@Override
+	protected void applyHeaders() {
+		HttpHeaders headers = getHeaders();
+		for (Map.Entry<String, List<String>> header : getHeaders().entrySet()) {
+			if (!DISALLOWED_HEADERS.contains(header.getKey().toLowerCase())) {
+				for (String value : header.getValue()) {
+					this.builder.header(header.getKey(), value);
+				}
+			}
+		}
+		if (!headers.containsKey(HttpHeaders.ACCEPT)) {
+			this.builder.header(HttpHeaders.ACCEPT, "*/*");
+		}
+	}
+
+	@Override
+	protected void applyCookies() {
+		final String cookies = getCookies().values().stream().flatMap(List::stream).map(c -> c.getName() + "=" + c.getValue()).collect(Collectors.joining("; "));
+		this.builder.header(HttpHeaders.COOKIE, cookies);
+	}
+
+	@Override
+	public HttpMethod getMethod() {
+		return this.method;
+	}
+
+	@Override
+	public URI getURI() {
+		return this.uri;
+	}
+
+	@Override
+	public DataBufferFactory bufferFactory() {
+		return this.bufferFactory;
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> T getNativeRequest() {
+		return (T) this.builder.build();
+	}
+
+	@Override
+	public Mono<Void> writeWith(final Publisher<? extends DataBuffer> body) {
+		return doCommit(() -> {
+			final Flow.Publisher<ByteBuffer> flowAdapter = JdkFlowAdapter.publisherToFlowPublisher(Flux.from(body).map(DataBuffer::asByteBuffer));
+			final long contentLength = getHeaders().getContentLength();
+			final HttpRequest.BodyPublisher bodyPublisher = contentLength >= 0 ? HttpRequest.BodyPublishers.fromPublisher(flowAdapter, contentLength)
+					: HttpRequest.BodyPublishers.fromPublisher(flowAdapter);
+			this.response = Mono
+					.fromCompletionStage(() -> this.httpClient.sendAsync(this.builder.method(this.method.name(), bodyPublisher).build(), HttpResponse.BodyHandlers.ofPublisher()))
+					.map(r -> new JdkClientHttpResponse(r, this.bufferFactory));
+			return Mono.empty();
+		});
+	}
+
+	@Override
+	public Mono<Void> writeAndFlushWith(final Publisher<? extends Publisher<? extends DataBuffer>> body) {
+		return writeWith(Flux.from(body).flatMap(Function.identity()));
+	}
+
+	@Override
+	public Mono<Void> setComplete() {
+		if (isCommitted()) {
+			return Mono.empty();
+		}
+		else {
+			return doCommit(() -> {
+				this.response = Mono
+						.fromCompletionStage(() -> this.httpClient.sendAsync(this.builder.method(this.method.name(), HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.ofPublisher()))
+						.map(r -> new JdkClientHttpResponse(r, this.bufferFactory));
+				return Mono.empty();
+			});
+		}
+	}
+
+	public Mono<ClientHttpResponse> getResponse() {
+		return this.response;
+	}
+}
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
new file mode 100644
index 000000000000..a705be046b55
--- /dev/null
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ * 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.http.client.reactive;
+
+import java.net.HttpCookie;
+import java.net.http.HttpResponse;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.Flow;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import reactor.adapter.JdkFlowAdapter;
+import reactor.core.publisher.Flux;
+
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseCookie;
+import org.springframework.lang.Nullable;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+/**
+ * {@link ClientHttpResponse} implementation for the Java 11 HTTP client.
+ *
+ * @author Julien Eyraud
+ * @since 5.2
+ * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">Java HttpClient</a>
+ */
+class JdkClientHttpResponse implements ClientHttpResponse {
+	private static final Pattern SAMESITE_PATTERN = Pattern.compile("(?i).*SameSite=(Strict|Lax|None).*");
+
+	private final HttpResponse<Flow.Publisher<List<ByteBuffer>>> response;
+
+	private final DataBufferFactory bufferFactory;
+
+
+	public JdkClientHttpResponse(final HttpResponse<Flow.Publisher<List<ByteBuffer>>> response, final DataBufferFactory bufferFactory) {
+		this.response = response;
+		this.bufferFactory = bufferFactory;
+	}
+
+	@Nullable
+	private static String parseSameSite(String headerValue) {
+		Matcher matcher = SAMESITE_PATTERN.matcher(headerValue);
+		return (matcher.matches() ? matcher.group(1) : null);
+	}
+
+	@Override
+	public HttpStatus getStatusCode() {
+		return HttpStatus.resolve(this.response.statusCode());
+	}
+
+	@Override
+	public int getRawStatusCode() {
+		return this.response.statusCode();
+	}
+
+	@Override
+	public MultiValueMap<String, ResponseCookie> getCookies() {
+		return this.response.headers().allValues(HttpHeaders.SET_COOKIE).stream()
+				.flatMap(header ->
+						HttpCookie.parse(header).stream().map(httpCookie ->
+								ResponseCookie
+										.from(httpCookie.getName(), httpCookie.getValue())
+										.domain(httpCookie.getDomain())
+										.httpOnly(httpCookie.isHttpOnly())
+										.maxAge(httpCookie.getMaxAge())
+										.path(httpCookie.getPath())
+										.secure(httpCookie.getSecure())
+										.sameSite(parseSameSite(header))
+										.build()
+						)
+				).collect(LinkedMultiValueMap::new, (m, v) -> m.add(v.getName(), v), LinkedMultiValueMap::addAll);
+	}
+
+	@Override
+	public Flux<DataBuffer> getBody() {
+		return JdkFlowAdapter
+				.flowPublisherToFlux(this.response.body())
+				.flatMap(Flux::fromIterable)
+				.map(this.bufferFactory::wrap)
+				.doOnDiscard(DataBuffer.class, DataBufferUtils::release);
+	}
+
+	@Override
+	public HttpHeaders getHeaders() {
+		return this.response.headers().map().entrySet().stream().collect(HttpHeaders::new, (headers, entry) -> headers.addAll(entry.getKey(), entry.getValue()), HttpHeaders::addAll);
+	}
+}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index e7fa002ff51b..11cc814a2d85 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -67,6 +67,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.reactive.ClientHttpConnector;
 import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
+import org.springframework.http.client.reactive.JdkClientHttpConnector;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.util.SocketUtils;
@@ -99,7 +100,8 @@ static Stream<ClientHttpConnector> arguments() {
 		return Stream.of(
 				new ReactorClientHttpConnector(),
 				new JettyClientHttpConnector(),
-				new HttpComponentsClientHttpConnector()
+				new HttpComponentsClientHttpConnector(),
+				new JdkClientHttpConnector()
 		);
 	}
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
index 7cc9a20e0c08..daf092d1e37a 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
@@ -36,6 +36,7 @@
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.client.reactive.ClientHttpConnector;
 import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
+import org.springframework.http.client.reactive.JdkClientHttpConnector;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.http.codec.ServerSentEvent;
@@ -76,15 +77,19 @@ static Object[][] arguments() {
 			{new JettyHttpServer(), new ReactorClientHttpConnector()},
 			{new JettyHttpServer(), new JettyClientHttpConnector()},
 			{new JettyHttpServer(), new HttpComponentsClientHttpConnector()},
+			{new JettyHttpServer(), new JdkClientHttpConnector()},
 			{new ReactorHttpServer(), new ReactorClientHttpConnector()},
 			{new ReactorHttpServer(), new JettyClientHttpConnector()},
 			{new ReactorHttpServer(), new HttpComponentsClientHttpConnector()},
+			{new ReactorHttpServer(), new JdkClientHttpConnector()},
 			{new TomcatHttpServer(), new ReactorClientHttpConnector()},
 			{new TomcatHttpServer(), new JettyClientHttpConnector()},
 			{new TomcatHttpServer(), new HttpComponentsClientHttpConnector()},
+			{new TomcatHttpServer(), new JdkClientHttpConnector()},
 			{new UndertowHttpServer(), new ReactorClientHttpConnector()},
 			{new UndertowHttpServer(), new JettyClientHttpConnector()},
-			{new UndertowHttpServer(), new HttpComponentsClientHttpConnector()}
+			{new UndertowHttpServer(), new HttpComponentsClientHttpConnector()},
+			{new UndertowHttpServer(), new JdkClientHttpConnector()},
 		};
 	}
 
diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index 3099ecb02d26..c9c725a38e67 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -14,6 +14,7 @@ support for the following:
 * https://github.com/reactor/reactor-netty[Reactor Netty]
 * https://github.com/jetty-project/jetty-reactive-httpclient[Jetty Reactive HttpClient]
 * https://hc.apache.org/index.html[Apache HttpComponents]
+* https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html[JDK HttpClient]
 * Others can be plugged via `ClientHttpConnector`.
 
 
@@ -382,7 +383,7 @@ shows:
 
 		HttpClient httpClient = new HttpClient();
 		// Further customizations...
-		
+
 		ClientHttpConnector connector =
 				new JettyClientHttpConnector(httpClient, resourceFactory()); <1>
 
@@ -403,7 +404,7 @@ shows:
 
 		val httpClient = HttpClient()
 		// Further customizations...
-			
+
 		val connector = JettyClientHttpConnector(httpClient, resourceFactory()) // <1>
 
 		return WebClient.builder().clientConnector(connector).build() // <2>
@@ -439,6 +440,43 @@ The following example shows how to customize Apache HttpComponents `HttpClient`
 	val webClient = WebClient.builder().clientConnector(connector).build()
 ----
 
+[[webflux-client-builder-jdk-httpclient]]
+=== JDK
+The following example shows how to customize JDK `HttpClient` settings:
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+	@Bean
+	public WebClient webClient() {
+		HttpClient httpClient = HttpClient.newBuilder()
+			.executor(...)
+			.connectTimeout(...)
+			.build();
+		ClientHttpConnector connector =
+				new JdkClientHttpConnector(httpClient, new DefaultDataBufferFactory()); // <1>
+
+		return WebClient webClient = WebClient.builder().clientConnector(connector).build(); // <2>
+	}
+----
+<1> Use the `JdkClientHttpConnector` constructor with customized `HttpClient` instance.
+<2> Plug the connector into the `WebClient.Builder`.
+
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	@Bean
+	fun webClient() : WebClient {
+		val httpClient = HttpClient.newBuilder()
+			.executor(...)
+			.connectTimeout(...)
+			.build()
+		val connector = JdkClientHttpConnector(httpClient, DefaultDataBufferFactory()) // <1>
+
+		return WebClient webClient = WebClient.builder()
+				.clientConnector(connector).build() // <2>
+	}
+----
 
 [[webflux-client-retrieve]]
 == `retrieve()`
@@ -761,9 +799,9 @@ multipart request. The following example shows how to create a `MultiValueMap<St
 		part("fieldPart", "fieldValue")
 		part("filePart1", new FileSystemResource("...logo.png"))
 		part("jsonPart", new Person("Jason"))
-		part("myPart", part) // Part from a server request	
+		part("myPart", part) // Part from a server request
 	}
-	
+
 	val parts = builder.build()
 ----
 
@@ -1063,7 +1101,7 @@ apply to all operations. For example:
 		client.get().uri("/person/{id}", i).retrieve()
 				.awaitBody<Person>()
 	}
-	
+
 	val persons = runBlocking {
 		client.get().uri("/persons").retrieve()
 				.bodyToFlow<Person>()
@@ -1118,7 +1156,7 @@ inter-dependent, without ever blocking until the end.
 With `Flux` or `Mono`, you should never have to block in a Spring MVC or Spring WebFlux controller.
 Simply return the resulting reactive type from the controller method. The same principle apply to
 Kotlin Coroutines and Spring WebFlux, just use suspending function or return `Flow` in your
-controller method . 
+controller method .
 ====
 
 

From dcc71546410c8bafcacb3230ba660f9cb94d4455 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 18 Nov 2021 07:28:59 +0000
Subject: [PATCH 352/735] Polishing contribution

See gh-23432
---
 .../reactive/JdkClientHttpConnector.java      |  25 ++--
 .../client/reactive/JdkClientHttpRequest.java | 112 +++++++++++-------
 .../reactive/JdkClientHttpResponse.java       |  69 ++++++-----
 .../client/WebClientIntegrationTests.java     |   2 +-
 .../annotation/SseIntegrationTests.java       |   2 +-
 src/docs/asciidoc/web/webflux-webclient.adoc  |  74 ++++++------
 6 files changed, 158 insertions(+), 126 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
index 1cc8e13be93e..3fcf28194857 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,37 +27,40 @@
 import org.springframework.http.HttpMethod;
 
 /**
- * {@link ClientHttpConnector} for the Java 11 HTTP client.
+ * {@link ClientHttpConnector} for Java's {@link HttpClient}.
  *
  * @author Julien Eyraud
- * @since 5.2
- * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">Java HttpClient</a>
+ * @since 6.0
+ * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">HttpClient</a>
  */
 public class JdkClientHttpConnector implements ClientHttpConnector {
 
 	private final HttpClient httpClient;
 
-	private final DataBufferFactory dataBufferFactory;
+	private final DataBufferFactory bufferFactory;
 
 
 	/**
-	 * Default constructor that creates a new instance of {@link HttpClient} and a {@link DataBufferFactory}.
+	 * Default constructor that uses {@link HttpClient#newHttpClient()}.
 	 */
 	public JdkClientHttpConnector() {
 		this(HttpClient.newHttpClient(), new DefaultDataBufferFactory());
 	}
 
 	/**
-	 * Constructor with an initialized {@link HttpClient} and a initialized {@link DataBufferFactory}.
+	 * Constructor with an initialized {@link HttpClient} and a {@link DataBufferFactory}.
 	 */
-	public JdkClientHttpConnector(final HttpClient httpClient, final DataBufferFactory dataBufferFactory) {
+	public JdkClientHttpConnector(HttpClient httpClient, DataBufferFactory bufferFactory) {
 		this.httpClient = httpClient;
-		this.dataBufferFactory = dataBufferFactory;
+		this.bufferFactory = bufferFactory;
 	}
 
+
 	@Override
-	public Mono<ClientHttpResponse> connect(final HttpMethod method, final URI uri, final Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
-		final JdkClientHttpRequest request = new JdkClientHttpRequest(this.httpClient, method, uri, this.dataBufferFactory);
+	public Mono<ClientHttpResponse> connect(
+			HttpMethod method, URI uri, Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
+
+		JdkClientHttpRequest request = new JdkClientHttpRequest(this.httpClient, method, uri, this.bufferFactory);
 		return requestCallback.apply(request).then(Mono.defer(request::getResponse));
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
index 567e88827795..f514915230ff 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,18 +37,20 @@
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * {@link ClientHttpRequest} implementation for the Java 11 HTTP client.
+ * {@link ClientHttpRequest} implementation for Java's {@link HttpClient}.
  *
  * @author Julien Eyraud
- * @since 5.2
- * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">Java HttpClient</a>
+ * @since 6.0
  */
 class JdkClientHttpRequest extends AbstractClientHttpRequest {
 
-	private static final Set<String> DISALLOWED_HEADERS = Set.of("connection", "content-length", "date", "expect", "from", "host", "upgrade", "via", "warning");
+	private static final Set<String> DISALLOWED_HEADERS =
+			Set.of("connection", "content-length", "date", "expect", "from", "host", "upgrade", "via", "warning");
+
 
 	private final HttpClient httpClient;
 
@@ -60,14 +62,18 @@ class JdkClientHttpRequest extends AbstractClientHttpRequest {
 
 	private final DataBufferFactory bufferFactory;
 
+	@Nullable
 	private Mono<ClientHttpResponse> response;
 
 
-	public JdkClientHttpRequest(final HttpClient httpClient, final HttpMethod httpMethod, final URI uri, final DataBufferFactory bufferFactory) {
+	public JdkClientHttpRequest(
+			HttpClient httpClient, HttpMethod httpMethod, URI uri, DataBufferFactory bufferFactory) {
+
 		Assert.notNull(httpClient, "HttpClient should not be null");
 		Assert.notNull(httpMethod, "HttpMethod should not be null");
 		Assert.notNull(uri, "URI should not be null");
 		Assert.notNull(bufferFactory, "DataBufferFactory should not be null");
+
 		this.httpClient = httpClient;
 		this.method = httpMethod;
 		this.uri = uri;
@@ -75,26 +81,6 @@ public JdkClientHttpRequest(final HttpClient httpClient, final HttpMethod httpMe
 		this.bufferFactory = bufferFactory;
 	}
 
-	@Override
-	protected void applyHeaders() {
-		HttpHeaders headers = getHeaders();
-		for (Map.Entry<String, List<String>> header : getHeaders().entrySet()) {
-			if (!DISALLOWED_HEADERS.contains(header.getKey().toLowerCase())) {
-				for (String value : header.getValue()) {
-					this.builder.header(header.getKey(), value);
-				}
-			}
-		}
-		if (!headers.containsKey(HttpHeaders.ACCEPT)) {
-			this.builder.header(HttpHeaders.ACCEPT, "*/*");
-		}
-	}
-
-	@Override
-	protected void applyCookies() {
-		final String cookies = getCookies().values().stream().flatMap(List::stream).map(c -> c.getName() + "=" + c.getValue()).collect(Collectors.joining("; "));
-		this.builder.header(HttpHeaders.COOKIE, cookies);
-	}
 
 	@Override
 	public HttpMethod getMethod() {
@@ -117,16 +103,52 @@ public <T> T getNativeRequest() {
 		return (T) this.builder.build();
 	}
 
+	Mono<ClientHttpResponse> getResponse() {
+		Assert.notNull(this.response, "Response is not set");
+		return this.response;
+	}
+
+
+	@Override
+	protected void applyHeaders() {
+		for (Map.Entry<String, List<String>> header : getHeaders().entrySet()) {
+			if (DISALLOWED_HEADERS.contains(header.getKey().toLowerCase())) {
+				continue;
+			}
+			for (String value : header.getValue()) {
+				this.builder.header(header.getKey(), value);
+			}
+		}
+		if (!getHeaders().containsKey(HttpHeaders.ACCEPT)) {
+			this.builder.header(HttpHeaders.ACCEPT, "*/*");
+		}
+	}
+
+	@Override
+	protected void applyCookies() {
+		this.builder.header(HttpHeaders.COOKIE,
+				getCookies().values().stream()
+						.flatMap(List::stream)
+						.map(cookie -> cookie.getName() + "=" + cookie.getValue())
+						.collect(Collectors.joining("; ")));
+	}
+
 	@Override
-	public Mono<Void> writeWith(final Publisher<? extends DataBuffer> body) {
+	public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
 		return doCommit(() -> {
-			final Flow.Publisher<ByteBuffer> flowAdapter = JdkFlowAdapter.publisherToFlowPublisher(Flux.from(body).map(DataBuffer::asByteBuffer));
-			final long contentLength = getHeaders().getContentLength();
-			final HttpRequest.BodyPublisher bodyPublisher = contentLength >= 0 ? HttpRequest.BodyPublishers.fromPublisher(flowAdapter, contentLength)
-					: HttpRequest.BodyPublishers.fromPublisher(flowAdapter);
-			this.response = Mono
-					.fromCompletionStage(() -> this.httpClient.sendAsync(this.builder.method(this.method.name(), bodyPublisher).build(), HttpResponse.BodyHandlers.ofPublisher()))
-					.map(r -> new JdkClientHttpResponse(r, this.bufferFactory));
+			Flow.Publisher<ByteBuffer> flow =
+					JdkFlowAdapter.publisherToFlowPublisher(Flux.from(body).map(DataBuffer::asByteBuffer));
+
+			HttpRequest.BodyPublisher bodyPublisher = (getHeaders().getContentLength() >= 0 ?
+					HttpRequest.BodyPublishers.fromPublisher(flow, getHeaders().getContentLength()) :
+					HttpRequest.BodyPublishers.fromPublisher(flow));
+
+			this.response = Mono.fromCompletionStage(() -> {
+						HttpRequest request = this.builder.method(this.method.name(), bodyPublisher).build();
+						return this.httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofPublisher());
+					})
+					.map(response -> new JdkClientHttpResponse(response, this.bufferFactory));
+
 			return Mono.empty();
 		});
 	}
@@ -141,17 +163,17 @@ public Mono<Void> setComplete() {
 		if (isCommitted()) {
 			return Mono.empty();
 		}
-		else {
-			return doCommit(() -> {
-				this.response = Mono
-						.fromCompletionStage(() -> this.httpClient.sendAsync(this.builder.method(this.method.name(), HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.ofPublisher()))
-						.map(r -> new JdkClientHttpResponse(r, this.bufferFactory));
-				return Mono.empty();
-			});
-		}
-	}
 
-	public Mono<ClientHttpResponse> getResponse() {
-		return this.response;
+		return doCommit(() -> {
+			this.response = Mono.fromCompletionStage(() -> {
+						HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.noBody();
+						HttpRequest request = this.builder.method(this.method.name(), bodyPublisher).build();
+						return this.httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofPublisher());
+					})
+					.map(response -> new JdkClientHttpResponse(response, this.bufferFactory));
+
+			return Mono.empty();
+		});
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
index a705be046b55..c00308e4e439 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,12 @@
 package org.springframework.http.client.reactive;
 
 import java.net.HttpCookie;
+import java.net.http.HttpClient;
 import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.concurrent.Flow;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -38,34 +40,32 @@
 import org.springframework.util.MultiValueMap;
 
 /**
- * {@link ClientHttpResponse} implementation for the Java 11 HTTP client.
+ * {@link ClientHttpResponse} implementation for Java's {@link HttpClient}.
  *
  * @author Julien Eyraud
- * @since 5.2
- * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">Java HttpClient</a>
+ * @since 6.0
  */
 class JdkClientHttpResponse implements ClientHttpResponse {
-	private static final Pattern SAMESITE_PATTERN = Pattern.compile("(?i).*SameSite=(Strict|Lax|None).*");
+
+	private static final Pattern SAME_SITE_PATTERN = Pattern.compile("(?i).*SameSite=(Strict|Lax|None).*");
+
 
 	private final HttpResponse<Flow.Publisher<List<ByteBuffer>>> response;
 
 	private final DataBufferFactory bufferFactory;
 
 
-	public JdkClientHttpResponse(final HttpResponse<Flow.Publisher<List<ByteBuffer>>> response, final DataBufferFactory bufferFactory) {
+	public JdkClientHttpResponse(
+			HttpResponse<Flow.Publisher<List<ByteBuffer>>> response, DataBufferFactory bufferFactory) {
+
 		this.response = response;
 		this.bufferFactory = bufferFactory;
 	}
 
-	@Nullable
-	private static String parseSameSite(String headerValue) {
-		Matcher matcher = SAMESITE_PATTERN.matcher(headerValue);
-		return (matcher.matches() ? matcher.group(1) : null);
-	}
 
 	@Override
 	public HttpStatus getStatusCode() {
-		return HttpStatus.resolve(this.response.statusCode());
+		return HttpStatus.valueOf(this.response.statusCode());
 	}
 
 	@Override
@@ -73,35 +73,44 @@ public int getRawStatusCode() {
 		return this.response.statusCode();
 	}
 
+	@Override
+	public HttpHeaders getHeaders() {
+		return this.response.headers().map().entrySet().stream()
+				.collect(HttpHeaders::new,
+						(headers, entry) -> headers.addAll(entry.getKey(), entry.getValue()),
+						HttpHeaders::addAll);
+	}
+
 	@Override
 	public MultiValueMap<String, ResponseCookie> getCookies() {
 		return this.response.headers().allValues(HttpHeaders.SET_COOKIE).stream()
 				.flatMap(header ->
-						HttpCookie.parse(header).stream().map(httpCookie ->
-								ResponseCookie
-										.from(httpCookie.getName(), httpCookie.getValue())
-										.domain(httpCookie.getDomain())
-										.httpOnly(httpCookie.isHttpOnly())
-										.maxAge(httpCookie.getMaxAge())
-										.path(httpCookie.getPath())
-										.secure(httpCookie.getSecure())
+						HttpCookie.parse(header).stream().map(cookie ->
+								ResponseCookie.from(cookie.getName(), cookie.getValue())
+										.domain(cookie.getDomain())
+										.httpOnly(cookie.isHttpOnly())
+										.maxAge(cookie.getMaxAge())
+										.path(cookie.getPath())
+										.secure(cookie.getSecure())
 										.sameSite(parseSameSite(header))
-										.build()
-						)
-				).collect(LinkedMultiValueMap::new, (m, v) -> m.add(v.getName(), v), LinkedMultiValueMap::addAll);
+										.build()))
+				.collect(LinkedMultiValueMap::new,
+						(valueMap, cookie) -> valueMap.add(cookie.getName(), cookie),
+						LinkedMultiValueMap::addAll);
+	}
+
+	@Nullable
+	private static String parseSameSite(String headerValue) {
+		Matcher matcher = SAME_SITE_PATTERN.matcher(headerValue);
+		return (matcher.matches() ? matcher.group(1) : null);
 	}
 
 	@Override
 	public Flux<DataBuffer> getBody() {
-		return JdkFlowAdapter
-				.flowPublisherToFlux(this.response.body())
-				.flatMap(Flux::fromIterable)
+		return JdkFlowAdapter.flowPublisherToFlux(this.response.body())
+				.flatMapIterable(Function.identity())
 				.map(this.bufferFactory::wrap)
 				.doOnDiscard(DataBuffer.class, DataBufferUtils::release);
 	}
 
-	@Override
-	public HttpHeaders getHeaders() {
-		return this.response.headers().map().entrySet().stream().collect(HttpHeaders::new, (headers, entry) -> headers.addAll(entry.getKey(), entry.getValue()), HttpHeaders::addAll);
-	}
 }
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index 11cc814a2d85..d08c7c56d96e 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
index daf092d1e37a..3d83767813a5 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index c9c725a38e67..b0b8e4a9519e 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -12,9 +12,9 @@ decode request and response content on the server side.
 support for the following:
 
 * https://github.com/reactor/reactor-netty[Reactor Netty]
+* https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html[JDK HttpClient]
 * https://github.com/jetty-project/jetty-reactive-httpclient[Jetty Reactive HttpClient]
 * https://hc.apache.org/index.html[Apache HttpComponents]
-* https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html[JDK HttpClient]
 * Others can be plugged via `ClientHttpConnector`.
 
 
@@ -336,6 +336,40 @@ To configure a response timeout for a specific request:
 
 
 
+[[webflux-client-builder-jdk-httpclient]]
+=== JDK HttpClient
+
+The following example shows how to customize the JDK `HttpClient`:
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+    HttpClient httpClient = HttpClient.newBuilder()
+        .followRedirects(Redirect.NORMAL)
+        .connectTimeout(Duration.ofSeconds(20))
+        .build();
+
+    ClientHttpConnector connector =
+            new JdkClientHttpConnector(httpClient, new DefaultDataBufferFactory());
+
+    WebClient webClient = WebClient.builder().clientConnector(connector).build();
+----
+
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+    val httpClient = HttpClient.newBuilder()
+        .followRedirects(Redirect.NORMAL)
+        .connectTimeout(Duration.ofSeconds(20))
+        .build()
+
+    val connector = JdkClientHttpConnector(httpClient, DefaultDataBufferFactory())
+
+    val webClient = WebClient.builder().clientConnector(connector).build()
+----
+
+
+
 [[webflux-client-builder-jetty]]
 === Jetty
 
@@ -426,6 +460,7 @@ The following example shows how to customize Apache HttpComponents `HttpClient`
 	HttpAsyncClientBuilder clientBuilder = HttpAsyncClients.custom();
 	clientBuilder.setDefaultRequestConfig(...);
 	CloseableHttpAsyncClient client = clientBuilder.build();
+
 	ClientHttpConnector connector = new HttpComponentsClientHttpConnector(client);
 
 	WebClient webClient = WebClient.builder().clientConnector(connector).build();
@@ -440,43 +475,6 @@ The following example shows how to customize Apache HttpComponents `HttpClient`
 	val webClient = WebClient.builder().clientConnector(connector).build()
 ----
 
-[[webflux-client-builder-jdk-httpclient]]
-=== JDK
-The following example shows how to customize JDK `HttpClient` settings:
-
-[source,java,indent=0,subs="verbatim,quotes",role="primary"]
-.Java
-----
-	@Bean
-	public WebClient webClient() {
-		HttpClient httpClient = HttpClient.newBuilder()
-			.executor(...)
-			.connectTimeout(...)
-			.build();
-		ClientHttpConnector connector =
-				new JdkClientHttpConnector(httpClient, new DefaultDataBufferFactory()); // <1>
-
-		return WebClient webClient = WebClient.builder().clientConnector(connector).build(); // <2>
-	}
-----
-<1> Use the `JdkClientHttpConnector` constructor with customized `HttpClient` instance.
-<2> Plug the connector into the `WebClient.Builder`.
-
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-.Kotlin
-----
-	@Bean
-	fun webClient() : WebClient {
-		val httpClient = HttpClient.newBuilder()
-			.executor(...)
-			.connectTimeout(...)
-			.build()
-		val connector = JdkClientHttpConnector(httpClient, DefaultDataBufferFactory()) // <1>
-
-		return WebClient webClient = WebClient.builder()
-				.clientConnector(connector).build() // <2>
-	}
-----
 
 [[webflux-client-retrieve]]
 == `retrieve()`

From b3b50f8f4bad43ffca0e17e570bf5ed2f5a8bd3a Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 19 Nov 2021 07:28:59 +0000
Subject: [PATCH 353/735] Refactoring in the JDK HttpClient support

See gh-23432
---
 .../reactive/JdkClientHttpConnector.java      | 22 ++++-
 .../client/reactive/JdkClientHttpRequest.java | 89 ++++++-------------
 .../reactive/JdkClientHttpResponse.java       | 53 ++++++-----
 3 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
index 3fcf28194857..fd30f8b8b689 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
@@ -18,6 +18,12 @@
 
 import java.net.URI;
 import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Flow;
 import java.util.function.Function;
 
 import reactor.core.publisher.Mono;
@@ -27,9 +33,10 @@
 import org.springframework.http.HttpMethod;
 
 /**
- * {@link ClientHttpConnector} for Java's {@link HttpClient}.
+ * {@link ClientHttpConnector} for the Java {@link HttpClient}.
  *
  * @author Julien Eyraud
+ * @author Rossen Stoyanchev
  * @since 6.0
  * @see <a href="https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html">HttpClient</a>
  */
@@ -60,8 +67,17 @@ public JdkClientHttpConnector(HttpClient httpClient, DataBufferFactory bufferFac
 	public Mono<ClientHttpResponse> connect(
 			HttpMethod method, URI uri, Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
 
-		JdkClientHttpRequest request = new JdkClientHttpRequest(this.httpClient, method, uri, this.bufferFactory);
-		return requestCallback.apply(request).then(Mono.defer(request::getResponse));
+		JdkClientHttpRequest jdkClientHttpRequest = new JdkClientHttpRequest(method, uri, this.bufferFactory);
+
+		return requestCallback.apply(jdkClientHttpRequest).then(Mono.defer(() -> {
+			HttpRequest httpRequest = jdkClientHttpRequest.getNativeRequest();
+
+			CompletableFuture<HttpResponse<Flow.Publisher<List<ByteBuffer>>>> future =
+					this.httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofPublisher());
+
+			return Mono.fromCompletionStage(future)
+					.map(response -> new JdkClientHttpResponse(response, this.bufferFactory));
+		}));
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
index f514915230ff..3aed6a3d9df7 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpRequest.java
@@ -19,11 +19,9 @@
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.Flow;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -35,50 +33,38 @@
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.http.HttpCookie;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * {@link ClientHttpRequest} implementation for Java's {@link HttpClient}.
+ * {@link ClientHttpRequest} for the Java {@link HttpClient}.
  *
  * @author Julien Eyraud
+ * @author Rossen Stoyanchev
  * @since 6.0
  */
 class JdkClientHttpRequest extends AbstractClientHttpRequest {
 
-	private static final Set<String> DISALLOWED_HEADERS =
-			Set.of("connection", "content-length", "date", "expect", "from", "host", "upgrade", "via", "warning");
-
-
-	private final HttpClient httpClient;
-
 	private final HttpMethod method;
 
 	private final URI uri;
 
-	private final HttpRequest.Builder builder;
-
 	private final DataBufferFactory bufferFactory;
 
-	@Nullable
-	private Mono<ClientHttpResponse> response;
-
+	private final HttpRequest.Builder builder;
 
-	public JdkClientHttpRequest(
-			HttpClient httpClient, HttpMethod httpMethod, URI uri, DataBufferFactory bufferFactory) {
 
-		Assert.notNull(httpClient, "HttpClient should not be null");
-		Assert.notNull(httpMethod, "HttpMethod should not be null");
-		Assert.notNull(uri, "URI should not be null");
-		Assert.notNull(bufferFactory, "DataBufferFactory should not be null");
+	public JdkClientHttpRequest(HttpMethod httpMethod, URI uri, DataBufferFactory bufferFactory) {
+		Assert.notNull(httpMethod, "HttpMethod is required");
+		Assert.notNull(uri, "URI is required");
+		Assert.notNull(bufferFactory, "DataBufferFactory is required");
 
-		this.httpClient = httpClient;
 		this.method = httpMethod;
 		this.uri = uri;
-		this.builder = HttpRequest.newBuilder(uri);
 		this.bufferFactory = bufferFactory;
+		this.builder = HttpRequest.newBuilder(uri);
 	}
 
 
@@ -103,20 +89,16 @@ public <T> T getNativeRequest() {
 		return (T) this.builder.build();
 	}
 
-	Mono<ClientHttpResponse> getResponse() {
-		Assert.notNull(this.response, "Response is not set");
-		return this.response;
-	}
-
 
 	@Override
 	protected void applyHeaders() {
-		for (Map.Entry<String, List<String>> header : getHeaders().entrySet()) {
-			if (DISALLOWED_HEADERS.contains(header.getKey().toLowerCase())) {
+		for (Map.Entry<String, List<String>> entry : getHeaders().entrySet()) {
+			if (entry.getKey().equalsIgnoreCase(HttpHeaders.CONTENT_LENGTH)) {
+				// content-length is specified when writing
 				continue;
 			}
-			for (String value : header.getValue()) {
-				this.builder.header(header.getKey(), value);
+			for (String value : entry.getValue()) {
+				this.builder.header(entry.getKey(), value);
 			}
 		}
 		if (!getHeaders().containsKey(HttpHeaders.ACCEPT)) {
@@ -126,31 +108,28 @@ protected void applyHeaders() {
 
 	@Override
 	protected void applyCookies() {
-		this.builder.header(HttpHeaders.COOKIE,
-				getCookies().values().stream()
-						.flatMap(List::stream)
-						.map(cookie -> cookie.getName() + "=" + cookie.getValue())
-						.collect(Collectors.joining("; ")));
+		this.builder.header(HttpHeaders.COOKIE, getCookies().values().stream()
+				.flatMap(List::stream).map(HttpCookie::toString).collect(Collectors.joining(";")));
 	}
 
 	@Override
 	public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
 		return doCommit(() -> {
-			Flow.Publisher<ByteBuffer> flow =
-					JdkFlowAdapter.publisherToFlowPublisher(Flux.from(body).map(DataBuffer::asByteBuffer));
+			this.builder.method(this.method.name(), toBodyPublisher(body));
+			return Mono.empty();
+		});
+	}
 
-			HttpRequest.BodyPublisher bodyPublisher = (getHeaders().getContentLength() >= 0 ?
-					HttpRequest.BodyPublishers.fromPublisher(flow, getHeaders().getContentLength()) :
-					HttpRequest.BodyPublishers.fromPublisher(flow));
+	private HttpRequest.BodyPublisher toBodyPublisher(Publisher<? extends DataBuffer> body) {
+		Publisher<ByteBuffer> byteBufferBody = (body instanceof Mono ?
+				Mono.from(body).map(DataBuffer::asByteBuffer) :
+				Flux.from(body).map(DataBuffer::asByteBuffer));
 
-			this.response = Mono.fromCompletionStage(() -> {
-						HttpRequest request = this.builder.method(this.method.name(), bodyPublisher).build();
-						return this.httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofPublisher());
-					})
-					.map(response -> new JdkClientHttpResponse(response, this.bufferFactory));
+		Flow.Publisher<ByteBuffer> bodyFlow = JdkFlowAdapter.publisherToFlowPublisher(byteBufferBody);
 
-			return Mono.empty();
-		});
+		return (getHeaders().getContentLength() > 0 ?
+				HttpRequest.BodyPublishers.fromPublisher(bodyFlow, getHeaders().getContentLength()) :
+				HttpRequest.BodyPublishers.fromPublisher(bodyFlow));
 	}
 
 	@Override
@@ -160,18 +139,8 @@ public Mono<Void> writeAndFlushWith(final Publisher<? extends Publisher<? extend
 
 	@Override
 	public Mono<Void> setComplete() {
-		if (isCommitted()) {
-			return Mono.empty();
-		}
-
 		return doCommit(() -> {
-			this.response = Mono.fromCompletionStage(() -> {
-						HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.noBody();
-						HttpRequest request = this.builder.method(this.method.name(), bodyPublisher).build();
-						return this.httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofPublisher());
-					})
-					.map(response -> new JdkClientHttpResponse(response, this.bufferFactory));
-
+			this.builder.method(this.method.name(), HttpRequest.BodyPublishers.noBody());
 			return Mono.empty();
 		});
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
index c00308e4e439..8beacd5809e0 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
@@ -21,6 +21,8 @@
 import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.Flow;
 import java.util.function.Function;
 import java.util.regex.Matcher;
@@ -36,13 +38,16 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseCookie;
 import org.springframework.lang.Nullable;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.LinkedCaseInsensitiveMap;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 /**
- * {@link ClientHttpResponse} implementation for Java's {@link HttpClient}.
+ * {@link ClientHttpResponse} for the Java {@link HttpClient}.
  *
  * @author Julien Eyraud
+ * @author Rossen Stoyanchev
  * @since 6.0
  */
 class JdkClientHttpResponse implements ClientHttpResponse {
@@ -54,12 +59,23 @@ class JdkClientHttpResponse implements ClientHttpResponse {
 
 	private final DataBufferFactory bufferFactory;
 
+	private final HttpHeaders headers;
+
 
 	public JdkClientHttpResponse(
 			HttpResponse<Flow.Publisher<List<ByteBuffer>>> response, DataBufferFactory bufferFactory) {
 
 		this.response = response;
 		this.bufferFactory = bufferFactory;
+		this.headers = adaptHeaders(response);
+	}
+
+	private static HttpHeaders adaptHeaders(HttpResponse<Flow.Publisher<List<ByteBuffer>>> response) {
+		Map<String, List<String>> rawHeaders = response.headers().map();
+		Map<String, List<String>> map = new LinkedCaseInsensitiveMap<>(rawHeaders.size(), Locale.ENGLISH);
+		MultiValueMap<String, String> multiValueMap = CollectionUtils.toMultiValueMap(map);
+		multiValueMap.putAll(rawHeaders);
+		return HttpHeaders.readOnlyHttpHeaders(multiValueMap);
 	}
 
 
@@ -75,34 +91,31 @@ public int getRawStatusCode() {
 
 	@Override
 	public HttpHeaders getHeaders() {
-		return this.response.headers().map().entrySet().stream()
-				.collect(HttpHeaders::new,
-						(headers, entry) -> headers.addAll(entry.getKey(), entry.getValue()),
-						HttpHeaders::addAll);
+		return this.headers;
 	}
 
 	@Override
 	public MultiValueMap<String, ResponseCookie> getCookies() {
 		return this.response.headers().allValues(HttpHeaders.SET_COOKIE).stream()
-				.flatMap(header ->
-						HttpCookie.parse(header).stream().map(cookie ->
-								ResponseCookie.from(cookie.getName(), cookie.getValue())
-										.domain(cookie.getDomain())
-										.httpOnly(cookie.isHttpOnly())
-										.maxAge(cookie.getMaxAge())
-										.path(cookie.getPath())
-										.secure(cookie.getSecure())
-										.sameSite(parseSameSite(header))
-										.build()))
+				.flatMap(header -> {
+					Matcher matcher = SAME_SITE_PATTERN.matcher(header);
+					String sameSite = (matcher.matches() ? matcher.group(1) : null);
+					return HttpCookie.parse(header).stream().map(cookie -> toResponseCookie(cookie, sameSite));
+				})
 				.collect(LinkedMultiValueMap::new,
-						(valueMap, cookie) -> valueMap.add(cookie.getName(), cookie),
+						(cookies, cookie) -> cookies.add(cookie.getName(), cookie),
 						LinkedMultiValueMap::addAll);
 	}
 
-	@Nullable
-	private static String parseSameSite(String headerValue) {
-		Matcher matcher = SAME_SITE_PATTERN.matcher(headerValue);
-		return (matcher.matches() ? matcher.group(1) : null);
+	private ResponseCookie toResponseCookie(HttpCookie cookie, @Nullable String sameSite) {
+		return ResponseCookie.from(cookie.getName(), cookie.getValue())
+				.domain(cookie.getDomain())
+				.httpOnly(cookie.isHttpOnly())
+				.maxAge(cookie.getMaxAge())
+				.path(cookie.getPath())
+				.secure(cookie.getSecure())
+				.sameSite(sameSite)
+				.build();
 	}
 
 	@Override

From fe8d42ff59e1ff23b0807aba85a8bc65a0b54e84 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 22 Nov 2021 12:09:57 +0000
Subject: [PATCH 354/735] Add JdkHttpClientResourceFactory

See gh-23432
---
 .../reactive/JdkClientHttpConnector.java      |  35 +++++-
 .../JdkHttpClientResourceFactory.java         | 108 ++++++++++++++++++
 .../client/WebClientIntegrationTests.java     |   4 +-
 .../annotation/SseIntegrationTests.java       |   8 +-
 4 files changed, 146 insertions(+), 9 deletions(-)
 create mode 100644 spring-web/src/main/java/org/springframework/http/client/reactive/JdkHttpClientResourceFactory.java

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
index fd30f8b8b689..4313c658076d 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpConnector.java
@@ -23,6 +23,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.concurrent.Flow;
 import java.util.function.Function;
 
@@ -31,6 +32,8 @@
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpMethod;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 
 /**
  * {@link ClientHttpConnector} for the Java {@link HttpClient}.
@@ -44,21 +47,47 @@ public class JdkClientHttpConnector implements ClientHttpConnector {
 
 	private final HttpClient httpClient;
 
-	private final DataBufferFactory bufferFactory;
+	private DataBufferFactory bufferFactory = DefaultDataBufferFactory.sharedInstance;
 
 
 	/**
 	 * Default constructor that uses {@link HttpClient#newHttpClient()}.
 	 */
 	public JdkClientHttpConnector() {
-		this(HttpClient.newHttpClient(), new DefaultDataBufferFactory());
+		this(HttpClient.newHttpClient());
 	}
 
 	/**
 	 * Constructor with an initialized {@link HttpClient} and a {@link DataBufferFactory}.
 	 */
-	public JdkClientHttpConnector(HttpClient httpClient, DataBufferFactory bufferFactory) {
+	public JdkClientHttpConnector(HttpClient httpClient) {
 		this.httpClient = httpClient;
+	}
+
+	/**
+	 * Constructor with a {@link JdkHttpClientResourceFactory} that provides
+	 * shared resources.
+	 * @param clientBuilder a pre-initialized builder for the client that will
+	 * be further initialized with the shared resources to use
+	 * @param resourceFactory the {@link JdkHttpClientResourceFactory} to use
+	 */
+	public JdkClientHttpConnector(
+			HttpClient.Builder clientBuilder, @Nullable JdkHttpClientResourceFactory resourceFactory) {
+
+		if (resourceFactory != null) {
+			Executor executor = resourceFactory.getExecutor();
+			clientBuilder.executor(executor);
+		}
+		this.httpClient = clientBuilder.build();
+	}
+
+
+	/**
+	 * Set the buffer factory to use.
+	 * <p>By default, this is {@link DefaultDataBufferFactory#sharedInstance}.
+	 */
+	public void setBufferFactory(DataBufferFactory bufferFactory) {
+		Assert.notNull(bufferFactory, "DataBufferFactory is required");
 		this.bufferFactory = bufferFactory;
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkHttpClientResourceFactory.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkHttpClientResourceFactory.java
new file mode 100644
index 000000000000..956c411c0fc6
--- /dev/null
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkHttpClientResourceFactory.java
@@ -0,0 +1,108 @@
+/*
+ * 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.http.client.reactive;
+
+import java.net.http.HttpClient;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+import org.eclipse.jetty.util.component.LifeCycle;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.lang.Nullable;
+import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
+import org.springframework.util.Assert;
+
+/**
+ * Factory to manage JDK HttpClient resources such as a shared {@link Executor}
+ * within the lifecycle of a Spring {@code ApplicationContext}.
+ *
+ * <p>This factory implements {@link InitializingBean} and {@link DisposableBean}
+ * and is expected typically to be declared as a Spring-managed bean.
+ *
+ * @author Rossen Stoyanchev
+ * @since 6.0
+ * @see JdkClientHttpConnector#JdkClientHttpConnector(HttpClient.Builder, JdkHttpClientResourceFactory)
+ */
+public class JdkHttpClientResourceFactory implements InitializingBean, DisposableBean {
+
+	@Nullable
+	private Executor executor;
+
+	private String threadPrefix = "jdk-http";
+
+
+	/**
+	 * Configure the {@link Executor} to use for {@link HttpClient} exchanges.
+	 * The given executor is started and stopped via {@link InitializingBean}
+	 * and {@link DisposableBean}.
+	 * <p>By default, this is set to {@link Executors#newCachedThreadPool(ThreadFactory)},
+	 * which mirrors {@link HttpClient.Builder#executor(Executor)}.
+	 * @param executor the executor to use
+	 */
+	public void setExecutor(@Nullable Executor executor) {
+		this.executor = executor;
+	}
+
+	/**
+	 * Return the configured {@link Executor}.
+	 */
+	@Nullable
+	public Executor getExecutor() {
+		return this.executor;
+	}
+
+	/**
+	 * Configure the thread prefix to initialize {@link QueuedThreadPool} executor with. This
+	 * is used only when a {@link Executor} instance isn't
+	 * {@link #setExecutor(Executor) provided}.
+	 * <p>By default set to "jetty-http".
+	 * @param threadPrefix the thread prefix to use
+	 */
+	public void setThreadPrefix(String threadPrefix) {
+		Assert.notNull(threadPrefix, "Thread prefix is required");
+		this.threadPrefix = threadPrefix;
+	}
+
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		if (this.executor == null) {
+			String name = this.threadPrefix + "@" + Integer.toHexString(hashCode());
+			this.executor = Executors.newCachedThreadPool(new CustomizableThreadFactory(name));
+		}
+		if (this.executor instanceof LifeCycle) {
+			((LifeCycle)this.executor).start();
+		}
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			if (this.executor instanceof LifeCycle) {
+				((LifeCycle)this.executor).stop();
+			}
+		}
+		catch (Throwable ex) {
+			// ignore
+		}
+	}
+
+}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index d08c7c56d96e..f926502dbebc 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -99,9 +99,9 @@ class WebClientIntegrationTests {
 	static Stream<ClientHttpConnector> arguments() {
 		return Stream.of(
 				new ReactorClientHttpConnector(),
+				new JdkClientHttpConnector(),
 				new JettyClientHttpConnector(),
-				new HttpComponentsClientHttpConnector(),
-				new JdkClientHttpConnector()
+				new HttpComponentsClientHttpConnector()
 		);
 	}
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
index 3d83767813a5..ced791de0969 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
@@ -75,21 +75,21 @@ class SseIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 	static Object[][] arguments() {
 		return new Object[][] {
 			{new JettyHttpServer(), new ReactorClientHttpConnector()},
+			{new JettyHttpServer(), new JdkClientHttpConnector()},
 			{new JettyHttpServer(), new JettyClientHttpConnector()},
 			{new JettyHttpServer(), new HttpComponentsClientHttpConnector()},
-			{new JettyHttpServer(), new JdkClientHttpConnector()},
 			{new ReactorHttpServer(), new ReactorClientHttpConnector()},
+			{new ReactorHttpServer(), new JdkClientHttpConnector()},
 			{new ReactorHttpServer(), new JettyClientHttpConnector()},
 			{new ReactorHttpServer(), new HttpComponentsClientHttpConnector()},
-			{new ReactorHttpServer(), new JdkClientHttpConnector()},
 			{new TomcatHttpServer(), new ReactorClientHttpConnector()},
+			{new TomcatHttpServer(), new JdkClientHttpConnector()},
 			{new TomcatHttpServer(), new JettyClientHttpConnector()},
 			{new TomcatHttpServer(), new HttpComponentsClientHttpConnector()},
-			{new TomcatHttpServer(), new JdkClientHttpConnector()},
 			{new UndertowHttpServer(), new ReactorClientHttpConnector()},
+			{new UndertowHttpServer(), new JdkClientHttpConnector()},
 			{new UndertowHttpServer(), new JettyClientHttpConnector()},
 			{new UndertowHttpServer(), new HttpComponentsClientHttpConnector()},
-			{new UndertowHttpServer(), new JdkClientHttpConnector()},
 		};
 	}
 

From 1694691b791d9f86e735a9d31fc6820bd8f3c55c Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 22 Nov 2021 12:19:25 +0000
Subject: [PATCH 355/735] Default to JDK HttpClient if no others present

Closes gh-23432
---
 .../reactive/function/client/DefaultWebClientBuilder.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
index 40bd81342bc7..b224801cba92 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.client.reactive.ClientHttpConnector;
 import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
+import org.springframework.http.client.reactive.JdkClientHttpConnector;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.http.codec.ClientCodecConfigurer;
@@ -294,7 +295,9 @@ else if (jettyClientPresent) {
 		else if (httpComponentsClientPresent) {
 			return new HttpComponentsClientHttpConnector();
 		}
-		throw new IllegalStateException("No suitable default ClientHttpConnector found");
+		else {
+			return new JdkClientHttpConnector();
+		}
 	}
 
 	private ExchangeStrategies initExchangeStrategies() {

From 1e0bdf95d051912c327e9781673d9690941a8d4b Mon Sep 17 00:00:00 2001
From: julianladisch <julianladisch@users.noreply.github.com>
Date: Mon, 4 Apr 2016 10:30:22 +0200
Subject: [PATCH 356/735] Fix simple data format in appendix

See gh-1025
---
 src/docs/asciidoc/core/core-appendix.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-appendix.adoc b/src/docs/asciidoc/core/core-appendix.adoc
index 53ef8e333583..095f767518a0 100644
--- a/src/docs/asciidoc/core/core-appendix.adoc
+++ b/src/docs/asciidoc/core/core-appendix.adoc
@@ -749,7 +749,7 @@ essentially the same as the following XML snippet:
 [source,xml,indent=0,subs="verbatim,quotes"]
 ----
 	<bean id="dateFormat" class="java.text.SimpleDateFormat">
-		<constructor-arg value="yyyy-HH-dd HH:mm"/>
+		<constructor-arg value="yyyy-MM-dd HH:mm"/>
 		<property name="lenient" value="true"/>
 	</bean>
 ----

From bcb9f159ca602fb3437123ee3f3fffdaf3572251 Mon Sep 17 00:00:00 2001
From: Kazuki Shimizu <kazuki43zoo@gmail.com>
Date: Sun, 19 Feb 2017 02:24:50 +0900
Subject: [PATCH 357/735] Add tests for AbstractRoutingDataSource

See gh-1330
---
 .../AbstractRoutingDataSourceTests.java       | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
new file mode 100644
index 000000000000..a39729161c9b
--- /dev/null
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
@@ -0,0 +1,185 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://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.jdbc.datasource.lookup;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import javax.sql.DataSource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.core.IsSame.sameInstance;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Tests for {@link AbstractRoutingDataSource}.
+ * @author Kazuki Shimizu
+ */
+public class AbstractRoutingDataSourceTests {
+
+	@Rule
+	public final ExpectedException exception = ExpectedException.none();
+
+	@Test
+	public void setTargetDataSources() {
+		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
+		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
+			@Override
+			protected Object determineCurrentLookupKey() {
+				return lookupKey.get();
+			}
+		};
+		DataSource ds1 = new StubDataSource();
+		DataSource ds2 = new StubDataSource();
+
+		MapDataSourceLookup dataSourceLookup = new MapDataSourceLookup();
+		dataSourceLookup.addDataSource("dataSource2", ds2);
+		routingDataSource.setDataSourceLookup(dataSourceLookup);
+
+		Map<Object, Object> targetDataSources = new HashMap<>();
+		targetDataSources.put("ds1", ds1);
+		targetDataSources.put("ds2", "dataSource2");
+		routingDataSource.setTargetDataSources(targetDataSources);
+
+		routingDataSource.afterPropertiesSet();
+
+		lookupKey.set("ds1");
+		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds1));
+
+		lookupKey.set("ds2");
+		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds2));
+	}
+
+	@Test
+	public void targetDataSourcesIsNull() {
+		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
+			@Override
+			protected Object determineCurrentLookupKey() {
+				return null;
+			}
+		};
+
+		exception.expect(IllegalArgumentException.class);
+		exception.expectMessage("Property 'targetDataSources' is required");
+
+		routingDataSource.afterPropertiesSet();
+	}
+
+	@Test
+	public void dataSourceIsUnSupportedType() {
+		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
+			@Override
+			protected Object determineCurrentLookupKey() {
+				return null;
+			}
+		};
+		Map<Object, Object> targetDataSources = new HashMap<>();
+		targetDataSources.put("ds1", 1);
+		routingDataSource.setTargetDataSources(targetDataSources);
+
+		exception.expect(IllegalArgumentException.class);
+		exception.expectMessage("Illegal data source value - only [javax.sql.DataSource] and String supported: 1");
+
+		routingDataSource.afterPropertiesSet();
+	}
+
+
+
+	@Test
+	public void setDefaultTargetDataSource() {
+		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
+		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
+			@Override
+			protected Object determineCurrentLookupKey() {
+				return lookupKey.get();
+			}
+		};
+		DataSource ds = new StubDataSource();
+
+		routingDataSource.setTargetDataSources(new HashMap<>());
+		routingDataSource.setDefaultTargetDataSource(ds);
+
+		routingDataSource.afterPropertiesSet();
+
+		lookupKey.set("foo");
+		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds));
+	}
+
+	@Test
+	public void setDefaultTargetDataSourceFallbackIsFalse() {
+		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
+		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
+			@Override
+			protected Object determineCurrentLookupKey() {
+				return lookupKey.get();
+			}
+		};
+		DataSource ds = new StubDataSource();
+
+		routingDataSource.setTargetDataSources(new HashMap<>());
+		routingDataSource.setDefaultTargetDataSource(ds);
+		routingDataSource.setLenientFallback(false);
+
+		routingDataSource.afterPropertiesSet();
+
+		exception.expect(IllegalStateException.class);
+		exception.expectMessage("Cannot determine target DataSource for lookup key [foo]");
+
+		lookupKey.set("foo");
+		routingDataSource.determineTargetDataSource();
+	}
+
+	@Test
+	public void setDefaultTargetDataSourceLookupKeyIsNullWhenFallbackIsFalse() {
+		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
+		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
+			@Override
+			protected Object determineCurrentLookupKey() {
+				return lookupKey.get();
+			}
+		};
+		DataSource ds = new StubDataSource();
+
+		routingDataSource.setTargetDataSources(new HashMap<>());
+		routingDataSource.setDefaultTargetDataSource(ds);
+		routingDataSource.setLenientFallback(false);
+
+		routingDataSource.afterPropertiesSet();
+
+		lookupKey.set(null);
+		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds));
+	}
+
+	@Test
+	public void notInitialized() {
+		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
+			@Override
+			protected Object determineCurrentLookupKey() {
+				return null;
+			}
+		};
+
+		exception.expect(IllegalArgumentException.class);
+		exception.expectMessage("DataSource router not initialized");
+
+		routingDataSource.determineTargetDataSource();
+	}
+
+}
\ No newline at end of file

From 23babe27bbae32325a076259672035decfccf9ca Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 22 Nov 2021 13:43:00 +0100
Subject: [PATCH 358/735] Polish "Add tests for AbstractRoutingDataSource"

See gh-1330
---
 .../AbstractRoutingDataSourceTests.java       | 82 +++++++------------
 1 file changed, 29 insertions(+), 53 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
index a39729161c9b..7fb3445c4a79 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,29 +16,28 @@
 
 package org.springframework.jdbc.datasource.lookup;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import javax.sql.DataSource;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.hamcrest.core.IsSame.sameInstance;
-import static org.junit.Assert.assertThat;
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+
 
 /**
  * Tests for {@link AbstractRoutingDataSource}.
+ *
  * @author Kazuki Shimizu
  */
-public class AbstractRoutingDataSourceTests {
-
-	@Rule
-	public final ExpectedException exception = ExpectedException.none();
+class AbstractRoutingDataSourceTests {
 
 	@Test
-	public void setTargetDataSources() {
+	void setTargetDataSources() {
 		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
 		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
 			@Override
@@ -59,31 +58,26 @@ protected Object determineCurrentLookupKey() {
 		routingDataSource.setTargetDataSources(targetDataSources);
 
 		routingDataSource.afterPropertiesSet();
-
 		lookupKey.set("ds1");
-		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds1));
-
+		assertThat(routingDataSource.determineTargetDataSource()).isSameAs(ds1);
 		lookupKey.set("ds2");
-		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds2));
+		assertThat(routingDataSource.determineTargetDataSource()).isSameAs(ds2);
 	}
 
 	@Test
-	public void targetDataSourcesIsNull() {
+	void targetDataSourcesIsNull() {
 		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
 			@Override
 			protected Object determineCurrentLookupKey() {
 				return null;
 			}
 		};
-
-		exception.expect(IllegalArgumentException.class);
-		exception.expectMessage("Property 'targetDataSources' is required");
-
-		routingDataSource.afterPropertiesSet();
+		assertThatIllegalArgumentException().isThrownBy(routingDataSource::afterPropertiesSet)
+				.withMessage("Property 'targetDataSources' is required");
 	}
 
 	@Test
-	public void dataSourceIsUnSupportedType() {
+	void dataSourceIsUnSupportedType() {
 		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
 			@Override
 			protected Object determineCurrentLookupKey() {
@@ -93,17 +87,13 @@ protected Object determineCurrentLookupKey() {
 		Map<Object, Object> targetDataSources = new HashMap<>();
 		targetDataSources.put("ds1", 1);
 		routingDataSource.setTargetDataSources(targetDataSources);
-
-		exception.expect(IllegalArgumentException.class);
-		exception.expectMessage("Illegal data source value - only [javax.sql.DataSource] and String supported: 1");
-
-		routingDataSource.afterPropertiesSet();
+		assertThatIllegalArgumentException().isThrownBy(routingDataSource::afterPropertiesSet)
+				.withMessage("Illegal data source value - only [javax.sql.DataSource] and String supported: 1");
 	}
 
 
-
 	@Test
-	public void setDefaultTargetDataSource() {
+	void setDefaultTargetDataSource() {
 		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
 		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
 			@Override
@@ -112,18 +102,15 @@ protected Object determineCurrentLookupKey() {
 			}
 		};
 		DataSource ds = new StubDataSource();
-
 		routingDataSource.setTargetDataSources(new HashMap<>());
 		routingDataSource.setDefaultTargetDataSource(ds);
-
 		routingDataSource.afterPropertiesSet();
-
 		lookupKey.set("foo");
-		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds));
+		assertThat(routingDataSource.determineTargetDataSource()).isSameAs(ds);
 	}
 
 	@Test
-	public void setDefaultTargetDataSourceFallbackIsFalse() {
+	void setDefaultTargetDataSourceFallbackIsFalse() {
 		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
 		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
 			@Override
@@ -132,22 +119,17 @@ protected Object determineCurrentLookupKey() {
 			}
 		};
 		DataSource ds = new StubDataSource();
-
 		routingDataSource.setTargetDataSources(new HashMap<>());
 		routingDataSource.setDefaultTargetDataSource(ds);
 		routingDataSource.setLenientFallback(false);
-
 		routingDataSource.afterPropertiesSet();
-
-		exception.expect(IllegalStateException.class);
-		exception.expectMessage("Cannot determine target DataSource for lookup key [foo]");
-
 		lookupKey.set("foo");
-		routingDataSource.determineTargetDataSource();
+		assertThatIllegalStateException().isThrownBy(routingDataSource::determineTargetDataSource)
+				.withMessage("Cannot determine target DataSource for lookup key [foo]");
 	}
 
 	@Test
-	public void setDefaultTargetDataSourceLookupKeyIsNullWhenFallbackIsFalse() {
+	void setDefaultTargetDataSourceLookupKeyIsNullWhenFallbackIsFalse() {
 		final ThreadLocal<String> lookupKey = new ThreadLocal<>();
 		AbstractRoutingDataSource routingDataSource = new AbstractRoutingDataSource() {
 			@Override
@@ -156,15 +138,12 @@ protected Object determineCurrentLookupKey() {
 			}
 		};
 		DataSource ds = new StubDataSource();
-
 		routingDataSource.setTargetDataSources(new HashMap<>());
 		routingDataSource.setDefaultTargetDataSource(ds);
 		routingDataSource.setLenientFallback(false);
-
 		routingDataSource.afterPropertiesSet();
-
 		lookupKey.set(null);
-		assertThat(routingDataSource.determineTargetDataSource(), sameInstance(ds));
+		assertThat(routingDataSource.determineTargetDataSource()).isSameAs(ds);
 	}
 
 	@Test
@@ -175,11 +154,8 @@ protected Object determineCurrentLookupKey() {
 				return null;
 			}
 		};
-
-		exception.expect(IllegalArgumentException.class);
-		exception.expectMessage("DataSource router not initialized");
-
-		routingDataSource.determineTargetDataSource();
+		assertThatIllegalArgumentException().isThrownBy(routingDataSource::determineTargetDataSource)
+				.withMessage("DataSource router not initialized");
 	}
 
 }
\ No newline at end of file

From b67e97d38879d653f3746032e2c243cf58a27f92 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 22 Nov 2021 16:11:43 +0100
Subject: [PATCH 359/735] Polish

---
 .../datasource/lookup/AbstractRoutingDataSourceTests.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
index 7fb3445c4a79..8dc23a3f9651 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSourceTests.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -158,4 +158,4 @@ protected Object determineCurrentLookupKey() {
 				.withMessage("DataSource router not initialized");
 	}
 
-}
\ No newline at end of file
+}

From e8eeb99ac894dde7896d080c0bcb18335e49ee78 Mon Sep 17 00:00:00 2001
From: qxo <qxodream@gmail.com>
Date: Wed, 29 Nov 2017 17:44:05 +0800
Subject: [PATCH 360/735] Repect StaxDriver in
 XStreamMarshaller::marshalXmlStreamWriter

This commit makes sure that namespaces configured via the streamDriver
property are respected.
---
 .../springframework/oxm/xstream/XStreamMarshaller.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index ccb10d27c172..9ab9c9a5be30 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -696,7 +696,13 @@ protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) t
 	@Override
 	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
 		try {
-			doMarshal(graph, new StaxWriter(new QNameMap(), streamWriter, this.nameCoder), null);
+			final StaxWriter writer;
+			if( streamDriver instanceof StaxDriver){
+				writer = ((StaxDriver)streamDriver).createStaxWriter(streamWriter);
+			}else{
+				writer =  new StaxWriter( new QNameMap(),streamWriter, this.nameCoder);
+			}
+			doMarshal(graph,writer, null);
 		}
 		catch (XMLStreamException ex) {
 			throw convertXStreamException(ex, true);

From 2271b6078e65c6cee55c069ebb15f04fe04f0845 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 23 Nov 2021 10:39:38 +0100
Subject: [PATCH 361/735] Polishing contribution

See gh-1607
---
 .../oxm/xstream/XStreamMarshaller.java        | 14 ++++++++------
 .../oxm/xstream/XStreamMarshallerTests.java   | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index 9ab9c9a5be30..3a22e4b6e8fe 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -56,6 +56,7 @@
 import com.thoughtworks.xstream.io.xml.DomWriter;
 import com.thoughtworks.xstream.io.xml.QNameMap;
 import com.thoughtworks.xstream.io.xml.SaxWriter;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 import com.thoughtworks.xstream.io.xml.StaxReader;
 import com.thoughtworks.xstream.io.xml.StaxWriter;
 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
@@ -696,13 +697,14 @@ protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) t
 	@Override
 	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
 		try {
-			final StaxWriter writer;
-			if( streamDriver instanceof StaxDriver){
-				writer = ((StaxDriver)streamDriver).createStaxWriter(streamWriter);
-			}else{
-				writer =  new StaxWriter( new QNameMap(),streamWriter, this.nameCoder);
+			StaxWriter writer;
+			if (this.streamDriver instanceof StaxDriver) {
+				writer = ((StaxDriver) this.streamDriver).createStaxWriter(streamWriter);
 			}
-			doMarshal(graph,writer, null);
+			else {
+				writer = new StaxWriter(new QNameMap(), streamWriter, this.nameCoder);
+			}
+			doMarshal(graph, writer, null);
 		}
 		catch (XMLStreamException ex) {
 			throw convertXStreamException(ex, true);
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index 304d3fcc771b..44435fff9720 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -43,6 +43,8 @@
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JsonWriter;
+import com.thoughtworks.xstream.io.xml.QNameMap;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -176,6 +178,23 @@ void marshalStaxResultXMLStreamWriter() throws Exception {
 		assertThat(XmlContent.from(writer)).isSimilarTo(EXPECTED_STRING);
 	}
 
+	@Test
+	void marshalStaxResultXMLStreamWriterDefaultNamespace() throws Exception {
+		QNameMap map = new QNameMap();
+		map.setDefaultNamespace("https://example.com");
+		map.setDefaultPrefix("spr");
+		StaxDriver driver = new StaxDriver(map);
+		marshaller.setStreamDriver(driver);
+
+		XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+		StringWriter writer = new StringWriter();
+		XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
+		Result result = StaxUtils.createStaxResult(streamWriter);
+		marshaller.marshal(flight, result);
+		assertThat(XmlContent.from(writer)).isSimilarTo(
+				"<spr:flight xmlns:spr=\"https://example.com\"><spr:flightNumber>42</spr:flightNumber></spr:flight>");
+	}
+
 	@Test
 	void marshalStaxResultXMLEventWriter() throws Exception {
 		XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();

From 247d2bb0ae35efee96ada2c3b4501c6981d34b3b Mon Sep 17 00:00:00 2001
From: qxo <qxodream@gmail.com>
Date: Wed, 29 Nov 2017 17:44:05 +0800
Subject: [PATCH 362/735] Repect StaxDriver in
 XStreamMarshaller::marshalXmlStreamWriter

This commit makes sure that namespaces configured via the streamDriver
property are respected.
---
 .../springframework/oxm/xstream/XStreamMarshaller.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index 3a3356d485cb..8b20da0c901d 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -694,7 +694,13 @@ protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) t
 	@Override
 	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
 		try {
-			doMarshal(graph, new StaxWriter(new QNameMap(), streamWriter, this.nameCoder), null);
+			final StaxWriter writer;
+			if( streamDriver instanceof StaxDriver){
+				writer = ((StaxDriver)streamDriver).createStaxWriter(streamWriter);
+			}else{
+				writer =  new StaxWriter( new QNameMap(),streamWriter, this.nameCoder);
+			}
+			doMarshal(graph,writer, null);
 		}
 		catch (XMLStreamException ex) {
 			throw convertXStreamException(ex, true);

From 38062c33737d15e63a5954c7afce110b84ee82f6 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 23 Nov 2021 10:39:38 +0100
Subject: [PATCH 363/735] Polishing contribution

See gh-1607
---
 .../oxm/xstream/XStreamMarshaller.java        | 14 ++++++++------
 .../oxm/xstream/XStreamMarshallerTests.java   | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index 8b20da0c901d..c34de879a862 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -57,6 +57,7 @@
 import com.thoughtworks.xstream.io.xml.DomWriter;
 import com.thoughtworks.xstream.io.xml.QNameMap;
 import com.thoughtworks.xstream.io.xml.SaxWriter;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 import com.thoughtworks.xstream.io.xml.StaxReader;
 import com.thoughtworks.xstream.io.xml.StaxWriter;
 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
@@ -694,13 +695,14 @@ protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) t
 	@Override
 	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
 		try {
-			final StaxWriter writer;
-			if( streamDriver instanceof StaxDriver){
-				writer = ((StaxDriver)streamDriver).createStaxWriter(streamWriter);
-			}else{
-				writer =  new StaxWriter( new QNameMap(),streamWriter, this.nameCoder);
+			StaxWriter writer;
+			if (this.streamDriver instanceof StaxDriver) {
+				writer = ((StaxDriver) this.streamDriver).createStaxWriter(streamWriter);
 			}
-			doMarshal(graph,writer, null);
+			else {
+				writer = new StaxWriter(new QNameMap(), streamWriter, this.nameCoder);
+			}
+			doMarshal(graph, writer, null);
 		}
 		catch (XMLStreamException ex) {
 			throw convertXStreamException(ex, true);
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index b408c6611be3..2a85c254d5f0 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -43,6 +43,8 @@
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JsonWriter;
+import com.thoughtworks.xstream.io.xml.QNameMap;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -176,6 +178,23 @@ void marshalStaxResultXMLStreamWriter() throws Exception {
 		assertThat(XmlContent.from(writer)).isSimilarTo(EXPECTED_STRING);
 	}
 
+	@Test
+	void marshalStaxResultXMLStreamWriterDefaultNamespace() throws Exception {
+		QNameMap map = new QNameMap();
+		map.setDefaultNamespace("https://example.com");
+		map.setDefaultPrefix("spr");
+		StaxDriver driver = new StaxDriver(map);
+		marshaller.setStreamDriver(driver);
+
+		XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+		StringWriter writer = new StringWriter();
+		XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
+		Result result = StaxUtils.createStaxResult(streamWriter);
+		marshaller.marshal(flight, result);
+		assertThat(XmlContent.from(writer)).isSimilarTo(
+				"<spr:flight xmlns:spr=\"https://example.com\"><spr:flightNumber>42</spr:flightNumber></spr:flight>");
+	}
+
 	@Test
 	void marshalStaxResultXMLEventWriter() throws Exception {
 		XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();

From a7789db0673f6997233a6af361b23d14bf54eea0 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 23 Nov 2021 10:59:28 +0100
Subject: [PATCH 364/735] Polishing

---
 .../org/springframework/oxm/xstream/XStreamMarshaller.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index c34de879a862..bdc89edd25fc 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -696,8 +696,8 @@ protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) t
 	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
 		try {
 			StaxWriter writer;
-			if (this.streamDriver instanceof StaxDriver) {
-				writer = ((StaxDriver) this.streamDriver).createStaxWriter(streamWriter);
+			if (this.streamDriver instanceof StaxDriver staxDriver) {
+				writer = staxDriver.createStaxWriter(streamWriter);
 			}
 			else {
 				writer = new StaxWriter(new QNameMap(), streamWriter, this.nameCoder);

From 6d9136013e5bf6f5655f9d8a3c68a7501e9a816c Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Tue, 19 Oct 2021 18:40:41 +0200
Subject: [PATCH 365/735] Refactor MimeType/MediaType specificity

This commit makes several changes to MimeType and MediaType
related to the topic of specificity.

This commit deprecates the MimeType and MediaType Comparators.
Comparators require a transitive relationship, and the desired order for
these types is not transitive (see #27488).

Instead, this commit introduces two new MimeType methods: isMoreSpecific
and isLessSpecific, both of which return booleans. MediaType overrides
these methods to include the quality factor (q) in the comparison.

All MediaType sorting methods have been deprecated in favor of
MimeTypeUtils::sortBySpecificity.  This sorting method now uses
MimeType::isLessSpecific in combination a bubble sort algorithm (which
does not require a transitive compare function).

Closes gh-27580
---
 .../org/springframework/util/MimeType.java    | 86 +++++++++++++++++-
 .../springframework/util/MimeTypeUtils.java   | 75 +++++++++-------
 .../springframework/util/MimeTypeTests.java   | 63 +++++++++++++
 .../org/springframework/http/MediaType.java   | 90 ++++++++++++++++++-
 .../springframework/http/MediaTypeTests.java  | 68 ++++++++++++++
 5 files changed, 342 insertions(+), 40 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
index b427527267d0..cf6010a4e570 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeType.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -26,7 +26,6 @@
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeSet;
@@ -529,7 +528,6 @@ private void appendTo(Map<String, String> map, StringBuilder builder) {
 	/**
 	 * Compares this MIME Type to another alphabetically.
 	 * @param other the MIME Type to compare to
-	 * @see MimeTypeUtils#sortBySpecificity(List)
 	 */
 	@Override
 	public int compareTo(MimeType other) {
@@ -592,6 +590,88 @@ public int compareTo(MimeType other) {
 		return 0;
 	}
 
+	/**
+	 * Indicates whether this {@code MimeType} is more specific than the given
+	 * type.
+	 * <ol>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code false}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code true}.</li>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code false}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code true}.</li>
+	 * <li>if the two mime types have identical {@linkplain #getType() type} and
+	 * {@linkplain #getSubtype() subtype}, then the mime type with the most
+	 * parameters is more specific than the other.</li>
+	 * <li>Otherwise, this method returns {@code false}.</li>
+	 * </ol>
+	 * @param other the {@code MimeType} to be compared
+	 * @return the result of the comparison
+	 * @since 6.0
+	 * @see #isLessSpecific(MimeType)
+	 * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.2">HTTP 1.1: Semantics
+	 * and Content, section 5.3.2</a>
+	 */
+	public boolean isMoreSpecific(MimeType other) {
+		Assert.notNull(other, "Other must not be null");
+		boolean thisWildcard = isWildcardType();
+		boolean otherWildcard = other.isWildcardType();
+		if (thisWildcard && !otherWildcard) {  // */* > audio/*
+			return false;
+		}
+		else if (!thisWildcard && otherWildcard) {  // audio/* < */*
+			return true;
+		}
+		else {
+			boolean thisWildcardSubtype = isWildcardSubtype();
+			boolean otherWildcardSubtype = other.isWildcardSubtype();
+			if (thisWildcardSubtype && !otherWildcardSubtype) {  // audio/* > audio/basic
+				return false;
+			}
+			else if (!thisWildcardSubtype && otherWildcardSubtype) {  // audio/basic < audio/*
+				return true;
+			}
+			else if (getType().equals(other.getType()) && getSubtype().equals(other.getSubtype())) {
+				int paramsSize1 = getParameters().size();
+				int paramsSize2 = other.getParameters().size();
+				return paramsSize1 > paramsSize2;
+			}
+			else {
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Indicates whether this {@code MimeType} is more less than the given type.
+	 * <ol>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code true}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code false}.</li>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code true}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code false}.</li>
+	 * <li>if the two mime types have identical {@linkplain #getType() type} and
+	 * {@linkplain #getSubtype() subtype}, then the mime type with the least
+	 * parameters is less specific than the other.</li>
+	 * <li>Otherwise, this method returns {@code false}.</li>
+	 * </ol>
+	 * @param other the {@code MimeType} to be compared
+	 * @return the result of the comparison
+	 * @since 6.0
+	 * @see #isMoreSpecific(MimeType)
+	 * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.2">HTTP 1.1: Semantics
+	 * and Content, section 5.3.2</a>
+	 */
+	public boolean isLessSpecific(MimeType other) {
+		Assert.notNull(other, "Other must not be null");
+		return other.isMoreSpecific(this);
+	}
+
 	private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
 		// Rely on default serialization, just initialize state after deserialization.
 		ois.defaultReadObject();
@@ -625,7 +705,9 @@ private static Map<String, String> addCharsetParameter(Charset charset, Map<Stri
 	 * Comparator to sort {@link MimeType MimeTypes} in order of specificity.
 	 *
 	 * @param <T> the type of mime types that may be compared by this comparator
+	 * @deprecated As of 6.0, with no direct replacement
 	 */
+	@Deprecated
 	public static class SpecificityComparator<T extends MimeType> implements Comparator<T> {
 
 		@Override
diff --git a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
index 05809bc5ad7b..3bea63fdea3a 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
 
 import org.springframework.lang.Nullable;
@@ -51,8 +52,10 @@ public abstract class MimeTypeUtils {
 					'V', 'W', 'X', 'Y', 'Z'};
 
 	/**
-	 * Comparator used by {@link #sortBySpecificity(List)}.
+	 * Comparator formally used by {@link #sortBySpecificity(List)}.
+	 * @deprecated As of 6.0, with no direct replacement
 	 */
+	@Deprecated
 	public static final Comparator<MimeType> SPECIFICITY_COMPARATOR = new MimeType.SpecificityComparator<>();
 
 	/**
@@ -334,37 +337,52 @@ public static String toString(Collection<? extends MimeType> mimeTypes) {
 	}
 
 	/**
-	 * Sorts the given list of {@code MimeType} objects by specificity.
-	 * <p>Given two mime types:
-	 * <ol>
-	 * <li>if either mime type has a {@linkplain MimeType#isWildcardType() wildcard type},
-	 * then the mime type without the wildcard is ordered before the other.</li>
-	 * <li>if the two mime types have different {@linkplain MimeType#getType() types},
-	 * then they are considered equal and remain their current order.</li>
-	 * <li>if either mime type has a {@linkplain MimeType#isWildcardSubtype() wildcard subtype}
-	 * , then the mime type without the wildcard is sorted before the other.</li>
-	 * <li>if the two mime types have different {@linkplain MimeType#getSubtype() subtypes},
-	 * then they are considered equal and remain their current order.</li>
-	 * <li>if the two mime types have a different amount of
-	 * {@linkplain MimeType#getParameter(String) parameters}, then the mime type with the most
-	 * parameters is ordered before the other.</li>
-	 * </ol>
-	 * <p>For example: <blockquote>audio/basic &lt; audio/* &lt; *&#047;*</blockquote>
-	 * <blockquote>audio/basic;level=1 &lt; audio/basic</blockquote>
-	 * <blockquote>audio/basic == text/html</blockquote> <blockquote>audio/basic ==
-	 * audio/wave</blockquote>
+	 * Sorts the given list of {@code MimeType} objects by
+	 * {@linkplain MimeType#isMoreSpecific(MimeType) specificity}.
+	 *
+	 * <p>Because of the computational cost, this method throws an exception
+	 * when the given list contains too many elements.
 	 * @param mimeTypes the list of mime types to be sorted
+	 * @throws IllegalArgumentException if {@code mimeTypes} contains more
+	 * than 50 elements
 	 * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.2">HTTP 1.1: Semantics
 	 * and Content, section 5.3.2</a>
+	 * @see MimeType#isMoreSpecific(MimeType)
 	 */
-	public static void sortBySpecificity(List<MimeType> mimeTypes) {
+	public static <T extends MimeType> void sortBySpecificity(List<T> mimeTypes) {
 		Assert.notNull(mimeTypes, "'mimeTypes' must not be null");
-		if (mimeTypes.size() > 1) {
-			mimeTypes.sort(SPECIFICITY_COMPARATOR);
+		Assert.isTrue(mimeTypes.size() <= 50, "Too many elements");
+
+		bubbleSort(mimeTypes, MimeType::isLessSpecific);
+	}
+
+	static <T> void bubbleSort(List<T> list, BiPredicate<? super T, ? super T> swap) {
+		int len = list.size();
+		for (int i = 0; i < len; i++) {
+			for (int j = 1; j < len - i ; j++) {
+				T prev = list.get(j - 1);
+				T cur = list.get(j);
+				if (swap.test(prev, cur)) {
+					list.set(j, prev);
+					list.set(j - 1, cur);
+				}
+			}
 		}
 	}
 
 
+	/**
+	 * Generate a random MIME boundary as bytes, often used in multipart mime types.
+	 */
+	public static byte[] generateMultipartBoundary() {
+		Random randomToUse = initRandom();
+		byte[] boundary = new byte[randomToUse.nextInt(11) + 30];
+		for (int i = 0; i < boundary.length; i++) {
+			boundary[i] = BOUNDARY_CHARS[randomToUse.nextInt(BOUNDARY_CHARS.length)];
+		}
+		return boundary;
+	}
+
 	/**
 	 * Lazily initialize the {@link SecureRandom} for {@link #generateMultipartBoundary()}.
 	 */
@@ -382,17 +400,6 @@ private static Random initRandom() {
 		return randomToUse;
 	}
 
-	/**
-	 * Generate a random MIME boundary as bytes, often used in multipart mime types.
-	 */
-	public static byte[] generateMultipartBoundary() {
-		Random randomToUse = initRandom();
-		byte[] boundary = new byte[randomToUse.nextInt(11) + 30];
-		for (int i = 0; i < boundary.length; i++) {
-			boundary[i] = BOUNDARY_CHARS[randomToUse.nextInt(BOUNDARY_CHARS.length)];
-		}
-		return boundary;
-	}
 
 	/**
 	 * Generate a random MIME boundary as String, often used in multipart mime types.
diff --git a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
index 59bfad035805..9c62f82be106 100644
--- a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
+++ b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
@@ -402,6 +402,69 @@ void compareToCaseSensitivity() {
 		assertThat(m2.compareTo(m1) != 0).as("Invalid comparison result").isTrue();
 	}
 
+	@Test
+	void isMoreSpecific() {
+		MimeType audioBasic = new MimeType("audio", "basic");
+		MimeType audio = new MimeType("audio");
+		MimeType audioWave = new MimeType("audio", "wave");
+		MimeType audioBasicLevel = new MimeType("audio", "basic", singletonMap("level", "1"));
+
+		assertThat(audioBasic.isMoreSpecific(audioBasicLevel)).isFalse();
+		assertThat(audioBasicLevel.isMoreSpecific(audioBasic)).isTrue();
+
+		assertThat(audio.isMoreSpecific(MimeTypeUtils.ALL)).isTrue();
+		assertThat(MimeTypeUtils.ALL.isMoreSpecific(audio)).isFalse();
+
+		assertThat(audioBasicLevel.isMoreSpecific(audioBasic)).isTrue();
+		assertThat(audioBasic.isMoreSpecific(audioBasicLevel)).isFalse();
+
+		assertThat(audioBasic.isMoreSpecific(MimeTypeUtils.TEXT_HTML)).isFalse();
+		assertThat(audioBasic.isMoreSpecific(audioWave)).isFalse();
+		assertThat(audioBasicLevel.isMoreSpecific(MimeTypeUtils.TEXT_HTML)).isFalse();
+	}
+
+	@Test
+	void isLessSpecific() {
+		MimeType audioBasic = new MimeType("audio", "basic");
+		MimeType audio = new MimeType("audio");
+		MimeType audioWave = new MimeType("audio", "wave");
+		MimeType audioBasicLevel = new MimeType("audio", "basic", singletonMap("level", "1"));
+
+		assertThat(audioBasic.isLessSpecific(audioBasicLevel)).isTrue();
+		assertThat(audioBasicLevel.isLessSpecific(audioBasic)).isFalse();
+
+		assertThat(audio.isLessSpecific(MimeTypeUtils.ALL)).isFalse();
+		assertThat(MimeTypeUtils.ALL.isLessSpecific(audio)).isTrue();
+
+		assertThat(audioBasicLevel.isLessSpecific(audioBasic)).isFalse();
+		assertThat(audioBasic.isLessSpecific(audioBasicLevel)).isTrue();
+
+		assertThat(audioBasic.isLessSpecific(MimeTypeUtils.TEXT_HTML)).isFalse();
+		assertThat(audioBasic.isLessSpecific(audioWave)).isFalse();
+		assertThat(audioBasicLevel.isLessSpecific(MimeTypeUtils.TEXT_HTML)).isFalse();
+	}
+
+	@Test
+	void sortBySpecificity() {
+		MimeType audioBasic = new MimeType("audio", "basic");
+		MimeType audio = new MimeType("audio");
+		MimeType audioWave = new MimeType("audio", "wave");
+		MimeType audioBasicLevel = new MimeType("audio", "basic", singletonMap("level", "1"));
+
+		List<MimeType> mimeTypes = new ArrayList<>(List.of(MimeTypeUtils.ALL, audio, audioWave, audioBasic,
+				audioBasicLevel));
+		MimeTypeUtils.sortBySpecificity(mimeTypes);
+
+		assertThat(mimeTypes).containsExactly(audioWave, audioBasicLevel, audioBasic, audio, MimeTypeUtils.ALL);
+	}
+
+	@Test
+	void bubbleSort() {
+		List<Integer> list = new ArrayList<>(List.of(10, 9, 8, 7, 6, 5, 4, 3, 2, 1));
+		MimeTypeUtils.bubbleSort(list, (i1, i2) -> i1 > i2);
+		assertThat(list).containsExactly(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+	}
+
 	@Test  // SPR-13157
 	void equalsIsCaseInsensitiveForCharsets() {
 		MimeType m1 = new MimeType("text", "plain", singletonMap("charset", "UTF-8"));
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index 17744012ac13..ae279fc0c6d0 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -534,6 +534,82 @@ public double getQualityValue() {
 		return (qualityFactor != null ? Double.parseDouble(unquote(qualityFactor)) : 1D);
 	}
 
+	/**
+	 * Indicates whether this {@code MediaType} more specific than the given type.
+	 * <ol>
+	 * <li>if this media type has a {@linkplain #getQualityValue() quality factor} higher than the other,
+	 * then this method returns {@code true}.</li>
+	 * <li>if this media type has a {@linkplain #getQualityValue() quality factor} lower than the other,
+	 * then this method returns {@code false}.</li>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code false}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code true}.</li>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code false}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code true}.</li>
+	 * <li>if the two mime types have identical {@linkplain #getType() type} and
+	 * {@linkplain #getSubtype() subtype}, then the mime type with the most
+	 * parameters is more specific than the other.</li>
+	 * <li>Otherwise, this method returns {@code false}.</li>
+	 * </ol>
+	 * @param other the {@code MimeType} to be compared
+	 * @return the result of the comparison
+	 * @since 6.0
+	 * @see #isLessSpecific(MimeType)
+	 * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.2">HTTP 1.1: Semantics
+	 * and Content, section 5.3.2</a>
+	 */
+	@Override
+	public boolean isMoreSpecific(MimeType other) {
+		Assert.notNull(other, "Other must not be null");
+		if (other instanceof MediaType otherMediaType) {
+			double quality1 = getQualityValue();
+			double quality2 = otherMediaType.getQualityValue();
+			if (quality1 > quality2) {
+				return true;
+			}
+			else if (quality1 < quality2) {
+				return false;
+			}
+		}
+		return super.isMoreSpecific(other);
+	}
+
+	/**
+	 * Indicates whether this {@code MediaType} more specific than the given type.
+	 * <ol>
+	 * <li>if this media type has a {@linkplain #getQualityValue() quality factor} higher than the other,
+	 * then this method returns {@code false}.</li>
+	 * <li>if this media type has a {@linkplain #getQualityValue() quality factor} lower than the other,
+	 * then this method returns {@code true}.</li>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code true}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code false}.</li>
+	 * <li>if this mime type has a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does not, then this method returns {@code true}.</li>
+	 * <li>if this mime type does not have a {@linkplain #isWildcardType() wildcard type},
+	 * and the other does, then this method returns {@code false}.</li>
+	 * <li>if the two mime types have identical {@linkplain #getType() type} and
+	 * {@linkplain #getSubtype() subtype}, then the mime type with the least
+	 * parameters is less specific than the other.</li>
+	 * <li>Otherwise, this method returns {@code false}.</li>
+	 * </ol>
+	 * @param other the {@code MimeType} to be compared
+	 * @return the result of the comparison
+	 * @since 6.0
+	 * @see #isMoreSpecific(MimeType)
+	 * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.2">HTTP 1.1: Semantics
+	 * and Content, section 5.3.2</a>
+	 */
+	@Override
+	public boolean isLessSpecific(MimeType other) {
+		Assert.notNull(other, "Other must not be null");
+		return other.isMoreSpecific(this);
+	}
+
 	/**
 	 * Indicate whether this {@code MediaType} includes the given media type.
 	 * <p>For instance, {@code text/*} includes {@code text/plain} and {@code text/html},
@@ -731,9 +807,9 @@ public static String toString(Collection<MediaType> mediaTypes) {
 	 * <blockquote>audio/basic == text/html</blockquote>
 	 * <blockquote>audio/basic == audio/wave</blockquote>
 	 * @param mediaTypes the list of media types to be sorted
-	 * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.2">HTTP 1.1: Semantics
-	 * and Content, section 5.3.2</a>
+	 * @deprecated As of 6.0, in favor of {@link MimeTypeUtils#sortBySpecificity(List)}
 	 */
+	@Deprecated
 	public static void sortBySpecificity(List<MediaType> mediaTypes) {
 		Assert.notNull(mediaTypes, "'mediaTypes' must not be null");
 		if (mediaTypes.size() > 1) {
@@ -760,7 +836,9 @@ public static void sortBySpecificity(List<MediaType> mediaTypes) {
 	 * </ol>
 	 * @param mediaTypes the list of media types to be sorted
 	 * @see #getQualityValue()
+	 * @deprecated As of 6.0, with no direct replacement
 	 */
+	@Deprecated
 	public static void sortByQualityValue(List<MediaType> mediaTypes) {
 		Assert.notNull(mediaTypes, "'mediaTypes' must not be null");
 		if (mediaTypes.size() > 1) {
@@ -771,9 +849,9 @@ public static void sortByQualityValue(List<MediaType> mediaTypes) {
 	/**
 	 * Sorts the given list of {@code MediaType} objects by specificity as the
 	 * primary criteria and quality value the secondary.
-	 * @see MediaType#sortBySpecificity(List)
-	 * @see MediaType#sortByQualityValue(List)
+	 * @deprecated As of 6.0, in favor of {@link MimeTypeUtils#sortBySpecificity(List)}
 	 */
+	@Deprecated
 	public static void sortBySpecificityAndQuality(List<MediaType> mediaTypes) {
 		Assert.notNull(mediaTypes, "'mediaTypes' must not be null");
 		if (mediaTypes.size() > 1) {
@@ -784,7 +862,9 @@ public static void sortBySpecificityAndQuality(List<MediaType> mediaTypes) {
 
 	/**
 	 * Comparator used by {@link #sortByQualityValue(List)}.
+	 * @deprecated As of 6.0, with no direct replacement
 	 */
+	@Deprecated
 	public static final Comparator<MediaType> QUALITY_VALUE_COMPARATOR = (mediaType1, mediaType2) -> {
 		double quality1 = mediaType1.getQualityValue();
 		double quality2 = mediaType2.getQualityValue();
@@ -822,7 +902,9 @@ else if (!mediaType1.getSubtype().equals(mediaType2.getSubtype())) {  // audio/b
 
 	/**
 	 * Comparator used by {@link #sortBySpecificity(List)}.
+	 * @deprecated As of 6.0, with no direct replacement
 	 */
+	@Deprecated
 	public static final Comparator<MediaType> SPECIFICITY_COMPARATOR = new SpecificityComparator<>() {
 
 		@Override
diff --git a/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java b/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
index 74e73bfa7126..9c145058452c 100644
--- a/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
+++ b/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
@@ -28,6 +28,7 @@
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
+import org.springframework.util.MimeTypeUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -240,6 +241,44 @@ public void compareToCaseSensitivity() {
 
 	}
 
+	@Test
+	void isMoreSpecific() {
+		MediaType audio = new MediaType("audio");
+		MediaType audioBasic = new MediaType("audio", "basic");
+		MediaType audioBasic07 = new MediaType("audio", "basic", 0.7);
+		MediaType audioBasic03 = new MediaType("audio", "basic", 0.3);
+
+		assertThat(audioBasic.isMoreSpecific(audio)).isTrue();
+		assertThat(audio.isMoreSpecific(audioBasic)).isFalse();
+
+		assertThat(audio.isMoreSpecific(audioBasic07)).isTrue();
+		assertThat(audioBasic07.isMoreSpecific(audio)).isFalse();
+
+		assertThat(audioBasic07.isMoreSpecific(audioBasic03)).isTrue();
+		assertThat(audioBasic03.isMoreSpecific(audioBasic07)).isFalse();
+
+		assertThat(audioBasic.isMoreSpecific(MediaType.TEXT_HTML)).isFalse();
+	}
+
+	@Test
+	void isLessSpecific() {
+		MediaType audio = new MediaType("audio");
+		MediaType audioBasic = new MediaType("audio", "basic");
+		MediaType audioBasic07 = new MediaType("audio", "basic", 0.7);
+		MediaType audioBasic03 = new MediaType("audio", "basic", 0.3);
+
+		assertThat(audioBasic.isLessSpecific(audio)).isFalse();
+		assertThat(audio.isLessSpecific(audioBasic)).isTrue();
+
+		assertThat(audio.isLessSpecific(audioBasic07)).isFalse();
+		assertThat(audioBasic07.isLessSpecific(audio)).isTrue();
+
+		assertThat(audioBasic07.isLessSpecific(audioBasic03)).isFalse();
+		assertThat(audioBasic03.isLessSpecific(audioBasic07)).isTrue();
+
+		assertThat(audioBasic.isLessSpecific(MediaType.TEXT_HTML)).isFalse();
+	}
+
 	@Test
 	public void specificityComparator() throws Exception {
 		MediaType audioBasic = new MediaType("audio", "basic");
@@ -470,4 +509,33 @@ void serialize() throws Exception {
 		assertThat(original).isEqualTo(deserialized);
 	}
 
+	@Test
+	public void sortBySpecificity() {
+		MediaType audioBasic = new MediaType("audio", "basic");
+		MediaType audio = new MediaType("audio");
+		MediaType audio03 = new MediaType("audio", "*", 0.3);
+		MediaType audio07 = new MediaType("audio", "*", 0.7);
+		MediaType audioBasicLevel = new MediaType("audio", "basic", Collections.singletonMap("level", "1"));
+		MediaType all = MediaType.ALL;
+
+		List<MediaType> expected = new ArrayList<>();
+		expected.add(audioBasicLevel);
+		expected.add(audioBasic);
+		expected.add(audio);
+		expected.add(all);
+		expected.add(audio07);
+		expected.add(audio03);
+
+		List<MediaType> result = new ArrayList<>(expected);
+		Random rnd = new Random();
+		// shuffle & sort 10 times
+		for (int i = 0; i < 10; i++) {
+			Collections.shuffle(result, rnd);
+			MimeTypeUtils.sortBySpecificity(result);
+
+			assertThat(result).containsExactlyElementsOf(expected);
+
+		}
+	}
+
 }

From 259bcd60fbbc5cdb8b230595a5004707f4c6ff23 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Wed, 20 Oct 2021 11:47:53 +0200
Subject: [PATCH 366/735] Change deprecated MimeType specificity usages

This commit changes all code that uses now deprecated methods in
MimeType and MediaType.

See gh-27580
---
 .../accept/HeaderContentNegotiationStrategy.java    |  3 ++-
 .../springframework/web/client/RestTemplate.java    |  3 ++-
 .../reactive/accept/HeaderContentTypeResolver.java  |  3 ++-
 .../reactive/function/server/RequestPredicates.java |  3 ++-
 .../result/HandlerResultHandlerSupport.java         | 12 ++++++++----
 .../condition/AbstractMediaTypeExpression.java      | 13 +++++++++++--
 .../result/condition/ProducesRequestCondition.java  |  6 ++++--
 .../condition/ProducesRequestConditionTests.java    |  4 ++--
 .../web/servlet/function/DefaultServerRequest.java  | 11 +++++++----
 .../web/servlet/function/RequestPredicates.java     |  3 ++-
 .../mvc/condition/AbstractMediaTypeExpression.java  | 12 +++++++++++-
 .../mvc/condition/ProducesRequestCondition.java     |  6 ++++--
 ...tractMessageConverterMethodArgumentResolver.java |  5 +++--
 .../AbstractMessageConverterMethodProcessor.java    | 10 ++++++++--
 .../view/ContentNegotiatingViewResolver.java        | 10 ++++++++--
 .../condition/ProducesRequestConditionTests.java    |  4 ++--
 16 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java
index 08880a61e97e..9ef86aabfd1a 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java
@@ -23,6 +23,7 @@
 import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.context.request.NativeWebRequest;
 
@@ -51,7 +52,7 @@ public List<MediaType> resolveMediaTypes(NativeWebRequest request)
 		List<String> headerValues = Arrays.asList(headerValueArray);
 		try {
 			List<MediaType> mediaTypes = MediaType.parseMediaTypes(headerValues);
-			MediaType.sortBySpecificityAndQuality(mediaTypes);
+			MimeTypeUtils.sortBySpecificity(mediaTypes);
 			return !CollectionUtils.isEmpty(mediaTypes) ? mediaTypes : MEDIA_TYPE_ALL_LIST;
 		}
 		catch (InvalidMediaTypeException ex) {
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index b38076727a26..7e27ac62a76b 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -61,6 +61,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.web.util.DefaultUriBuilderFactory;
 import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode;
 import org.springframework.web.util.UriTemplateHandler;
@@ -878,8 +879,8 @@ public void doWithRequest(ClientHttpRequest request) throws IOException {
 						.filter(converter -> canReadResponse(this.responseType, converter))
 						.flatMap((HttpMessageConverter<?> converter) -> getSupportedMediaTypes(this.responseType, converter))
 						.distinct()
-						.sorted(MediaType.SPECIFICITY_COMPARATOR)
 						.collect(Collectors.toList());
+				MimeTypeUtils.sortBySpecificity(allSupportedMediaTypes);
 				if (logger.isDebugEnabled()) {
 					logger.debug("Accept=" + allSupportedMediaTypes);
 				}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java
index 88bc3ab250f0..b4e1d2063548 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java
@@ -21,6 +21,7 @@
 import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.web.server.NotAcceptableStatusException;
 import org.springframework.web.server.ServerWebExchange;
 
@@ -36,7 +37,7 @@ public class HeaderContentTypeResolver implements RequestedContentTypeResolver {
 	public List<MediaType> resolveMediaTypes(ServerWebExchange exchange) throws NotAcceptableStatusException {
 		try {
 			List<MediaType> mediaTypes = exchange.getRequest().getHeaders().getAccept();
-			MediaType.sortBySpecificityAndQuality(mediaTypes);
+			MimeTypeUtils.sortBySpecificity(mediaTypes);
 			return (!CollectionUtils.isEmpty(mediaTypes) ? mediaTypes : MEDIA_TYPE_ALL_LIST);
 		}
 		catch (InvalidMediaTypeException ex) {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
index d2c68f6760fe..444d7d44a859 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
@@ -51,6 +51,7 @@
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.cors.reactive.CorsUtils;
 import org.springframework.web.reactive.function.BodyExtractor;
@@ -630,7 +631,7 @@ private static List<MediaType> acceptedMediaTypes(ServerRequest.Headers headers)
 				acceptedMediaTypes = Collections.singletonList(MediaType.ALL);
 			}
 			else {
-				MediaType.sortBySpecificityAndQuality(acceptedMediaTypes);
+				MimeTypeUtils.sortBySpecificity(acceptedMediaTypes);
 			}
 			return acceptedMediaTypes;
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/HandlerResultHandlerSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/HandlerResultHandlerSupport.java
index 22bd32952870..e7a8d3da71cf 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/HandlerResultHandlerSupport.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/HandlerResultHandlerSupport.java
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -33,6 +32,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.web.reactive.HandlerMapping;
 import org.springframework.web.reactive.HandlerResult;
 import org.springframework.web.reactive.accept.RequestedContentTypeResolver;
@@ -141,7 +141,7 @@ protected MediaType selectMediaType(
 		}
 
 		List<MediaType> result = new ArrayList<>(compatibleMediaTypes);
-		MediaType.sortBySpecificityAndQuality(result);
+		MimeTypeUtils.sortBySpecificity(result);
 
 		MediaType selected = null;
 		for (MediaType mediaType : result) {
@@ -183,8 +183,12 @@ private List<MediaType> getProducibleTypes(
 
 	private MediaType selectMoreSpecificMediaType(MediaType acceptable, MediaType producible) {
 		producible = producible.copyQualityValue(acceptable);
-		Comparator<MediaType> comparator = MediaType.SPECIFICITY_COMPARATOR;
-		return (comparator.compare(acceptable, producible) <= 0 ? acceptable : producible);
+		if (acceptable.isLessSpecific(producible)) {
+			return producible;
+		}
+		else {
+			return acceptable;
+		}
 	}
 
 }
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
index 63a9be423984..82e8bfb9aafa 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
@@ -78,10 +78,19 @@ public final boolean match(ServerWebExchange exchange) {
 	protected abstract boolean matchMediaType(ServerWebExchange exchange)
 			throws NotAcceptableStatusException, UnsupportedMediaTypeStatusException;
 
-
 	@Override
 	public int compareTo(AbstractMediaTypeExpression other) {
-		return MediaType.SPECIFICITY_COMPARATOR.compare(this.getMediaType(), other.getMediaType());
+		MediaType mediaType1 = this.getMediaType();
+		MediaType mediaType2 = other.getMediaType();
+		if (mediaType1.isMoreSpecific(mediaType2)) {
+			return -1;
+		}
+		else if (mediaType1.isLessSpecific(mediaType2)) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
 	}
 
 	@Override
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
index 6fa70307ad73..205159fcd811 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
@@ -25,6 +25,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.accept.ContentNegotiationManager;
@@ -232,13 +233,14 @@ private List<ProduceMediaTypeExpression> getMatchingExpressions(ServerWebExchang
 	 * Compares this and another "produces" condition as follows:
 	 * <ol>
 	 * <li>Sort 'Accept' header media types by quality value via
-	 * {@link MediaType#sortByQualityValue(List)} and iterate the list.
+	 * {@link org.springframework.util.MimeTypeUtils#sortBySpecificity(List)}
+	 * and iterate the list.
 	 * <li>Get the first index of matching media types in each "produces"
 	 * condition first matching with {@link MediaType#equals(Object)} and
 	 * then with {@link MediaType#includes(MediaType)}.
 	 * <li>If a lower index is found, the condition at that index wins.
 	 * <li>If both indexes are equal, the media types at the index are
-	 * compared further with {@link MediaType#SPECIFICITY_COMPARATOR}.
+	 * compared further with {@link MediaType#isMoreSpecific(MimeType)}.
 	 * </ol>
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(ServerWebExchange)} and each instance
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
index 3b9e7e97534e..978ca9b32074 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
@@ -206,10 +206,10 @@ public void compareToMultipleExpressions() {
 		MockServerWebExchange exchange = MockServerWebExchange.from(get("/").header("Accept", "text/plain"));
 
 		int result = condition1.compareTo(condition2, exchange);
-		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
+		assertThat(result).as("Invalid comparison result: " + result).isGreaterThan(0);
 
 		result = condition2.compareTo(condition1, exchange);
-		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
+		assertThat(result).as("Invalid comparison result: " + result).isLessThan(0);
 	}
 
 	@Test
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
index 81f3700daee0..f09177c2af40 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
@@ -57,6 +57,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.HttpMediaTypeNotSupportedException;
@@ -203,10 +204,12 @@ private <T> T bodyInternal(Type bodyType, Class<?> bodyClass) throws ServletExce
 	}
 
 	private List<MediaType> getSupportedMediaTypes(Class<?> bodyClass) {
-		return this.messageConverters.stream()
-				.flatMap(converter -> converter.getSupportedMediaTypes(bodyClass).stream())
-				.sorted(MediaType.SPECIFICITY_COMPARATOR)
-				.collect(Collectors.toList());
+		List<MediaType> result = new ArrayList<>(this.messageConverters.size());
+		for (HttpMessageConverter<?> converter : this.messageConverters) {
+			result.addAll(converter.getSupportedMediaTypes(bodyClass));
+		}
+		MimeTypeUtils.sortBySpecificity(result);
+		return result;
 	}
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
index d29a96271e9c..db160bc4b9c2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
@@ -53,6 +53,7 @@
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.cors.CorsUtils;
 import org.springframework.web.util.UriBuilder;
@@ -628,7 +629,7 @@ private static List<MediaType> acceptedMediaTypes(ServerRequest.Headers headers)
 				acceptedMediaTypes = Collections.singletonList(MediaType.ALL);
 			}
 			else {
-				MediaType.sortBySpecificityAndQuality(acceptedMediaTypes);
+				MimeTypeUtils.sortBySpecificity(acceptedMediaTypes);
 			}
 			return acceptedMediaTypes;
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
index 0b3c6319933d..064fbb0c1726 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
@@ -65,7 +65,17 @@ public boolean isNegated() {
 
 	@Override
 	public int compareTo(AbstractMediaTypeExpression other) {
-		return MediaType.SPECIFICITY_COMPARATOR.compare(this.getMediaType(), other.getMediaType());
+		MediaType mediaType1 = this.getMediaType();
+		MediaType mediaType2 = other.getMediaType();
+		if (mediaType1.isMoreSpecific(mediaType2)) {
+			return -1;
+		}
+		else if (mediaType1.isLessSpecific(mediaType2)) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
 	}
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
index b7e3aa4fed66..6361a22fca60 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
@@ -27,6 +27,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.HttpMediaTypeException;
@@ -238,13 +239,14 @@ private List<ProduceMediaTypeExpression> getMatchingExpressions(List<MediaType>
 	 * Compares this and another "produces" condition as follows:
 	 * <ol>
 	 * <li>Sort 'Accept' header media types by quality value via
-	 * {@link MediaType#sortByQualityValue(List)} and iterate the list.
+	 * {@link org.springframework.util.MimeTypeUtils#sortBySpecificity(List)}
+	 * and iterate the list.
 	 * <li>Get the first index of matching media types in each "produces"
 	 * condition first matching with {@link MediaType#equals(Object)} and
 	 * then with {@link MediaType#includes(MediaType)}.
 	 * <li>If a lower index is found, the condition at that index wins.
 	 * <li>If both indexes are equal, the media types at the index are
-	 * compared further with {@link MediaType#SPECIFICITY_COMPARATOR}.
+	 * compared further with {@link MediaType#isMoreSpecific(MimeType)}.
 	 * </ol>
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
index b9bf4a176b19..f550766908f1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
@@ -48,6 +48,7 @@
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.StreamUtils;
 import org.springframework.validation.Errors;
 import org.springframework.validation.annotation.ValidationAnnotationUtils;
@@ -263,7 +264,7 @@ protected boolean isBindExceptionRequired(WebDataBinder binder, MethodParameter
 
 	/**
 	 * Return the media types supported by all provided message converters sorted
-	 * by specificity via {@link MediaType#sortBySpecificity(List)}.
+	 * by specificity via {@link MimeTypeUtils#sortBySpecificity(List)}.
 	 * @since 5.3.4
 	 */
 	protected List<MediaType> getSupportedMediaTypes(Class<?> clazz) {
@@ -272,7 +273,7 @@ protected List<MediaType> getSupportedMediaTypes(Class<?> clazz) {
 			mediaTypeSet.addAll(converter.getSupportedMediaTypes(clazz));
 		}
 		List<MediaType> result = new ArrayList<>(mediaTypeSet);
-		MediaType.sortBySpecificity(result);
+		MimeTypeUtils.sortBySpecificity(result);
 		return result;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
index bd18540925b9..23bb651e20c4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
@@ -53,6 +53,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.accept.ContentNegotiationManager;
@@ -251,7 +252,7 @@ protected <T> void writeWithMessageConverters(@Nullable T value, MethodParameter
 				return;
 			}
 
-			MediaType.sortBySpecificityAndQuality(mediaTypesToUse);
+			MimeTypeUtils.sortBySpecificity(mediaTypesToUse);
 
 			for (MediaType mediaType : mediaTypesToUse) {
 				if (mediaType.isConcrete()) {
@@ -400,7 +401,12 @@ private List<MediaType> getAcceptableMediaTypes(HttpServletRequest request)
 	 */
 	private MediaType getMostSpecificMediaType(MediaType acceptType, MediaType produceType) {
 		MediaType produceTypeToUse = produceType.copyQualityValue(acceptType);
-		return (MediaType.SPECIFICITY_COMPARATOR.compare(acceptType, produceTypeToUse) <= 0 ? acceptType : produceTypeToUse);
+		if (acceptType.isLessSpecific(produceTypeToUse)) {
+			return produceTypeToUse;
+		}
+		else {
+			return acceptType;
+		}
 	}
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
index 4fdb0a2c8835..9f1c2d3b20b1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
@@ -37,6 +37,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.accept.ContentNegotiationManager;
@@ -268,7 +269,7 @@ protected List<MediaType> getMediaTypes(HttpServletRequest request) {
 				}
 			}
 			List<MediaType> selectedMediaTypes = new ArrayList<>(compatibleMediaTypes);
-			MediaType.sortBySpecificityAndQuality(selectedMediaTypes);
+			MimeTypeUtils.sortBySpecificity(selectedMediaTypes);
 			return selectedMediaTypes;
 		}
 		catch (HttpMediaTypeNotAcceptableException ex) {
@@ -297,7 +298,12 @@ private List<MediaType> getProducibleMediaTypes(HttpServletRequest request) {
 	 */
 	private MediaType getMostSpecificMediaType(MediaType acceptType, MediaType produceType) {
 		produceType = produceType.copyQualityValue(acceptType);
-		return (MediaType.SPECIFICITY_COMPARATOR.compare(acceptType, produceType) < 0 ? acceptType : produceType);
+		if (acceptType.isLessSpecific(produceType)) {
+			return produceType;
+		}
+		else {
+			return acceptType;
+		}
 	}
 
 	private List<View> getCandidateViews(String viewName, Locale locale, List<MediaType> requestedMediaTypes)
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
index 15244e1baa25..1f8850e49b7e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
@@ -221,10 +221,10 @@ public void compareToMultipleExpressions() {
 		HttpServletRequest request = createRequest("text/plain");
 
 		int result = condition1.compareTo(condition2, request);
-		assertThat(result < 0).as("Invalid comparison result: " + result).isTrue();
+		assertThat(result).as("Invalid comparison result: " + result).isGreaterThan(0);
 
 		result = condition2.compareTo(condition1, request);
-		assertThat(result > 0).as("Invalid comparison result: " + result).isTrue();
+		assertThat(result).as("Invalid comparison result: " + result).isLessThan(0);
 	}
 
 	@Test

From 2c53e9e308dc39c5988c014a12d32917f0b5528d Mon Sep 17 00:00:00 2001
From: Federico Donnarumma <federico.donnarumma@mulesoft.com>
Date: Fri, 25 Nov 2016 17:33:49 -0300
Subject: [PATCH 367/735] Expose prestartAllCoreThreads on ExecutorService

See gh-1246
---
 .../ThreadPoolExecutorFactoryBean.java        | 21 +++++-
 .../ThreadPoolExecutorFactoryBeanTests.java   | 64 +++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
index e880489f80af..26dcec6370b7 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
@@ -73,12 +73,14 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 
 	private int keepAliveSeconds = 60;
 
-	private boolean allowCoreThreadTimeOut = false;
-
 	private int queueCapacity = Integer.MAX_VALUE;
 
+	private boolean allowCoreThreadTimeOut = false;
+
 	private boolean exposeUnconfigurableExecutor = false;
 
+	private boolean prestartAllCoreThreads = false;
+
 	@Nullable
 	private ExecutorService exposedExecutor;
 
@@ -130,6 +132,17 @@ public void setQueueCapacity(int queueCapacity) {
 		this.queueCapacity = queueCapacity;
 	}
 
+	/**
+	 * Specify whether this FactoryBean should prestart all threads
+	 * for the created executor.
+	 * <p>Default is "false".
+	 * Switch this flag to "true" to prestart the threads allocated for the current executor
+	 * @see java.util.concurrent.ThreadPoolExecutor#prestartAllCoreThreads
+	 */
+	public void setPrestartAllCoreThreads(boolean prestartAllCoreThreads) {
+		this.prestartAllCoreThreads = prestartAllCoreThreads;
+	}
+
 	/**
 	 * Specify whether this FactoryBean should expose an unconfigurable
 	 * decorator for the created executor.
@@ -154,6 +167,10 @@ protected ExecutorService initializeExecutor(
 			executor.allowCoreThreadTimeOut(true);
 		}
 
+		if (this.prestartAllCoreThreads) {
+			executor.prestartAllCoreThreads();
+		}
+
 		// Wrap executor with an unconfigurable decorator.
 		this.exposedExecutor = (this.exposeUnconfigurableExecutor ?
 				Executors.unconfigurableExecutorService(executor) : executor);
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
index abba6cf16849..c5731e3139f6 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
@@ -16,17 +16,25 @@
 
 package org.springframework.scheduling.concurrent;
 
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.FutureTask;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 /**
  * @author Juergen Hoeller
@@ -44,6 +52,21 @@ void defaultExecutor() throws Exception {
 		context.close();
 	}
 
+	@Test
+	public void executorWithPreStartedThreads() throws Exception {
+		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(ExecutorConfigWithPreStartedThreads.class);
+		ThreadPoolExecutor executor = context.getBean("childExecutor", ThreadPoolExecutor.class);
+
+		verify(executor).prestartAllCoreThreads();
+	}
+
+	@Test
+	public void executorWithNoPreStartedThreads() throws Exception {
+		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(ExecutorConfigWithNoPreStartedThreads.class);
+		ThreadPoolExecutor executor = context.getBean("childExecutor", ThreadPoolExecutor.class);
+
+		verify(executor, never()).prestartAllCoreThreads();
+	}
 
 	@Configuration
 	static class ExecutorConfig {
@@ -55,4 +78,45 @@ ThreadPoolExecutorFactoryBean executor() {
 
 	}
 
+	@Configuration
+	public static class ExecutorConfigWithPreStartedThreads {
+
+		@Bean
+		public ThreadPoolExecutorFactoryBean executorChildFactory() {
+			ThreadPoolExecutorFactoryBeanMockingChild threadPoolExecutorFactoryBeanMockingChild = new ThreadPoolExecutorFactoryBeanMockingChild();
+			threadPoolExecutorFactoryBeanMockingChild.setPrestartAllCoreThreads(true);
+			return threadPoolExecutorFactoryBeanMockingChild;
+		}
+
+		@Bean
+		public ExecutorService childExecutor() {
+			return executorChildFactory().getObject();
+		}
+	}
+
+	@Configuration
+	public static class ExecutorConfigWithNoPreStartedThreads {
+
+		@Bean
+		public ThreadPoolExecutorFactoryBean executorChildFactory() {
+			return new ThreadPoolExecutorFactoryBeanMockingChild();
+		}
+
+		@Bean
+		public ExecutorService childExecutor() {
+			return executorChildFactory().getObject();
+		}
+	}
+
+	private static class ThreadPoolExecutorFactoryBeanMockingChild extends ThreadPoolExecutorFactoryBean {
+		@Override
+		protected ThreadPoolExecutor createExecutor(
+				int corePoolSize, int maxPoolSize, int keepAliveSeconds, BlockingQueue<Runnable> queue,
+				ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
+
+			return mock(ThreadPoolExecutor.class);
+		}
+	}
+
+
 }

From 19a8b94b21a3cd8740b06b9910734cd136b226ad Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 23 Nov 2021 17:15:18 +0100
Subject: [PATCH 368/735] Polish "Expose prestartAllCoreThreads on
 ExecutorService"

See gh-1246
---
 .../ThreadPoolExecutorFactoryBean.java        | 32 +++++-----
 .../concurrent/ThreadPoolTaskExecutor.java    | 17 ++++-
 .../ThreadPoolExecutorFactoryBeanTests.java   | 64 ++++++-------------
 3 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
index 26dcec6370b7..d95fef71f22a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,14 +73,14 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 
 	private int keepAliveSeconds = 60;
 
-	private int queueCapacity = Integer.MAX_VALUE;
-
 	private boolean allowCoreThreadTimeOut = false;
 
-	private boolean exposeUnconfigurableExecutor = false;
-
 	private boolean prestartAllCoreThreads = false;
 
+	private int queueCapacity = Integer.MAX_VALUE;
+
+	private boolean exposeUnconfigurableExecutor = false;
+
 	@Nullable
 	private ExecutorService exposedExecutor;
 
@@ -120,6 +120,16 @@ public void setAllowCoreThreadTimeOut(boolean allowCoreThreadTimeOut) {
 		this.allowCoreThreadTimeOut = allowCoreThreadTimeOut;
 	}
 
+	/**
+	 * Specify whether to start all core threads, causing them to idly wait for work.
+	 * <p>Default is "false".
+	 * @since 5.3.14
+	 * @see java.util.concurrent.ThreadPoolExecutor#prestartAllCoreThreads
+	 */
+	public void setPrestartAllCoreThreads(boolean prestartAllCoreThreads) {
+		this.prestartAllCoreThreads = prestartAllCoreThreads;
+	}
+
 	/**
 	 * Set the capacity for the ThreadPoolExecutor's BlockingQueue.
 	 * Default is {@code Integer.MAX_VALUE}.
@@ -132,17 +142,6 @@ public void setQueueCapacity(int queueCapacity) {
 		this.queueCapacity = queueCapacity;
 	}
 
-	/**
-	 * Specify whether this FactoryBean should prestart all threads
-	 * for the created executor.
-	 * <p>Default is "false".
-	 * Switch this flag to "true" to prestart the threads allocated for the current executor
-	 * @see java.util.concurrent.ThreadPoolExecutor#prestartAllCoreThreads
-	 */
-	public void setPrestartAllCoreThreads(boolean prestartAllCoreThreads) {
-		this.prestartAllCoreThreads = prestartAllCoreThreads;
-	}
-
 	/**
 	 * Specify whether this FactoryBean should expose an unconfigurable
 	 * decorator for the created executor.
@@ -166,7 +165,6 @@ protected ExecutorService initializeExecutor(
 		if (this.allowCoreThreadTimeOut) {
 			executor.allowCoreThreadTimeOut(true);
 		}
-
 		if (this.prestartAllCoreThreads) {
 			executor.prestartAllCoreThreads();
 		}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
index 486e0c7cddb6..928814524c67 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,6 +94,8 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport
 
 	private boolean allowCoreThreadTimeOut = false;
 
+	private boolean prestartAllCoreThreads = false;
+
 	@Nullable
 	private TaskDecorator taskDecorator;
 
@@ -197,6 +199,16 @@ public void setAllowCoreThreadTimeOut(boolean allowCoreThreadTimeOut) {
 		this.allowCoreThreadTimeOut = allowCoreThreadTimeOut;
 	}
 
+	/**
+	 * Specify whether to start all core threads, causing them to idly wait for work.
+	 * <p>Default is "false".
+	 * @since 5.3.14
+	 * @see java.util.concurrent.ThreadPoolExecutor#prestartAllCoreThreads
+	 */
+	public void setPrestartAllCoreThreads(boolean prestartAllCoreThreads) {
+		this.prestartAllCoreThreads = prestartAllCoreThreads;
+	}
+
 	/**
 	 * Specify a custom {@link TaskDecorator} to be applied to any {@link Runnable}
 	 * about to be executed.
@@ -256,6 +268,9 @@ public void execute(Runnable command) {
 		if (this.allowCoreThreadTimeOut) {
 			executor.allowCoreThreadTimeOut(true);
 		}
+		if (this.prestartAllCoreThreads) {
+			executor.prestartAllCoreThreads();
+		}
 
 		this.threadPoolExecutor = executor;
 		return executor;
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
index c5731e3139f6..d350341a8c46 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.GenericApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -37,6 +37,8 @@
 import static org.mockito.Mockito.verify;
 
 /**
+ * Tests for {@link ThreadPoolExecutorFactoryBean}.
+ *
  * @author Juergen Hoeller
  */
 class ThreadPoolExecutorFactoryBeanTests {
@@ -53,19 +55,25 @@ void defaultExecutor() throws Exception {
 	}
 
 	@Test
-	public void executorWithPreStartedThreads() throws Exception {
-		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(ExecutorConfigWithPreStartedThreads.class);
-		ThreadPoolExecutor executor = context.getBean("childExecutor", ThreadPoolExecutor.class);
-
-		verify(executor).prestartAllCoreThreads();
+	void executorWithDefaultSettingsDoesNotPrestartAllCoreThreads() {
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBean("taskExecutor", ThreadPoolExecutorFactoryBean.class, TestThreadPoolExecutorFactoryBean::new);
+		context.refresh();
+		ThreadPoolExecutor threadPoolExecutor = context.getBean(ThreadPoolExecutor.class);
+		verify(threadPoolExecutor, never()).prestartAllCoreThreads();
 	}
 
 	@Test
-	public void executorWithNoPreStartedThreads() throws Exception {
-		ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(ExecutorConfigWithNoPreStartedThreads.class);
-		ThreadPoolExecutor executor = context.getBean("childExecutor", ThreadPoolExecutor.class);
-
-		verify(executor, never()).prestartAllCoreThreads();
+	void executorWithPrestartAllCoreThreads() {
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBean("taskExecutor", ThreadPoolExecutorFactoryBean.class, () -> {
+			TestThreadPoolExecutorFactoryBean factoryBean = new TestThreadPoolExecutorFactoryBean();
+			factoryBean.setPrestartAllCoreThreads(true);
+			return factoryBean;
+		});
+		context.refresh();
+		ThreadPoolExecutor threadPoolExecutor = context.getBean(ThreadPoolExecutor.class);
+		verify(threadPoolExecutor).prestartAllCoreThreads();
 	}
 
 	@Configuration
@@ -78,37 +86,8 @@ ThreadPoolExecutorFactoryBean executor() {
 
 	}
 
-	@Configuration
-	public static class ExecutorConfigWithPreStartedThreads {
-
-		@Bean
-		public ThreadPoolExecutorFactoryBean executorChildFactory() {
-			ThreadPoolExecutorFactoryBeanMockingChild threadPoolExecutorFactoryBeanMockingChild = new ThreadPoolExecutorFactoryBeanMockingChild();
-			threadPoolExecutorFactoryBeanMockingChild.setPrestartAllCoreThreads(true);
-			return threadPoolExecutorFactoryBeanMockingChild;
-		}
-
-		@Bean
-		public ExecutorService childExecutor() {
-			return executorChildFactory().getObject();
-		}
-	}
+	private static class TestThreadPoolExecutorFactoryBean extends ThreadPoolExecutorFactoryBean {
 
-	@Configuration
-	public static class ExecutorConfigWithNoPreStartedThreads {
-
-		@Bean
-		public ThreadPoolExecutorFactoryBean executorChildFactory() {
-			return new ThreadPoolExecutorFactoryBeanMockingChild();
-		}
-
-		@Bean
-		public ExecutorService childExecutor() {
-			return executorChildFactory().getObject();
-		}
-	}
-
-	private static class ThreadPoolExecutorFactoryBeanMockingChild extends ThreadPoolExecutorFactoryBean {
 		@Override
 		protected ThreadPoolExecutor createExecutor(
 				int corePoolSize, int maxPoolSize, int keepAliveSeconds, BlockingQueue<Runnable> queue,
@@ -118,5 +97,4 @@ protected ThreadPoolExecutor createExecutor(
 		}
 	}
 
-
 }

From 830cc3450fac3332be54865c53f448091f72748b Mon Sep 17 00:00:00 2001
From: Marco Krikke <marco@eveoh.nl>
Date: Fri, 21 Nov 2014 17:32:42 +0100
Subject: [PATCH 369/735] Improved DataBinder Javadoc for xxx*yyy pattern
 matching

The default documentation does not mention xxx*yyy pattern matching,
which is, however, supported by PatternMatchUtils. Such a pattern
can be useful for matching nested properties in all elements of a
collection, e.g. property[*].nestedProperty.

See gh-699
---
 .../validation/DataBinder.java                | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
index 1818b94b48f2..9ae262ee070e 100644
--- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java
+++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
@@ -418,10 +418,11 @@ public boolean isIgnoreInvalidFields() {
 	}
 
 	/**
-	 * Register fields that should be allowed for binding. Default is all
-	 * fields. Restrict this for example to avoid unwanted modifications
-	 * by malicious users when binding HTTP request parameters.
-	 * <p>Supports "xxx*", "*xxx" and "*xxx*" patterns. More sophisticated matching
+	 * Register fields that should be allowed for binding. Default is all fields.
+	 * Restrict this for example to avoid unwanted modifications by malicious users
+	 * when binding HTTP request parameters.
+	 * <p>Supports "xxx*", "*xxx", "*xxx*" and "xxx*yyy" matches (with an arbitrary
+	 * number of pattern parts), as well as direct equality. More sophisticated matching
 	 * can be implemented by overriding the {@code isAllowed} method.
 	 * <p>Alternatively, specify a list of <i>disallowed</i> fields.
 	 * @param allowedFields array of field names
@@ -445,7 +446,8 @@ public String[] getAllowedFields() {
 	 * Register fields that should <i>not</i> be allowed for binding. Default is none.
 	 * Mark fields as disallowed for example to avoid unwanted modifications
 	 * by malicious users when binding HTTP request parameters.
-	 * <p>Supports "xxx*", "*xxx" and "*xxx*" patterns. More sophisticated matching
+	 * <p>Supports "xxx*", "*xxx", "*xxx*" and "xxx*yyy" matches (with an arbitrary
+	 * number of pattern parts), as well as direct equality. More sophisticated matching
 	 * can be implemented by overriding the {@code isAllowed} method.
 	 * <p>Alternatively, specify a list of <i>allowed</i> fields.
 	 * @param disallowedFields array of field names
@@ -772,10 +774,11 @@ protected void checkAllowedFields(MutablePropertyValues mpvs) {
 	/**
 	 * Return if the given field is allowed for binding.
 	 * Invoked for each passed-in property value.
-	 * <p>The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
-	 * as well as direct equality, in the specified lists of allowed fields and
-	 * disallowed fields. A field matching a disallowed pattern will not be accepted
-	 * even if it also happens to match a pattern in the allowed list.
+	 * <p>The default implementation checks for "xxx*", "*xxx", "*xxx*" and "xxx*yyy"
+	 * matches (with an arbitrary number of pattern parts), as well as direct equality,
+	 * in the specified lists of allowed fields and disallowed fields. A field matching
+	 * a disallowed pattern will not be accepted even if it also happens to match a
+	 * pattern in the allowed list.
 	 * <p>Can be overridden in subclasses.
 	 * @param field the field to check
 	 * @return if the field is allowed

From 3f7dec0b0dccdbc84897c4c10e6c35ff152d63d9 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 23 Nov 2021 10:52:05 +0000
Subject: [PATCH 370/735] Polishing contribution

Closes gh-699
---
 .../validation/DataBinder.java                | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
index 9ae262ee070e..612dfc5622a2 100644
--- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java
+++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -419,11 +419,12 @@ public boolean isIgnoreInvalidFields() {
 
 	/**
 	 * Register fields that should be allowed for binding. Default is all fields.
-	 * Restrict this for example to avoid unwanted modifications by malicious users
-	 * when binding HTTP request parameters.
-	 * <p>Supports "xxx*", "*xxx", "*xxx*" and "xxx*yyy" matches (with an arbitrary
-	 * number of pattern parts), as well as direct equality. More sophisticated matching
-	 * can be implemented by overriding the {@code isAllowed} method.
+	 * Restrict this for example to avoid unwanted modifications by malicious
+	 * users when binding HTTP request parameters.
+	 * <p>Supports "xxx*", "*xxx", "*xxx*" and "xxx*yyy" matches (with an
+	 * arbitrary number of pattern parts), as well as direct equality. More
+	 * sophisticated matching can be implemented by overriding the
+	 * {@code isAllowed} method.
 	 * <p>Alternatively, specify a list of <i>disallowed</i> fields.
 	 * @param allowedFields array of field names
 	 * @see #setDisallowedFields
@@ -443,12 +444,13 @@ public String[] getAllowedFields() {
 	}
 
 	/**
-	 * Register fields that should <i>not</i> be allowed for binding. Default is none.
-	 * Mark fields as disallowed for example to avoid unwanted modifications
-	 * by malicious users when binding HTTP request parameters.
-	 * <p>Supports "xxx*", "*xxx", "*xxx*" and "xxx*yyy" matches (with an arbitrary
-	 * number of pattern parts), as well as direct equality. More sophisticated matching
-	 * can be implemented by overriding the {@code isAllowed} method.
+	 * Register fields that should <i>not</i> be allowed for binding. Default
+	 * is none. Mark fields as disallowed for example to avoid unwanted
+	 * modifications by malicious users when binding HTTP request parameters.
+	 * <p>Supports "xxx*", "*xxx", "*xxx*" and "xxx*yyy" matches (with an
+	 * arbitrary number of pattern parts), as well as direct equality.
+	 * More sophisticated matching can be implemented by overriding the
+	 * {@code isAllowed} method.
 	 * <p>Alternatively, specify a list of <i>allowed</i> fields.
 	 * @param disallowedFields array of field names
 	 * @see #setAllowedFields

From 913cc079af07fbb58ea09e73d3fb538714b6a1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?/usr/local/=CE=95=CE=A8=CE=97=CE=95=CE=9B=CE=A9=CE=9D?=
 <djechelon@users.noreply.github.com>
Date: Tue, 3 Nov 2015 12:30:34 +0100
Subject: [PATCH 371/735] TagWriter can write empty attribute

See gh-910
---
 .../web/servlet/tags/form/TagWriter.java            | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
index 87cedb540223..29b62c2b936a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
@@ -97,6 +97,19 @@ public void writeAttribute(String attributeName, String attributeValue) throws J
 		this.writer.append(" ").append(attributeName).append("=\"")
 				.append(attributeValue).append("\"");
 	}
+	
+	/**
+	 * Write an empty HTML attribute with the specified name.
+	 * <p>Be sure to write all attributes <strong>before</strong> writing
+	 * any inner text or nested tags.
+	 * @throws IllegalStateException if the opening tag is closed
+	 */
+	public void writeAttribute(String attributeName) throws JspException {
+		if (currentState().isBlockTag()) {
+			throw new IllegalStateException("Cannot write attributes after opening tag is closed.");
+		}
+		this.writer.append(" ").append(attributeName);
+	}
 
 	/**
 	 * Write an HTML attribute if the supplied value is not {@code null}

From 0d7c5626936d07446f4ba3f10df2fcbf8d68c551 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 24 Nov 2021 12:42:04 +0000
Subject: [PATCH 372/735] Polishing contribution

Closes gh-910
---
 .../web/servlet/tags/form/TagWriter.java              | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
index 29b62c2b936a..a8167bcbf34a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,12 +97,11 @@ public void writeAttribute(String attributeName, String attributeValue) throws J
 		this.writer.append(" ").append(attributeName).append("=\"")
 				.append(attributeValue).append("\"");
 	}
-	
+
 	/**
-	 * Write an empty HTML attribute with the specified name.
-	 * <p>Be sure to write all attributes <strong>before</strong> writing
-	 * any inner text or nested tags.
-	 * @throws IllegalStateException if the opening tag is closed
+	 * Variant of {@link #writeAttribute(String, String)} for writing empty HTML
+	 * attributes without a value such as {@code required}.
+	 * @since 5.3.14
 	 */
 	public void writeAttribute(String attributeName) throws JspException {
 		if (currentState().isBlockTag()) {

From ce0aed216b5cc04fbf52ba7a9007c185593e5625 Mon Sep 17 00:00:00 2001
From: Andreas Grub <andreas.grub@qaware.de>
Date: Wed, 24 Nov 2021 07:47:21 +0100
Subject: [PATCH 373/735] Add getter for
 RequestMappingInfo.BuilderConfiguration

This improves support for programmatic registration of mappings to
use the same config as that of the RequestMappingHandlerMapping.

See gh-27723
---
 .../annotation/RequestMappingHandlerMapping.java      | 11 +++++++++++
 .../annotation/RequestMappingHandlerMappingTests.java | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
index 1da7ca1ed8b3..6bebaa18df0b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -246,6 +246,17 @@ public List<String> getFileExtensions() {
 		return this.config.getFileExtensions();
 	}
 
+	/**
+	 * Get the configuration to build {@link RequestMappingInfo}
+	 * instances. This is useful for programmatic registration of
+	 * additional mappings following the same configuration as {@link
+	 * #createRequestMappingInfo(RequestMapping, RequestCondition)}.
+	 *
+	 * @return builder configuration to be supplied into {@link RequestMappingInfo.Builder#options}.
+	 */
+	public RequestMappingInfo.BuilderConfiguration getRequestMappingInfoBuilderConfiguration() {
+		return this.config;
+	}
 
 	/**
 	 * {@inheritDoc}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
index f60e69af0e3b..2e6149bc9695 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
@@ -79,6 +79,17 @@ static Stream<Arguments> pathPatternsArguments() {
 		return Stream.of(Arguments.of(mapping1, wac1), Arguments.of(mapping2, wac2));
 	}
 
+	@Test
+	void getRequestMappingInfoBuilderConfiguration() {
+		RequestMappingHandlerMapping handlerMapping = new RequestMappingHandlerMapping();
+		handlerMapping.setApplicationContext(new StaticWebApplicationContext());
+
+		RequestMappingInfo.BuilderConfiguration beforeAfterPropertiesSet = handlerMapping.getRequestMappingInfoBuilderConfiguration();
+		assertThat(beforeAfterPropertiesSet).isNotNull();
+		handlerMapping.afterPropertiesSet();
+		RequestMappingInfo.BuilderConfiguration afterPropertiesSet = handlerMapping.getRequestMappingInfoBuilderConfiguration();
+		assertThat(afterPropertiesSet).isNotNull().isNotSameAs(beforeAfterPropertiesSet);
+	}
 
 	@Test
 	@SuppressWarnings("deprecation")

From 829bed03af2f92b37eb45732e5f2b5113f433bdf Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 24 Nov 2021 13:03:12 +0000
Subject: [PATCH 374/735] Polishing contribution

Closes gh-27723
---
 .../RequestMappingHandlerMapping.java         | 30 ++++++++++++++-----
 .../RequestMappingHandlerMappingTests.java    | 24 ++++++++-------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
index 6bebaa18df0b..c3b264158891 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -187,7 +187,6 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
 	@Override
 	@SuppressWarnings("deprecation")
 	public void afterPropertiesSet() {
-
 		this.config = new RequestMappingInfo.BuilderConfiguration();
 		this.config.setTrailingSlashMatch(useTrailingSlashMatch());
 		this.config.setContentNegotiationManager(getContentNegotiationManager());
@@ -247,17 +246,19 @@ public List<String> getFileExtensions() {
 	}
 
 	/**
-	 * Get the configuration to build {@link RequestMappingInfo}
-	 * instances. This is useful for programmatic registration of
-	 * additional mappings following the same configuration as {@link
-	 * #createRequestMappingInfo(RequestMapping, RequestCondition)}.
-	 *
-	 * @return builder configuration to be supplied into {@link RequestMappingInfo.Builder#options}.
+	 * Obtain a {@link RequestMappingInfo.BuilderConfiguration} that can reflects
+	 * the internal configuration of this {@code HandlerMapping} and can be used
+	 * to set {@link RequestMappingInfo.Builder#options(RequestMappingInfo.BuilderConfiguration)}.
+	 * <p>This is useful for programmatic registration of request mappings via
+	 * {@link #registerHandlerMethod(Object, Method, RequestMappingInfo)}.
+	 * @return the builder configuration that reflects the internal state
+	 * @since 5.3.14
 	 */
-	public RequestMappingInfo.BuilderConfiguration getRequestMappingInfoBuilderConfiguration() {
+	public RequestMappingInfo.BuilderConfiguration getBuilderConfiguration() {
 		return this.config;
 	}
 
+
 	/**
 	 * {@inheritDoc}
 	 * <p>Expects a handler to have either a type-level @{@link Controller}
@@ -401,6 +402,19 @@ public void registerMapping(RequestMappingInfo mapping, Object handler, Method m
 		updateConsumesCondition(mapping, method);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * <p><strong>Note:</strong> To create the {@link RequestMappingInfo},
+	 * please use {@link #getBuilderConfiguration()} and set the options on
+	 * {@link RequestMappingInfo.Builder#options(RequestMappingInfo.BuilderConfiguration)}
+	 * to match how this {@code HandlerMapping} is configured. This
+	 * is important for example to ensure use of
+	 * {@link org.springframework.web.util.pattern.PathPattern} or
+	 * {@link org.springframework.util.PathMatcher} based matching.
+	 * @param handler the bean name of the handler or the handler instance
+	 * @param method the method to register
+	 * @param mapping the mapping conditions associated with the handler method
+	 */
 	@Override
 	protected void registerHandlerMethod(Object handler, Method method, RequestMappingInfo mapping) {
 		super.registerHandlerMethod(handler, method, mapping);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
index 2e6149bc9695..9ed74e07817e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,15 +80,15 @@ static Stream<Arguments> pathPatternsArguments() {
 	}
 
 	@Test
-	void getRequestMappingInfoBuilderConfiguration() {
-		RequestMappingHandlerMapping handlerMapping = new RequestMappingHandlerMapping();
-		handlerMapping.setApplicationContext(new StaticWebApplicationContext());
+	void builderConfiguration() {
+		RequestMappingHandlerMapping mapping = new RequestMappingHandlerMapping();
+		mapping.setApplicationContext(new StaticWebApplicationContext());
 
-		RequestMappingInfo.BuilderConfiguration beforeAfterPropertiesSet = handlerMapping.getRequestMappingInfoBuilderConfiguration();
-		assertThat(beforeAfterPropertiesSet).isNotNull();
-		handlerMapping.afterPropertiesSet();
-		RequestMappingInfo.BuilderConfiguration afterPropertiesSet = handlerMapping.getRequestMappingInfoBuilderConfiguration();
-		assertThat(afterPropertiesSet).isNotNull().isNotSameAs(beforeAfterPropertiesSet);
+		RequestMappingInfo.BuilderConfiguration config = mapping.getBuilderConfiguration();
+		assertThat(config).isNotNull();
+
+		mapping.afterPropertiesSet();
+		assertThat(mapping.getBuilderConfiguration()).isNotNull().isNotSameAs(config);
 	}
 
 	@Test
@@ -99,7 +99,8 @@ void useRegisteredSuffixPatternMatch() {
 		handlerMapping.setApplicationContext(new StaticWebApplicationContext());
 
 		Map<String, MediaType> fileExtensions = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
-		org.springframework.web.accept.PathExtensionContentNegotiationStrategy strategy = new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(fileExtensions);
+		org.springframework.web.accept.PathExtensionContentNegotiationStrategy strategy =
+				new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(fileExtensions);
 		ContentNegotiationManager manager = new ContentNegotiationManager(strategy);
 
 		handlerMapping.setContentNegotiationManager(manager);
@@ -115,7 +116,8 @@ void useRegisteredSuffixPatternMatch() {
 	@SuppressWarnings("deprecation")
 	void useRegisteredSuffixPatternMatchInitialization() {
 		Map<String, MediaType> fileExtensions = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
-		org.springframework.web.accept.PathExtensionContentNegotiationStrategy strategy = new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(fileExtensions);
+		org.springframework.web.accept.PathExtensionContentNegotiationStrategy strategy =
+				new org.springframework.web.accept.PathExtensionContentNegotiationStrategy(fileExtensions);
 		ContentNegotiationManager manager = new ContentNegotiationManager(strategy);
 
 		final Set<String> extensions = new HashSet<>();

From 341f4882ed9026661d8c2818dc90c9c84b1e69e1 Mon Sep 17 00:00:00 2001
From: Mateusz <mateusz.pszczolka@gmail.com>
Date: Wed, 28 Nov 2018 12:21:21 +0100
Subject: [PATCH 375/735] Clarify behaviour of AnnotationBeanNameGenerator with
 acronyms

Name transformation is delegated to Introspector#decapitalize, which
states "but in the (unusual) special case when there is more than one
character and both the first and second characters are upper case, we
leave it alone.". This commit clarifies this behavior.

See gh-2030
---
 .../context/annotation/AnnotationBeanNameGenerator.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index 4beee8680642..bb13d3944a10 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -47,10 +47,11 @@
  *
  * <p>If the annotation's value doesn't indicate a bean name, an appropriate
  * name will be built based on the short name of the class (with the first
- * letter lower-cased). For example:
+ * letter lower-cased). If two first letters of class name are uppercase, bean name will be unchanged. For example:
  *
  * <pre class="code">com.xyz.FooServiceImpl -&gt; fooServiceImpl</pre>
- *
+ * <pre class="code">com.xyz.URLFooServiceImpl -&gt; URLFooServiceImpl</pre>
+ * 
  * @author Juergen Hoeller
  * @author Mark Fisher
  * @since 2.5

From a1b2695c3a24017c258515faf84041420dd9f6d6 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 24 Nov 2021 16:00:11 +0100
Subject: [PATCH 376/735] Polish "Clarify behaviour of
 AnnotationBeanNameGenerator with acronyms"

See gh-2030
---
 .../context/annotation/AnnotationBeanNameGenerator.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index bb13d3944a10..54ac7379e751 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
  *
  * <p>If the annotation's value doesn't indicate a bean name, an appropriate
  * name will be built based on the short name of the class (with the first
- * letter lower-cased). If two first letters of class name are uppercase, bean name will be unchanged. For example:
+ * letter lower-cased), unless the two first letters are uppercase. For example:
  *
  * <pre class="code">com.xyz.FooServiceImpl -&gt; fooServiceImpl</pre>
  * <pre class="code">com.xyz.URLFooServiceImpl -&gt; URLFooServiceImpl</pre>

From d019c1f82b107d13dc0ab8d7d78f85274a9d6619 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 24 Nov 2021 21:34:23 +0100
Subject: [PATCH 377/735] Polish

See gh-2030
---
 .../context/annotation/AnnotationBeanNameGenerator.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index 54ac7379e751..688087c8e770 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -51,7 +51,7 @@
  *
  * <pre class="code">com.xyz.FooServiceImpl -&gt; fooServiceImpl</pre>
  * <pre class="code">com.xyz.URLFooServiceImpl -&gt; URLFooServiceImpl</pre>
- * 
+ *
  * @author Juergen Hoeller
  * @author Mark Fisher
  * @since 2.5

From 804b343cabe8a16a02a714f2f51d4b3815f9f6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EB=B0=B0=28Bobae=20Kim=29/Platform=20En?=
 =?UTF-8?q?gineering=ED=8C=80/11ST?= <bb@sk.com>
Date: Fri, 12 Nov 2021 14:53:27 +0900
Subject: [PATCH 378/735] Use parseInt without substring method

---
 .../factory/support/PropertiesBeanDefinitionReader.java     | 4 ++--
 .../scheduling/config/TaskExecutorFactoryBean.java          | 6 +++---
 .../springframework/scheduling/support/BitsCronField.java   | 4 ++--
 .../springframework/scheduling/support/QuartzCronField.java | 6 +++---
 .../FormattingConversionServiceFactoryBeanTests.java        | 4 ++--
 .../jms/listener/DefaultMessageListenerContainer.java       | 4 ++--
 .../jms/listener/SimpleMessageListenerContainer.java        | 2 +-
 .../jms/listener/endpoint/JmsActivationSpecConfig.java      | 4 ++--
 .../springframework/mock/web/MockHttpServletRequest.java    | 2 +-
 .../http/server/reactive/ReactorServerHttpRequest.java      | 2 +-
 .../org/springframework/web/util/UriComponentsBuilder.java  | 4 ++--
 .../web/util/HtmlCharacterEntityReferencesTests.java        | 4 ++--
 .../web/testfixture/servlet/MockHttpServletRequest.java     | 2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
index 01d901048d00..bb9f3bfcdc91 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -457,11 +457,11 @@ else if (LAZY_INIT_KEY.equals(property)) {
 				}
 				else if (property.startsWith(CONSTRUCTOR_ARG_PREFIX)) {
 					if (property.endsWith(REF_SUFFIX)) {
-						int index = Integer.parseInt(property.substring(1, property.length() - REF_SUFFIX.length()));
+						int index = Integer.parseInt(property, 1, property.length() - REF_SUFFIX.length(), 10);
 						cas.addIndexedArgumentValue(index, new RuntimeBeanReference(entry.getValue().toString()));
 					}
 					else {
-						int index = Integer.parseInt(property.substring(1));
+						int index = Integer.parseInt(property, 1, property.length(), 10);
 						cas.addIndexedArgumentValue(index, readValue(entry));
 					}
 				}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
index c49b06ba7444..abb3f7315e3e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,8 +106,8 @@ private void determinePoolSizeRange(ThreadPoolTaskExecutor executor) {
 				int maxPoolSize;
 				int separatorIndex = this.poolSize.indexOf('-');
 				if (separatorIndex != -1) {
-					corePoolSize = Integer.parseInt(this.poolSize.substring(0, separatorIndex));
-					maxPoolSize = Integer.parseInt(this.poolSize.substring(separatorIndex + 1));
+					corePoolSize = Integer.parseInt(this.poolSize, 0, separatorIndex, 10);
+					maxPoolSize = Integer.parseInt(this.poolSize, separatorIndex + 1, this.poolSize.length(), 10);
 					if (corePoolSize > maxPoolSize) {
 						throw new IllegalArgumentException(
 								"Lower bound of pool-size range must not exceed the upper bound");
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
index 9619c12ca5c3..0c3d29bebb1c 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java
@@ -161,8 +161,8 @@ private static ValueRange parseRange(String value, Type type) {
 				return ValueRange.of(result, result);
 			}
 			else {
-				int min = Integer.parseInt(value.substring(0, hyphenPos));
-				int max = Integer.parseInt(value.substring(hyphenPos + 1));
+				int min = Integer.parseInt(value, 0, hyphenPos, 10);
+				int max = Integer.parseInt(value, hyphenPos + 1, value.length(), 10);
 				min = type.checkValidValue(min);
 				max = type.checkValidValue(max);
 				if (type == Type.DAY_OF_WEEK && min == 7) {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
index db1f20a7cb79..ed57360d30cc 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
@@ -86,7 +86,7 @@ else if (value.length() == 2 && value.charAt(1) == 'W') { // "LW"
 					adjuster = lastDayOfMonth();
 				}
 				else { // "L-[0-9]+"
-					int offset = Integer.parseInt(value.substring(idx + 1));
+					int offset = Integer.parseInt(value, idx + 1, value.length(), 10);
 					if (offset >= 0) {
 						throw new IllegalArgumentException("Offset '" + offset + " should be < 0 '" + value + "'");
 					}
@@ -104,7 +104,7 @@ else if (idx != value.length() - 1) {
 				throw new IllegalArgumentException("Unrecognized characters after 'W' in '" + value + "'");
 			}
 			else { // "[0-9]+W"
-				int dayOfMonth = Integer.parseInt(value.substring(0, idx));
+				int dayOfMonth = Integer.parseInt(value, 0, idx, 10);
 				dayOfMonth = Type.DAY_OF_MONTH.checkValidValue(dayOfMonth);
 				TemporalAdjuster adjuster = weekdayNearestTo(dayOfMonth);
 				return new QuartzCronField(Type.DAY_OF_MONTH, adjuster, value);
@@ -152,7 +152,7 @@ else if (idx == value.length() - 1) {
 			}
 			// "[0-7]#[0-9]+"
 			DayOfWeek dayOfWeek = parseDayOfWeek(value.substring(0, idx));
-			int ordinal = Integer.parseInt(value.substring(idx + 1));
+			int ordinal = Integer.parseInt(value, idx + 1, value.length(), 10);
 			if (ordinal <= 0) {
 				throw new IllegalArgumentException("Ordinal '" + ordinal + "' in '" + value +
 						"' must be positive number ");
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
index 8b8aacf6dd56..a7e4fe01dcc2 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -204,7 +204,7 @@ public Parser<?> getParser(SpecialInt annotation, Class<?> fieldType) {
 			return new Parser<Integer>() {
 				@Override
 				public Integer parse(String text, Locale locale) throws ParseException {
-					return Integer.parseInt(text.substring(1));
+					return Integer.parseInt(text, 1, text.length(), 10);
 				}
 			};
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
index 4f2435ff5c74..cd8099bcbefb 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -309,8 +309,8 @@ public void setConcurrency(String concurrency) {
 		try {
 			int separatorIndex = concurrency.indexOf('-');
 			if (separatorIndex != -1) {
-				setConcurrentConsumers(Integer.parseInt(concurrency.substring(0, separatorIndex)));
-				setMaxConcurrentConsumers(Integer.parseInt(concurrency.substring(separatorIndex + 1)));
+				setConcurrentConsumers(Integer.parseInt(concurrency, 0, separatorIndex, 10));
+				setMaxConcurrentConsumers(Integer.parseInt(concurrency, separatorIndex + 1, concurrency.length(), 10));
 			}
 			else {
 				setConcurrentConsumers(1);
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
index 12e4eba04543..9530b2365864 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
@@ -126,7 +126,7 @@ public void setConcurrency(String concurrency) {
 		try {
 			int separatorIndex = concurrency.indexOf('-');
 			if (separatorIndex != -1) {
-				setConcurrentConsumers(Integer.parseInt(concurrency.substring(separatorIndex + 1)));
+				setConcurrentConsumers(Integer.parseInt(concurrency, separatorIndex + 1, concurrency.length(), 10));
 			}
 			else {
 				setConcurrentConsumers(Integer.parseInt(concurrency));
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
index 9109654e2ff7..41deb89a26af 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,7 +226,7 @@ public void setConcurrency(String concurrency) {
 		try {
 			int separatorIndex = concurrency.indexOf('-');
 			if (separatorIndex != -1) {
-				setMaxConcurrency(Integer.parseInt(concurrency.substring(separatorIndex + 1)));
+				setMaxConcurrency(Integer.parseInt(concurrency, separatorIndex + 1, concurrency.length(), 10));
 			}
 			else {
 				setMaxConcurrency(Integer.parseInt(concurrency));
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
index 2ac4b33e4c76..106c87c49258 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -707,7 +707,7 @@ public int getServerPort() {
 				idx = host.indexOf(':');
 			}
 			if (idx != -1) {
-				return Integer.parseInt(host.substring(idx + 1));
+				return Integer.parseInt(host, idx + 1, host.length(), 10);
 			}
 		}
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
index 35db4de36c87..ab0fdb62d184 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
@@ -94,7 +94,7 @@ private static URI resolveBaseUrl(HttpServerRequest request) throws URISyntaxExc
 			if (portIndex != -1) {
 				try {
 					return new URI(scheme, null, header.substring(0, portIndex),
-							Integer.parseInt(header.substring(portIndex + 1)), null, null, null);
+							Integer.parseInt(header, portIndex + 1, header.length(), 10), null, null, null);
 				}
 				catch (NumberFormatException ex) {
 					throw new URISyntaxException(header, "Unable to parse port", portIndex);
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index 37fbf44b7b9e..38762811619b 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -364,7 +364,7 @@ public static InetSocketAddress parseForwardedFor(
 					}
 					host = value.substring(0, portSeparatorIdx);
 					try {
-						port = Integer.parseInt(value.substring(portSeparatorIdx + 1));
+						port = Integer.parseInt(value, portSeparatorIdx + 1, value.length(), 10);
 					}
 					catch (NumberFormatException ex) {
 						throw new IllegalArgumentException(
@@ -904,7 +904,7 @@ private void adaptForwardedHost(String rawValue) {
 				throw new IllegalArgumentException("Invalid IPv4 address: " + rawValue);
 			}
 			host(rawValue.substring(0, portSeparatorIdx));
-			port(Integer.parseInt(rawValue.substring(portSeparatorIdx + 1)));
+			port(Integer.parseInt(rawValue, portSeparatorIdx + 1, rawValue.length(), 10));
 		}
 		else {
 			host(rawValue);
diff --git a/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java
index cb60d2ad014e..ea6c1a66ce8a 100644
--- a/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/HtmlCharacterEntityReferencesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -174,7 +174,7 @@ private boolean navigateToNextEntity() throws IOException {
 		private int nextReferredCharacterId() throws IOException {
 			String reference = nextWordToken();
 			if (reference != null && reference.startsWith("&#") && reference.endsWith(";")) {
-				return Integer.parseInt(reference.substring(2, reference.length() - 1));
+				return Integer.parseInt(reference, 2, reference.length() - 1, 10);
 			}
 			return -1;
 		}
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
index bcf9172d8f9c..4fa2620ca84b 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
@@ -710,7 +710,7 @@ public int getServerPort() {
 				idx = host.indexOf(':');
 			}
 			if (idx != -1) {
-				return Integer.parseInt(host.substring(idx + 1));
+				return Integer.parseInt(host, idx + 1, host.length(), 10);
 			}
 		}
 

From d178eafc11f6576188df8bbb569d82e9d5569bc2 Mon Sep 17 00:00:00 2001
From: Tin Pavlinic <tin.pavlinic@gmail.com>
Date: Wed, 1 Nov 2017 14:32:40 +1100
Subject: [PATCH 379/735] Fix SpEL comparison operator for comparable types

Prior to this commit, the SpEL relational operators for comparison
would have the following problem:

* their implementation would claim that incompatible types
  could be compared and later fail during comparison
* not delegate the comparison to the actual `TypeComparator`
  implementation but rely on operator specifics

This commit ensures that the `TypeComparator` implementation is used for
both `canCompare` and `compare` calls in the operators.

See gh-1581
---
 .../expression/spel/ast/Operator.java         |  7 +--
 .../spel/support/StandardTypeComparator.java  |  6 +-
 .../spel/AlternativeComparatorTests.java      | 62 +++++++++++++++++++
 .../spel/DefaultComparatorUnitTests.java      |  2 +-
 4 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
index 11150a7c9bf6..8ae4b06de2bf 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
@@ -309,11 +309,8 @@ else if (leftNumber instanceof Byte || rightNumber instanceof Byte) {
 			return true;
 		}
 
-		if (left instanceof Comparable && right instanceof Comparable) {
-			Class<?> ancestor = ClassUtils.determineCommonAncestor(left.getClass(), right.getClass());
-			if (ancestor != null && Comparable.class.isAssignableFrom(ancestor)) {
-				return (context.getTypeComparator().compare(left, right) == 0);
-			}
+		if (context.getTypeComparator().canCompare(left, right)) {
+			return context.getTypeComparator().compare(left, right) == 0;
 		}
 
 		return false;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
index fc15f6b3ec0e..a27fbe6ceee9 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
@@ -23,6 +23,7 @@
 import org.springframework.expression.spel.SpelEvaluationException;
 import org.springframework.expression.spel.SpelMessage;
 import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.NumberUtils;
 
 /**
@@ -44,8 +45,9 @@ public boolean canCompare(@Nullable Object left, @Nullable Object right) {
 		if (left instanceof Number && right instanceof Number) {
 			return true;
 		}
-		if (left instanceof Comparable) {
-			return true;
+		if (left instanceof Comparable && right instanceof Comparable) {
+            Class<?> ancestor = ClassUtils.determineCommonAncestor(left.getClass(), right.getClass());
+			return ancestor != null && Comparable.class.isAssignableFrom(ancestor);
 		}
 		return false;
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java
new file mode 100644
index 000000000000..34f417c7646f
--- /dev/null
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://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.expression.spel;
+
+import org.junit.Test;
+import org.springframework.lang.Nullable;
+import org.springframework.expression.Expression;
+import org.springframework.expression.TypeComparator;
+import org.springframework.expression.EvaluationException;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+
+import static org.junit.Assert.*;
+
+/**
+ * Test construction of arrays.
+ *
+ * @author Andy Clement
+ */
+public class AlternativeComparatorTests {
+	private ExpressionParser parser = new SpelExpressionParser();
+
+	// A silly comparator declaring everything to be equal
+	private TypeComparator customComparator = new TypeComparator() {
+		@Override
+		public boolean canCompare(@Nullable Object firstObject, @Nullable Object secondObject) {
+			return true;
+		}
+
+		@Override
+		public int compare(@Nullable Object firstObject, @Nullable Object secondObject) throws EvaluationException {
+			return 0;
+		}
+
+	};
+
+	@Test
+	public void customComparatorWorksWithEquality() {
+		final StandardEvaluationContext ctx = new StandardEvaluationContext();
+		ctx.setTypeComparator(customComparator);
+
+		Expression expr = parser.parseExpression("'1' == 1");
+
+		assertEquals(true, expr.getValue(ctx, Boolean.class));
+
+	}
+}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
index eeb23b4d4152..f27a0ed42d4f 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
@@ -116,7 +116,7 @@ void testCanCompare() throws EvaluationException {
 
 		assertThat(comparator.canCompare(2,1)).isTrue();
 		assertThat(comparator.canCompare("abc","def")).isTrue();
-		assertThat(comparator.canCompare("abc",3)).isTrue();
+		assertThat(comparator.canCompare("abc",3)).isFalse();
 		assertThat(comparator.canCompare(String.class,3)).isFalse();
 	}
 

From fab9abd7fe34a09a6f1c114d36efdef84b8ced47 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Thu, 25 Nov 2021 19:09:23 +0100
Subject: [PATCH 380/735] Polish

Closes gh-1581
---
 .../expression/spel/ast/Operator.java         |   1 -
 .../spel/support/StandardTypeComparator.java  |   2 +-
 .../spel/AlternativeComparatorTests.java      |  62 -------
 ...torUnitTests.java => ComparatorTests.java} |  33 +++-
 .../expression/spel/OperatorTests.java        |  28 +++-
 .../spel/StandardTypeComparatorTests.java     | 152 ++++++++++++++++++
 src/docs/asciidoc/core/core-expressions.adoc  |  11 +-
 7 files changed, 220 insertions(+), 69 deletions(-)
 delete mode 100644 spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java
 rename spring-expression/src/test/java/org/springframework/expression/spel/{DefaultComparatorUnitTests.java => ComparatorTests.java} (80%)
 create mode 100644 spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
index 8ae4b06de2bf..c84ec0a2d86c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
@@ -24,7 +24,6 @@
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.spel.CodeFlow;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
index a27fbe6ceee9..cdbc46e1c44c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
@@ -46,7 +46,7 @@ public boolean canCompare(@Nullable Object left, @Nullable Object right) {
 			return true;
 		}
 		if (left instanceof Comparable && right instanceof Comparable) {
-            Class<?> ancestor = ClassUtils.determineCommonAncestor(left.getClass(), right.getClass());
+			Class<?> ancestor = ClassUtils.determineCommonAncestor(left.getClass(), right.getClass());
 			return ancestor != null && Comparable.class.isAssignableFrom(ancestor);
 		}
 		return false;
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java
deleted file mode 100644
index 34f417c7646f..000000000000
--- a/spring-expression/src/test/java/org/springframework/expression/spel/AlternativeComparatorTests.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2002-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://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.expression.spel;
-
-import org.junit.Test;
-import org.springframework.lang.Nullable;
-import org.springframework.expression.Expression;
-import org.springframework.expression.TypeComparator;
-import org.springframework.expression.EvaluationException;
-import org.springframework.expression.ExpressionParser;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-
-import static org.junit.Assert.*;
-
-/**
- * Test construction of arrays.
- *
- * @author Andy Clement
- */
-public class AlternativeComparatorTests {
-	private ExpressionParser parser = new SpelExpressionParser();
-
-	// A silly comparator declaring everything to be equal
-	private TypeComparator customComparator = new TypeComparator() {
-		@Override
-		public boolean canCompare(@Nullable Object firstObject, @Nullable Object secondObject) {
-			return true;
-		}
-
-		@Override
-		public int compare(@Nullable Object firstObject, @Nullable Object secondObject) throws EvaluationException {
-			return 0;
-		}
-
-	};
-
-	@Test
-	public void customComparatorWorksWithEquality() {
-		final StandardEvaluationContext ctx = new StandardEvaluationContext();
-		ctx.setTypeComparator(customComparator);
-
-		Expression expr = parser.parseExpression("'1' == 1");
-
-		assertEquals(true, expr.getValue(ctx, Boolean.class));
-
-	}
-}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ComparatorTests.java
similarity index 80%
rename from spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ComparatorTests.java
index f27a0ed42d4f..1c2d10e46368 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ComparatorTests.java
@@ -21,8 +21,13 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.EvaluationException;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.TypeComparator;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.expression.spel.support.StandardTypeComparator;
+import org.springframework.lang.Nullable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,7 +37,7 @@
  * @author Andy Clement
  * @author Giovanni Dall'Oglio Risso
  */
-class DefaultComparatorUnitTests {
+public class ComparatorTests {
 
 	@Test
 	void testPrimitives() throws EvaluationException {
@@ -120,4 +125,30 @@ void testCanCompare() throws EvaluationException {
 		assertThat(comparator.canCompare(String.class,3)).isFalse();
 	}
 
+	@Test
+	public void customComparatorWorksWithEquality() {
+		final StandardEvaluationContext ctx = new StandardEvaluationContext();
+		ctx.setTypeComparator(customComparator);
+
+		ExpressionParser parser = new SpelExpressionParser();
+		Expression expr = parser.parseExpression("'1' == 1");
+
+		assertThat(expr.getValue(ctx, Boolean.class)).isTrue();
+
+	}
+
+	// A silly comparator declaring everything to be equal
+	private TypeComparator customComparator = new TypeComparator() {
+		@Override
+		public boolean canCompare(@Nullable Object firstObject, @Nullable Object secondObject) {
+			return true;
+		}
+
+		@Override
+		public int compare(@Nullable Object firstObject, @Nullable Object secondObject) throws EvaluationException {
+			return 0;
+		}
+
+	};
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
index baef9bd558c9..28f446280b8d 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
@@ -58,7 +58,9 @@ void testEqual() {
 		evaluate("'abc' == new java.lang.StringBuilder('abc')", true, Boolean.class);
 		evaluate("'abc' == 'def'", false, Boolean.class);
 		evaluate("'abc' == null", false, Boolean.class);
-		evaluate("new org.springframework.expression.spel.OperatorTests$SubComparable() == new org.springframework.expression.spel.OperatorTests$OtherSubComparable()", true, Boolean.class);
+		evaluate("new org.springframework.expression.spel.OperatorTests$SubComparable(0) == new org.springframework.expression.spel.OperatorTests$OtherSubComparable(0)", true, Boolean.class);
+		evaluate("new org.springframework.expression.spel.OperatorTests$SubComparable(1) < new org.springframework.expression.spel.OperatorTests$OtherSubComparable(2)", true, Boolean.class);
+		evaluate("new org.springframework.expression.spel.OperatorTests$SubComparable(2) > new org.springframework.expression.spel.OperatorTests$OtherSubComparable(1)", true, Boolean.class);
 
 		evaluate("3 eq 5", false, Boolean.class);
 		evaluate("5 eQ 3", false, Boolean.class);
@@ -621,18 +623,40 @@ private Operator findOperator(SpelNode node) {
 
 	public static class BaseComparable implements Comparable<BaseComparable> {
 
+		private int id;
+
+		public BaseComparable() {
+			this.id = 0;
+		}
+
+		public BaseComparable(int id) {
+			this.id = id;
+		}
+
 		@Override
 		public int compareTo(BaseComparable other) {
-			return 0;
+			return this.id - other.id;
 		}
 	}
 
 
 	public static class SubComparable extends BaseComparable {
+		public SubComparable() {
+		}
+
+		public SubComparable(int id) {
+			super(id);
+		}
 	}
 
 
 	public static class OtherSubComparable extends BaseComparable {
+		public OtherSubComparable() {
+		}
+
+		public OtherSubComparable(int id) {
+			super(id);
+		}
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java
new file mode 100644
index 000000000000..956187ea6fa4
--- /dev/null
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeComparatorTests.java
@@ -0,0 +1,152 @@
+/*
+ * 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.expression.spel;
+
+import java.math.BigDecimal;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.expression.EvaluationException;
+import org.springframework.expression.TypeComparator;
+import org.springframework.expression.spel.support.StandardTypeComparator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Unit tests for type comparison
+ *
+ * @author Andy Clement
+ * @author Giovanni Dall'Oglio Risso
+ */
+public class StandardTypeComparatorTests {
+
+	@Test
+	void testPrimitives() throws EvaluationException {
+		TypeComparator comparator = new StandardTypeComparator();
+		// primitive int
+		assertThat(comparator.compare(1, 2)).isNegative();
+		assertThat(comparator.compare(1, 1)).isZero();
+		assertThat(comparator.compare(2, 1)).isPositive();
+
+		assertThat(comparator.compare(1.0d, 2)).isNegative();
+		assertThat(comparator.compare(1.0d, 1)).isZero();
+		assertThat(comparator.compare(2.0d, 1)).isPositive();
+
+		assertThat(comparator.compare(1.0f, 2)).isNegative();
+		assertThat(comparator.compare(1.0f, 1)).isZero();
+		assertThat(comparator.compare(2.0f, 1)).isPositive();
+
+		assertThat(comparator.compare(1L, 2)).isNegative();
+		assertThat(comparator.compare(1L, 1)).isZero();
+		assertThat(comparator.compare(2L, 1)).isPositive();
+
+		assertThat(comparator.compare(1, 2L)).isNegative();
+		assertThat(comparator.compare(1, 1L)).isZero();
+		assertThat(comparator.compare(2, 1L)).isPositive();
+
+		assertThat(comparator.compare(1L, 2L)).isNegative();
+		assertThat(comparator.compare(1L, 1L)).isZero();
+		assertThat(comparator.compare(2L, 1L)).isPositive();
+	}
+
+	@Test
+	void testNonPrimitiveNumbers() throws EvaluationException {
+		TypeComparator comparator = new StandardTypeComparator();
+
+		BigDecimal bdOne = new BigDecimal("1");
+		BigDecimal bdTwo = new BigDecimal("2");
+
+		assertThat(comparator.compare(bdOne, bdTwo)).isNegative();
+		assertThat(comparator.compare(bdOne, new BigDecimal("1"))).isZero();
+		assertThat(comparator.compare(bdTwo, bdOne)).isPositive();
+
+		assertThat(comparator.compare(1, bdTwo)).isNegative();
+		assertThat(comparator.compare(1, bdOne)).isZero();
+		assertThat(comparator.compare(2, bdOne)).isPositive();
+
+		assertThat(comparator.compare(1.0d, bdTwo)).isNegative();
+		assertThat(comparator.compare(1.0d, bdOne)).isZero();
+		assertThat(comparator.compare(2.0d, bdOne)).isPositive();
+
+		assertThat(comparator.compare(1.0f, bdTwo)).isNegative();
+		assertThat(comparator.compare(1.0f, bdOne)).isZero();
+		assertThat(comparator.compare(2.0f, bdOne)).isPositive();
+
+		assertThat(comparator.compare(1L, bdTwo)).isNegative();
+		assertThat(comparator.compare(1L, bdOne)).isZero();
+		assertThat(comparator.compare(2L, bdOne)).isPositive();
+
+	}
+
+	@Test
+	void testNulls() throws EvaluationException {
+		TypeComparator comparator = new StandardTypeComparator();
+		assertThat(comparator.compare(null, "abc")).isNegative();
+		assertThat(comparator.compare(null, null)).isZero();
+		assertThat(comparator.compare("abc", null)).isPositive();
+	}
+
+	@Test
+	void testObjects() throws EvaluationException {
+		TypeComparator comparator = new StandardTypeComparator();
+		assertThat(comparator.compare("a", "a")).isZero();
+		assertThat(comparator.compare("a", "b")).isNegative();
+		assertThat(comparator.compare("b", "a")).isPositive();
+	}
+
+	@Test
+	void testCanCompare() throws EvaluationException {
+		TypeComparator comparator = new StandardTypeComparator();
+		assertThat(comparator.canCompare(null, 1)).isTrue();
+		assertThat(comparator.canCompare(1, null)).isTrue();
+
+		assertThat(comparator.canCompare(2, 1)).isTrue();
+		assertThat(comparator.canCompare("abc", "def")).isTrue();
+		assertThat(comparator.canCompare("abc", 3)).isFalse();
+		assertThat(comparator.canCompare(String.class, 3)).isFalse();
+	}
+
+	@Test
+	public void shouldUseCustomComparator() {
+		TypeComparator comparator = new StandardTypeComparator();
+		ComparableType t1 = new ComparableType(1);
+		ComparableType t2 = new ComparableType(2);
+
+		assertThat(comparator.canCompare(t1, 2)).isFalse();
+		assertThat(comparator.canCompare(t1, t2)).isTrue();
+		assertThat(comparator.compare(t1, t1)).isZero();
+		assertThat(comparator.compare(t1, t2)).isNegative();
+		assertThat(comparator.compare(t2, t1)).isPositive();
+	}
+
+	static class ComparableType implements Comparable<ComparableType> {
+
+		private final int id;
+
+		public ComparableType(int id) {
+			this.id = id;
+		}
+
+		@Override
+		public int compareTo(@NotNull ComparableType other) {
+			return this.id - other.id;
+		}
+
+	}
+
+}
diff --git a/src/docs/asciidoc/core/core-expressions.adoc b/src/docs/asciidoc/core/core-expressions.adoc
index 074523d392d1..5229e116757e 100644
--- a/src/docs/asciidoc/core/core-expressions.adoc
+++ b/src/docs/asciidoc/core/core-expressions.adoc
@@ -1052,8 +1052,9 @@ The Spring Expression Language supports the following kinds of operators:
 ==== Relational Operators
 
 The relational operators (equal, not equal, less than, less than or equal, greater than,
-and greater than or equal) are supported by using standard operator notation. The
-following listing shows a few examples of operators:
+and greater than or equal) are supported by using standard operator notation.
+These operators work on `Number` types as well as types implementing `Comparable`.
+The following listing shows a few examples of operators:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -1066,6 +1067,9 @@ following listing shows a few examples of operators:
 
 	// evaluates to true
 	boolean trueValue = parser.parseExpression("'black' < 'block'").getValue(Boolean.class);
+
+	// uses CustomValue:::compareTo
+	boolean trueValue = parser.parseExpression("new CustomValue(1) < new CustomValue(2)").getValue(Boolean.class);
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
@@ -1078,6 +1082,9 @@ following listing shows a few examples of operators:
 
 	// evaluates to true
 	val trueValue = parser.parseExpression("'black' < 'block'").getValue(Boolean::class.java)
+
+	// uses CustomValue:::compareTo
+	val trueValue = parser.parseExpression("new CustomValue(1) < new CustomValue(2)").getValue(Boolean::class.java);
 ----
 
 [NOTE]

From 6605953eb5919775b16f666bf1865a0cb43caaea Mon Sep 17 00:00:00 2001
From: Daniel Le <greenrecyclebin@gmail.com>
Date: Sat, 25 Sep 2021 20:18:54 +0800
Subject: [PATCH 381/735] Optimize header removal in ForwardedHeaderFilter

The current implementation suggests that the request's headers are not
expected to change. Hence, it's not necessary to copy them.
Furthermore, it might be costly to do so if there are many headers.
Instead, cache only the request's header names for method getHeaderNames.

Methods getHeader and getHeaders delegate to the respective methods of
request if the header name is not in FORWARDED_HEADER_NAMES. Otherwise,
they return null or an empty Enumeration respectively.

See gh-27466
---
 .../web/filter/ForwardedHeaderFilter.java     | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
index 27db5087a245..9d6bb2eed653 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
@@ -20,9 +20,7 @@
 import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
 
@@ -37,7 +35,6 @@
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.lang.Nullable;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedCaseInsensitiveMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.util.UriComponents;
@@ -169,23 +166,26 @@ protected void doFilterNestedErrorDispatch(HttpServletRequest request, HttpServl
 	 */
 	private static class ForwardedHeaderRemovingRequest extends HttpServletRequestWrapper {
 
-		private final Map<String, List<String>> headers;
+		private final Set<String> headerNames;
 
 		public ForwardedHeaderRemovingRequest(HttpServletRequest request) {
 			super(request);
-			this.headers = initHeaders(request);
+
+			this.headerNames = headerNames(request);
 		}
 
-		private static Map<String, List<String>> initHeaders(HttpServletRequest request) {
-			Map<String, List<String>> headers = new LinkedCaseInsensitiveMap<>(Locale.ENGLISH);
-			Enumeration<String> names = request.getHeaderNames();
+		private static Set<String> headerNames(HttpServletRequest request) {
+			final var headerNames = Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(Locale.ENGLISH));
+			final var names = request.getHeaderNames();
+
 			while (names.hasMoreElements()) {
-				String name = names.nextElement();
-				if (!FORWARDED_HEADER_NAMES.contains(name)) {
-					headers.put(name, Collections.list(request.getHeaders(name)));
-				}
+				final var name = names.nextElement();
+				headerNames.add(name);
 			}
-			return headers;
+
+			headerNames.removeAll(FORWARDED_HEADER_NAMES);
+
+			return Collections.unmodifiableSet(headerNames);
 		}
 
 		// Override header accessors to not expose forwarded headers
@@ -193,19 +193,25 @@ private static Map<String, List<String>> initHeaders(HttpServletRequest request)
 		@Override
 		@Nullable
 		public String getHeader(String name) {
-			List<String> value = this.headers.get(name);
-			return (CollectionUtils.isEmpty(value) ? null : value.get(0));
+			if (FORWARDED_HEADER_NAMES.contains(name)) {
+				return null;
+			}
+
+			return super.getHeader(name);
 		}
 
 		@Override
 		public Enumeration<String> getHeaders(String name) {
-			List<String> value = this.headers.get(name);
-			return (Collections.enumeration(value != null ? value : Collections.emptySet()));
+			if (FORWARDED_HEADER_NAMES.contains(name)) {
+				return Collections.emptyEnumeration();
+			}
+
+			return super.getHeaders(name);
 		}
 
 		@Override
 		public Enumeration<String> getHeaderNames() {
-			return Collections.enumeration(this.headers.keySet());
+			return Collections.enumeration(this.headerNames);
 		}
 	}
 

From e66095b1a27d0b65ecf845585986b3beefc35a02 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Thu, 25 Nov 2021 22:03:11 +0100
Subject: [PATCH 382/735] Polish

Closes gh-27466
---
 .../web/filter/ForwardedHeaderFilter.java       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
index 9d6bb2eed653..abb2b469b002 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
@@ -170,21 +170,18 @@ private static class ForwardedHeaderRemovingRequest extends HttpServletRequestWr
 
 		public ForwardedHeaderRemovingRequest(HttpServletRequest request) {
 			super(request);
-
 			this.headerNames = headerNames(request);
 		}
 
 		private static Set<String> headerNames(HttpServletRequest request) {
-			final var headerNames = Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(Locale.ENGLISH));
-			final var names = request.getHeaderNames();
-
+			Set<String> headerNames = Collections.newSetFromMap(new LinkedCaseInsensitiveMap<>(Locale.ENGLISH));
+			Enumeration<String> names = request.getHeaderNames();
 			while (names.hasMoreElements()) {
-				final var name = names.nextElement();
-				headerNames.add(name);
+				String name = names.nextElement();
+				if (!FORWARDED_HEADER_NAMES.contains(name)) {
+					headerNames.add(name);
+				}
 			}
-
-			headerNames.removeAll(FORWARDED_HEADER_NAMES);
-
 			return Collections.unmodifiableSet(headerNames);
 		}
 
@@ -196,7 +193,6 @@ public String getHeader(String name) {
 			if (FORWARDED_HEADER_NAMES.contains(name)) {
 				return null;
 			}
-
 			return super.getHeader(name);
 		}
 
@@ -205,7 +201,6 @@ public Enumeration<String> getHeaders(String name) {
 			if (FORWARDED_HEADER_NAMES.contains(name)) {
 				return Collections.emptyEnumeration();
 			}
-
 			return super.getHeaders(name);
 		}
 

From 2f32806bcb6cefa6479074d5fb66cb68043cedc9 Mon Sep 17 00:00:00 2001
From: Lars Grefer <github@larsgrefer.de>
Date: Thu, 11 Nov 2021 23:49:23 +0100
Subject: [PATCH 383/735] Update aspectj-plugin to 6.3.0

Version 6.3.0 aligns with the used Gradle 7.3

Closes gh-27678
---
 build.gradle                         | 2 +-
 spring-aspects/spring-aspects.gradle | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a6d25090556f..d1bddb65dd34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
-	id "io.freefair.aspectj" version '6.2.0' apply false
+	id "io.freefair.aspectj" version '6.3.0' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
 	id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 6b319135dba0..bd4e49ff638b 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -8,8 +8,6 @@ sourceSets.main.java.srcDirs = files()
 sourceSets.test.aspectj.srcDir "src/test/java"
 sourceSets.test.java.srcDirs = files()
 
-aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
-
 compileAspectj {
 	sourceCompatibility "17"
 	targetCompatibility "17"

From e209a460ca35b90daba6a923f1bdabc4bfdbaaa8 Mon Sep 17 00:00:00 2001
From: diguage <leejun119@gmail.com>
Date: Sat, 12 Jan 2019 22:32:46 +0800
Subject: [PATCH 384/735] Fix reference to CountingBeforeAdvice

See gh-22246
---
 .../aop/config/AopNamespaceHandlerEventTests-context.xml      | 4 ++--
 .../AopNamespaceHandlerEventTests-directPointcutEvents.xml    | 2 +-
 .../AopNamespaceHandlerEventTests-pointcutRefEvents.xml       | 2 +-
 ...NamespaceHandlerPointcutErrorTests-pointcutDuplication.xml | 2 +-
 .../AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
index 64f222cdd372..4a290477bb9d 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
@@ -16,9 +16,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
index 852f7479377e..c06d3188a98e 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
@@ -9,6 +9,6 @@
 		<aop:advisor advice-ref="countingAdvice" pointcut="within(org.springframework..*)"/>
 	</aop:config>
 
-	<bean id="countingAdvice" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+	<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
index 8300b280512d..c1f5180aaceb 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
@@ -10,6 +10,6 @@
 		<aop:advisor advice-ref="countingAdvice" pointcut-ref="pc"/>
 	</aop:config>
 
-	<bean id="countingAdvice" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+	<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
index 33693b7c1c40..6cb11d7e966b 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
@@ -12,7 +12,7 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
index 3d2037805e41..b18d0d435e83 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
@@ -12,7 +12,7 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 

From 27257fb82e82861b01a4108ac46124c8adb32029 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sun, 28 Nov 2021 10:52:16 +0100
Subject: [PATCH 385/735] Polish "Fix reference to CountingBeforeAdvice"

See gh-22246
---
 .../aop/config/AopNamespaceHandlerEventTests-context.xml      | 4 ++--
 .../AopNamespaceHandlerEventTests-directPointcutEvents.xml    | 2 +-
 .../AopNamespaceHandlerEventTests-pointcutRefEvents.xml       | 2 +-
 ...NamespaceHandlerPointcutErrorTests-pointcutDuplication.xml | 2 +-
 .../AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
index 4a290477bb9d..6acd17a85671 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
@@ -16,9 +16,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
index c06d3188a98e..2f2024ada6cd 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml
@@ -9,6 +9,6 @@
 		<aop:advisor advice-ref="countingAdvice" pointcut="within(org.springframework..*)"/>
 	</aop:config>
 
-	<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="countingAdvice" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
index c1f5180aaceb..0b12eb945e5d 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml
@@ -10,6 +10,6 @@
 		<aop:advisor advice-ref="countingAdvice" pointcut-ref="pc"/>
 	</aop:config>
 
-	<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="countingAdvice" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
index 6cb11d7e966b..7c8f47124e6b 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
@@ -12,7 +12,7 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
index b18d0d435e83..847f864eb114 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
@@ -12,7 +12,7 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 

From 445c0def0ce741e70d716da74862e03a4524ab3f Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 29 Nov 2021 17:13:57 +0000
Subject: [PATCH 386/735] Update docs on heartbeats with simple broker

Closes gh-27746
---
 src/docs/asciidoc/web/websocket.adoc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index e4ee1e49c055..2a8042403d5c 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1439,8 +1439,11 @@ See <<websocket-stomp-destination-separator>>.
 
 If configured with a task scheduler, the simple broker supports
 https://stomp.github.io/stomp-specification-1.2.html#Heart-beating[STOMP heartbeats].
-For that, you can declare your own scheduler or use the one that is automatically
-declared and used internally. The following example shows how to declare your own scheduler:
+To configure a scheduler, you can declare your own `TaskScheduler` bean and set it through
+the `MessageBrokerRegistry`. Alternatively, you can use the one that is automatically
+declared in the built-in WebSocket configuration, however, you'll' need `@Lazy` to avoid
+a cycle between the built-in WebSocket configuration and your
+`WebSocketMessageBrokerConfigurer`. For example:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -1451,13 +1454,12 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 	private TaskScheduler messageBrokerTaskScheduler;
 
 	@Autowired
-	public void setMessageBrokerTaskScheduler(TaskScheduler taskScheduler) {
+	public void setMessageBrokerTaskScheduler(@Lazy TaskScheduler taskScheduler) {
 		this.messageBrokerTaskScheduler = taskScheduler;
 	}
 
 	@Override
 	public void configureMessageBroker(MessageBrokerRegistry registry) {
-
 		registry.enableSimpleBroker("/queue/", "/topic/")
 				.setHeartbeatValue(new long[] {10000, 20000})
 				.setTaskScheduler(this.messageBrokerTaskScheduler);

From 0d478ca8dd55d080e656831f9abc7fa794d7acfb Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 29 Nov 2021 17:37:37 +0000
Subject: [PATCH 387/735] Add link to WebSocket scope from the Spring Core
 section

Closes gh-25172
---
 src/docs/asciidoc/core/core-beans.adoc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 22cdf42ce530..72138867377e 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -2969,6 +2969,8 @@ When using annotation-driven components or Java configuration, you can use the
 ----
 
 
+
+
 [[beans-factory-scopes-application]]
 ==== Application Scope
 
@@ -3012,6 +3014,17 @@ following example shows how to do so:
 
 
 
+
+[[beans-factory-scopes-websocket]]
+==== WebSocket Scope
+
+WebSocket scope is associated with the lifecycle of a WebSocket session and applies to
+STOMP over WebSocket applications, see
+<<web.adoc#websocket-stomp-websocket-scope,WebSocket scope>> for more details.
+
+
+
+
 [[beans-factory-scopes-other-injection]]
 ==== Scoped Beans as Dependencies
 

From 40d2058b9756189f6208d5389056032f6088fd28 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 30 Nov 2021 12:22:31 +0100
Subject: [PATCH 388/735] Upgrade to JUnit 5.8.2

Closes gh-27744
---
 build.gradle                   | 6 +++---
 spring-test/spring-test.gradle | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6021fa574ddf..90251e0e8fac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ configure(allprojects) { project ->
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
-			mavenBom "org.junit:junit-bom:5.8.1"
+			mavenBom "org.junit:junit-bom:5.8.2"
 		}
 		dependencies {
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
@@ -383,9 +383,9 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			// Disabling linking to JUnit 5.8.1, since the `package-list` file no longer exists due to
+			// Disabling linking to JUnit 5.8.2, since the `package-list` file no longer exists due to
 			// https://github.com/junit-team/junit5/commit/67ad4e545518b0ce2b0e7c96df31a669866d5003.
-			// "https://junit.org/junit5/docs/5.8.1/api/",
+			// "https://junit.org/junit5/docs/5.8.2/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 0bc316636a7a..58ca0680ad44 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -60,9 +60,6 @@ dependencies {
 	testImplementation("org.hibernate:hibernate-core")
 	testImplementation("org.hibernate:hibernate-validator")
 	testImplementation("javax.validation:validation-api")
-	testImplementation("org.junit.platform:junit-platform-runner") {
-		exclude group: "junit", module: "junit"
-	}
 	testImplementation("org.junit.platform:junit-platform-testkit")
 	testImplementation("com.fasterxml.jackson.core:jackson-databind")
 	testImplementation("com.thoughtworks.xstream:xstream")

From a0d54105e99111755489339e34b3cce3e525b8e9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 30 Nov 2021 13:00:28 +0100
Subject: [PATCH 389/735] Use new features in JUnit Jupiter 5.8.2

See gh-27744
---
 .../datasource/init/ScriptUtilsUnitTests.java | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java
index 1255c297bf9a..7c9202cceec2 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java
@@ -200,37 +200,43 @@ public void readAndSplitScriptContainingMultiLineNestedComments() throws Excepti
 	}
 
 	@ParameterizedTest
-	@CsvSource(delimiter = '#', value = {
-		// semicolon
-		"'select 1\n select '';'''                                                          # ;      # false",
-		"'select 1\n select \";\"'                                                          # ;      # false",
-		"'select 1; select 2'                                                               # ;      # true",
-		// newline
-		"'select 1; select ''\n'''                                                          # '\n'   # false",
-		"'select 1; select \"\n\"'                                                          # '\n'   # false",
-		"'select 1\n select 2'                                                              # '\n'   # true",
-		// double newline
-		"'select 1\n select 2'                                                              # '\n\n' # false",
-		"'select 1\n\n select 2'                                                            # '\n\n' # true",
-		// semicolon with MySQL style escapes '\\'
-		"'insert into users(first, last)\nvalues(''a\\\\'', ''b;'')'                        # ;      # false",
-		"'insert into users(first, last)\nvalues(''Charles'', ''d\\''Artagnan''); select 1' # ;      # true",
-		// semicolon inside comments
-		"'-- a;b;c\ninsert into colors(color_num) values(42);'                              # ;      # true",
-		"'/* a;b;c */\ninsert into colors(color_num) values(42);'                           # ;      # true",
-		"'-- a;b;c\ninsert into colors(color_num) values(42)'                               # ;      # false",
-		"'/* a;b;c */\ninsert into colors(color_num) values(42)'                            # ;      # false",
-		// single quotes inside comments
-		"'-- What\\''s your favorite color?\ninsert into colors(color_num) values(42);'     # ;      # true",
-		"'-- What''s your favorite color?\ninsert into colors(color_num) values(42);'       # ;      # true",
-		"'/* What\\''s your favorite color? */\ninsert into colors(color_num) values(42);'  # ;      # true",
-		"'/* What''s your favorite color? */\ninsert into colors(color_num) values(42);'    # ;      # true",
-		// double quotes inside comments
-		"'-- double \" quotes\ninsert into colors(color_num) values(42);'                   # ;      # true",
-		"'-- double \\\" quotes\ninsert into colors(color_num) values(42);'                 # ;      # true",
-		"'/* double \" quotes */\ninsert into colors(color_num) values(42);'                # ;      # true",
-		"'/* double \\\" quotes */\ninsert into colors(color_num) values(42);'              # ;      # true"
-	})
+	@CsvSource(delimiter = '|', quoteCharacter = '~', textBlock = """
+		# semicolon
+		~select 1\n select ';'~                                                            | ;      | false
+		~select 1\n select ";"~                                                            | ;      | false
+		~select 1; select 2~                                                               | ;      | true
+
+		# newline
+		~select 1; select '\n'~                                                            | ~\n~   | false
+		~select 1; select "\n"~                                                            | ~\n~   | false
+		~select 1\n select 2~                                                              | ~\n~   | true
+
+		# double newline
+		~select 1\n select 2~                                                              | ~\n\n~ | false
+		~select 1\n\n select 2~                                                            | ~\n\n~ | true
+
+		# semicolon with MySQL style escapes '\\'
+		~insert into users(first, last)\n values('a\\\\', 'b;')~                           | ;      | false
+		~insert into users(first, last)\n values('Charles', 'd\\'Artagnan'); select 1~     | ;      | true
+
+		# semicolon inside comments
+		~-- a;b;c\n insert into colors(color_num) values(42);~                             | ;      | true
+		~/* a;b;c */\n insert into colors(color_num) values(42);~                          | ;      | true
+		~-- a;b;c\n insert into colors(color_num) values(42)~                              | ;      | false
+		~/* a;b;c */\n insert into colors(color_num) values(42)~                           | ;      | false
+
+		# single quotes inside comments
+		~-- What\\'s your favorite color?\n insert into colors(color_num) values(42);~     | ;      | true
+		~-- What's your favorite color?\n insert into colors(color_num) values(42);~       | ;      | true
+		~/* What\\'s your favorite color? */\n insert into colors(color_num) values(42);~  | ;      | true
+		~/* What's your favorite color? */\n insert into colors(color_num) values(42);~    | ;      | true
+
+		# double quotes inside comments
+		~-- double " quotes\n insert into colors(color_num) values(42);~                   | ;      | true
+		~-- double \\" quotes\n insert into colors(color_num) values(42);~                 | ;      | true
+		~/* double " quotes */\n insert into colors(color_num) values(42);~                | ;      | true
+		~/* double \\" quotes */\n insert into colors(color_num) values(42);~              | ;      | true
+		""")
 	@SuppressWarnings("deprecation")
 	public void containsStatementSeparator(String script, String delimiter, boolean expected) {
 		// Indirectly tests ScriptUtils.containsStatementSeparator(EncodedResource, String, String, String[], String, String).

From 2a5713f389e305300d7659887d38a89aa4e7e91e Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Mon, 29 Nov 2021 16:48:36 +0100
Subject: [PATCH 390/735] Always copy ServerResponse headers

Prior to this commit, ServerResponse headers would only be written if
there were no existing headers with the same name, thus making it
impossible to overwrite existing headers.

With the changes in this commit, headers are always written.

Closes gh-27741
---
 .../server/DefaultServerResponseBuilder.java    |  4 +---
 .../DefaultServerResponseBuilderTests.java      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
index da71fbe565a1..2d406d39d46c 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
@@ -362,9 +362,7 @@ private void writeStatusAndHeaders(ServerHttpResponse response) {
 
 		private static <K,V> void copy(MultiValueMap<K,V> src, MultiValueMap<K,V> dst) {
 			if (!src.isEmpty()) {
-				src.entrySet().stream()
-						.filter(entry -> !dst.containsKey(entry.getKey()))
-						.forEach(entry -> dst.put(entry.getKey(), entry.getValue()));
+				dst.putAll(src);
 			}
 		}
 	}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
index 38b295463ca4..c3780d2c443d 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
@@ -320,6 +320,23 @@ public void copyCookies() {
 		assertThat(serverResponse.block().cookies().isEmpty()).isFalse();
 	}
 
+	@Test
+	public void overwriteHeaders() {
+		ServerResponse serverResponse =
+				ServerResponse.ok().headers(headers -> headers.set("Foo", "Bar")).build().block();
+		assertThat(serverResponse).isNotNull();
+
+		MockServerWebExchange mockExchange = MockServerWebExchange
+				.builder(MockServerHttpRequest.get("https://example.org"))
+				.build();
+		MockServerHttpResponse response = mockExchange.getResponse();
+		response.getHeaders().set("Foo", "Baz");
+
+		serverResponse.writeTo(mockExchange, EMPTY_CONTEXT).block();
+
+		assertThat(response.getHeaders().getFirst("Foo")).isEqualTo("Bar");
+	}
+
 
 	@Test
 	public void build() {

From 6e335e3a9ff7727dc42e790904ae98a6d0edb7b5 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Thu, 25 Nov 2021 13:41:24 +0100
Subject: [PATCH 391/735] Refactor HTTP Method from Enum to Class

This commit refactors HttpMethod from a Java enum into a class. The
underlying reason being that HTTP methods are not enumerable, but
instead an open range and not limited to the predefined values in the
specifications.

Closes gh-27697
---
 .../org/springframework/http/HttpMethod.java  | 135 +++++++++++++++++-
 .../springframework/http/HttpMethodTests.java |  76 ++++++++++
 2 files changed, 207 insertions(+), 4 deletions(-)
 create mode 100644 spring-web/src/test/java/org/springframework/http/HttpMethodTests.java

diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
index b1039145cf4d..0cb5885a0f54 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMethod.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -16,13 +16,15 @@
 
 package org.springframework.http;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 
 /**
- * Java 5 enumeration of HTTP request methods. Intended for use
+ * Represents an HTTP request methods. Intended for use
  * with {@link org.springframework.http.client.ClientHttpRequest}
  * and {@link org.springframework.web.client.RestTemplate}.
  *
@@ -30,32 +32,131 @@
  * @author Juergen Hoeller
  * @since 3.0
  */
-public enum HttpMethod {
+public final class HttpMethod implements Comparable<HttpMethod>, Serializable {
 
-	GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
+	private static final long serialVersionUID = -70133475680645360L;
 
+	private static final HttpMethod[] values;
 
 	private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
 
+
+	/**
+	 * The HTTP method {@code GET}.
+	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.3">HTTP 1.1, section 9.3</a>
+	 */
+	public static final HttpMethod GET = new HttpMethod("GET");
+
+	/**
+	 * The HTTP method {@code HEAD}.
+	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4">HTTP 1.1, section 9.4</a>
+	 */
+	public static final HttpMethod HEAD = new HttpMethod("HEAD");
+
+	/**
+	 * The HTTP method {@code POST}.
+	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.5">HTTP 1.1, section 9.5</a>
+	 */
+	public static final HttpMethod POST = new HttpMethod("POST");
+
+	/**
+	 * The HTTP method {@code PUT}.
+	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.6">HTTP 1.1, section 9.6</a>
+	 */
+	public static final HttpMethod PUT = new HttpMethod("PUT");
+
+	/**
+	 * The HTTP method {@code PATCH}.
+	 * @see <a href="https://datatracker.ietf.org/doc/html/rfc5789#section-2">RFC 5789</a>
+	 */
+	public static final HttpMethod PATCH = new HttpMethod("PATCH");
+
+	/**
+	 * The HTTP method {@code DELETE}.
+	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.7">HTTP 1.1, section 9.7</a>
+	 */
+	public static final HttpMethod DELETE = new HttpMethod("DELETE");
+
+	/**
+	 * The HTTP method {@code OPTIONS}.
+	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.2">HTTP 1.1, section 9.2</a>
+	 */
+	public static final HttpMethod OPTIONS = new HttpMethod("OPTIONS");
+
+	/**
+	 * The HTTP method {@code TRACE}.
+	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.8">HTTP 1.1, section 9.8</a>
+	 */
+	public static final HttpMethod TRACE = new HttpMethod("TRACE");
+
+
 	static {
-		for (HttpMethod httpMethod : values()) {
+		values = new HttpMethod[]{GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE};
+		for (HttpMethod httpMethod : values) {
 			mappings.put(httpMethod.name(), httpMethod);
 		}
 	}
 
 
+	private final String name;
+
+
+	private HttpMethod(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Returns an array containing the standard HTTP methods. Specifically,
+	 * this method returns an array containing {@link #GET}, {@link #HEAD},
+	 * {@link #POST}, {@link #PUT}, {@link #PATCH}, {@link #DELETE},
+	 * {@link #OPTIONS}, and {@link #TRACE}.
+	 *
+	 * <p>Note that the returned value does not include any HTTP methods defined
+	 * in WebDav.
+	 */
+	public static HttpMethod[] values() {
+		HttpMethod[] copy = new HttpMethod[values.length];
+		System.arraycopy(values, 0, copy, 0, values.length);
+		return copy;
+	}
+
+	/**
+	 * Return an {@code HttpMethod} object for the given value.
+	 * @param method the method value as a String
+	 * @return the corresponding {@code HttpMethod}
+	 */
+	public static HttpMethod valueOf(String method) {
+		Assert.notNull(method, "Name must not be null");
+		HttpMethod result = mappings.get(method);
+		if (result != null) {
+			return result;
+		}
+		else {
+			return new HttpMethod(method);
+		}
+	}
+
 	/**
 	 * Resolve the given method value to an {@code HttpMethod}.
 	 * @param method the method value as a String
 	 * @return the corresponding {@code HttpMethod}, or {@code null} if not found
 	 * @since 4.2.4
+	 * @deprecated in favor of {@link #valueOf(String)}
 	 */
 	@Nullable
+	@Deprecated
 	public static HttpMethod resolve(@Nullable String method) {
 		return (method != null ? mappings.get(method) : null);
 	}
 
 
+	/**
+	 * Return the name of this method, e.g. "GET", "POST".
+	 */
+	public String name() {
+		return this.name;
+	}
+
 	/**
 	 * Determine whether this {@code HttpMethod} matches the given method value.
 	 * @param method the HTTP method as a String
@@ -66,4 +167,30 @@ public boolean matches(String method) {
 		return name().equals(method);
 	}
 
+
+	@Override
+	public int compareTo(HttpMethod other) {
+		return this.name.compareTo(other.name);
+	}
+
+	@Override
+	public int hashCode() {
+		return this.name.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		else if (o instanceof HttpMethod other) {
+			return this.name.equals(other.name);
+		}
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return this.name;
+	}
 }
diff --git a/spring-web/src/test/java/org/springframework/http/HttpMethodTests.java b/spring-web/src/test/java/org/springframework/http/HttpMethodTests.java
new file mode 100644
index 000000000000..ee92695ac912
--- /dev/null
+++ b/spring-web/src/test/java/org/springframework/http/HttpMethodTests.java
@@ -0,0 +1,76 @@
+/*
+ * 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.http;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Arjen Poutsma
+ */
+class HttpMethodTests {
+
+	@Test
+	public void comparison() {
+		HttpMethod method1 = HttpMethod.valueOf("FOO");
+		HttpMethod method2 = HttpMethod.valueOf("FOO");
+		HttpMethod method3 = HttpMethod.valueOf("BAR");
+
+		assertThat(method1).isEqualTo(method2);
+		assertThat(method1).isNotEqualTo(method3);
+
+		assertThat(method1.hashCode()).isEqualTo(method2.hashCode());
+
+		assertThat(method1.compareTo(method2)).isEqualTo(0);
+		assertThat(method1.compareTo(method3)).isNotEqualTo(0);
+	}
+
+	@Test
+	void values() {
+		HttpMethod[] values = HttpMethod.values();
+		assertThat(values).containsExactly(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.POST, HttpMethod.PUT,
+				HttpMethod.PATCH, HttpMethod.DELETE, HttpMethod.OPTIONS, HttpMethod.TRACE);
+
+		// check defensive copy
+		values[0] = HttpMethod.POST;
+		assertThat(HttpMethod.values()).containsExactly(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.POST, HttpMethod.PUT,
+				HttpMethod.PATCH, HttpMethod.DELETE, HttpMethod.OPTIONS, HttpMethod.TRACE);
+	}
+
+	@Test
+	void valueOf() {
+		HttpMethod get = HttpMethod.valueOf("GET");
+		assertThat(get).isSameAs(HttpMethod.GET);
+
+		HttpMethod foo = HttpMethod.valueOf("FOO");
+		HttpMethod other = HttpMethod.valueOf("FOO");
+		assertThat(foo).isEqualTo(other);
+	}
+
+	@Test
+	void name() {
+		HttpMethod method = HttpMethod.valueOf("FOO");
+		assertThat(method.name()).isEqualTo("FOO");
+	}
+
+	@Test
+	void matches() {
+		assertThat(HttpMethod.GET.matches("GET")).isTrue();
+		assertThat(HttpMethod.GET.matches("FOO")).isFalse();
+	}
+}

From 7a4207cd7bfbe57217b1718111f8c56cb076a34d Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Thu, 25 Nov 2021 13:45:34 +0100
Subject: [PATCH 392/735] Changes because HttpMethod changed to class

This commit contains changes made because HttpMethod changed from enum
to class.

See gh-27697
---
 .../http/client/MockClientHttpRequest.java    |  1 +
 .../reactive/MockServerHttpRequest.java       | 29 ++++++-------
 .../web/MockMultipartHttpServletRequest.java  | 12 +++---
 .../function/server/MockServerRequest.java    |  1 +
 .../org/springframework/http/HttpHeaders.java | 35 ++++++++-------
 .../org/springframework/http/HttpRequest.java | 16 +++----
 .../BufferingClientHttpRequestWrapper.java    |  3 +-
 .../HttpComponentsClientHttpRequest.java      |  5 +++
 ...ttpComponentsClientHttpRequestFactory.java | 43 +++++++++++--------
 ...pComponentsStreamingClientHttpRequest.java |  6 +++
 .../client/InterceptingClientHttpRequest.java |  3 +-
 .../http/client/OkHttp3ClientHttpRequest.java |  1 +
 .../SimpleBufferingClientHttpRequest.java     |  5 +++
 .../SimpleStreamingClientHttpRequest.java     |  5 +++
 .../HttpComponentsClientHttpRequest.java      |  5 +--
 .../client/support/HttpRequestWrapper.java    |  3 +-
 .../http/server/ServletServerHttpRequest.java |  4 +-
 .../DefaultServerHttpRequestBuilder.java      | 23 ++++++----
 .../reactive/ReactorServerHttpRequest.java    |  6 +++
 .../reactive/ServerHttpRequestDecorator.java  |  2 +-
 .../reactive/ServletServerHttpRequest.java    |  6 +++
 .../reactive/UndertowServerHttpRequest.java   |  7 +++
 ...ttpRequestMethodNotSupportedException.java | 14 +++---
 .../context/request/ServletWebRequest.java    |  3 +-
 .../web/cors/CorsConfiguration.java           |  6 +--
 .../reactive/HiddenHttpMethodFilter.java      |  3 +-
 .../MultipartHttpServletRequest.java          |  1 -
 .../AbstractMultipartHttpServletRequest.java  |  2 +-
 .../http/HttpHeadersTests.java                |  4 +-
 ...rceptingClientHttpRequestFactoryTests.java |  1 +
 .../reactive/ClientHttpConnectorTests.java    |  6 +--
 .../client/RestTemplateIntegrationTests.java  |  3 +-
 .../web/client/RestTemplateTests.java         |  3 +-
 .../reactive/HiddenHttpMethodFilterTests.java | 11 -----
 .../web/util/UriComponentsBuilderTests.java   |  7 +++
 ...tParamMethodArgumentResolverKotlinTests.kt | 16 +++----
 .../reactive/MockClientHttpRequest.java       |  1 +
 .../reactive/MockServerHttpRequest.java       | 29 ++++++-------
 .../MockMultipartHttpServletRequest.java      |  8 +++-
 .../client/DefaultClientResponseBuilder.java  |  9 +++-
 .../function/client/DefaultWebClient.java     |  3 +-
 .../function/client/ExchangeFunctions.java    |  1 +
 .../client/WebClientResponseException.java    |  2 +-
 .../function/server/DefaultServerRequest.java |  9 +++-
 .../server/DefaultServerRequestBuilder.java   | 20 ++++++---
 .../server/DefaultServerResponseBuilder.java  |  3 +-
 .../function/server/RequestPredicates.java    | 16 +++----
 .../server/ResourceHandlerFunction.java       | 30 ++++++-------
 .../function/server/ServerRequest.java        |  7 ++-
 .../server/support/ServerRequestWrapper.java  |  1 +
 .../reactive/resource/ResourceWebHandler.java |  7 ++-
 .../RequestMethodsRequestCondition.java       |  2 +-
 .../RequestMappingInfoHandlerMapping.java     | 12 +++---
 ...AbstractMessageReaderArgumentResolver.java |  5 +--
 .../ResponseEntityResultHandler.java          |  3 +-
 .../support/HandshakeWebSocketService.java    |  2 +-
 .../WebSocketUpgradeHandlerPredicate.java     |  5 ++-
 .../DefaultEntityResponseBuilderTests.java    |  3 +-
 .../DefaultServerResponseBuilderTests.java    |  3 +-
 .../server/ResourceHandlerFunctionTests.java  |  6 +--
 ...RequestMappingInfoHandlerMappingTests.java | 13 +++---
 .../web/servlet/FrameworkServlet.java         |  4 +-
 .../function/AbstractServerResponse.java      |  5 +--
 .../function/DefaultServerRequest.java        |  6 +++
 .../function/DefaultServerRequestBuilder.java | 22 ++++++----
 .../servlet/function/RequestPredicates.java   | 16 +++----
 .../function/ResourceHandlerFunction.java     | 24 +++++------
 .../web/servlet/function/ServerRequest.java   |  7 ++-
 ...essageConverterMethodArgumentResolver.java |  4 +-
 .../ServletRequestMethodArgumentResolver.java |  2 +-
 .../DefaultEntityResponseBuilderTests.java    |  3 +-
 .../DefaultServerResponseBuilderTests.java    |  4 +-
 .../ResourceHandlerFunctionTests.java         |  9 ++--
 .../ResponseEntityExceptionHandlerTests.java  |  4 +-
 74 files changed, 337 insertions(+), 274 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
index 7630ac3a3b2b..f3aafea735af 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
@@ -78,6 +78,7 @@ public HttpMethod getMethod() {
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.httpMethod.name();
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
index 29b39931af6c..6d8bda48ab81 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
@@ -55,10 +55,7 @@
  */
 public final class MockServerHttpRequest extends AbstractServerHttpRequest {
 
-	/**
-	 * String representation of one of {@link HttpMethod} or not empty custom method (e.g. <i>CONNECT</i>).
-	 */
-	private final String httpMethod;
+	private final HttpMethod httpMethod;
 
 	private final MultiValueMap<String, HttpCookie> cookies;
 
@@ -73,13 +70,12 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
 
 	private final Flux<DataBuffer> body;
 
-	private MockServerHttpRequest(String httpMethod,
+	private MockServerHttpRequest(HttpMethod httpMethod,
 			URI uri, @Nullable String contextPath, HttpHeaders headers, MultiValueMap<String, HttpCookie> cookies,
 			@Nullable InetSocketAddress localAddress, @Nullable InetSocketAddress remoteAddress,
 			@Nullable SslInfo sslInfo, Publisher<? extends DataBuffer> body) {
 
 		super(uri, contextPath, headers);
-		Assert.isTrue(StringUtils.hasText(httpMethod), "HTTP method is required.");
 		this.httpMethod = httpMethod;
 		this.cookies = cookies;
 		this.localAddress = localAddress;
@@ -90,14 +86,14 @@ private MockServerHttpRequest(String httpMethod,
 
 
 	@Override
-	@Nullable
 	public HttpMethod getMethod() {
-		return HttpMethod.resolve(this.httpMethod);
+		return this.httpMethod;
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
-		return this.httpMethod;
+		return this.httpMethod.name();
 	}
 
 	@Override
@@ -218,7 +214,7 @@ public static BaseBuilder<?> options(String urlTemplate, Object... uriVars) {
 	public static BodyBuilder method(HttpMethod method, URI url) {
 		Assert.notNull(method, "HTTP method is required. " +
 				"For a custom HTTP method, please provide a String HTTP method value.");
-		return new DefaultBodyBuilder(method.name(), url);
+		return new DefaultBodyBuilder(method, url);
 	}
 
 	/**
@@ -242,9 +238,12 @@ public static BodyBuilder method(HttpMethod method, String uri, Object... vars)
 	 * @param vars variables to expand into the template
 	 * @return the created builder
 	 * @since 5.2.7
+	 * @deprecated in favor of {@link #method(HttpMethod, String, Object...)}
 	 */
+	@Deprecated
 	public static BodyBuilder method(String httpMethod, String uri, Object... vars) {
-		return new DefaultBodyBuilder(httpMethod, toUri(uri, vars));
+		Assert.isTrue(StringUtils.hasText(httpMethod), "HTTP method is required.");
+		return new DefaultBodyBuilder(HttpMethod.valueOf(httpMethod), toUri(uri, vars));
 	}
 
 	private static URI toUri(String uri, Object[] vars) {
@@ -427,7 +426,7 @@ public interface BodyBuilder extends BaseBuilder<BodyBuilder> {
 
 	private static class DefaultBodyBuilder implements BodyBuilder {
 
-		private final String methodValue;
+		private final HttpMethod method;
 
 		private final URI url;
 
@@ -449,8 +448,8 @@ private static class DefaultBodyBuilder implements BodyBuilder {
 		@Nullable
 		private SslInfo sslInfo;
 
-		DefaultBodyBuilder(String method, URI url) {
-			this.methodValue = method;
+		DefaultBodyBuilder(HttpMethod method, URI url) {
+			this.method = method;
 			this.url = url;
 		}
 
@@ -589,7 +588,7 @@ private Charset getCharset() {
 		@Override
 		public MockServerHttpRequest body(Publisher<? extends DataBuffer> body) {
 			applyCookiesIfNecessary();
-			return new MockServerHttpRequest(this.methodValue, getUrlToUse(), this.contextPath,
+			return new MockServerHttpRequest(this.method, getUrlToUse(), this.contextPath,
 					this.headers, this.cookies, this.localAddress, this.remoteAddress, this.sslInfo, body);
 		}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
index af199e423362..9357c9b58480 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletException;
@@ -102,12 +103,7 @@ public MultipartFile getFile(String name) {
 	@Override
 	public List<MultipartFile> getFiles(String name) {
 		List<MultipartFile> multipartFiles = this.multipartFiles.get(name);
-		if (multipartFiles != null) {
-			return multipartFiles;
-		}
-		else {
-			return Collections.emptyList();
-		}
+		return Objects.requireNonNullElse(multipartFiles, Collections.emptyList());
 	}
 
 	@Override
@@ -141,7 +137,9 @@ public String getMultipartContentType(String paramOrFileName) {
 
 	@Override
 	public HttpMethod getRequestMethod() {
-		return HttpMethod.resolve(getMethod());
+		String method = getMethod();
+		Assert.state(method != null, "Method must not be null");
+		return HttpMethod.valueOf(method);
 	}
 
 	@Override
diff --git a/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java b/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java
index 21440f4a07bc..5e5ee6ac4f55 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java
@@ -132,6 +132,7 @@ public HttpMethod method() {
 	}
 
 	@Override
+	@Deprecated
 	public String methodName() {
 		return this.method.name();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
index b009471a26ff..d4a27e923e16 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -34,7 +34,7 @@
 import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -589,18 +589,19 @@ public void setAccessControlAllowMethods(List<HttpMethod> allowedMethods) {
 	 * Return the value of the {@code Access-Control-Allow-Methods} response header.
 	 */
 	public List<HttpMethod> getAccessControlAllowMethods() {
-		List<HttpMethod> result = new ArrayList<>();
 		String value = getFirst(ACCESS_CONTROL_ALLOW_METHODS);
 		if (value != null) {
 			String[] tokens = StringUtils.tokenizeToStringArray(value, ",");
+			List<HttpMethod> result = new ArrayList<>();
 			for (String token : tokens) {
-				HttpMethod resolved = HttpMethod.resolve(token);
-				if (resolved != null) {
-					result.add(resolved);
-				}
+				HttpMethod method = HttpMethod.valueOf(token);
+				result.add(method);
 			}
+			return result;
+		}
+		else {
+			return Collections.emptyList();
 		}
-		return result;
 	}
 
 	/**
@@ -682,7 +683,13 @@ public void setAccessControlRequestMethod(@Nullable HttpMethod requestMethod) {
 	 */
 	@Nullable
 	public HttpMethod getAccessControlRequestMethod() {
-		return HttpMethod.resolve(getFirst(ACCESS_CONTROL_REQUEST_METHOD));
+		String requestMethod = getFirst(ACCESS_CONTROL_REQUEST_METHOD);
+		if (requestMethod != null) {
+			return HttpMethod.valueOf(requestMethod);
+		}
+		else {
+			return null;
+		}
 	}
 
 	/**
@@ -743,17 +750,15 @@ public Set<HttpMethod> getAllow() {
 		String value = getFirst(ALLOW);
 		if (StringUtils.hasLength(value)) {
 			String[] tokens = StringUtils.tokenizeToStringArray(value, ",");
-			List<HttpMethod> result = new ArrayList<>(tokens.length);
+			Set<HttpMethod> result = new LinkedHashSet<>(tokens.length);
 			for (String token : tokens) {
-				HttpMethod resolved = HttpMethod.resolve(token);
-				if (resolved != null) {
-					result.add(resolved);
-				}
+				HttpMethod method = HttpMethod.valueOf(token);
+				result.add(method);
 			}
-			return EnumSet.copyOf(result);
+			return result;
 		}
 		else {
-			return EnumSet.noneOf(HttpMethod.class);
+			return Collections.emptySet();
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/HttpRequest.java b/spring-web/src/main/java/org/springframework/http/HttpRequest.java
index ed82012166e2..2c0c71ca185d 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpRequest.java
@@ -18,8 +18,6 @@
 
 import java.net.URI;
 
-import org.springframework.lang.Nullable;
-
 /**
  * Represents an HTTP request message, consisting of
  * {@linkplain #getMethod() method} and {@linkplain #getURI() uri}.
@@ -31,22 +29,20 @@ public interface HttpRequest extends HttpMessage {
 
 	/**
 	 * Return the HTTP method of the request.
-	 * @return the HTTP method as an HttpMethod enum value, or {@code null}
-	 * if not resolvable (e.g. in case of a non-standard HTTP method)
-	 * @see #getMethodValue()
-	 * @see HttpMethod#resolve(String)
+	 * @return the HTTP method as an HttpMethod value
+	 * @see HttpMethod#valueOf(String)
 	 */
-	@Nullable
-	default HttpMethod getMethod() {
-		return HttpMethod.resolve(getMethodValue());
-	}
+	HttpMethod getMethod();
 
 	/**
 	 * Return the HTTP method of the request as a String value.
 	 * @return the HTTP method as a plain String
 	 * @since 5.0
 	 * @see #getMethod()
+	 * @deprecated in favor of {@link #getMethod()} and
+	 * {@link HttpMethod#name()}
 	 */
+	@Deprecated
 	String getMethodValue();
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
index c7daa6115e2a..2af781be97aa 100644
--- a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
@@ -21,7 +21,6 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.lang.Nullable;
 import org.springframework.util.StreamUtils;
 
 /**
@@ -41,12 +40,12 @@ final class BufferingClientHttpRequestWrapper extends AbstractBufferingClientHtt
 
 
 	@Override
-	@Nullable
 	public HttpMethod getMethod() {
 		return this.request.getMethod();
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.request.getMethodValue();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
index 5803e19f92a1..364405553725 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
@@ -59,8 +59,13 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR
 		this.httpContext = context;
 	}
 
+	@Override
+	public HttpMethod getMethod() {
+		return HttpMethod.valueOf(this.httpRequest.getMethod());
+	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.httpRequest.getMethod();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
index db8cb8cefce9..dbf763ac3b84 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
@@ -273,26 +273,31 @@ protected RequestConfig mergeRequestConfig(RequestConfig clientConfig) {
 	 * @return the Commons HttpMethodBase object
 	 */
 	protected HttpUriRequest createHttpUriRequest(HttpMethod httpMethod, URI uri) {
-		switch (httpMethod) {
-			case GET:
-				return new HttpGet(uri);
-			case HEAD:
-				return new HttpHead(uri);
-			case POST:
-				return new HttpPost(uri);
-			case PUT:
-				return new HttpPut(uri);
-			case PATCH:
-				return new HttpPatch(uri);
-			case DELETE:
-				return new HttpDelete(uri);
-			case OPTIONS:
-				return new HttpOptions(uri);
-			case TRACE:
-				return new HttpTrace(uri);
-			default:
-				throw new IllegalArgumentException("Invalid HTTP method: " + httpMethod);
+		if (HttpMethod.GET.equals(httpMethod)) {
+			return new HttpGet(uri);
 		}
+		else if (HttpMethod.HEAD.equals(httpMethod)) {
+			return new HttpHead(uri);
+		}
+		else if (HttpMethod.POST.equals(httpMethod)) {
+			return new HttpPost(uri);
+		}
+		else if (HttpMethod.PUT.equals(httpMethod)) {
+			return new HttpPut(uri);
+		}
+		else if (HttpMethod.PATCH.equals(httpMethod)) {
+			return new HttpPatch(uri);
+		}
+		else if (HttpMethod.DELETE.equals(httpMethod)) {
+			return new HttpDelete(uri);
+		}
+		else if (HttpMethod.OPTIONS.equals(httpMethod)) {
+			return new HttpOptions(uri);
+		}
+		else if (HttpMethod.TRACE.equals(httpMethod)) {
+			return new HttpTrace(uri);
+		}
+		throw new IllegalArgumentException("Invalid HTTP method: " + httpMethod);
 	}
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
index ed0cc19fa79d..2dc701df6deb 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
@@ -31,6 +31,7 @@
 import org.apache.http.protocol.HttpContext;
 
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.StreamingHttpOutputMessage;
 import org.springframework.lang.Nullable;
@@ -64,8 +65,13 @@ final class HttpComponentsStreamingClientHttpRequest extends AbstractClientHttpR
 		this.httpContext = context;
 	}
 
+	@Override
+	public HttpMethod getMethod() {
+		return HttpMethod.valueOf(this.httpRequest.getMethod());
+	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.httpRequest.getMethod();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
index 57198a5e697a..aa617cccf143 100644
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
@@ -25,7 +25,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.StreamingHttpOutputMessage;
-import org.springframework.util.Assert;
 import org.springframework.util.StreamUtils;
 
 /**
@@ -62,6 +61,7 @@ public HttpMethod getMethod() {
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.method.name();
 	}
@@ -94,7 +94,6 @@ public ClientHttpResponse execute(HttpRequest request, byte[] body) throws IOExc
 			}
 			else {
 				HttpMethod method = request.getMethod();
-				Assert.state(method != null, "No standard HTTP method");
 				ClientHttpRequest delegate = requestFactory.createRequest(request.getURI(), method);
 				request.getHeaders().forEach((key, value) -> delegate.getHeaders().addAll(key, value));
 				if (body.length > 0) {
diff --git a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java
index 74ff955332cd..07c074fd2e6d 100644
--- a/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/OkHttp3ClientHttpRequest.java
@@ -57,6 +57,7 @@ public HttpMethod getMethod() {
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.method.name();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
index 394a83076354..d47be65d4a23 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
@@ -47,8 +47,13 @@ final class SimpleBufferingClientHttpRequest extends AbstractBufferingClientHttp
 		this.outputStreaming = outputStreaming;
 	}
 
+	@Override
+	public HttpMethod getMethod() {
+		return HttpMethod.valueOf(this.connection.getRequestMethod());
+	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.connection.getRequestMethod();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
index 2b751ac1c21a..1a6a9fc42a48 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
@@ -55,8 +55,13 @@ final class SimpleStreamingClientHttpRequest extends AbstractClientHttpRequest {
 		this.outputStreaming = outputStreaming;
 	}
 
+	@Override
+	public HttpMethod getMethod() {
+		return HttpMethod.valueOf(this.connection.getRequestMethod());
+	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.connection.getRequestMethod();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
index 440fc681860b..40c6af39b589 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
@@ -40,7 +40,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 
 import static org.springframework.http.MediaType.ALL_VALUE;
 
@@ -74,9 +73,7 @@ public HttpComponentsClientHttpRequest(HttpMethod method, URI uri, HttpClientCon
 
 	@Override
 	public HttpMethod getMethod() {
-		HttpMethod method = HttpMethod.resolve(this.httpRequest.getMethod());
-		Assert.state(method != null, "Method must not be null");
-		return method;
+		return HttpMethod.valueOf(this.httpRequest.getMethod());
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
index d3a72f55449f..28233e858556 100644
--- a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
@@ -21,7 +21,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -59,7 +58,6 @@ public HttpRequest getRequest() {
 	 * Return the method of the wrapped request.
 	 */
 	@Override
-	@Nullable
 	public HttpMethod getMethod() {
 		return this.request.getMethod();
 	}
@@ -68,6 +66,7 @@ public HttpMethod getMethod() {
 	 * Return the method value of the wrapped request.
 	 */
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.request.getMethodValue();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index 478ae10542ca..75bbdd0dd7aa 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -92,12 +92,12 @@ public HttpServletRequest getServletRequest() {
 	}
 
 	@Override
-	@Nullable
 	public HttpMethod getMethod() {
-		return HttpMethod.resolve(this.servletRequest.getMethod());
+		return HttpMethod.valueOf(this.servletRequest.getMethod());
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.servletRequest.getMethod();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java b/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
index 956808e57ae1..c93b4ac286e3 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/DefaultServerHttpRequestBuilder.java
@@ -47,7 +47,7 @@ class DefaultServerHttpRequestBuilder implements ServerHttpRequest.Builder {
 
 	private final HttpHeaders headers;
 
-	private String httpMethodValue;
+	private HttpMethod httpMethod;
 
 	@Nullable
 	private String uriPath;
@@ -71,7 +71,7 @@ public DefaultServerHttpRequestBuilder(ServerHttpRequest original) {
 
 		this.uri = original.getURI();
 		this.headers = HttpHeaders.writableHttpHeaders(original.getHeaders());
-		this.httpMethodValue = original.getMethodValue();
+		this.httpMethod = original.getMethod();
 		this.contextPath = original.getPath().contextPath().value();
 		this.remoteAddress = original.getRemoteAddress();
 		this.body = original.getBody();
@@ -81,7 +81,8 @@ public DefaultServerHttpRequestBuilder(ServerHttpRequest original) {
 
 	@Override
 	public ServerHttpRequest.Builder method(HttpMethod httpMethod) {
-		this.httpMethodValue = httpMethod.name();
+		Assert.notNull(httpMethod, "HttpMethod must not be null");
+		this.httpMethod = httpMethod;
 		return this;
 	}
 
@@ -132,7 +133,7 @@ public ServerHttpRequest.Builder remoteAddress(InetSocketAddress remoteAddress)
 	@Override
 	public ServerHttpRequest build() {
 		return new MutatedServerHttpRequest(getUriToUse(), this.contextPath,
-				this.httpMethodValue, this.sslInfo, this.remoteAddress, this.headers, this.body, this.originalRequest);
+				this.httpMethod, this.sslInfo, this.remoteAddress, this.headers, this.body, this.originalRequest);
 	}
 
 	private URI getUriToUse() {
@@ -176,7 +177,7 @@ private URI getUriToUse() {
 
 	private static class MutatedServerHttpRequest extends AbstractServerHttpRequest {
 
-		private final String methodValue;
+		private final HttpMethod method;
 
 		@Nullable
 		private final SslInfo sslInfo;
@@ -190,11 +191,11 @@ private static class MutatedServerHttpRequest extends AbstractServerHttpRequest
 
 
 		public MutatedServerHttpRequest(URI uri, @Nullable String contextPath,
-				String methodValue, @Nullable SslInfo sslInfo, @Nullable InetSocketAddress remoteAddress,
+				HttpMethod method, @Nullable SslInfo sslInfo, @Nullable InetSocketAddress remoteAddress,
 				HttpHeaders headers, Flux<DataBuffer> body, ServerHttpRequest originalRequest) {
 
 			super(uri, contextPath, headers);
-			this.methodValue = methodValue;
+			this.method = method;
 			this.remoteAddress = (remoteAddress != null ? remoteAddress : originalRequest.getRemoteAddress());
 			this.sslInfo = (sslInfo != null ? sslInfo : originalRequest.getSslInfo());
 			this.body = body;
@@ -202,8 +203,14 @@ public MutatedServerHttpRequest(URI uri, @Nullable String contextPath,
 		}
 
 		@Override
+		public HttpMethod getMethod() {
+			return this.method;
+		}
+
+		@Override
+		@Deprecated
 		public String getMethodValue() {
-			return this.methodValue;
+			return this.method.name();
 		}
 
 		@Override
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
index ab0fdb62d184..ad809acf011c 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
@@ -36,6 +36,7 @@
 import org.springframework.core.io.buffer.NettyDataBufferFactory;
 import org.springframework.http.HttpCookie;
 import org.springframework.http.HttpLogging;
+import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -138,8 +139,13 @@ private static String resolveRequestUri(HttpServerRequest request) {
 		return uri;
 	}
 
+	@Override
+	public HttpMethod getMethod() {
+		return HttpMethod.valueOf(this.request.method().name());
+	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.request.method().name();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java
index df1086d21c9f..d5f34dcde326 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpRequestDecorator.java
@@ -61,12 +61,12 @@ public String getId() {
 	}
 
 	@Override
-	@Nullable
 	public HttpMethod getMethod() {
 		return getDelegate().getMethod();
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return getDelegate().getMethodValue();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
index 93be805e7ff7..cd5d47c6dfe9 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
@@ -41,6 +41,7 @@
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpCookie;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
@@ -158,8 +159,13 @@ private static MultiValueMap<String, String> initHeaders(
 		return (headers != null ? headers : headerValues);
 	}
 
+	@Override
+	public HttpMethod getMethod() {
+		return HttpMethod.valueOf(this.request.getMethod());
+	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.request.getMethod();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
index 6de7dfb39996..f21abb16bfc2 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
@@ -35,6 +35,7 @@
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.HttpCookie;
+import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.LinkedMultiValueMap;
@@ -77,6 +78,12 @@ private static URI initUri(HttpServerExchange exchange) throws URISyntaxExceptio
 	}
 
 	@Override
+	public HttpMethod getMethod() {
+		return HttpMethod.valueOf(this.exchange.getRequestMethod().toString());
+	}
+
+	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.exchange.getRequestMethod().toString();
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
index 4e1168d84deb..fec3b285266b 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
@@ -16,10 +16,8 @@
 
 package org.springframework.web;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.EnumSet;
-import java.util.List;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import jakarta.servlet.ServletException;
@@ -117,14 +115,12 @@ public Set<HttpMethod> getSupportedHttpMethods() {
 		if (this.supportedMethods == null) {
 			return null;
 		}
-		List<HttpMethod> supportedMethods = new ArrayList<>(this.supportedMethods.length);
+		Set<HttpMethod> supportedMethods = new LinkedHashSet<>(this.supportedMethods.length);
 		for (String value : this.supportedMethods) {
-			HttpMethod resolved = HttpMethod.resolve(value);
-			if (resolved != null) {
-				supportedMethods.add(resolved);
-			}
+			HttpMethod method = HttpMethod.valueOf(value);
+			supportedMethods.add(method);
 		}
-		return EnumSet.copyOf(supportedMethods);
+		return supportedMethods;
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
index 1b2917cf5ae0..946a19ad60ae 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
@@ -118,9 +118,8 @@ public <T> T getNativeResponse(@Nullable Class<T> requiredType) {
 	 * Return the HTTP method of the request.
 	 * @since 4.0.2
 	 */
-	@Nullable
 	public HttpMethod getHttpMethod() {
-		return HttpMethod.resolve(getRequest().getMethod());
+		return HttpMethod.valueOf(getRequest().getMethod());
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
index 3d69879e1ed6..a0357bf720c0 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
@@ -258,7 +258,7 @@ public void setAllowedMethods(@Nullable List<String> allowedMethods) {
 					this.resolvedMethods = null;
 					break;
 				}
-				this.resolvedMethods.add(HttpMethod.resolve(method));
+				this.resolvedMethods.add(HttpMethod.valueOf(method));
 			}
 		}
 		else {
@@ -302,7 +302,7 @@ else if (this.allowedMethods == DEFAULT_PERMIT_METHODS) {
 				this.resolvedMethods = null;
 			}
 			else if (this.resolvedMethods != null) {
-				this.resolvedMethods.add(HttpMethod.resolve(method));
+				this.resolvedMethods.add(HttpMethod.valueOf(method));
 			}
 		}
 	}
@@ -447,7 +447,7 @@ public CorsConfiguration applyPermitDefaultValues() {
 		if (this.allowedMethods == null) {
 			this.allowedMethods = DEFAULT_PERMIT_METHODS;
 			this.resolvedMethods = DEFAULT_PERMIT_METHODS
-					.stream().map(HttpMethod::resolve).collect(Collectors.toList());
+					.stream().map(HttpMethod::valueOf).collect(Collectors.toList());
 		}
 		if (this.allowedHeaders == null) {
 			this.allowedHeaders = DEFAULT_PERMIT_ALL;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java
index 90d18497169c..d06cac32bc91 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java
@@ -91,8 +91,7 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 	}
 
 	private ServerWebExchange mapExchange(ServerWebExchange exchange, String methodParamValue) {
-		HttpMethod httpMethod = HttpMethod.resolve(methodParamValue.toUpperCase(Locale.ENGLISH));
-		Assert.notNull(httpMethod, () -> "HttpMethod '" + methodParamValue + "' not supported");
+		HttpMethod httpMethod = HttpMethod.valueOf(methodParamValue.toUpperCase(Locale.ENGLISH));
 		if (ALLOWED_METHODS.contains(httpMethod)) {
 			return exchange.mutate().request(builder -> builder.method(httpMethod)).build();
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
index 0fa6a8b726fa..40f678469da8 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartHttpServletRequest.java
@@ -52,7 +52,6 @@ public interface MultipartHttpServletRequest extends HttpServletRequest, Multipa
 	/**
 	 * Return this request's method as a convenient HttpMethod instance.
 	 */
-	@Nullable
 	HttpMethod getRequestMethod();
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
index fb705a9445e3..a331034bf10f 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
@@ -64,7 +64,7 @@ public HttpServletRequest getRequest() {
 
 	@Override
 	public HttpMethod getRequestMethod() {
-		return HttpMethod.resolve(getRequest().getMethod());
+		return HttpMethod.valueOf(getRequest().getMethod());
 	}
 
 	@Override
diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
index 0bad35ed16ce..f802ac500bb6 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
@@ -28,8 +28,8 @@
 import java.util.Base64;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.GregorianCalendar;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
@@ -129,7 +129,7 @@ void acceptCharsetWildcard() {
 
 	@Test
 	void allow() {
-		EnumSet<HttpMethod> methods = EnumSet.of(HttpMethod.GET, HttpMethod.POST);
+		Set<HttpMethod> methods = new LinkedHashSet<>(Arrays.asList(HttpMethod.GET, HttpMethod.POST));
 		headers.setAllow(methods);
 		assertThat(headers.getAllow()).as("Invalid Allow header").isEqualTo(methods);
 		assertThat(headers.getFirst("Allow")).as("Invalid Allow header").isEqualTo("GET,POST");
diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
index 82a3e79cb4c6..7dbcc58f7e1d 100644
--- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
@@ -268,6 +268,7 @@ public HttpMethod getMethod() {
 		}
 
 		@Override
+		@Deprecated
 		public String getMethodValue() {
 			return method.name();
 		}
diff --git a/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java b/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
index 0f30c2391e05..f6d577d04ac6 100644
--- a/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
@@ -25,9 +25,9 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Consumer;
 
@@ -62,8 +62,8 @@ public class ClientHttpConnectorTests {
 
 	private static final int BUF_SIZE = 1024;
 
-	private static final EnumSet<HttpMethod> METHODS_WITH_BODY =
-			EnumSet.of(HttpMethod.PUT, HttpMethod.POST, HttpMethod.PATCH);
+	private static final Set<HttpMethod> METHODS_WITH_BODY =
+			Set.of(HttpMethod.PUT, HttpMethod.POST, HttpMethod.PATCH);
 
 	private final MockWebServer server = new MockWebServer();
 
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
index cc684fe001bc..e2a46d5919ed 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
@@ -23,7 +23,6 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -275,7 +274,7 @@ void optionsForAllow(ClientHttpRequestFactory clientHttpRequestFactory) throws E
 		setUpClient(clientHttpRequestFactory);
 
 		Set<HttpMethod> allowed = template.optionsForAllow(new URI(baseUrl + "/get"));
-		assertThat(allowed).as("Invalid response").isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS, HttpMethod.HEAD, HttpMethod.TRACE));
+		assertThat(allowed).as("Invalid response").isEqualTo(Set.of(HttpMethod.GET, HttpMethod.OPTIONS, HttpMethod.HEAD, HttpMethod.TRACE));
 	}
 
 	@ParameterizedRestTemplateTest
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
index c95c60cb28f7..85144efdeda2 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
@@ -21,7 +21,6 @@
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -580,7 +579,7 @@ void optionsForAllow() throws Exception {
 		mockSentRequest(OPTIONS, "https://example.com");
 		mockResponseStatus(HttpStatus.OK);
 		HttpHeaders responseHeaders = new HttpHeaders();
-		EnumSet<HttpMethod> expected = EnumSet.of(GET, POST);
+		Set<HttpMethod> expected = Set.of(GET, POST);
 		responseHeaders.setAllow(expected);
 		given(response.getHeaders()).willReturn(responseHeaders);
 
diff --git a/spring-web/src/test/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilterTests.java
index 4bf21aa08036..8b360081c7e8 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilterTests.java
@@ -20,7 +20,6 @@
 
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -75,16 +74,6 @@ public void filterWithDifferentMethodParam() {
 		assertThat(this.filterChain.getHttpMethod()).isEqualTo(HttpMethod.DELETE);
 	}
 
-	@Test
-	public void filterWithInvalidMethodValue() {
-		StepVerifier.create(postForm("_method=INVALID"))
-				.consumeErrorWith(error -> {
-					assertThat(error).isInstanceOf(IllegalArgumentException.class);
-					assertThat(error.getMessage()).isEqualTo("HttpMethod 'INVALID' not supported");
-				})
-				.verify();
-	}
-
 	@Test
 	public void filterWithHttpPut() {
 
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
index d6d971c4ed5a..6f6b5011081a 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
@@ -32,6 +32,7 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.util.LinkedMultiValueMap;
@@ -680,6 +681,12 @@ void fromHttpRequestWithTrailingSlash() {
 	void fromHttpRequestWithEmptyScheme() {
 		HttpRequest request = new HttpRequest() {
 			@Override
+			public HttpMethod getMethod() {
+				return HttpMethod.GET;
+			}
+
+			@Override
+			@Deprecated
 			public String getMethodValue() {
 				return "GET";
 			}
diff --git a/spring-web/src/test/kotlin/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt b/spring-web/src/test/kotlin/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
index 281771bd6362..e49b805a01be 100644
--- a/spring-web/src/test/kotlin/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
+++ b/spring-web/src/test/kotlin/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
@@ -25,10 +25,6 @@ import org.springframework.core.annotation.SynthesizingMethodParameter
 import org.springframework.core.convert.support.DefaultConversionService
 import org.springframework.http.HttpMethod
 import org.springframework.http.MediaType
-import org.springframework.web.testfixture.servlet.MockHttpServletRequest
-import org.springframework.web.testfixture.servlet.MockHttpServletResponse
-import org.springframework.web.testfixture.servlet.MockMultipartFile
-import org.springframework.web.testfixture.servlet.MockMultipartHttpServletRequest
 import org.springframework.util.ReflectionUtils
 import org.springframework.web.bind.MissingServletRequestParameterException
 import org.springframework.web.bind.annotation.RequestParam
@@ -39,6 +35,10 @@ import org.springframework.web.context.request.NativeWebRequest
 import org.springframework.web.context.request.ServletWebRequest
 import org.springframework.web.multipart.MultipartFile
 import org.springframework.web.multipart.support.MissingServletRequestPartException
+import org.springframework.web.testfixture.servlet.MockHttpServletRequest
+import org.springframework.web.testfixture.servlet.MockHttpServletResponse
+import org.springframework.web.testfixture.servlet.MockMultipartFile
+import org.springframework.web.testfixture.servlet.MockMultipartHttpServletRequest
 
 /**
  * Kotlin test fixture for [RequestParamMethodArgumentResolver].
@@ -156,7 +156,7 @@ class RequestParamMethodArgumentResolverKotlinTests {
 
 	@Test
 	fun resolveNullableRequiredWithoutMultipartParameter() {
-		request.method = HttpMethod.POST.name
+		request.method = HttpMethod.POST.name()
 		request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
 
 		var result = resolver.resolveArgument(nullableMultipartParamRequired, null, webRequest, binderFactory)
@@ -176,7 +176,7 @@ class RequestParamMethodArgumentResolverKotlinTests {
 
 	@Test
 	fun resolveNullableNotRequiredWithoutMultipartParameter() {
-		request.method = HttpMethod.POST.name
+		request.method = HttpMethod.POST.name()
 		request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
 
 		var result = resolver.resolveArgument(nullableMultipartParamNotRequired, null, webRequest, binderFactory)
@@ -196,7 +196,7 @@ class RequestParamMethodArgumentResolverKotlinTests {
 
 	@Test
 	fun resolveNonNullableRequiredWithoutMultipartParameter() {
-		request.method = HttpMethod.POST.name
+		request.method = HttpMethod.POST.name()
 		request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
 
 		assertThatExceptionOfType(MissingServletRequestPartException::class.java).isThrownBy {
@@ -217,7 +217,7 @@ class RequestParamMethodArgumentResolverKotlinTests {
 
 	@Test
 	fun resolveNonNullableNotRequiredWithoutMultipartParameter() {
-		request.method = HttpMethod.POST.name
+		request.method = HttpMethod.POST.name()
 		request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
 
 		assertThatExceptionOfType(NullPointerException::class.java).isThrownBy {
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpRequest.java
index e05438231d22..67d08a0d0893 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpRequest.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/client/reactive/MockClientHttpRequest.java
@@ -96,6 +96,7 @@ public HttpMethod getMethod() {
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
 		return this.httpMethod.name();
 	}
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java
index b3ed7ea547a2..5a28bd98b13e 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java
@@ -55,10 +55,7 @@
  */
 public final class MockServerHttpRequest extends AbstractServerHttpRequest {
 
-	/**
-	 * String representation of one of {@link HttpMethod} or not empty custom method (e.g. <i>CONNECT</i>).
-	 */
-	private final String httpMethod;
+	private final HttpMethod httpMethod;
 
 	private final MultiValueMap<String, HttpCookie> cookies;
 
@@ -73,13 +70,12 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
 
 	private final Flux<DataBuffer> body;
 
-	private MockServerHttpRequest(String httpMethod,
+	private MockServerHttpRequest(HttpMethod httpMethod,
 			URI uri, @Nullable String contextPath, HttpHeaders headers, MultiValueMap<String, HttpCookie> cookies,
 			@Nullable InetSocketAddress localAddress, @Nullable InetSocketAddress remoteAddress,
 			@Nullable SslInfo sslInfo, Publisher<? extends DataBuffer> body) {
 
 		super(uri, contextPath, headers);
-		Assert.isTrue(StringUtils.hasText(httpMethod), "HTTP method is required.");
 		this.httpMethod = httpMethod;
 		this.cookies = cookies;
 		this.localAddress = localAddress;
@@ -90,14 +86,14 @@ private MockServerHttpRequest(String httpMethod,
 
 
 	@Override
-	@Nullable
 	public HttpMethod getMethod() {
-		return HttpMethod.resolve(this.httpMethod);
+		return this.httpMethod;
 	}
 
 	@Override
+	@Deprecated
 	public String getMethodValue() {
-		return this.httpMethod;
+		return this.httpMethod.name();
 	}
 
 	@Override
@@ -218,7 +214,7 @@ public static BaseBuilder<?> options(String urlTemplate, Object... uriVars) {
 	public static BodyBuilder method(HttpMethod method, URI url) {
 		Assert.notNull(method, "HTTP method is required. " +
 				"For a custom HTTP method, please provide a String HTTP method value.");
-		return new DefaultBodyBuilder(method.name(), url);
+		return new DefaultBodyBuilder(method, url);
 	}
 
 	/**
@@ -242,9 +238,12 @@ public static BodyBuilder method(HttpMethod method, String uri, Object... vars)
 	 * @param vars variables to expand into the template
 	 * @return the created builder
 	 * @since 5.2.7
+	 * @deprecated in favor of {@link #method(HttpMethod, String, Object...)}
 	 */
+	@Deprecated
 	public static BodyBuilder method(String httpMethod, String uri, Object... vars) {
-		return new DefaultBodyBuilder(httpMethod, toUri(uri, vars));
+		Assert.isTrue(StringUtils.hasText(httpMethod), "HTTP method is required.");
+		return new DefaultBodyBuilder(HttpMethod.valueOf(httpMethod), toUri(uri, vars));
 	}
 
 	private static URI toUri(String uri, Object[] vars) {
@@ -427,7 +426,7 @@ public interface BodyBuilder extends BaseBuilder<BodyBuilder> {
 
 	private static class DefaultBodyBuilder implements BodyBuilder {
 
-		private final String methodValue;
+		private final HttpMethod method;
 
 		private final URI url;
 
@@ -449,8 +448,8 @@ private static class DefaultBodyBuilder implements BodyBuilder {
 		@Nullable
 		private SslInfo sslInfo;
 
-		DefaultBodyBuilder(String method, URI url) {
-			this.methodValue = method;
+		DefaultBodyBuilder(HttpMethod method, URI url) {
+			this.method = method;
 			this.url = url;
 		}
 
@@ -589,7 +588,7 @@ private Charset getCharset() {
 		@Override
 		public MockServerHttpRequest body(Publisher<? extends DataBuffer> body) {
 			applyCookiesIfNecessary();
-			return new MockServerHttpRequest(this.methodValue, getUrlToUse(), this.contextPath,
+			return new MockServerHttpRequest(this.method, getUrlToUse(), this.contextPath,
 					this.headers, this.cookies, this.localAddress, this.remoteAddress, this.sslInfo, body);
 		}
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java
index 88c51b9498db..10a4443fc48f 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java
@@ -141,7 +141,13 @@ public String getMultipartContentType(String paramOrFileName) {
 
 	@Override
 	public HttpMethod getRequestMethod() {
-		return HttpMethod.resolve(getMethod());
+		String method = getMethod();
+		if (method != null) {
+			return HttpMethod.valueOf(method);
+		}
+		else {
+			return null;
+		}
 	}
 
 	@Override
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java
index a63ba76bf7e0..955f9834dc10 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilder.java
@@ -27,6 +27,7 @@
 import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseCookie;
@@ -50,6 +51,12 @@ final class DefaultClientResponseBuilder implements ClientResponse.Builder {
 		private final URI empty = URI.create("");
 
 		@Override
+		public HttpMethod getMethod() {
+			return HttpMethod.valueOf("UNKNOWN");
+		}
+
+		@Override
+		@Deprecated
 		public String getMethodValue() {
 			return "UNKNOWN";
 		}
@@ -210,7 +217,7 @@ public ClientResponse build() {
 
 		return new DefaultClientResponse(httpResponse, this.strategies,
 				this.originalResponse != null ? this.originalResponse.logPrefix() : "",
-				this.request.getMethodValue() + " " + this.request.getURI(),
+				this.request.getMethod() + " " + this.request.getURI(),
 				() -> this.request);
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
index efaf758ef43b..d6627ce2f6ee 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
@@ -378,6 +378,7 @@ public HttpMethod getMethod() {
 					return httpMethod;
 				}
 				@Override
+				@Deprecated
 				public String getMethodValue() {
 					return httpMethod.name();
 				}
@@ -667,7 +668,7 @@ private <T> Mono<T> applyStatusHandlers(ClientResponse response) {
 		}
 
 		private <T> Mono<T> insertCheckpoint(Mono<T> result, int statusCode, HttpRequest request) {
-			String httpMethod = request.getMethodValue();
+			HttpMethod httpMethod = request.getMethod();
 			URI uri = request.getURI();
 			String description = statusCode + " from " + httpMethod + " " + uri + " [DefaultWebClient]";
 			return result.checkpoint(description);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
index b6b4d58b6c96..b85566ab482f 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
@@ -150,6 +150,7 @@ public HttpMethod getMethod() {
 				}
 
 				@Override
+				@Deprecated
 				public String getMethodValue() {
 					return request.method().name();
 				}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java
index ab211917b5f4..0d5137019b65 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java
@@ -73,7 +73,7 @@ public WebClientResponseException(int status, String reasonPhrase,
 
 	private static String initMessage(int status, String reasonPhrase, @Nullable HttpRequest request) {
 		return status + " " + reasonPhrase +
-				(request != null ? " from " + request.getMethodValue() + " " + request.getURI() : "");
+				(request != null ? " from " + request.getMethod() + " " + request.getURI() : "");
 	}
 
 	/**
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
index 7e7d8b4bf1d7..1514af903ea1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
@@ -39,6 +39,7 @@
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpCookie;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRange;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.HttpMessageReader;
@@ -108,8 +109,14 @@ static Mono<ServerResponse> checkNotModified(ServerWebExchange exchange, @Nullab
 	}
 
 	@Override
+	public HttpMethod method() {
+		return request().getMethod();
+	}
+
+	@Override
+	@Deprecated
 	public String methodName() {
-		return request().getMethodValue();
+		return request().getMethod().name();
 	}
 
 	@Override
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
index 174899b88946..50f5eb5bd964 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
@@ -71,7 +71,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
 
 	private final ServerWebExchange exchange;
 
-	private String methodName;
+	private HttpMethod method;
 
 	private URI uri;
 
@@ -88,7 +88,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
 		Assert.notNull(other, "ServerRequest must not be null");
 		this.messageReaders = other.messageReaders();
 		this.exchange = other.exchange();
-		this.methodName = other.methodName();
+		this.method = other.method();
 		this.uri = other.uri();
 		this.headers.addAll(other.headers().asHttpHeaders());
 		this.cookies.addAll(other.cookies());
@@ -99,7 +99,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
 	@Override
 	public ServerRequest.Builder method(HttpMethod method) {
 		Assert.notNull(method, "HttpMethod must not be null");
-		this.methodName = method.name();
+		this.method = method;
 		return this;
 	}
 
@@ -177,7 +177,7 @@ public ServerRequest.Builder attributes(Consumer<Map<String, Object>> attributes
 	@Override
 	public ServerRequest build() {
 		ServerHttpRequest serverHttpRequest = new BuiltServerHttpRequest(this.exchange.getRequest().getId(),
-				this.methodName, this.uri, this.headers, this.cookies, this.body);
+				this.method, this.uri, this.headers, this.cookies, this.body);
 		ServerWebExchange exchange = new DelegatingServerWebExchange(
 				serverHttpRequest, this.attributes, this.exchange, this.messageReaders);
 		return new DefaultServerRequest(exchange, this.messageReaders);
@@ -190,7 +190,7 @@ private static class BuiltServerHttpRequest implements ServerHttpRequest {
 
 		private final String id;
 
-		private final String method;
+		private final HttpMethod method;
 
 		private final URI uri;
 
@@ -204,7 +204,7 @@ private static class BuiltServerHttpRequest implements ServerHttpRequest {
 
 		private final Flux<DataBuffer> body;
 
-		public BuiltServerHttpRequest(String id, String method, URI uri, HttpHeaders headers,
+		public BuiltServerHttpRequest(String id, HttpMethod method, URI uri, HttpHeaders headers,
 				MultiValueMap<String, HttpCookie> cookies, Flux<DataBuffer> body) {
 
 			this.id = id;
@@ -248,10 +248,16 @@ public String getId() {
 		}
 
 		@Override
-		public String getMethodValue() {
+		public HttpMethod getMethod() {
 			return this.method;
 		}
 
+		@Override
+		@Deprecated
+		public String getMethodValue() {
+			return this.method.name();
+		}
+
 		@Override
 		public URI getURI() {
 			return this.uri;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
index 25b53f373b51..b62189c041b9 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
@@ -21,7 +21,6 @@
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -297,7 +296,7 @@ public Mono<ServerResponse> render(String name, Map<String, ?> model) {
 	 */
 	abstract static class AbstractServerResponse implements ServerResponse {
 
-		private static final Set<HttpMethod> SAFE_METHODS = EnumSet.of(HttpMethod.GET, HttpMethod.HEAD);
+		private static final Set<HttpMethod> SAFE_METHODS = Set.of(HttpMethod.GET, HttpMethod.HEAD);
 
 		final int statusCode;
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
index 444d7d44a859..3ae0b2f9c344 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
@@ -21,10 +21,10 @@
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -437,12 +437,12 @@ private static class HttpMethodPredicate implements RequestPredicate {
 
 		public HttpMethodPredicate(HttpMethod httpMethod) {
 			Assert.notNull(httpMethod, "HttpMethod must not be null");
-			this.httpMethods = EnumSet.of(httpMethod);
+			this.httpMethods = Collections.singleton(httpMethod);
 		}
 
 		public HttpMethodPredicate(HttpMethod... httpMethods) {
 			Assert.notEmpty(httpMethods, "HttpMethods must not be empty");
-			this.httpMethods = EnumSet.copyOf(Arrays.asList(httpMethods));
+			this.httpMethods = new LinkedHashSet<>(Arrays.asList(httpMethods));
 		}
 
 		@Override
@@ -453,16 +453,15 @@ public boolean test(ServerRequest request) {
 			return match;
 		}
 
-		@Nullable
 		private static HttpMethod method(ServerRequest request) {
 			if (CorsUtils.isPreFlightRequest(request.exchange().getRequest())) {
 				String accessControlRequestMethod =
 						request.headers().firstHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD);
-				return HttpMethod.resolve(accessControlRequestMethod);
-			}
-			else {
-				return request.method();
+				if (accessControlRequestMethod != null) {
+					return HttpMethod.valueOf(accessControlRequestMethod);
+				}
 			}
+			return request.method();
 		}
 
 		@Override
@@ -968,6 +967,7 @@ public HttpMethod method() {
 		}
 
 		@Override
+		@Deprecated
 		public String methodName() {
 			return this.request.methodName();
 		}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java
index 95b91fb0f448..66f8c097cf3a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java
@@ -22,7 +22,6 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
-import java.util.EnumSet;
 import java.util.Set;
 
 import reactor.core.publisher.Mono;
@@ -42,7 +41,7 @@
 class ResourceHandlerFunction implements HandlerFunction<ServerResponse> {
 
 	private static final Set<HttpMethod> SUPPORTED_METHODS =
-			EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS);
+			Set.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS);
 
 
 	private final Resource resource;
@@ -56,20 +55,19 @@ public ResourceHandlerFunction(Resource resource) {
 	@Override
 	public Mono<ServerResponse> handle(ServerRequest request) {
 		HttpMethod method = request.method();
-		if (method != null) {
-			switch (method) {
-				case GET:
-					return EntityResponse.fromObject(this.resource).build()
-							.map(response -> response);
-				case HEAD:
-					Resource headResource = new HeadMethodResource(this.resource);
-					return EntityResponse.fromObject(headResource).build()
-							.map(response -> response);
-				case OPTIONS:
-					return ServerResponse.ok()
-							.allow(SUPPORTED_METHODS)
-							.body(BodyInserters.empty());
-			}
+		if (HttpMethod.GET.equals(method)) {
+			return EntityResponse.fromObject(this.resource).build()
+					.map(response -> response);
+		}
+		else if (HttpMethod.HEAD.equals(method)) {
+			Resource headResource = new HeadMethodResource(this.resource);
+			return EntityResponse.fromObject(headResource).build()
+					.map(response -> response);
+		}
+		else if (HttpMethod.OPTIONS.equals(method)) {
+			return ServerResponse.ok()
+					.allow(SUPPORTED_METHODS)
+					.body(BodyInserters.empty());
 		}
 		return ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED)
 				.allow(SUPPORTED_METHODS)
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
index 5b44e5a45647..9bbab1a7eab5 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
@@ -70,15 +70,14 @@ public interface ServerRequest {
 	 * @return the HTTP method as an HttpMethod enum value, or {@code null}
 	 * if not resolvable (e.g. in case of a non-standard HTTP method)
 	 */
-	@Nullable
-	default HttpMethod method() {
-		return HttpMethod.resolve(methodName());
-	}
+	HttpMethod method();
 
 	/**
 	 * Get the name of the HTTP method.
 	 * @return the HTTP method as a String
+	 * @deprecated in favor of {@link #method()}
 	 */
+	@Deprecated
 	String methodName();
 
 	/**
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
index 20127d8a6345..ac7faf5743f2 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
@@ -85,6 +85,7 @@ public HttpMethod method() {
 	}
 
 	@Override
+	@Deprecated
 	public String methodName() {
 		return this.delegate.methodName();
 	}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index 8a8ba5894d1b..125593a88792 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -22,7 +22,6 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -90,7 +89,7 @@
  */
 public class ResourceWebHandler implements WebHandler, InitializingBean {
 
-	private static final Set<HttpMethod> SUPPORTED_METHODS = EnumSet.of(HttpMethod.GET, HttpMethod.HEAD);
+	private static final Set<HttpMethod> SUPPORTED_METHODS = Set.of(HttpMethod.GET, HttpMethod.HEAD);
 
 	private static final Log logger = LogFactory.getLog(ResourceWebHandler.class);
 
@@ -407,7 +406,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {
 				}))
 				.flatMap(resource -> {
 					try {
-						if (HttpMethod.OPTIONS.matches(exchange.getRequest().getMethodValue())) {
+						if (HttpMethod.OPTIONS.equals(exchange.getRequest().getMethod())) {
 							exchange.getResponse().getHeaders().add("Allow", "GET,HEAD,OPTIONS");
 							return Mono.empty();
 						}
@@ -416,7 +415,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {
 						HttpMethod httpMethod = exchange.getRequest().getMethod();
 						if (!SUPPORTED_METHODS.contains(httpMethod)) {
 							return Mono.error(new MethodNotAllowedException(
-									exchange.getRequest().getMethodValue(), SUPPORTED_METHODS));
+									exchange.getRequest().getMethod(), SUPPORTED_METHODS));
 						}
 
 						// Header phase
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java
index 3583f8657d9b..600708a77365 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java
@@ -127,7 +127,7 @@ public RequestMethodsRequestCondition getMatchingCondition(ServerWebExchange exc
 			return matchPreFlight(exchange.getRequest());
 		}
 		if (getMethods().isEmpty()) {
-			if (RequestMethod.OPTIONS.name().equals(exchange.getRequest().getMethodValue())) {
+			if (HttpMethod.OPTIONS.equals(exchange.getRequest().getMethod())) {
 				return null; // We handle OPTIONS transparently, so don't match if no explicit declarations
 			}
 			return this;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java
index fe4478e646ee..a581cc6e0c34 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java
@@ -20,12 +20,12 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import reactor.core.publisher.Mono;
 
@@ -171,9 +171,9 @@ protected HandlerMethod handleNoMatch(Set<RequestMappingInfo> infos,
 		ServerHttpRequest request = exchange.getRequest();
 
 		if (helper.hasMethodsMismatch()) {
-			String httpMethod = request.getMethodValue();
+			HttpMethod httpMethod = request.getMethod();
 			Set<HttpMethod> methods = helper.getAllowedMethods();
-			if (HttpMethod.OPTIONS.matches(httpMethod)) {
+			if (HttpMethod.OPTIONS.equals(httpMethod)) {
 				Set<MediaType> mediaTypes = helper.getConsumablePatchMediaTypes();
 				HttpOptionsHandler handler = new HttpOptionsHandler(methods, mediaTypes);
 				return new HandlerMethod(handler, HTTP_OPTIONS_HANDLE_METHOD);
@@ -269,7 +269,7 @@ public boolean hasParamsMismatch() {
 		public Set<HttpMethod> getAllowedMethods() {
 			return this.partialMatches.stream().
 					flatMap(m -> m.getInfo().getMethodsCondition().getMethods().stream()).
-					map(requestMethod -> HttpMethod.resolve(requestMethod.name())).
+					map(requestMethod -> HttpMethod.valueOf(requestMethod.name())).
 					collect(Collectors.toSet());
 		}
 
@@ -392,8 +392,8 @@ public HttpOptionsHandler(Set<HttpMethod> declaredMethods, Set<MediaType> accept
 
 		private static Set<HttpMethod> initAllowedHttpMethods(Set<HttpMethod> declaredMethods) {
 			if (declaredMethods.isEmpty()) {
-				return EnumSet.allOf(HttpMethod.class).stream()
-						.filter(method -> method != HttpMethod.TRACE)
+				return Stream.of(HttpMethod.values())
+						.filter(method -> !HttpMethod.TRACE.equals(method))
 						.collect(Collectors.toSet());
 			}
 			else {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
index 082bd5e88bc0..79dde79b0787 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
@@ -18,7 +18,6 @@
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -70,7 +69,7 @@
 public abstract class AbstractMessageReaderArgumentResolver extends HandlerMethodArgumentResolverSupport {
 
 	private static final Set<HttpMethod> SUPPORTED_METHODS =
-			EnumSet.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH);
+			Set.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH);
 
 
 	private final List<HttpMessageReader<?>> messageReaders;
@@ -203,7 +202,7 @@ protected Mono<Object> readBody(MethodParameter bodyParam, @Nullable MethodParam
 		// No compatible reader but body may be empty..
 
 		HttpMethod method = request.getMethod();
-		if (contentType == null && method != null && SUPPORTED_METHODS.contains(method)) {
+		if (contentType == null && SUPPORTED_METHODS.contains(method)) {
 			Flux<DataBuffer> body = request.getBody().doOnNext(buffer -> {
 				DataBufferUtils.release(buffer);
 				// Body not empty, back toy 415..
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
index 26b59a4bd4b7..35f8044c0eca 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
@@ -17,7 +17,6 @@
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.time.Instant;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 
@@ -52,7 +51,7 @@
  */
 public class ResponseEntityResultHandler extends AbstractMessageWriterResultHandler implements HandlerResultHandler {
 
-	private static final Set<HttpMethod> SAFE_METHODS = EnumSet.of(HttpMethod.GET, HttpMethod.HEAD);
+	private static final Set<HttpMethod> SAFE_METHODS = Set.of(HttpMethod.GET, HttpMethod.HEAD);
 
 
 	/**
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
index 78d6bcb8b60f..059dedffe1e1 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
@@ -214,7 +214,7 @@ public Mono<Void> handleRequest(ServerWebExchange exchange, WebSocketHandler han
 
 		if (HttpMethod.GET != method) {
 			return Mono.error(new MethodNotAllowedException(
-					request.getMethodValue(), Collections.singleton(HttpMethod.GET)));
+					request.getMethod(), Collections.singleton(HttpMethod.GET)));
 		}
 
 		if (!"WebSocket".equalsIgnoreCase(headers.getUpgrade())) {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicate.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicate.java
index 0ee33929ab14..a986d53d5961 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicate.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicate.java
@@ -18,6 +18,7 @@
 
 import java.util.function.BiPredicate;
 
+import org.springframework.http.HttpMethod;
 import org.springframework.web.reactive.socket.WebSocketHandler;
 import org.springframework.web.server.ServerWebExchange;
 
@@ -35,9 +36,9 @@ public class WebSocketUpgradeHandlerPredicate implements BiPredicate<Object, Ser
 	@Override
 	public boolean test(Object handler, ServerWebExchange exchange) {
 		if (handler instanceof WebSocketHandler) {
-			String method = exchange.getRequest().getMethodValue();
+			HttpMethod method = exchange.getRequest().getMethod();
 			String header = exchange.getRequest().getHeaders().getUpgrade();
-			return (method.equals("GET") && header != null && header.equalsIgnoreCase("websocket"));
+			return (HttpMethod.GET.equals(method) && header != null && header.equalsIgnoreCase("websocket"));
 		}
 		return true;
 	}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java
index b6bb38ebd548..1e180ccfb045 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java
@@ -20,7 +20,6 @@
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 
@@ -100,7 +99,7 @@ public void status() {
 	public void allow() {
 		String body = "foo";
 		Mono<EntityResponse<String>> result = EntityResponse.fromObject(body).allow(HttpMethod.GET).build();
-		Set<HttpMethod> expected = EnumSet.of(HttpMethod.GET);
+		Set<HttpMethod> expected = Set.of(HttpMethod.GET);
 		StepVerifier.create(result)
 				.expectNextMatches(response -> expected.equals(response.headers().getAllow()))
 				.expectComplete()
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
index c3780d2c443d..8fa8f14c4ffa 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
@@ -21,7 +21,6 @@
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 
@@ -198,7 +197,7 @@ public void unprocessableEntity() {
 	@Test
 	public void allow() {
 		Mono<ServerResponse> result = ServerResponse.ok().allow(HttpMethod.GET).build();
-		Set<HttpMethod> expected = EnumSet.of(HttpMethod.GET);
+		Set<HttpMethod> expected = Set.of(HttpMethod.GET);
 		StepVerifier.create(result)
 				.expectNextMatches(response -> expected.equals(response.headers().getAllow()))
 				.expectComplete()
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java
index 1c60b8a5ad15..086eedaa7d9e 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java
@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -141,7 +141,7 @@ public void options() {
 		Mono<ServerResponse> responseMono = this.handlerFunction.handle(request);
 		Mono<Void> result = responseMono.flatMap(response -> {
 			assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
-			assertThat(response.headers().getAllow()).isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS));
+			assertThat(response.headers().getAllow()).isEqualTo(Set.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS));
 			return response.writeTo(exchange, context);
 		});
 
@@ -150,7 +150,7 @@ public void options() {
 				.expectComplete()
 				.verify();
 		assertThat(mockResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
-		assertThat(mockResponse.getHeaders().getAllow()).isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS));
+		assertThat(mockResponse.getHeaders().getAllow()).isEqualTo(Set.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS));
 
 		StepVerifier.create(mockResponse.getBody()).expectComplete().verify();
 	}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java
index cbc923abe1b2..7e13ecf54408 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -141,7 +140,7 @@ public void getHandlerRequestMethodNotAllowed() {
 		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
 
 		assertError(mono, MethodNotAllowedException.class,
-				ex -> assertThat(ex.getSupportedMethods()).isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.HEAD)));
+				ex -> assertThat(ex.getSupportedMethods()).isEqualTo(Set.of(HttpMethod.GET, HttpMethod.HEAD)));
 	}
 
 	@Test  // SPR-9603
@@ -194,11 +193,11 @@ public void getHandlerHttpOptions() {
 		List<HttpMethod> allMethodExceptTrace = new ArrayList<>(Arrays.asList(HttpMethod.values()));
 		allMethodExceptTrace.remove(HttpMethod.TRACE);
 
-		testHttpOptions("/foo", EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS), null);
-		testHttpOptions("/person/1", EnumSet.of(HttpMethod.PUT, HttpMethod.OPTIONS), null);
-		testHttpOptions("/persons", EnumSet.copyOf(allMethodExceptTrace), null);
-		testHttpOptions("/something", EnumSet.of(HttpMethod.PUT, HttpMethod.POST), null);
-		testHttpOptions("/qux", EnumSet.of(HttpMethod.PATCH,HttpMethod.GET,HttpMethod.HEAD,HttpMethod.OPTIONS),
+		testHttpOptions("/foo", Set.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS), null);
+		testHttpOptions("/person/1", Set.of(HttpMethod.PUT, HttpMethod.OPTIONS), null);
+		testHttpOptions("/persons", Set.copyOf(allMethodExceptTrace), null);
+		testHttpOptions("/something", Set.of(HttpMethod.PUT, HttpMethod.POST), null);
+		testHttpOptions("/qux", Set.of(HttpMethod.PATCH,HttpMethod.GET,HttpMethod.HEAD,HttpMethod.OPTIONS),
 				new MediaType("foo", "bar"));
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 36dceaad6789..3af108f45f86 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -872,8 +872,8 @@ public void destroy() {
 	protected void service(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
-		HttpMethod httpMethod = HttpMethod.resolve(request.getMethod());
-		if (httpMethod == HttpMethod.PATCH || httpMethod == null) {
+		HttpMethod httpMethod = HttpMethod.valueOf(request.getMethod());
+		if (HttpMethod.PATCH.equals(httpMethod)) {
 			processRequest(request, response);
 		}
 		else {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java
index a35571fdf222..fc667124dbca 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/AbstractServerResponse.java
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.EnumSet;
 import java.util.Set;
 
 import jakarta.servlet.ServletException;
@@ -44,7 +43,7 @@
  */
 abstract class AbstractServerResponse extends ErrorHandlingServerResponse {
 
-	private static final Set<HttpMethod> SAFE_METHODS = EnumSet.of(HttpMethod.GET, HttpMethod.HEAD);
+	private static final Set<HttpMethod> SAFE_METHODS = Set.of(HttpMethod.GET, HttpMethod.HEAD);
 
 	final int statusCode;
 
@@ -90,7 +89,7 @@ public ModelAndView writeTo(HttpServletRequest request, HttpServletResponse resp
 
 			long lastModified = headers().getLastModified();
 			ServletWebRequest servletWebRequest = new ServletWebRequest(request, response);
-			HttpMethod httpMethod = HttpMethod.resolve(request.getMethod());
+			HttpMethod httpMethod = HttpMethod.valueOf(request.getMethod());
 			if (SAFE_METHODS.contains(httpMethod) &&
 					servletWebRequest.checkNotModified(headers().getETag(), lastModified)) {
 				return null;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
index f09177c2af40..9ff4cd503baa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java
@@ -48,6 +48,7 @@
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRange;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.GenericHttpMessageConverter;
@@ -107,8 +108,13 @@ public DefaultServerRequest(HttpServletRequest servletRequest, List<HttpMessageC
 				ServletRequestPathUtils.parseAndCache(servletRequest));
 	}
 
+	@Override
+	public HttpMethod method() {
+		return HttpMethod.valueOf(servletRequest().getMethod());
+	}
 
 	@Override
+	@Deprecated
 	public String methodName() {
 		return servletRequest().getMethod();
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
index 7dbca4417cbc..c3e6d93d83d8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java
@@ -68,7 +68,7 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
 
 	private final List<HttpMessageConverter<?>> messageConverters;
 
-	private String methodName;
+	private HttpMethod method;
 
 	private URI uri;
 
@@ -90,7 +90,7 @@ public DefaultServerRequestBuilder(ServerRequest other) {
 		Assert.notNull(other, "ServerRequest must not be null");
 		this.servletRequest = other.servletRequest();
 		this.messageConverters = new ArrayList<>(other.messageConverters());
-		this.methodName = other.methodName();
+		this.method = other.method();
 		this.uri = other.uri();
 		headers(headers -> headers.addAll(other.headers().asHttpHeaders()));
 		cookies(cookies -> cookies.addAll(other.cookies()));
@@ -102,7 +102,7 @@ public DefaultServerRequestBuilder(ServerRequest other) {
 	@Override
 	public ServerRequest.Builder method(HttpMethod method) {
 		Assert.notNull(method, "HttpMethod must not be null");
-		this.methodName = method.name();
+		this.method = method;
 		return this;
 	}
 
@@ -188,14 +188,14 @@ public ServerRequest.Builder remoteAddress(InetSocketAddress remoteAddress) {
 
 	@Override
 	public ServerRequest build() {
-		return new BuiltServerRequest(this.servletRequest, this.methodName, this.uri, this.headers, this.cookies,
+		return new BuiltServerRequest(this.servletRequest, this.method, this.uri, this.headers, this.cookies,
 				this.attributes, this.params, this.remoteAddress, this.body, this.messageConverters);
 	}
 
 
 	private static class BuiltServerRequest implements ServerRequest {
 
-		private final String methodName;
+		private final HttpMethod method;
 
 		private final URI uri;
 
@@ -216,13 +216,13 @@ private static class BuiltServerRequest implements ServerRequest {
 		@Nullable
 		private final InetSocketAddress remoteAddress;
 
-		public BuiltServerRequest(HttpServletRequest servletRequest, String methodName, URI uri,
+		public BuiltServerRequest(HttpServletRequest servletRequest, HttpMethod method, URI uri,
 				HttpHeaders headers, MultiValueMap<String, Cookie> cookies,
 				Map<String, Object> attributes, MultiValueMap<String, String> params,
 				@Nullable InetSocketAddress remoteAddress, byte[] body, List<HttpMessageConverter<?>> messageConverters) {
 
 			this.servletRequest = servletRequest;
-			this.methodName = methodName;
+			this.method = method;
 			this.uri = uri;
 			this.headers = new HttpHeaders(headers);
 			this.cookies = new LinkedMultiValueMap<>(cookies);
@@ -234,8 +234,14 @@ public BuiltServerRequest(HttpServletRequest servletRequest, String methodName,
 		}
 
 		@Override
+		public HttpMethod method() {
+			return this.method;
+		}
+
+		@Override
+		@Deprecated
 		public String methodName() {
-			return this.methodName;
+			return this.method.name();
 		}
 
 		@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
index db160bc4b9c2..653f3af9463d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java
@@ -23,10 +23,10 @@
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -435,12 +435,12 @@ private static class HttpMethodPredicate implements RequestPredicate {
 
 		public HttpMethodPredicate(HttpMethod httpMethod) {
 			Assert.notNull(httpMethod, "HttpMethod must not be null");
-			this.httpMethods = EnumSet.of(httpMethod);
+			this.httpMethods = Set.of(httpMethod);
 		}
 
 		public HttpMethodPredicate(HttpMethod... httpMethods) {
 			Assert.notEmpty(httpMethods, "HttpMethods must not be empty");
-			this.httpMethods = EnumSet.copyOf(Arrays.asList(httpMethods));
+			this.httpMethods = new LinkedHashSet<>(Arrays.asList(httpMethods));
 		}
 
 		@Override
@@ -451,16 +451,15 @@ public boolean test(ServerRequest request) {
 			return match;
 		}
 
-		@Nullable
 		private static HttpMethod method(ServerRequest request) {
 			if (CorsUtils.isPreFlightRequest(request.servletRequest())) {
 				String accessControlRequestMethod =
 						request.headers().firstHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD);
-				return HttpMethod.resolve(accessControlRequestMethod);
-			}
-			else {
-				return request.method();
+				if (accessControlRequestMethod != null) {
+					return HttpMethod.valueOf(accessControlRequestMethod);
+				}
 			}
+			return request.method();
 		}
 
 		@Override
@@ -966,6 +965,7 @@ public HttpMethod method() {
 		}
 
 		@Override
+		@Deprecated
 		public String methodName() {
 			return this.request.methodName();
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ResourceHandlerFunction.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ResourceHandlerFunction.java
index 55da489a21b2..0012c3d0da87 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ResourceHandlerFunction.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ResourceHandlerFunction.java
@@ -22,7 +22,6 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
-import java.util.EnumSet;
 import java.util.Set;
 
 import org.springframework.core.io.Resource;
@@ -39,7 +38,7 @@
 class ResourceHandlerFunction implements HandlerFunction<ServerResponse> {
 
 	private static final Set<HttpMethod> SUPPORTED_METHODS =
-			EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS);
+			Set.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS);
 
 
 	private final Resource resource;
@@ -53,17 +52,16 @@ public ResourceHandlerFunction(Resource resource) {
 	@Override
 	public ServerResponse handle(ServerRequest request) {
 		HttpMethod method = request.method();
-		if (method != null) {
-			switch (method) {
-				case GET:
-					return EntityResponse.fromObject(this.resource).build();
-				case HEAD:
-					Resource headResource = new HeadMethodResource(this.resource);
-					return EntityResponse.fromObject(headResource).build();
-				case OPTIONS:
-					return ServerResponse.ok()
-							.allow(SUPPORTED_METHODS).build();
-			}
+		if (HttpMethod.GET.equals(method)) {
+			return EntityResponse.fromObject(this.resource).build();
+		}
+		else if (HttpMethod.HEAD.equals(method)) {
+			Resource headResource = new HeadMethodResource(this.resource);
+			return EntityResponse.fromObject(headResource).build();
+		}
+		else if (HttpMethod.OPTIONS.equals(method)) {
+			return ServerResponse.ok()
+					.allow(SUPPORTED_METHODS).build();
 		}
 		return ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED)
 				.allow(SUPPORTED_METHODS).build();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
index 741c4190f181..e8b3982c77ab 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
@@ -66,15 +66,14 @@ public interface ServerRequest {
 	 * @return the HTTP method as an HttpMethod enum value, or {@code null}
 	 * if not resolvable (e.g. in case of a non-standard HTTP method)
 	 */
-	@Nullable
-	default HttpMethod method() {
-		return HttpMethod.resolve(methodName());
-	}
+	HttpMethod method();
 
 	/**
 	 * Get the name of the HTTP method.
 	 * @return the HTTP method as a String
+	 * @deprecated in favor of {@link #method()}
 	 */
+	@Deprecated
 	String methodName();
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
index f550766908f1..cdd4bf407c01 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
@@ -23,7 +23,6 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -68,8 +67,7 @@
  */
 public abstract class AbstractMessageConverterMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
-	private static final Set<HttpMethod> SUPPORTED_METHODS =
-			EnumSet.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH);
+	private static final Set<HttpMethod> SUPPORTED_METHODS = Set.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH);
 
 	private static final Object NO_VALUE = new Object();
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
index db80a70dfd13..9da95ef51164 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
@@ -171,7 +171,7 @@ else if (Principal.class.isAssignableFrom(paramType)) {
 			return userPrincipal;
 		}
 		else if (HttpMethod.class == paramType) {
-			return HttpMethod.resolve(request.getMethod());
+			return HttpMethod.valueOf(request.getMethod());
 		}
 		else if (Locale.class == paramType) {
 			return RequestContextUtils.getLocale(request);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
index 00969fbb85c1..f57fdbded43f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
@@ -21,7 +21,6 @@
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 
@@ -89,7 +88,7 @@ public void allow() {
 		String body = "foo";
 		EntityResponse<String> result =
 				EntityResponse.fromObject(body).allow(HttpMethod.GET).build();
-		Set<HttpMethod> expected = EnumSet.of(HttpMethod.GET);
+		Set<HttpMethod> expected = Set.of(HttpMethod.GET);
 		assertThat(result.headers().getAllow()).isEqualTo(expected);
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
index d70ffb3a8e81..6630814bc347 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
@@ -22,8 +22,8 @@
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
@@ -156,7 +156,7 @@ public void unprocessableEntity() {
 	@Test
 	public void allow() {
 		ServerResponse response = ServerResponse.ok().allow(HttpMethod.GET).build();
-		assertThat(response.headers().getAllow()).isEqualTo(EnumSet.of(HttpMethod.GET));
+		assertThat(response.headers().getAllow()).isEqualTo(Set.of(HttpMethod.GET));
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
index a5cfa327b7d8..90aab2cff2f7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
@@ -21,7 +21,7 @@
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumSet;
+import java.util.Set;
 
 import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +35,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ResourceHttpMessageConverter;
 import org.springframework.http.converter.ResourceRegionHttpMessageConverter;
+import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.PathPatternsTestUtils;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
@@ -173,14 +174,16 @@ public void options() throws ServletException, IOException {
 
 		ServerResponse response = this.handlerFunction.handle(request);
 		assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
-		assertThat(response.headers().getAllow()).isEqualTo(EnumSet.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS));
+		assertThat(response.headers().getAllow()).isEqualTo(Set.of(HttpMethod.GET, HttpMethod.HEAD, HttpMethod.OPTIONS));
 
 		MockHttpServletResponse servletResponse = new MockHttpServletResponse();
 		ModelAndView mav = response.writeTo(servletRequest, servletResponse, this.context);
 		assertThat(mav).isNull();
 
 		assertThat(servletResponse.getStatus()).isEqualTo(200);
-		assertThat(servletResponse.getHeader("Allow")).isEqualTo("GET,HEAD,OPTIONS");
+		String allowHeader = servletResponse.getHeader("Allow");
+		String[] methods = StringUtils.tokenizeToStringArray(allowHeader, ",");
+		assertThat(methods).containsExactlyInAnyOrder("GET","HEAD","OPTIONS");
 		byte[] actualBytes = servletResponse.getContentAsByteArray();
 		assertThat(actualBytes.length).isEqualTo(0);
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
index dfc40e2807c0..f469e8c85238 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java
@@ -18,8 +18,8 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.Test;
@@ -102,7 +102,7 @@ public void httpRequestMethodNotSupported() {
 		Exception ex = new HttpRequestMethodNotSupportedException("GET", supported);
 
 		ResponseEntity<Object> responseEntity = testException(ex);
-		assertThat(responseEntity.getHeaders().getAllow()).isEqualTo(EnumSet.of(HttpMethod.POST, HttpMethod.DELETE));
+		assertThat(responseEntity.getHeaders().getAllow()).isEqualTo(Set.of(HttpMethod.POST, HttpMethod.DELETE));
 	}
 
 	@Test

From da3b4cb65d6e148450857eddd54cdeb9238be2ef Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 30 Nov 2021 14:09:33 +0100
Subject: [PATCH 393/735] Polish

---
 .../src/main/java/org/springframework/http/HttpMethod.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
index 0cb5885a0f54..ba011e6d2203 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMethod.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -24,7 +24,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Represents an HTTP request methods. Intended for use
+ * Represents an HTTP request method. Intended for use
  * with {@link org.springframework.http.client.ClientHttpRequest}
  * and {@link org.springframework.web.client.RestTemplate}.
  *

From 5c4cde78536c014757672ea780abdef0a7283743 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Wed, 16 Oct 2019 10:07:27 +0900
Subject: [PATCH 394/735] Polish AbstractResource

See gh-23813
---
 .../core/io/AbstractResource.java             | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
index de327d7e1c12..9f35ead87fe6 100644
--- a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
@@ -25,6 +25,7 @@
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
+import java.util.function.Supplier;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -60,10 +61,7 @@ public boolean exists() {
 				return getFile().exists();
 			}
 			catch (IOException ex) {
-				Log logger = LogFactory.getLog(getClass());
-				if (logger.isDebugEnabled()) {
-					logger.debug("Could not retrieve File for existence check of " + getDescription(), ex);
-				}
+				debug(() -> "Could not retrieve File for existence check of " + getDescription(), ex);
 			}
 		}
 		// Fall back to stream existence: can we open the stream?
@@ -72,14 +70,18 @@ public boolean exists() {
 			return true;
 		}
 		catch (Throwable ex) {
-			Log logger = LogFactory.getLog(getClass());
-			if (logger.isDebugEnabled()) {
-				logger.debug("Could not retrieve InputStream for existence check of " + getDescription(), ex);
-			}
+			debug(() -> "Could not retrieve InputStream for existence check of " + getDescription(), ex);
 			return false;
 		}
 	}
 
+	private void debug(Supplier<String> message, Throwable ex) {
+		Log logger = LogFactory.getLog(getClass());
+		if (logger.isDebugEnabled()) {
+			logger.debug(message.get(), ex);
+		}
+	}
+
 	/**
 	 * This implementation always returns {@code true} for a resource
 	 * that {@link #exists() exists} (revised as of 5.1).
@@ -174,10 +176,7 @@ public long contentLength() throws IOException {
 				is.close();
 			}
 			catch (IOException ex) {
-				Log logger = LogFactory.getLog(getClass());
-				if (logger.isDebugEnabled()) {
-					logger.debug("Could not close content-length InputStream for " + getDescription(), ex);
-				}
+				debug(() -> "Could not close content-length InputStream for " + getDescription(), ex);
 			}
 		}
 	}

From 46cb5ab1355660979ad4cba59be023885540106d Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 30 Nov 2021 14:29:05 +0100
Subject: [PATCH 395/735] Polish contribution

See gh-23813
---
 .../core/io/AbstractResource.java                | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
index 9f35ead87fe6..cf3266672f9d 100644
--- a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,13 +75,6 @@ public boolean exists() {
 		}
 	}
 
-	private void debug(Supplier<String> message, Throwable ex) {
-		Log logger = LogFactory.getLog(getClass());
-		if (logger.isDebugEnabled()) {
-			logger.debug(message.get(), ex);
-		}
-	}
-
 	/**
 	 * This implementation always returns {@code true} for a resource
 	 * that {@link #exists() exists} (revised as of 5.1).
@@ -257,4 +250,11 @@ public String toString() {
 		return getDescription();
 	}
 
+	private void debug(Supplier<String> message, Throwable ex) {
+		Log logger = LogFactory.getLog(getClass());
+		if (logger.isDebugEnabled()) {
+			logger.debug(message.get(), ex);
+		}
+	}
+
 }

From 445f25c466c64f206f5f141c56a1b7cf63f3a30b Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 30 Nov 2021 14:59:42 +0100
Subject: [PATCH 396/735] Use HttpMethod::valueOf in HttpMethod::resolve

This commit makes sure that HttpMethod::resolve uses HttpMethod::valueOf
and returns an HttpMethod for non-standard methods.

See gh-27697
---
 .../src/main/java/org/springframework/http/HttpMethod.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
index ba011e6d2203..90557d4e108b 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMethod.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -146,7 +146,7 @@ public static HttpMethod valueOf(String method) {
 	@Nullable
 	@Deprecated
 	public static HttpMethod resolve(@Nullable String method) {
-		return (method != null ? mappings.get(method) : null);
+		return (method != null ? valueOf(method) : null);
 	}
 
 

From 7794606305da37e5efbfeded67eb421208492339 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Wed, 1 Dec 2021 11:10:10 +0100
Subject: [PATCH 397/735] Add ClientResponse::createError

This commit introduces ClientResponse::createError, returning
a Mono that terminates with a WebClientException.

Closes gh-27637
---
 .../function/client/ClientResponse.java       | 12 ++++++++
 .../client/DefaultClientResponse.java         |  5 ++++
 .../client/support/ClientResponseWrapper.java |  5 ++++
 .../client/DefaultClientResponseTests.java    | 30 +++++++++++++++++++
 4 files changed, 52 insertions(+)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
index 90384a6ede04..093de96ba637 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
@@ -181,6 +181,18 @@ public interface ClientResponse {
 	 */
 	Mono<WebClientResponseException> createException();
 
+	/**
+	 * Create a {@code Mono} that terminates with a
+	 * {@link WebClientResponseException}, containing the response status,
+	 * headers, body, and the originating request.
+	 * @param <T> the reified type
+	 * @return a {@code Mono} that fails with a
+	 * {@link WebClientResponseException}.
+	 * @see #createException()
+	 * @since 6.0
+	 */
+	<T> Mono<T> createError();
+
 	/**
 	 * Return a log message prefix to use to correlate messages for this exchange.
 	 * <p>The prefix is based on {@linkplain ClientRequest#logPrefix()}, which
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
index 37f14f34ae0b..7e768498d216 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
@@ -223,6 +223,11 @@ public Mono<WebClientResponseException> createException() {
 				});
 	}
 
+	@Override
+	public <T> Mono<T> createError() {
+		return createException().flatMap(Mono::error);
+	}
+
 	@Override
 	public String logPrefix() {
 		return this.logPrefix;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java
index 3b558eeee308..e20f6ff8cb1c 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapper.java
@@ -153,6 +153,11 @@ public Mono<WebClientResponseException> createException() {
 		return this.delegate.createException();
 	}
 
+	@Override
+	public <T> Mono<T> createError() {
+		return this.delegate.createError();
+	}
+
 	@Override
 	public String logPrefix() {
 		return this.delegate.logPrefix();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
index f9b626a60c79..9143688b1716 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.codec.ByteArrayDecoder;
@@ -353,6 +354,35 @@ public void createException() {
 		assertThat(exception.getResponseBodyAsByteArray()).isEqualTo(bytes);
 	}
 
+	@Test
+	public void createError() {
+		byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8);
+		DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes));
+		Flux<DataBuffer> body = Flux.just(dataBuffer);
+		httpHeaders.setContentType(MediaType.TEXT_PLAIN);
+		given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND);
+		given(mockResponse.getRawStatusCode()).willReturn(HttpStatus.NOT_FOUND.value());
+		given(mockResponse.getBody()).willReturn(body);
+
+		List<HttpMessageReader<?>> messageReaders = Collections.singletonList(
+				new DecoderHttpMessageReader<>(new ByteArrayDecoder()));
+		given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders);
+
+		Mono<String> resultMono = defaultClientResponse.createError();
+		StepVerifier.create(resultMono)
+				.consumeErrorWith(t -> {
+					assertThat(t).isInstanceOf(WebClientResponseException.class);
+					WebClientResponseException exception = (WebClientResponseException) t;
+					assertThat(exception.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+					assertThat(exception.getMessage()).isEqualTo("404 Not Found");
+					assertThat(exception.getHeaders()).containsExactly(entry("Content-Type",
+							Collections.singletonList("text/plain")));
+					assertThat(exception.getResponseBodyAsByteArray()).isEqualTo(bytes);
+
+				})
+				.verify();
+	}
+
 
 	private void mockTextPlainResponse(Flux<DataBuffer> body) {
 		httpHeaders.setContentType(MediaType.TEXT_PLAIN);

From 6283456ef24c4271469ea67ff21b95e303d708c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=85=B6=E8=8B=97?= <chenqimiao1994@126.com>
Date: Wed, 26 Feb 2020 18:57:35 +0800
Subject: [PATCH 398/735] Add support for explicit generic type in
 PayloadApplicationEvent

See gh-24599
---
 .../context/PayloadApplicationEvent.java      | 20 +++++++++-
 .../support/AbstractApplicationContext.java   |  2 +-
 .../AnnotationDrivenEventListenerTests.java   | 37 +++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
index addcbc5dd975..f6121045576d 100644
--- a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
@@ -20,6 +20,7 @@
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.ResolvableTypeProvider;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -27,6 +28,7 @@
  *
  * @author Stephane Nicoll
  * @author Juergen Hoeller
+ * @author Qimiao Chen
  * @since 4.2
  * @param <T> the payload type of the event
  * @see ApplicationEventPublisher#publishEvent(Object)
@@ -37,6 +39,8 @@ public class PayloadApplicationEvent<T> extends ApplicationEvent implements Reso
 
 	private final T payload;
 
+	@Nullable
+	private ResolvableType payloadType;
 
 	/**
 	 * Create a new PayloadApplicationEvent.
@@ -44,15 +48,29 @@ public class PayloadApplicationEvent<T> extends ApplicationEvent implements Reso
 	 * @param payload the payload object (never {@code null})
 	 */
 	public PayloadApplicationEvent(Object source, T payload) {
+		this(source, payload, null);
+	}
+
+	/**
+	 * Create a new PayloadApplicationEvent.
+	 * @param source the object on which the event initially occurred (never {@code null})
+	 * @param payload the payload object (never {@code null})
+	 * @param payloadType the type object of payload object (can be {@code null})
+	 */
+	public PayloadApplicationEvent(Object source, T payload, @Nullable ResolvableType payloadType) {
 		super(source);
 		Assert.notNull(payload, "Payload must not be null");
 		this.payload = payload;
+		this.payloadType = payloadType;
 	}
 
 
 	@Override
 	public ResolvableType getResolvableType() {
-		return ResolvableType.forClassWithGenerics(getClass(), ResolvableType.forInstance(getPayload()));
+		if (this.payloadType == null) {
+			this.payloadType = ResolvableType.forInstance(getPayload());
+		}
+		return ResolvableType.forClassWithGenerics(getClass(), this.payloadType);
 	}
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
index 27b050838cd7..1bb789a46e9f 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -407,7 +407,7 @@ protected void publishEvent(Object event, @Nullable ResolvableType eventType) {
 			applicationEvent = (ApplicationEvent) event;
 		}
 		else {
-			applicationEvent = new PayloadApplicationEvent<>(this, event);
+			applicationEvent = new PayloadApplicationEvent<>(this, event, eventType);
 			if (eventType == null) {
 				eventType = ((PayloadApplicationEvent<?>) applicationEvent).getResolvableType();
 			}
diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
index 8c51dd29420b..c95f163007c3 100644
--- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
@@ -60,6 +60,7 @@
 import org.springframework.context.event.test.Identifiable;
 import org.springframework.context.event.test.TestEvent;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.Async;
@@ -622,6 +623,17 @@ void conditionDoesNotMatch() {
 		this.eventCollector.assertNoEventReceived(listener);
 		this.eventCollector.assertTotalEventsCount(0);
 	}
+	@Test
+	public void publishEventWithGeneric() throws NoSuchMethodException {
+		MyAnnotationConfigApplicationContext ctx = new MyAnnotationConfigApplicationContext();
+		context = ctx;
+		ctx.register(MyEventWithGenericListener.class);
+		ctx.refresh();
+		ResolvableType resolvableType = ResolvableType.forMethodParameter(MyEventWithGenericListener.class.getMethod("onMyEventWithGeneric",MyEventWithGeneric.class),0);
+		ctx.publishEvent(new MyEventWithGeneric<String>(),resolvableType);
+		assertThat(MyEventWithGenericListener.count).isEqualTo(1);
+	}
+
 
 	@Test
 	void orderedListeners() {
@@ -1134,4 +1146,29 @@ public UseMissingEventListener(Optional<MyEventListener> notHere) {
 		}
 	}
 
+	public static class MyAnnotationConfigApplicationContext extends AnnotationConfigApplicationContext{
+
+		@Override
+		public void publishEvent(Object event, ResolvableType eventType) {
+			super.publishEvent(event, eventType);
+		}
+	}
+
+	public static class MyEventWithGeneric<T> {
+
+	}
+
+	@Component
+	public static class MyEventWithGenericListener{
+
+		public static int count ;
+
+		@EventListener
+		public void onMyEventWithGeneric(MyEventWithGeneric<String> event){
+			count ++;
+		}
+
+
+	}
+
 }

From 792b366bda738f9c7d0287f13a61019357df2176 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 2 Dec 2021 10:10:38 +0100
Subject: [PATCH 399/735] Polish "Add support for explicit generic type in
 PayloadApplicationEvent"

See gh-24599
---
 .../context/PayloadApplicationEvent.java      | 24 ++++-----
 .../AnnotationDrivenEventListenerTests.java   | 37 --------------
 .../event/PayloadApplicationEventTests.java   | 49 +++++++++++++++++--
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
index f6121045576d..612d2752f5fc 100644
--- a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
@@ -39,37 +39,33 @@ public class PayloadApplicationEvent<T> extends ApplicationEvent implements Reso
 
 	private final T payload;
 
-	@Nullable
-	private ResolvableType payloadType;
+	private final ResolvableType payloadType;
 
 	/**
 	 * Create a new PayloadApplicationEvent.
 	 * @param source the object on which the event initially occurred (never {@code null})
 	 * @param payload the payload object (never {@code null})
+	 * @param payloadType the type object of payload object (can be {@code null})
 	 */
-	public PayloadApplicationEvent(Object source, T payload) {
-		this(source, payload, null);
+	public PayloadApplicationEvent(Object source, T payload, @Nullable ResolvableType payloadType) {
+		super(source);
+		Assert.notNull(payload, "Payload must not be null");
+		this.payload = payload;
+		this.payloadType = (payloadType != null) ? payloadType : ResolvableType.forInstance(payload);
 	}
 
 	/**
-	 * Create a new PayloadApplicationEvent.
+	 * Create a new PayloadApplicationEvent, using the instance to infer its type.
 	 * @param source the object on which the event initially occurred (never {@code null})
 	 * @param payload the payload object (never {@code null})
-	 * @param payloadType the type object of payload object (can be {@code null})
 	 */
-	public PayloadApplicationEvent(Object source, T payload, @Nullable ResolvableType payloadType) {
-		super(source);
-		Assert.notNull(payload, "Payload must not be null");
-		this.payload = payload;
-		this.payloadType = payloadType;
+	public PayloadApplicationEvent(Object source, T payload) {
+		this(source, payload, null);
 	}
 
 
 	@Override
 	public ResolvableType getResolvableType() {
-		if (this.payloadType == null) {
-			this.payloadType = ResolvableType.forInstance(getPayload());
-		}
 		return ResolvableType.forClassWithGenerics(getClass(), this.payloadType);
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
index c95f163007c3..8c51dd29420b 100644
--- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
@@ -60,7 +60,6 @@
 import org.springframework.context.event.test.Identifiable;
 import org.springframework.context.event.test.TestEvent;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.Async;
@@ -623,17 +622,6 @@ void conditionDoesNotMatch() {
 		this.eventCollector.assertNoEventReceived(listener);
 		this.eventCollector.assertTotalEventsCount(0);
 	}
-	@Test
-	public void publishEventWithGeneric() throws NoSuchMethodException {
-		MyAnnotationConfigApplicationContext ctx = new MyAnnotationConfigApplicationContext();
-		context = ctx;
-		ctx.register(MyEventWithGenericListener.class);
-		ctx.refresh();
-		ResolvableType resolvableType = ResolvableType.forMethodParameter(MyEventWithGenericListener.class.getMethod("onMyEventWithGeneric",MyEventWithGeneric.class),0);
-		ctx.publishEvent(new MyEventWithGeneric<String>(),resolvableType);
-		assertThat(MyEventWithGenericListener.count).isEqualTo(1);
-	}
-
 
 	@Test
 	void orderedListeners() {
@@ -1146,29 +1134,4 @@ public UseMissingEventListener(Optional<MyEventListener> notHere) {
 		}
 	}
 
-	public static class MyAnnotationConfigApplicationContext extends AnnotationConfigApplicationContext{
-
-		@Override
-		public void publishEvent(Object event, ResolvableType eventType) {
-			super.publishEvent(event, eventType);
-		}
-	}
-
-	public static class MyEventWithGeneric<T> {
-
-	}
-
-	@Component
-	public static class MyEventWithGenericListener{
-
-		public static int count ;
-
-		@EventListener
-		public void onMyEventWithGeneric(MyEventWithGeneric<String> event){
-			count ++;
-		}
-
-
-	}
-
 }
diff --git a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
index c752623bb55f..8fb78ceda8a9 100644
--- a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
@@ -27,6 +27,7 @@
 import org.springframework.context.PayloadApplicationEvent;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.ResolvableType;
 import org.springframework.stereotype.Component;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,10 +35,40 @@
 /**
  * @author Juergen Hoeller
  */
-public class PayloadApplicationEventTests {
+class PayloadApplicationEventTests {
 
 	@Test
-	public void testEventClassWithInterface() {
+	void payloadApplicationEventWithNoTypeUsesInstance() {
+		NumberHolder<Integer> payload = new NumberHolder<>(42);
+		PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this, payload);
+		assertThat(event.getResolvableType()).satisfies(eventType -> {
+			assertThat(eventType.toClass()).isEqualTo(PayloadApplicationEvent.class);
+			assertThat(eventType.getGenerics()).hasSize(1);
+			assertThat(eventType.getGenerics()[0]).satisfies(bodyType -> {
+				assertThat(bodyType.toClass()).isEqualTo(NumberHolder.class);
+				assertThat(bodyType.hasUnresolvableGenerics()).isTrue();
+			});
+		});
+	}
+
+	@Test
+	void payloadApplicationEventWithType() {
+		NumberHolder<Integer> payload = new NumberHolder<>(42);
+		ResolvableType payloadType = ResolvableType.forClassWithGenerics(NumberHolder.class, Integer.class);
+		PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this, payload, payloadType);
+		assertThat(event.getResolvableType()).satisfies(eventType -> {
+			assertThat(eventType.toClass()).isEqualTo(PayloadApplicationEvent.class);
+			assertThat(eventType.getGenerics()).hasSize(1);
+			assertThat(eventType.getGenerics()[0]).satisfies(bodyType -> {
+				assertThat(bodyType.toClass()).isEqualTo(NumberHolder.class);
+				assertThat(bodyType.hasUnresolvableGenerics()).isFalse();
+				assertThat(bodyType.getGenerics()[0].toClass()).isEqualTo(Integer.class);
+			});
+		});
+	}
+
+	@Test
+	void testEventClassWithInterface() {
 		ApplicationContext ac = new AnnotationConfigApplicationContext(AuditableListener.class);
 
 		AuditablePayloadEvent<String> event = new AuditablePayloadEvent<>(this, "xyz");
@@ -46,7 +77,7 @@ public void testEventClassWithInterface() {
 	}
 
 	@Test
-	public void testProgrammaticEventListener() {
+	void testProgrammaticEventListener() {
 		List<Auditable> events = new ArrayList<>();
 		ApplicationListener<AuditablePayloadEvent<String>> listener = events::add;
 		ApplicationListener<AuditablePayloadEvent<Integer>> mismatch = (event -> event.getPayload().intValue());
@@ -62,7 +93,7 @@ public void testProgrammaticEventListener() {
 	}
 
 	@Test
-	public void testProgrammaticPayloadListener() {
+	void testProgrammaticPayloadListener() {
 		List<String> events = new ArrayList<>();
 		ApplicationListener<PayloadApplicationEvent<String>> listener = ApplicationListener.forPayload(events::add);
 		ApplicationListener<PayloadApplicationEvent<Integer>> mismatch = ApplicationListener.forPayload(payload -> payload.intValue());
@@ -102,4 +133,14 @@ public void onEvent(Auditable event) {
 		}
 	}
 
+	static class NumberHolder<T extends Number> {
+
+		private T number;
+
+		public NumberHolder(T number) {
+			this.number = number;
+		}
+
+	}
+
 }

From 32359c52b4b2dd76f37f5c489d39f1a52cfa7448 Mon Sep 17 00:00:00 2001
From: liuzhifei <2679431923@qq.com>
Date: Wed, 1 Dec 2021 17:22:32 +0800
Subject: [PATCH 400/735] Remove transitive dependency on Java EE 8 JAX-B

Closes gh-27754
---
 spring-webmvc/spring-webmvc.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index cb8bd88e583f..aa9dedb7a952 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -45,7 +45,9 @@ dependencies {
 	testImplementation("org.apache.httpcomponents:httpclient")
 	testImplementation("commons-io:commons-io")
 	testImplementation("org.mozilla:rhino")
-	testImplementation("org.dom4j:dom4j")
+	testImplementation("org.dom4j:dom4j") {
+		exclude group: 'javax.xml.bind', module: "jaxb-api"
+	}
 	testImplementation("jaxen:jaxen")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")

From baed0785fd02b2bf6b93c72b756c37b603359220 Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Wed, 4 Aug 2021 17:15:18 +1000
Subject: [PATCH 401/735] Replace XMLReaderFactory with SAXParserFactory

XMLReaderFactory has been marked as deprecated and without additional
configuration, and it's slower than SAXParserFactory.

Previously `XMLReaderFactory.createXMLReader()` is called upon every
request. This is an anti-pattern as mentioned in [1] and it can be very
slow since it loads the jar service file unless a parser has been
pre-assigned [2] (e.g. by setting org.xml.sax.driver).

SAXParserFactory uses a FactoryFinder [3] instead, which takes advantage
of a thread-local cache provided by ServiceLoader. Developers can still
pre-assign a factory by setting javax.xml.parsers.SAXParserFactory to
make it faster.

[1] https://bugs.openjdk.java.net/browse/JDK-6925410
[2] https://github.com/openjdk/jdk/blob/c8add223a10030e40ccef42e081fd0d8f00e0593/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java#L144-L148
[3] https://github.com/openjdk/jdk/blob/66c653c561b3b5e904579af62e23ff94952bca05/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java#L181-L185

See gh-27239
---
 .../util/xml/AbstractStaxHandlerTests.java    |  8 ++++--
 .../util/xml/AbstractStaxXMLReaderTests.java  |  8 ++++--
 .../util/xml/DomContentHandlerTests.java      |  8 ++++--
 .../oxm/jaxb/Jaxb2Marshaller.java             | 27 ++++++++++++-------
 .../oxm/support/AbstractMarshaller.java       | 17 +++++++-----
 .../oxm/AbstractUnmarshallerTests.java        |  8 ++++--
 .../Jaxb2RootElementHttpMessageConverter.java | 15 +++++++----
 .../xml/SourceHttpMessageConverter.java       | 14 ++++++----
 8 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java
index 76d55709d13c..71cfe38c338e 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java
@@ -21,6 +21,8 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Result;
 import javax.xml.transform.dom.DOMResult;
@@ -63,9 +65,11 @@ abstract class AbstractStaxHandlerTests {
 
 
 	@BeforeEach
-	@SuppressWarnings("deprecation")  // on JDK 9
 	void createXMLReader() throws Exception {
-		xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
+		SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+		saxParserFactory.setNamespaceAware(true);
+		SAXParser saxParser = saxParserFactory.newSAXParser();
+		xmlReader = saxParser.getXMLReader();
 		xmlReader.setEntityResolver((publicId, systemId) -> new InputSource(new StringReader("")));
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
index 317a88b9eb81..504e69d6c7c0 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
@@ -19,6 +19,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Transformer;
@@ -64,10 +66,12 @@ abstract class AbstractStaxXMLReaderTests {
 
 
 	@BeforeEach
-	@SuppressWarnings("deprecation")  // on JDK 9
 	void setUp() throws Exception {
 		inputFactory = XMLInputFactory.newInstance();
-		standardReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
+		SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+		saxParserFactory.setNamespaceAware(true);
+		SAXParser saxParser = saxParserFactory.newSAXParser();
+		standardReader = saxParser.getXMLReader();
 		standardContentHandler = mockContentHandler();
 		standardReader.setContentHandler(standardContentHandler);
 	}
diff --git a/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java b/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
index 40cef2118496..b069809b4466 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
@@ -20,6 +20,8 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -62,13 +64,15 @@ class DomContentHandlerTests {
 
 
 	@BeforeEach
-	@SuppressWarnings("deprecation")  // on JDK 9
 	void setUp() throws Exception {
 		DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 		documentBuilderFactory.setNamespaceAware(true);
 		documentBuilder = documentBuilderFactory.newDocumentBuilder();
 		result = documentBuilder.newDocument();
-		xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
+		SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+		saxParserFactory.setNamespaceAware(true);
+		SAXParser saxParser = saxParserFactory.newSAXParser();
+		xmlReader = saxParser.getXMLReader();
 	}
 
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 78b4ca23e4a5..32f544067d8a 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -42,6 +42,9 @@
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamReader;
@@ -575,8 +578,7 @@ private JAXBContext createJaxbContextFromPackages(String... packagesToScan) thro
 		}
 	}
 
-	@SuppressWarnings("deprecation")
-	private Schema loadSchema(Resource[] resources, String schemaLanguage) throws IOException, SAXException {
+	private Schema loadSchema(Resource[] resources, String schemaLanguage) throws IOException, SAXException, ParserConfigurationException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Setting validation schema to " +
 					StringUtils.arrayToCommaDelimitedString(this.schemaResources));
@@ -584,8 +586,11 @@ private Schema loadSchema(Resource[] resources, String schemaLanguage) throws IO
 		Assert.notEmpty(resources, "No resources given");
 		Assert.hasLength(schemaLanguage, "No schema language provided");
 		Source[] schemaSources = new Source[resources.length];
-		XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
-		xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+		SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+		saxParserFactory.setNamespaceAware(true);
+		saxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+		SAXParser saxParser = saxParserFactory.newSAXParser();
+		XMLReader xmlReader = saxParser.getXMLReader();
 		for (int i = 0; i < resources.length; i++) {
 			Resource resource = resources[i];
 			Assert.isTrue(resource != null && resource.exists(), () -> "Resource does not exist: " + resource);
@@ -854,7 +859,6 @@ protected Object unmarshalStaxSource(Unmarshaller jaxbUnmarshaller, Source staxS
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	private Source processSource(Source source) {
 		if (StaxUtils.isStaxSource(source) || source instanceof DOMSource) {
 			return source;
@@ -881,17 +885,20 @@ else if (streamSource.getReader() != null) {
 
 		try {
 			if (xmlReader == null) {
-				xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
+				SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+				saxParserFactory.setNamespaceAware(true);
+				saxParserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+				String name = "http://xml.org/sax/features/external-general-entities";
+				saxParserFactory.setFeature(name, isProcessExternalEntities());
+				SAXParser saxParser = saxParserFactory.newSAXParser();
+				xmlReader = saxParser.getXMLReader();
 			}
-			xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
-			String name = "http://xml.org/sax/features/external-general-entities";
-			xmlReader.setFeature(name, isProcessExternalEntities());
 			if (!isProcessExternalEntities()) {
 				xmlReader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
 			}
 			return new SAXSource(xmlReader, inputSource);
 		}
-		catch (SAXException ex) {
+		catch (SAXException | ParserConfigurationException ex) {
 			logger.info("Processing of external entities could not be disabled", ex);
 			return source;
 		}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
index 4803cfada497..906159e8c90e 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
@@ -26,6 +26,8 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamReader;
@@ -188,12 +190,15 @@ protected DocumentBuilder createDocumentBuilder(DocumentBuilderFactory factory)
 	 * Create an {@code XMLReader} that this marshaller will when passed an empty {@code SAXSource}.
 	 * @return the XMLReader
 	 * @throws SAXException if thrown by JAXP methods
+	 * @throws ParserConfigurationException if thrown by JAXP methods
 	 */
-	@SuppressWarnings("deprecation")
-	protected XMLReader createXmlReader() throws SAXException {
-		XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
-		xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
-		xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+	protected XMLReader createXmlReader() throws SAXException, ParserConfigurationException {
+		SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+		saxParserFactory.setNamespaceAware(true);
+		saxParserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+		saxParserFactory.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+		SAXParser saxParser = saxParserFactory.newSAXParser();
+		XMLReader xmlReader = saxParser.getXMLReader();
 		if (!isProcessExternalEntities()) {
 			xmlReader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
 		}
@@ -431,7 +436,7 @@ protected Object unmarshalSaxSource(SAXSource saxSource) throws XmlMappingExcept
 			try {
 				saxSource.setXMLReader(createXmlReader());
 			}
-			catch (SAXException ex) {
+			catch (SAXException | ParserConfigurationException ex) {
 				throw new UnmarshallingFailureException("Could not create XMLReader for SAXSource", ex);
 			}
 		}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
index 9f0eb47435ef..18376987fade 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
@@ -22,6 +22,8 @@
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
@@ -98,9 +100,11 @@ public void unmarshalStreamSourceInputStream() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")  // on JDK 9
 	public void unmarshalSAXSource() throws Exception {
-		XMLReader reader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
+		SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+		saxParserFactory.setNamespaceAware(true);
+		SAXParser saxParser = saxParserFactory.newSAXParser();
+		XMLReader reader = saxParser.getXMLReader();
 		SAXSource source = new SAXSource(reader, new InputSource(new StringReader(INPUT_STRING)));
 		Object flights = unmarshaller.unmarshal(source);
 		testFlights(flights);
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
index a1acfda553e3..5100061cacea 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
@@ -18,6 +18,9 @@
 
 import java.io.StringReader;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.sax.SAXSource;
@@ -149,21 +152,23 @@ protected Object readFromSource(Class<?> clazz, HttpHeaders headers, Source sour
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	protected Source processSource(Source source) {
 		if (source instanceof StreamSource streamSource) {
 			InputSource inputSource = new InputSource(streamSource.getInputStream());
 			try {
-				XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
-				xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+				SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+				saxParserFactory.setNamespaceAware(true);
+				saxParserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
 				String featureName = "http://xml.org/sax/features/external-general-entities";
-				xmlReader.setFeature(featureName, isProcessExternalEntities());
+				saxParserFactory.setFeature(featureName, isProcessExternalEntities());
+				SAXParser saxParser = saxParserFactory.newSAXParser();
+				XMLReader xmlReader = saxParser.getXMLReader();
 				if (!isProcessExternalEntities()) {
 					xmlReader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
 				}
 				return new SAXSource(xmlReader, inputSource);
 			}
-			catch (SAXException ex) {
+			catch (SAXException | ParserConfigurationException ex) {
 				logger.warn("Processing of external entities could not be disabled", ex);
 				return source;
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
index 94d4b0d75117..3f6be8788b01 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
@@ -27,6 +27,8 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
@@ -197,19 +199,21 @@ private DOMSource readDOMSource(InputStream body, HttpInputMessage inputMessage)
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	private SAXSource readSAXSource(InputStream body, HttpInputMessage inputMessage) throws IOException {
 		try {
-			XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
-			xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
-			xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+			SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+			saxParserFactory.setNamespaceAware(true);
+			saxParserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+			saxParserFactory.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+			SAXParser saxParser = saxParserFactory.newSAXParser();
+			XMLReader xmlReader = saxParser.getXMLReader();
 			if (!isProcessExternalEntities()) {
 				xmlReader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
 			}
 			byte[] bytes = StreamUtils.copyToByteArray(body);
 			return new SAXSource(xmlReader, new InputSource(new ByteArrayInputStream(bytes)));
 		}
-		catch (SAXException ex) {
+		catch (SAXException | ParserConfigurationException ex) {
 			throw new HttpMessageNotReadableException(
 					"Could not parse document: " + ex.getMessage(), ex, inputMessage);
 		}

From e986ff8d078395a902a3d77dde96a4e57ea7600e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 2 Dec 2021 11:32:11 +0100
Subject: [PATCH 402/735] Update copyright year of changed files

See gh-27239
---
 .../org/springframework/util/xml/AbstractStaxHandlerTests.java  | 2 +-
 .../org/springframework/util/xml/DomContentHandlerTests.java    | 2 +-
 .../java/org/springframework/oxm/AbstractUnmarshallerTests.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java
index 71cfe38c338e..8cb0ec73f638 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java b/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
index b069809b4466..88b6d8c6b327 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
index 18376987fade..9795f47566ce 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From a0ba8082179f7d80d9f284b4d69020358be9a6f3 Mon Sep 17 00:00:00 2001
From: ydh6226 <ydh6226@naver.com>
Date: Sat, 4 Sep 2021 01:07:04 +0900
Subject: [PATCH 403/735] Use HttpHeaders.ALLOW instead of String constant

This commit changes "Allow" strings into HttpHeaders.ALLOW.

See gh-27356
---
 .../web/context/support/HttpRequestHandlerServlet.java       | 3 ++-
 .../org/springframework/web/servlet/FrameworkServlet.java    | 5 +++--
 .../springframework/web/servlet/mvc/AbstractController.java  | 3 ++-
 .../web/servlet/resource/ResourceHttpRequestHandler.java     | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
index 958559b6d622..be1ac6857fa3 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
@@ -24,6 +24,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -68,7 +69,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
 		catch (HttpRequestMethodNotSupportedException ex) {
 			String[] supportedMethods = ex.getSupportedMethods();
 			if (supportedMethods != null) {
-				response.setHeader("Allow", StringUtils.arrayToDelimitedString(supportedMethods, ", "));
+				response.setHeader(HttpHeaders.ALLOW, StringUtils.arrayToDelimitedString(supportedMethods, ", "));
 			}
 			response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, ex.getMessage());
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 3af108f45f86..da918c257eb4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -46,6 +46,7 @@
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.lang.Nullable;
@@ -940,7 +941,7 @@ protected void doOptions(HttpServletRequest request, HttpServletResponse respons
 
 		if (this.dispatchOptionsRequest || CorsUtils.isPreFlightRequest(request)) {
 			processRequest(request, response);
-			if (response.containsHeader("Allow")) {
+			if (response.containsHeader(HttpHeaders.ALLOW)) {
 				// Proper OPTIONS response coming from a handler - we're done.
 				return;
 			}
@@ -950,7 +951,7 @@ protected void doOptions(HttpServletRequest request, HttpServletResponse respons
 		super.doOptions(request, new HttpServletResponseWrapper(response) {
 			@Override
 			public void setHeader(String name, String value) {
-				if ("Allow".equals(name)) {
+				if (HttpHeaders.ALLOW.equals(name)) {
 					value = (StringUtils.hasLength(value) ? value + ", " : "") + HttpMethod.PATCH.name();
 				}
 				super.setHeader(name, value);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
index 12a42a7a4918..5576d0c7ee94 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
@@ -20,6 +20,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.ModelAndView;
@@ -155,7 +156,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons
 			throws Exception {
 
 		if (HttpMethod.OPTIONS.matches(request.getMethod())) {
-			response.setHeader("Allow", getAllowHeader());
+			response.setHeader(HttpHeaders.ALLOW, getAllowHeader());
 			return null;
 		}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 824a9aa6b677..520e1de50ff4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -560,7 +560,7 @@ public void handleRequest(HttpServletRequest request, HttpServletResponse respon
 		}
 
 		if (HttpMethod.OPTIONS.matches(request.getMethod())) {
-			response.setHeader("Allow", getAllowHeader());
+			response.setHeader(HttpHeaders.ALLOW, getAllowHeader());
 			return;
 		}
 

From 8b89128c7bec7c1e902ba74d2b6c268f3011194a Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 2 Dec 2021 11:53:43 +0000
Subject: [PATCH 404/735] Update createException example for WebClient

Closes gh-27645
---
 .../web/reactive/function/client/WebClient.java               | 4 ++--
 src/docs/asciidoc/web/webflux-webclient.adoc                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index 7e8219c1678a..9097000ccc60 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -530,7 +530,7 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 *             return response.bodyToMono(ErrorContainer.class);
 		 *         }
 		 *         else {
-		 *             return Mono.error(response.createException());
+		 *             return response.createException();
 		 *         }
 		 *     });
 		 * </pre>
@@ -562,7 +562,7 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 *             return response.bodyToMono(ErrorContainer.class).flux();
 		 *         }
 		 *         else {
-		 *             return Flux.error(response.createException());
+		 *             return response.createException().flux();
 		 *         }
 		 *     });
 		 * </pre>
diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index 3099ecb02d26..3c2d18c56129 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -559,7 +559,7 @@ depending on the response status:
 				}
 				else {
 					// Turn to error
-					return response.createException().flatMap(Mono::error);
+					return response.createException();
 				}
 			});
 ----

From 6582787678817ac3c2d88daf2b0bd83505abfdc4 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 2 Dec 2021 12:28:36 +0000
Subject: [PATCH 405/735] Apply resources after application HttpClient mapper

Closes gh-27749
---
 .../reactive/ReactorClientHttpConnector.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
index 8112ecf6442e..0fdfaab69155 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,18 +73,21 @@ public ReactorClientHttpConnector() {
 	 * @since 5.1
 	 */
 	public ReactorClientHttpConnector(ReactorResourceFactory factory, Function<HttpClient, HttpClient> mapper) {
-		this.httpClient = defaultInitializer.andThen(mapper).apply(initHttpClient(factory));
+		ConnectionProvider provider = factory.getConnectionProvider();
+		Assert.notNull(provider, "No ConnectionProvider: is ReactorResourceFactory not initialized yet?");
+		this.httpClient = defaultInitializer.andThen(mapper).andThen(applyLoopResources(factory))
+				.apply(HttpClient.create(provider));
 	}
 
-	@SuppressWarnings("deprecation")
-	private static HttpClient initHttpClient(ReactorResourceFactory resourceFactory) {
-		ConnectionProvider provider = resourceFactory.getConnectionProvider();
-		LoopResources resources = resourceFactory.getLoopResources();
-		Assert.notNull(provider, "No ConnectionProvider: is ReactorResourceFactory not initialized yet?");
-		Assert.notNull(resources, "No LoopResources: is ReactorResourceFactory not initialized yet?");
-		return HttpClient.create(provider).tcpConfiguration(tcpClient -> tcpClient.runOn(resources));
+	private static Function<HttpClient, HttpClient> applyLoopResources(ReactorResourceFactory factory) {
+		return httpClient -> {
+			LoopResources resources = factory.getLoopResources();
+			Assert.notNull(resources, "No LoopResources: is ReactorResourceFactory not initialized yet?");
+			return httpClient.runOn(resources);
+		};
 	}
 
+
 	/**
 	 * Constructor with a pre-configured {@code HttpClient} instance.
 	 * @param httpClient the client to use

From 24cb1def7dadc1c32a297b44374bf6418fb43b49 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Thu, 2 Dec 2021 14:23:16 +0100
Subject: [PATCH 406/735] Polish

Closes gh-27754
---
 build.gradle                       | 1 +
 spring-webmvc/spring-webmvc.gradle | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 19bb8059e08b..0de747085197 100644
--- a/build.gradle
+++ b/build.gradle
@@ -153,6 +153,7 @@ configure(allprojects) { project ->
 			dependency "org.mozilla:rhino:1.7.11"
 
 			dependency("org.dom4j:dom4j:2.1.3") {
+				exclude group: 'javax.xml.bind', name: "jaxb-api"
 				exclude group: "jaxen", name: "jaxen"
 				exclude group: "net.java.dev.msv", name: "xsdlib"
 				exclude group: "pull-parser", name: "pull-parser"
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index aa9dedb7a952..cb8bd88e583f 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -45,9 +45,7 @@ dependencies {
 	testImplementation("org.apache.httpcomponents:httpclient")
 	testImplementation("commons-io:commons-io")
 	testImplementation("org.mozilla:rhino")
-	testImplementation("org.dom4j:dom4j") {
-		exclude group: 'javax.xml.bind', module: "jaxb-api"
-	}
+	testImplementation("org.dom4j:dom4j")
 	testImplementation("jaxen:jaxen")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")

From 5ec1e20242bd47e87f822375ba34c39ef423b6d1 Mon Sep 17 00:00:00 2001
From: sokomishalov <sokomishalov@mail.ru>
Date: Sat, 2 Nov 2019 14:25:38 +0300
Subject: [PATCH 407/735] Add Kotlin extensions for Cache and CacheManager

See gh-23927
---
 .../springframework/cache/CacheExtensions.kt  | 44 +++++++++++++++++++
 .../cache/CacheManagerExtensions.kt           |  9 ++++
 .../cache/CacheExtensionsTest.kt              | 31 +++++++++++++
 .../cache/CacheManagerExtensionsTest.kt       | 16 +++++++
 4 files changed, 100 insertions(+)
 create mode 100644 spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt
 create mode 100644 spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt
 create mode 100644 spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt
 create mode 100644 spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt

diff --git a/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt b/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt
new file mode 100644
index 000000000000..fe0f3d5deb54
--- /dev/null
+++ b/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ * 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.cache
+
+
+/**
+ * Extension for [Cache.get] providing a `get<Foo>()` variant.
+ *
+ * @author Mikhael Sokolov
+ * @since 5.2
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+inline fun <reified T : Any> Cache.get(key: Any): T? = get(key, T::class.java)
+
+/**
+ * Extension for [Cache.get] providing a `foo[key]` variant.
+ *
+ * @author Mikhael Sokolov
+ * @since 5.2
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+operator fun Cache.get(key: Any): Cache.ValueWrapper? = get(key)
+
+/**
+ * Extension for [Cache.put] providing a `foo[key]` variant.
+ *
+ * @author Mikhael Sokolov
+ * @since 5.2
+ */
+operator fun Cache.set(key: Any, value: Any?) = put(key, value)
\ No newline at end of file
diff --git a/spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt b/spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt
new file mode 100644
index 000000000000..bc2656637014
--- /dev/null
+++ b/spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt
@@ -0,0 +1,9 @@
+package org.springframework.cache
+
+/**
+ * Extension for [CacheManager.getCache(name)] providing a `cm[name]` variant.
+ *
+ * @author Mikhael Sokolov
+ * @since 5.2
+ */
+operator fun CacheManager.get(name: String): Cache? = getCache(name)
\ No newline at end of file
diff --git a/spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt b/spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt
new file mode 100644
index 000000000000..28d52f92f3a0
--- /dev/null
+++ b/spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt
@@ -0,0 +1,31 @@
+package org.springframework.cache
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager
+
+class CacheExtensionsTest {
+
+	@Test
+	fun `Check inline get variant`() {
+		val cache = createCache()
+		cache.put("k", "v")
+		assertEquals("v", cache.get<String>("k"))
+	}
+
+	@Test
+	fun `Check operator get variant`() {
+		val cache = createCache()
+		cache.put("k", "v")
+		assertEquals("v", cache["k"]?.get() as String?)
+	}
+
+	@Test
+	fun `Check operator set variant`() {
+		val cache = createCache()
+		cache["k"] = "v"
+		assertEquals("v", cache.get("k", String::class.java))
+	}
+
+	private fun createCache(cacheName: String = "c"): Cache = ConcurrentMapCacheManager(cacheName).getCache(cacheName)!!
+}
\ No newline at end of file
diff --git a/spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt b/spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt
new file mode 100644
index 000000000000..43765e407a1f
--- /dev/null
+++ b/spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt
@@ -0,0 +1,16 @@
+package org.springframework.cache
+
+import org.junit.jupiter.api.Assertions.assertNotEquals
+import org.junit.jupiter.api.Test
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager
+
+class CacheManagerExtensionsTest {
+
+	@Test
+	fun `Check operator get variant`() {
+		val cm = createCacheManager("c")
+		assertNotEquals(null, cm["c"])
+	}
+
+	private fun createCacheManager(cacheName: String = "c"): CacheManager = ConcurrentMapCacheManager(cacheName)
+}
\ No newline at end of file

From 65dc2afe9d54c785333b34559de3f2a846a972d4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 2 Dec 2021 14:49:46 +0100
Subject: [PATCH 408/735] Polish "Add Kotlin extensions for Cache and
 CacheManager"

See gh-23927
---
 .../springframework/cache/CacheExtensions.kt  |  8 ++++----
 .../cache/CacheManagerExtensions.kt           | 18 +++++++++++++++++-
 .../cache/CacheExtensionsTest.kt              | 19 ++++++++++++++++++-
 .../cache/CacheManagerExtensionsTest.kt       | 19 ++++++++++++++++++-
 4 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt b/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt
index fe0f3d5deb54..df6a4737bdd9 100644
--- a/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt
+++ b/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ package org.springframework.cache
  * Extension for [Cache.get] providing a `get<Foo>()` variant.
  *
  * @author Mikhael Sokolov
- * @since 5.2
+ * @since 6.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 inline fun <reified T : Any> Cache.get(key: Any): T? = get(key, T::class.java)
@@ -30,7 +30,7 @@ inline fun <reified T : Any> Cache.get(key: Any): T? = get(key, T::class.java)
  * Extension for [Cache.get] providing a `foo[key]` variant.
  *
  * @author Mikhael Sokolov
- * @since 5.2
+ * @since 6.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 operator fun Cache.get(key: Any): Cache.ValueWrapper? = get(key)
@@ -39,6 +39,6 @@ operator fun Cache.get(key: Any): Cache.ValueWrapper? = get(key)
  * Extension for [Cache.put] providing a `foo[key]` variant.
  *
  * @author Mikhael Sokolov
- * @since 5.2
+ * @since 6.0
  */
 operator fun Cache.set(key: Any, value: Any?) = put(key, value)
\ No newline at end of file
diff --git a/spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt b/spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt
index bc2656637014..afa7d431248f 100644
--- a/spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt
+++ b/spring-context/src/main/kotlin/org/springframework/cache/CacheManagerExtensions.kt
@@ -1,9 +1,25 @@
+/*
+ * 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.cache
 
 /**
  * Extension for [CacheManager.getCache(name)] providing a `cm[name]` variant.
  *
  * @author Mikhael Sokolov
- * @since 5.2
+ * @since 6.0
  */
 operator fun CacheManager.get(name: String): Cache? = getCache(name)
\ No newline at end of file
diff --git a/spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt b/spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt
index 28d52f92f3a0..70f98c38e22a 100644
--- a/spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt
+++ b/spring-context/src/test/kotlin/org/springframework/cache/CacheExtensionsTest.kt
@@ -1,3 +1,19 @@
+/*
+ * 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.cache
 
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -27,5 +43,6 @@ class CacheExtensionsTest {
 		assertEquals("v", cache.get("k", String::class.java))
 	}
 
-	private fun createCache(cacheName: String = "c"): Cache = ConcurrentMapCacheManager(cacheName).getCache(cacheName)!!
+	private fun createCache(cacheName: String = "c"): Cache =
+		ConcurrentMapCacheManager(cacheName).getCache(cacheName)!!
 }
\ No newline at end of file
diff --git a/spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt b/spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt
index 43765e407a1f..95bd32e38441 100644
--- a/spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt
+++ b/spring-context/src/test/kotlin/org/springframework/cache/CacheManagerExtensionsTest.kt
@@ -1,3 +1,19 @@
+/*
+ * 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.cache
 
 import org.junit.jupiter.api.Assertions.assertNotEquals
@@ -12,5 +28,6 @@ class CacheManagerExtensionsTest {
 		assertNotEquals(null, cm["c"])
 	}
 
-	private fun createCacheManager(cacheName: String = "c"): CacheManager = ConcurrentMapCacheManager(cacheName)
+	private fun createCacheManager(cacheName: String = "c"): CacheManager =
+		ConcurrentMapCacheManager(cacheName)
 }
\ No newline at end of file

From b77b45434f5c8fd73be39ffe5b1e52ebc641411b Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Thu, 2 Dec 2021 15:11:15 +0100
Subject: [PATCH 409/735] Change createException to createError

See gh-27645
---
 .../springframework/web/reactive/function/client/WebClient.java | 2 +-
 src/docs/asciidoc/web/webflux-webclient.adoc                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index 9097000ccc60..530324d42b64 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -530,7 +530,7 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 *             return response.bodyToMono(ErrorContainer.class);
 		 *         }
 		 *         else {
-		 *             return response.createException();
+		 *             return response.createError();
 		 *         }
 		 *     });
 		 * </pre>
diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index 3c2d18c56129..d07ff5b3514b 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -559,7 +559,7 @@ depending on the response status:
 				}
 				else {
 					// Turn to error
-					return response.createException();
+					return response.createError();
 				}
 			});
 ----

From be6eeafe78194f9ca7cbf871310674e5188466e3 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Thu, 2 Dec 2021 15:59:51 +0100
Subject: [PATCH 410/735] Revert change createException to createError

createError is not available in 5.3.

See gh-27645
---
 .../springframework/web/reactive/function/client/WebClient.java | 2 +-
 src/docs/asciidoc/web/webflux-webclient.adoc                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index 530324d42b64..9097000ccc60 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -530,7 +530,7 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 *             return response.bodyToMono(ErrorContainer.class);
 		 *         }
 		 *         else {
-		 *             return response.createError();
+		 *             return response.createException();
 		 *         }
 		 *     });
 		 * </pre>
diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index d07ff5b3514b..3c2d18c56129 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -559,7 +559,7 @@ depending on the response status:
 				}
 				else {
 					// Turn to error
-					return response.createError();
+					return response.createException();
 				}
 			});
 ----

From 5649a6f8ef335735480616cbeb4dd87efb371adf Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 3 Dec 2021 09:21:21 +0000
Subject: [PATCH 411/735] Update exchangeToMono Javadoc

This time showing a more representative example.

See gh-27645
---
 .../web/reactive/function/client/WebClient.java    | 14 ++++----------
 src/docs/asciidoc/web/webflux-webclient.adoc       | 11 ++---------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index 9097000ccc60..1df8c06ffbaa 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -519,18 +519,15 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 * scenarios, for example to decode the response differently depending
 		 * on the response status:
 		 * <p><pre>
-		 * Mono&lt;Object&gt; entityMono = client.get()
+		 * Mono&lt;Person&gt; entityMono = client.get()
 		 *     .uri("/persons/1")
 		 *     .accept(MediaType.APPLICATION_JSON)
 		 *     .exchangeToMono(response -&gt; {
 		 *         if (response.statusCode().equals(HttpStatus.OK)) {
 		 *             return response.bodyToMono(Person.class);
 		 *         }
-		 *         else if (response.statusCode().is4xxClientError()) {
-		 *             return response.bodyToMono(ErrorContainer.class);
-		 *         }
 		 *         else {
-		 *             return response.createException();
+		 *             return response.createException().flatMap(Mono::error);
 		 *         }
 		 *     });
 		 * </pre>
@@ -551,18 +548,15 @@ interface RequestHeadersSpec<S extends RequestHeadersSpec<S>> {
 		 * scenarios, for example to decode the response differently depending
 		 * on the response status:
 		 * <p><pre>
-		 * Mono&lt;Object&gt; entityMono = client.get()
+		 * Flux&lt;Person&gt; entityMono = client.get()
 		 *     .uri("/persons")
 		 *     .accept(MediaType.APPLICATION_JSON)
 		 *     .exchangeToFlux(response -&gt; {
 		 *         if (response.statusCode().equals(HttpStatus.OK)) {
 		 *             return response.bodyToFlux(Person.class);
 		 *         }
-		 *         else if (response.statusCode().is4xxClientError()) {
-		 *             return response.bodyToMono(ErrorContainer.class).flux();
-		 *         }
 		 *         else {
-		 *             return response.createException().flux();
+		 *             return response.createException().flatMapMany(Mono::error);
 		 *         }
 		 *     });
 		 * </pre>
diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc
index 3c2d18c56129..e93d1214046e 100644
--- a/src/docs/asciidoc/web/webflux-webclient.adoc
+++ b/src/docs/asciidoc/web/webflux-webclient.adoc
@@ -546,20 +546,16 @@ depending on the response status:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	Mono<Object> entityMono = client.get()
+	Mono<Person> entityMono = client.get()
 			.uri("/persons/1")
 			.accept(MediaType.APPLICATION_JSON)
 			.exchangeToMono(response -> {
 				if (response.statusCode().equals(HttpStatus.OK)) {
 					return response.bodyToMono(Person.class);
 				}
-				else if (response.statusCode().is4xxClientError()) {
-					// Suppress error status code
-					return response.bodyToMono(ErrorContainer.class);
-				}
 				else {
 					// Turn to error
-					return response.createException();
+					return response.createException().flatMap(Mono::error);
 				}
 			});
 ----
@@ -573,9 +569,6 @@ val entity = client.get()
 		if (response.statusCode() == HttpStatus.OK) {
 			 return response.awaitBody<Person>()
 		}
-		else if (response.statusCode().is4xxClientError) {
-			 return response.awaitBody<ErrorContainer>()
-		}
 		else {
 			 throw response.createExceptionAndAwait()
 		}

From 65eceafeee0712ba09496b740e60cc666f27e6eb Mon Sep 17 00:00:00 2001
From: Kazuki Shimizu <kazuki43zoo@gmail.com>
Date: Sat, 22 Oct 2016 16:27:04 +0900
Subject: [PATCH 412/735] Add support for YearMonth and MonthDay in
 @DateTimeFormat

See gh-1215
---
 ...eTimeFormatAnnotationFormatterFactory.java |  5 +++
 .../standard/TemporalAccessorParser.java      | 11 +++++
 .../standard/DateTimeFormattingTests.java     | 43 +++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
index a1fd17fe21fb..e7f96dc1183c 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
@@ -21,6 +21,8 @@
 import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
+import java.time.MonthDay;
+import java.time.YearMonth;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAccessor;
@@ -43,6 +45,7 @@
  *
  * @author Juergen Hoeller
  * @author Sam Brannen
+ * @author Kazuki Shimizu
  * @since 4.0
  * @see org.springframework.format.annotation.DateTimeFormat
  */
@@ -60,6 +63,8 @@ public class Jsr310DateTimeFormatAnnotationFormatterFactory extends EmbeddedValu
 		fieldTypes.add(ZonedDateTime.class);
 		fieldTypes.add(OffsetDateTime.class);
 		fieldTypes.add(OffsetTime.class);
+		fieldTypes.add(YearMonth.class);
+		fieldTypes.add(MonthDay.class);
 		FIELD_TYPES = Collections.unmodifiableSet(fieldTypes);
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java
index b8dd20fe0191..cea8340132d2 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java
@@ -20,8 +20,10 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.MonthDay;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
+import java.time.YearMonth;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -38,6 +40,7 @@
  *
  * @author Juergen Hoeller
  * @author Sam Brannen
+ * @author Kazuki Shimizu
  * @since 4.0
  * @see DateTimeContextHolder#getFormatter
  * @see java.time.LocalDate#parse(CharSequence, java.time.format.DateTimeFormatter)
@@ -46,6 +49,8 @@
  * @see java.time.ZonedDateTime#parse(CharSequence, java.time.format.DateTimeFormatter)
  * @see java.time.OffsetDateTime#parse(CharSequence, java.time.format.DateTimeFormatter)
  * @see java.time.OffsetTime#parse(CharSequence, java.time.format.DateTimeFormatter)
+ * @see java.time.YearMonth#parse(CharSequence, java.time.format.DateTimeFormatter)
+ * @see java.time.MonthDay#parse(CharSequence, java.time.format.DateTimeFormatter)
  */
 public final class TemporalAccessorParser implements Parser<TemporalAccessor> {
 
@@ -128,6 +133,12 @@ else if (OffsetDateTime.class == this.temporalAccessorType) {
 		else if (OffsetTime.class == this.temporalAccessorType) {
 			return OffsetTime.parse(text, formatterToUse);
 		}
+		else if (YearMonth.class == this.temporalAccessorType) {
+			return YearMonth.parse(text, formatterToUse);
+		}
+		else if (MonthDay.class == this.temporalAccessorType) {
+			return MonthDay.parse(text, formatterToUse);
+		}
 		else {
 			throw new IllegalStateException("Unsupported TemporalAccessor type: " + this.temporalAccessorType);
 		}
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
index 23a62770fdf3..d16483b7686d 100644
--- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
+++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
@@ -64,6 +64,7 @@
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @author Sam Brannen
+ * @author Kazuki Shimizu
  */
 class DateTimeFormattingTests {
 
@@ -467,6 +468,16 @@ void testBindYearMonth() {
 		assertThat(binder.getBindingResult().getFieldValue("yearMonth").toString().equals("2007-12")).isTrue();
 	}
 
+	@Test
+	public void testBindYearMonthAnnotatedPattern() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.add("yearMonthAnnotatedPattern", "12/2007");
+		binder.bind(propertyValues);
+		assertEquals(0, binder.getBindingResult().getErrorCount());
+		assertTrue(binder.getBindingResult().getFieldValue("yearMonthAnnotatedPattern").toString().equals("12/2007"));
+		assertEquals(YearMonth.parse("2007-12"), binder.getBindingResult().getRawFieldValue("yearMonthAnnotatedPattern"));
+	}
+
 	@Test
 	void testBindMonthDay() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
@@ -557,6 +568,16 @@ void patternLocalDateWithUnsupportedPattern() {
 		}
 	}
 
+	@Test
+	public void testBindMonthDayAnnotatedPattern() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.add("monthDayAnnotatedPattern", "1/3");
+		binder.bind(propertyValues);
+		assertEquals(0, binder.getBindingResult().getErrorCount());
+		assertTrue(binder.getBindingResult().getFieldValue("monthDayAnnotatedPattern").toString().equals("1/3"));
+		assertEquals(MonthDay.parse("--01-03"), binder.getBindingResult().getRawFieldValue("monthDayAnnotatedPattern"));
+	}
+
 
 	public static class DateTimeBean {
 
@@ -611,6 +632,12 @@ public static class DateTimeBean {
 
 		private YearMonth yearMonth;
 
+		@DateTimeFormat(pattern="MM/uuuu")
+		private YearMonth yearMonthAnnotatedPattern;
+
+		@DateTimeFormat(pattern="M/d")
+		private MonthDay monthDayAnnotatedPattern;
+
 		private MonthDay monthDay;
 
 		private final List<DateTimeBean> children = new ArrayList<>();
@@ -775,6 +802,14 @@ public void setYearMonth(YearMonth yearMonth) {
 			this.yearMonth = yearMonth;
 		}
 
+		public YearMonth getYearMonthAnnotatedPattern() {
+			return yearMonthAnnotatedPattern;
+		}
+
+		public void setYearMonthAnnotatedPattern(YearMonth yearMonthAnnotatedPattern) {
+			this.yearMonthAnnotatedPattern = yearMonthAnnotatedPattern;
+		}
+
 		public MonthDay getMonthDay() {
 			return this.monthDay;
 		}
@@ -783,6 +818,14 @@ public void setMonthDay(MonthDay monthDay) {
 			this.monthDay = monthDay;
 		}
 
+		public MonthDay getMonthDayAnnotatedPattern() {
+			return monthDayAnnotatedPattern;
+		}
+
+		public void setMonthDayAnnotatedPattern(MonthDay monthDayAnnotatedPattern) {
+			this.monthDayAnnotatedPattern = monthDayAnnotatedPattern;
+		}
+
 		public List<DateTimeBean> getChildren() {
 			return this.children;
 		}

From a57ea39707be88862d81cb6aa409f5f56dc63458 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 3 Dec 2021 11:12:45 +0100
Subject: [PATCH 413/735] Polish "Add support for YearMonth and MonthDay in
 @DateTimeFormat"

See gh-1215
---
 ...eTimeFormatAnnotationFormatterFactory.java |  3 +-
 .../standard/DateTimeFormattingTests.java     | 30 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
index e7f96dc1183c..4c112bfc27fa 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
@@ -19,9 +19,9 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.MonthDay;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
-import java.time.MonthDay;
 import java.time.YearMonth;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -68,7 +68,6 @@ public class Jsr310DateTimeFormatAnnotationFormatterFactory extends EmbeddedValu
 		FIELD_TYPES = Collections.unmodifiableSet(fieldTypes);
 	}
 
-
 	@Override
 	public final Set<Class<?>> getFieldTypes() {
 		return FIELD_TYPES;
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
index d16483b7686d..1fe57b428c5a 100644
--- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
+++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
@@ -473,9 +473,9 @@ public void testBindYearMonthAnnotatedPattern() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
 		propertyValues.add("yearMonthAnnotatedPattern", "12/2007");
 		binder.bind(propertyValues);
-		assertEquals(0, binder.getBindingResult().getErrorCount());
-		assertTrue(binder.getBindingResult().getFieldValue("yearMonthAnnotatedPattern").toString().equals("12/2007"));
-		assertEquals(YearMonth.parse("2007-12"), binder.getBindingResult().getRawFieldValue("yearMonthAnnotatedPattern"));
+		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
+		assertThat(binder.getBindingResult().getFieldValue("yearMonthAnnotatedPattern")).isEqualTo("12/2007");
+		assertThat(binder.getBindingResult().getRawFieldValue("yearMonthAnnotatedPattern")).isEqualTo(YearMonth.parse("2007-12"));
 	}
 
 	@Test
@@ -487,6 +487,16 @@ void testBindMonthDay() {
 		assertThat(binder.getBindingResult().getFieldValue("monthDay").toString().equals("--12-03")).isTrue();
 	}
 
+	@Test
+	public void testBindMonthDayAnnotatedPattern() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.add("monthDayAnnotatedPattern", "1/3");
+		binder.bind(propertyValues);
+		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
+		assertThat(binder.getBindingResult().getFieldValue("monthDayAnnotatedPattern")).isEqualTo("1/3");
+		assertThat(binder.getBindingResult().getRawFieldValue("monthDayAnnotatedPattern")).isEqualTo(MonthDay.parse("--01-03"));
+	}
+
 	@Nested
 	class FallbackPatternTests {
 
@@ -568,16 +578,6 @@ void patternLocalDateWithUnsupportedPattern() {
 		}
 	}
 
-	@Test
-	public void testBindMonthDayAnnotatedPattern() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("monthDayAnnotatedPattern", "1/3");
-		binder.bind(propertyValues);
-		assertEquals(0, binder.getBindingResult().getErrorCount());
-		assertTrue(binder.getBindingResult().getFieldValue("monthDayAnnotatedPattern").toString().equals("1/3"));
-		assertEquals(MonthDay.parse("--01-03"), binder.getBindingResult().getRawFieldValue("monthDayAnnotatedPattern"));
-	}
-
 
 	public static class DateTimeBean {
 
@@ -635,11 +635,11 @@ public static class DateTimeBean {
 		@DateTimeFormat(pattern="MM/uuuu")
 		private YearMonth yearMonthAnnotatedPattern;
 
+		private MonthDay monthDay;
+
 		@DateTimeFormat(pattern="M/d")
 		private MonthDay monthDayAnnotatedPattern;
 
-		private MonthDay monthDay;
-
 		private final List<DateTimeBean> children = new ArrayList<>();
 
 

From 69df27a99ff191cbdfc9ecf7c19f3ac3e87888af Mon Sep 17 00:00:00 2001
From: Ingmar van Dijk <ingmar.van.dijk@philips.com>
Date: Mon, 6 Jul 2020 09:13:07 +0200
Subject: [PATCH 414/735] Throw 404 ResponseStatusException when no routes
 found

This commit makes it possible to customize 404 responses generated by
RouterFunctionWebHandler, by throwing an ResponseStatusException
instead of returning a standard 404 response.

See gh-25358
---
 .../function/server/RouterFunctions.java      | 12 +++-------
 .../function/server/RouterFunctionsTests.java | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
index 30157153d4ae..8b241f70cd9b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
@@ -32,10 +32,12 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.Resource;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.codec.HttpMessageWriter;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.result.view.ViewResolver;
+import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
@@ -1231,9 +1233,6 @@ public List<ViewResolver> viewResolvers() {
 
 	private static class RouterFunctionWebHandler implements WebHandler {
 
-		private static final HandlerFunction<ServerResponse> NOT_FOUND_HANDLER =
-				request -> ServerResponse.notFound().build();
-
 		private final HandlerStrategies strategies;
 
 		private final RouterFunction<?> routerFunction;
@@ -1249,7 +1248,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {
 				ServerRequest request = new DefaultServerRequest(exchange, this.strategies.messageReaders());
 				addAttributes(exchange, request);
 				return this.routerFunction.route(request)
-						.defaultIfEmpty(notFound())
+						.switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)))
 						.flatMap(handlerFunction -> wrapException(() -> handlerFunction.handle(request)))
 						.flatMap(response -> wrapException(() -> response.writeTo(exchange,
 								new HandlerStrategiesResponseContext(this.strategies))));
@@ -1261,11 +1260,6 @@ private void addAttributes(ServerWebExchange exchange, ServerRequest request) {
 			attributes.put(REQUEST_ATTRIBUTE, request);
 		}
 
-		@SuppressWarnings("unchecked")
-		private static <T extends ServerResponse> HandlerFunction<T> notFound() {
-			return (HandlerFunction<T>) NOT_FOUND_HANDLER;
-		}
-
 		private static <T> Mono<T> wrapException(Supplier<Mono<T>> supplier) {
 			try {
 				return supplier.get();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
index 46b29bdf6cd4..ad6bfbdca9f7 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
@@ -16,14 +16,17 @@
 
 package org.springframework.web.reactive.function.server;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseCookie;
@@ -191,6 +194,27 @@ public void toHttpHandlerHandlerResponseStatusException() {
 		assertThat(httpResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
+	@Test
+	public void toHttpHandlerRouteNotFoundReturnsResponseStatusException() {
+		HandlerFunction<ServerResponse> handlerFunction = request -> ServerResponse.accepted().build();
+		RouterFunction<ServerResponse> routerFunction =
+				RouterFunctions.route(RequestPredicates.GET("/path"), handlerFunction);
+
+		HandlerStrategies handlerStrategies = HandlerStrategies.empty().exceptionHandler((exchange, ex) -> {
+			exchange.getResponse().setStatusCode(HttpStatus.NOT_FOUND);
+			DataBuffer buffer = exchange.getResponse().bufferFactory().wrap("Custom response".getBytes(StandardCharsets.UTF_8));
+			return exchange.getResponse().writeWith(Flux.just(buffer));
+		}).build();
+		HttpHandler result = RouterFunctions.toHttpHandler(routerFunction, handlerStrategies);
+		assertThat(result).isNotNull();
+
+		MockServerHttpRequest httpRequest = MockServerHttpRequest.get("https://localhost").build();
+		MockServerHttpResponse httpResponse = new MockServerHttpResponse();
+		result.handle(httpRequest, httpResponse).block();
+		assertThat(httpResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+		assertThat(httpResponse.getBodyAsString().block()).isEqualTo("Custom response");
+	}
+
 	@Test
 	public void toHttpHandlerHandlerReturnResponseStatusExceptionInResponseWriteTo() {
 		HandlerFunction<ServerResponse> handlerFunction =

From b84fe99d07f9cb1261950121e8da7133bc645302 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Fri, 3 Dec 2021 12:00:23 +0100
Subject: [PATCH 415/735] Polish "Throw 404 ResponseStatusException when no
 routes found"

See gh-25358
---
 .../web/reactive/function/server/RouterFunctions.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
index 8b241f70cd9b..739fc17a1c33 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
@@ -1248,7 +1248,7 @@ public Mono<Void> handle(ServerWebExchange exchange) {
 				ServerRequest request = new DefaultServerRequest(exchange, this.strategies.messageReaders());
 				addAttributes(exchange, request);
 				return this.routerFunction.route(request)
-						.switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND)))
+						.switchIfEmpty(createNotFoundError())
 						.flatMap(handlerFunction -> wrapException(() -> handlerFunction.handle(request)))
 						.flatMap(response -> wrapException(() -> response.writeTo(exchange,
 								new HandlerStrategiesResponseContext(this.strategies))));
@@ -1260,6 +1260,11 @@ private void addAttributes(ServerWebExchange exchange, ServerRequest request) {
 			attributes.put(REQUEST_ATTRIBUTE, request);
 		}
 
+		private <R> Mono<R> createNotFoundError() {
+			return Mono.defer(() -> Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND,
+					"No matching router function")));
+		}
+
 		private static <T> Mono<T> wrapException(Supplier<Mono<T>> supplier) {
 			try {
 				return supplier.get();

From 110e0f7f2b0a07699a96bf6410299d95635b2f63 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 3 Dec 2021 16:17:52 +0100
Subject: [PATCH 416/735] Add support for Instant in @DateTimeFormat

Closes gh-19846
---
 ...eTimeFormatAnnotationFormatterFactory.java |  2 ++
 .../standard/TemporalAccessorParser.java      |  6 +++++-
 .../standard/DateTimeFormattingTests.java     | 20 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
index 4c112bfc27fa..da3afad60454 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
@@ -16,6 +16,7 @@
 
 package org.springframework.format.datetime.standard;
 
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -57,6 +58,7 @@ public class Jsr310DateTimeFormatAnnotationFormatterFactory extends EmbeddedValu
 	static {
 		// Create the set of field types that may be annotated with @DateTimeFormat.
 		Set<Class<?>> fieldTypes = new HashSet<>(8);
+		fieldTypes.add(Instant.class);
 		fieldTypes.add(LocalDate.class);
 		fieldTypes.add(LocalTime.class);
 		fieldTypes.add(LocalDateTime.class);
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java
index cea8340132d2..ef9cd0a8c053 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java
@@ -17,6 +17,7 @@
 package org.springframework.format.datetime.standard;
 
 import java.text.ParseException;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -115,7 +116,10 @@ public TemporalAccessor parse(String text, Locale locale) throws ParseException
 
 	private TemporalAccessor doParse(String text, Locale locale, DateTimeFormatter formatter) throws DateTimeParseException {
 		DateTimeFormatter formatterToUse = DateTimeContextHolder.getFormatter(formatter, locale);
-		if (LocalDate.class == this.temporalAccessorType) {
+		if (Instant.class == this.temporalAccessorType) {
+			return formatterToUse.parse(text, Instant::from);
+		}
+		else if (LocalDate.class == this.temporalAccessorType) {
 			return LocalDate.parse(text, formatterToUse);
 		}
 		else if (LocalTime.class == this.temporalAccessorType) {
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
index 1fe57b428c5a..d133522024a9 100644
--- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
+++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
@@ -397,6 +397,15 @@ void testBindInstant() {
 		assertThat(binder.getBindingResult().getFieldValue("instant").toString().startsWith("2009-10-31T12:00")).isTrue();
 	}
 
+	@Test
+	void testBindInstantAnnotated() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.add("styleInstant", "2017-02-21T13:00");
+		binder.bind(propertyValues);
+		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
+		assertThat(binder.getBindingResult().getFieldValue("styleInstant")).isEqualTo("2017-02-21T13:00");
+	}
+
 	@Test
 	@SuppressWarnings("deprecation")
 	void testBindInstantFromJavaUtilDate() {
@@ -622,6 +631,9 @@ public static class DateTimeBean {
 
 		private Instant instant;
 
+		@DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+		private Instant styleInstant;
+
 		private Period period;
 
 		private Duration duration;
@@ -762,6 +774,14 @@ public void setInstant(Instant instant) {
 			this.instant = instant;
 		}
 
+		public Instant getStyleInstant() {
+			return this.styleInstant;
+		}
+
+		public void setStyleInstant(Instant styleInstant) {
+			this.styleInstant = styleInstant;
+		}
+
 		public Period getPeriod() {
 			return this.period;
 		}

From 70974e006e0263d8c7f8a35c5ee6b743523cafe7 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 3 Dec 2021 22:32:00 +0100
Subject: [PATCH 417/735] Upgrade to Tomcat 9.0.55, Undertow 2.2.13, RxJava
 3.1.3, SmallRye Mutiny 1.2, Joda-Time 2.10.13, JRuby 9.2.20.1, HtmlUnit 2.55,
 Checkstyle 9.2

---
 build.gradle                                  | 20 +++++++++----------
 .../upgrade/TomcatRequestUpgradeStrategy.java |  1 +
 .../TomcatRequestUpgradeStrategy.java         |  3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 90251e0e8fac..ff029ad98709 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,8 +67,8 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
-			dependency "io.smallrye.reactive:mutiny:1.1.1"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.3"
+			dependency "io.smallrye.reactive:mutiny:1.2.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
@@ -128,18 +128,18 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.54') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.55') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.54') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.55') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.12.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.13.Final') {
 				entry 'undertow-core'
 				entry('undertow-websockets-jsr') {
 					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
@@ -164,7 +164,7 @@ configure(allprojects) { project ->
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
 			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9"
 
-			dependency "org.jruby:jruby:9.2.19.0"
+			dependency "org.jruby:jruby:9.2.20.1"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"
 
@@ -206,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.54.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.55.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.54.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.55.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -237,7 +237,7 @@ configure(allprojects) { project ->
 
 			dependency "com.ibm.websphere:uow:6.0.2.17"
 			dependency "com.jamonapi:jamon:2.82"
-			dependency "joda-time:joda-time:2.10.10"
+			dependency "joda-time:joda-time:2.10.13"
 			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.9"
 			dependency "org.javamoney:moneta:1.3"
 
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "9.0"
+		toolVersion = "9.2"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
index f918410dd5ee..1d2c641c9bea 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
@@ -123,6 +123,7 @@ public Integer getMaxBinaryMessageBufferSize() {
 	}
 
 
+	@SuppressWarnings("deprecation")  // for old doUpgrade variant in Tomcat 9.0.55
 	@Override
 	public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
 			@Nullable String subProtocol, Supplier<HandshakeInfo> handshakeInfoFactory){
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java
index c3c6a191609d..4f685ad372bd 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ public String[] getSupportedVersions() {
 		return new String[] {"13"};
 	}
 
+	@SuppressWarnings("deprecation")  // for old doUpgrade variant in Tomcat 9.0.55
 	@Override
 	public void upgradeInternal(ServerHttpRequest request, ServerHttpResponse response,
 			@Nullable String selectedProtocol, List<Extension> selectedExtensions, Endpoint endpoint)

From 7c834d98c2037b5cca0b1de461545b7de1b2db6c Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 3 Dec 2021 22:32:26 +0100
Subject: [PATCH 418/735] Upgrade to ASM master (including early support for
 Java 19 bytecode)

Closes gh-27740
---
 .../src/main/java/org/springframework/asm/ClassReader.java      | 2 +-
 spring-core/src/main/java/org/springframework/asm/Opcodes.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/ClassReader.java b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
index e5c2113993ff..1b14e0e02a38 100644
--- a/spring-core/src/main/java/org/springframework/asm/ClassReader.java
+++ b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
@@ -194,7 +194,7 @@ public ClassReader(
     this.b = classFileBuffer;
     // Check the class' major_version. This field is after the magic and minor_version fields, which
     // use 4 and 2 bytes respectively.
-    if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V18) {
+    if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V19) {
       throw new IllegalArgumentException(
           "Unsupported class file major version " + readShort(classFileOffset + 6));
     }
diff --git a/spring-core/src/main/java/org/springframework/asm/Opcodes.java b/spring-core/src/main/java/org/springframework/asm/Opcodes.java
index fbd0c4db640e..dc7bbce285c2 100644
--- a/spring-core/src/main/java/org/springframework/asm/Opcodes.java
+++ b/spring-core/src/main/java/org/springframework/asm/Opcodes.java
@@ -283,6 +283,7 @@ public interface Opcodes {
   int V16 = 0 << 16 | 60;
   int V17 = 0 << 16 | 61;
   int V18 = 0 << 16 | 62;
+  int V19 = 0 << 16 | 63;
 
   /**
    * Version flag indicating that the class is using 'preview' features.

From d7e0eed8d26ab0dc882d2bd2257b805f2a4a5f37 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 3 Dec 2021 22:33:50 +0100
Subject: [PATCH 419/735] Clarify getBeanProvider(ResolvableType) semantics for
 unresolved generics

Closes gh-27727
---
 .../springframework/beans/factory/BeanFactory.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
index e9108e828f54..93c909e047b6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
@@ -214,6 +214,7 @@ public interface BeanFactory {
 	/**
 	 * Return a provider for the specified bean, allowing for lazy on-demand retrieval
 	 * of instances, including availability and uniqueness options.
+	 * <p>For matching a generic type, consider {@link #getBeanProvider(ResolvableType)}.
 	 * @param requiredType type the bean must match; can be an interface or superclass
 	 * @return a corresponding provider handle
 	 * @since 5.1
@@ -223,13 +224,20 @@ public interface BeanFactory {
 
 	/**
 	 * Return a provider for the specified bean, allowing for lazy on-demand retrieval
-	 * of instances, including availability and uniqueness options.
-	 * @param requiredType type the bean must match; can be a generic type declaration.
-	 * Note that collection types are not supported here, in contrast to reflective
+	 * of instances, including availability and uniqueness options. This variant allows
+	 * for specifying a generic type to match, similar to reflective injection points
+	 * with generic type declarations in method/constructor parameters.
+	 * <p>Note that collections of beans are not supported here, in contrast to reflective
 	 * injection points. For programmatically retrieving a list of beans matching a
 	 * specific type, specify the actual bean type as an argument here and subsequently
 	 * use {@link ObjectProvider#orderedStream()} or its lazy streaming/iteration options.
+	 * <p>Also, generics matching is strict here, as per the Java assignment rules.
+	 * For lenient fallback matching with unchecked semantics (similar to the ´unchecked´
+	 * Java compiler warning), consider calling {@link #getBeanProvider(Class)} with the
+	 * raw type as a second step if no full generic match is
+	 * {@link ObjectProvider#getIfAvailable() available} with this variant.
 	 * @return a corresponding provider handle
+	 * @param requiredType type the bean must match; can be a generic type declaration
 	 * @since 5.1
 	 * @see ObjectProvider#iterator()
 	 * @see ObjectProvider#stream()

From 14f24f43d7a3da9796cdbe50dbb06b60e2278644 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 3 Dec 2021 22:36:31 +0100
Subject: [PATCH 420/735] Polishing

---
 .../InstantiationAwareBeanPostProcessor.java  |  6 ++---
 ...AbstractFallbackJCacheOperationSource.java |  4 ++--
 .../AbstractFallbackCacheOperationSource.java |  4 ++--
 .../ThreadPoolExecutorFactoryBean.java        |  4 +---
 .../client/match/ContentRequestMatchers.java  |  4 ++--
 ...actFallbackTransactionAttributeSource.java |  4 ++--
 .../AbstractListenerWriteProcessor.java       |  2 +-
 .../web/filter/DelegatingFilterProxy.java     | 22 ++++++++-----------
 .../web/filter/OncePerRequestFilter.java      |  4 +---
 .../MediaTypeNotSupportedStatusException.java |  4 ++--
 .../util/ContentCachingRequestWrapper.java    |  1 -
 .../handler/HandlerMappingIntrospector.java   | 15 ++++++-------
 12 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
index c4e21122ed81..03e192e72e4c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,9 +34,7 @@
  *
  * <p><b>NOTE:</b> This interface is a special purpose interface, mainly for
  * internal use within the framework. It is recommended to implement the plain
- * {@link BeanPostProcessor} interface as far as possible, or to derive from
- * {@link InstantiationAwareBeanPostProcessorAdapter} in order to be shielded
- * from extensions to this interface.
+ * {@link BeanPostProcessor} interface as far as possible.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
index 3edf2a2c153a..8b20e4b14822 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public JCacheOperation<?> getCacheOperation(Method method, @Nullable Class<?> ta
 
 	@Nullable
 	private JCacheOperation<?> computeCacheOperation(Method method, @Nullable Class<?> targetClass) {
-		// Don't allow no-public methods as required.
+		// Don't allow non-public methods, as configured.
 		if (allowPublicMethodsOnly() && !Modifier.isPublic(method.getModifiers())) {
 			return null;
 		}
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
index 8de528875fb2..d20993ae27a7 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ protected Object getCacheKey(Method method, @Nullable Class<?> targetClass) {
 
 	@Nullable
 	private Collection<CacheOperation> computeCacheOperations(Method method, @Nullable Class<?> targetClass) {
-		// Don't allow no-public methods as required.
+		// Don't allow non-public methods, as configured.
 		if (allowPublicMethodsOnly() && !Modifier.isPublic(method.getModifiers())) {
 			return null;
 		}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
index d95fef71f22a..3a853297b397 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
@@ -26,9 +26,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
 
 /**
@@ -65,7 +63,7 @@
  */
 @SuppressWarnings("serial")
 public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
-		implements FactoryBean<ExecutorService>, InitializingBean, DisposableBean {
+		implements FactoryBean<ExecutorService> {
 
 	private int corePoolSize = 1;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index ec883b02a41c..fed5808a1ff2 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -193,7 +193,7 @@ private RequestMatcher formData(MultiValueMap<String, String> expectedMap, boole
 	 * <li>{@link Resource} - content from a file
 	 * <li>{@code byte[]} - other raw content
 	 * </ul>
-	 * <p><strong>Note:</strong> This method uses the Apache Commons File Upload
+	 * <p><strong>Note:</strong> This method uses the Apache Commons FileUpload
 	 * library to parse the multipart data and it must be on the test classpath.
 	 * @param expectedMap the expected multipart values
 	 * @since 5.3
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
index 80983806eded..c19cf2c10670 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -163,7 +163,7 @@ protected Object getCacheKey(Method method, @Nullable Class<?> targetClass) {
 	 */
 	@Nullable
 	protected TransactionAttribute computeTransactionAttribute(Method method, @Nullable Class<?> targetClass) {
-		// Don't allow no-public methods as required.
+		// Don't allow non-public methods, as configured.
 		if (allowPublicMethodsOnly() && !Modifier.isPublic(method.getModifiers())) {
 			return null;
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
index 92d7b41846b5..e94e3dcc334c 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
@@ -254,7 +254,7 @@ protected void dataReceived(T data) {
 	 * the next item from the upstream, write Publisher.
 	 * <p>The default implementation is a no-op.
 	 * @deprecated originally introduced for Undertow to stop write notifications
-	 * when no data is available, but deprecated as of as of 5.0.6 since constant
+	 * when no data is available, but deprecated as of 5.0.6 since constant
 	 * switching on every requested item causes a significant slowdown.
 	 */
 	@Deprecated
diff --git a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
index bfbe62739dce..0dbc22408240 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,9 +54,9 @@
  * of the {@code Filter.init} and {@code Filter.destroy} lifecycle methods
  * on the target bean, letting the servlet container manage the filter lifecycle.
  *
- * <p>As of Spring 3.1, {@code DelegatingFilterProxy} has been updated to optionally accept
- * constructor parameters when using Servlet 3.0's instance-based filter registration
- * methods, usually in conjunction with Spring 3.1's
+ * <p>As of Spring 3.1, {@code DelegatingFilterProxy} has been updated to optionally
+ * accept constructor parameters when using a Servlet container's instance-based filter
+ * registration methods, usually in conjunction with Spring's
  * {@link org.springframework.web.WebApplicationInitializer} SPI. These constructors allow
  * for providing the delegate Filter bean directly, or providing the application context
  * and bean name to fetch, avoiding the need to look up the application context from the
@@ -100,8 +100,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
 
 
 	/**
-	 * Create a new {@code DelegatingFilterProxy}. For traditional (pre-Servlet 3.0) use
-	 * in {@code web.xml}.
+	 * Create a new {@code DelegatingFilterProxy}. For traditional use in {@code web.xml}.
 	 * @see #setTargetBeanName(String)
 	 */
 	public DelegatingFilterProxy() {
@@ -111,8 +110,7 @@ public DelegatingFilterProxy() {
 	 * Create a new {@code DelegatingFilterProxy} with the given {@link Filter} delegate.
 	 * Bypasses entirely the need for interacting with a Spring application context,
 	 * specifying the {@linkplain #setTargetBeanName target bean name}, etc.
-	 * <p>For use in Servlet 3.0+ environments where instance-based registration of
-	 * filters is supported.
+	 * <p>For use with instance-based registration of filters.
 	 * @param delegate the {@code Filter} instance that this proxy will delegate to and
 	 * manage the lifecycle for (must not be {@code null}).
 	 * @see #doFilter(ServletRequest, ServletResponse, FilterChain)
@@ -130,9 +128,8 @@ public DelegatingFilterProxy(Filter delegate) {
 	 * bean from the Spring {@code WebApplicationContext} found in the {@code ServletContext}
 	 * (either the 'root' application context or the context named by
 	 * {@link #setContextAttribute}).
-	 * <p>For use in Servlet 3.0+ environments where instance-based registration of
-	 * filters is supported.
-	 * <p>The target bean must implement the standard Servlet Filter.
+	 * <p>For use with instance-based registration of filters.
+	 * <p>The target bean must implement the standard Servlet Filter interface.
 	 * @param targetBeanName name of the target filter bean to look up in the Spring
 	 * application context (must not be {@code null}).
 	 * @see #findWebApplicationContext()
@@ -145,8 +142,7 @@ public DelegatingFilterProxy(String targetBeanName) {
 	/**
 	 * Create a new {@code DelegatingFilterProxy} that will retrieve the named target
 	 * bean from the given Spring {@code WebApplicationContext}.
-	 * <p>For use in Servlet 3.0+ environments where instance-based registration of
-	 * filters is supported.
+	 * <p>For use with instance-based registration of filters.
 	 * <p>The target bean must implement the standard Servlet Filter interface.
 	 * <p>The given {@code WebApplicationContext} may or may not be refreshed when passed
 	 * in. If it has not, and if the context implements {@link ConfigurableApplicationContext},
diff --git a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
index 0f5e1a3831ad..271560f930ca 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
@@ -98,12 +98,10 @@ public final void doFilter(ServletRequest request, ServletResponse response, Fil
 		boolean hasAlreadyFilteredAttribute = request.getAttribute(alreadyFilteredAttributeName) != null;
 
 		if (skipDispatch(httpRequest) || shouldNotFilter(httpRequest)) {
-
 			// Proceed without invoking this filter...
 			filterChain.doFilter(request, response);
 		}
 		else if (hasAlreadyFilteredAttribute) {
-
 			if (DispatcherType.ERROR.equals(request.getDispatcherType())) {
 				doFilterNestedErrorDispatch(httpRequest, httpResponse, filterChain);
 				return;
@@ -197,7 +195,7 @@ protected boolean shouldNotFilter(HttpServletRequest request) throws ServletExce
 	 * setting up thread locals or to perform final processing at the very end.
 	 * <p>Note that although a filter can be mapped to handle specific dispatcher
 	 * types via {@code web.xml} or in Java through the {@code ServletContext},
-	 * servlet containers may enforce different defaults with regards to
+	 * servlet containers may enforce different defaults with respect to
 	 * dispatcher types. This flag enforces the design intent of the filter.
 	 * <p>The default return value is "true", which means the filter will not be
 	 * invoked during subsequent async dispatches. If "false", the filter will
diff --git a/spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java b/spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
index 690e7a136b0f..f9cd1700a435 100644
--- a/spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
+++ b/spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
  * @author Rossen Stoyanchev
  * @since 5.0
  * @deprecated in favor of {@link UnsupportedMediaTypeStatusException},
- * with this class never thrown by Spring code and to be removed in 5.3
+ * with this class never thrown by Spring code and to be removed in 6.0
  */
 @Deprecated
 @SuppressWarnings("serial")
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
index faa0ccbf6431..104f762b4539 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
@@ -48,7 +48,6 @@
  * <p>Used e.g. by {@link org.springframework.web.filter.AbstractRequestLoggingFilter}.
  * Note: As of Spring Framework 5.0, this wrapper is built on the Servlet 3.1 API.
  *
- *
  * @author Juergen Hoeller
  * @author Brian Clozel
  * @since 4.1.3
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
index 81d38fb3b8c7..7ee392b3514a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
@@ -103,14 +103,6 @@ public HandlerMappingIntrospector(ApplicationContext context) {
 	}
 
 
-	/**
-	 * Return the configured or detected {@code HandlerMapping}s.
-	 */
-	public List<HandlerMapping> getHandlerMappings() {
-		return (this.handlerMappings != null ? this.handlerMappings : Collections.emptyList());
-	}
-
-
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
@@ -125,6 +117,13 @@ public void afterPropertiesSet() {
 		}
 	}
 
+	/**
+	 * Return the configured or detected {@code HandlerMapping}s.
+	 */
+	public List<HandlerMapping> getHandlerMappings() {
+		return (this.handlerMappings != null ? this.handlerMappings : Collections.emptyList());
+	}
+
 
 	/**
 	 * Find the {@link HandlerMapping} that would handle the given request and

From 68cf95f499f644eff2a535ce86a1a20d85f2204e Mon Sep 17 00:00:00 2001
From: liuzhifei <2679431923@qq.com>
Date: Fri, 19 Nov 2021 17:33:52 +0800
Subject: [PATCH 421/735] Use String::strip in StringUtils::trimWhitespace

See gh-27703
---
 .../org/springframework/util/StringUtils.java | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 313979e87e03..9f45c8bc2be6 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -224,18 +224,7 @@ public static String trimWhitespace(String str) {
 			return str;
 		}
 
-		int beginIndex = 0;
-		int endIndex = str.length() - 1;
-
-		while (beginIndex <= endIndex && Character.isWhitespace(str.charAt(beginIndex))) {
-			beginIndex++;
-		}
-
-		while (endIndex > beginIndex && Character.isWhitespace(str.charAt(endIndex))) {
-			endIndex--;
-		}
-
-		return str.substring(beginIndex, endIndex + 1);
+		return str.strip();
 	}
 
 	/**
@@ -272,11 +261,7 @@ public static String trimLeadingWhitespace(String str) {
 			return str;
 		}
 
-		int beginIdx = 0;
-		while (beginIdx < str.length() && Character.isWhitespace(str.charAt(beginIdx))) {
-			beginIdx++;
-		}
-		return str.substring(beginIdx);
+		return str.stripLeading();
 	}
 
 	/**
@@ -290,11 +275,7 @@ public static String trimTrailingWhitespace(String str) {
 			return str;
 		}
 
-		int endIdx = str.length() - 1;
-		while (endIdx >= 0 && Character.isWhitespace(str.charAt(endIdx))) {
-			endIdx--;
-		}
-		return str.substring(0, endIdx + 1);
+		return str.stripTrailing();
 	}
 
 	/**

From 81af7330f65bdf009c34f23489d7fd9a45376e3f Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Mon, 6 Dec 2021 13:33:30 +0100
Subject: [PATCH 422/735] Deprecate StringUtils::trimWhitespace and variants

This commits deprecates
- StringUtils::trimWhitespace in favor of String::strip
- StringUtils::trimLeadingWhitespace in favor of String::stripLeading
- StringUtils::trimTrailingWhitespace in favor of String::stripTrailing

Closes gh-27769
---
 .../aop/aspectj/AbstractAspectJAdvice.java       |  2 +-
 .../AspectJAdviceParameterNameDiscoverer.java    |  2 +-
 .../autoproxy/BeanNameAutoProxyCreator.java      |  3 +--
 .../support/AbstractRegexpMethodPointcut.java    |  5 ++---
 .../support/PropertiesBeanDefinitionReader.java  | 16 ++++++++--------
 .../xml/SimpleConstructorNamespaceHandler.java   |  4 ++--
 .../org/springframework/util/StringUtils.java    |  8 +++++++-
 .../springframework/util/StringUtilsTests.java   |  3 +++
 .../config/TxAdviceBeanDefinitionParser.java     |  4 ++--
 .../interceptor/TransactionAttributeEditor.java  |  2 +-
 10 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
index fdede934f586..02037e0400a0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
@@ -261,7 +261,7 @@ public void setArgumentNames(String argNames) {
 	public void setArgumentNamesFromStringArray(String... args) {
 		this.argumentNames = new String[args.length];
 		for (int i = 0; i < args.length; i++) {
-			this.argumentNames[i] = StringUtils.trimWhitespace(args[i]);
+			this.argumentNames[i] = args[i].strip();
 			if (!isVariableName(this.argumentNames[i])) {
 				throw new IllegalArgumentException(
 						"'argumentNames' property of AbstractAspectJAdvice contains an argument name '" +
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
index 9497eb30a266..13d21faab205 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
@@ -486,7 +486,7 @@ private void maybeExtractVariableNamesFromArgs(@Nullable String argsSpec, List<S
 		}
 		String[] tokens = StringUtils.tokenizeToStringArray(argsSpec, ",");
 		for (int i = 0; i < tokens.length; i++) {
-			tokens[i] = StringUtils.trimWhitespace(tokens[i]);
+			tokens[i] = tokens[i].strip();
 			String varName = maybeExtractVariableName(tokens[i]);
 			if (varName != null) {
 				varNames.add(varName);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
index 297ab0cd1f63..823961064347 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
@@ -25,7 +25,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.PatternMatchUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * Auto proxy creator that identifies beans to proxy via a list of names.
@@ -69,7 +68,7 @@ public void setBeanNames(String... beanNames) {
 		Assert.notEmpty(beanNames, "'beanNames' must not be empty");
 		this.beanNames = new ArrayList<>(beanNames.length);
 		for (String mappedName : beanNames) {
-			this.beanNames.add(StringUtils.trimWhitespace(mappedName));
+			this.beanNames.add(mappedName.strip());
 		}
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
index 9587e1164612..44f57669012f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
@@ -24,7 +24,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * Abstract base regular expression pointcut bean. JavaBean properties are:
@@ -81,7 +80,7 @@ public void setPatterns(String... patterns) {
 		Assert.notEmpty(patterns, "'patterns' must not be empty");
 		this.patterns = new String[patterns.length];
 		for (int i = 0; i < patterns.length; i++) {
-			this.patterns[i] = StringUtils.trimWhitespace(patterns[i]);
+			this.patterns[i] = patterns[i].strip();
 		}
 		initPatternRepresentation(this.patterns);
 	}
@@ -111,7 +110,7 @@ public void setExcludedPatterns(String... excludedPatterns) {
 		Assert.notEmpty(excludedPatterns, "'excludedPatterns' must not be empty");
 		this.excludedPatterns = new String[excludedPatterns.length];
 		for (int i = 0; i < excludedPatterns.length; i++) {
-			this.excludedPatterns[i] = StringUtils.trimWhitespace(excludedPatterns[i]);
+			this.excludedPatterns[i] = excludedPatterns[i].strip();
 		}
 		initExcludedPatternRepresentation(this.excludedPatterns);
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
index bb9f3bfcdc91..b12483a86102 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -428,31 +428,31 @@ protected void registerBeanDefinition(String beanName, Map<?, ?> map, String pre
 		int beginIndex = prefixWithSep.length();
 
 		for (Map.Entry<?, ?> entry : map.entrySet()) {
-			String key = StringUtils.trimWhitespace((String) entry.getKey());
+			String key = ((String) entry.getKey()).strip();
 			if (key.startsWith(prefixWithSep)) {
 				String property = key.substring(beginIndex);
 				if (CLASS_KEY.equals(property)) {
-					className = StringUtils.trimWhitespace((String) entry.getValue());
+					className = ((String) entry.getValue()).strip();
 				}
 				else if (PARENT_KEY.equals(property)) {
-					parent = StringUtils.trimWhitespace((String) entry.getValue());
+					parent = ((String) entry.getValue()).strip();
 				}
 				else if (ABSTRACT_KEY.equals(property)) {
-					String val = StringUtils.trimWhitespace((String) entry.getValue());
+					String val = ((String) entry.getValue()).strip();
 					isAbstract = TRUE_VALUE.equals(val);
 				}
 				else if (SCOPE_KEY.equals(property)) {
 					// Spring 2.0 style
-					scope = StringUtils.trimWhitespace((String) entry.getValue());
+					scope = ((String) entry.getValue()).strip();
 				}
 				else if (SINGLETON_KEY.equals(property)) {
 					// Spring 1.2 style
-					String val = StringUtils.trimWhitespace((String) entry.getValue());
+					String val = ((String) entry.getValue()).strip();
 					scope = (!StringUtils.hasLength(val) || TRUE_VALUE.equals(val) ?
 							BeanDefinition.SCOPE_SINGLETON : BeanDefinition.SCOPE_PROTOTYPE);
 				}
 				else if (LAZY_INIT_KEY.equals(property)) {
-					String val = StringUtils.trimWhitespace((String) entry.getValue());
+					String val = ((String) entry.getValue()).strip();
 					lazyInit = TRUE_VALUE.equals(val);
 				}
 				else if (property.startsWith(CONSTRUCTOR_ARG_PREFIX)) {
@@ -469,7 +469,7 @@ else if (property.endsWith(REF_SUFFIX)) {
 					// This isn't a real property, but a reference to another prototype
 					// Extract property name: property is of form dog(ref)
 					property = property.substring(0, property.length() - REF_SUFFIX.length());
-					String ref = StringUtils.trimWhitespace((String) entry.getValue());
+					String ref = ((String) entry.getValue()).strip();
 
 					// It doesn't matter if the referenced bean hasn't yet been registered:
 					// this will ensure that the reference is resolved at runtime.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
index f30852f97b6c..7806f96985a0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
@@ -79,8 +79,8 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 		if (node instanceof Attr attr) {
-			String argName = StringUtils.trimWhitespace(parserContext.getDelegate().getLocalName(attr));
-			String argValue = StringUtils.trimWhitespace(attr.getValue());
+			String argName = parserContext.getDelegate().getLocalName(attr).strip();
+			String argValue = attr.getValue().strip();
 
 			ConstructorArgumentValues cvs = definition.getBeanDefinition().getConstructorArgumentValues();
 			boolean ref = false;
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 9f45c8bc2be6..1b7a591faefd 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -218,7 +218,9 @@ public static boolean containsWhitespace(@Nullable String str) {
 	 * @param str the {@code String} to check
 	 * @return the trimmed {@code String}
 	 * @see java.lang.Character#isWhitespace
+	 * @deprecated in favor of {@link String#strip()}
 	 */
+	@Deprecated
 	public static String trimWhitespace(String str) {
 		if (!hasLength(str)) {
 			return str;
@@ -255,7 +257,9 @@ public static String trimAllWhitespace(String str) {
 	 * @param str the {@code String} to check
 	 * @return the trimmed {@code String}
 	 * @see java.lang.Character#isWhitespace
+	 * @deprecated in favor of {@link String#stripLeading()}
 	 */
+	@Deprecated
 	public static String trimLeadingWhitespace(String str) {
 		if (!hasLength(str)) {
 			return str;
@@ -269,7 +273,9 @@ public static String trimLeadingWhitespace(String str) {
 	 * @param str the {@code String} to check
 	 * @return the trimmed {@code String}
 	 * @see java.lang.Character#isWhitespace
+	 * @deprecated in favor of {@link String#stripTrailing()}
 	 */
+	@Deprecated
 	public static String trimTrailingWhitespace(String str) {
 		if (!hasLength(str)) {
 			return str;
@@ -843,7 +849,7 @@ private static Locale parseLocaleTokens(String localeString, String[] tokens) {
 			// code sans the separator between the country code and the variant.
 			int endIndexOfCountryCode = localeString.indexOf(country, language.length()) + country.length();
 			// Strip off any leading '_' and whitespace, what's left is the variant.
-			variant = trimLeadingWhitespace(localeString.substring(endIndexOfCountryCode));
+			variant = localeString.substring(endIndexOfCountryCode).stripLeading();
 			if (variant.startsWith("_")) {
 				variant = trimLeadingCharacter(variant, '_');
 			}
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index 24525c9f2d50..f0b1040b64d6 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -67,6 +67,7 @@ void containsWhitespace() {
 	}
 
 	@Test
+	@Deprecated
 	void trimWhitespace() {
 		assertThat(StringUtils.trimWhitespace(null)).isEqualTo(null);
 		assertThat(StringUtils.trimWhitespace("")).isEqualTo("");
@@ -97,6 +98,7 @@ void trimAllWhitespace() {
 	}
 
 	@Test
+	@Deprecated
 	void trimLeadingWhitespace() {
 		assertThat(StringUtils.trimLeadingWhitespace(null)).isEqualTo(null);
 		assertThat(StringUtils.trimLeadingWhitespace("")).isEqualTo("");
@@ -112,6 +114,7 @@ void trimLeadingWhitespace() {
 	}
 
 	@Test
+	@Deprecated
 	void trimTrailingWhitespace() {
 		assertThat(StringUtils.trimTrailingWhitespace(null)).isEqualTo(null);
 		assertThat(StringUtils.trimTrailingWhitespace("")).isEqualTo("");
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
index e81b294baacf..fd7b9cc785c3 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
@@ -145,14 +145,14 @@ private RootBeanDefinition parseAttributeSource(Element attrEle, ParserContext p
 	private void addRollbackRuleAttributesTo(List<RollbackRuleAttribute> rollbackRules, String rollbackForValue) {
 		String[] exceptionTypeNames = StringUtils.commaDelimitedListToStringArray(rollbackForValue);
 		for (String typeName : exceptionTypeNames) {
-			rollbackRules.add(new RollbackRuleAttribute(StringUtils.trimWhitespace(typeName)));
+			rollbackRules.add(new RollbackRuleAttribute(typeName.strip()));
 		}
 	}
 
 	private void addNoRollbackRuleAttributesTo(List<RollbackRuleAttribute> rollbackRules, String noRollbackForValue) {
 		String[] exceptionTypeNames = StringUtils.commaDelimitedListToStringArray(noRollbackForValue);
 		for (String typeName : exceptionTypeNames) {
-			rollbackRules.add(new NoRollbackRuleAttribute(StringUtils.trimWhitespace(typeName)));
+			rollbackRules.add(new NoRollbackRuleAttribute(typeName.strip()));
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
index e6a13c8130f1..2fdfbe07b1e0 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
@@ -54,7 +54,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 			RuleBasedTransactionAttribute attr = new RuleBasedTransactionAttribute();
 			for (String token : tokens) {
 				// Trim leading and trailing whitespace.
-				String trimmedToken = StringUtils.trimWhitespace(token.trim());
+				String trimmedToken = token.strip();
 				// Check whether token contains illegal whitespace within text.
 				if (StringUtils.containsWhitespace(trimmedToken)) {
 					throw new IllegalArgumentException(

From 9261766677727387a7c43d7382362863b6a602c8 Mon Sep 17 00:00:00 2001
From: "Katada, Junya" <jkatada@gmail.com>
Date: Sun, 17 May 2020 00:07:21 +0900
Subject: [PATCH 423/735] Fix for ModelAndView.status not working with
 RedirectView

---
 .../web/servlet/DispatcherServlet.java          |  1 +
 ...tAnnotationControllerHandlerMethodTests.java | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 869b4c6979c5..cd4dc70872b3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -1395,6 +1395,7 @@ protected void render(ModelAndView mv, HttpServletRequest request, HttpServletRe
 		}
 		try {
 			if (mv.getStatus() != null) {
+				request.setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, mv.getStatus());
 				response.setStatus(mv.getStatus().value());
 			}
 			view.render(mv.getModelInternal(), request, response);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
index 6957bdfc828e..aeaf049adb23 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
@@ -1897,6 +1897,18 @@ void modelAndViewWithStatus(boolean usePathPatterns) throws Exception {
 		assertThat(response.getForwardedUrl()).isEqualTo("view");
 	}
 
+	@PathPatternsParameterizedTest
+	void modelAndViewWithStatusForRedirect(boolean usePathPatterns) throws Exception {
+		initDispatcherServlet(ModelAndViewController.class, usePathPatterns);
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/redirect");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		getServlet().service(request, response);
+
+		assertThat(response.getStatus()).isEqualTo(307);
+		assertThat(response.getRedirectedUrl()).isEqualTo("/path");
+	}
+
 	@PathPatternsParameterizedTest // SPR-14796
 	void modelAndViewWithStatusInExceptionHandler(boolean usePathPatterns) throws Exception {
 		initDispatcherServlet(ModelAndViewController.class, usePathPatterns);
@@ -3872,6 +3884,11 @@ public ModelAndView methodWithHttpStatus(MyEntity object) {
 			return new ModelAndView("view", HttpStatus.UNPROCESSABLE_ENTITY);
 		}
 
+		@RequestMapping("/redirect")
+		public ModelAndView methodWithHttpStatusForRedirect(MyEntity object) {
+			return new ModelAndView("redirect:/path", HttpStatus.TEMPORARY_REDIRECT);
+		}
+
 		@RequestMapping("/exception")
 		public void raiseException() throws Exception {
 			throw new TestException();

From 99c7608ffe726fea4d6a1dce30005a8273cb305e Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 8 Dec 2021 11:24:30 +0000
Subject: [PATCH 424/735] Replace both EOL and control characters

---
 .../core/log/LogFormatUtils.java              | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
index 51ffd98cf0ab..9a2693e2ce6b 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
@@ -17,6 +17,7 @@
 package org.springframework.core.log;
 
 import java.util.function.Function;
+import java.util.regex.Pattern;
 
 import org.apache.commons.logging.Log;
 
@@ -35,10 +36,15 @@
  */
 public abstract class LogFormatUtils {
 
+	private static final Pattern NEWLINE_PATTERN = Pattern.compile("[\n\r]");
+
+	private static final Pattern CONTROL_CHARACTER_PATTERN = Pattern.compile("\\p{Cc}");
+
+
 	/**
 	 * Convenience variant of {@link #formatValue(Object, int, boolean)} that
 	 * limits the length of a log message to 100 characters and also replaces
-	 * newline characters if {@code limitLength} is set to "true".
+	 * newline and control characters if {@code limitLength} is set to "true".
 	 * @param value the value to format
 	 * @param limitLength whether to truncate the value at a length of 100
 	 * @return the formatted value
@@ -53,10 +59,13 @@ public static String formatValue(@Nullable Object value, boolean limitLength) {
 	 * compacting it into a single line when {@code replaceNewLines} is set.
 	 * @param value the value to be formatted
 	 * @param maxLength the max length, after which to truncate, or -1 for unlimited
-	 * @param replaceNewlines whether to replace newline characters with placeholders
+	 * @param replaceNewlinesAndControlCharacters whether to replace newline and
+	 * control characters with placeholders
 	 * @return the formatted value
 	 */
-	public static String formatValue(@Nullable Object value, int maxLength, boolean replaceNewlines) {
+	public static String formatValue(
+			@Nullable Object value, int maxLength, boolean replaceNewlinesAndControlCharacters) {
+
 		if (value == null) {
 			return "";
 		}
@@ -70,8 +79,9 @@ public static String formatValue(@Nullable Object value, int maxLength, boolean
 		if (maxLength != -1) {
 			result = (result.length() > maxLength ? result.substring(0, maxLength) + " (truncated)..." : result);
 		}
-		if (replaceNewlines) {
-			result = result.replace("\n", "<LF>").replace("\r", "<CR>");
+		if (replaceNewlinesAndControlCharacters) {
+			result = NEWLINE_PATTERN.matcher(result).replaceAll("<EOL>");
+			result = CONTROL_CHARACTER_PATTERN.matcher(result).replaceAll("?");
 		}
 		if (value instanceof CharSequence) {
 			result = "\"" + result + "\"";

From 57a5370eec4dce7739aa467d2a496c53091bf940 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 9 Dec 2021 14:43:00 +0100
Subject: [PATCH 425/735] Mention explicitly that @EventListener should be put
 on public methods

Closes gh-27777
---
 src/docs/asciidoc/core/core-beans.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 72138867377e..786615be14fb 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -10695,7 +10695,7 @@ architectures that build upon the well-known Spring programming model.
 [[context-functionality-events-annotation]]
 ==== Annotation-based Event Listeners
 
-You can register an event listener on any method of a managed bean by using the
+You can register an event listener on any `public` method of a managed bean by using the
 `@EventListener` annotation. The `BlockedListNotifier` can be rewritten as follows:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]

From 98ce171b30a09cadbf37593a1448ad011f75a7b6 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 9 Dec 2021 15:18:56 +0100
Subject: [PATCH 426/735] Revert "Mention explicitly that @EventListener should
 be put on public methods"

This reverts commit 57a5370eec4dce7739aa467d2a496c53091bf940.

See gh-27777
---
 src/docs/asciidoc/core/core-beans.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 786615be14fb..72138867377e 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -10695,7 +10695,7 @@ architectures that build upon the well-known Spring programming model.
 [[context-functionality-events-annotation]]
 ==== Annotation-based Event Listeners
 
-You can register an event listener on any `public` method of a managed bean by using the
+You can register an event listener on any method of a managed bean by using the
 `@EventListener` annotation. The `BlockedListNotifier` can be rewritten as follows:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]

From e9083d7d2053fea3919bfeb9057e9fdba4049119 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 9 Dec 2021 14:52:34 +0000
Subject: [PATCH 427/735] Apply LogFormatUtils in more places

---
 .../springframework/web/util/UrlPathHelper.java   |  4 ++--
 .../reactive/resource/PathResourceResolver.java   | 15 +++++++++------
 .../web/reactive/resource/ResourceWebHandler.java | 10 +++++++---
 .../ExtendedServletRequestDataBinder.java         |  7 +++----
 .../method/annotation/ReactiveTypeHandler.java    |  4 ++--
 .../servlet/resource/PathResourceResolver.java    | 15 +++++++++------
 .../resource/ResourceHttpRequestHandler.java      | 10 +++++++---
 .../server/support/AbstractHandshakeHandler.java  | 12 ++++++++----
 .../sockjs/support/AbstractSockJsService.java     |  7 +++++--
 .../transport/TransportHandlingSockJsService.java |  7 ++++---
 10 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 685f376b426a..ac43d5394c9c 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -578,8 +578,8 @@ private String decodeInternal(HttpServletRequest request, String source) {
 			return UriUtils.decode(source, enc);
 		}
 		catch (UnsupportedCharsetException ex) {
-			if (logger.isWarnEnabled()) {
-				logger.warn("Could not decode request string [" + source + "] with encoding '" + enc +
+			if (logger.isDebugEnabled()) {
+				logger.debug("Could not decode request string [" + source + "] with encoding '" + enc +
 						"': falling back to platform default encoding; exception message: " + ex.getMessage());
 			}
 			return URLDecoder.decode(source);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
index dd86b8e9a264..23d5eaaa55f3 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
@@ -29,6 +29,7 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
@@ -119,11 +120,12 @@ protected Mono<Resource> getResource(String resourcePath, Resource location) {
 					return Mono.just(resource);
 				}
 				else if (logger.isWarnEnabled()) {
-					Resource[] allowedLocations = getAllowedLocations();
-					logger.warn("Resource path \"" + resourcePath + "\" was successfully resolved " +
-							"but resource \"" + resource.getURL() + "\" is neither under the " +
-							"current location \"" + location.getURL() + "\" nor under any of the " +
-							"allowed locations " + (allowedLocations != null ? Arrays.asList(allowedLocations) : "[]"));
+					Resource[] allowed = getAllowedLocations();
+					logger.warn(LogFormatUtils.formatValue(
+							"Resource path \"" + resourcePath + "\" was successfully resolved " +
+									"but resource \"" + resource.getURL() + "\" is neither under the " +
+									"current location \"" + location.getURL() + "\" nor under any of the " +
+									"allowed locations " + (allowed != null ? Arrays.asList(allowed) : "[]"), -1, true));
 				}
 			}
 			return Mono.empty();
@@ -199,7 +201,8 @@ private boolean isInvalidEncodedPath(String resourcePath) {
 			try {
 				String decodedPath = URLDecoder.decode(resourcePath, "UTF-8");
 				if (decodedPath.contains("../") || decodedPath.contains("..\\")) {
-					logger.warn("Resolved resource path contains encoded \"../\" or \"..\\\": " + resourcePath);
+					logger.warn(LogFormatUtils.formatValue(
+							"Resolved resource path contains encoded \"../\" or \"..\\\": " + resourcePath, -1, true));
 					return true;
 				}
 			}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
index e6f0640a7022..7c4db588b450 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
@@ -39,6 +39,7 @@
 import org.springframework.core.codec.Hints;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.CacheControl;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -572,7 +573,8 @@ private boolean isInvalidEncodedPath(String path) {
 	protected boolean isInvalidPath(String path) {
 		if (path.contains("WEB-INF") || path.contains("META-INF")) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Path with \"WEB-INF\" or \"META-INF\": [" + path + "]");
+				logger.warn(LogFormatUtils.formatValue(
+						"Path with \"WEB-INF\" or \"META-INF\": [" + path + "]", -1, true));
 			}
 			return true;
 		}
@@ -580,14 +582,16 @@ protected boolean isInvalidPath(String path) {
 			String relativePath = (path.charAt(0) == '/' ? path.substring(1) : path);
 			if (ResourceUtils.isUrl(relativePath) || relativePath.startsWith("url:")) {
 				if (logger.isWarnEnabled()) {
-					logger.warn("Path represents URL or has \"url:\" prefix: [" + path + "]");
+					logger.warn(LogFormatUtils.formatValue(
+							"Path represents URL or has \"url:\" prefix: [" + path + "]", -1, true));
 				}
 				return true;
 			}
 		}
 		if (path.contains("..") && StringUtils.cleanPath(path).contains("../")) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
+				logger.warn(LogFormatUtils.formatValue(
+						"Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]", -1, true));
 			}
 			return true;
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
index a0db1cac45a2..2a7489b98176 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,9 +69,8 @@ protected void addBindValues(MutablePropertyValues mpvs, ServletRequest request)
 		if (uriVars != null) {
 			uriVars.forEach((name, value) -> {
 				if (mpvs.contains(name)) {
-					if (logger.isWarnEnabled()) {
-						logger.warn("Skipping URI variable '" + name +
-								"' because request contains bind value with same name.");
+					if (logger.isDebugEnabled()) {
+						logger.debug("URI variable '" + name + "' overridden by request bind value.");
 					}
 				}
 				else {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
index ec3e9a47081c..107fc4cd7b86 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -202,7 +202,7 @@ private void logExecutorWarning(MethodParameter returnType) {
 							"-------------------------------\n" +
 							"Controller:\t" + returnType.getContainingClass().getName() + "\n" +
 							"Method:\t\t" + returnType.getMethod().getName() + "\n" +
-							"Returning:\t" + ResolvableType.forMethodParameter(returnType).toString() + "\n" +
+							"Returning:\t" + ResolvableType.forMethodParameter(returnType) + "\n" +
 							"!!!");
 					this.taskExecutorWarning = false;
 				}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
index 2b97ac60895f..cc042115d88d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
@@ -33,6 +33,7 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.server.PathContainer;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
@@ -190,11 +191,12 @@ protected Resource getResource(String resourcePath, Resource location) throws IO
 				return resource;
 			}
 			else if (logger.isWarnEnabled()) {
-				Resource[] allowedLocations = getAllowedLocations();
-				logger.warn("Resource path \"" + resourcePath + "\" was successfully resolved " +
-						"but resource \"" +	resource.getURL() + "\" is neither under the " +
-						"current location \"" + location.getURL() + "\" nor under any of the " +
-						"allowed locations " + (allowedLocations != null ? Arrays.asList(allowedLocations) : "[]"));
+				Resource[] allowed = getAllowedLocations();
+				logger.warn(LogFormatUtils.formatValue(
+						"Resource path \"" + resourcePath + "\" was successfully resolved " +
+								"but resource \"" + resource.getURL() + "\" is neither under " +
+								"the current location \"" + location.getURL() + "\" nor under any of " +
+								"the allowed locations " + (allowed != null ? Arrays.asList(allowed) : "[]"), -1, true));
 			}
 		}
 		return null;
@@ -297,7 +299,8 @@ private boolean isInvalidEncodedPath(String resourcePath) {
 			try {
 				String decodedPath = URLDecoder.decode(resourcePath, "UTF-8");
 				if (decodedPath.contains("../") || decodedPath.contains("..\\")) {
-					logger.warn("Resolved resource path contains encoded \"../\" or \"..\\\": " + resourcePath);
+					logger.warn(LogFormatUtils.formatValue(
+							"Resolved resource path contains encoded \"../\" or \"..\\\": " + resourcePath, -1, true));
 					return true;
 				}
 			}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 7855a1171cb3..ba1b0ef6cd88 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -39,6 +39,7 @@
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRange;
@@ -734,7 +735,8 @@ private boolean isInvalidEncodedPath(String path) {
 	protected boolean isInvalidPath(String path) {
 		if (path.contains("WEB-INF") || path.contains("META-INF")) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Path with \"WEB-INF\" or \"META-INF\": [" + path + "]");
+				logger.warn(LogFormatUtils.formatValue(
+						"Path with \"WEB-INF\" or \"META-INF\": [" + path + "]", -1, true));
 			}
 			return true;
 		}
@@ -742,14 +744,16 @@ protected boolean isInvalidPath(String path) {
 			String relativePath = (path.charAt(0) == '/' ? path.substring(1) : path);
 			if (ResourceUtils.isUrl(relativePath) || relativePath.startsWith("url:")) {
 				if (logger.isWarnEnabled()) {
-					logger.warn("Path represents URL or has \"url:\" prefix: [" + path + "]");
+					logger.warn(LogFormatUtils.formatValue(
+							"Path represents URL or has \"url:\" prefix: [" + path + "]", -1, true));
 				}
 				return true;
 			}
 		}
 		if (path.contains("..") && StringUtils.cleanPath(path).contains("../")) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
+				logger.warn(LogFormatUtils.formatValue(
+						"Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]", -1, true));
 			}
 			return true;
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java
index 8ca56429a4e8..4c9fa3ea2dd9 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractHandshakeHandler.java
@@ -29,6 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.context.Lifecycle;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
@@ -299,7 +300,8 @@ public final boolean doHandshake(ServerHttpRequest request, ServerHttpResponse r
 
 	protected void handleInvalidUpgradeHeader(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
 		if (logger.isErrorEnabled()) {
-			logger.error("Handshake failed due to invalid Upgrade header: " + request.getHeaders().getUpgrade());
+			logger.error(LogFormatUtils.formatValue(
+					"Handshake failed due to invalid Upgrade header: " + request.getHeaders().getUpgrade(), -1, true));
 		}
 		response.setStatusCode(HttpStatus.BAD_REQUEST);
 		response.getBody().write("Can \"Upgrade\" only to \"WebSocket\".".getBytes(StandardCharsets.UTF_8));
@@ -307,7 +309,8 @@ protected void handleInvalidUpgradeHeader(ServerHttpRequest request, ServerHttpR
 
 	protected void handleInvalidConnectHeader(ServerHttpRequest request, ServerHttpResponse response) throws IOException {
 		if (logger.isErrorEnabled()) {
-			logger.error("Handshake failed due to invalid Connection header " + request.getHeaders().getConnection());
+			logger.error(LogFormatUtils.formatValue(
+					"Handshake failed due to invalid Connection header" + request.getHeaders().getConnection(), -1, true));
 		}
 		response.setStatusCode(HttpStatus.BAD_REQUEST);
 		response.getBody().write("\"Connection\" must be \"upgrade\".".getBytes(StandardCharsets.UTF_8));
@@ -331,8 +334,9 @@ protected String[] getSupportedVersions() {
 	protected void handleWebSocketVersionNotSupported(ServerHttpRequest request, ServerHttpResponse response) {
 		if (logger.isErrorEnabled()) {
 			String version = request.getHeaders().getFirst("Sec-WebSocket-Version");
-			logger.error("Handshake failed due to unsupported WebSocket version: " + version +
-					". Supported versions: " + Arrays.toString(getSupportedVersions()));
+			logger.error(LogFormatUtils.formatValue(
+					"Handshake failed due to unsupported WebSocket version: " + version +
+							". Supported versions: " + Arrays.toString(getSupportedVersions()), -1, true));
 		}
 		response.setStatusCode(HttpStatus.UPGRADE_REQUIRED);
 		response.getHeaders().set(WebSocketHttpHeaders.SEC_WEBSOCKET_VERSION,
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
index 84502556bd65..39f6d2436b19 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -32,6 +32,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -377,7 +378,8 @@ public final void handleRequest(ServerHttpRequest request, ServerHttpResponse re
 
 		if (sockJsPath == null) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Expected SockJS path. Failing request: " + request.getURI());
+				logger.warn(LogFormatUtils.formatValue(
+						"Expected SockJS path. Failing request: " + request.getURI(), -1, true));
 			}
 			response.setStatusCode(HttpStatus.NOT_FOUND);
 			return;
@@ -447,7 +449,8 @@ else if (requestInfo != null) {
 				String[] pathSegments = StringUtils.tokenizeToStringArray(sockJsPath.substring(1), "/");
 				if (pathSegments.length != 3) {
 					if (logger.isWarnEnabled()) {
-						logger.warn("Invalid SockJS path '" + sockJsPath + "' - required to have 3 path segments");
+						logger.warn(LogFormatUtils.formatValue("Invalid SockJS path '" + sockJsPath + "' - " +
+								"required to have 3 path segments", -1, true));
 					}
 					if (requestInfo != null) {
 						logger.debug("Ignoring transport request: " + requestInfo);
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
index 8968980ef6ae..18224e3184f4 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import java.util.concurrent.ScheduledFuture;
 
 import org.springframework.context.Lifecycle;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
@@ -234,7 +235,7 @@ protected void handleTransportRequest(ServerHttpRequest request, ServerHttpRespo
 		TransportType transportType = TransportType.fromValue(transport);
 		if (transportType == null) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Unknown transport type for " + request.getURI());
+				logger.warn(LogFormatUtils.formatValue("Unknown transport type for " + request.getURI(), -1, true));
 			}
 			response.setStatusCode(HttpStatus.NOT_FOUND);
 			return;
@@ -243,7 +244,7 @@ protected void handleTransportRequest(ServerHttpRequest request, ServerHttpRespo
 		TransportHandler transportHandler = this.handlers.get(transportType);
 		if (transportHandler == null) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("No TransportHandler for " + request.getURI());
+				logger.warn(LogFormatUtils.formatValue("No TransportHandler for " + request.getURI(), -1, true));
 			}
 			response.setStatusCode(HttpStatus.NOT_FOUND);
 			return;

From 6cc9538ab9a1434f1b210f598e20d3d882b583f8 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 10 Dec 2021 07:48:52 +0100
Subject: [PATCH 428/735] Start building against Reactor 2020.0.14 snapshots

See gh-27793
---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ff029ad98709..be9b492ad257 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.70.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.13"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.14-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,6 +292,7 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
+			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From ad7cdc5ce970c3df3297dc4456b511ded9d3e2b1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 10 Dec 2021 13:12:44 +0100
Subject: [PATCH 429/735] Fix regression for null varargs in SpEL expressions

A regression was introduced in gh-27582. Specifically, when null is
supplied as the single argument for a varargs parameter in a method or
function in a SpEL expression, ReflectionHelper currently throws a
NullPointerException instead of leaving the null value unchanged.

This commit fixes this regression.

Closes gh-27719
---
 .../spel/support/ReflectionHelper.java        | 19 +++---
 .../spel/MethodInvocationTests.java           | 58 ++++++++++++++-----
 .../expression/spel/TestScenarioCreator.java  | 32 ++++------
 .../spel/VariableAndFunctionTests.java        | 40 ++++++++-----
 .../spel/testresources/Inventor.java          | 19 +++---
 5 files changed, 99 insertions(+), 69 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
index 821c0b246ae6..d202a61a8c1b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
@@ -290,17 +290,18 @@ static boolean convertArguments(TypeConverter converter, Object[] arguments, Exe
 				Object argument = arguments[varargsPosition];
 				TypeDescriptor targetType = new TypeDescriptor(methodParam);
 				TypeDescriptor sourceType = TypeDescriptor.forObject(argument);
-				// If the argument type is equal to the varargs element type, there is no need
-				// to convert it or wrap it in an array. For example, using StringToArrayConverter
-				// to convert a String containing a comma would result in the String being split
-				// and repackaged in an array when it should be used as-is.
-				if (!sourceType.equals(targetType.getElementTypeDescriptor())) {
+				// If the argument is null or the argument type is equal to the varargs element type,
+				// there is no need to convert it or wrap it in an array. For example, using
+				// StringToArrayConverter to convert a String containing a comma would result in the
+				// String being split and repackaged in an array when it should be used as-is.
+				if (argument != null && !sourceType.equals(targetType.getElementTypeDescriptor())) {
 					arguments[varargsPosition] = converter.convertValue(argument, sourceType, targetType);
 				}
-				// Three outcomes of the above if-block:
-				// 1) the input argument was correct type but not wrapped in an array, and nothing was done.
-				// 2) the input argument was already compatible (i.e., array of valid type), and nothing was done.
-				// 3) the input argument was the wrong type and got converted and wrapped in an array.
+				// Possible outcomes of the above if-block:
+				// 1) the input argument was null, and nothing was done.
+				// 2) the input argument was correct type but not wrapped in an array, and nothing was done.
+				// 3) the input argument was already compatible (i.e., array of valid type), and nothing was done.
+				// 4) the input argument was the wrong type and got converted and wrapped in an array.
 				if (argument != arguments[varargsPosition] &&
 						!isFirstEntryInArray(argument, arguments[varargsPosition])) {
 					conversionOccurred = true; // case 3
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
index b2cde1f10ff3..c003a07636b5 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
@@ -234,26 +234,33 @@ public void testAddingMethodResolvers() {
 
 	@Test
 	public void testVarargsInvocation01() {
-		// Calling 'public int aVarargsMethod(String... strings)' - returns number of arguments
-		evaluate("aVarargsMethod('a','b','c')", 3, Integer.class);
-		evaluate("aVarargsMethod('a')", 1, Integer.class);
-		evaluate("aVarargsMethod()", 0, Integer.class);
-		evaluate("aVarargsMethod(1,2,3)", 3, Integer.class); // all need converting to strings
-		evaluate("aVarargsMethod(1)", 1, Integer.class); // needs string conversion
-		evaluate("aVarargsMethod(1,'a',3.0d)", 3, Integer.class); // first and last need conversion
-		evaluate("aVarargsMethod(new String[]{'a','b','c'})", 3, Integer.class);
+		// Calling 'public String aVarargsMethod(String... strings)'
+		evaluate("aVarargsMethod('a','b','c')", "[a, b, c]", String.class);
+		evaluate("aVarargsMethod('a')", "[a]", String.class);
+		evaluate("aVarargsMethod()", "[]", String.class);
+		evaluate("aVarargsMethod(1,2,3)", "[1, 2, 3]", String.class); // all need converting to strings
+		evaluate("aVarargsMethod(1)", "[1]", String.class); // needs string conversion
+		evaluate("aVarargsMethod(1,'a',3.0d)", "[1, a, 3.0]", String.class); // first and last need conversion
+		evaluate("aVarargsMethod(new String[]{'a','b','c'})", "[a, b, c]", String.class);
+		evaluate("aVarargsMethod(new String[]{})", "[]", String.class);
+		evaluate("aVarargsMethod(null)", "[null]", String.class);
+		evaluate("aVarargsMethod(null,'a')", "[null, a]", String.class);
+		evaluate("aVarargsMethod('a',null,'b')", "[a, null, b]", String.class);
 	}
 
 	@Test
 	public void testVarargsInvocation02() {
-		// Calling 'public int aVarargsMethod2(int i, String... strings)' - returns int + length_of_strings
-		evaluate("aVarargsMethod2(5,'a','b','c')", 8, Integer.class);
-		evaluate("aVarargsMethod2(2,'a')", 3, Integer.class);
-		evaluate("aVarargsMethod2(4)", 4, Integer.class);
-		evaluate("aVarargsMethod2(8,2,3)", 10, Integer.class);
-		evaluate("aVarargsMethod2(9)", 9, Integer.class);
-		evaluate("aVarargsMethod2(2,'a',3.0d)", 4, Integer.class);
-		evaluate("aVarargsMethod2(8,new String[]{'a','b','c'})", 11, Integer.class);
+		// Calling 'public String aVarargsMethod2(int i, String... strings)'
+		evaluate("aVarargsMethod2(5,'a','b','c')", "5-[a, b, c]", String.class);
+		evaluate("aVarargsMethod2(2,'a')", "2-[a]", String.class);
+		evaluate("aVarargsMethod2(4)", "4-[]", String.class);
+		evaluate("aVarargsMethod2(8,2,3)", "8-[2, 3]", String.class);
+		evaluate("aVarargsMethod2(2,'a',3.0d)", "2-[a, 3.0]", String.class);
+		evaluate("aVarargsMethod2(8,new String[]{'a','b','c'})", "8-[a, b, c]", String.class);
+		evaluate("aVarargsMethod2(8,new String[]{})", "8-[]", String.class);
+		evaluate("aVarargsMethod2(8,null)", "8-[null]", String.class);
+		evaluate("aVarargsMethod2(8,null,'a')", "8-[null, a]", String.class);
+		evaluate("aVarargsMethod2(8,'a',null,'b')", "8-[a, null, b]", String.class);
 	}
 
 	@Test
@@ -284,6 +291,25 @@ public void testVarargsInvocation03() {
 		evaluate("aVarargsMethod3('foo', 'bar,baz')", "foo-bar,baz", String.class);
 	}
 
+	@Test
+	public void testVarargsOptionalInvocation() {
+		// Calling 'public String optionalVarargsMethod(Optional<String>... values)'
+		evaluate("optionalVarargsMethod()", "[]", String.class);
+		evaluate("optionalVarargsMethod(new String[0])", "[]", String.class);
+		evaluate("optionalVarargsMethod('a')", "[Optional[a]]", String.class);
+		evaluate("optionalVarargsMethod('a','b','c')", "[Optional[a], Optional[b], Optional[c]]", String.class);
+		evaluate("optionalVarargsMethod(9)", "[Optional[9]]", String.class);
+		evaluate("optionalVarargsMethod(2,3)", "[Optional[2], Optional[3]]", String.class);
+		evaluate("optionalVarargsMethod('a',3.0d)", "[Optional[a], Optional[3.0]]", String.class);
+		evaluate("optionalVarargsMethod(new String[]{'a','b','c'})", "[Optional[a], Optional[b], Optional[c]]", String.class);
+		// The following should actually evaluate to [Optional.empty] instead of [null],
+		// but ReflectionHelper.convertArguments() currently does not provide explicit
+		// Optional support for a single argument passed to a varargs array.
+		evaluate("optionalVarargsMethod(null)", "[null]", String.class);
+		evaluate("optionalVarargsMethod(null,'a')", "[Optional.empty, Optional[a]]", String.class);
+		evaluate("optionalVarargsMethod('a',null,'b')", "[Optional[a], Optional.empty, Optional[b]]", String.class);
+	}
+
 	@Test
 	public void testInvocationOnNullContextObject() {
 		evaluateAndCheckError("null.toString()",SpelMessage.METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED);
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java b/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
index eb60acd79808..4bb3f7da0cc3 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.expression.spel;
 
+import java.util.Arrays;
 import java.util.GregorianCalendar;
 
 import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -51,10 +52,10 @@ private static void populateFunctions(StandardEvaluationContext testContext) {
 					TestScenarioCreator.class.getDeclaredMethod("reverseInt", Integer.TYPE, Integer.TYPE, Integer.TYPE));
 			testContext.registerFunction("reverseString",
 					TestScenarioCreator.class.getDeclaredMethod("reverseString", String.class));
-			testContext.registerFunction("varargsFunctionReverseStringsAndMerge",
-					TestScenarioCreator.class.getDeclaredMethod("varargsFunctionReverseStringsAndMerge", String[].class));
-			testContext.registerFunction("varargsFunctionReverseStringsAndMerge2",
-					TestScenarioCreator.class.getDeclaredMethod("varargsFunctionReverseStringsAndMerge2", Integer.TYPE, String[].class));
+			testContext.registerFunction("varargsFunction",
+					TestScenarioCreator.class.getDeclaredMethod("varargsFunction", String[].class));
+			testContext.registerFunction("varargsFunction2",
+					TestScenarioCreator.class.getDeclaredMethod("varargsFunction2", Integer.TYPE, String[].class));
 		}
 		catch (Exception ex) {
 			throw new IllegalStateException(ex);
@@ -108,25 +109,12 @@ public static String reverseString(String input) {
 		return backwards.toString();
 	}
 
-	public static String varargsFunctionReverseStringsAndMerge(String... strings) {
-		StringBuilder sb = new StringBuilder();
-		if (strings != null) {
-			for (int i = strings.length - 1; i >= 0; i--) {
-				sb.append(strings[i]);
-			}
-		}
-		return sb.toString();
+	public static String varargsFunction(String... strings) {
+		return Arrays.toString(strings);
 	}
 
-	public static String varargsFunctionReverseStringsAndMerge2(int j, String... strings) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(j);
-		if (strings != null) {
-			for (int i = strings.length - 1; i >= 0; i--) {
-				sb.append(strings[i]);
-			}
-		}
-		return sb.toString();
+	public static String varargsFunction2(int i, String... strings) {
+		return String.valueOf(i) + "-" + Arrays.toString(strings);
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
index 3271e45ea6d1..71c266acd801 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
@@ -59,21 +59,33 @@ public void testFunctionAccess02() {
 
 	@Test
 	public void testCallVarargsFunction() {
-		evaluate("#varargsFunctionReverseStringsAndMerge('a,b')", "a,b", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge('a', 'b,c', 'd')", "db,ca", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge('a','b','c')", "cba", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge('a')", "a", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge()", "", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge('b',25)", "25b", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge(25)", "25", String.class);
+		evaluate("#varargsFunction()", "[]", String.class);
+		evaluate("#varargsFunction(new String[0])", "[]", String.class);
+		evaluate("#varargsFunction('a')", "[a]", String.class);
+		evaluate("#varargsFunction('a','b','c')", "[a, b, c]", String.class);
+		// Conversion from int to String
+		evaluate("#varargsFunction(25)", "[25]", String.class);
+		evaluate("#varargsFunction('b',25)", "[b, 25]", String.class);
+		// Strings that contain a comma
+		evaluate("#varargsFunction('a,b')", "[a,b]", String.class);
+		evaluate("#varargsFunction('a', 'x,y', 'd')", "[a, x,y, d]", String.class);
+		// null values
+		evaluate("#varargsFunction(null)", "[null]", String.class);
+		evaluate("#varargsFunction('a',null,'b')", "[a, null, b]", String.class);
 
-		evaluate("#varargsFunctionReverseStringsAndMerge2(1, 'a,b')", "1a,b", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge2(1,'a','b','c')", "1cba", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge2(1, 'a', 'b,c', 'd')", "1db,ca", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge2(2,'a')", "2a", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge2(3)", "3", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge2(4,'b',25)", "425b", String.class);
-		evaluate("#varargsFunctionReverseStringsAndMerge2(5,25)", "525", String.class);
+		evaluate("#varargsFunction2(9)", "9-[]", String.class);
+		evaluate("#varargsFunction2(9, new String[0])", "9-[]", String.class);
+		evaluate("#varargsFunction2(9,'a')", "9-[a]", String.class);
+		evaluate("#varargsFunction2(9,'a','b','c')", "9-[a, b, c]", String.class);
+		// Conversion from int to String
+		evaluate("#varargsFunction2(9,25)", "9-[25]", String.class);
+		evaluate("#varargsFunction2(9,'b',25)", "9-[b, 25]", String.class);
+		// Strings that contain a comma:
+		evaluate("#varargsFunction2(9, 'a,b')", "9-[a,b]", String.class);
+		evaluate("#varargsFunction2(9, 'a', 'x,y', 'd')", "9-[a, x,y, d]", String.class);
+		// null values
+		evaluate("#varargsFunction2(9,null)", "9-[null]", String.class);
+		evaluate("#varargsFunction2(9,'a',null,'b')", "9-[a, null, b]", String.class);
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
index 34960d982fe3..282622cf7d2d 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
@@ -17,11 +17,13 @@
 package org.springframework.expression.spel.testresources;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.springframework.util.ObjectUtils;
 
@@ -191,16 +193,17 @@ public String joinThreeStrings(String a, String b, String c) {
 		return a + b + c;
 	}
 
-	public int aVarargsMethod(String... strings) {
-		if (strings == null)
-			return 0;
-		return strings.length;
+	public String aVarargsMethod(String... strings) {
+		return Arrays.toString(strings);
 	}
 
-	public int aVarargsMethod2(int i, String... strings) {
-		if (strings == null)
-			return i;
-		return strings.length + i;
+	public String aVarargsMethod2(int i, String... strings) {
+		return String.valueOf(i) + "-" + Arrays.toString(strings);
+	}
+
+	@SuppressWarnings("unchecked")
+	public String optionalVarargsMethod(Optional<String>... values) {
+		return Arrays.toString(values);
 	}
 
 	public String aVarargsMethod3(String str1, String... strings) {

From b2e94f611fded8bf9c907de4ba5d9eb1fba10ef0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 10 Dec 2021 13:53:28 +0100
Subject: [PATCH 430/735] Convert single null argument to Optional.empty() in
 SpEL varargs expression

Prior to this commit, if a single null value was passed to a method with
a varargs array of type java.util.Optional, that null value was passed
unmodified. On the contrary, a null passed with additional values to
such a method resulted in the null being converted to Optional.empty().

This commit ensures that a single null value is also converted to
Optional.empty() for such SpEL expressions.

Closes gh-27795
---
 .../spel/support/ReflectionHelper.java        | 29 ++++++++++++-------
 .../spel/MethodInvocationTests.java           |  5 +---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
index d202a61a8c1b..e9b62ec2adbb 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
@@ -20,6 +20,7 @@
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.TypeDescriptor;
@@ -290,21 +291,29 @@ static boolean convertArguments(TypeConverter converter, Object[] arguments, Exe
 				Object argument = arguments[varargsPosition];
 				TypeDescriptor targetType = new TypeDescriptor(methodParam);
 				TypeDescriptor sourceType = TypeDescriptor.forObject(argument);
-				// If the argument is null or the argument type is equal to the varargs element type,
-				// there is no need to convert it or wrap it in an array. For example, using
-				// StringToArrayConverter to convert a String containing a comma would result in the
-				// String being split and repackaged in an array when it should be used as-is.
-				if (argument != null && !sourceType.equals(targetType.getElementTypeDescriptor())) {
+				if (argument == null) {
+					// Perform the equivalent of GenericConversionService.convertNullSource() for a single argument.
+					if (targetType.getElementTypeDescriptor().getObjectType() == Optional.class) {
+						arguments[varargsPosition] = Optional.empty();
+						conversionOccurred = true;
+					}
+				}
+				// If the argument type is equal to the varargs element type, there is no need to
+				// convert it or wrap it in an array. For example, using StringToArrayConverter to
+				// convert a String containing a comma would result in the String being split and
+				// repackaged in an array when it should be used as-is.
+				else if (!sourceType.equals(targetType.getElementTypeDescriptor())) {
 					arguments[varargsPosition] = converter.convertValue(argument, sourceType, targetType);
 				}
-				// Possible outcomes of the above if-block:
+				// Possible outcomes of the above if-else block:
 				// 1) the input argument was null, and nothing was done.
-				// 2) the input argument was correct type but not wrapped in an array, and nothing was done.
-				// 3) the input argument was already compatible (i.e., array of valid type), and nothing was done.
-				// 4) the input argument was the wrong type and got converted and wrapped in an array.
+				// 2) the input argument was null; the varargs element type is Optional; and the argument was converted to Optional.empty().
+				// 3) the input argument was correct type but not wrapped in an array, and nothing was done.
+				// 4) the input argument was already compatible (i.e., array of valid type), and nothing was done.
+				// 5) the input argument was the wrong type and got converted and wrapped in an array.
 				if (argument != arguments[varargsPosition] &&
 						!isFirstEntryInArray(argument, arguments[varargsPosition])) {
-					conversionOccurred = true; // case 3
+					conversionOccurred = true; // case 5
 				}
 			}
 			// Otherwise, convert remaining arguments to the varargs element type.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
index c003a07636b5..6a94550104d3 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
@@ -302,10 +302,7 @@ public void testVarargsOptionalInvocation() {
 		evaluate("optionalVarargsMethod(2,3)", "[Optional[2], Optional[3]]", String.class);
 		evaluate("optionalVarargsMethod('a',3.0d)", "[Optional[a], Optional[3.0]]", String.class);
 		evaluate("optionalVarargsMethod(new String[]{'a','b','c'})", "[Optional[a], Optional[b], Optional[c]]", String.class);
-		// The following should actually evaluate to [Optional.empty] instead of [null],
-		// but ReflectionHelper.convertArguments() currently does not provide explicit
-		// Optional support for a single argument passed to a varargs array.
-		evaluate("optionalVarargsMethod(null)", "[null]", String.class);
+		evaluate("optionalVarargsMethod(null)", "[Optional.empty]", String.class);
 		evaluate("optionalVarargsMethod(null,'a')", "[Optional.empty, Optional[a]]", String.class);
 		evaluate("optionalVarargsMethod('a',null,'b')", "[Optional[a], Optional.empty, Optional[b]]", String.class);
 	}

From b1352e1833b6f92b210cc83ff9d48553be969b3e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 10 Dec 2021 15:05:56 +0100
Subject: [PATCH 431/735] Upgrade to Log4j2 2.15.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index be9b492ad257..24b93577a4c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ configure(allprojects) { project ->
 			mavenBom "org.junit:junit-bom:5.8.2"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.15.0') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'

From 00375df4e8acc97f88c96cfaf5e4c0c44e7f8960 Mon Sep 17 00:00:00 2001
From: xay <1580319665@qq.com>
Date: Sun, 12 Dec 2021 20:07:17 +0800
Subject: [PATCH 432/735] Fix javadoc reference to ThrowsAdvice

See gh-27804
---
 .../aop/framework/adapter/ThrowsAdviceAdapter.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
index dd557215c563..1bf091ce408e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
@@ -25,7 +25,7 @@
 import org.springframework.aop.ThrowsAdvice;
 
 /**
- * Adapter to enable {@link org.springframework.aop.MethodBeforeAdvice}
+ * Adapter to enable {@link org.springframework.aop.ThrowsAdvice}
  * to be used in the Spring AOP framework.
  *
  * @author Rod Johnson

From 31b8587ce61b2a37268eeaf2c83bd57b65ccd141 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sun, 12 Dec 2021 16:30:06 +0100
Subject: [PATCH 433/735] Update copyright year of changed file

See gh-27804
---
 .../aop/framework/adapter/ThrowsAdviceAdapter.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
index 1bf091ce408e..91450ac1db44 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 9e09d6cde498f26a71e183cbf6a3afad0ed2f575 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sun, 12 Dec 2021 16:32:35 +0100
Subject: [PATCH 434/735] Polish "Fix javadoc reference to ThrowsAdvice"

See gh-27804
---
 .../aop/framework/adapter/ThrowsAdviceAdapter.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
index 91450ac1db44..a6b09c63cbbe 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
@@ -25,8 +25,8 @@
 import org.springframework.aop.ThrowsAdvice;
 
 /**
- * Adapter to enable {@link org.springframework.aop.ThrowsAdvice}
- * to be used in the Spring AOP framework.
+ * Adapter to enable {@link org.springframework.aop.ThrowsAdvice} to be used
+ * in the Spring AOP framework.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller

From d836fb4a7a8952ee1de3df9567eec4052349cedb Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Mon, 13 Dec 2021 16:05:14 +0800
Subject: [PATCH 435/735] Remove unnecessary @SuppressWarnings

See gh-27807
---
 .../annotation/ConfigurationClassBeanDefinitionReader.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
index 86bcbb5e5bc6..72edc2a49f51 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -182,7 +182,6 @@ private void registerBeanDefinitionForImportedConfigurationClass(ConfigurationCl
 	 * Read the given {@link BeanMethod}, registering bean definitions
 	 * with the BeanDefinitionRegistry based on its contents.
 	 */
-	@SuppressWarnings("deprecation")  // for RequiredAnnotationBeanPostProcessor.SKIP_REQUIRED_CHECK_ATTRIBUTE
 	private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 		ConfigurationClass configClass = beanMethod.getConfigurationClass();
 		MethodMetadata metadata = beanMethod.getMetadata();

From 49c4d310b51ac0552e036348fc1c1dbbc2b0589f Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Sat, 11 Dec 2021 12:05:48 +0900
Subject: [PATCH 436/735] Polish

See gh-27799
---
 .../beans/PropertyEditorRegistrySupport.java                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
index e17a4e52e697..d62fc5d83b07 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
@@ -423,9 +423,6 @@ private PropertyEditor getCustomEditor(@Nullable Class<?> requiredType) {
 			if (editor == null) {
 				// Find editor for superclass or interface.
 				for (Map.Entry<Class<?>, PropertyEditor> entry : this.customEditors.entrySet()) {
-					if (editor != null) {
-						break;
-					}
 					Class<?> key = entry.getKey();
 					if (key.isAssignableFrom(requiredType)) {
 						editor = entry.getValue();
@@ -435,6 +432,9 @@ private PropertyEditor getCustomEditor(@Nullable Class<?> requiredType) {
 							this.customEditorCache = new HashMap<>();
 						}
 						this.customEditorCache.put(requiredType, editor);
+						if (editor != null) {
+							break;
+						}
 					}
 				}
 			}

From 4453102e852f4693222d103264c9a62b421f3d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Ostro=C5=BEl=C3=ADk?= <adamostrozlik@yandex.com>
Date: Sat, 11 Dec 2021 16:51:27 +0100
Subject: [PATCH 437/735] Polish ExceptionHandlerMethodResolver mapping

See gh-27801
---
 .../annotation/ExceptionHandlerExceptionResolver.java       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
index 83ae13af4eea..9bb49d0954e3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
@@ -476,11 +476,7 @@ protected ServletInvocableHandlerMethod getExceptionHandlerMethod(
 			// Local exception handler methods on the controller class itself.
 			// To be invoked through the proxy, even in case of an interface-based proxy.
 			handlerType = handlerMethod.getBeanType();
-			ExceptionHandlerMethodResolver resolver = this.exceptionHandlerCache.get(handlerType);
-			if (resolver == null) {
-				resolver = new ExceptionHandlerMethodResolver(handlerType);
-				this.exceptionHandlerCache.put(handlerType, resolver);
-			}
+			ExceptionHandlerMethodResolver resolver = this.exceptionHandlerCache.computeIfAbsent(handlerType, ExceptionHandlerMethodResolver::new);
 			Method method = resolver.resolveMethod(exception);
 			if (method != null) {
 				return new ServletInvocableHandlerMethod(handlerMethod.getBean(), method, this.applicationContext);

From 61601de250957b7b2bc4796b99e183ff5e5500d9 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 13 Dec 2021 15:57:58 +0100
Subject: [PATCH 438/735] Polish formatting

See gh-27801
---
 .../method/annotation/ExceptionHandlerExceptionResolver.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
index 9bb49d0954e3..620f4515121d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
@@ -476,7 +476,8 @@ protected ServletInvocableHandlerMethod getExceptionHandlerMethod(
 			// Local exception handler methods on the controller class itself.
 			// To be invoked through the proxy, even in case of an interface-based proxy.
 			handlerType = handlerMethod.getBeanType();
-			ExceptionHandlerMethodResolver resolver = this.exceptionHandlerCache.computeIfAbsent(handlerType, ExceptionHandlerMethodResolver::new);
+			ExceptionHandlerMethodResolver resolver = this.exceptionHandlerCache.computeIfAbsent(
+					handlerType, ExceptionHandlerMethodResolver::new);
 			Method method = resolver.resolveMethod(exception);
 			if (method != null) {
 				return new ServletInvocableHandlerMethod(handlerMethod.getBean(), method, this.applicationContext);

From c50a5096a04c2a198da21192333fa05d1d85e70e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 13 Dec 2021 16:18:25 +0100
Subject: [PATCH 439/735] Upgrade to Netty 4.1.72.Final

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 24b93577a4c5..367edd2b90ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
-			mavenBom "io.netty:netty-bom:4.1.70.Final"
+			mavenBom "io.netty:netty-bom:4.1.72.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.14-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"

From 5d91560f9230a1673036ee0a9b5e4aa75c4f148c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8C=E1=85=A9=E1=84=92=E1=85=A7=E1=86=AB=E1=84=89?=
 =?UTF-8?q?=E1=85=AE=28Hyunsoo=20Cho=29/Platform=20Engineering=E1=84=90?=
 =?UTF-8?q?=E1=85=B5=E1=86=B7/11ST?= <hyunsoo.cho@sk.com>
Date: Wed, 24 Nov 2021 15:20:51 +0900
Subject: [PATCH 440/735] Avoid unescape for CONNECT and CONNECTED frames

See gh-27722
---
 .../messaging/simp/stomp/StompDecoder.java      | 10 ++++++----
 .../messaging/simp/stomp/StompDecoderTests.java | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
index 70b2c0b2e545..66206f667953 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
@@ -143,7 +143,7 @@ private Message<byte[]> decodeMessage(ByteBuffer byteBuffer, @Nullable MultiValu
 				StompCommand stompCommand = StompCommand.valueOf(command);
 				headerAccessor = StompHeaderAccessor.create(stompCommand);
 				initHeaders(headerAccessor);
-				readHeaders(byteBuffer, headerAccessor);
+				readHeaders(stompCommand, byteBuffer, headerAccessor);
 				payload = readPayload(byteBuffer, headerAccessor);
 			}
 			if (payload != null) {
@@ -215,7 +215,9 @@ private String readCommand(ByteBuffer byteBuffer) {
 		return StreamUtils.copyToString(command, StandardCharsets.UTF_8);
 	}
 
-	private void readHeaders(ByteBuffer byteBuffer, StompHeaderAccessor headerAccessor) {
+	private void readHeaders(StompCommand stompCommand, ByteBuffer byteBuffer, StompHeaderAccessor headerAccessor) {
+		boolean shouldUnescape = (stompCommand != StompCommand.CONNECT && stompCommand != StompCommand.STOMP
+				&& stompCommand != StompCommand.CONNECTED);
 		while (true) {
 			ByteArrayOutputStream headerStream = new ByteArrayOutputStream(256);
 			boolean headerComplete = false;
@@ -236,8 +238,8 @@ private void readHeaders(ByteBuffer byteBuffer, StompHeaderAccessor headerAccess
 					}
 				}
 				else {
-					String headerName = unescape(header.substring(0, colonIndex));
-					String headerValue = unescape(header.substring(colonIndex + 1));
+					String headerName = shouldUnescape ? unescape(header.substring(0, colonIndex)) : header.substring(0, colonIndex);
+					String headerValue = shouldUnescape ? unescape(header.substring(colonIndex + 1)) : header.substring(colonIndex + 1);
 					try {
 						headerAccessor.addNativeHeader(headerName, headerValue);
 					}
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java
index 439b157d2d6e..b0797dc6c171 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java
@@ -159,6 +159,23 @@ public void decodeFrameWithEscapedHeaders() {
 		assertThat(headers.getFirstNativeHeader("a:\r\n\\b")).isEqualTo("alpha:bravo\r\n\\");
 	}
 
+	@Test
+	public void decodeFrameWithHeaderWithBackslashValue() {
+		String accept = "accept-version:1.1\n";
+		String keyAndValueWithBackslash = "key:\\value\n";
+
+		Message<byte[]> frame = decode("CONNECT\n" + accept + keyAndValueWithBackslash + "\n\0");
+		StompHeaderAccessor headers = StompHeaderAccessor.wrap(frame);
+
+		assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT);
+
+		assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2);
+		assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1");
+		assertThat(headers.getFirstNativeHeader("key")).isEqualTo("\\value");
+
+		assertThat(frame.getPayload().length).isEqualTo(0);
+	}
+
 	@Test
 	public void decodeFrameBodyNotAllowed() {
 		assertThatExceptionOfType(StompConversionException.class).isThrownBy(() ->

From 2db6795a1aae8326ad5c98def421e6e7b94dc277 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 13 Dec 2021 21:03:28 +0000
Subject: [PATCH 441/735] Polishing contribution

Closes gh-27722
---
 .../messaging/simp/stomp/StompDecoder.java            | 11 +++++++----
 .../messaging/simp/stomp/StompDecoderTests.java       |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
index 66206f667953..b22e91154b53 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
@@ -143,7 +143,7 @@ private Message<byte[]> decodeMessage(ByteBuffer byteBuffer, @Nullable MultiValu
 				StompCommand stompCommand = StompCommand.valueOf(command);
 				headerAccessor = StompHeaderAccessor.create(stompCommand);
 				initHeaders(headerAccessor);
-				readHeaders(stompCommand, byteBuffer, headerAccessor);
+				readHeaders(byteBuffer, headerAccessor, stompCommand);
 				payload = readPayload(byteBuffer, headerAccessor);
 			}
 			if (payload != null) {
@@ -215,9 +215,12 @@ private String readCommand(ByteBuffer byteBuffer) {
 		return StreamUtils.copyToString(command, StandardCharsets.UTF_8);
 	}
 
-	private void readHeaders(StompCommand stompCommand, ByteBuffer byteBuffer, StompHeaderAccessor headerAccessor) {
-		boolean shouldUnescape = (stompCommand != StompCommand.CONNECT && stompCommand != StompCommand.STOMP
-				&& stompCommand != StompCommand.CONNECTED);
+	private void readHeaders(ByteBuffer byteBuffer, StompHeaderAccessor headerAccessor, StompCommand command) {
+
+		boolean shouldUnescape = (command != StompCommand.CONNECT &&
+				command != StompCommand.CONNECTED &&
+				command != StompCommand.STOMP);
+
 		while (true) {
 			ByteArrayOutputStream headerStream = new ByteArrayOutputStream(256);
 			boolean headerComplete = false;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java
index b0797dc6c171..d8cb23d02db3 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,7 +159,7 @@ public void decodeFrameWithEscapedHeaders() {
 		assertThat(headers.getFirstNativeHeader("a:\r\n\\b")).isEqualTo("alpha:bravo\r\n\\");
 	}
 
-	@Test
+	@Test // gh-27722
 	public void decodeFrameWithHeaderWithBackslashValue() {
 		String accept = "accept-version:1.1\n";
 		String keyAndValueWithBackslash = "key:\\value\n";

From 3600644ed1776dce35c4a42d74799a90b90e359e Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 14 Dec 2021 07:09:08 +0000
Subject: [PATCH 442/735] Require type-level @Controller annotation

Closes gh-22154
---
 .../RequestMappingHandlerMapping.java         |  3 +--
 .../RequestMappingHandlerMapping.java         |  3 +--
 ...HandlerMethodAnnotationDetectionTests.java |  6 +++--
 .../MvcUriComponentsBuilderTests.java         | 14 ++++++++---
 src/docs/asciidoc/web/webflux.adoc            | 23 +++++++++++++++++++
 src/docs/asciidoc/web/webmvc.adoc             | 20 ++++++++++------
 6 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
index e58948a04863..ad9335ecc2f3 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
@@ -133,8 +133,7 @@ public void afterPropertiesSet() {
 	 */
 	@Override
 	protected boolean isHandler(Class<?> beanType) {
-		return (AnnotatedElementUtils.hasAnnotation(beanType, Controller.class) ||
-				AnnotatedElementUtils.hasAnnotation(beanType, RequestMapping.class));
+		return AnnotatedElementUtils.hasAnnotation(beanType, Controller.class);
 	}
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
index bfb424d433f8..e896bd25a1db 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -266,8 +266,7 @@ public RequestMappingInfo.BuilderConfiguration getBuilderConfiguration() {
 	 */
 	@Override
 	protected boolean isHandler(Class<?> beanType) {
-		return (AnnotatedElementUtils.hasAnnotation(beanType, Controller.class) ||
-				AnnotatedElementUtils.hasAnnotation(beanType, RequestMapping.class));
+		return AnnotatedElementUtils.hasAnnotation(beanType, Controller.class);
 	}
 
 	/**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
index e0b9c866a787..9854477d73b7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ static Object[][] handlerTypes() {
 				// { ParameterizedSubclassDoesNotOverrideConcreteImplementationsFromGenericAbstractSuperclass.class, true }, // CGLIB proxy
 				// { ParameterizedSubclassDoesNotOverrideConcreteImplementationsFromGenericAbstractSuperclass.class, false },
 
-				{ InterfaceController.class, true }, // JDK dynamic proxy
+				// { InterfaceController.class, true }, // JDK dynamic proxy (gh-22154: no longer supported))
 				{ InterfaceController.class, false },
 
 				{ ParameterizedInterfaceController.class, false }, // no AOP
@@ -250,6 +250,7 @@ interface MappingInterface {
 	 * <p>JDK Dynamic proxy: All annotations must be on the interface.
 	 * <p>Without AOP: Annotations can be on interface methods except parameter annotations.
 	 */
+	@Controller
 	static class InterfaceController implements MappingInterface {
 
 		@Override
@@ -443,6 +444,7 @@ interface MappingGenericInterface<A, B, C> {
 	 * <p>All annotations can be on interface except parameter annotations.
 	 * <p>Cannot be used as JDK dynamic proxy since parameterized interface does not contain type information.
 	 */
+	@Controller
 	static class ParameterizedInterfaceController implements MappingGenericInterface<String, Date, Date> {
 
 		@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
index bce9d4f1a6be..dc49c0a539ae 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
@@ -77,6 +77,7 @@
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  */
+@SuppressWarnings("unused")
 public class MvcUriComponentsBuilderTests {
 
 	private final MockHttpServletRequest request = new MockHttpServletRequest();
@@ -455,7 +456,8 @@ public void fromControllerWithPrefix() {
 		this.request.setServerPort(9999);
 		this.request.setContextPath("/base");
 
-		assertThat(fromController(PersonsAddressesController.class).buildAndExpand("123").toString()).isEqualTo("https://example.org:9999/base/api/people/123/addresses");
+		assertThat(fromController(PersonsAddressesController.class).buildAndExpand("123").toString())
+				.isEqualTo("https://example.org:9999/base/api/people/123/addresses");
 	}
 
 	@Test
@@ -468,8 +470,12 @@ public void fromMethodWithPrefix() {
 		this.request.setServerPort(9999);
 		this.request.setContextPath("/base");
 
-		assertThat(fromMethodCall(on(PersonsAddressesController.class).getAddressesForCountry("DE"))
-				.buildAndExpand("123").toString()).isEqualTo("https://example.org:9999/base/api/people/123/addresses/DE");
+		String url = fromMethodCall(on(PersonsAddressesController.class)
+				.getAddressesForCountry("DE"))
+				.buildAndExpand("123")
+				.toString();
+
+		assertThat(url).isEqualTo("https://example.org:9999/base/api/people/123/addresses/DE");
 	}
 
 	private void initWebApplicationContext(Class<?> configClass) {
@@ -500,6 +506,7 @@ static class PersonControllerImpl implements PersonController {
 	}
 
 
+	@Controller
 	@RequestMapping("/people/{id}/addresses")
 	static class PersonsAddressesController {
 
@@ -509,6 +516,7 @@ HttpEntity<Void> getAddressesForCountry(@PathVariable String country) {
 		}
 	}
 
+	@Controller
 	@RequestMapping({"people"})
 	static class PathWithoutLeadingSlashController {
 
diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc
index ac10e816b80b..3c65f735914e 100644
--- a/src/docs/asciidoc/web/webflux.adoc
+++ b/src/docs/asciidoc/web/webflux.adoc
@@ -1348,6 +1348,29 @@ directly to the response body versus view resolution and rendering with an HTML
 
 
 
+[[webflux-ann-requestmapping-proxying]]
+==== AOP Proxies
+[.small]#<<web.adoc#mvc-ann-requestmapping-proxying, Web MVC>>#
+
+In some cases, you may need to decorate a controller with an AOP proxy at runtime.
+One example is if you choose to have `@Transactional` annotations directly on the
+controller. When this is the case, for controllers specifically, we recommend
+using class-based proxying. This is automatically the case with such annotations
+directly on the controller.
+
+If the controller implements an interface, and needs AOP proxying, you may need to
+explicitly configure class-based proxying. For example, with `@EnableTransactionManagement`
+you can change to `@EnableTransactionManagement(proxyTargetClass = true)`, and with
+`<tx:annotation-driven/>` you can change to `<tx:annotation-driven proxy-target-class="true"/>`.
+
+NOTE: Keep in mind that as of 6.0, with interface proxying, Spring MVC no longer detects
+controllers based solely on a type-level `@RequestMapping` annotation on the interface.
+Please, enable class based proxying, or otherwise the interface must also have an
+`@Controller` annotation.
+
+
+
+
 [[webflux-ann-requestmapping]]
 === Request Mapping
 [.small]#<<web.adoc#mvc-ann-requestmapping, Web MVC>>#
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index e0237b498d7a..7dc7df941dc7 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -1512,17 +1512,23 @@ directly to the response body versus view resolution and rendering with an HTML
 
 [[mvc-ann-requestmapping-proxying]]
 ==== AOP Proxies
+[.small]#<<web-reactive.adoc#webflux-ann-requestmapping-proxying, WebFlux>>#
 
 In some cases, you may need to decorate a controller with an AOP proxy at runtime.
 One example is if you choose to have `@Transactional` annotations directly on the
 controller. When this is the case, for controllers specifically, we recommend
-using class-based proxying. This is typically the default choice with controllers.
-However, if a controller must implement an interface that is not a Spring Context
-callback (such as `InitializingBean`, `*Aware`, and others), you may need to explicitly
-configure class-based proxying. For example, with `<tx:annotation-driven/>` you can
-change to `<tx:annotation-driven proxy-target-class="true"/>`, and with
-`@EnableTransactionManagement` you can change to
-`@EnableTransactionManagement(proxyTargetClass = true)`.
+using class-based proxying. This is automatically the case with such annotations
+directly on the controller.
+
+If the controller implements an interface, and needs AOP proxying, you may need to
+explicitly configure class-based proxying. For example, with `@EnableTransactionManagement`
+you can change to `@EnableTransactionManagement(proxyTargetClass = true)`, and with
+`<tx:annotation-driven/>` you can change to `<tx:annotation-driven proxy-target-class="true"/>`.
+
+NOTE: Keep in mind that as of 6.0, with interface proxying, Spring MVC no longer detects
+controllers based solely on a type-level `@RequestMapping` annotation on the interface.
+Please, enable class based proxying, or otherwise the interface must also have an
+`@Controller` annotation.
 
 
 

From 32b87104892bc5d551947af125104b350d00a80b Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 14 Dec 2021 07:31:18 +0000
Subject: [PATCH 443/735] Typo

See gh-22154
---
 src/docs/asciidoc/web/webflux.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc
index 3c65f735914e..cc4c25767951 100644
--- a/src/docs/asciidoc/web/webflux.adoc
+++ b/src/docs/asciidoc/web/webflux.adoc
@@ -1363,7 +1363,7 @@ explicitly configure class-based proxying. For example, with `@EnableTransaction
 you can change to `@EnableTransactionManagement(proxyTargetClass = true)`, and with
 `<tx:annotation-driven/>` you can change to `<tx:annotation-driven proxy-target-class="true"/>`.
 
-NOTE: Keep in mind that as of 6.0, with interface proxying, Spring MVC no longer detects
+NOTE: Keep in mind that as of 6.0, with interface proxying, Spring WebFlux no longer detects
 controllers based solely on a type-level `@RequestMapping` annotation on the interface.
 Please, enable class based proxying, or otherwise the interface must also have an
 `@Controller` annotation.

From 37bebeaaaf294ef350ec646604124b5b78c6e690 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 09:41:23 +0100
Subject: [PATCH 444/735] Accept protected @Transactional/Cacheable methods on
 CGLIB proxies

Closes gh-25582
---
 .../cache/annotation/ProxyCachingConfiguration.java          | 5 +++--
 .../annotation/ProxyTransactionManagementConfiguration.java  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
index b7d35684b32a..e5b628950b35 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,8 @@ public BeanFactoryCacheOperationSourceAdvisor cacheAdvisor(
 	@Bean
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public CacheOperationSource cacheOperationSource() {
-		return new AnnotationCacheOperationSource();
+		// Accept protected @Cacheable etc methods on CGLIB proxies, as of 6.0.
+		return new AnnotationCacheOperationSource(false);
 	}
 
 	@Bean
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
index 206cd512abc7..4469f5a0b7bf 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,8 @@ public BeanFactoryTransactionAttributeSourceAdvisor transactionAdvisor(
 	@Bean
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public TransactionAttributeSource transactionAttributeSource() {
-		return new AnnotationTransactionAttributeSource();
+		// Accept protected @Transactional methods on CGLIB proxies, as of 6.0.
+		return new AnnotationTransactionAttributeSource(false);
 	}
 
 	@Bean

From 9a513cfdea9020c6ed2cf3f37711ed4e31d7c310 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 09:44:12 +0100
Subject: [PATCH 445/735] Enforce Future/void return declaration for async
 methods

Closes gh-27734
---
 .../aop/interceptor/AsyncExecutionAspectSupport.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
index 8908cab491d2..33beb7c9e62a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -286,10 +286,14 @@ else if (ListenableFuture.class.isAssignableFrom(returnType)) {
 		else if (Future.class.isAssignableFrom(returnType)) {
 			return executor.submit(task);
 		}
-		else {
+		else if (void.class == returnType) {
 			executor.submit(task);
 			return null;
 		}
+		else {
+			throw new IllegalArgumentException(
+					"Invalid return type for async method (only Future and void supported): " + returnType);
+		}
 	}
 
 	/**

From ba468a731fc49a383021d3243e6934d29aa1a802 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 09:46:08 +0100
Subject: [PATCH 446/735] Remove JamonPerformanceMonitorInterceptor support

Includes upgrade to Tomcat 10.0.14, Undertow 2.2.14, Apache HttpClient 5.1.2, Hibernate ORM 5.6.2, Mockito 4.1.

Closes gh-27786
---
 build.gradle                                  |  30 ++--
 spring-aop/spring-aop.gradle                  |   1 -
 .../JamonPerformanceMonitorInterceptor.java   | 144 ------------------
 .../PerformanceMonitorInterceptor.java        |   3 +-
 ...monPerformanceMonitorInterceptorTests.java |  79 ----------
 spring-web/spring-web.gradle                  |   3 +-
 spring-webflux/spring-webflux.gradle          |   2 +-
 spring-websocket/spring-websocket.gradle      |   4 +-
 8 files changed, 18 insertions(+), 248 deletions(-)
 delete mode 100644 spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
 delete mode 100644 spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java

diff --git a/build.gradle b/build.gradle
index ff77a4b9829a..36449aaf58b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -112,41 +112,38 @@ configure(allprojects) { project ->
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core-jakarta:5.6.1.Final"
+			dependency "org.hibernate:hibernate-core-jakarta:5.6.2.Final"
 			dependency "org.hibernate:hibernate-validator:7.0.1.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '10.0.13') {
+			dependencySet(group: 'org.apache.tomcat', version: '10.0.14') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '10.0.13') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '10.0.14') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.13.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.14.Final') {
 				entry 'undertow-core'
-				entry 'undertow-servlet-jakartaee9'
-				entry 'undertow-websockets-jsr-jakartaee9'
+				entry 'undertow-servlet-jakarta'
+				entry 'undertow-websockets-jsr-jakarta'
 			}
 
-			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
-				entry 'okhttp'
-				entry 'mockwebserver'
-			}
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4"
+			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2'
+			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2'
 			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
-				exclude group: "commons-logging", name: "commons-logging"
+			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
+				entry 'okhttp'
+				entry 'mockwebserver'
 			}
-			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:3.0.4"
 
 			dependency "org.jruby:jruby:9.3.2.0"
 			dependency "org.python:jython-standalone:2.7.1"
@@ -180,7 +177,7 @@ configure(allprojects) { project ->
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '4.0.0') {
+			dependencySet(group: 'org.mockito', version: '4.1.0') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
@@ -201,7 +198,6 @@ configure(allprojects) { project ->
 			dependency "org.skyscreamer:jsonassert:1.5.0"
 			dependency "com.jayway.jsonpath:json-path:2.6.0"
 			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
-			dependency "com.jamonapi:jamon:2.82"
 
 			dependency "javax.cache:cache-api:1.1.1"
 			dependency "javax.money:money-api:1.1"
diff --git a/spring-aop/spring-aop.gradle b/spring-aop/spring-aop.gradle
index 67bf95e8dd6c..f87eceff6a80 100644
--- a/spring-aop/spring-aop.gradle
+++ b/spring-aop/spring-aop.gradle
@@ -5,7 +5,6 @@ dependencies {
 	api(project(":spring-core"))
 	optional("org.aspectj:aspectjweaver")
 	optional("org.apache.commons:commons-pool2")
-	optional("com.jamonapi:jamon")
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testFixturesImplementation(testFixtures(project(":spring-beans")))
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
deleted file mode 100644
index 0476a4f3c7a1..000000000000
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.
- * 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.aop.interceptor;
-
-import com.jamonapi.MonKey;
-import com.jamonapi.MonKeyImp;
-import com.jamonapi.Monitor;
-import com.jamonapi.MonitorFactory;
-import com.jamonapi.utils.Misc;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-
-/**
- * Performance monitor interceptor that uses <b>JAMon</b> library to perform the
- * performance measurement on the intercepted method and output the stats.
- * In addition, it tracks/counts exceptions thrown by the intercepted method.
- * The stack traces can be viewed in the JAMon web application.
- *
- * <p>This code is inspired by Thierry Templier's blog.
- *
- * @author Dmitriy Kopylenko
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @author Steve Souza
- * @since 1.1.3
- * @see com.jamonapi.MonitorFactory
- * @see PerformanceMonitorInterceptor
- */
-@SuppressWarnings("serial")
-public class JamonPerformanceMonitorInterceptor extends AbstractMonitoringInterceptor {
-
-	private boolean trackAllInvocations = false;
-
-
-	/**
-	 * Create a new JamonPerformanceMonitorInterceptor with a static logger.
-	 */
-	public JamonPerformanceMonitorInterceptor() {
-	}
-
-	/**
-	 * Create a new JamonPerformanceMonitorInterceptor with a dynamic or static logger,
-	 * according to the given flag.
-	 * @param useDynamicLogger whether to use a dynamic logger or a static logger
-	 * @see #setUseDynamicLogger
-	 */
-	public JamonPerformanceMonitorInterceptor(boolean useDynamicLogger) {
-		setUseDynamicLogger(useDynamicLogger);
-	}
-
-	/**
-	 * Create a new JamonPerformanceMonitorInterceptor with a dynamic or static logger,
-	 * according to the given flag.
-	 * @param useDynamicLogger whether to use a dynamic logger or a static logger
-	 * @param trackAllInvocations whether to track all invocations that go through
-	 * this interceptor, or just invocations with trace logging enabled
-	 * @see #setUseDynamicLogger
-	 */
-	public JamonPerformanceMonitorInterceptor(boolean useDynamicLogger, boolean trackAllInvocations) {
-		setUseDynamicLogger(useDynamicLogger);
-		setTrackAllInvocations(trackAllInvocations);
-	}
-
-
-	/**
-	 * Set whether to track all invocations that go through this interceptor,
-	 * or just invocations with trace logging enabled.
-	 * <p>Default is "false": Only invocations with trace logging enabled will
-	 * be monitored. Specify "true" to let JAMon track all invocations,
-	 * gathering statistics even when trace logging is disabled.
-	 */
-	public void setTrackAllInvocations(boolean trackAllInvocations) {
-		this.trackAllInvocations = trackAllInvocations;
-	}
-
-
-	/**
-	 * Always applies the interceptor if the "trackAllInvocations" flag has been set;
-	 * else just kicks in if the log is enabled.
-	 * @see #setTrackAllInvocations
-	 * @see #isLogEnabled
-	 */
-	@Override
-	protected boolean isInterceptorEnabled(MethodInvocation invocation, Log logger) {
-		return (this.trackAllInvocations || isLogEnabled(logger));
-	}
-
-	/**
-	 * Wraps the invocation with a JAMon Monitor and writes the current
-	 * performance statistics to the log (if enabled).
-	 * @see com.jamonapi.MonitorFactory#start
-	 * @see com.jamonapi.Monitor#stop
-	 */
-	@Override
-	protected Object invokeUnderTrace(MethodInvocation invocation, Log logger) throws Throwable {
-		String name = createInvocationTraceName(invocation);
-		MonKey key = new MonKeyImp(name, name, "ms.");
-
-		Monitor monitor = MonitorFactory.start(key);
-		try {
-			return invocation.proceed();
-		}
-		catch (Throwable ex) {
-			trackException(key, ex);
-			throw ex;
-		}
-		finally {
-			monitor.stop();
-			if (!this.trackAllInvocations || isLogEnabled(logger)) {
-				writeToLog(logger, "JAMon performance statistics for method [" + name + "]:\n" + monitor);
-			}
-		}
-	}
-
-	/**
-	 * Count the thrown exception and put the stack trace in the details portion of the key.
-	 * This will allow the stack trace to be viewed in the JAMon web application.
-	 */
-	protected void trackException(MonKey key, Throwable ex) {
-		String stackTrace = "stackTrace=" + Misc.getExceptionTrace(ex);
-		key.setDetails(stackTrace);
-
-		// Specific exception counter. Example: java.lang.RuntimeException
-		MonitorFactory.add(new MonKeyImp(ex.getClass().getName(), stackTrace, "Exception"), 1);
-
-		// General exception counter which is a total for all exceptions thrown
-		MonitorFactory.add(new MonKeyImp(MonitorFactory.EXCEPTIONS_LABEL, stackTrace, "Exception"), 1);
-	}
-
-}
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
index 6a0e5315feb2..610f950cff77 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@
  * @author Dmitriy Kopylenko
  * @author Rob Harrop
  * @see org.springframework.util.StopWatch
- * @see JamonPerformanceMonitorInterceptor
  */
 @SuppressWarnings("serial")
 public class PerformanceMonitorInterceptor extends AbstractMonitoringInterceptor {
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java
deleted file mode 100644
index 18556d6df509..000000000000
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptorTests.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- * 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.aop.interceptor;
-
-import com.jamonapi.MonitorFactory;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Steve Souza
- * @since 4.1
- */
-public class JamonPerformanceMonitorInterceptorTests {
-
-	private final JamonPerformanceMonitorInterceptor interceptor = new JamonPerformanceMonitorInterceptor();
-
-	private final MethodInvocation mi = mock(MethodInvocation.class);
-
-	private final Log log = mock(Log.class);
-
-
-	@BeforeEach
-	public void setUp() {
-		MonitorFactory.reset();
-	}
-
-	@AfterEach
-	public void tearDown() {
-		MonitorFactory.reset();
-	}
-
-
-	@Test
-	public void testInvokeUnderTraceWithNormalProcessing() throws Throwable {
-		given(mi.getMethod()).willReturn(String.class.getMethod("toString"));
-
-		interceptor.invokeUnderTrace(mi, log);
-
-		assertThat(MonitorFactory.getNumRows() > 0).as("jamon must track the method being invoked").isTrue();
-		assertThat(MonitorFactory.getReport().contains("toString")).as("The jamon report must contain the toString method that was invoked").isTrue();
-	}
-
-	@Test
-	public void testInvokeUnderTraceWithExceptionTracking() throws Throwable {
-		given(mi.getMethod()).willReturn(String.class.getMethod("toString"));
-		given(mi.proceed()).willThrow(new IllegalArgumentException());
-
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				interceptor.invokeUnderTrace(mi, log));
-
-		assertThat(MonitorFactory.getNumRows()).as("Monitors must exist for the method invocation and 2 exceptions").isEqualTo(3);
-		assertThat(MonitorFactory.getReport().contains("toString")).as("The jamon report must contain the toString method that was invoked").isTrue();
-		assertThat(MonitorFactory.getReport().contains(MonitorFactory.EXCEPTIONS_LABEL)).as("The jamon report must contain the generic exception: " + MonitorFactory.EXCEPTIONS_LABEL).isTrue();
-		assertThat(MonitorFactory.getReport().contains("IllegalArgumentException")).as("The jamon report must contain the specific exception: IllegalArgumentException'").isTrue();
-	}
-
-}
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index f066790df20c..40d915ea6bf4 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -35,9 +35,8 @@ dependencies {
 	optional("org.eclipse.jetty:jetty-reactive-httpclient")
 	optional('org.apache.httpcomponents.client5:httpclient5')
 	optional('org.apache.httpcomponents.core5:httpcore5-reactive')
-	optional("com.squareup.okhttp3:okhttp")
 	optional("org.apache.httpcomponents:httpclient")
-	optional("org.apache.httpcomponents:httpasyncclient")
+	optional("com.squareup.okhttp3:okhttp")
 	optional("com.fasterxml.woodstox:woodstox-core")
 	optional("com.fasterxml:aalto-xml")
 	optional("com.fasterxml.jackson.core:jackson-databind")
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index 464f3f8902c0..67773a507ca5 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -21,7 +21,7 @@ dependencies {
 		exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
 	}
 	optional("org.eclipse.jetty.websocket:websocket-jetty-client")
-	optional("io.undertow:undertow-websockets-jsr-jakartaee9")
+	optional("io.undertow:undertow-websockets-jsr-jakarta")
 	optional("org.apache.httpcomponents:httpclient")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle
index fe4f65250fff..8fdf48c5079b 100644
--- a/spring-websocket/spring-websocket.gradle
+++ b/spring-websocket/spring-websocket.gradle
@@ -18,8 +18,8 @@ dependencies {
 	}
 	optional("org.eclipse.jetty.websocket:websocket-jetty-client")
 	optional("org.eclipse.jetty:jetty-client")
-	optional("io.undertow:undertow-servlet-jakartaee9")
-	optional("io.undertow:undertow-websockets-jsr-jakartaee9")
+	optional("io.undertow:undertow-servlet-jakarta")
+	optional("io.undertow:undertow-websockets-jsr-jakarta")
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-web")))

From aeff664cf9fd7817a2c699732b150e3691018f73 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 09:46:52 +0100
Subject: [PATCH 447/735] Polishing

---
 .../java/org/springframework/core/ResolvableType.java     | 3 +--
 .../http/client/HttpComponentsClientHttpRequest.java      | 1 +
 .../client/reactive/HttpComponentsClientHttpRequest.java  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
index 17a9572ccd03..c78ecd1d459a 100644
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -976,8 +976,7 @@ public String toString() {
 		if (this.resolved == null) {
 			return "?";
 		}
-		if (this.type instanceof TypeVariable) {
-			TypeVariable<?> variable = (TypeVariable<?>) this.type;
+		if (this.type instanceof TypeVariable<?> variable) {
 			if (this.variableResolver == null || this.variableResolver.resolveVariable(variable) == null) {
 				// Don't bother with variable boundaries for toString()...
 				// Can cause infinite recursions in case of self-references
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
index 364405553725..f837391ed950 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
@@ -59,6 +59,7 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR
 		this.httpContext = context;
 	}
 
+
 	@Override
 	public HttpMethod getMethod() {
 		return HttpMethod.valueOf(this.httpRequest.getMethod());
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
index 40c6af39b589..8af84d6f0e02 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,12 +39,12 @@
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
 
-import static org.springframework.http.MediaType.ALL_VALUE;
-
 /**
  * {@link ClientHttpRequest} implementation for the Apache HttpComponents HttpClient 5.x.
+ *
  * @author Martin Tarjányi
  * @author Arjen Poutsma
  * @since 5.3
@@ -125,7 +125,7 @@ protected void applyHeaders() {
 				.forEach(entry -> entry.getValue().forEach(v -> this.httpRequest.addHeader(entry.getKey(), v)));
 
 		if (!this.httpRequest.containsHeader(HttpHeaders.ACCEPT)) {
-			this.httpRequest.addHeader(HttpHeaders.ACCEPT, ALL_VALUE);
+			this.httpRequest.addHeader(HttpHeaders.ACCEPT, MediaType.ALL_VALUE);
 		}
 	}
 

From 86eda279c82b79c7888558e7a2524db44c7ee108 Mon Sep 17 00:00:00 2001
From: Anton Naydenov <lagavas@gmail.com>
Date: Mon, 22 Nov 2021 09:53:53 +0300
Subject: [PATCH 448/735] Support SQUARE brackets [] around NAMED parameter

---
 .../r2dbc/core/NamedParameterUtils.java             |  3 ++-
 .../r2dbc/core/NamedParameterUtilsUnitTests.java    | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
index 293d84518859..724ab440bccd 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
@@ -48,6 +48,7 @@
  * @author Thomas Risberg
  * @author Juergen Hoeller
  * @author Mark Paluch
+ * @author Anton Naydenov
  * @since 5.3
  */
 abstract class NamedParameterUtils {
@@ -66,7 +67,7 @@ abstract class NamedParameterUtils {
 	 * Set of characters that qualify as parameter separators,
 	 * indicating that a parameter name in an SQL String has ended.
 	 */
-	private static final String PARAMETER_SEPARATORS = "\"':&,;()|=+-*%/\\<>^";
+	private static final String PARAMETER_SEPARATORS = "\"':&,;()|=+-*%/\\<>^[]";
 
 	/**
 	 * An index with separator flags per character code.
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java
index f332b222e8b1..679bcc1fc5dd 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java
@@ -38,6 +38,7 @@
  *
  * @author Mark Paluch
  * @author Jens Schauder
+ * @author Anton Naydenov
  */
 public class NamedParameterUtilsUnitTests {
 
@@ -274,6 +275,18 @@ public void parseSqlStatementWithQuotesAndCommentAfter() {
 		assertThat(psql2.getParameterNames()).containsExactly("xxx");
 	}
 
+	@Test public void parseSqlStatementWithSquareBracket() {
+		// given
+		String sql = "SELECT ARRAY[:ext]";
+
+		// when
+		ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
+
+		//then
+		assertThat(psql.getNamedParameterCount()).isEqualTo(1);
+		assertThat(psql.getParameterNames()).containsExactly("ext");
+	}
+
 	@Test
 	public void shouldAllowParsingMultipleUseOfParameter() {
 

From 64b6beed5b135344b6f0d15bc50bf4c08c2ab9bb Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 11:34:48 +0100
Subject: [PATCH 449/735] Consistent support for square brackets around named
 parameter

See gh-27716
---
 .../core/namedparam/NamedParameterUtils.java  |  2 +-
 .../namedparam/NamedParameterUtilsTests.java  |  8 ++++
 .../r2dbc/core/NamedParameterUtils.java       |  5 +--
 .../core/NamedParameterUtilsUnitTests.java    | 39 +++----------------
 4 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
index 981dfc22e7fb..1efea4e8031f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
@@ -55,7 +55,7 @@ public abstract class NamedParameterUtils {
 	 * Set of characters that qualify as parameter separators,
 	 * indicating that a parameter name in an SQL String has ended.
 	 */
-	private static final String PARAMETER_SEPARATORS = "\"':&,;()|=+-*%/\\<>^";
+	private static final String PARAMETER_SEPARATORS = "\"':&,;()|=+-*%/\\<>^[]";
 
 	/**
 	 * An index with separator flags per character code.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
index 7a1df2928a57..bf501d046547 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
@@ -319,4 +319,12 @@ public void parseSqlStatementWithQuotesAndCommentAfter() {
 		assertThat(psql2.getParameterNames().get(0)).isEqualTo("xxx");
 	}
 
+	@Test  // gh-27716
+	public void parseSqlStatementWithSquareBracket() {
+		String sql = "SELECT ARRAY[:ext]";
+		ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
+		assertThat(psql.getNamedParameterCount()).isEqualTo(1);
+		assertThat(psql.getParameterNames()).containsExactly("ext");
+	}
+
 }
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
index 724ab440bccd..49eecd68e96f 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,7 @@
 /**
  * Helper methods for named parameter parsing.
  *
- * <p>Only intended for internal use within Spring's R2DBC
- * framework.
+ * <p>Only intended for internal use within Spring's R2DBC framework.
  *
  * <p>References to the same parameter name are substituted with
  * the same bind marker placeholder if a {@link BindMarkersFactory} uses
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java
index 679bcc1fc5dd..5663c6307321 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ public class NamedParameterUtilsUnitTests {
 
 	private final BindMarkersFactory BIND_MARKERS = BindMarkersFactory.indexed("$", 1);
 
+
 	@Test
 	public void shouldParseSql() {
 		String sql = "xxx :a yyyy :b :c :a zzzzz";
@@ -146,7 +147,6 @@ public void parseSqlStatementWithPostgresContainedOperator() {
 		String sql = "select 'first name' from artists where info->'stat'->'albums' = ?? :album and '[\"1\",\"2\",\"3\"]'::jsonb ?? '4'";
 
 		ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
-
 		assertThat(parsedSql.getTotalParameterCount()).isEqualTo(1);
 		assertThat(expand(parsedSql)).isEqualTo(expectedSql);
 	}
@@ -157,7 +157,6 @@ public void parseSqlStatementWithPostgresAnyArrayStringsExistsOperator() {
 		String sql = "select '[\"3\", \"11\"]'::jsonb ?| '{1,3,11,12,17}'::text[]";
 
 		ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
-
 		assertThat(parsedSql.getTotalParameterCount()).isEqualTo(0);
 		assertThat(expand(parsedSql)).isEqualTo(expectedSql);
 	}
@@ -178,7 +177,6 @@ public void parseSqlStatementWithEscapedColon() {
 		String sql = "select '0\\:0' as a, foo from bar where baz < DATE(:p1 23\\:59\\:59) and baz = :p2";
 
 		ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
-
 		assertThat(parsedSql.getParameterNames()).containsExactly("p1", "p2");
 		assertThat(expand(parsedSql)).isEqualTo(expectedSql);
 	}
@@ -199,7 +197,6 @@ public void parseSqlStatementWithEmptyBracketsOrBracketsInQuotes() {
 		String sql = "select foo from bar where baz = b:{}z";
 
 		ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
-
 		assertThat(parsedSql.getParameterNames()).isEmpty();
 		assertThat(expand(parsedSql)).isEqualTo(expectedSql);
 
@@ -226,13 +223,11 @@ public void parseSqlStatementWithLogicalAnd() {
 		String expectedSql = "xxx & yyyy";
 
 		ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(expectedSql);
-
 		assertThat(expand(parsedSql)).isEqualTo(expectedSql);
 	}
 
 	@Test
 	public void substituteNamedParametersWithLogicalAnd() {
-
 		String expectedSql = "xxx & yyyy";
 
 		assertThat(expand(expectedSql)).isEqualTo(expectedSql);
@@ -250,7 +245,6 @@ public void parseSqlStatementWithQuotedSingleQuote() {
 		String sql = "SELECT ':foo'':doo', :xxx FROM DUAL";
 
 		ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
-
 		assertThat(psql.getTotalParameterCount()).isEqualTo(1);
 		assertThat(psql.getParameterNames()).containsExactly("xxx");
 	}
@@ -260,7 +254,6 @@ public void parseSqlStatementWithQuotesAndCommentBefore() {
 		String sql = "SELECT /*:doo*/':foo', :xxx FROM DUAL";
 
 		ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
-
 		assertThat(psql.getTotalParameterCount()).isEqualTo(1);
 		assertThat(psql.getParameterNames()).containsExactly("xxx");
 	}
@@ -270,30 +263,24 @@ public void parseSqlStatementWithQuotesAndCommentAfter() {
 		String sql2 = "SELECT ':foo'/*:doo*/, :xxx FROM DUAL";
 
 		ParsedSql psql2 = NamedParameterUtils.parseSqlStatement(sql2);
-
 		assertThat(psql2.getTotalParameterCount()).isEqualTo(1);
 		assertThat(psql2.getParameterNames()).containsExactly("xxx");
 	}
 
-	@Test public void parseSqlStatementWithSquareBracket() {
-		// given
+	@Test  // gh-27716
+	public void parseSqlStatementWithSquareBracket() {
 		String sql = "SELECT ARRAY[:ext]";
 
-		// when
 		ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
-
-		//then
 		assertThat(psql.getNamedParameterCount()).isEqualTo(1);
 		assertThat(psql.getParameterNames()).containsExactly("ext");
 	}
 
 	@Test
 	public void shouldAllowParsingMultipleUseOfParameter() {
-
 		String sql = "SELECT * FROM person where name = :id or lastname = :id";
 
 		ParsedSql parsed = NamedParameterUtils.parseSqlStatement(sql);
-
 		assertThat(parsed.getTotalParameterCount()).isEqualTo(2);
 		assertThat(parsed.getNamedParameterCount()).isEqualTo(1);
 		assertThat(parsed.getParameterNames()).containsExactly("id", "id");
@@ -313,23 +300,19 @@ sql, factory, new MapBindParameterSource(
 				"SELECT * FROM person where name = $0 or lastname = $0");
 
 		operation.bindTo(new BindTarget() {
-
 			@Override
 			public void bind(String identifier, Object value) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bind(int index, Object value) {
 				assertThat(index).isEqualTo(0);
 				assertThat(value).isEqualTo("foo");
 			}
-
 			@Override
 			public void bindNull(String identifier, Class<?> type) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bindNull(int index, Class<?> type) {
 				throw new UnsupportedOperationException();
@@ -353,25 +336,20 @@ sql, factory, new MapBindParameterSource(Collections.singletonMap("ids",
 				"SELECT * FROM person where name IN ($0, $1, $2) or lastname IN ($0, $1, $2)");
 
 		operation.bindTo(new BindTarget() {
-
 			@Override
 			public void bind(String identifier, Object value) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bind(int index, Object value) {
 				assertThat(index).isIn(0, 1, 2);
 				assertThat(value).isIn("foo", "bar", "baz");
-
 				bindings.add(index, value);
 			}
-
 			@Override
 			public void bindNull(String identifier, Class<?> type) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bindNull(int index, Class<?> type) {
 				throw new UnsupportedOperationException();
@@ -399,22 +377,18 @@ sql, factory, new MapBindParameterSource(
 		Map<Integer, Object> bindValues = new LinkedHashMap<>();
 
 		operation.bindTo(new BindTarget() {
-
 			@Override
 			public void bind(String identifier, Object value) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bind(int index, Object value) {
 				bindValues.put(index, value);
 			}
-
 			@Override
 			public void bindNull(String identifier, Class<?> type) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bindNull(int index, Class<?> type) {
 				throw new UnsupportedOperationException();
@@ -438,22 +412,18 @@ sql, factory, new MapBindParameterSource(
 				"SELECT * FROM person where name = $0 or lastname = $0");
 
 		operation.bindTo(new BindTarget() {
-
 			@Override
 			public void bind(String identifier, Object value) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bind(int index, Object value) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bindNull(String identifier, Class<?> type) {
 				throw new UnsupportedOperationException();
 			}
-
 			@Override
 			public void bindNull(int index, Class<?> type) {
 				assertThat(index).isEqualTo(0);
@@ -462,6 +432,7 @@ public void bindNull(int index, Class<?> type) {
 		});
 	}
 
+
 	private String expand(ParsedSql sql) {
 		return NamedParameterUtils.substituteNamedParameters(sql, BIND_MARKERS,
 				new MapBindParameterSource()).toQuery();

From 2fb3f9993f34c561223c5dc3b35537d78020e21d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 13:43:44 +0100
Subject: [PATCH 450/735] Upgrade to AspectJ 1.9.8 RC3

Closes gh-27537
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 36449aaf58b0..1d7fba3c0233 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ configure(allprojects) { project ->
 			}
 			dependency "com.google.code.findbugs:jsr305:3.0.2"
 
-			dependencySet(group: 'org.aspectj', version: '1.9.8.RC1') {
+			dependencySet(group: 'org.aspectj', version: '1.9.8.RC3') {
 				entry 'aspectjrt'
 				entry 'aspectjtools'
 				entry 'aspectjweaver'

From 8422d9d22f4156831a92b5e01950306880135c0f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 14 Dec 2021 13:44:48 +0100
Subject: [PATCH 451/735] Add default methods to CachingConfigurer

This commit adds default methods to CachingConfigurer and
JCacheConfigurer and removes the reference to their respective support
classes as they are now irrelevant.

Closes gh-27811
---
 .../cache/jcache/config/JCacheConfigurer.java | 10 ++++-----
 .../jcache/JCacheEhCacheAnnotationTests.java  |  6 ++---
 .../jcache/config/JCacheJavaConfigTests.java  |  8 +++----
 .../interceptor/JCacheErrorHandlerTests.java  |  6 ++---
 .../interceptor/JCacheKeyGeneratorTests.java  |  8 +++----
 .../cache/annotation/CachingConfigurer.java   | 22 ++++++++++++-------
 .../cache/CacheReproTests.java                |  6 ++---
 .../config/EnableCachingIntegrationTests.java |  6 ++---
 .../cache/config/EnableCachingTests.java      | 10 ++++-----
 .../ExpressionCachingIntegrationTests.java    |  6 ++---
 .../interceptor/CacheErrorHandlerTests.java   |  6 ++---
 .../interceptor/CachePutEvaluationTests.java  |  6 ++---
 .../CacheResolverCustomizationTests.java      |  6 ++---
 .../interceptor/CacheSyncFailureTests.java    |  6 ++---
 14 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java
index 989e720aeb99..039729a02d50 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,7 @@
  * <p>To be implemented by classes annotated with
  * {@link org.springframework.cache.annotation.EnableCaching} that wish
  * or need to specify explicitly how exception caches are resolved for
- * annotation-driven cache management. Consider extending {@link JCacheConfigurerSupport},
- * which provides a stub implementation of all interface methods.
+ * annotation-driven cache management.
  *
  * <p>See {@link org.springframework.cache.annotation.EnableCaching} for
  * general examples and context; see {@link #exceptionCacheResolver()} for
@@ -36,7 +35,6 @@
  * @author Stephane Nicoll
  * @since 4.1
  * @see CachingConfigurer
- * @see JCacheConfigurerSupport
  * @see org.springframework.cache.annotation.EnableCaching
  */
 public interface JCacheConfigurer extends CachingConfigurer {
@@ -60,6 +58,8 @@ public interface JCacheConfigurer extends CachingConfigurer {
 	 * See {@link org.springframework.cache.annotation.EnableCaching} for more complete examples.
 	 */
 	@Nullable
-	CacheResolver exceptionCacheResolver();
+	default CacheResolver exceptionCacheResolver() {
+		return null;
+	}
 
 }
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
index 188cc293c974..e73dd79a222d 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.interceptor.KeyGenerator;
 import org.springframework.cache.interceptor.SimpleKeyGenerator;
@@ -104,7 +104,7 @@ public void testEvictAllEarlyWithTransaction() {
 
 	@Configuration
 	@EnableCaching
-	static class EnableCachingConfig extends CachingConfigurerSupport {
+	static class EnableCachingConfig implements CachingConfigurer {
 
 		@Autowired
 		CachingProvider cachingProvider;
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java
index 5c12aceac022..1dcc12540d1e 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -180,7 +180,7 @@ public CacheResolver exceptionCacheResolver() {
 
 	@Configuration
 	@EnableCaching
-	public static class EmptyConfigSupportConfig extends JCacheConfigurerSupport {
+	public static class EmptyConfigSupportConfig implements JCacheConfigurer {
 		@Bean
 		public CacheManager cm() {
 			return new NoOpCacheManager();
@@ -190,7 +190,7 @@ public CacheManager cm() {
 
 	@Configuration
 	@EnableCaching
-	static class FullCachingConfigSupport extends JCacheConfigurerSupport {
+	static class FullCachingConfigSupport implements JCacheConfigurer {
 
 		@Override
 		@Bean
@@ -220,7 +220,7 @@ public CacheResolver exceptionCacheResolver() {
 
 	@Configuration
 	@EnableCaching
-	static class NoExceptionCacheResolverConfig extends JCacheConfigurerSupport {
+	static class NoExceptionCacheResolverConfig implements JCacheConfigurer {
 
 		@Override
 		@Bean
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java
index 3b341a0c4df0..561c0af54d1b 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.interceptor.CacheErrorHandler;
 import org.springframework.cache.interceptor.SimpleKeyGenerator;
-import org.springframework.cache.jcache.config.JCacheConfigurerSupport;
+import org.springframework.cache.jcache.config.JCacheConfigurer;
 import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -141,7 +141,7 @@ public void clearFail() {
 
 	@Configuration
 	@EnableCaching
-	static class Config extends JCacheConfigurerSupport {
+	static class Config implements JCacheConfigurer {
 
 		@Bean
 		@Override
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java
index dd5497764b0c..35db912df971 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
 import org.springframework.cache.interceptor.KeyGenerator;
 import org.springframework.cache.interceptor.SimpleKey;
 import org.springframework.cache.interceptor.SimpleKeyGenerator;
-import org.springframework.cache.jcache.config.JCacheConfigurerSupport;
+import org.springframework.cache.jcache.config.JCacheConfigurer;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -97,7 +97,7 @@ public void getFiltered() {
 
 	@Configuration
 	@EnableCaching
-	static class Config extends JCacheConfigurerSupport {
+	static class Config implements JCacheConfigurer {
 
 		@Bean
 		@Override
@@ -151,7 +151,7 @@ private void expect(Object... params) {
 		@Override
 		public Object generate(Object target, Method method, Object... params) {
 			assertThat(Arrays.equals(expectedParams, params)).as("Unexpected parameters: expected: "
-								+ Arrays.toString(this.expectedParams) + " but got: " + Arrays.toString(params)).isTrue();
+					+ Arrays.toString(this.expectedParams) + " but got: " + Arrays.toString(params)).isTrue();
 			return new SimpleKey(params);
 		}
 	}
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
index b7a609e9c238..e3dbe023f189 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,7 @@
  * Interface to be implemented by @{@link org.springframework.context.annotation.Configuration
  * Configuration} classes annotated with @{@link EnableCaching} that wish or need to
  * specify explicitly how caches are resolved and how keys are generated for annotation-driven
- * cache management. Consider extending {@link CachingConfigurerSupport}, which provides a
- * stub implementation of all interface methods.
+ * cache management.
  *
  * <p>See @{@link EnableCaching} for general examples and context; see
  * {@link #cacheManager()}, {@link #cacheResolver()} and {@link #keyGenerator()}
@@ -37,7 +36,6 @@
  * @author Stephane Nicoll
  * @since 3.1
  * @see EnableCaching
- * @see CachingConfigurerSupport
  */
 public interface CachingConfigurer {
 
@@ -64,7 +62,9 @@ public interface CachingConfigurer {
 	 * See @{@link EnableCaching} for more complete examples.
 	 */
 	@Nullable
-	CacheManager cacheManager();
+	default CacheManager cacheManager() {
+		return null;
+	}
 
 	/**
 	 * Return the {@link CacheResolver} bean to use to resolve regular caches for
@@ -89,7 +89,9 @@ public interface CachingConfigurer {
 	 * See {@link EnableCaching} for more complete examples.
 	 */
 	@Nullable
-	CacheResolver cacheResolver();
+	default CacheResolver cacheResolver() {
+		return null;
+	}
 
 	/**
 	 * Return the key generator bean to use for annotation-driven cache management.
@@ -110,7 +112,9 @@ public interface CachingConfigurer {
 	 * See @{@link EnableCaching} for more complete examples.
 	 */
 	@Nullable
-	KeyGenerator keyGenerator();
+	default KeyGenerator keyGenerator() {
+		return null;
+	}
 
 	/**
 	 * Return the {@link CacheErrorHandler} to use to handle cache-related errors.
@@ -133,6 +137,8 @@ public interface CachingConfigurer {
 	 * See @{@link EnableCaching} for more complete examples.
 	 */
 	@Nullable
-	CacheErrorHandler errorHandler();
+	default CacheErrorHandler errorHandler() {
+		return null;
+	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/cache/CacheReproTests.java b/spring-context/src/test/java/org/springframework/cache/CacheReproTests.java
index 4c81623f507e..b08c6f895a06 100644
--- a/spring-context/src/test/java/org/springframework/cache/CacheReproTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/CacheReproTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Caching;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
@@ -306,7 +306,7 @@ public Object getNeverCache(String key) {
 
 	@Configuration
 	@EnableCaching
-	public static class Spr13081Config extends CachingConfigurerSupport {
+	public static class Spr13081Config implements CachingConfigurer {
 
 		@Bean
 		@Override
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
index 858d9c0d5b92..6e10f5d04c64 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -124,7 +124,7 @@ private Cache getCache() {
 
 
 	@Configuration
-	static class SharedConfig extends CachingConfigurerSupport {
+	static class SharedConfig implements CachingConfigurer {
 
 		@Override
 		@Bean
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
index ea7717478968..8c41ef04570e 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
@@ -22,7 +22,7 @@
 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.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.interceptor.CacheErrorHandler;
 import org.springframework.cache.interceptor.CacheInterceptor;
@@ -150,7 +150,7 @@ public void bothSetOnlyResolverIsUsed() {
 
 	@Configuration
 	@EnableCaching
-	static class EnableCachingConfig extends CachingConfigurerSupport {
+	static class EnableCachingConfig implements CachingConfigurer {
 
 		@Override
 		@Bean
@@ -227,7 +227,7 @@ public CacheManager cm2() {
 
 	@Configuration
 	@EnableCaching
-	static class MultiCacheManagerConfigurer extends CachingConfigurerSupport {
+	static class MultiCacheManagerConfigurer implements CachingConfigurer {
 
 		@Bean
 		public CacheManager cm1() {
@@ -253,7 +253,7 @@ public KeyGenerator keyGenerator() {
 
 	@Configuration
 	@EnableCaching
-	static class EmptyConfigSupportConfig extends CachingConfigurerSupport {
+	static class EmptyConfigSupportConfig implements CachingConfigurer {
 
 		@Bean
 		public CacheManager cm() {
@@ -264,7 +264,7 @@ public CacheManager cm() {
 
 	@Configuration
 	@EnableCaching
-	static class FullCachingConfig extends CachingConfigurerSupport {
+	static class FullCachingConfig implements CachingConfigurer {
 
 		@Override
 		@Bean
diff --git a/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java
index ae109aec5c56..5ba071381fc7 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -122,7 +122,7 @@ public String getId() {
 
 	@Configuration
 	@EnableCaching
-	static class SharedConfig extends CachingConfigurerSupport {
+	static class SharedConfig implements CachingConfigurer {
 
 		@Override
 		@Bean
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java
index cfcd9cd713ae..90e26dd51f39 100644
--- a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.cache.support.SimpleValueWrapper;
@@ -170,7 +170,7 @@ public void clearFailProperException() {
 
 	@Configuration
 	@EnableCaching
-	static class Config extends CachingConfigurerSupport {
+	static class Config implements CachingConfigurer {
 
 		@Bean
 		@Override
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CachePutEvaluationTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CachePutEvaluationTests.java
index d17630a8ed29..c257534c6fb0 100644
--- a/spring-context/src/test/java/org/springframework/cache/interceptor/CachePutEvaluationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CachePutEvaluationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -106,7 +106,7 @@ public void getAndPut() {
 
 	@Configuration
 	@EnableCaching
-	static class Config extends CachingConfigurerSupport {
+	static class Config implements CachingConfigurer {
 
 		@Bean
 		@Override
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java
index ca2e76fc36ff..86f0223402f9 100644
--- a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -149,7 +149,7 @@ public void unknownCacheResolver() {
 
 	@Configuration
 	@EnableCaching
-	static class Config extends CachingConfigurerSupport {
+	static class Config implements CachingConfigurer {
 
 		@Override
 		@Bean
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java
index 2a3eccc6db7b..de4776adae2e 100644
--- a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.Caching;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -133,7 +133,7 @@ public Object syncWithTwoGetOperations(Object arg1) {
 
 	@Configuration
 	@EnableCaching
-	static class Config extends CachingConfigurerSupport {
+	static class Config implements CachingConfigurer {
 
 		@Override
 		@Bean

From ceea00f73306d17e777946ee589ecdd8e8e59e54 Mon Sep 17 00:00:00 2001
From: Kwangyong Kim <banana.yong@gmail.com>
Date: Wed, 24 Nov 2021 16:41:10 +0900
Subject: [PATCH 452/735] Fix cache annotation tip

Even if using cglib proxy mode, annotations on an interface can be recognized.

Signed-off-by: Kwangyong Kim <banana.yong@gmail.com>
---
 .../config/EnableCachingIntegrationTests.java | 38 +++++++++++++++++++
 src/docs/asciidoc/integration.adoc            |  8 ++--
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
index 858d9c0d5b92..5fe72ce41164 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
@@ -73,6 +73,19 @@ public void fooServiceWithInterfaceCglib() {
 		fooGetSimple(service);
 	}
 
+	@Test
+	public void barServiceWithCacheableInterfaceCglib() {
+		this.context = new AnnotationConfigApplicationContext(BarConfigCglib.class);
+		BarService service = this.context.getBean(BarService.class);
+		Cache cache = getCache();
+
+		Object key = new Object();
+		assertCacheMiss(key, cache);
+
+		Object value = service.getSimple(key);
+		assertCacheHit(key, value, cache);
+	}
+
 	private void fooGetSimple(FooService service) {
 		Cache cache = getCache();
 
@@ -184,6 +197,31 @@ public Object getWithCondition(Object key) {
 		}
 	}
 
+	@Configuration
+	@Import(SharedConfig.class)
+	@EnableCaching(proxyTargetClass = true)
+	static class BarConfigCglib {
+
+		@Bean
+		public BarService barService() {
+			return new BarServiceImpl();
+		}
+	}
+
+	interface BarService {
+		@Cacheable(cacheNames = "testCache")
+		Object getSimple(Object key);
+	}
+
+	static class BarServiceImpl implements BarService {
+
+		private final AtomicLong counter = new AtomicLong();
+
+		@Override
+		public Object getSimple(Object key) {
+			return this.counter.getAndIncrement();
+		}
+	}
 
 	@Configuration
 	@Import(FooConfig.class)
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index e619d93fde11..9d058c316abe 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -6226,11 +6226,9 @@ if you need to annotate non-public methods, as it changes the bytecode itself.
 TIP: Spring recommends that you only annotate concrete classes (and methods of concrete
 classes) with the `@Cache{asterisk}` annotation, as opposed to annotating interfaces.
 You certainly can place the `@Cache{asterisk}` annotation on an interface (or an interface
-method), but this works only as you would expect it to if you use interface-based proxies.
-The fact that Java annotations are not inherited from interfaces means that, if you use
-class-based proxies (`proxy-target-class="true"`) or the weaving-based aspect
-(`mode="aspectj"`), the caching settings are not recognized by the proxying and weaving
-infrastructure, and the object is not wrapped in a caching proxy.
+method), but this works only as you would expect it to if you use the proxy mode (`mode="proxy"`).
+If you use the weaving-based aspect (`mode="aspectj"`), the caching settings are not
+recognized by weaving infrastructure.
 
 NOTE: In proxy mode (the default), only external method calls coming in through the
 proxy are intercepted. This means that self-invocation (in effect, a method within the

From b06d267232f3951e4d4bdbfbb04c4ce1d83f3b8c Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 14 Dec 2021 13:56:28 +0100
Subject: [PATCH 453/735] Remove references to AsyncConfigurerSupport

Closes gh-27812
---
 .../scheduling/annotation/AsyncConfigurer.java |  8 +-------
 .../AsyncAnnotationBeanPostProcessorTests.java |  8 ++++----
 ...gTestExecutionListenerIntegrationTests.java | 18 +++++++++++-------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
index eab9744cf340..488297171ba6 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,6 @@
  * {@link AsyncUncaughtExceptionHandler} instance used to process exception thrown from
  * async method with {@code void} return type.
  *
- * <p>Consider using {@link AsyncConfigurerSupport} providing default implementations for
- * both methods if only one element needs to be customized. Furthermore, backward compatibility
- * of this interface will be insured in case new customization options are introduced
- * in the future.
- *
  * <p>See @{@link EnableAsync} for usage examples.
  *
  * @author Chris Beams
@@ -40,7 +35,6 @@
  * @since 3.1
  * @see AbstractAsyncConfiguration
  * @see EnableAsync
- * @see AsyncConfigurerSupport
  */
 public interface AsyncConfigurer {
 
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
index 477a97dec3df..2599d1a3cefb 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -218,8 +218,8 @@ public void handleExceptionWithListenableFuture() {
 	private void assertFutureWithException(Future<Object> result,
 			TestableAsyncUncaughtExceptionHandler exceptionHandler) {
 		assertThatExceptionOfType(ExecutionException.class).isThrownBy(
-				result::get)
-			.withCauseExactlyInstanceOf(UnsupportedOperationException.class);
+						result::get)
+				.withCauseExactlyInstanceOf(UnsupportedOperationException.class);
 		assertThat(exceptionHandler.isCalled()).as("handler should never be called with Future return type").isFalse();
 	}
 
@@ -343,7 +343,7 @@ public void execute(Runnable r) {
 
 	@Configuration
 	@EnableAsync
-	static class ConfigWithExceptionHandler extends AsyncConfigurerSupport {
+	static class ConfigWithExceptionHandler implements AsyncConfigurer {
 
 		@Bean
 		public ITestBean target() {
diff --git a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java
index c3edfeb83869..7cba9a363509 100644
--- a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
@@ -73,13 +73,17 @@ public class EventPublishingTestExecutionListenerIntegrationTests {
 	private static final CountDownLatch countDownLatch = new CountDownLatch(1);
 
 	private final TestContextManager testContextManager = new TestContextManager(ExampleTestCase.class);
+
 	private final TestContext testContext = testContextManager.getTestContext();
+
 	// Note that the following invocation of getApplicationContext() forces eager
 	// loading of the test's ApplicationContext which consequently results in the
 	// publication of all test execution events. Otherwise, TestContext#publishEvent
 	// would never fire any events for ExampleTestCase.
 	private final TestExecutionListener listener = testContext.getApplicationContext().getBean(TestExecutionListener.class);
+
 	private final Object testInstance = new ExampleTestCase();
+
 	private final Method traceableTestMethod = ReflectionUtils.findMethod(ExampleTestCase.class, "traceableTest");
 
 
@@ -127,8 +131,8 @@ public void beforeTestMethodAnnotationWithFailingCondition() throws Exception {
 	public void beforeTestMethodAnnotationWithFailingEventListener() throws Exception {
 		Method method = ReflectionUtils.findMethod(ExampleTestCase.class, "testWithFailingEventListener");
 		assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
-				testContextManager.beforeTestMethod(testInstance, method))
-			.withMessageContaining("Boom!");
+						testContextManager.beforeTestMethod(testInstance, method))
+				.withMessageContaining("Boom!");
 		verify(listener, only()).beforeTestMethod(testContext);
 	}
 
@@ -149,7 +153,7 @@ public void beforeTestMethodAnnotationWithFailingAsyncEventListener() throws Exc
 
 		verify(listener, only()).beforeTestMethod(testContext);
 		assertThat(TrackingAsyncUncaughtExceptionHandler.asyncException.getMessage())
-			.startsWith("Asynchronous exception for test method [" + methodName + "] in thread [" + THREAD_NAME_PREFIX);
+				.startsWith("Asynchronous exception for test method [" + methodName + "] in thread [" + THREAD_NAME_PREFIX);
 	}
 
 	@Test
@@ -211,7 +215,7 @@ public void testWithFailingAsyncEventListener() {
 
 	@Configuration
 	@EnableAsync(proxyTargetClass = true)
-	static class TestEventListenerConfiguration extends AsyncConfigurerSupport {
+	static class TestEventListenerConfiguration implements AsyncConfigurer {
 
 		@Override
 		public Executor getAsyncExecutor() {
@@ -306,7 +310,7 @@ static class AsyncTestEventComponent {
 		public void beforeTestMethodWithAsyncFailure(BeforeTestMethodEvent event) throws Exception {
 			this.listener.beforeTestMethod(event.getSource());
 			throw new RuntimeException(String.format("Asynchronous exception for test method [%s] in thread [%s]",
-				event.getTestContext().getTestMethod().getName(), Thread.currentThread().getName()));
+					event.getTestContext().getTestMethod().getName(), Thread.currentThread().getName()));
 		}
 
 	}

From bb53a99defc5ec70393ff21a8a40f74d650e2e1a Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 14 Dec 2021 15:25:50 +0100
Subject: [PATCH 454/735] Upgrade to Kotlin 1.6.10

Closes gh-27413
---
 build.gradle                                           | 10 +++++-----
 .../context/support/BeanDefinitionDsl.kt               |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1d7fba3c0233..23c1600d55cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.10'
 	id "io.freefair.aspectj" version '6.3.0' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
-	id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
@@ -33,7 +33,7 @@ configure(allprojects) { project ->
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:11.0.7"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
 			mavenBom "org.junit:junit-bom:5.8.2"
@@ -277,8 +277,8 @@ configure([rootProject] + javaProjects) { project ->
 
 		compileKotlin {
 			kotlinOptions {
-				languageVersion = "1.3"
-				apiVersion = "1.3"
+				languageVersion = "1.6"
+				apiVersion = "1.6"
 				freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings", "-Xopt-in=kotlin.RequiresOptIn"]
 				allWarningsAsErrors = true
 			}
diff --git a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt
index f5dfa9186846..a13723158986 100644
--- a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt
+++ b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt
@@ -178,7 +178,7 @@ open class BeanDefinitionDsl internal constructor (private val init: BeanDefinit
 									  role: Role? = null) {
 
 		val customizer = BeanDefinitionCustomizer { bd ->
-			scope?.let { bd.scope = scope.name.toLowerCase() }
+			scope?.let { bd.scope = scope.name.lowercase() }
 			isLazyInit?.let { bd.isLazyInit = isLazyInit }
 			isPrimary?.let { bd.isPrimary = isPrimary }
 			isAutowireCandidate?.let { bd.isAutowireCandidate = isAutowireCandidate }
@@ -221,7 +221,7 @@ open class BeanDefinitionDsl internal constructor (private val init: BeanDefinit
 									  crossinline function: BeanSupplierContext.() -> T) {
 
 		val customizer = BeanDefinitionCustomizer { bd ->
-			scope?.let { bd.scope = scope.name.toLowerCase() }
+			scope?.let { bd.scope = scope.name.lowercase() }
 			isLazyInit?.let { bd.isLazyInit = isLazyInit }
 			isPrimary?.let { bd.isPrimary = isPrimary }
 			isAutowireCandidate?.let { bd.isAutowireCandidate = isAutowireCandidate }

From 8b80d38c339717cc66edc9f56ac8b503da50e179 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 14 Dec 2021 15:33:55 +0100
Subject: [PATCH 455/735] Upgrade to Reactor 2020.0.14

Closes gh-27793
---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 367edd2b90ba..e1cd581786ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.72.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.14-SNAPSHOT"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.14"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,7 +292,6 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
-			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From c44447f622b35331e6e3a41eb7f8578fcd62b7c1 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:46:01 +0100
Subject: [PATCH 456/735] Avoid early initialization of empty interceptor names

Closes gh-12238
---
 .../aop/framework/ProxyFactoryBean.java       | 12 ++----
 .../aop/framework/ProxyFactoryBeanTests.java  | 38 +++++++++++++++++--
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
index 6c9efc49f0d7..5e1ed1603fa6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -421,11 +421,7 @@ private boolean isNamedBeanAnAdvisorOrAdvice(String beanName) {
 	 * are unaffected by such changes.
 	 */
 	private synchronized void initializeAdvisorChain() throws AopConfigException, BeansException {
-		if (this.advisorChainInitialized) {
-			return;
-		}
-
-		if (!ObjectUtils.isEmpty(this.interceptorNames)) {
+		if (!this.advisorChainInitialized && !ObjectUtils.isEmpty(this.interceptorNames)) {
 			if (this.beanFactory == null) {
 				throw new IllegalStateException("No BeanFactory available anymore (probably due to serialization) " +
 						"- cannot resolve interceptor names " + Arrays.asList(this.interceptorNames));
@@ -464,9 +460,9 @@ private synchronized void initializeAdvisorChain() throws AopConfigException, Be
 					addAdvisorOnChainCreation(advice);
 				}
 			}
-		}
 
-		this.advisorChainInitialized = true;
+			this.advisorChainInitialized = true;
+		}
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index 57df369b68eb..91d85d35dadd 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,10 +65,10 @@
 import static org.assertj.core.api.Assertions.assertThatIOException;
 
 /**
- * @since 13.03.2003
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Chris Beams
+ * @since 13.03.2003
  */
 public class ProxyFactoryBeanTests {
 
@@ -633,20 +633,50 @@ public void testFrozenFactoryBean() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(FROZEN_CONTEXT, CLASS));
 
-		Advised advised = (Advised)bf.getBean("frozen");
+		Advised advised = (Advised) bf.getBean("frozen");
 		assertThat(advised.isFrozen()).as("The proxy should be frozen").isTrue();
 	}
 
 	@Test
-	public void testDetectsInterfaces() throws Exception {
+	public void testDetectsInterfaces() {
 		ProxyFactoryBean fb = new ProxyFactoryBean();
 		fb.setTarget(new TestBean());
 		fb.addAdvice(new DebugInterceptor());
 		fb.setBeanFactory(new DefaultListableBeanFactory());
+
 		ITestBean proxy = (ITestBean) fb.getObject();
 		assertThat(AopUtils.isJdkDynamicProxy(proxy)).isTrue();
 	}
 
+	@Test
+	public void testWithInterceptorNames() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerSingleton("debug", new DebugInterceptor());
+
+		ProxyFactoryBean fb = new ProxyFactoryBean();
+		fb.setTarget(new TestBean());
+		fb.setInterceptorNames("debug");
+		fb.setBeanFactory(bf);
+
+		Advised proxy = (Advised) fb.getObject();
+		assertThat(proxy.getAdvisorCount()).isEqualTo(1);
+	}
+
+	@Test
+	public void testWithLateInterceptorNames() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerSingleton("debug", new DebugInterceptor());
+
+		ProxyFactoryBean fb = new ProxyFactoryBean();
+		fb.setTarget(new TestBean());
+		fb.setBeanFactory(bf);
+		fb.getObject();
+
+		fb.setInterceptorNames("debug");
+		Advised proxy = (Advised) fb.getObject();
+		assertThat(proxy.getAdvisorCount()).isEqualTo(1);
+	}
+
 
 	/**
 	 * Fires only on void methods. Saves list of methods intercepted.

From d7b9270672a141cd5b046fbdeb8a22f269c73a6f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:46:13 +0100
Subject: [PATCH 457/735] Clarify SchedulerFactoryBean's
 LocalDataSourceJobStore overriding

Includes clarification of interface-level cache annotations for target-class proxies.

Closes gh-27709
See gh-27726
---
 .../quartz/LocalDataSourceJobStore.java       |  3 ++
 .../quartz/SchedulerFactoryBean.java          |  4 +-
 .../config/EnableCachingIntegrationTests.java | 43 +++++++++++++++++++
 src/docs/asciidoc/integration.adoc            | 32 +++++++-------
 4 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
index e0b12f443f91..e4b09c0798fb 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
@@ -39,6 +39,7 @@
  * Subclass of Quartz's {@link JobStoreCMT} class that delegates to a Spring-managed
  * {@link DataSource} instead of using a Quartz-managed JDBC connection pool.
  * This JobStore will be used if SchedulerFactoryBean's "dataSource" property is set.
+ * You may also configure it explicitly, possibly as a custom subclass of this class.
  *
  * <p>Supports both transactional and non-transactional DataSource access.
  * With a non-XA DataSource and local Spring transactions, a single DataSource
@@ -58,6 +59,8 @@
  * @since 1.1
  * @see SchedulerFactoryBean#setDataSource
  * @see SchedulerFactoryBean#setNonTransactionalDataSource
+ * @see SchedulerFactoryBean#getConfigTimeDataSource()
+ * @see SchedulerFactoryBean#getConfigTimeNonTransactionalDataSource()
  * @see org.springframework.jdbc.datasource.DataSourceUtils#doGetConnection
  * @see org.springframework.jdbc.datasource.DataSourceUtils#releaseConnection
  */
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
index e0982a2e5ff9..15185bba6c37 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
@@ -310,9 +310,11 @@ public void setTaskExecutor(Executor taskExecutor) {
 
 	/**
 	 * Set the default {@link DataSource} to be used by the Scheduler.
-	 * If set, this will override corresponding settings in Quartz properties.
 	 * <p>Note: If this is set, the Quartz settings should not define
 	 * a job store "dataSource" to avoid meaningless double configuration.
+	 * Also, do not define a "org.quartz.jobStore.class" property at all.
+	 * (You may explicitly define Spring's {@link LocalDataSourceJobStore}
+	 * but that's the default when using this method anyway.)
 	 * <p>A Spring-specific subclass of Quartz' JobStoreCMT will be used.
 	 * It is therefore strongly recommended to perform all operations on
 	 * the Scheduler within Spring-managed (or plain JTA) transactions.
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
index 6e10f5d04c64..6a7e1127aecd 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
@@ -83,6 +83,19 @@ private void fooGetSimple(FooService service) {
 		assertCacheHit(key, value, cache);
 	}
 
+	@Test
+	public void barServiceWithCacheableInterfaceCglib() {
+		this.context = new AnnotationConfigApplicationContext(BarConfigCglib.class);
+		BarService service = this.context.getBean(BarService.class);
+		Cache cache = getCache();
+
+		Object key = new Object();
+		assertCacheMiss(key, cache);
+
+		Object value = service.getSimple(key);
+		assertCacheHit(key, value, cache);
+	}
+
 	@Test
 	public void beanConditionOff() {
 		this.context = new AnnotationConfigApplicationContext(BeanConditionConfig.class);
@@ -185,6 +198,36 @@ public Object getWithCondition(Object key) {
 	}
 
 
+	@Configuration
+	@Import(SharedConfig.class)
+	@EnableCaching(proxyTargetClass = true)
+	static class BarConfigCglib {
+
+		@Bean
+		public BarService barService() {
+			return new BarServiceImpl();
+		}
+	}
+
+
+	interface BarService {
+
+		@Cacheable(cacheNames = "testCache")
+		Object getSimple(Object key);
+	}
+
+
+	static class BarServiceImpl implements BarService {
+
+		private final AtomicLong counter = new AtomicLong();
+
+		@Override
+		public Object getSimple(Object key) {
+			return this.counter.getAndIncrement();
+		}
+	}
+
+
 	@Configuration
 	@Import(FooConfig.class)
 	@EnableCaching
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index f2ec53ad0aed..9ea8f646d7d5 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -5396,6 +5396,7 @@ You can use these macros instead of the six-digit value, thus: `@Scheduled(cron
 |===
 
 
+
 [[scheduling-quartz]]
 === Using the Quartz Scheduler
 
@@ -5451,7 +5452,6 @@ has it applied automatically:
 		protected void executeInternal(JobExecutionContext ctx) throws JobExecutionException {
 			// do the actual work
 		}
-
 	}
 ----
 
@@ -5571,11 +5571,19 @@ seconds and one running every morning at 6 AM. To finalize everything, we need t
 	</bean>
 ----
 
-More properties are available for the `SchedulerFactoryBean`, such as the calendars
-used by the job details, properties to customize Quartz with, and others. See the
-{api-spring-framework}/scheduling/quartz/SchedulerFactoryBean.html[`SchedulerFactoryBean`]
+More properties are available for the `SchedulerFactoryBean`, such as the calendars used by the
+job details, properties to customize Quartz with, and a Spring-provided JDBC DataSource. See
+the {api-spring-framework}/scheduling/quartz/SchedulerFactoryBean.html[`SchedulerFactoryBean`]
 javadoc for more information.
 
+NOTE: `SchedulerFactoryBean` also recognizes a `quartz.properties` file in the classpath,
+based on Quartz property keys, as with regular Quartz configuration. Please note that many
+`SchedulerFactoryBean` settings interact with common Quartz settings in the properties file;
+it is therefore not recommended to specify values at both levels. For example, do not set
+an "org.quartz.jobStore.class" property if you mean to rely on a Spring-provided DataSource,
+or specify an `org.springframework.scheduling.quartz.LocalDataSourceJobStore` variant which
+is a full-fledged replacement for the standard `org.quartz.impl.jdbcjobstore.JobStoreTX`.
+
 
 
 
@@ -5877,7 +5885,6 @@ is updated in the cache. The following example shows how to use the `sync` attri
 ----
 <1> Using the `sync` attribute.
 
-
 NOTE: This is an optional feature, and your favorite cache library may not support it.
 All `CacheManager` implementations provided by the core framework support it. See the
 documentation of your cache provider for more details.
@@ -6035,7 +6042,6 @@ all entries from the `books` cache:
 ----
 <1> Using the `allEntries` attribute to evict all entries from the cache.
 
-
 This option comes in handy when an entire cache region needs to be cleared out.
 Rather than evicting each entry (which would take a long time, since it is inefficient),
 all the entries are removed in one operation, as the preceding example shows.
@@ -6094,7 +6100,6 @@ comes into play. The following examples uses `@CacheConfig` to set the name of t
 ----
 <1> Using `@CacheConfig` to set the name of the cache.
 
-
 `@CacheConfig` is a class-level annotation that allows sharing the cache names,
 the custom `KeyGenerator`, the custom `CacheManager`, and the custom `CacheResolver`.
 Placing this annotation on the class does not turn on any caching operation.
@@ -6235,13 +6240,11 @@ if you need to annotate non-public methods, as it changes the bytecode itself.
 ****
 
 TIP: Spring recommends that you only annotate concrete classes (and methods of concrete
-classes) with the `@Cache{asterisk}` annotation, as opposed to annotating interfaces.
-You certainly can place the `@Cache{asterisk}` annotation on an interface (or an interface
-method), but this works only as you would expect it to if you use interface-based proxies.
-The fact that Java annotations are not inherited from interfaces means that, if you use
-class-based proxies (`proxy-target-class="true"`) or the weaving-based aspect
-(`mode="aspectj"`), the caching settings are not recognized by the proxying and weaving
-infrastructure, and the object is not wrapped in a caching proxy.
+classes) with the `@Cache{asterisk}` annotations, as opposed to annotating interfaces.
+You certainly can place an `@Cache{asterisk}` annotation on an interface (or an interface
+method), but this works only if you use the proxy mode (`mode="proxy"`). If you use the
+weaving-based aspect (`mode="aspectj"`), the caching settings are not recognized on
+interface-level declarations by the weaving infrastructure.
 
 NOTE: In proxy mode (the default), only external method calls coming in through the
 proxy are intercepted. This means that self-invocation (in effect, a method within the
@@ -6378,7 +6381,6 @@ to customize the factory for each cache operation, as the following example show
 ----
 <1> Customizing the factory for this operation.
 
-
 NOTE: For all referenced classes, Spring tries to locate a bean with the given type.
 If more than one match exists, a new instance is created and can use the regular
 bean lifecycle callbacks, such as dependency injection.

From 0802581aff7e3ec5b00f7c2f44e1af3d5574461b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:46:26 +0100
Subject: [PATCH 458/735] Unit test for identifying type variable argument

See gh-27748
---
 .../core/ResolvableTypeTests.java             | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
index ba58532c74f2..3ca17918b53e 100644
--- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1159,6 +1159,20 @@ void isAssignableFromForComplexWildcards() throws Exception {
 		assertThatResolvableType(complex4).isNotAssignableFrom(complex3);
 	}
 
+	@Test
+	void identifyTypeVariable() throws Exception {
+		Method method = ClassArguments.class.getMethod("typedArgumentFirst", Class.class, Class.class, Class.class);
+		ResolvableType returnType = ResolvableType.forMethodReturnType(method, ClassArguments.class);
+
+		ResolvableType arg0 = ResolvableType.forMethodParameter(method, 0, ClassArguments.class);
+		ResolvableType arg1 = ResolvableType.forMethodParameter(method, 1, ClassArguments.class);
+		ResolvableType arg2 = ResolvableType.forMethodParameter(method, 2, ClassArguments.class);
+
+		assertThat(returnType.getType().equals(arg0.as(Class.class).getGeneric(0).getType())).isTrue();
+		assertThat(returnType.getType().equals(arg1.as(Class.class).getGeneric(0).getType())).isFalse();
+		assertThat(returnType.getType().equals(arg2.as(Class.class).getGeneric(0).getType())).isFalse();
+	}
+
 	@Test
 	void hashCodeAndEquals() throws Exception {
 		ResolvableType forClass = ResolvableType.forClass(List.class);
@@ -1427,6 +1441,10 @@ interface Methods<T> {
 	}
 
 
+	interface TypedMethods extends Methods<String> {
+	}
+
+
 	static class AssignmentBase<O, C, S> {
 
 		public O o;
@@ -1479,7 +1497,9 @@ static class Assignment extends AssignmentBase<Object, CharSequence, String> {
 	}
 
 
-	interface TypedMethods extends Methods<String> {
+	interface ClassArguments {
+
+		<T> T typedArgumentFirst(Class<T> arg0, Class<?> arg1, Class<Object> arg2);
 	}
 
 

From ac581bed92181ce8ddfe629e94629a52e3dc972a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:46:42 +0100
Subject: [PATCH 459/735] Avoid NPE against null value from toString call

Closes gh-27782
---
 .../java/org/springframework/core/log/LogFormatUtils.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
index 9a2693e2ce6b..550a202255c2 100644
--- a/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/log/LogFormatUtils.java
@@ -22,6 +22,7 @@
 import org.apache.commons.logging.Log;
 
 import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Utility methods for formatting and logging messages.
@@ -71,10 +72,10 @@ public static String formatValue(
 		}
 		String result;
 		try {
-			result = value.toString();
+			result = ObjectUtils.nullSafeToString(value);
 		}
 		catch (Throwable ex) {
-			result = ex.toString();
+			result = ObjectUtils.nullSafeToString(ex);
 		}
 		if (maxLength != -1) {
 			result = (result.length() > maxLength ? result.substring(0, maxLength) + " (truncated)..." : result);

From 1af21bb4513e27add1b32a024fd10e9e69253776 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:46:59 +0100
Subject: [PATCH 460/735] Declare serialVersionUID on DefaultAopProxyFactory

Closes gh-27784
---
 .../springframework/aop/framework/DefaultAopProxyFactory.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
index 3e8c838704c4..8692371d3a8c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
@@ -45,9 +45,10 @@
  * @see AdvisedSupport#setProxyTargetClass
  * @see AdvisedSupport#setInterfaces
  */
-@SuppressWarnings("serial")
 public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 
+	private static final long serialVersionUID = 7930414337282325166L;
+
 
 	@Override
 	public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException {

From ca84559588a26c4acb48cd0110ded9a89b43852e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:47:12 +0100
Subject: [PATCH 461/735] Provide findAnnotationOnBean variant with
 allowFactoryBeanInit flag

Closes gh-27796
---
 .../beans/factory/ListableBeanFactory.java    | 24 ++++++++++++++++++-
 .../support/DefaultListableBeanFactory.java   | 17 +++++++++----
 .../support/StaticListableBeanFactory.java    | 13 ++++++++--
 .../support/AbstractApplicationContext.java   | 10 ++++++++
 .../setup/StubWebApplicationContext.java      | 11 ++++++++-
 5 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
index 389f19c9e488..2642e72d7ae5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -353,9 +353,31 @@ <T> Map<String, T> getBeansOfType(@Nullable Class<T> type, boolean includeNonSin
 	 * @since 3.0
 	 * @see #getBeanNamesForAnnotation
 	 * @see #getBeansWithAnnotation
+	 * @see #getType(String)
 	 */
 	@Nullable
 	<A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
 			throws NoSuchBeanDefinitionException;
 
+	/**
+	 * Find an {@link Annotation} of {@code annotationType} on the specified bean,
+	 * traversing its interfaces and super classes if no annotation can be found on
+	 * the given class itself, as well as checking the bean's factory method (if any).
+	 * @param beanName the name of the bean to look for annotations on
+	 * @param annotationType the type of annotation to look for
+	 * (at class, interface or factory method level of the specified bean)
+	 * @param allowFactoryBeanInit whether a {@code FactoryBean} may get initialized
+	 * just for the purpose of determining its object type
+	 * @return the annotation of the given type if found, or {@code null} otherwise
+	 * @throws NoSuchBeanDefinitionException if there is no bean with the given name
+	 * @since 5.3.14
+	 * @see #getBeanNamesForAnnotation
+	 * @see #getBeansWithAnnotation
+	 * @see #getType(String, boolean)
+	 */
+	@Nullable
+	<A extends Annotation> A findAnnotationOnBean(
+			String beanName, Class<A> annotationType, boolean allowFactoryBeanInit)
+			throws NoSuchBeanDefinitionException;
+
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index 048612fbed73..b019ef5361f3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -730,14 +730,23 @@ public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> an
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
 			throws NoSuchBeanDefinitionException {
 
-		return findMergedAnnotationOnBean(beanName, annotationType)
+		return findAnnotationOnBean(beanName, annotationType, true);
+	}
+
+	@Override
+	@Nullable
+	public <A extends Annotation> A findAnnotationOnBean(
+			String beanName, Class<A> annotationType, boolean allowFactoryBeanInit)
+			throws NoSuchBeanDefinitionException {
+
+		return findMergedAnnotationOnBean(beanName, annotationType, allowFactoryBeanInit)
 				.synthesize(MergedAnnotation::isPresent).orElse(null);
 	}
 
 	private <A extends Annotation> MergedAnnotation<A> findMergedAnnotationOnBean(
-			String beanName, Class<A> annotationType) {
+			String beanName, Class<A> annotationType, boolean allowFactoryBeanInit) {
 
-		Class<?> beanType = getType(beanName);
+		Class<?> beanType = getType(beanName, allowFactoryBeanInit);
 		if (beanType != null) {
 			MergedAnnotation<A> annotation =
 					MergedAnnotations.from(beanType, SearchStrategy.TYPE_HIERARCHY).get(annotationType);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
index a5430120dfdb..1105ead3e12f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -459,7 +459,16 @@ public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> an
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
 			throws NoSuchBeanDefinitionException {
 
-		Class<?> beanType = getType(beanName);
+		return findAnnotationOnBean(beanName, annotationType, true);
+	}
+
+	@Override
+	@Nullable
+	public <A extends Annotation> A findAnnotationOnBean(
+			String beanName, Class<A> annotationType, boolean allowFactoryBeanInit)
+			throws NoSuchBeanDefinitionException {
+
+		Class<?> beanType = getType(beanName, allowFactoryBeanInit);
 		return (beanType != null ? AnnotatedElementUtils.findMergedAnnotation(beanType, annotationType) : null);
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
index aca706e82c1f..38243b17944b 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -1331,6 +1331,16 @@ public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> a
 		return getBeanFactory().findAnnotationOnBean(beanName, annotationType);
 	}
 
+	@Override
+	@Nullable
+	public <A extends Annotation> A findAnnotationOnBean(
+			String beanName, Class<A> annotationType, boolean allowFactoryBeanInit)
+			throws NoSuchBeanDefinitionException {
+
+		assertBeanFactoryActive();
+		return getBeanFactory().findAnnotationOnBean(beanName, annotationType, allowFactoryBeanInit);
+	}
+
 
 	//---------------------------------------------------------------------
 	// Implementation of HierarchicalBeanFactory interface
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
index c5271e8d18e8..4a64b49d9943 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -314,6 +314,15 @@ public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> a
 		return this.beanFactory.findAnnotationOnBean(beanName, annotationType);
 	}
 
+	@Override
+	@Nullable
+	public <A extends Annotation> A findAnnotationOnBean(
+			String beanName, Class<A> annotationType, boolean allowFactoryBeanInit)
+			throws NoSuchBeanDefinitionException {
+
+		return this.beanFactory.findAnnotationOnBean(beanName, annotationType, allowFactoryBeanInit);
+	}
+
 
 	//---------------------------------------------------------------------
 	// Implementation of HierarchicalBeanFactory interface

From 4b7d9b1f9c38c60ac43a752ed1f244abbb1000e2 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:48:07 +0100
Subject: [PATCH 462/735] Avoid compilation warning for test class with
 serializable base class

---
 .../concurrent/ThreadPoolExecutorFactoryBeanTests.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
index d350341a8c46..8f81b987c8aa 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBeanTests.java
@@ -76,6 +76,7 @@ void executorWithPrestartAllCoreThreads() {
 		verify(threadPoolExecutor).prestartAllCoreThreads();
 	}
 
+
 	@Configuration
 	static class ExecutorConfig {
 
@@ -83,9 +84,10 @@ static class ExecutorConfig {
 		ThreadPoolExecutorFactoryBean executor() {
 			return new ThreadPoolExecutorFactoryBean();
 		}
-
 	}
 
+
+	@SuppressWarnings("serial")
 	private static class TestThreadPoolExecutorFactoryBean extends ThreadPoolExecutorFactoryBean {
 
 		@Override

From 0ebb1c5baabd280c1587e3be83c223e951f76133 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 16:48:40 +0100
Subject: [PATCH 463/735] Upgrade to Tomcat 9.0.56, Undertow 2.2.14, Apache
 HttpClient 5.1.2 & HttpAsyncClient 4.1.5, Mockito 4.1

---
 build.gradle | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index e1cd581786ad..992aa6391a25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,41 +128,41 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.55') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.56') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
-					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
+					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.55') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.56') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.13.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.14.Final') {
 				entry 'undertow-core'
-				entry('undertow-websockets-jsr') {
-					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
-				}
 				entry('undertow-servlet') {
 					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
 					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec"
 				}
+				entry('undertow-websockets-jsr') {
+					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
+				}
 			}
 
-			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
-				entry 'okhttp'
-				entry 'mockwebserver'
-			}
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9"
+			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2'
+			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2'
 			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
+			dependency("org.apache.httpcomponents:httpasyncclient:4.1.5") {
 				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.9"
+			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
+				entry 'okhttp'
+				entry 'mockwebserver'
+			}
 
 			dependency "org.jruby:jruby:9.2.20.1"
 			dependency "org.python:jython-standalone:2.7.1"
@@ -198,7 +198,7 @@ configure(allprojects) { project ->
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '4.0.0') {
+			dependencySet(group: 'org.mockito', version: '4.1.0') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}

From ea9b8c1d0f273cc4cadd39fc2a4e24780c7857fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Tue, 14 Dec 2021 16:49:13 +0100
Subject: [PATCH 464/735] Upgrade Dokka to 1.6.0

Closes gh-27815
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c45d08b87566..80375553d358 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
 	id "io.freefair.aspectj" version '6.3.0' apply false
-	id 'org.jetbrains.dokka' version '1.5.0' apply false
+	id 'org.jetbrains.dokka' version '1.6.0' apply false
 	id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'

From 3e6eb987d06604926b55e4a2c597b87d4614900f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 17:01:17 +0100
Subject: [PATCH 465/735] Clean up 5.3.x merge result

See gh-27726
---
 .../config/EnableCachingIntegrationTests.java | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
index 39a636298eb4..6a7e1127aecd 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
@@ -73,19 +73,6 @@ public void fooServiceWithInterfaceCglib() {
 		fooGetSimple(service);
 	}
 
-	@Test
-	public void barServiceWithCacheableInterfaceCglib() {
-		this.context = new AnnotationConfigApplicationContext(BarConfigCglib.class);
-		BarService service = this.context.getBean(BarService.class);
-		Cache cache = getCache();
-
-		Object key = new Object();
-		assertCacheMiss(key, cache);
-
-		Object value = service.getSimple(key);
-		assertCacheHit(key, value, cache);
-	}
-
 	private void fooGetSimple(FooService service) {
 		Cache cache = getCache();
 
@@ -210,31 +197,6 @@ public Object getWithCondition(Object key) {
 		}
 	}
 
-	@Configuration
-	@Import(SharedConfig.class)
-	@EnableCaching(proxyTargetClass = true)
-	static class BarConfigCglib {
-
-		@Bean
-		public BarService barService() {
-			return new BarServiceImpl();
-		}
-	}
-
-	interface BarService {
-		@Cacheable(cacheNames = "testCache")
-		Object getSimple(Object key);
-	}
-
-	static class BarServiceImpl implements BarService {
-
-		private final AtomicLong counter = new AtomicLong();
-
-		@Override
-		public Object getSimple(Object key) {
-			return this.counter.getAndIncrement();
-		}
-	}
 
 	@Configuration
 	@Import(SharedConfig.class)

From f191cf4eb34ceac5d1bf48cca86b6487509b0474 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 18:32:32 +0100
Subject: [PATCH 466/735] Revised comment on explicit LocalDataSourceJobStore
 configuration

See gh-27709
---
 .../scheduling/quartz/LocalDataSourceJobStore.java           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
index e4b09c0798fb..f6042bee9347 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,8 @@
  * Subclass of Quartz's {@link JobStoreCMT} class that delegates to a Spring-managed
  * {@link DataSource} instead of using a Quartz-managed JDBC connection pool.
  * This JobStore will be used if SchedulerFactoryBean's "dataSource" property is set.
- * You may also configure it explicitly, possibly as a custom subclass of this class.
+ * You may also configure it explicitly, possibly as a custom subclass of this
+ * {@code LocalDataSourceJobStore} or as an equivalent {@code JobStoreCMT} variant.
  *
  * <p>Supports both transactional and non-transactional DataSource access.
  * With a non-XA DataSource and local Spring transactions, a single DataSource

From 79804d92c29a71daf1cbdc64cd355f90b01b2765 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Dec 2021 18:36:05 +0100
Subject: [PATCH 467/735] Upgrade to Protobuf 3.19.1, Gson 2.8.9, Woodstox
 6.2.7, Apache Johnzon 1.2.15, Caffeine 2.9.3

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 992aa6391a25..8b51d040e5c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,17 +73,17 @@ configure(allprojects) { project ->
 
 			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.woodstox:woodstox-core:6.2.7") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependency "com.google.code.gson:gson:2.8.8"
-			dependency "com.google.protobuf:protobuf-java-util:3.18.0"
+			dependency "com.google.code.gson:gson:2.8.9"
+			dependency "com.google.protobuf:protobuf-java-util:3.19.1"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
 			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.14"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.15"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -95,7 +95,7 @@ configure(allprojects) { project ->
 			dependency "org.yaml:snakeyaml:1.29"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.9.2"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
 			dependency "com.github.librepdf:openpdf:1.3.26"
 			dependency "com.rometools:rome:1.16.0"
 			dependency "commons-io:commons-io:2.5"

From b7cd049d7d0c03496ee9d958590c1f7e1af8b5aa Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 14 Dec 2021 21:59:22 +0000
Subject: [PATCH 468/735] Add "application/*+json" to
 MappingJackson2MessageConverter

Closes gh-20269
---
 .../messaging/converter/MappingJackson2MessageConverter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
index 008d0b5ba759..6c01206abd3c 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
@@ -72,7 +72,7 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter {
 	 * the {@code application/json} MIME type with {@code UTF-8} character set.
 	 */
 	public MappingJackson2MessageConverter() {
-		super(new MimeType("application", "json"));
+		super(new MimeType("application", "json"), new MimeType("application", "*+json"));
 		this.objectMapper = initObjectMapper();
 	}
 

From 4c2e0ee5ffb9fd2e6bf56c4da36f4e2d68f0258a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 15 Dec 2021 09:49:57 +0100
Subject: [PATCH 469/735] Upgrade to Log4j2 2.16.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8b51d040e5c1..f1ba25cf6789 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ configure(allprojects) { project ->
 			mavenBom "org.junit:junit-bom:5.8.2"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.15.0') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.16.0') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'

From c7642422c3556e7e12279ce92bd7b8ece35cf200 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 14 Dec 2021 09:45:24 +0100
Subject: [PATCH 470/735] Stop resolving CachingConfigurer instances eagerly

Closes gh-27751
---
 .../AspectJEnableCachingIsolatedTests.java    |  8 +-
 .../config/AbstractJCacheConfiguration.java   | 16 ++--
 .../AbstractCachingConfiguration.java         | 75 ++++++++++++++-----
 .../cache/config/EnableCachingTests.java      |  8 +-
 4 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
index 7ca1037efbc4..4235f801df73 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
@@ -107,10 +106,7 @@ public void multipleCachingConfigurers() {
 		try {
 			load(MultiCacheManagerConfigurer.class, EnableCachingConfig.class);
 		}
-		catch (BeanCreationException ex) {
-			Throwable root = ex.getRootCause();
-			boolean condition = root instanceof IllegalStateException;
-			assertThat(condition).isTrue();
+		catch (IllegalStateException ex) {
 			assertThat(ex.getMessage().contains("implementations of CachingConfigurer")).isTrue();
 		}
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java
index 1cd5ce612f30..4d2af4b9461b 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/AbstractJCacheConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.cache.annotation.AbstractCachingConfiguration;
-import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.interceptor.CacheResolver;
 import org.springframework.cache.jcache.interceptor.DefaultJCacheOperationSource;
 import org.springframework.cache.jcache.interceptor.JCacheOperationSource;
@@ -46,11 +45,14 @@ public abstract class AbstractJCacheConfiguration extends AbstractCachingConfigu
 
 
 	@Override
-	protected void useCachingConfigurer(CachingConfigurer config) {
-		super.useCachingConfigurer(config);
-		if (config instanceof JCacheConfigurer) {
-			this.exceptionCacheResolver = ((JCacheConfigurer) config)::exceptionCacheResolver;
-		}
+	protected void useCachingConfigurer(CachingConfigurerSupplier cachingConfigurerSupplier) {
+		super.useCachingConfigurer(cachingConfigurerSupplier);
+		this.exceptionCacheResolver = cachingConfigurerSupplier.adapt(config -> {
+			if (config instanceof JCacheConfigurer) {
+				return ((JCacheConfigurer) config).exceptionCacheResolver();
+			}
+			return null;
+		});
 	}
 
 	@Bean(name = "jCacheOperationSource")
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
index c49d8d20c6e0..740ad3096b2b 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,12 @@
 
 package org.springframework.cache.annotation;
 
-import java.util.Collection;
+import java.util.List;
+import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.interceptor.CacheErrorHandler;
@@ -30,6 +33,7 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.function.SingletonSupplier;
 
 /**
  * Abstract base {@code @Configuration} class providing common structure
@@ -70,29 +74,60 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 		}
 	}
 
-	@Autowired(required = false)
-	void setConfigurers(Collection<CachingConfigurer> configurers) {
-		if (CollectionUtils.isEmpty(configurers)) {
-			return;
-		}
-		if (configurers.size() > 1) {
-			throw new IllegalStateException(configurers.size() + " implementations of " +
-					"CachingConfigurer were found when only 1 was expected. " +
-					"Refactor the configuration such that CachingConfigurer is " +
-					"implemented only once or not at all.");
-		}
-		CachingConfigurer configurer = configurers.iterator().next();
-		useCachingConfigurer(configurer);
+	@Autowired
+	void setConfigurers(ObjectProvider<CachingConfigurer> configurers) {
+		Supplier<CachingConfigurer> cachingConfigurer = () -> {
+			List<CachingConfigurer> candidates = configurers.stream().collect(Collectors.toList());
+			if (CollectionUtils.isEmpty(candidates)) {
+				return null;
+			}
+			if (candidates.size() > 1) {
+				throw new IllegalStateException(candidates.size() + " implementations of " +
+						"CachingConfigurer were found when only 1 was expected. " +
+						"Refactor the configuration such that CachingConfigurer is " +
+						"implemented only once or not at all.");
+			}
+			return candidates.get(0);
+		};
+		useCachingConfigurer(new CachingConfigurerSupplier(cachingConfigurer));
 	}
 
 	/**
 	 * Extract the configuration from the nominated {@link CachingConfigurer}.
 	 */
-	protected void useCachingConfigurer(CachingConfigurer config) {
-		this.cacheManager = config::cacheManager;
-		this.cacheResolver = config::cacheResolver;
-		this.keyGenerator = config::keyGenerator;
-		this.errorHandler = config::errorHandler;
+	protected void useCachingConfigurer(CachingConfigurerSupplier cachingConfigurerSupplier) {
+		this.cacheManager = cachingConfigurerSupplier.adapt(CachingConfigurer::cacheManager);
+		this.cacheResolver = cachingConfigurerSupplier.adapt(CachingConfigurer::cacheResolver);
+		this.keyGenerator = cachingConfigurerSupplier.adapt(CachingConfigurer::keyGenerator);
+		this.errorHandler = cachingConfigurerSupplier.adapt(CachingConfigurer::errorHandler);
+	}
+
+
+	protected static class CachingConfigurerSupplier {
+
+		private final Supplier<CachingConfigurer> supplier;
+
+		public CachingConfigurerSupplier(Supplier<CachingConfigurer> supplier) {
+			this.supplier = SingletonSupplier.of(supplier);
+		}
+
+		/**
+		 * Adapt the {@link CachingConfigurer} supplier to another supplier
+		 * provided by the specified mapping function. If the underlying
+		 * {@link CachingConfigurer} is {@code null}, {@code null} is returned
+		 * and the mapping function is not invoked.
+		 * @param provider the provider to use to adapt the supplier
+		 * @param <T> the type of the supplier
+		 * @return another supplier mapped by the specified function
+		 */
+		@Nullable
+		public <T> Supplier<T> adapt(Function<CachingConfigurer, T> provider) {
+			return () -> {
+				CachingConfigurer cachingConfigurer = this.supplier.get();
+				return (cachingConfigurer != null) ? provider.apply(cachingConfigurer) : null;
+			};
+		}
+
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
index 8c41ef04570e..b7cb5f1755a8 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
@@ -18,7 +18,6 @@
 
 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;
@@ -107,11 +106,8 @@ public void multipleCachingConfigurers() {
 		try {
 			ctx.refresh();
 		}
-		catch (BeanCreationException ex) {
-			Throwable root = ex.getRootCause();
-			boolean condition = root instanceof IllegalStateException;
-			assertThat(condition).isTrue();
-			assertThat(root.getMessage().contains("implementations of CachingConfigurer")).isTrue();
+		catch (IllegalStateException ex) {
+			assertThat(ex.getMessage().contains("implementations of CachingConfigurer")).isTrue();
 		}
 	}
 

From de10bb69cb129a45bba41c90b8a2e18d8305b764 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 15 Dec 2021 10:53:09 +0100
Subject: [PATCH 471/735] Stop resolving AsyncConfigurer instances eagerly

Closes gh-27808
---
 .../AbstractAsyncConfiguration.java           | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
index 60955d50077a..2558ab5684c5 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@
 
 package org.springframework.scheduling.annotation;
 
-import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.Executor;
+import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportAware;
@@ -28,6 +31,7 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.function.SingletonSupplier;
 
 /**
  * Abstract base {@code Configuration} class providing common structure for enabling
@@ -65,17 +69,27 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 	/**
 	 * Collect any {@link AsyncConfigurer} beans through autowiring.
 	 */
-	@Autowired(required = false)
-	void setConfigurers(Collection<AsyncConfigurer> configurers) {
-		if (CollectionUtils.isEmpty(configurers)) {
-			return;
-		}
-		if (configurers.size() > 1) {
-			throw new IllegalStateException("Only one AsyncConfigurer may exist");
-		}
-		AsyncConfigurer configurer = configurers.iterator().next();
-		this.executor = configurer::getAsyncExecutor;
-		this.exceptionHandler = configurer::getAsyncUncaughtExceptionHandler;
+	@Autowired
+	void setConfigurers(ObjectProvider<AsyncConfigurer> configurers) {
+		Supplier<AsyncConfigurer> asyncConfigurer = SingletonSupplier.of(() -> {
+			List<AsyncConfigurer> candidates = configurers.stream().collect(Collectors.toList());
+			if (CollectionUtils.isEmpty(candidates)) {
+				return null;
+			}
+			if (candidates.size() > 1) {
+				throw new IllegalStateException("Only one AsyncConfigurer may exist");
+			}
+			return candidates.get(0);
+		});
+		this.executor = adapt(asyncConfigurer, AsyncConfigurer::getAsyncExecutor);
+		this.exceptionHandler = adapt(asyncConfigurer, AsyncConfigurer::getAsyncUncaughtExceptionHandler);
+	}
+
+	private <T> Supplier<T> adapt(Supplier<AsyncConfigurer> supplier, Function<AsyncConfigurer, T> provider) {
+		return () -> {
+			AsyncConfigurer asyncConfigurer = supplier.get();
+			return (asyncConfigurer != null) ? provider.apply(asyncConfigurer) : null;
+		};
 	}
 
 }

From 2f3a9dbc685f03ad0fc9f58ba4bb60158c9da24e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 15 Dec 2021 11:51:21 +0100
Subject: [PATCH 472/735] Deprecate CachingConfigurerSupport and
 AsyncConfigurerSupport

Closes gh-27813
---
 .../cache/jcache/config/JCacheConfigurerSupport.java          | 4 +++-
 .../cache/annotation/CachingConfigurerSupport.java            | 4 +++-
 .../scheduling/annotation/AsyncConfigurerSupport.java         | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurerSupport.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurerSupport.java
index e36c4fb6df94..b20755c8d982 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurerSupport.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurerSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,9 @@
  * @since 4.1
  * @see JCacheConfigurer
  * @see CachingConfigurerSupport
+ * @deprecated as of 6.0 in favor of implementing {@link JCacheConfigurer} directly
  */
+@Deprecated
 public class JCacheConfigurerSupport extends CachingConfigurerSupport implements JCacheConfigurer {
 
 	@Override
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurerSupport.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurerSupport.java
index f077742f7f40..f2e913358efb 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurerSupport.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurerSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,9 @@
  * @author Stephane Nicoll
  * @since 4.1
  * @see CachingConfigurer
+ * @deprecated as of 6.0 in favor of implementing {@link CachingConfigurer} directly
  */
+@Deprecated
 public class CachingConfigurerSupport implements CachingConfigurer {
 
 	@Override
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurerSupport.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurerSupport.java
index 34acb2ce9f80..a3cece5a64d1 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurerSupport.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurerSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,9 @@
  *
  * @author Stephane Nicoll
  * @since 4.1
+ * @deprecated as of 6.0 in favor of implementing {@link AsyncConfigurer} directly
  */
+@Deprecated
 public class AsyncConfigurerSupport implements AsyncConfigurer {
 
 	@Override

From efaccd6356d6208b69d6389f304736abc3557ccb Mon Sep 17 00:00:00 2001
From: dramatist <stormzhaocn@gmail.com>
Date: Fri, 19 Nov 2021 14:29:56 +0800
Subject: [PATCH 473/735] Apply "instanceof pattern matching" in spring-beans

---
 .../annotation/AutowiredAnnotationBeanPostProcessor.java | 3 +--
 .../beans/factory/config/ConstructorArgumentValues.java  | 6 ++----
 .../beans/factory/config/CustomScopeConfigurer.java      | 3 +--
 .../beans/factory/groovy/GroovyBeanDefinitionReader.java | 3 +--
 .../factory/groovy/GroovyBeanDefinitionWrapper.java      | 3 +--
 .../factory/support/DefaultListableBeanFactory.java      | 9 +++++----
 .../beans/propertyeditors/CustomCollectionEditor.java    | 3 +--
 .../beans/propertyeditors/CustomMapEditor.java           | 3 +--
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index f11dcce9a33b..2ded080cd5d5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -599,8 +599,7 @@ private void registerDependentBeans(@Nullable String beanName, Set<String> autow
 	 */
 	@Nullable
 	private Object resolvedCachedArgument(@Nullable String beanName, @Nullable Object cachedArgument) {
-		if (cachedArgument instanceof DependencyDescriptor) {
-			DependencyDescriptor descriptor = (DependencyDescriptor) cachedArgument;
+		if (cachedArgument instanceof DependencyDescriptor descriptor) {
 			Assert.state(this.beanFactory != null, "No BeanFactory available");
 			return this.beanFactory.resolveDependency(descriptor, beanName, null, null);
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
index a90e57094530..c7f1d24dfa14 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
@@ -121,8 +121,7 @@ public void addIndexedArgumentValue(int index, ValueHolder newValue) {
 	 */
 	private void addOrMergeIndexedArgumentValue(Integer key, ValueHolder newValue) {
 		ValueHolder currentValue = this.indexedArgumentValues.get(key);
-		if (currentValue != null && newValue.getValue() instanceof Mergeable) {
-			Mergeable mergeable = (Mergeable) newValue.getValue();
+		if (currentValue != null && newValue.getValue() instanceof Mergeable mergeable) {
 			if (mergeable.isMergeEnabled()) {
 				newValue.setValue(mergeable.merge(currentValue.getValue()));
 			}
@@ -230,8 +229,7 @@ private void addOrMergeGenericArgumentValue(ValueHolder newValue) {
 			for (Iterator<ValueHolder> it = this.genericArgumentValues.iterator(); it.hasNext();) {
 				ValueHolder currentValue = it.next();
 				if (newValue.getName().equals(currentValue.getName())) {
-					if (newValue.getValue() instanceof Mergeable) {
-						Mergeable mergeable = (Mergeable) newValue.getValue();
+					if (newValue.getValue() instanceof Mergeable mergeable) {
 						if (mergeable.isMergeEnabled()) {
 							newValue.setValue(mergeable.merge(currentValue.getValue()));
 						}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
index f292cc9852f4..92702225d42d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
@@ -101,8 +101,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 				if (value instanceof Scope) {
 					beanFactory.registerScope(scopeKey, (Scope) value);
 				}
-				else if (value instanceof Class) {
-					Class<?> scopeClass = (Class<?>) value;
+				else if (value instanceof Class<?> scopeClass) {
 					Assert.isAssignable(Scope.class, scopeClass, "Invalid scope class");
 					beanFactory.registerScope(scopeKey, (Scope) BeanUtils.instantiateClass(scopeClass));
 				}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
index 56dd8580e9f8..be6dac24a4bd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
@@ -462,8 +462,7 @@ protected GroovyBeanDefinitionReader invokeBeanDefiningClosure(Closure<?> callab
 	 */
 	private GroovyBeanDefinitionWrapper invokeBeanDefiningMethod(String beanName, Object[] args) {
 		boolean hasClosureArgument = (args[args.length - 1] instanceof Closure);
-		if (args[0] instanceof Class) {
-			Class<?> beanClass = (Class<?>) args[0];
+		if (args[0] instanceof Class<?> beanClass) {
 			if (hasClosureArgument) {
 				if (args.length - 1 != 1) {
 					this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java
index d1aeff7d0bcc..322c41429f29 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java
@@ -194,9 +194,8 @@ else if (Boolean.TRUE.equals(newValue)) {
 				}
 			}
 			// constructorArgs
-			else if (CONSTRUCTOR_ARGS.equals(property) && newValue instanceof List) {
+			else if (CONSTRUCTOR_ARGS.equals(property) && newValue instanceof List<?> args) {
 				ConstructorArgumentValues cav = new ConstructorArgumentValues();
-				List<?> args = (List<?>) newValue;
 				for (Object arg : args) {
 					cav.addGenericArgumentValue(arg);
 				}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index 99561a063b1c..f84f724174e3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -20,6 +20,7 @@
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamException;
+import java.io.Serial;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.ref.Reference;
@@ -921,8 +922,7 @@ public void preInstantiateSingletons() throws BeansException {
 			if (!bd.isAbstract() && bd.isSingleton() && !bd.isLazyInit()) {
 				if (isFactoryBean(beanName)) {
 					Object bean = getBean(FACTORY_BEAN_PREFIX + beanName);
-					if (bean instanceof FactoryBean) {
-						FactoryBean<?> factory = (FactoryBean<?>) bean;
+					if (bean instanceof FactoryBean<?> factory) {
 						boolean isEagerInit = (factory instanceof SmartFactoryBean &&
 								((SmartFactoryBean<?>) factory).isEagerInit());
 						if (isEagerInit) {
@@ -939,10 +939,9 @@ public void preInstantiateSingletons() throws BeansException {
 		// Trigger post-initialization callback for all applicable beans...
 		for (String beanName : beanNames) {
 			Object singletonInstance = getSingleton(beanName);
-			if (singletonInstance instanceof SmartInitializingSingleton) {
+			if (singletonInstance instanceof SmartInitializingSingleton smartSingleton) {
 				StartupStep smartInitialize = this.getApplicationStartup().start("spring.beans.smart-initialize")
 						.tag("beanName", beanName);
-				SmartInitializingSingleton smartSingleton = (SmartInitializingSingleton) singletonInstance;
 				smartSingleton.afterSingletonsInstantiated();
 				smartInitialize.end();
 			}
@@ -1846,11 +1845,13 @@ public String toString() {
 	// Serialization support
 	//---------------------------------------------------------------------
 
+	@Serial
 	private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
 		throw new NotSerializableException("DefaultListableBeanFactory itself is not deserializable - " +
 				"just a SerializedBeanFactoryReference is");
 	}
 
+	@Serial
 	protected Object writeReplace() throws ObjectStreamException {
 		if (this.serializationId != null) {
 			return new SerializedBeanFactoryReference(this.serializationId);
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
index bcf39977df22..898adb52ecca 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
@@ -117,9 +117,8 @@ else if (value == null || (this.collectionType.isInstance(value) && !alwaysCreat
 			// Use the source value as-is, as it matches the target type.
 			super.setValue(value);
 		}
-		else if (value instanceof Collection) {
+		else if (value instanceof Collection<?> source) {
 			// Convert Collection elements.
-			Collection<?> source = (Collection<?>) value;
 			Collection<Object> target = createCollection(this.collectionType, source.size());
 			for (Object elem : source) {
 				target.add(convertElement(elem));
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
index a1e5ebd119b6..d421a8e25c00 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
@@ -107,9 +107,8 @@ else if (value == null || (this.mapType.isInstance(value) && !alwaysCreateNewMap
 			// Use the source value as-is, as it matches the target type.
 			super.setValue(value);
 		}
-		else if (value instanceof Map) {
+		else if (value instanceof Map<?, ?> source) {
 			// Convert Map elements.
-			Map<?, ?> source = (Map<?, ?>) value;
 			Map<Object, Object> target = createMap(this.mapType, source.size());
 			source.forEach((key, val) -> target.put(convertKey(key), convertValue(val)));
 			super.setValue(target);

From 50c7c848860fea9ae1ba8d9ce12a9ee7e2eee45f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Dec 2021 13:32:42 +0100
Subject: [PATCH 474/735] Introduce getDeclaredMethods() for MethodMetadata of
 all user-declared methods

Closes gh-27701
---
 .../core/type/AnnotationMetadata.java         | 10 ++++-
 .../core/type/StandardAnnotationMetadata.java | 30 +++++++--------
 .../core/type/StandardMethodMetadata.java     |  4 +-
 .../SimpleAnnotationMetadata.java             | 38 ++++++++++---------
 ...impleAnnotationMetadataReadingVisitor.java | 30 ++++++---------
 .../SimpleMethodMetadataReadingVisitor.java   | 13 +++----
 .../core/type/AnnotationMetadataTests.java    |  6 ++-
 7 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
index 66592ba7ea54..944e232af9f0 100644
--- a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,6 +115,14 @@ default boolean hasAnnotatedMethods(String annotationName) {
 	 */
 	Set<MethodMetadata> getAnnotatedMethods(String annotationName);
 
+	/**
+	 * Retrieve the method metadata for all user-declared methods on the
+	 * underlying class, preserving declaration order as far as possible.
+	 * @return a set of {@link MethodMetadata}
+	 * @since 6.0
+	 */
+	Set<MethodMetadata> getDeclaredMethods();
+
 
 	/**
 	 * Factory method to create a new {@link AnnotationMetadata} instance
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
index 60f0a26ff40e..bc34ed937a51 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
@@ -143,26 +143,24 @@ public boolean hasAnnotatedMethods(String annotationName) {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public Set<MethodMetadata> getAnnotatedMethods(String annotationName) {
-		Set<MethodMetadata> annotatedMethods = null;
+		Set<MethodMetadata> result = new LinkedHashSet<>(4);
 		if (AnnotationUtils.isCandidateClass(getIntrospectedClass(), annotationName)) {
-			try {
-				Method[] methods = ReflectionUtils.getDeclaredMethods(getIntrospectedClass());
-				for (Method method : methods) {
-					if (isAnnotatedMethod(method, annotationName)) {
-						if (annotatedMethods == null) {
-							annotatedMethods = new LinkedHashSet<>(4);
-						}
-						annotatedMethods.add(new StandardMethodMetadata(method, this.nestedAnnotationsAsMap));
-					}
+			ReflectionUtils.doWithLocalMethods(getIntrospectedClass(), method -> {
+				if (isAnnotatedMethod(method, annotationName)) {
+					result.add(new StandardMethodMetadata(method, this.nestedAnnotationsAsMap));
 				}
-			}
-			catch (Throwable ex) {
-				throw new IllegalStateException("Failed to introspect annotated methods on " + getIntrospectedClass(), ex);
-			}
+			});
 		}
-		return annotatedMethods != null ? annotatedMethods : Collections.emptySet();
+		return result;
+	}
+
+	@Override
+	public Set<MethodMetadata> getDeclaredMethods() {
+		Set<MethodMetadata> result = new LinkedHashSet<>(16);
+		ReflectionUtils.doWithLocalMethods(getIntrospectedClass(), method ->
+				result.add(new StandardMethodMetadata(method, this.nestedAnnotationsAsMap)));
+		return result;
 	}
 
 
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
index 53c69376d83f..b2eb1b84fde9 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
@@ -68,10 +68,8 @@ public StandardMethodMetadata(Method introspectedMethod) {
 	 * {@link org.springframework.core.annotation.AnnotationAttributes} for compatibility
 	 * with ASM-based {@link AnnotationMetadata} implementations
 	 * @since 3.1.1
-	 * @deprecated since 5.2 in favor of obtaining instances via {@link AnnotationMetadata}
 	 */
-	@Deprecated
-	public StandardMethodMetadata(Method introspectedMethod, boolean nestedAnnotationsAsMap) {
+	StandardMethodMetadata(Method introspectedMethod, boolean nestedAnnotationsAsMap) {
 		Assert.notNull(introspectedMethod, "Method must not be null");
 		this.introspectedMethod = introspectedMethod;
 		this.nestedAnnotationsAsMap = nestedAnnotationsAsMap;
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java
index 5f1ebf4bb51e..21fa6fac275f 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java
@@ -25,6 +25,7 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.MethodMetadata;
 import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link AnnotationMetadata} created from a
@@ -32,6 +33,7 @@
  *
  * @author Phillip Webb
  * @author Sam Brannen
+ * @author Juergen Hoeller
  * @since 5.2
  */
 final class SimpleAnnotationMetadata implements AnnotationMetadata {
@@ -48,11 +50,11 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata {
 
 	private final boolean independentInnerClass;
 
-	private final String[] interfaceNames;
+	private final Set<String> interfaceNames;
 
-	private final String[] memberClassNames;
+	private final Set<String> memberClassNames;
 
-	private final MethodMetadata[] annotatedMethods;
+	private final Set<MethodMetadata> declaredMethods;
 
 	private final MergedAnnotations annotations;
 
@@ -61,8 +63,8 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata {
 
 
 	SimpleAnnotationMetadata(String className, int access, @Nullable String enclosingClassName,
-			@Nullable String superClassName, boolean independentInnerClass, String[] interfaceNames,
-			String[] memberClassNames, MethodMetadata[] annotatedMethods, MergedAnnotations annotations) {
+			@Nullable String superClassName, boolean independentInnerClass, Set<String> interfaceNames,
+			Set<String> memberClassNames, Set<MethodMetadata> declaredMethods, MergedAnnotations annotations) {
 
 		this.className = className;
 		this.access = access;
@@ -71,7 +73,7 @@ final class SimpleAnnotationMetadata implements AnnotationMetadata {
 		this.independentInnerClass = independentInnerClass;
 		this.interfaceNames = interfaceNames;
 		this.memberClassNames = memberClassNames;
-		this.annotatedMethods = annotatedMethods;
+		this.declaredMethods = declaredMethods;
 		this.annotations = annotations;
 	}
 
@@ -119,12 +121,17 @@ public String getSuperClassName() {
 
 	@Override
 	public String[] getInterfaceNames() {
-		return this.interfaceNames.clone();
+		return StringUtils.toStringArray(this.interfaceNames);
 	}
 
 	@Override
 	public String[] getMemberClassNames() {
-		return this.memberClassNames.clone();
+		return StringUtils.toStringArray(this.memberClassNames);
+	}
+
+	@Override
+	public MergedAnnotations getAnnotations() {
+		return this.annotations;
 	}
 
 	@Override
@@ -140,21 +147,18 @@ public Set<String> getAnnotationTypes() {
 
 	@Override
 	public Set<MethodMetadata> getAnnotatedMethods(String annotationName) {
-		Set<MethodMetadata> annotatedMethods = null;
-		for (MethodMetadata annotatedMethod : this.annotatedMethods) {
+		Set<MethodMetadata> result = new LinkedHashSet<>(4);
+		for (MethodMetadata annotatedMethod : this.declaredMethods) {
 			if (annotatedMethod.isAnnotated(annotationName)) {
-				if (annotatedMethods == null) {
-					annotatedMethods = new LinkedHashSet<>(4);
-				}
-				annotatedMethods.add(annotatedMethod);
+				result.add(annotatedMethod);
 			}
 		}
-		return annotatedMethods != null ? annotatedMethods : Collections.emptySet();
+		return Collections.unmodifiableSet(result);
 	}
 
 	@Override
-	public MergedAnnotations getAnnotations() {
-		return this.annotations;
+	public Set<MethodMetadata> getDeclaredMethods() {
+		return Collections.unmodifiableSet(this.declaredMethods);
 	}
 
 	@Override
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
index 2875b1e263b1..b156330eb761 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
@@ -16,9 +16,7 @@
 
 package org.springframework.core.type.classreading;
 
-import java.util.ArrayList;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 
 import org.springframework.asm.AnnotationVisitor;
@@ -32,12 +30,12 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * ASM class visitor that creates {@link SimpleAnnotationMetadata}.
  *
  * @author Phillip Webb
+ * @author Juergen Hoeller
  * @since 5.2
  */
 final class SimpleAnnotationMetadataReadingVisitor extends ClassVisitor {
@@ -52,18 +50,18 @@ final class SimpleAnnotationMetadataReadingVisitor extends ClassVisitor {
 	@Nullable
 	private String superClassName;
 
-	private String[] interfaceNames = new String[0];
-
 	@Nullable
 	private String enclosingClassName;
 
 	private boolean independentInnerClass;
 
+	private final Set<String> interfaceNames = new LinkedHashSet<>(4);
+
 	private final Set<String> memberClassNames = new LinkedHashSet<>(4);
 
-	private final List<MergedAnnotation<?>> annotations = new ArrayList<>();
+	private final Set<MergedAnnotation<?>> annotations = new LinkedHashSet<>(4);
 
-	private final List<SimpleMethodMetadata> annotatedMethods = new ArrayList<>();
+	private final Set<MethodMetadata> declaredMethods = new LinkedHashSet<>(4);
 
 	@Nullable
 	private SimpleAnnotationMetadata metadata;
@@ -87,9 +85,8 @@ public void visit(int version, int access, String name, String signature,
 		if (supername != null && !isInterface(access)) {
 			this.superClassName = toClassName(supername);
 		}
-		this.interfaceNames = new String[interfaces.length];
 		for (int i = 0; i < interfaces.length; i++) {
-			this.interfaceNames[i] = toClassName(interfaces[i]);
+			this.interfaceNames.add(toClassName(interfaces[i]));
 		}
 	}
 
@@ -99,8 +96,7 @@ public void visitOuterClass(String owner, String name, String desc) {
 	}
 
 	@Override
-	public void visitInnerClass(String name, @Nullable String outerName, String innerName,
-			int access) {
+	public void visitInnerClass(String name, @Nullable String outerName, String innerName, int access) {
 		if (outerName != null) {
 			String className = toClassName(name);
 			String outerClassName = toClassName(outerName);
@@ -126,24 +122,20 @@ public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
 	public MethodVisitor visitMethod(
 			int access, String name, String descriptor, String signature, String[] exceptions) {
 
-		// Skip bridge methods - we're only interested in original
-		// annotation-defining user methods. On JDK 8, we'd otherwise run into
-		// double detection of the same annotated method...
-		if (isBridge(access)) {
+		// Skip bridge methods and constructors - we're only interested in original user methods.
+		if (isBridge(access) || name.equals("<init>")) {
 			return null;
 		}
 		return new SimpleMethodMetadataReadingVisitor(this.classLoader, this.className,
-				access, name, descriptor, this.annotatedMethods::add);
+				access, name, descriptor, this.declaredMethods::add);
 	}
 
 	@Override
 	public void visitEnd() {
-		String[] memberClassNames = StringUtils.toStringArray(this.memberClassNames);
-		MethodMetadata[] annotatedMethods = this.annotatedMethods.toArray(new MethodMetadata[0]);
 		MergedAnnotations annotations = MergedAnnotations.of(this.annotations);
 		this.metadata = new SimpleAnnotationMetadata(this.className, this.access,
 				this.enclosingClassName, this.superClassName, this.independentInnerClass,
-				this.interfaceNames, memberClassNames, annotatedMethods, annotations);
+				this.interfaceNames, this.memberClassNames, this.declaredMethods, annotations);
 	}
 
 	public SimpleAnnotationMetadata getMetadata() {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java
index df18e489b817..895887263e53 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMethodMetadataReadingVisitor.java
@@ -33,6 +33,7 @@
  *
  * @author Phillip Webb
  * @author Sam Brannen
+ * @author Juergen Hoeller
  * @since 5.2
  */
 final class SimpleMethodMetadataReadingVisitor extends MethodVisitor {
@@ -78,13 +79,11 @@ public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
 
 	@Override
 	public void visitEnd() {
-		if (!this.annotations.isEmpty()) {
-			String returnTypeName = Type.getReturnType(this.descriptor).getClassName();
-			MergedAnnotations annotations = MergedAnnotations.of(this.annotations);
-			SimpleMethodMetadata metadata = new SimpleMethodMetadata(this.methodName, this.access,
-					this.declaringClassName, returnTypeName, getSource(), annotations);
-			this.consumer.accept(metadata);
-		}
+		String returnTypeName = Type.getReturnType(this.descriptor).getClassName();
+		MergedAnnotations annotations = MergedAnnotations.of(this.annotations);
+		SimpleMethodMetadata metadata = new SimpleMethodMetadata(this.methodName, this.access,
+				this.declaringClassName, returnTypeName, getSource(), annotations);
+		this.consumer.accept(metadata);
 	}
 
 	private Object getSource() {
diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
index f1342883bca0..7994a0da24c1 100644
--- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
+++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -397,6 +397,7 @@ private void doTestAnnotationInfo(AnnotationMetadata metadata) {
 	}
 
 	private void doTestMethodAnnotationInfo(AnnotationMetadata classMetadata) {
+		assertThat(classMetadata.getDeclaredMethods()).hasSize(3);
 		Set<MethodMetadata> methods = classMetadata.getAnnotatedMethods(TestAutowired.class.getName());
 		assertThat(methods).hasSize(1);
 		for (MethodMetadata methodMetadata : methods) {
@@ -503,6 +504,9 @@ public enum SubclassEnum {
 	@NamedComposedAnnotation
 	private static class AnnotatedComponent implements Serializable {
 
+		public AnnotatedComponent() {
+		}
+
 		@TestAutowired
 		public void doWork(@TestQualifier("myColor") java.awt.Color color) {
 		}

From 1885ab3e07eba47d19e6e8505abda721bb692417 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Dec 2021 17:58:28 +0100
Subject: [PATCH 475/735] Polishing

---
 .../annotation/AbstractCachingConfiguration.java      |  2 +-
 .../core/type/StandardAnnotationMetadata.java         |  2 +-
 .../type/classreading/SimpleAnnotationMetadata.java   | 11 ++++++-----
 .../SimpleAnnotationMetadataReadingVisitor.java       |  5 ++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
index 740ad3096b2b..403c6e9dcee3 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
@@ -124,7 +124,7 @@ public CachingConfigurerSupplier(Supplier<CachingConfigurer> supplier) {
 		public <T> Supplier<T> adapt(Function<CachingConfigurer, T> provider) {
 			return () -> {
 				CachingConfigurer cachingConfigurer = this.supplier.get();
-				return (cachingConfigurer != null) ? provider.apply(cachingConfigurer) : null;
+				return (cachingConfigurer != null ? provider.apply(cachingConfigurer) : null);
 			};
 		}
 
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
index 60f0a26ff40e..fddd853af521 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
@@ -162,7 +162,7 @@ public Set<MethodMetadata> getAnnotatedMethods(String annotationName) {
 				throw new IllegalStateException("Failed to introspect annotated methods on " + getIntrospectedClass(), ex);
 			}
 		}
-		return annotatedMethods != null ? annotatedMethods : Collections.emptySet();
+		return (annotatedMethods != null ? annotatedMethods : Collections.emptySet());
 	}
 
 
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java
index 5f1ebf4bb51e..c80bc172a270 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java
@@ -127,6 +127,11 @@ public String[] getMemberClassNames() {
 		return this.memberClassNames.clone();
 	}
 
+	@Override
+	public MergedAnnotations getAnnotations() {
+		return this.annotations;
+	}
+
 	@Override
 	public Set<String> getAnnotationTypes() {
 		Set<String> annotationTypes = this.annotationTypes;
@@ -149,13 +154,9 @@ public Set<MethodMetadata> getAnnotatedMethods(String annotationName) {
 				annotatedMethods.add(annotatedMethod);
 			}
 		}
-		return annotatedMethods != null ? annotatedMethods : Collections.emptySet();
+		return (annotatedMethods != null ? annotatedMethods : Collections.emptySet());
 	}
 
-	@Override
-	public MergedAnnotations getAnnotations() {
-		return this.annotations;
-	}
 
 	@Override
 	public boolean equals(@Nullable Object obj) {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
index 6422cda99105..a951194ae7dc 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,8 +99,7 @@ public void visitOuterClass(String owner, String name, String desc) {
 	}
 
 	@Override
-	public void visitInnerClass(String name, @Nullable String outerName, String innerName,
-			int access) {
+	public void visitInnerClass(String name, @Nullable String outerName, String innerName, int access) {
 		if (outerName != null) {
 			String className = toClassName(name);
 			String outerClassName = toClassName(outerName);

From 0b6a54dcc77ea09a4dafc0dd7a04c34553f1a317 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Dec 2021 17:58:59 +0100
Subject: [PATCH 476/735] Upgrade to R2DBC Arabba-SR11, Kotlin 1.5.32, Jackson
 2.12.6

---
 build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index f1ba25cf6789..23057804e45d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.10'
 	id "io.freefair.aspectj" version '6.2.0' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
-	id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.5.32' apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.32" apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
@@ -27,13 +27,13 @@ configure(allprojects) { project ->
 
 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
 			mavenBom "io.netty:netty-bom:4.1.72.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.14"
-			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
+			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR11"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
 			mavenBom "org.junit:junit-bom:5.8.2"
@@ -353,12 +353,12 @@ configure([rootProject] + javaProjects) { project ->
 		testImplementation("io.mockk:mockk")
 		testImplementation("org.assertj:assertj-core")
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
-		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
-		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")

From e15bed781d510c03724ba2f8431b5cb7456fa2f0 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Dec 2021 18:15:39 +0100
Subject: [PATCH 477/735] Upgrade to POI 5.1

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6316a387ae76..852b6ee334dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -90,7 +90,7 @@ configure(allprojects) { project ->
 			dependency "com.github.ben-manes.caffeine:caffeine:3.0.5"
 			dependency "com.github.librepdf:openpdf:1.3.26"
 			dependency "com.rometools:rome:1.16.0"
-			dependency "commons-io:commons-io:2.5"
+			dependency "commons-io:commons-io:2.11.0"
 			dependency "io.vavr:vavr:0.10.4"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
 			dependencySet(group: 'org.apache.activemq', version: '5.16.2') {
@@ -105,7 +105,7 @@ configure(allprojects) { project ->
 				entry 'derby'
 				entry 'derbyclient'
 			}
-			dependency "org.apache.poi:poi-ooxml:4.1.2"
+			dependency "org.apache.poi:poi-ooxml:5.1.0"
 			dependency "org.apache-extras.beanshell:bsh:2.0b6"
 			dependency "org.freemarker:freemarker:2.3.31"
 			dependency "org.hsqldb:hsqldb:2.5.2"

From d665977787a31230c2a908fe695fb8fa3af254ee Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Dec 2021 21:50:30 +0100
Subject: [PATCH 478/735] Polishing

---
 .../annotation/AbstractCachingConfiguration.java     |  6 +++---
 .../context/annotation/AnnotationConfigUtils.java    |  8 ++++----
 .../annotation/AbstractAsyncConfiguration.java       | 12 ++++++------
 .../AbstractTransactionManagementConfiguration.java  |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
index 403c6e9dcee3..d6473e28e67b 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
@@ -67,7 +67,7 @@ public abstract class AbstractCachingConfiguration implements ImportAware {
 	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableCaching = AnnotationAttributes.fromMap(
-				importMetadata.getAnnotationAttributes(EnableCaching.class.getName(), false));
+				importMetadata.getAnnotationAttributes(EnableCaching.class.getName()));
 		if (this.enableCaching == null) {
 			throw new IllegalArgumentException(
 					"@EnableCaching is not present on importing class " + importMetadata.getClassName());
@@ -76,7 +76,7 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 
 	@Autowired
 	void setConfigurers(ObjectProvider<CachingConfigurer> configurers) {
-		Supplier<CachingConfigurer> cachingConfigurer = () -> {
+		Supplier<CachingConfigurer> configurer = () -> {
 			List<CachingConfigurer> candidates = configurers.stream().collect(Collectors.toList());
 			if (CollectionUtils.isEmpty(candidates)) {
 				return null;
@@ -89,7 +89,7 @@ void setConfigurers(ObjectProvider<CachingConfigurer> configurers) {
 			}
 			return candidates.get(0);
 		};
-		useCachingConfigurer(new CachingConfigurerSupplier(cachingConfigurer));
+		useCachingConfigurer(new CachingConfigurerSupplier(configurer));
 	}
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
index 91b1719b7083..0c6e55670953 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -282,7 +282,7 @@ static AnnotationAttributes attributesFor(AnnotatedTypeMetadata metadata, Class<
 
 	@Nullable
 	static AnnotationAttributes attributesFor(AnnotatedTypeMetadata metadata, String annotationClassName) {
-		return AnnotationAttributes.fromMap(metadata.getAnnotationAttributes(annotationClassName, false));
+		return AnnotationAttributes.fromMap(metadata.getAnnotationAttributes(annotationClassName));
 	}
 
 	static Set<AnnotationAttributes> attributesForRepeatable(AnnotationMetadata metadata,
@@ -298,10 +298,10 @@ static Set<AnnotationAttributes> attributesForRepeatable(
 		Set<AnnotationAttributes> result = new LinkedHashSet<>();
 
 		// Direct annotation present?
-		addAttributesIfNotNull(result, metadata.getAnnotationAttributes(annotationClassName, false));
+		addAttributesIfNotNull(result, metadata.getAnnotationAttributes(annotationClassName));
 
 		// Container annotation present?
-		Map<String, Object> container = metadata.getAnnotationAttributes(containerClassName, false);
+		Map<String, Object> container = metadata.getAnnotationAttributes(containerClassName);
 		if (container != null && container.containsKey("value")) {
 			for (Map<String, Object> containedAttributes : (Map<String, Object>[]) container.get("value")) {
 				addAttributesIfNotNull(result, containedAttributes);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
index 2558ab5684c5..53d7749982cf 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
@@ -59,7 +59,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware {
 	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableAsync = AnnotationAttributes.fromMap(
-				importMetadata.getAnnotationAttributes(EnableAsync.class.getName(), false));
+				importMetadata.getAnnotationAttributes(EnableAsync.class.getName()));
 		if (this.enableAsync == null) {
 			throw new IllegalArgumentException(
 					"@EnableAsync is not present on importing class " + importMetadata.getClassName());
@@ -71,7 +71,7 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 	 */
 	@Autowired
 	void setConfigurers(ObjectProvider<AsyncConfigurer> configurers) {
-		Supplier<AsyncConfigurer> asyncConfigurer = SingletonSupplier.of(() -> {
+		Supplier<AsyncConfigurer> configurer = SingletonSupplier.of(() -> {
 			List<AsyncConfigurer> candidates = configurers.stream().collect(Collectors.toList());
 			if (CollectionUtils.isEmpty(candidates)) {
 				return null;
@@ -81,14 +81,14 @@ void setConfigurers(ObjectProvider<AsyncConfigurer> configurers) {
 			}
 			return candidates.get(0);
 		});
-		this.executor = adapt(asyncConfigurer, AsyncConfigurer::getAsyncExecutor);
-		this.exceptionHandler = adapt(asyncConfigurer, AsyncConfigurer::getAsyncUncaughtExceptionHandler);
+		this.executor = adapt(configurer, AsyncConfigurer::getAsyncExecutor);
+		this.exceptionHandler = adapt(configurer, AsyncConfigurer::getAsyncUncaughtExceptionHandler);
 	}
 
 	private <T> Supplier<T> adapt(Supplier<AsyncConfigurer> supplier, Function<AsyncConfigurer, T> provider) {
 		return () -> {
-			AsyncConfigurer asyncConfigurer = supplier.get();
-			return (asyncConfigurer != null) ? provider.apply(asyncConfigurer) : null;
+			AsyncConfigurer configurer = supplier.get();
+			return (configurer != null ? provider.apply(configurer) : null);
 		};
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
index 460105d9ea56..0e885081fa23 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo
 	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableTx = AnnotationAttributes.fromMap(
-				importMetadata.getAnnotationAttributes(EnableTransactionManagement.class.getName(), false));
+				importMetadata.getAnnotationAttributes(EnableTransactionManagement.class.getName()));
 		if (this.enableTx == null) {
 			throw new IllegalArgumentException(
 					"@EnableTransactionManagement is not present on importing class " + importMetadata.getClassName());

From 31a4c274b7f34cc4fd66bb5c90864ce3ae45fe8e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 15 Dec 2021 21:51:05 +0100
Subject: [PATCH 479/735] Upgrade to SnakeYAML 1.30, MockK 1.12.1, Jetty
 Reactive HttpClient 1.1.10

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 23057804e45d..5144dbccf8cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,7 +92,7 @@ configure(allprojects) { project ->
 				entry 'jibx-run'
 			}
 			dependency "org.ogce:xpp3:1.1.6"
-			dependency "org.yaml:snakeyaml:1.29"
+			dependency "org.yaml:snakeyaml:1.30"
 
 			dependency "com.h2database:h2:1.4.200"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
@@ -150,7 +150,7 @@ configure(allprojects) { project ->
 				}
 			}
 
-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9"
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.10"
 			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2'
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2'
 			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
@@ -204,7 +204,7 @@ configure(allprojects) { project ->
 				}
 				entry 'mockito-junit-jupiter'
 			}
-			dependency "io.mockk:mockk:1.12.0"
+			dependency "io.mockk:mockk:1.12.1"
 
 			dependency("net.sourceforge.htmlunit:htmlunit:2.55.0") {
 				exclude group: "commons-logging", name: "commons-logging"

From 41c8bb4fe1b76d5d33e4a09be767829c99e80ccc Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Thu, 16 Dec 2021 08:46:23 +0000
Subject: [PATCH 480/735] Next development version (v5.3.15-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index bc834bbefe0d..74ccc5d2080b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.14-SNAPSHOT
+version=5.3.15-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From 08a34ca1ec275e4754b8005250ff54226e4546c3 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Sat, 18 Dec 2021 12:02:25 +0900
Subject: [PATCH 481/735] Polish HttpMethod

See gh-27835
---
 .../org/springframework/http/HttpMethod.java  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
index 90557d4e108b..1c85894bf779 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMethod.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -17,8 +17,10 @@
 package org.springframework.http;
 
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -36,10 +38,6 @@ public final class HttpMethod implements Comparable<HttpMethod>, Serializable {
 
 	private static final long serialVersionUID = -70133475680645360L;
 
-	private static final HttpMethod[] values;
-
-	private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
-
 
 	/**
 	 * The HTTP method {@code GET}.
@@ -90,12 +88,9 @@ public final class HttpMethod implements Comparable<HttpMethod>, Serializable {
 	public static final HttpMethod TRACE = new HttpMethod("TRACE");
 
 
-	static {
-		values = new HttpMethod[]{GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE};
-		for (HttpMethod httpMethod : values) {
-			mappings.put(httpMethod.name(), httpMethod);
-		}
-	}
+	private static final HttpMethod[] values = new HttpMethod[] { GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE };
+
+	private static final Map<String, HttpMethod> mappings = Arrays.stream(values).collect(Collectors.toUnmodifiableMap(HttpMethod::name, Function.identity()));
 
 
 	private final String name;
@@ -126,7 +121,7 @@ public static HttpMethod[] values() {
 	 * @return the corresponding {@code HttpMethod}
 	 */
 	public static HttpMethod valueOf(String method) {
-		Assert.notNull(method, "Name must not be null");
+		Assert.notNull(method, "Method must not be null");
 		HttpMethod result = mappings.get(method);
 		if (result != null) {
 			return result;

From 1aaf5262b1e11eec1e3f07dc5f2e7a191203c49a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 21 Dec 2021 09:22:03 +0100
Subject: [PATCH 482/735] Polish formatting

See gh-27835
---
 .../src/main/java/org/springframework/http/HttpMethod.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
index 1c85894bf779..327d37967894 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMethod.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -38,7 +38,6 @@ public final class HttpMethod implements Comparable<HttpMethod>, Serializable {
 
 	private static final long serialVersionUID = -70133475680645360L;
 
-
 	/**
 	 * The HTTP method {@code GET}.
 	 * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.3">HTTP 1.1, section 9.3</a>
@@ -87,10 +86,10 @@ public final class HttpMethod implements Comparable<HttpMethod>, Serializable {
 	 */
 	public static final HttpMethod TRACE = new HttpMethod("TRACE");
 
-
 	private static final HttpMethod[] values = new HttpMethod[] { GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE };
 
-	private static final Map<String, HttpMethod> mappings = Arrays.stream(values).collect(Collectors.toUnmodifiableMap(HttpMethod::name, Function.identity()));
+	private static final Map<String, HttpMethod> mappings = Arrays.stream(values)
+			.collect(Collectors.toUnmodifiableMap(HttpMethod::name, Function.identity()));
 
 
 	private final String name;

From 731af9444c01b53a0f4b3c6fefc06670fe002e89 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Fri, 17 Dec 2021 23:11:24 +0900
Subject: [PATCH 483/735] Polish HtmlCharacterEntityDecoder

See gh-27833
---
 .../web/util/HtmlCharacterEntityDecoder.java          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
index 2d6db518b20a..6b966e67882e 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
@@ -70,13 +70,6 @@ private void findNextPotentialReference(int startPosition) {
 				this.nextSemicolonPosition = this.originalMessage.indexOf(';', this.nextPotentialReferencePosition + 1);
 			}
 
-			boolean isPotentialReference = (this.nextPotentialReferencePosition != -1 &&
-					this.nextSemicolonPosition != -1 &&
-					this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE);
-
-			if (isPotentialReference) {
-				break;
-			}
 			if (this.nextPotentialReferencePosition == -1) {
 				break;
 			}
@@ -85,6 +78,10 @@ private void findNextPotentialReference(int startPosition) {
 				break;
 			}
 
+			if (this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE) {
+				break;
+			}
+
 			this.nextPotentialReferencePosition = this.nextPotentialReferencePosition + 1;
 		}
 		while (this.nextPotentialReferencePosition != -1);

From ac1032ffc99d0c8652fe054c62ff40946ee84b83 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 21 Dec 2021 09:34:39 +0100
Subject: [PATCH 484/735] Polish formatting

See gh-27833
---
 .../org/springframework/web/util/HtmlCharacterEntityDecoder.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
index 6b966e67882e..b99b97fea97a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityDecoder.java
@@ -77,7 +77,6 @@ private void findNextPotentialReference(int startPosition) {
 				this.nextPotentialReferencePosition = -1;
 				break;
 			}
-
 			if (this.nextSemicolonPosition - this.nextPotentialReferencePosition < MAX_REFERENCE_SIZE) {
 				break;
 			}

From 713795cc348c80930bb168374981f82194d32cac Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Thu, 16 Dec 2021 23:15:18 +0900
Subject: [PATCH 485/735] Polish

See gh-27827
---
 .../context/annotation/AnnotationBeanNameGenerator.java         | 2 +-
 .../springframework/web/util/ContentCachingRequestWrapper.java  | 2 +-
 .../function/server/support/RouterFunctionMappingTests.java     | 2 +-
 .../annotation/ExceptionHandlerExceptionResolverTests.java      | 2 +-
 .../method/annotation/ServletInvocableHandlerMethodTests.java   | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index b4f0271475a8..4f2dc199fd3c 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -47,7 +47,7 @@
  *
  * <p>If the annotation's value doesn't indicate a bean name, an appropriate
  * name will be built based on the short name of the class (with the first
- * letter lower-cased), unless the two first letters are uppercase. For example:
+ * letter lower-cased), unless the first two letters are uppercase. For example:
  *
  * <pre class="code">com.xyz.FooServiceImpl -&gt; fooServiceImpl</pre>
  * <pre class="code">com.xyz.URLFooServiceImpl -&gt; URLFooServiceImpl</pre>
diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
index 562ab5b1cca5..6b2bb021a822 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
@@ -189,7 +189,7 @@ private void writeRequestParametersToCachedContent() {
 	 * Return the cached request content as a byte array.
 	 * <p>The returned array will never be larger than the content cache limit.
 	 * <p><strong>Note:</strong> The byte array returned from this method
-	 * reflects the amount of content that has has been read at the time when it
+	 * reflects the amount of content that has been read at the time when it
 	 * is called. If the application does not read the content, this method
 	 * returns an empty array.
 	 * @see #ContentCachingRequestWrapper(HttpServletRequest, int)
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java
index a7d5fce5a17d..68f8b35ac4c3 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java
@@ -38,7 +38,7 @@
  * @author Arjen Poutsma
  * @author Brian Clozel
  */
-public class RouterFunctionMappingTests {
+class RouterFunctionMappingTests {
 
 	private final ServerCodecConfigurer codecConfigurer = ServerCodecConfigurer.create();
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
index 960935036266..90c9d2513bf1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
@@ -340,7 +340,7 @@ void resolveExceptionWithAssertionErrorAsRootCause() throws Exception {
 	}
 
 	@Test //gh-27156
-	void resolveExceptionWithReasonResovledByMessageSource() throws Exception {
+	void resolveExceptionWithReasonResolvedByMessageSource() throws Exception {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class);
 		StaticApplicationContext context = new StaticApplicationContext(ctx);
 		Locale locale = Locale.ENGLISH;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
index ba386fce36b8..08c5813b2158 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
@@ -196,7 +196,6 @@ public void invokeAndHandle_responseStatusAndReasonCode() throws Exception {
 		context.refresh();
 
 		ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
-		System.out.println(beanFactory.getType(beanName));
 
 		LocaleContextHolder.setLocale(locale);
 		try {

From dbbdd044cdd5439e4066b71af34324670a274514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=85=B6=E8=8B=97?= <chenqimiao1994@126.com>
Date: Wed, 4 Mar 2020 11:46:50 +0800
Subject: [PATCH 486/735] Use Collections.addAll instead of Collection.addAll

See gh-24636
---
 .../main/java/org/springframework/util/CollectionUtils.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
index a574fff2674b..0bb29244698b 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -129,9 +129,7 @@ public static List<?> arrayToList(@Nullable Object source) {
 	@SuppressWarnings("unchecked")
 	public static <E> void mergeArrayIntoCollection(@Nullable Object array, Collection<E> collection) {
 		Object[] arr = ObjectUtils.toObjectArray(array);
-		for (Object elem : arr) {
-			collection.add((E) elem);
-		}
+		Collections.addAll(collection, (E[])arr);
 	}
 
 	/**

From ca6911a532925e8f2a4d8c0901e5536dd60d1841 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 21 Dec 2021 09:49:08 +0100
Subject: [PATCH 487/735] Update copyright year of changed file

See gh-24636
---
 .../src/main/java/org/springframework/util/CollectionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
index 0bb29244698b..1eadaa5680fa 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From b69ab8d568d363d1e5e6be4330fa6d1242e27a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=85=B6=E8=8B=97?= <chenqimiao1994@126.com>
Date: Fri, 14 Feb 2020 22:40:47 +0800
Subject: [PATCH 488/735] Reuse ResolvableType in getDependencyType

See gh-24525
---
 .../factory/config/DependencyDescriptor.java  | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
index c808a8154124..0c81b30108f2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -21,8 +21,6 @@
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.Optional;
 
@@ -365,23 +363,8 @@ public String getDependencyName() {
 	public Class<?> getDependencyType() {
 		if (this.field != null) {
 			if (this.nestingLevel > 1) {
-				Type type = this.field.getGenericType();
-				for (int i = 2; i <= this.nestingLevel; i++) {
-					if (type instanceof ParameterizedType) {
-						Type[] args = ((ParameterizedType) type).getActualTypeArguments();
-						type = args[args.length - 1];
-					}
-				}
-				if (type instanceof Class) {
-					return (Class<?>) type;
-				}
-				else if (type instanceof ParameterizedType) {
-					Type arg = ((ParameterizedType) type).getRawType();
-					if (arg instanceof Class) {
-						return (Class<?>) arg;
-					}
-				}
-				return Object.class;
+				Class<?> clazz = getResolvableType().getRawClass();
+				return clazz != null ? clazz : Object.class;
 			}
 			else {
 				return this.field.getType();

From f1fe16e3cda66b164f77489f82287116477197bc Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 21 Dec 2021 11:17:53 +0100
Subject: [PATCH 489/735] Polish "Reuse ResolvableType in getDependencyType"

See gh-24525
---
 .../beans/factory/config/DependencyDescriptor.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
index 0c81b30108f2..4825563735ff 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -364,7 +364,7 @@ public Class<?> getDependencyType() {
 		if (this.field != null) {
 			if (this.nestingLevel > 1) {
 				Class<?> clazz = getResolvableType().getRawClass();
-				return clazz != null ? clazz : Object.class;
+				return (clazz != null ? clazz : Object.class);
 			}
 			else {
 				return this.field.getType();

From f3fd7b156ec2d75eb5259d664c674ae5695ec7f9 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Thu, 23 Dec 2021 20:01:10 +0900
Subject: [PATCH 490/735] Add Javadoc since to new PayloadApplicationEvent
 constructor

See gh-27848
---
 .../org/springframework/context/PayloadApplicationEvent.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
index 612d2752f5fc..e0ef81da7a20 100644
--- a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
@@ -46,6 +46,7 @@ public class PayloadApplicationEvent<T> extends ApplicationEvent implements Reso
 	 * @param source the object on which the event initially occurred (never {@code null})
 	 * @param payload the payload object (never {@code null})
 	 * @param payloadType the type object of payload object (can be {@code null})
+	 * @since 6.0.0
 	 */
 	public PayloadApplicationEvent(Object source, T payload, @Nullable ResolvableType payloadType) {
 		super(source);

From 772630caf153f5374ad12bd8064e10965c3b39d2 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 27 Dec 2021 12:15:27 +0100
Subject: [PATCH 491/735] Polish "Add Javadoc since to new
 PayloadApplicationEvent constructor"

See gh-27848
---
 .../org/springframework/context/PayloadApplicationEvent.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
index e0ef81da7a20..d591cf7421ff 100644
--- a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
@@ -46,7 +46,7 @@ public class PayloadApplicationEvent<T> extends ApplicationEvent implements Reso
 	 * @param source the object on which the event initially occurred (never {@code null})
 	 * @param payload the payload object (never {@code null})
 	 * @param payloadType the type object of payload object (can be {@code null})
-	 * @since 6.0.0
+	 * @since 6.0
 	 */
 	public PayloadApplicationEvent(Object source, T payload, @Nullable ResolvableType payloadType) {
 		super(source);

From 7ba089be9532eef1696edf450f07afeb1ca876f4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 27 Dec 2021 17:33:04 +0100
Subject: [PATCH 492/735] Temporarily remove references to JBoss AS Javadoc

See gh-27860
---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3db0d04aa39c..02bf1fedc648 100644
--- a/build.gradle
+++ b/build.gradle
@@ -328,8 +328,6 @@ configure([rootProject] + javaProjects) { project ->
 			"https://jakarta.ee/specifications/platform/9/apidocs/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
-			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
-			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
 			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",

From f0125afb5eb4286ff59ecf84f429cce459434248 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Wed, 29 Dec 2021 05:12:57 +0900
Subject: [PATCH 493/735] Remove references to JCacheConfigurerSupport and
 CachingConfigurerSupport

See gh-27863
---
 .../aspectj/AspectJEnableCachingIsolatedTests.java     | 10 +++++-----
 .../cache/aspectj/AspectJEnableCachingTests.java       |  4 ++--
 .../cache/jcache/config/JCacheConfigurer.java          |  2 +-
 .../cache/annotation/CachingConfigurer.java            |  8 ++++----
 .../cache/annotation/EnableCaching.java                |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
index 4235f801df73..6c16c26364a6 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
@@ -21,7 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.interceptor.CacheErrorHandler;
 import org.springframework.cache.interceptor.CacheResolver;
@@ -143,7 +143,7 @@ public void bothSetOnlyResolverIsUsed() {
 
 	@Configuration
 	@EnableCaching(mode = AdviceMode.ASPECTJ)
-	static class EnableCachingConfig extends CachingConfigurerSupport {
+	static class EnableCachingConfig implements CachingConfigurer {
 
 		@Override
 		@Bean
@@ -220,7 +220,7 @@ public CacheManager cm2() {
 
 	@Configuration
 	@EnableCaching(mode = AdviceMode.ASPECTJ)
-	static class MultiCacheManagerConfigurer extends CachingConfigurerSupport {
+	static class MultiCacheManagerConfigurer implements CachingConfigurer {
 
 		@Bean
 		public CacheManager cm1() {
@@ -246,7 +246,7 @@ public KeyGenerator keyGenerator() {
 
 	@Configuration
 	@EnableCaching(mode = AdviceMode.ASPECTJ)
-	static class EmptyConfigSupportConfig extends CachingConfigurerSupport {
+	static class EmptyConfigSupportConfig implements CachingConfigurer {
 
 		@Bean
 		public CacheManager cm() {
@@ -258,7 +258,7 @@ public CacheManager cm() {
 
 	@Configuration
 	@EnableCaching(mode = AdviceMode.ASPECTJ)
-	static class FullCachingConfig extends CachingConfigurerSupport {
+	static class FullCachingConfig implements CachingConfigurer {
 
 		@Override
 		@Bean
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java
index 7e693d6ea13a..4c5f7b414ab5 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java
@@ -17,7 +17,7 @@
 package org.springframework.cache.aspectj;
 
 import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.CachingConfigurer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.config.AnnotatedClassCacheableService;
 import org.springframework.cache.config.CacheableService;
@@ -47,7 +47,7 @@ protected ConfigurableApplicationContext getApplicationContext() {
 
 	@Configuration
 	@EnableCaching(mode = AdviceMode.ASPECTJ)
-	static class EnableCachingConfig extends CachingConfigurerSupport {
+	static class EnableCachingConfig implements CachingConfigurer {
 
 		@Override
 		@Bean
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java
index 039729a02d50..12f3d4fb7864 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/config/JCacheConfigurer.java
@@ -46,7 +46,7 @@ public interface JCacheConfigurer extends CachingConfigurer {
 	 * <pre class="code">
 	 * &#064;Configuration
 	 * &#064;EnableCaching
-	 * public class AppConfig extends JCacheConfigurerSupport {
+	 * public class AppConfig implements JCacheConfigurer {
 	 *     &#064;Bean // important!
 	 *     &#064;Override
 	 *     public CacheResolver exceptionCacheResolver() {
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
index e3dbe023f189..a0a7c8a83d3e 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java
@@ -50,7 +50,7 @@ public interface CachingConfigurer {
 	 * <pre class="code">
 	 * &#064;Configuration
 	 * &#064;EnableCaching
-	 * public class AppConfig extends CachingConfigurerSupport {
+	 * public class AppConfig implements CachingConfigurer {
 	 *     &#064;Bean // important!
 	 *     &#064;Override
 	 *     public CacheManager cacheManager() {
@@ -77,7 +77,7 @@ default CacheManager cacheManager() {
 	 * <pre class="code">
 	 * &#064;Configuration
 	 * &#064;EnableCaching
-	 * public class AppConfig extends CachingConfigurerSupport {
+	 * public class AppConfig implements CachingConfigurer {
 	 *     &#064;Bean // important!
 	 *     &#064;Override
 	 *     public CacheResolver cacheResolver() {
@@ -100,7 +100,7 @@ default CacheResolver cacheResolver() {
 	 * <pre class="code">
 	 * &#064;Configuration
 	 * &#064;EnableCaching
-	 * public class AppConfig extends CachingConfigurerSupport {
+	 * public class AppConfig implements CachingConfigurer {
 	 *     &#064;Bean // important!
 	 *     &#064;Override
 	 *     public KeyGenerator keyGenerator() {
@@ -125,7 +125,7 @@ default KeyGenerator keyGenerator() {
 	 * <pre class="code">
 	 * &#064;Configuration
 	 * &#064;EnableCaching
-	 * public class AppConfig extends CachingConfigurerSupport {
+	 * public class AppConfig implements CachingConfigurer {
 	 *     &#064;Bean // important!
 	 *     &#064;Override
 	 *     public CacheErrorHandler errorHandler() {
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
index 85948024cb3f..70f62b5fd0d0 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
@@ -103,7 +103,7 @@
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableCaching
- * public class AppConfig extends CachingConfigurerSupport {
+ * public class AppConfig implements CachingConfigurer {
  *
  *     &#064;Bean
  *     public MyService myService() {

From c204cc7ba0a2a62994b7275ad0743624c1344597 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 29 Dec 2021 10:54:49 +0100
Subject: [PATCH 494/735] Update copyright year of changed file

See gh-27863
---
 .../org/springframework/cache/annotation/EnableCaching.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
index 70f62b5fd0d0..872f493edc01 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 88d4eac5377f16b48458308c066ebc9d525ed183 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Wed, 29 Dec 2021 05:24:55 +0900
Subject: [PATCH 495/735] Remove AsyncConfigurerSupport reference in
 EnableAsync Javadoc

See gh-27864
---
 .../org/springframework/scheduling/annotation/EnableAsync.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 5e394ae7c75e..5e4b9290fae3 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -104,8 +104,7 @@
  * }</pre>
  *
  * <p>If only one item needs to be customized, {@code null} can be returned to
- * keep the default settings. Consider also extending from {@link AsyncConfigurerSupport}
- * when possible.
+ * keep the default settings.
  *
  * <p>Note: In the above example the {@code ThreadPoolTaskExecutor} is not a fully managed
  * Spring bean. Add the {@code @Bean} annotation to the {@code getAsyncExecutor()} method

From 8a7a046bf0073e73e85eab4856a7915fc9d46e40 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 29 Dec 2021 10:56:29 +0100
Subject: [PATCH 496/735] Update copyright year of changed file

See gh-27864
---
 .../org/springframework/scheduling/annotation/EnableAsync.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 5e4b9290fae3..0b7df3269e5d 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 65d2e9bb547e15df4b9eda1dcf36ec17f8f3a60a Mon Sep 17 00:00:00 2001
From: liuzhifei <2679431923@qq.com>
Date: Fri, 24 Dec 2021 11:11:28 +0800
Subject: [PATCH 497/735] Fix typo and use of componentry

See gh-27852
---
 .../springframework/scheduling/annotation/EnableAsync.java    | 2 +-
 .../scheduling/annotation/EnableScheduling.java               | 2 +-
 .../java/org/springframework/http/server/RequestPath.java     | 4 ++--
 .../web/SpringServletContainerInitializer.java                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 0b7df3269e5d..08225849007b 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -133,7 +133,7 @@
  * setting of the <em>thread name prefix</em> of the {@code Executor}; this is because
  * the {@code <task:executor>} element does not expose such an attribute. This
  * demonstrates how the JavaConfig-based approach allows for maximum configurability
- * through direct access to actual componentry.
+ * through direct access to actual component.
  *
  * <p>The {@link #mode} attribute controls how advice is applied: If the mode is
  * {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
index e35b0a799291..3b7e68a7678e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
@@ -180,7 +180,7 @@
  * instead of a custom <em>{@code Trigger}</em> implementation; this is because the
  * {@code task:} namespace {@code scheduled} cannot easily expose such support. This is
  * but one demonstration how the code-based approach allows for maximum configurability
- * through direct access to actual componentry.
+ * through direct access to actual component.
  *
  * <p><b>Note: {@code @EnableScheduling} applies to its local application context only,
  * allowing for selective scheduling of beans at different levels.</b> Please redeclare
diff --git a/spring-web/src/main/java/org/springframework/http/server/RequestPath.java b/spring-web/src/main/java/org/springframework/http/server/RequestPath.java
index 6b748da1d43a..cea7a8b99988 100644
--- a/spring-web/src/main/java/org/springframework/http/server/RequestPath.java
+++ b/spring-web/src/main/java/org/springframework/http/server/RequestPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 /**
  * Specialization of {@link PathContainer} that sub-divides the path into a
  * {@link #contextPath()} and the remaining {@link #pathWithinApplication()}.
- * The lattery is typically used for request mapping within the application
+ * The latter is typically used for request mapping within the application
  * while the former is useful when preparing external links that point back to
  * the application.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index 3c0d69c46d81..5e1a189fe6a5 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -129,7 +129,7 @@ public class SpringServletContainerInitializer implements ServletContainerInitia
 	 * method will be invoked on each instance, delegating the {@code ServletContext} such
 	 * that each instance may register and configure servlets such as Spring's
 	 * {@code DispatcherServlet}, listeners such as Spring's {@code ContextLoaderListener},
-	 * or any other Servlet API componentry such as filters.
+	 * or any other Servlet API component such as filters.
 	 * @param webAppInitializerClasses all implementations of
 	 * {@link WebApplicationInitializer} found on the application classpath
 	 * @param servletContext the servlet context to be initialized

From 900e0f56eba3669e7b2c13567589678c12e41c55 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 29 Dec 2021 11:05:27 +0100
Subject: [PATCH 498/735] Polish "Fix typo and use of componentry"

See gh-27852
---
 .../org/springframework/scheduling/annotation/EnableAsync.java  | 2 +-
 .../springframework/scheduling/annotation/EnableScheduling.java | 2 +-
 .../springframework/web/SpringServletContainerInitializer.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 08225849007b..38f5c2f410cb 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -133,7 +133,7 @@
  * setting of the <em>thread name prefix</em> of the {@code Executor}; this is because
  * the {@code <task:executor>} element does not expose such an attribute. This
  * demonstrates how the JavaConfig-based approach allows for maximum configurability
- * through direct access to actual component.
+ * through direct access to the actual component.
  *
  * <p>The {@link #mode} attribute controls how advice is applied: If the mode is
  * {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
index 3b7e68a7678e..0d49e240d5df 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
@@ -180,7 +180,7 @@
  * instead of a custom <em>{@code Trigger}</em> implementation; this is because the
  * {@code task:} namespace {@code scheduled} cannot easily expose such support. This is
  * but one demonstration how the code-based approach allows for maximum configurability
- * through direct access to actual component.
+ * through direct access to the actual component.
  *
  * <p><b>Note: {@code @EnableScheduling} applies to its local application context only,
  * allowing for selective scheduling of beans at different levels.</b> Please redeclare
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index 5e1a189fe6a5..5ced8bf39e44 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -129,7 +129,7 @@ public class SpringServletContainerInitializer implements ServletContainerInitia
 	 * method will be invoked on each instance, delegating the {@code ServletContext} such
 	 * that each instance may register and configure servlets such as Spring's
 	 * {@code DispatcherServlet}, listeners such as Spring's {@code ContextLoaderListener},
-	 * or any other Servlet API component such as filters.
+	 * or any other Servlet API features such as filters.
 	 * @param webAppInitializerClasses all implementations of
 	 * {@link WebApplicationInitializer} found on the application classpath
 	 * @param servletContext the servlet context to be initialized

From 95fac2589fc465a8b1d7187f55487ffdd92091b5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 3 Jan 2022 11:50:37 +0100
Subject: [PATCH 499/735] Upgrade to Log4j2 2.17.1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5144dbccf8cd..3f5e29f68092 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ configure(allprojects) { project ->
 			mavenBom "org.junit:junit-bom:5.8.2"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.16.0') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.17.1') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'

From a410f4c0f2f9ce10eefd1f7141739d362730cd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Mon, 3 Jan 2022 15:45:37 +0100
Subject: [PATCH 500/735] Upgrade Kotlin Coroutines to 1.6.0

Closes gh-27878
---
 build.gradle                                                  | 2 +-
 .../messaging/rsocket/RSocketRequesterExtensions.kt           | 4 ++--
 .../springframework/r2dbc/core/DatabaseClientExtensions.kt    | 4 ++--
 .../org/springframework/r2dbc/core/RowsFetchSpecExtensions.kt | 4 ++--
 .../web/reactive/function/client/ClientResponseExtensions.kt  | 4 ++--
 .../web/reactive/function/client/WebClientExtensions.kt       | 4 ++--
 .../web/reactive/function/server/ServerRequestExtensions.kt   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8527b9f8e410..f784d867f84f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ configure(allprojects) { project ->
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:11.0.7"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.0"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
 			mavenBom "org.junit:junit-bom:5.8.2"
 		}
diff --git a/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt
index 319680a63062..004b567a51e1 100644
--- a/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt
+++ b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,8 @@ package org.springframework.messaging.rsocket
 import io.rsocket.transport.ClientTransport
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
-import kotlinx.coroutines.reactive.awaitSingleOrNull
 import kotlinx.coroutines.reactive.awaitSingle
+import kotlinx.coroutines.reactor.awaitSingleOrNull
 import org.reactivestreams.Publisher
 import org.springframework.core.ParameterizedTypeReference
 import reactor.core.publisher.Flux
diff --git a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt
index 59179281e6c4..153e5ce97496 100644
--- a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt
+++ b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.r2dbc.core
 
-import kotlinx.coroutines.reactive.awaitSingleOrNull
+import kotlinx.coroutines.reactor.awaitSingleOrNull
 
 /**
  * Coroutines variant of [DatabaseClient.GenericExecuteSpec.then].
diff --git a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/RowsFetchSpecExtensions.kt b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/RowsFetchSpecExtensions.kt
index 40d7eed60283..56533c66d77c 100644
--- a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/RowsFetchSpecExtensions.kt
+++ b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/RowsFetchSpecExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ package org.springframework.r2dbc.core
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
-import kotlinx.coroutines.reactive.awaitSingleOrNull
+import kotlinx.coroutines.reactor.awaitSingleOrNull
 import org.springframework.dao.EmptyResultDataAccessException
 
 /**
diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt
index da021887f624..b922a0aaf801 100644
--- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt
+++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.web.reactive.function.client
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.reactive.awaitSingleOrNull
+import kotlinx.coroutines.reactor.awaitSingleOrNull
 import kotlinx.coroutines.reactive.awaitSingle
 import kotlinx.coroutines.reactive.asFlow
 import org.springframework.core.ParameterizedTypeReference
diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt
index 602b71212a70..100898577903 100644
--- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt
+++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,7 +20,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
 import kotlinx.coroutines.reactive.awaitSingle
-import kotlinx.coroutines.reactive.awaitSingleOrNull
+import kotlinx.coroutines.reactor.awaitSingleOrNull
 import kotlinx.coroutines.reactor.asFlux
 import kotlinx.coroutines.reactor.mono
 import org.reactivestreams.Publisher
diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt
index d02fa0bb5dd5..e446d51bfb3c 100644
--- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt
+++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.web.reactive.function.server
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.reactive.awaitSingleOrNull
+import kotlinx.coroutines.reactor.awaitSingleOrNull
 import kotlinx.coroutines.reactive.awaitSingle
 import kotlinx.coroutines.reactive.asFlow
 import org.springframework.core.ParameterizedTypeReference

From 0b8c815c6f9da128ed472b3bb40b5fe4eff18d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Mon, 3 Jan 2022 15:48:27 +0100
Subject: [PATCH 501/735] Upgrade Kotlin serialization to 1.3.2

Closes gh-27879
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f784d867f84f..5455bf0eda22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ configure(allprojects) { project ->
 			mavenBom "org.eclipse.jetty:jetty-bom:11.0.7"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.0"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.3.2"
 			mavenBom "org.junit:junit-bom:5.8.2"
 		}
 		dependencies {

From 1dee80e750df3fa658d3e5c6ef160538c62569ad Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 3 Jan 2022 15:59:37 +0100
Subject: [PATCH 502/735] Upgrade to Gradle 7.3.3

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e750102e0926..2e6e5897b528 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 97625e365803526658d47a26cc6f010259154be1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 3 Jan 2022 16:01:01 +0100
Subject: [PATCH 503/735] Additional changes because HttpMethod changed from
 enum to class

See gh-27697
---
 .../mock/http/server/reactive/MockServerHttpRequest.java  | 4 ++--
 .../http/server/reactive/MockServerHttpRequestTests.java  | 4 +++-
 .../main/java/org/springframework/http/HttpRequest.java   | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
index 6d8bda48ab81..a105e69713b7 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -238,7 +238,7 @@ public static BodyBuilder method(HttpMethod method, String uri, Object... vars)
 	 * @param vars variables to expand into the template
 	 * @return the created builder
 	 * @since 5.2.7
-	 * @deprecated in favor of {@link #method(HttpMethod, String, Object...)}
+	 * @deprecated as of Spring Framework 6.0 in favor of {@link #method(HttpMethod, String, Object...)}
 	 */
 	@Deprecated
 	public static BodyBuilder method(String httpMethod, String uri, Object... vars) {
diff --git a/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java b/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java
index 1fecf99f478b..59288db82c05 100644
--- a/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -70,6 +70,7 @@ void httpMethodNotNullOrEmpty(Executable executable) {
 		assertThat(ex.getMessage()).contains("HTTP method is required.");
 	}
 
+	@SuppressWarnings("deprecation")
 	static Stream<Executable> httpMethodNotNullOrEmpty() {
 		String uriTemplate = "/foo bar?a=b";
 		return Stream.of(
@@ -80,4 +81,5 @@ static Stream<Executable> httpMethodNotNullOrEmpty() {
 				() -> MockServerHttpRequest.method("   ", uriTemplate).build()
 		);
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/HttpRequest.java b/spring-web/src/main/java/org/springframework/http/HttpRequest.java
index 2c0c71ca185d..643f3ca365c1 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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,8 @@
 import java.net.URI;
 
 /**
- * Represents an HTTP request message, consisting of
- * {@linkplain #getMethod() method} and {@linkplain #getURI() uri}.
+ * Represents an HTTP request message, consisting of a
+ * {@linkplain #getMethod() method} and a {@linkplain #getURI() URI}.
  *
  * @author Arjen Poutsma
  * @since 3.1
@@ -39,7 +39,7 @@ public interface HttpRequest extends HttpMessage {
 	 * @return the HTTP method as a plain String
 	 * @since 5.0
 	 * @see #getMethod()
-	 * @deprecated in favor of {@link #getMethod()} and
+	 * @deprecated as of Spring Framework 6.0 in favor of {@link #getMethod()} and
 	 * {@link HttpMethod#name()}
 	 */
 	@Deprecated

From 6555d3b42d56014823a9ef9859a6824b074a72a8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 3 Jan 2022 16:11:15 +0100
Subject: [PATCH 504/735] Suppress warnings in tests

---
 .../event/PayloadApplicationEventTests.java   | 32 ++++++++++---------
 .../springframework/http/MediaTypeTests.java  |  8 ++++-
 .../ProtobufHttpMessageConverterTests.java    |  3 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
index 8fb78ceda8a9..42fb935e7f55 100644
--- a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -43,11 +43,12 @@ void payloadApplicationEventWithNoTypeUsesInstance() {
 		PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this, payload);
 		assertThat(event.getResolvableType()).satisfies(eventType -> {
 			assertThat(eventType.toClass()).isEqualTo(PayloadApplicationEvent.class);
-			assertThat(eventType.getGenerics()).hasSize(1);
-			assertThat(eventType.getGenerics()[0]).satisfies(bodyType -> {
-				assertThat(bodyType.toClass()).isEqualTo(NumberHolder.class);
-				assertThat(bodyType.hasUnresolvableGenerics()).isTrue();
-			});
+			assertThat(eventType.getGenerics())
+				.hasSize(1)
+				.allSatisfy(bodyType -> {
+					assertThat(bodyType.toClass()).isEqualTo(NumberHolder.class);
+					assertThat(bodyType.hasUnresolvableGenerics()).isTrue();
+				});
 		});
 	}
 
@@ -58,16 +59,18 @@ void payloadApplicationEventWithType() {
 		PayloadApplicationEvent<NumberHolder<Integer>> event = new PayloadApplicationEvent<>(this, payload, payloadType);
 		assertThat(event.getResolvableType()).satisfies(eventType -> {
 			assertThat(eventType.toClass()).isEqualTo(PayloadApplicationEvent.class);
-			assertThat(eventType.getGenerics()).hasSize(1);
-			assertThat(eventType.getGenerics()[0]).satisfies(bodyType -> {
-				assertThat(bodyType.toClass()).isEqualTo(NumberHolder.class);
-				assertThat(bodyType.hasUnresolvableGenerics()).isFalse();
-				assertThat(bodyType.getGenerics()[0].toClass()).isEqualTo(Integer.class);
-			});
+			assertThat(eventType.getGenerics())
+				.hasSize(1)
+				.allSatisfy(bodyType -> {
+					assertThat(bodyType.toClass()).isEqualTo(NumberHolder.class);
+					assertThat(bodyType.hasUnresolvableGenerics()).isFalse();
+					assertThat(bodyType.getGenerics()[0].toClass()).isEqualTo(Integer.class);
+				});
 		});
 	}
 
 	@Test
+	@SuppressWarnings("resource")
 	void testEventClassWithInterface() {
 		ApplicationContext ac = new AnnotationConfigApplicationContext(AuditableListener.class);
 
@@ -77,6 +80,7 @@ void testEventClassWithInterface() {
 	}
 
 	@Test
+	@SuppressWarnings("resource")
 	void testProgrammaticEventListener() {
 		List<Auditable> events = new ArrayList<>();
 		ApplicationListener<AuditablePayloadEvent<String>> listener = events::add;
@@ -93,6 +97,7 @@ void testProgrammaticEventListener() {
 	}
 
 	@Test
+	@SuppressWarnings("resource")
 	void testProgrammaticPayloadListener() {
 		List<String> events = new ArrayList<>();
 		ApplicationListener<PayloadApplicationEvent<String>> listener = ApplicationListener.forPayload(events::add);
@@ -135,10 +140,7 @@ public void onEvent(Auditable event) {
 
 	static class NumberHolder<T extends Number> {
 
-		private T number;
-
 		public NumberHolder(T number) {
-			this.number = number;
 		}
 
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java b/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
index 9c145058452c..190bdf82e890 100644
--- a/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
+++ b/spring-web/src/test/java/org/springframework/http/MediaTypeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -291,6 +291,7 @@ public void specificityComparator() throws Exception {
 		MediaType allXml = new MediaType("application", "*+xml");
 		MediaType all = MediaType.ALL;
 
+		@SuppressWarnings("deprecation")
 		Comparator<MediaType> comp = MediaType.SPECIFICITY_COMPARATOR;
 
 		// equal
@@ -334,6 +335,7 @@ public void specificityComparator() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void sortBySpecificityRelated() {
 		MediaType audioBasic = new MediaType("audio", "basic");
 		MediaType audio = new MediaType("audio");
@@ -364,6 +366,7 @@ public void sortBySpecificityRelated() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void sortBySpecificityUnrelated() {
 		MediaType audioBasic = new MediaType("audio", "basic");
 		MediaType audioWave = new MediaType("audio", "wave");
@@ -395,6 +398,7 @@ public void qualityComparator() throws Exception {
 		MediaType allXml = new MediaType("application", "*+xml");
 		MediaType all = MediaType.ALL;
 
+		@SuppressWarnings("deprecation")
 		Comparator<MediaType> comp = MediaType.QUALITY_VALUE_COMPARATOR;
 
 		// equal
@@ -438,6 +442,7 @@ public void qualityComparator() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void sortByQualityRelated() {
 		MediaType audioBasic = new MediaType("audio", "basic");
 		MediaType audio = new MediaType("audio");
@@ -468,6 +473,7 @@ public void sortByQualityRelated() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void sortByQualityUnrelated() {
 		MediaType audioBasic = new MediaType("audio", "basic");
 		MediaType audioWave = new MediaType("audio", "wave");
diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
index 6d89057ea85d..92705a4dcb10 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -147,6 +147,7 @@ public void writeJsonWithJavaFormat() throws IOException {
 				new ProtobufHttpMessageConverter.ProtobufJavaFormatSupport(),
 				this.extensionRegistry);
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+		@SuppressWarnings("deprecation")
 		MediaType contentType = MediaType.APPLICATION_JSON_UTF8;
 		this.converter.write(this.testMsg, contentType, outputMessage);
 

From 7021eb5bb1703a851028b0a9cae013e31dc04ebd Mon Sep 17 00:00:00 2001
From: liuzhifei <2679431923@qq.com>
Date: Thu, 18 Nov 2021 20:13:13 +0800
Subject: [PATCH 505/735] Apply "instanceof pattern matching" in additional
 locations

Closes gh-27696
---
 .../assembler/AbstractConfigurableMBeanInfoAssembler.java | 3 +--
 .../main/java/org/springframework/core/Conventions.java   | 8 +++-----
 .../web/socket/AbstractWebSocketMessage.java              | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
index 525a27432656..dba27a1205f6 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractConfigurableMBeanInfoAssembler.java
@@ -76,8 +76,7 @@ private ModelMBeanNotificationInfo[] extractNotificationMetadata(Object mapValue
 		if (mapValue instanceof ManagedNotification mn) {
 			return new ModelMBeanNotificationInfo[] {JmxMetadataUtils.convertToModelMBeanNotificationInfo(mn)};
 		}
-		else if (mapValue instanceof Collection) {
-			Collection<?> col = (Collection<?>) mapValue;
+		else if (mapValue instanceof Collection<?> col) {
 			List<ModelMBeanNotificationInfo> result = new ArrayList<>();
 			for (Object colValue : col) {
 				if (!(colValue instanceof ManagedNotification mn)) {
diff --git a/spring-core/src/main/java/org/springframework/core/Conventions.java b/spring-core/src/main/java/org/springframework/core/Conventions.java
index 70daea7b454e..be3abc598a95 100644
--- a/spring-core/src/main/java/org/springframework/core/Conventions.java
+++ b/spring-core/src/main/java/org/springframework/core/Conventions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,8 +70,7 @@ public static String getVariableName(Object value) {
 			valueClass = value.getClass().getComponentType();
 			pluralize = true;
 		}
-		else if (value instanceof Collection) {
-			Collection<?> collection = (Collection<?>) value;
+		else if (value instanceof Collection<?> collection) {
 			if (collection.isEmpty()) {
 				throw new IllegalArgumentException(
 						"Cannot generate variable name for an empty Collection");
@@ -188,11 +187,10 @@ public static String getVariableNameForReturnType(Method method, Class<?> resolv
 		else if (Collection.class.isAssignableFrom(resolvedType)) {
 			valueClass = ResolvableType.forMethodReturnType(method).asCollection().resolveGeneric();
 			if (valueClass == null) {
-				if (!(value instanceof Collection)) {
+				if (!(value instanceof Collection<?> collection)) {
 					throw new IllegalArgumentException("Cannot generate variable name " +
 							"for non-typed Collection return type and a non-Collection value");
 				}
-				Collection<?> collection = (Collection<?>) value;
 				if (collection.isEmpty()) {
 					throw new IllegalArgumentException("Cannot generate variable name " +
 							"for non-typed Collection return type and an empty Collection value");
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java b/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java
index b3a3b3ae635e..cd9d187a92f0 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,10 +79,9 @@ public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof AbstractWebSocketMessage)) {
+		if (!(other instanceof AbstractWebSocketMessage<?> otherMessage)) {
 			return false;
 		}
-		AbstractWebSocketMessage<?> otherMessage = (AbstractWebSocketMessage<?>) other;
 		return ObjectUtils.nullSafeEquals(this.payload, otherMessage.payload);
 	}
 

From ab240f5d8eb82e05ee558cbdbaa54cd548ab8cc0 Mon Sep 17 00:00:00 2001
From: "a.yazychyan" <a.yazychyan@tinkoff.ru>
Date: Fri, 17 Dec 2021 01:27:02 +0300
Subject: [PATCH 506/735] Use String.repeat() and pattern matching instanceof

Closes gh-27834
---
 .../jdbc/core/ArgumentTypePreparedStatementSetter.java   | 3 +--
 .../jdbc/core/PreparedStatementCreatorFactory.java       | 3 +--
 .../AbstractDataFieldMaxValueIncrementer.java            | 9 ++-------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java
index 3d89d8abe775..8b68d529e413 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java
@@ -61,8 +61,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 		if (this.args != null && this.argTypes != null) {
 			for (int i = 0; i < this.args.length; i++) {
 				Object arg = this.args[i];
-				if (arg instanceof Collection && this.argTypes[i] != Types.ARRAY) {
-					Collection<?> entries = (Collection<?>) arg;
+				if (arg instanceof Collection<?> entries && this.argTypes[i] != Types.ARRAY) {
 					for (Object entry : entries) {
 						if (entry instanceof Object[] valueArray) {
 							for (Object argValue : valueArray) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
index ecf784e4c63e..b40703dad045 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
@@ -265,8 +265,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 					}
 					declaredParameter = declaredParameters.get(i);
 				}
-				if (in instanceof Iterable && declaredParameter.getSqlType() != Types.ARRAY) {
-					Iterable<?> entries = (Iterable<?>) in;
+				if (in instanceof Iterable<?> entries && declaredParameter.getSqlType() != Types.ARRAY) {
 					for (Object entry : entries) {
 						if (entry instanceof Object[] valueArray) {
 							for (Object argValue : valueArray) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
index bc96bcf95ab8..75bb69ea9cb3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,12 +133,7 @@ public String nextStringValue() throws DataAccessException {
 		String s = Long.toString(getNextKey());
 		int len = s.length();
 		if (len < this.paddingLength) {
-			StringBuilder sb = new StringBuilder(this.paddingLength);
-			for (int i = 0; i < this.paddingLength - len; i++) {
-				sb.append('0');
-			}
-			sb.append(s);
-			s = sb.toString();
+			s = "0".repeat(this.paddingLength - len) + s;
 		}
 		return s;
 	}

From 941b6af9acada0c85522a1aeb91178f71c2c641a Mon Sep 17 00:00:00 2001
From: Marten Deinum <mdeinum@gmail.com>
Date: Thu, 16 Dec 2021 07:50:41 +0100
Subject: [PATCH 507/735] Use Collection factory methods when applicable

This commit replaces the use of Collections.unmodifiableList/Set/Map
with the corresponding 'of(...)' factory methods introduced in Java 9.

Closes gh-27824
---
 .../org/springframework/beans/BeanUtils.java  | 24 ++++++---------
 ...eTimeFormatAnnotationFormatterFactory.java | 13 +--------
 ...eTimeFormatAnnotationFormatterFactory.java | 29 +++++++------------
 .../core/annotation/TypeMappedAnnotation.java | 25 +++++++---------
 .../convert/support/ByteBufferConverter.java  | 18 ++++--------
 .../org/springframework/util/NumberUtils.java | 28 +++++++-----------
 .../support/ReflectivePropertyAccessor.java   | 11 +------
 .../http/codec/json/Jackson2CodecSupport.java | 12 ++++----
 .../multipart/MultipartHttpMessageReader.java | 11 ++++---
 .../codec/protobuf/ProtobufCodecSupport.java  |  9 ++----
 .../web/cors/CorsConfiguration.java           |  8 ++---
 .../web/filter/HiddenHttpMethodFilter.java    |  7 ++---
 .../reactive/HiddenHttpMethodFilter.java      |  7 ++---
 .../web/util/HierarchicalUriComponents.java   |  3 +-
 14 files changed, 68 insertions(+), 137 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index d908dbde63ae..58349d86b894 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -29,7 +29,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -79,20 +78,15 @@ public abstract class BeanUtils {
 	private static final Set<Class<?>> unknownEditorTypes =
 			Collections.newSetFromMap(new ConcurrentReferenceHashMap<>(64));
 
-	private static final Map<Class<?>, Object> DEFAULT_TYPE_VALUES;
-
-	static {
-		Map<Class<?>, Object> values = new HashMap<>();
-		values.put(boolean.class, false);
-		values.put(byte.class, (byte) 0);
-		values.put(short.class, (short) 0);
-		values.put(int.class, 0);
-		values.put(long.class, 0L);
-		values.put(float.class, 0F);
-		values.put(double.class, 0D);
-		values.put(char.class, '\0');
-		DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values);
-	}
+	private static final Map<Class<?>, Object> DEFAULT_TYPE_VALUES = Map.of(
+			boolean.class, false,
+			byte.class, (byte) 0,
+			short.class, (short) 0,
+			int.class, 0,
+			long.class, 0L,
+			float.class, 0F,
+			double.class, 0D,
+			char.class, '\0');
 
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
index f9fa9c3a99d7..a526f23d9be5 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
@@ -18,9 +18,7 @@
 
 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;
 
@@ -42,16 +40,7 @@
 public class DateTimeFormatAnnotationFormatterFactory  extends EmbeddedValueResolutionSupport
 		implements AnnotationFormatterFactory<DateTimeFormat> {
 
-	private static final Set<Class<?>> FIELD_TYPES;
-
-	static {
-		Set<Class<?>> fieldTypes = new HashSet<>(4);
-		fieldTypes.add(Date.class);
-		fieldTypes.add(Calendar.class);
-		fieldTypes.add(Long.class);
-		FIELD_TYPES = Collections.unmodifiableSet(fieldTypes);
-	}
-
+	private static final Set<Class<?>> FIELD_TYPES = Set.of(Date.class, Calendar.class, Long.class);
 
 	@Override
 	public Set<Class<?>> getFieldTypes() {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
index da3afad60454..60a75f7be2d2 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
@@ -28,8 +28,6 @@
 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;
 
@@ -53,22 +51,17 @@
 public class Jsr310DateTimeFormatAnnotationFormatterFactory extends EmbeddedValueResolutionSupport
 		implements AnnotationFormatterFactory<DateTimeFormat> {
 
-	private static final Set<Class<?>> FIELD_TYPES;
-
-	static {
-		// Create the set of field types that may be annotated with @DateTimeFormat.
-		Set<Class<?>> fieldTypes = new HashSet<>(8);
-		fieldTypes.add(Instant.class);
-		fieldTypes.add(LocalDate.class);
-		fieldTypes.add(LocalTime.class);
-		fieldTypes.add(LocalDateTime.class);
-		fieldTypes.add(ZonedDateTime.class);
-		fieldTypes.add(OffsetDateTime.class);
-		fieldTypes.add(OffsetTime.class);
-		fieldTypes.add(YearMonth.class);
-		fieldTypes.add(MonthDay.class);
-		FIELD_TYPES = Collections.unmodifiableSet(fieldTypes);
-	}
+	// Create the set of field types that may be annotated with @DateTimeFormat.
+	private static final Set<Class<?>> FIELD_TYPES = Set.of(
+				Instant.class,
+				LocalDate.class,
+				LocalTime.class,
+				LocalDateTime.class,
+				ZonedDateTime.class,
+				OffsetDateTime.class,
+				OffsetTime.class,
+				YearMonth.class,
+				MonthDay.class);
 
 	@Override
 	public final Set<Class<?>> getFieldTypes() {
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
index 660e43b86951..079eea85937c 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
@@ -21,7 +21,6 @@
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,20 +69,16 @@
  */
 final class TypeMappedAnnotation<A extends Annotation> extends AbstractMergedAnnotation<A> {
 
-	private static final Map<Class<?>, Object> EMPTY_ARRAYS;
-	static {
-		Map<Class<?>, Object> emptyArrays = new HashMap<>();
-		emptyArrays.put(boolean.class, new boolean[0]);
-		emptyArrays.put(byte.class, new byte[0]);
-		emptyArrays.put(char.class, new char[0]);
-		emptyArrays.put(double.class, new double[0]);
-		emptyArrays.put(float.class, new float[0]);
-		emptyArrays.put(int.class, new int[0]);
-		emptyArrays.put(long.class, new long[0]);
-		emptyArrays.put(short.class, new short[0]);
-		emptyArrays.put(String.class, new String[0]);
-		EMPTY_ARRAYS = Collections.unmodifiableMap(emptyArrays);
-	}
+	private static final Map<Class<?>, Object> EMPTY_ARRAYS = Map.of(
+		boolean.class, new boolean[0],
+		byte.class, new byte[0],
+		char.class, new char[0],
+		double.class, new double[0],
+		float.class, new float[0],
+		int.class, new int[0],
+		long.class, new long[0],
+		short.class, new short[0],
+		String.class, new String[0]);
 
 
 	private final AnnotationTypeMapping mapping;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
index 64e49717974c..3023eb6781fa 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
@@ -17,8 +17,6 @@
 package org.springframework.core.convert.support;
 
 import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.springframework.core.convert.ConversionService;
@@ -40,17 +38,11 @@ final class ByteBufferConverter implements ConditionalGenericConverter {
 
 	private static final TypeDescriptor BYTE_ARRAY_TYPE = TypeDescriptor.valueOf(byte[].class);
 
-	private static final Set<ConvertiblePair> CONVERTIBLE_PAIRS;
-
-	static {
-		Set<ConvertiblePair> convertiblePairs = new HashSet<>(4);
-		convertiblePairs.add(new ConvertiblePair(ByteBuffer.class, byte[].class));
-		convertiblePairs.add(new ConvertiblePair(byte[].class, ByteBuffer.class));
-		convertiblePairs.add(new ConvertiblePair(ByteBuffer.class, Object.class));
-		convertiblePairs.add(new ConvertiblePair(Object.class, ByteBuffer.class));
-		CONVERTIBLE_PAIRS = Collections.unmodifiableSet(convertiblePairs);
-	}
-
+	private static final Set<ConvertiblePair> CONVERTIBLE_PAIRS = Set.of(
+				new ConvertiblePair(ByteBuffer.class, byte[].class),
+				new ConvertiblePair(byte[].class, ByteBuffer.class),
+				new ConvertiblePair(ByteBuffer.class, Object.class),
+				new ConvertiblePair(Object.class, ByteBuffer.class));
 
 	private final ConversionService conversionService;
 
diff --git a/spring-core/src/main/java/org/springframework/util/NumberUtils.java b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
index 1857d5bc4bdf..ec174a96ae6b 100644
--- a/spring-core/src/main/java/org/springframework/util/NumberUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,6 @@
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.springframework.lang.Nullable;
@@ -46,21 +44,15 @@ public abstract class NumberUtils {
 	 * Standard number types (all immutable):
 	 * Byte, Short, Integer, Long, BigInteger, Float, Double, BigDecimal.
 	 */
-	public static final Set<Class<?>> STANDARD_NUMBER_TYPES;
-
-	static {
-		Set<Class<?>> numberTypes = new HashSet<>(8);
-		numberTypes.add(Byte.class);
-		numberTypes.add(Short.class);
-		numberTypes.add(Integer.class);
-		numberTypes.add(Long.class);
-		numberTypes.add(BigInteger.class);
-		numberTypes.add(Float.class);
-		numberTypes.add(Double.class);
-		numberTypes.add(BigDecimal.class);
-		STANDARD_NUMBER_TYPES = Collections.unmodifiableSet(numberTypes);
-	}
-
+	public static final Set<Class<?>> STANDARD_NUMBER_TYPES = Set.of(
+			Byte.class,
+			Short.class,
+			Integer.class,
+			Long.class,
+			BigInteger.class,
+			Float.class,
+			Double.class,
+			BigDecimal.class);
 
 	/**
 	 * Convert the given number into an instance of the given target class.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
index f9fbd7b6385c..408ebe27c2f9 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
@@ -23,7 +23,6 @@
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -65,15 +64,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 
 	private static final Set<Class<?>> ANY_TYPES = Collections.emptySet();
 
-	private static final Set<Class<?>> BOOLEAN_TYPES;
-
-	static {
-		Set<Class<?>> booleanTypes = new HashSet<>(4);
-		booleanTypes.add(Boolean.class);
-		booleanTypes.add(Boolean.TYPE);
-		BOOLEAN_TYPES = Collections.unmodifiableSet(booleanTypes);
-	}
-
+	private static final Set<Class<?>> BOOLEAN_TYPES = Set.of(Boolean.class, Boolean.TYPE);
 
 	private final boolean allowWrite;
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java
index 57107e5270d5..edbef7cb38cd 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java
@@ -19,7 +19,6 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -75,11 +74,10 @@ public abstract class Jackson2CodecSupport {
 	private static final String JSON_VIEW_HINT_ERROR =
 			"@JsonView only supported for write hints with exactly 1 class argument: ";
 
-	private static final List<MimeType> DEFAULT_MIME_TYPES = Collections.unmodifiableList(
-			Arrays.asList(
-					MediaType.APPLICATION_JSON,
-					new MediaType("application", "*+json"),
-					MediaType.APPLICATION_NDJSON));
+	private static final List<MimeType> DEFAULT_MIME_TYPES = List.of(
+			MediaType.APPLICATION_JSON,
+			new MediaType("application", "*+json"),
+			MediaType.APPLICATION_NDJSON);
 
 
 	protected final Log logger = HttpLogging.forLogName(getClass());
@@ -99,7 +97,7 @@ protected Jackson2CodecSupport(ObjectMapper objectMapper, MimeType... mimeTypes)
 		Assert.notNull(objectMapper, "ObjectMapper must not be null");
 		this.defaultObjectMapper = objectMapper;
 		this.mimeTypes = !ObjectUtils.isEmpty(mimeTypes) ?
-				Collections.unmodifiableList(Arrays.asList(mimeTypes)) : DEFAULT_MIME_TYPES;
+				List.of(mimeTypes) : DEFAULT_MIME_TYPES;
 	}
 
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
index 2866d7ed02fd..79f181a1f76d 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,7 @@
 package org.springframework.http.codec.multipart;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -56,9 +54,10 @@ public class MultipartHttpMessageReader extends LoggingCodecSupport
 	private static final ResolvableType MULTIPART_VALUE_TYPE = ResolvableType.forClassWithGenerics(
 			MultiValueMap.class, String.class, Part.class);
 
-	static final List<MediaType> MIME_TYPES = Collections.unmodifiableList(Arrays.asList(
-			MediaType.MULTIPART_FORM_DATA, MediaType.MULTIPART_MIXED, MediaType.MULTIPART_RELATED));
-
+	static final List<MediaType> MIME_TYPES = List.of(
+			MediaType.MULTIPART_FORM_DATA,
+			MediaType.MULTIPART_MIXED,
+			MediaType.MULTIPART_RELATED);
 
 	private final HttpMessageReader<Part> partReader;
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufCodecSupport.java b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufCodecSupport.java
index 1bc5c8ba08ac..1679b5a7c5fc 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufCodecSupport.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufCodecSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.http.codec.protobuf;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.springframework.lang.Nullable;
@@ -31,11 +29,10 @@
  */
 public abstract class ProtobufCodecSupport {
 
-	static final List<MimeType> MIME_TYPES = Collections.unmodifiableList(
-			Arrays.asList(
+	static final List<MimeType> MIME_TYPES = List.of(
 					new MimeType("application", "x-protobuf"),
 					new MimeType("application", "octet-stream"),
-					new MimeType("application", "vnd.google.protobuf")));
+					new MimeType("application", "vnd.google.protobuf"));
 
 	static final String DELIMITED_KEY = "delimited";
 
diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
index a0357bf720c0..3a7cbe3cbf8c 100644
--- a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
@@ -18,7 +18,6 @@
 
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -65,11 +64,10 @@ public class CorsConfiguration {
 
 	private static final List<String> DEFAULT_PERMIT_ALL = Collections.singletonList(ALL);
 
-	private static final List<HttpMethod> DEFAULT_METHODS = Collections.unmodifiableList(
-			Arrays.asList(HttpMethod.GET, HttpMethod.HEAD));
+	private static final List<HttpMethod> DEFAULT_METHODS = List.of(HttpMethod.GET, HttpMethod.HEAD);
 
-	private static final List<String> DEFAULT_PERMIT_METHODS = Collections.unmodifiableList(
-			Arrays.asList(HttpMethod.GET.name(), HttpMethod.HEAD.name(), HttpMethod.POST.name()));
+	private static final List<String> DEFAULT_PERMIT_METHODS = List.of(HttpMethod.GET.name(),
+			HttpMethod.HEAD.name(), HttpMethod.POST.name());
 
 
 	@Nullable
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
index a2abd162f2cb..51487b395608 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 package org.springframework.web.filter;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
@@ -57,8 +55,7 @@
 public class HiddenHttpMethodFilter extends OncePerRequestFilter {
 
 	private static final List<String> ALLOWED_METHODS =
-			Collections.unmodifiableList(Arrays.asList(HttpMethod.PUT.name(),
-					HttpMethod.DELETE.name(), HttpMethod.PATCH.name()));
+			List.of(HttpMethod.PUT.name(), HttpMethod.DELETE.name(), HttpMethod.PATCH.name());
 
 	/** Default method parameter: {@code _method}. */
 	public static final String DEFAULT_METHOD_PARAM = "_method";
diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java
index d06cac32bc91..96dd44dbf975 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.web.filter.reactive;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
@@ -49,8 +47,7 @@
 public class HiddenHttpMethodFilter implements WebFilter {
 
 	private static final List<HttpMethod> ALLOWED_METHODS =
-			Collections.unmodifiableList(Arrays.asList(HttpMethod.PUT,
-					HttpMethod.DELETE, HttpMethod.PATCH));
+			List.of(HttpMethod.PUT, HttpMethod.DELETE, HttpMethod.PATCH);
 
 	/** Default name of the form parameter with the HTTP method to use. */
 	public static final String DEFAULT_METHOD_PARAMETER_NAME = "_method";
diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
index 1d5c5843cc73..819ed656e13f 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
@@ -22,7 +22,6 @@
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.StringJoiner;
@@ -898,7 +897,7 @@ public String getPath() {
 		@Override
 		public List<String> getPathSegments() {
 			String[] segments = StringUtils.tokenizeToStringArray(getPath(), PATH_DELIMITER_STRING);
-			return Collections.unmodifiableList(Arrays.asList(segments));
+			return List.of(segments);
 		}
 
 		@Override

From c1606c5a5e46c2f60e747413fe57758fa6c8a7ac Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 12:39:28 +0100
Subject: [PATCH 508/735] Polishing

---
 .../support/AbstractBeanDefinitionReader.java |  7 +++-
 .../factory/support/BeanDefinitionReader.java | 33 ++++++++++---------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
index a9a556caea4e..70e9f94e62fb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,6 +103,11 @@ protected AbstractBeanDefinitionReader(BeanDefinitionRegistry registry) {
 	}
 
 
+	/**
+	 * Return the bean factory to register the bean definitions with.
+	 * <p>The factory is exposed through the BeanDefinitionRegistry interface,
+	 * encapsulating the methods that are relevant for bean definition handling.
+	 */
 	public final BeanDefinitionRegistry getBeanFactory() {
 		return this.registry;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
index a6fedff03795..8441abbc7664 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,15 +22,15 @@
 import org.springframework.lang.Nullable;
 
 /**
- * Simple interface for bean definition readers.
- * Specifies load methods with Resource and String location parameters.
+ * Simple interface for bean definition readers that specifies load methods with
+ * {@link Resource} and {@link String} location parameters.
  *
  * <p>Concrete bean definition readers can of course add additional
  * load and register methods for bean definitions, specific to
  * their bean definition format.
  *
  * <p>Note that a bean definition reader does not have to implement
- * this interface. It only serves as suggestion for bean definition
+ * this interface. It only serves as a suggestion for bean definition
  * readers that want to follow standard naming conventions.
  *
  * @author Juergen Hoeller
@@ -41,14 +41,14 @@ public interface BeanDefinitionReader {
 
 	/**
 	 * Return the bean factory to register the bean definitions with.
-	 * <p>The factory is exposed through the BeanDefinitionRegistry interface,
+	 * <p>The factory is exposed through the {@link BeanDefinitionRegistry} interface,
 	 * encapsulating the methods that are relevant for bean definition handling.
 	 */
 	BeanDefinitionRegistry getRegistry();
 
 	/**
-	 * Return the resource loader to use for resource locations.
-	 * Can be checked for the <b>ResourcePatternResolver</b> interface and cast
+	 * Return the {@link ResourceLoader} to use for resource locations.
+	 * <p>Can be checked for the {@code ResourcePatternResolver} interface and cast
 	 * accordingly, for loading multiple resources for a given resource pattern.
 	 * <p>A {@code null} return value suggests that absolute resource loading
 	 * is not available for this bean definition reader.
@@ -56,10 +56,10 @@ public interface BeanDefinitionReader {
 	 * from within a bean definition resource, for example via the "import"
 	 * tag in XML bean definitions. It is recommended, however, to apply
 	 * such imports relative to the defining resource; only explicit full
-	 * resource locations will trigger absolute resource loading.
+	 * resource locations will trigger absolute path based resource loading.
 	 * <p>There is also a {@code loadBeanDefinitions(String)} method available,
 	 * for loading bean definitions from a resource location (or location pattern).
-	 * This is a convenience to avoid explicit ResourceLoader handling.
+	 * This is a convenience to avoid explicit {@code ResourceLoader} handling.
 	 * @see #loadBeanDefinitions(String)
 	 * @see org.springframework.core.io.support.ResourcePatternResolver
 	 */
@@ -70,13 +70,13 @@ public interface BeanDefinitionReader {
 	 * Return the class loader to use for bean classes.
 	 * <p>{@code null} suggests to not load bean classes eagerly
 	 * but rather to just register bean definitions with class names,
-	 * with the corresponding Classes to be resolved later (or never).
+	 * with the corresponding classes to be resolved later (or never).
 	 */
 	@Nullable
 	ClassLoader getBeanClassLoader();
 
 	/**
-	 * Return the BeanNameGenerator to use for anonymous beans
+	 * Return the {@link BeanNameGenerator} to use for anonymous beans
 	 * (without explicit bean name specified).
 	 */
 	BeanNameGenerator getBeanNameGenerator();
@@ -101,9 +101,10 @@ public interface BeanDefinitionReader {
 	/**
 	 * Load bean definitions from the specified resource location.
 	 * <p>The location can also be a location pattern, provided that the
-	 * ResourceLoader of this bean definition reader is a ResourcePatternResolver.
-	 * @param location the resource location, to be loaded with the ResourceLoader
-	 * (or ResourcePatternResolver) of this bean definition reader
+	 * {@link ResourceLoader} of this bean definition reader is a
+	 * {@code ResourcePatternResolver}.
+	 * @param location the resource location, to be loaded with the {@code ResourceLoader}
+	 * (or {@code ResourcePatternResolver}) of this bean definition reader
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 * @see #getResourceLoader()
@@ -114,8 +115,8 @@ public interface BeanDefinitionReader {
 
 	/**
 	 * Load bean definitions from the specified resource locations.
-	 * @param locations the resource locations, to be loaded with the ResourceLoader
-	 * (or ResourcePatternResolver) of this bean definition reader
+	 * @param locations the resource locations, to be loaded with the {@code ResourceLoader}
+	 * (or {@code ResourcePatternResolver}) of this bean definition reader
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 */

From f04e9a83662b2ce25e97a11d9a7cb16bed8edf71 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 12:45:11 +0100
Subject: [PATCH 509/735] Deprecate getBeanFactory() method in
 AbstractBeanDefinitionReader

The getBeanFactory() method has been obsolete for more than 13 years
since it was superseded by the getRegistry() method in the
BeanDefinitionReader interface.

Closes gh-27875
---
 .../beans/factory/support/AbstractBeanDefinitionReader.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
index 70e9f94e62fb..c5fa1335218a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
@@ -107,7 +107,10 @@ protected AbstractBeanDefinitionReader(BeanDefinitionRegistry registry) {
 	 * Return the bean factory to register the bean definitions with.
 	 * <p>The factory is exposed through the BeanDefinitionRegistry interface,
 	 * encapsulating the methods that are relevant for bean definition handling.
+	 * @deprecated as of Spring Framework 5.3.15 in favor of {@link #getRegistry()},
+	 * to be removed in Spring Framework 6.0
 	 */
+	@Deprecated
 	public final BeanDefinitionRegistry getBeanFactory() {
 		return this.registry;
 	}

From 2ed7268ded4a03ca3042b81050112e1f1fba6d0f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 12:55:13 +0100
Subject: [PATCH 510/735] Remove deprecated
 AbstractBeanDefinitionReader.getBeanFactory() method

The getBeanFactory() method (which is deprecated since Spring Framework
5.3.15) has been obsolete for more than 13 years since it was superseded
by the getRegistry() method in the BeanDefinitionReader interface.

Closes gh-27875
---
 .../support/AbstractBeanDefinitionReader.java        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
index c5fa1335218a..3c23aecf46ef 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
@@ -103,18 +103,6 @@ protected AbstractBeanDefinitionReader(BeanDefinitionRegistry registry) {
 	}
 
 
-	/**
-	 * Return the bean factory to register the bean definitions with.
-	 * <p>The factory is exposed through the BeanDefinitionRegistry interface,
-	 * encapsulating the methods that are relevant for bean definition handling.
-	 * @deprecated as of Spring Framework 5.3.15 in favor of {@link #getRegistry()},
-	 * to be removed in Spring Framework 6.0
-	 */
-	@Deprecated
-	public final BeanDefinitionRegistry getBeanFactory() {
-		return this.registry;
-	}
-
 	@Override
 	public final BeanDefinitionRegistry getRegistry() {
 		return this.registry;

From 948f5999c3dc8bc82c7b0476954a08fe9ed2011c Mon Sep 17 00:00:00 2001
From: Marten Deinum <mdeinum@gmail.com>
Date: Wed, 15 Dec 2021 19:44:50 +0100
Subject: [PATCH 511/735] Replace use of StringBuffer with StringBuilder

With JDK 9, java.util.regex.Matcher received overloaded variants of
appendReplacement() and appendTail() that accept a StringBuilder,
allowing us to replace the use of StringBuffer with StringBuilder.

Closes gh-27822
---
 .../springframework/messaging/rsocket/MetadataEncoder.java    | 4 ++--
 .../main/java/org/springframework/web/util/UriComponents.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
index 24fde3c2d988..da667cc7c969 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ private static String expand(String route, Object... routeVars) {
 		if (ObjectUtils.isEmpty(routeVars)) {
 			return route;
 		}
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		int index = 0;
 		Matcher matcher = VARS_PATTERN.matcher(route);
 		while (matcher.find()) {
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
index 7ff83bdf76da..047a8ce09cf6 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
@@ -256,7 +256,7 @@ static String expandUriComponent(@Nullable String source, UriTemplateVariables u
 			source = sanitizeSource(source);
 		}
 		Matcher matcher = NAMES_PATTERN.matcher(source);
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		while (matcher.find()) {
 			String match = matcher.group(1);
 			String varName = getVariableName(match);

From ee292ec116155878bc193bca1ecdc49ea676ebbc Mon Sep 17 00:00:00 2001
From: liuzhifei <2679431923@qq.com>
Date: Tue, 4 Jan 2022 19:30:04 +0800
Subject: [PATCH 512/735] Replace use of StringBuffer with StringBuilder

With JDK 9, java.util.regex.Matcher received overloaded variants of
appendReplacement() and appendTail() that accept a StringBuilder,
allowing us to replace the use of StringBuffer with StringBuilder.

Closes gh-27884
---
 .../interceptor/CustomizableTraceInterceptor.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
index a46c85d0d13b..bc675836229f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -299,7 +299,7 @@ protected String replacePlaceholders(String message, MethodInvocation methodInvo
 		Object target = methodInvocation.getThis();
 		Assert.state(target != null, "Target must not be null");
 
-		StringBuffer output = new StringBuffer();
+		StringBuilder output = new StringBuilder();
 		while (matcher.find()) {
 			String match = matcher.group();
 			if (PLACEHOLDER_METHOD_NAME.equals(match)) {
@@ -341,15 +341,15 @@ else if (PLACEHOLDER_INVOCATION_TIME.equals(match)) {
 
 	/**
 	 * Adds the {@code String} representation of the method return value
-	 * to the supplied {@code StringBuffer}. Correctly handles
+	 * to the supplied {@code StringBuilder}. Correctly handles
 	 * {@code null} and {@code void} results.
 	 * @param methodInvocation the {@code MethodInvocation} that returned the value
 	 * @param matcher the {@code Matcher} containing the matched placeholder
-	 * @param output the {@code StringBuffer} to write output to
+	 * @param output the {@code StringBuilder} to write output to
 	 * @param returnValue the value returned by the method invocation.
 	 */
 	private void appendReturnValue(
-			MethodInvocation methodInvocation, Matcher matcher, StringBuffer output, @Nullable Object returnValue) {
+			MethodInvocation methodInvocation, Matcher matcher, StringBuilder output, @Nullable Object returnValue) {
 
 		if (methodInvocation.getMethod().getReturnType() == void.class) {
 			matcher.appendReplacement(output, "void");
@@ -370,9 +370,9 @@ else if (returnValue == null) {
 	 * @param methodInvocation the {@code MethodInvocation} being logged.
 	 * Arguments will be retrieved from the corresponding {@code Method}.
 	 * @param matcher the {@code Matcher} containing the state of the output
-	 * @param output the {@code StringBuffer} containing the output
+	 * @param output the {@code StringBuilder} containing the output
 	 */
-	private void appendArgumentTypes(MethodInvocation methodInvocation, Matcher matcher, StringBuffer output) {
+	private void appendArgumentTypes(MethodInvocation methodInvocation, Matcher matcher, StringBuilder output) {
 		Class<?>[] argumentTypes = methodInvocation.getMethod().getParameterTypes();
 		String[] argumentTypeShortNames = new String[argumentTypes.length];
 		for (int i = 0; i < argumentTypeShortNames.length; i++) {

From 3e14cdbc6983d026dece705f2915e353cab12ae1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 13:56:16 +0100
Subject: [PATCH 513/735] Polish tests

---
 .../interceptor/RollbackRuleTests.java        | 45 +++++++++----------
 .../web/context/ContextLoaderTests.java       | 40 ++++++++---------
 ...scapeTagOutsideDispatcherServletTests.java |  4 +-
 .../web/servlet/tags/HtmlEscapeTagTests.java  | 18 ++++----
 ...ssageTagOutsideDispatcherServletTests.java |  4 +-
 .../web/servlet/tags/MessageTagTests.java     | 42 ++++++++---------
 .../web/servlet/tags/ThemeTagTests.java       |  8 ++--
 7 files changed, 79 insertions(+), 82 deletions(-)

diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
index 992053ab4095..8445de81bb51 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,62 +34,59 @@
  * @author Sam Brannen
  * @since 09.04.2003
  */
-public class RollbackRuleTests {
+class RollbackRuleTests {
 
 	@Test
-	public void foundImmediatelyWithString() {
-		RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Exception.class.getName());
+	void foundImmediatelyWithString() {
+		RollbackRuleAttribute rr = new RollbackRuleAttribute(Exception.class.getName());
 		assertThat(rr.getDepth(new Exception())).isEqualTo(0);
 	}
 
 	@Test
-	public void foundImmediatelyWithClass() {
+	void foundImmediatelyWithClass() {
 		RollbackRuleAttribute rr = new RollbackRuleAttribute(Exception.class);
 		assertThat(rr.getDepth(new Exception())).isEqualTo(0);
 	}
 
 	@Test
-	public void notFound() {
+	void notFound() {
 		RollbackRuleAttribute rr = new RollbackRuleAttribute(java.io.IOException.class.getName());
 		assertThat(rr.getDepth(new MyRuntimeException(""))).isEqualTo(-1);
 	}
 
 	@Test
-	public void ancestry() {
-		RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Exception.class.getName());
+	void ancestry() {
+		RollbackRuleAttribute rr = new RollbackRuleAttribute(Exception.class.getName());
 		// Exception -> Runtime -> NestedRuntime -> MyRuntimeException
 		assertThat(rr.getDepth(new MyRuntimeException(""))).isEqualTo(3);
 	}
 
 	@Test
-	public void alwaysTrueForThrowable() {
-		RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Throwable.class.getName());
-		assertThat(rr.getDepth(new MyRuntimeException("")) > 0).isTrue();
-		assertThat(rr.getDepth(new IOException()) > 0).isTrue();
-		assertThat(rr.getDepth(new FatalBeanException(null,null)) > 0).isTrue();
-		assertThat(rr.getDepth(new RuntimeException()) > 0).isTrue();
+	void alwaysTrueForThrowable() {
+		RollbackRuleAttribute rr = new RollbackRuleAttribute(Throwable.class.getName());
+		assertThat(rr.getDepth(new MyRuntimeException(""))).isGreaterThan(0);
+		assertThat(rr.getDepth(new IOException())).isGreaterThan(0);
+		assertThat(rr.getDepth(new FatalBeanException(null, null))).isGreaterThan(0);
+		assertThat(rr.getDepth(new RuntimeException())).isGreaterThan(0);
 	}
 
 	@Test
-	public void ctorArgMustBeAThrowableClassWithNonThrowableType() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				new RollbackRuleAttribute(StringBuffer.class));
+	void ctorArgMustBeAThrowableClassWithNonThrowableType() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new RollbackRuleAttribute(Object.class));
 	}
 
 	@Test
-	public void ctorArgMustBeAThrowableClassWithNullThrowableType() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				new RollbackRuleAttribute((Class<?>) null));
+	void ctorArgMustBeAThrowableClassWithNullThrowableType() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new RollbackRuleAttribute((Class<?>) null));
 	}
 
 	@Test
-	public void ctorArgExceptionStringNameVersionWithNull() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				new RollbackRuleAttribute((String) null));
+	void ctorArgExceptionStringNameVersionWithNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new RollbackRuleAttribute((String) null));
 	}
 
 	@Test
-	public void foundEnclosedExceptionWithEnclosingException() {
+	void foundEnclosedExceptionWithEnclosingException() {
 		RollbackRuleAttribute rr = new RollbackRuleAttribute(EnclosingException.class);
 		assertThat(rr.getDepth(new EnclosingException.EnclosedException())).isEqualTo(0);
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index 961ec8bd5e70..9e0d1259f9ef 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -58,10 +58,10 @@
  * @since 12.08.2003
  * @see org.springframework.web.context.support.Spr8510Tests
  */
-public class ContextLoaderTests {
+class ContextLoaderTests {
 
 	@Test
-	public void testContextLoaderListenerWithDefaultContext() {
+	void contextLoaderListenerWithDefaultContext() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"/org/springframework/web/context/WEB-INF/applicationContext.xml " +
@@ -95,7 +95,7 @@ public void testContextLoaderListenerWithDefaultContext() {
 	 * context before calling refresh in ContextLoaders</em>.
 	 */
 	@Test
-	public void testContextLoaderListenerWithCustomizedContextLoader() {
+	void contextLoaderListenerWithCustomizedContextLoader() {
 		final StringBuffer buffer = new StringBuffer();
 		final String expectedContents = "customizeContext() was called";
 		final MockServletContext sc = new MockServletContext("");
@@ -115,7 +115,7 @@ protected void customizeContext(ServletContext sc, ConfigurableWebApplicationCon
 	}
 
 	@Test
-	public void testContextLoaderListenerWithLocalContextInitializers() {
+	void contextLoaderListenerWithLocalContextInitializers() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
@@ -130,7 +130,7 @@ public void testContextLoaderListenerWithLocalContextInitializers() {
 	}
 
 	@Test
-	public void testContextLoaderListenerWithGlobalContextInitializers() {
+	void contextLoaderListenerWithGlobalContextInitializers() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
@@ -145,7 +145,7 @@ public void testContextLoaderListenerWithGlobalContextInitializers() {
 	}
 
 	@Test
-	public void testContextLoaderListenerWithMixedContextInitializers() {
+	void contextLoaderListenerWithMixedContextInitializers() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
@@ -160,7 +160,7 @@ public void testContextLoaderListenerWithMixedContextInitializers() {
 	}
 
 	@Test
-	public void testContextLoaderListenerWithProgrammaticInitializers() {
+	void contextLoaderListenerWithProgrammaticInitializers() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
@@ -174,7 +174,7 @@ public void testContextLoaderListenerWithProgrammaticInitializers() {
 	}
 
 	@Test
-	public void testContextLoaderListenerWithProgrammaticAndLocalInitializers() {
+	void contextLoaderListenerWithProgrammaticAndLocalInitializers() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
@@ -189,7 +189,7 @@ public void testContextLoaderListenerWithProgrammaticAndLocalInitializers() {
 	}
 
 	@Test
-	public void testContextLoaderListenerWithProgrammaticAndGlobalInitializers() {
+	void contextLoaderListenerWithProgrammaticAndGlobalInitializers() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
@@ -204,7 +204,7 @@ public void testContextLoaderListenerWithProgrammaticAndGlobalInitializers() {
 	}
 
 	@Test
-	public void testRegisteredContextInitializerCanAccessServletContextParamsViaEnvironment() {
+	void registeredContextInitializerCanAccessServletContextParamsViaEnvironment() {
 		MockServletContext sc = new MockServletContext("");
 		// config file doesn't matter - just a placeholder
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
@@ -218,7 +218,7 @@ public void testRegisteredContextInitializerCanAccessServletContextParamsViaEnvi
 	}
 
 	@Test
-	public void testContextLoaderListenerWithUnknownContextInitializer() {
+	void contextLoaderListenerWithUnknownContextInitializer() {
 		MockServletContext sc = new MockServletContext("");
 		// config file doesn't matter.  just a placeholder
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
@@ -232,7 +232,7 @@ public void testContextLoaderListenerWithUnknownContextInitializer() {
 	}
 
 	@Test
-	public void testContextLoaderWithCustomContext() throws Exception {
+	void contextLoaderWithCustomContext() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM,
 				"org.springframework.web.servlet.SimpleWebApplicationContext");
@@ -246,7 +246,7 @@ public void testContextLoaderWithCustomContext() throws Exception {
 	}
 
 	@Test
-	public void testContextLoaderWithInvalidLocation() throws Exception {
+	void contextLoaderWithInvalidLocation() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "/WEB-INF/myContext.xml");
 		ServletContextListener listener = new ContextLoaderListener();
@@ -257,7 +257,7 @@ public void testContextLoaderWithInvalidLocation() throws Exception {
 	}
 
 	@Test
-	public void testContextLoaderWithInvalidContext() throws Exception {
+	void contextLoaderWithInvalidContext() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM,
 				"org.springframework.web.context.support.InvalidWebApplicationContext");
@@ -269,7 +269,7 @@ public void testContextLoaderWithInvalidContext() throws Exception {
 	}
 
 	@Test
-	public void testContextLoaderWithDefaultLocation() throws Exception {
+	void contextLoaderWithDefaultLocation() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		ServletContextListener listener = new ContextLoaderListener();
 		ServletContextEvent event = new ServletContextEvent(sc);
@@ -281,7 +281,7 @@ public void testContextLoaderWithDefaultLocation() throws Exception {
 	}
 
 	@Test
-	public void testFrameworkServletWithDefaultLocation() throws Exception {
+	void frameworkServletWithDefaultLocation() throws Exception {
 		DispatcherServlet servlet = new DispatcherServlet();
 		servlet.setContextClass(XmlWebApplicationContext.class);
 		assertThatExceptionOfType(BeanDefinitionStoreException.class)
@@ -292,7 +292,7 @@ public void testFrameworkServletWithDefaultLocation() throws Exception {
 	}
 
 	@Test
-	public void testFrameworkServletWithCustomLocation() throws Exception {
+	void frameworkServletWithCustomLocation() throws Exception {
 		DispatcherServlet servlet = new DispatcherServlet();
 		servlet.setContextConfigLocation("/org/springframework/web/context/WEB-INF/testNamespace.xml "
 				+ "/org/springframework/web/context/WEB-INF/context-addition.xml");
@@ -303,7 +303,7 @@ public void testFrameworkServletWithCustomLocation() throws Exception {
 
 	@Test
 	@SuppressWarnings("resource")
-	public void testClassPathXmlApplicationContext() throws IOException {
+	void classPathXmlApplicationContext() throws IOException {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"/org/springframework/web/context/WEB-INF/applicationContext.xml");
 		assertThat(context.containsBean("father")).as("Has father").isTrue();
@@ -322,7 +322,7 @@ public void testClassPathXmlApplicationContext() throws IOException {
 
 	@Test
 	@SuppressWarnings("resource")
-	public void testSingletonDestructionOnStartupFailure() throws IOException {
+	void singletonDestructionOnStartupFailure() throws IOException {
 		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
 				new ClassPathXmlApplicationContext(new String[] {
 					"/org/springframework/web/context/WEB-INF/applicationContext.xml",
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
index 77257f567f4b..d69e91424700 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2022 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,7 +20,7 @@
  * @author Juergen Hoeller
  * @since 14.01.2005
  */
-public class HtmlEscapeTagOutsideDispatcherServletTests extends HtmlEscapeTagTests {
+class HtmlEscapeTagOutsideDispatcherServletTests extends HtmlEscapeTagTests {
 
 	@Override
 	protected boolean inDispatcherServlet() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
index 7f8f57aa5f82..e27414fc9e2f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,10 +33,10 @@
  * @author Alef Arendsen
  */
 @SuppressWarnings("serial")
-public class HtmlEscapeTagTests extends AbstractTagTests {
+class HtmlEscapeTagTests extends AbstractTagTests {
 
 	@Test
-	public void htmlEscapeTag() throws JspException {
+	void htmlEscapeTag() throws JspException {
 		PageContext pc = createPageContext();
 		HtmlEscapeTag tag = new HtmlEscapeTag();
 		tag.setPageContext(pc);
@@ -88,7 +88,7 @@ public int doStartTagInternal() throws Exception {
 	}
 
 	@Test
-	public void htmlEscapeTagWithContextParamTrue() throws JspException {
+	void htmlEscapeTagWithContextParamTrue() throws JspException {
 		PageContext pc = createPageContext();
 		MockServletContext sc = (MockServletContext) pc.getServletContext();
 		sc.addInitParameter(WebUtils.HTML_ESCAPE_CONTEXT_PARAM, "true");
@@ -109,7 +109,7 @@ public void htmlEscapeTagWithContextParamTrue() throws JspException {
 	}
 
 	@Test
-	public void htmlEscapeTagWithContextParamFalse() throws JspException {
+	void htmlEscapeTagWithContextParamFalse() throws JspException {
 		PageContext pc = createPageContext();
 		MockServletContext sc = (MockServletContext) pc.getServletContext();
 		HtmlEscapeTag tag = new HtmlEscapeTag();
@@ -129,7 +129,7 @@ public void htmlEscapeTagWithContextParamFalse() throws JspException {
 	}
 
 	@Test
-	public void escapeBody() throws JspException {
+	void escapeBody() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
@@ -149,7 +149,7 @@ protected void writeBodyContent(String content) {
 	}
 
 	@Test
-	public void escapeBodyWithHtmlEscape() throws JspException {
+	void escapeBodyWithHtmlEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
@@ -170,7 +170,7 @@ protected void writeBodyContent(String content) {
 	}
 
 	@Test
-	public void escapeBodyWithJavaScriptEscape() throws JspException {
+	void escapeBodyWithJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
@@ -191,7 +191,7 @@ protected void writeBodyContent(String content) {
 	}
 
 	@Test
-	public void escapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException {
+	void escapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
index 23b44313c3fe..42907b1e6349 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2022 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,7 +20,7 @@
  * @author Juergen Hoeller
  * @since 14.01.2005
  */
-public class MessageTagOutsideDispatcherServletTests extends MessageTagTests {
+class MessageTagOutsideDispatcherServletTests extends MessageTagTests {
 
 	@Override
 	protected boolean inDispatcherServlet() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
index 03698a7c57fb..48ba4b25ecf2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,10 +44,10 @@
  * @author Nicholas Williams
  */
 @SuppressWarnings("serial")
-public class MessageTagTests extends AbstractTagTests {
+class MessageTagTests extends AbstractTagTests {
 
 	@Test
-	public void messageTagWithMessageSourceResolvable() throws JspException {
+	void messageTagWithMessageSourceResolvable() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -64,7 +64,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCode() throws JspException {
+	void messageTagWithCode() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -81,7 +81,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndArgument() throws JspException {
+	void messageTagWithCodeAndArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -99,7 +99,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndArguments() throws JspException {
+	void messageTagWithCodeAndArguments() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -117,7 +117,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException {
+	void messageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -136,7 +136,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndArrayArgument() throws JspException {
+	void messageTagWithCodeAndArrayArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -154,7 +154,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndObjectArgument() throws JspException {
+	void messageTagWithCodeAndObjectArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -172,7 +172,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndArgumentAndNestedArgument() throws JspException {
+	void messageTagWithCodeAndArgumentAndNestedArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -191,7 +191,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndNestedArgument() throws JspException {
+	void messageTagWithCodeAndNestedArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -209,7 +209,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndNestedArguments() throws JspException {
+	void messageTagWithCodeAndNestedArguments() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -228,7 +228,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithCodeAndText() throws JspException {
+	void messageTagWithCodeAndText() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -246,7 +246,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithText() throws JspException {
+	void messageTagWithText() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -264,7 +264,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithTextEncodingEscaped() throws JspException {
+	void messageTagWithTextEncodingEscaped() throws JspException {
 		PageContext pc = createPageContext();
 		pc.getServletContext().setInitParameter(WebUtils.RESPONSE_ENCODED_HTML_ESCAPE_CONTEXT_PARAM, "true");
 		pc.getResponse().setCharacterEncoding("UTF-8");
@@ -284,7 +284,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithTextAndJavaScriptEscape() throws JspException {
+	void messageTagWithTextAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -302,7 +302,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException {
+	void messageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
@@ -321,7 +321,7 @@ protected void writeMessage(String msg) {
 	}
 
 	@Test
-	public void messageWithVarAndScope() throws JspException {
+	void messageWithVarAndScope() throws JspException {
 		PageContext pc = createPageContext();
 		MessageTag tag = new MessageTag();
 		tag.setPageContext(pc);
@@ -344,7 +344,7 @@ public void messageWithVarAndScope() throws JspException {
 	}
 
 	@Test
-	public void messageWithVar() throws JspException {
+	void messageWithVar() throws JspException {
 		PageContext pc = createPageContext();
 		MessageTag tag = new MessageTag();
 		tag.setPageContext(pc);
@@ -366,7 +366,7 @@ public void messageWithVar() throws JspException {
 	}
 
 	@Test
-	public void nullMessageSource() throws JspException {
+	void nullMessageSource() throws JspException {
 		PageContext pc = createPageContext();
 		ConfigurableWebApplicationContext ctx = (ConfigurableWebApplicationContext)
 				RequestContextUtils.findWebApplicationContext((HttpServletRequest) pc.getRequest(), pc.getServletContext());
@@ -382,7 +382,7 @@ public void nullMessageSource() throws JspException {
 
 	@Test
 	@SuppressWarnings("rawtypes")
-	public void requestContext() throws ServletException {
+	void requestContext() throws ServletException {
 		PageContext pc = createPageContext();
 		RequestContext rc = new RequestContext((HttpServletRequest) pc.getRequest(), pc.getServletContext());
 		assertThat(rc.getMessage("test")).isEqualTo("test message");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
index 2704a5582716..7b8b35cd4dab 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,11 +37,11 @@
  * @author Juergen Hoeller
  * @author Alef Arendsen
  */
-public class ThemeTagTests extends AbstractTagTests {
+class ThemeTagTests extends AbstractTagTests {
 
 	@Test
 	@SuppressWarnings("serial")
-	public void themeTag() throws JspException {
+	void themeTag() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		ThemeTag tag = new ThemeTag() {
@@ -59,7 +59,7 @@ protected void writeMessage(String msg) {
 
 	@Test
 	@SuppressWarnings("rawtypes")
-	public void requestContext() throws ServletException {
+	void requestContext() throws ServletException {
 		PageContext pc = createPageContext();
 		RequestContext rc = new RequestContext((HttpServletRequest) pc.getRequest());
 		assertThat(rc.getThemeMessage("themetest")).isEqualTo("theme test message");

From 03668f9c103e40ec2dab222eec7ace44b9e63d07 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 14:00:00 +0100
Subject: [PATCH 514/735] Replace remaining use of StringBuffer with
 StringBuilder

Although this commit only applies to test classes, it serves to reduce
the noise when searching for undesirable usage of StringBuffer in
production code.
---
 .../AbstractAspectJAdvisorFactoryTests.java   |  8 ++---
 ...rtiesContextWithContextHierarchyTests.java | 24 +++++++--------
 .../web/context/ContextLoaderTests.java       |  6 ++--
 .../web/servlet/tags/HtmlEscapeTagTests.java  |  8 ++---
 .../web/servlet/tags/MessageTagTests.java     | 30 +++++++++----------
 .../web/servlet/tags/ThemeTagTests.java       |  2 +-
 6 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index 612aa61af66a..9aeeef0f1564 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -322,7 +322,7 @@ void bindingWithMultipleArgsDifferentlyOrdered() {
 		int b = 12;
 		int c = 25;
 		String d = "d";
-		StringBuffer e = new StringBuffer("stringbuf");
+		StringBuilder e = new StringBuilder("stringbuf");
 		String expectedResult = a + b+ c + d + e;
 		assertThat(mva.mungeArgs(a, b, c, d, e)).isEqualTo(expectedResult);
 	}
@@ -728,12 +728,12 @@ void changeReturnType(ProceedingJoinPoint pjp, int age) throws Throwable {
 	@Aspect
 	static class ManyValuedArgs {
 
-		String mungeArgs(String a, int b, int c, String d, StringBuffer e) {
+		String mungeArgs(String a, int b, int c, String d, StringBuilder e) {
 			return a + b + c + d + e;
 		}
 
 		@Around(value="execution(String mungeArgs(..)) && args(a, b, c, d, e)", argNames="b,c,d,e,a")
-		String reverseAdvice(ProceedingJoinPoint pjp, int b, int c, String d, StringBuffer e, String a) throws Throwable {
+		String reverseAdvice(ProceedingJoinPoint pjp, int b, int c, String d, StringBuilder e, String a) throws Throwable {
 			assertThat(pjp.proceed()).isEqualTo(a + b+ c+ d+ e);
 			return a + b + c + d + e;
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java b/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java
index 0662049ca59a..5d3c26844058 100644
--- a/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/hierarchies/standard/DirtiesContextWithContextHierarchyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -54,10 +54,10 @@
 class DirtiesContextWithContextHierarchyTests {
 
 	@Autowired
-	private StringBuffer foo;
+	private StringBuilder foo;
 
 	@Autowired
-	private StringBuffer baz;
+	private StringBuilder baz;
 
 	@Autowired
 	private ApplicationContext context;
@@ -74,7 +74,7 @@ void verifyContextHierarchy() {
 	@Order(1)
 	void verifyOriginalStateAndDirtyContexts() {
 		assertOriginalState();
-		reverseStringBuffers();
+		reverseStringBuilders();
 	}
 
 	@Test
@@ -90,7 +90,7 @@ void verifyContextsWereDirtiedAndTriggerExhaustiveCacheClearing() {
 	@DirtiesContext(hierarchyMode = HierarchyMode.CURRENT_LEVEL)
 	void verifyOriginalStateWasReinstatedAndDirtyContextsAndTriggerCurrentLevelCacheClearing() {
 		assertOriginalState();
-		reverseStringBuffers();
+		reverseStringBuilders();
 	}
 
 	@Test
@@ -100,7 +100,7 @@ void verifyParentContextIsStillDirtyButChildContextHasBeenReinstated() {
 		assertCleanChildContext();
 	}
 
-	private void reverseStringBuffers() {
+	private void reverseStringBuilders() {
 		foo.reverse();
 		baz.reverse();
 	}
@@ -131,13 +131,13 @@ private void assertDirtyChildContext() {
 	static class ParentConfig {
 
 		@Bean
-		StringBuffer foo() {
-			return new StringBuffer("foo");
+		StringBuilder foo() {
+			return new StringBuilder("foo");
 		}
 
 		@Bean
-		StringBuffer baz() {
-			return new StringBuffer("baz-parent");
+		StringBuilder baz() {
+			return new StringBuilder("baz-parent");
 		}
 	}
 
@@ -145,8 +145,8 @@ StringBuffer baz() {
 	static class ChildConfig {
 
 		@Bean
-		StringBuffer baz() {
-			return new StringBuffer("baz-child");
+		StringBuilder baz() {
+			return new StringBuilder("baz-child");
 		}
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index 9e0d1259f9ef..01d63c21f826 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -96,7 +96,7 @@ void contextLoaderListenerWithDefaultContext() {
 	 */
 	@Test
 	void contextLoaderListenerWithCustomizedContextLoader() {
-		final StringBuffer buffer = new StringBuffer();
+		final StringBuilder builder = new StringBuilder();
 		final String expectedContents = "customizeContext() was called";
 		final MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
@@ -107,11 +107,11 @@ protected void customizeContext(ServletContext sc, ConfigurableWebApplicationCon
 				assertThat(sc).as("The ServletContext should not be null.").isNotNull();
 				assertThat(sc).as("Verifying that we received the expected ServletContext.").isEqualTo(sc);
 				assertThat(wac.isActive()).as("The ApplicationContext should not yet have been refreshed.").isFalse();
-				buffer.append(expectedContents);
+				builder.append(expectedContents);
 			}
 		};
 		listener.contextInitialized(new ServletContextEvent(sc));
-		assertThat(buffer.toString()).as("customizeContext() should have been called.").isEqualTo(expectedContents);
+		assertThat(builder.toString()).as("customizeContext() should have been called.").isEqualTo(expectedContents);
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
index e27414fc9e2f..5bb5f464851a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
@@ -131,7 +131,7 @@ void htmlEscapeTagWithContextParamFalse() throws JspException {
 	@Test
 	void escapeBody() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer result = new StringBuffer();
+		final StringBuilder result = new StringBuilder();
 		EscapeBodyTag tag = new EscapeBodyTag() {
 			@Override
 			protected String readBodyContent() {
@@ -151,7 +151,7 @@ protected void writeBodyContent(String content) {
 	@Test
 	void escapeBodyWithHtmlEscape() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer result = new StringBuffer();
+		final StringBuilder result = new StringBuilder();
 		EscapeBodyTag tag = new EscapeBodyTag() {
 			@Override
 			protected String readBodyContent() {
@@ -172,7 +172,7 @@ protected void writeBodyContent(String content) {
 	@Test
 	void escapeBodyWithJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer result = new StringBuffer();
+		final StringBuilder result = new StringBuilder();
 		EscapeBodyTag tag = new EscapeBodyTag() {
 			@Override
 			protected String readBodyContent() {
@@ -193,7 +193,7 @@ protected void writeBodyContent(String content) {
 	@Test
 	void escapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer result = new StringBuffer();
+		final StringBuilder result = new StringBuilder();
 		EscapeBodyTag tag = new EscapeBodyTag() {
 			@Override
 			protected String readBodyContent() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
index 48ba4b25ecf2..ae1024bc5c98 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
@@ -49,7 +49,7 @@ class MessageTagTests extends AbstractTagTests {
 	@Test
 	void messageTagWithMessageSourceResolvable() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -66,7 +66,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCode() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -83,7 +83,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndArgument() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -101,7 +101,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndArguments() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -119,7 +119,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -138,7 +138,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndArrayArgument() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -156,7 +156,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndObjectArgument() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -174,7 +174,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndArgumentAndNestedArgument() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -193,7 +193,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndNestedArgument() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -211,7 +211,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndNestedArguments() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -230,7 +230,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithCodeAndText() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -248,7 +248,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithText() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -268,7 +268,7 @@ void messageTagWithTextEncodingEscaped() throws JspException {
 		PageContext pc = createPageContext();
 		pc.getServletContext().setInitParameter(WebUtils.RESPONSE_ENCODED_HTML_ESCAPE_CONTEXT_PARAM, "true");
 		pc.getResponse().setCharacterEncoding("UTF-8");
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -286,7 +286,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithTextAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
@@ -304,7 +304,7 @@ protected void writeMessage(String msg) {
 	@Test
 	void messageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		MessageTag tag = new MessageTag() {
 			@Override
 			protected void writeMessage(String msg) {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
index 7b8b35cd4dab..3eb98f58d281 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
@@ -43,7 +43,7 @@ class ThemeTagTests extends AbstractTagTests {
 	@SuppressWarnings("serial")
 	void themeTag() throws JspException {
 		PageContext pc = createPageContext();
-		final StringBuffer message = new StringBuffer();
+		final StringBuilder message = new StringBuilder();
 		ThemeTag tag = new ThemeTag() {
 			@Override
 			protected void writeMessage(String msg) {

From c942d789c38c6a934fd38d2f6ab8d89a045b41f2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 14:52:23 +0100
Subject: [PATCH 515/735] Ignore unsupported @SuppressWarnings tokens in
 Eclipse IDE

This helps to reduce noise in the "Problems" view by not displaying
warnings resulting from @SuppressWarnings tokens that Eclipse does not
understand -- for example, tokens supported by IntelliJ IDEA or other
tools.
---
 src/eclipse/org.eclipse.jdt.core.prefs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/eclipse/org.eclipse.jdt.core.prefs b/src/eclipse/org.eclipse.jdt.core.prefs
index 7fafdb460983..fb1133481a59 100644
--- a/src/eclipse/org.eclipse.jdt.core.prefs
+++ b/src/eclipse/org.eclipse.jdt.core.prefs
@@ -84,6 +84,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=ignore
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
@@ -91,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -109,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647

From 999376f9f94c866c15fa31c8217c7eabeab6bf28 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 27 Dec 2021 17:33:04 +0100
Subject: [PATCH 516/735] Temporarily remove references to JBoss AS Javadoc

See gh-27860
---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3f5e29f68092..ff9401b48da8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -370,8 +370,6 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
-			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
-			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://tiles.apache.org/tiles-request/apidocs/",
 			"https://tiles.apache.org/framework/apidocs/",
 			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",

From e1200f34e735769fcc9bac86059d56312460e132 Mon Sep 17 00:00:00 2001
From: Marten Deinum <mdeinum@gmail.com>
Date: Thu, 16 Dec 2021 07:10:12 +0100
Subject: [PATCH 517/735] Use try-with-resources for AutoClosables where
 feasible

Where unfeasible, this commit adds inline comments to explain why
try-with-resources must not be used in certain scenarios. The purpose
of the comments is to avoid accidental conversion to try-with-resources
at a later date.

Closes gh-27823
---
 .../context/index/processor/MetadataStore.java               | 5 +----
 .../core/LocalVariableTableParameterNameDiscoverer.java      | 2 ++
 .../http/converter/BufferedImageHttpMessageConverter.java    | 2 ++
 .../http/converter/ResourceHttpMessageConverter.java         | 2 ++
 .../http/converter/ResourceRegionHttpMessageConverter.java   | 2 ++
 .../web/socket/messaging/StompSubProtocolHandler.java        | 2 ++
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
index c00f682b77ea..8593fc7508b1 100644
--- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
+++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
@@ -62,12 +62,9 @@ public void writeMetadata(CandidateComponentsMetadata metadata) throws IOExcepti
 
 
 	private CandidateComponentsMetadata readMetadata(InputStream in) throws IOException {
-		try {
+		try (in){
 			return PropertiesMarshaller.read(in);
 		}
-		finally {
-			in.close();
-		}
 	}
 
 	private FileObject getMetadataResource() throws IOException {
diff --git a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
index 6498a35f56eb..70a2a6adf6c0 100644
--- a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
@@ -101,6 +101,8 @@ private Map<Executable, String[]> inspectClass(Class<?> clazz) {
 			}
 			return NO_DEBUG_INFO_MAP;
 		}
+		// We cannot use try-with-resources here as, potential, exception upon closing
+		// would still bubble up the stack
 		try {
 			ClassReader classReader = new ClassReader(is);
 			Map<Executable, String[]> map = new ConcurrentHashMap<>(32);
diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
index cdfa5781c99d..7a020f25c092 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
@@ -169,6 +169,8 @@ public BufferedImage read(@Nullable Class<? extends BufferedImage> clazz, HttpIn
 
 		ImageInputStream imageInputStream = null;
 		ImageReader imageReader = null;
+		// We cannot use try-with-resources here as, potential, exception upon closing
+		// would still bubble up the stack
 		try {
 			imageInputStream = createImageInputStream(inputMessage.getBody());
 			MediaType contentType = inputMessage.getHeaders().getContentType();
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
index f587aecf7ff9..08e4027c6420 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
@@ -131,6 +131,8 @@ protected void writeInternal(Resource resource, HttpOutputMessage outputMessage)
 
 	protected void writeContent(Resource resource, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
+		// We cannot use try-with-resources here as, potential, exception upon closing
+		// would still bubble up the stack
 		try {
 			InputStream in = resource.getInputStream();
 			try {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
index b9dca7220413..972f1289e5b3 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
@@ -155,6 +155,8 @@ protected void writeResourceRegion(ResourceRegion region, HttpOutputMessage outp
 		responseHeaders.setContentLength(rangeLength);
 
 		InputStream in = region.getResource().getInputStream();
+		// We cannot use try-with-resources here as, potential, exception upon closing
+		// would still bubble up the stack
 		try {
 			StreamUtils.copyRange(in, outputMessage.getBody(), start, end);
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
index 08991986c833..873f99539e1e 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
@@ -374,6 +374,8 @@ private void sendErrorMessage(WebSocketSession session, Throwable error) {
 		headerAccessor.setMessage(error.getMessage());
 
 		byte[] bytes = this.stompEncoder.encode(headerAccessor.getMessageHeaders(), EMPTY_PAYLOAD);
+		// We cannot use try-with-resources here as, potential, exception upon closing
+		// would still bubble up the stack
 		try {
 			session.sendMessage(new TextMessage(bytes));
 		}

From c3ce4f0f90a0793bf4aa758a929b794d002a1428 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 15:12:18 +0100
Subject: [PATCH 518/735] Polish contribution

See gh-27823
---
 .../context/index/processor/MetadataStore.java              | 4 ++--
 .../core/LocalVariableTableParameterNameDiscoverer.java     | 6 +++---
 .../http/converter/BufferedImageHttpMessageConverter.java   | 6 +++---
 .../http/converter/ResourceHttpMessageConverter.java        | 6 +++---
 .../http/converter/ResourceRegionHttpMessageConverter.java  | 6 +++---
 .../web/socket/messaging/StompSubProtocolHandler.java       | 6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
index 8593fc7508b1..8585b89bea9f 100644
--- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
+++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -62,7 +62,7 @@ public void writeMetadata(CandidateComponentsMetadata metadata) throws IOExcepti
 
 
 	private CandidateComponentsMetadata readMetadata(InputStream in) throws IOException {
-		try (in){
+		try (in) {
 			return PropertiesMarshaller.read(in);
 		}
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
index 70a2a6adf6c0..f20807f1190f 100644
--- a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -101,8 +101,8 @@ private Map<Executable, String[]> inspectClass(Class<?> clazz) {
 			}
 			return NO_DEBUG_INFO_MAP;
 		}
-		// We cannot use try-with-resources here as, potential, exception upon closing
-		// would still bubble up the stack
+		// We cannot use try-with-resources here for the InputStream, since we have
+		// custom handling of the close() method in a finally-block.
 		try {
 			ClassReader classReader = new ClassReader(is);
 			Map<Executable, String[]> map = new ConcurrentHashMap<>(32);
diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
index 7a020f25c092..0dbfc02f098b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -169,8 +169,8 @@ public BufferedImage read(@Nullable Class<? extends BufferedImage> clazz, HttpIn
 
 		ImageInputStream imageInputStream = null;
 		ImageReader imageReader = null;
-		// We cannot use try-with-resources here as, potential, exception upon closing
-		// would still bubble up the stack
+		// We cannot use try-with-resources here for the ImageInputStream, since we have
+		// custom handling of the close() method in a finally-block.
 		try {
 			imageInputStream = createImageInputStream(inputMessage.getBody());
 			MediaType contentType = inputMessage.getHeaders().getContentType();
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
index 08e4027c6420..17aa290ca9ab 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,8 +131,8 @@ protected void writeInternal(Resource resource, HttpOutputMessage outputMessage)
 
 	protected void writeContent(Resource resource, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
-		// We cannot use try-with-resources here as, potential, exception upon closing
-		// would still bubble up the stack
+		// We cannot use try-with-resources here for the InputStream, since we have
+		// custom handling of the close() method in a finally-block.
 		try {
 			InputStream in = resource.getInputStream();
 			try {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
index 972f1289e5b3..511544a95614 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -155,8 +155,8 @@ protected void writeResourceRegion(ResourceRegion region, HttpOutputMessage outp
 		responseHeaders.setContentLength(rangeLength);
 
 		InputStream in = region.getResource().getInputStream();
-		// We cannot use try-with-resources here as, potential, exception upon closing
-		// would still bubble up the stack
+		// We cannot use try-with-resources here for the InputStream, since we have
+		// custom handling of the close() method in a finally-block.
 		try {
 			StreamUtils.copyRange(in, outputMessage.getBody(), start, end);
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
index 873f99539e1e..c07db18eca4d 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -374,8 +374,8 @@ private void sendErrorMessage(WebSocketSession session, Throwable error) {
 		headerAccessor.setMessage(error.getMessage());
 
 		byte[] bytes = this.stompEncoder.encode(headerAccessor.getMessageHeaders(), EMPTY_PAYLOAD);
-		// We cannot use try-with-resources here as, potential, exception upon closing
-		// would still bubble up the stack
+		// We cannot use try-with-resources here for the WebSocketSession, since we have
+		// custom handling of the close() method in a finally-block.
 		try {
 			session.sendMessage(new TextMessage(bytes));
 		}

From c04fa858fc3344b8d8a9b01b3b07ce0d00d51676 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 Jan 2022 16:20:55 +0100
Subject: [PATCH 519/735] Partially revert
 e1200f34e735769fcc9bac86059d56312460e132

Syntax for this try-with-resources use case only permitted on Java 9+.
---
 .../context/index/processor/MetadataStore.java               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
index 8585b89bea9f..c27fae2c0792 100644
--- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
+++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataStore.java
@@ -62,9 +62,12 @@ public void writeMetadata(CandidateComponentsMetadata metadata) throws IOExcepti
 
 
 	private CandidateComponentsMetadata readMetadata(InputStream in) throws IOException {
-		try (in) {
+		try {
 			return PropertiesMarshaller.read(in);
 		}
+		finally {
+			in.close();
+		}
 	}
 
 	private FileObject getMetadataResource() throws IOException {

From fdd6e50721dd7b9655792134719960f05b75cf97 Mon Sep 17 00:00:00 2001
From: Johannes Wengert <johannes.wengert@googlemail.com>
Date: Tue, 4 Jan 2022 15:47:54 +0100
Subject: [PATCH 520/735] Correct not compiling example code in Data Access
 docs

The EntityManager interface does not implement AutoCloseable until
JPA 3.1.

This commit therefore partially reverts 189e1afc6ee6bd40b so that the
example code compiles with the supported JPA version.

See gh-22269
Closes gh-27886
---
 src/docs/asciidoc/data-access.adoc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index 55d6be79646d..a1cdec9d9efa 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -2444,10 +2444,10 @@ the `TransactionOperator` resembles the next example:
 		}
 
 		public Mono<Object> someServiceMethod() {
-			
+
 			// the code in this method runs in a transactional context
-			
-            Mono<Object> update = updateOperation1();
+
+			Mono<Object> update = updateOperation1();
 
 			return update.then(resultOfUpdateOperation2).as(transactionalOperator::transactional);
 		}
@@ -8221,11 +8221,17 @@ that uses the `@PersistenceUnit` annotation:
 		}
 
 		public Collection loadProductsByCategory(String category) {
-			try (EntityManager em = this.emf.createEntityManager()) {
+			EntityManager em = this.emf.createEntityManager();
+			try {
 				Query query = em.createQuery("from Product as p where p.category = ?1");
 				query.setParameter(1, category);
 				return query.getResultList();
 			}
+			finally {
+				if (em != null) {
+					em.close();
+				}
+			}
 		}
 	}
 ----

From ccf95413ed41c7016bc57f92676716fc5c44e286 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 6 Jan 2022 16:48:15 +0100
Subject: [PATCH 521/735] Start building against Reactor 2020.0.15 snapshots

See gh-27897
---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ff9401b48da8..1e3da6be1068 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
 			mavenBom "io.netty:netty-bom:4.1.72.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.14"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.15-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR11"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,6 +292,7 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
+			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From ed4e2289cdcc72e9bc8e061f208c4dde721d4d1b Mon Sep 17 00:00:00 2001
From: Henning Poettker <Henning.Poettker@c24.de>
Date: Sat, 1 Jan 2022 22:53:21 +0100
Subject: [PATCH 522/735] Support H2 1.4 & 2.0 in H2SequenceMaxValueIncrementer

Prior to this commit, H2SequenceMaxValueIncrementer only supported H2
database 1.4.

This commit updates H2SequenceMaxValueIncrementer's getSequenceQuery()
method so that the syntax used supports version 1.4 and 2.0 of the H2
database.

This commit also updates several test schemas so that they work with H2
1.4 and 2.0 as well as HSQL.

Closes gh-27870
---
 .../H2SequenceMaxValueIncrementer.java        |  2 +-
 .../H2SequenceMaxValueIncrementerTests.java   | 45 +++++++++++++++++++
 .../init/users-schema-without-separator.sql   |  2 +-
 .../jdbc/datasource/init/users-schema.sql     |  2 +-
 .../jdbc/support/incrementer/schema.sql       |  1 +
 .../r2dbc/connection/init/users-schema.sql    |  2 +-
 .../test/context/junit4/orm/db-schema.sql     |  4 +-
 .../context/junit4/spr8849/spr8849-schema.sql |  2 +-
 8 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
 create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/support/incrementer/schema.sql

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
index 7b39ada35e1a..2c55352cee32 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
@@ -47,7 +47,7 @@ public H2SequenceMaxValueIncrementer(DataSource dataSource, String incrementerNa
 
 	@Override
 	protected String getSequenceQuery() {
-		return "select " + getIncrementerName() + ".nextval from dual";
+		return "values next value for " + getIncrementerName();
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
new file mode 100644
index 000000000000..66804b529224
--- /dev/null
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2022 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.jdbc.support.incrementer;
+
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Henning Pöttker
+ */
+class H2SequenceMaxValueIncrementerTests {
+
+	@Test
+	void testH2SequenceMaxValueIncrementer() {
+		DataSource dataSource = new EmbeddedDatabaseBuilder()
+				.setType(EmbeddedDatabaseType.H2)
+				.addScript("classpath:/org/springframework/jdbc/support/incrementer/schema.sql")
+				.build();
+		H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
+
+		assertThat(incrementer.nextIntValue()).isEqualTo(1);
+		assertThat(incrementer.nextStringValue()).isEqualTo("2");
+	}
+
+}
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema-without-separator.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema-without-separator.sql
index 4a4dc97f2fbe..19af16cc04ee 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema-without-separator.sql
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema-without-separator.sql
@@ -1,5 +1,5 @@
 CREATE TABLE users (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	first_name VARCHAR(50) NOT NULL,
 	last_name VARCHAR(50) NOT NULL
 )
\ No newline at end of file
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql
index 80ffe23da9ad..523c4a7c2b19 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema.sql
@@ -1,7 +1,7 @@
 DROP TABLE users IF EXISTS;
 
 CREATE TABLE users (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	first_name VARCHAR(50) NOT NULL,
 	last_name VARCHAR(50) NOT NULL
 );
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/support/incrementer/schema.sql b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/incrementer/schema.sql
new file mode 100644
index 000000000000..b74b576ab837
--- /dev/null
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/support/incrementer/schema.sql
@@ -0,0 +1 @@
+CREATE SEQUENCE SEQ;
\ No newline at end of file
diff --git a/spring-r2dbc/src/test/resources/org/springframework/r2dbc/connection/init/users-schema.sql b/spring-r2dbc/src/test/resources/org/springframework/r2dbc/connection/init/users-schema.sql
index 80ffe23da9ad..523c4a7c2b19 100644
--- a/spring-r2dbc/src/test/resources/org/springframework/r2dbc/connection/init/users-schema.sql
+++ b/spring-r2dbc/src/test/resources/org/springframework/r2dbc/connection/init/users-schema.sql
@@ -1,7 +1,7 @@
 DROP TABLE users IF EXISTS;
 
 CREATE TABLE users (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	first_name VARCHAR(50) NOT NULL,
 	last_name VARCHAR(50) NOT NULL
 );
diff --git a/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-schema.sql b/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-schema.sql
index 3dee075af5f0..d8ded6eff4b4 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-schema.sql
+++ b/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-schema.sql
@@ -2,7 +2,7 @@ DROP TABLE drivers_license IF EXISTS;
 DROP TABLE person IF EXISTS;
 
 CREATE TABLE person (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	name VARCHAR(50) NOT NULL,
 	drivers_license_id INTEGER NOT NULL
 );
@@ -10,7 +10,7 @@ CREATE UNIQUE INDEX person_name ON person(name);
 CREATE UNIQUE INDEX person_drivers_license_id ON person(drivers_license_id);
 
 CREATE TABLE drivers_license (
-	id INTEGER NOT NULL IDENTITY,
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY,
 	license_number INTEGER NOT NULL
 );
 CREATE UNIQUE INDEX drivers_license_license_number ON drivers_license(license_number);
diff --git a/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql
index da1ce4b8c982..2407ffa5edc1 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql
+++ b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql
@@ -1,3 +1,3 @@
 CREATE TABLE enigma (
-	id INTEGER NOT NULL IDENTITY
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY
 );

From 18781e58ac8ece4e2d0b8511f047307d5b2677a7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 7 Jan 2022 10:08:57 +0100
Subject: [PATCH 523/735] Polish contribution

See gh-27870
---
 .../H2SequenceMaxValueIncrementer.java        |  3 ++-
 .../H2SequenceMaxValueIncrementerTests.java   | 24 +++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
index 2c55352cee32..bc4c2d80d074 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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,6 +23,7 @@
  * of a given H2 sequence.
  *
  * @author Thomas Risberg
+ * @author Henning Pöttker
  * @since 2.5
  */
 public class H2SequenceMaxValueIncrementer extends AbstractSequenceMaxValueIncrementer {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
index 66804b529224..18b1cde51035 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
@@ -16,30 +16,40 @@
 
 package org.springframework.jdbc.support.incrementer;
 
-import javax.sql.DataSource;
-
 import org.junit.jupiter.api.Test;
 
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
+ * Integration tests for {@link H2SequenceMaxValueIncrementer}.
+ *
  * @author Henning Pöttker
+ * @author Sam Brannen
+ * @since 5.3.15
  */
 class H2SequenceMaxValueIncrementerTests {
 
 	@Test
-	void testH2SequenceMaxValueIncrementer() {
-		DataSource dataSource = new EmbeddedDatabaseBuilder()
+	void incrementsSequence() {
+		EmbeddedDatabase database = new EmbeddedDatabaseBuilder()
 				.setType(EmbeddedDatabaseType.H2)
+				.generateUniqueName(true)
 				.addScript("classpath:/org/springframework/jdbc/support/incrementer/schema.sql")
 				.build();
-		H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
 
-		assertThat(incrementer.nextIntValue()).isEqualTo(1);
-		assertThat(incrementer.nextStringValue()).isEqualTo("2");
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(database);
+		assertThat(jdbcTemplate.queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
+
+		H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(database, "SEQ");
+		assertThat(incrementer.nextIntValue()).isEqualTo(2);
+		assertThat(incrementer.nextStringValue()).isEqualTo("3");
+
+		database.shutdown();
 	}
 
 }

From aaa10e9060d274b346ca9875864733d2e83de094 Mon Sep 17 00:00:00 2001
From: springmonster <charleskuanghc@163.com>
Date: Fri, 7 Jan 2022 17:15:39 +0800
Subject: [PATCH 524/735] Simplify HashMap declaration in test fixture

Co-authored-by: kuanghc1 <kuanghc1@lenovo.com>

Closes gh-27900
---
 .../springframework/aop/testfixture/advice/MethodCounter.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
index 384973bd9aa7..0b3fdd1199ed 100644
--- a/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Abstract superclass for counting advices etc.
@@ -31,7 +32,7 @@
 public class MethodCounter implements Serializable {
 
 	/** Method name --> count, does not understand overloading */
-	private HashMap<String, Integer> map = new HashMap<>();
+	private Map<String, Integer> map = new HashMap<>();
 
 	private int allCount;
 

From 75e18114700b8e8cc0b95a3732ffaa2ceedf0a48 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 7 Jan 2022 14:29:17 +0100
Subject: [PATCH 525/735] Ensure H2SequenceMaxValueIncrementer works with all
 H2 compatibility modes

See gh-27870
---
 .../H2SequenceMaxValueIncrementerTests.java   | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
index 18b1cde51035..512e82dea0cf 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
@@ -16,12 +16,22 @@
 
 package org.springframework.jdbc.support.incrementer;
 
+import java.util.UUID;
+
+import javax.sql.DataSource;
+
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -34,8 +44,16 @@
  */
 class H2SequenceMaxValueIncrementerTests {
 
+	/**
+	 * Tests that the incrementer works when using the JDBC connection URL used
+	 * in the {@code H2EmbeddedDatabaseConfigurer} which is used transparently
+	 * when using Spring's {@link EmbeddedDatabaseBuilder}.
+	 *
+	 * <p>In other words, this tests compatibility with the default H2
+	 * <em>compatibility mode</em>.
+	 */
 	@Test
-	void incrementsSequence() {
+	void incrementsSequenceUsingH2EmbeddedDatabaseConfigurer() {
 		EmbeddedDatabase database = new EmbeddedDatabaseBuilder()
 				.setType(EmbeddedDatabaseType.H2)
 				.generateUniqueName(true)
@@ -52,4 +70,30 @@ void incrementsSequence() {
 		database.shutdown();
 	}
 
+	/**
+	 * Tests that the incrementer works when using all supported H2 <em>compatibility modes</em>.
+	 *
+	 * <p>The following modes are only supported with H2 2.x or higher: STRICT, LEGACY, MariaDB
+	 */
+	@ParameterizedTest
+	@ValueSource(strings = { "DB2", "Derby", "HSQLDB", "MSSQLServer", "MySQL", "Oracle", "PostgreSQL" })
+	void incrementsSequenceWithExplicitH2CompatibilityMode(String compatibilityMode) {
+		String connectionUrl = String.format("jdbc:h2:mem:%s;MODE=%s", UUID.randomUUID().toString(), compatibilityMode);
+		DataSource dataSource = new SimpleDriverDataSource(new org.h2.Driver(), connectionUrl, "sa", "");
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+		PlatformTransactionManager transactionManager = new DataSourceTransactionManager(dataSource);
+		TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
+
+		transactionTemplate.executeWithoutResult(status -> {
+			jdbcTemplate.execute("CREATE SEQUENCE SEQ");
+			assertThat(jdbcTemplate.queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
+
+			H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
+			assertThat(incrementer.nextIntValue()).isEqualTo(2);
+			assertThat(incrementer.nextStringValue()).isEqualTo("3");
+		});
+
+		jdbcTemplate.execute("SHUTDOWN");
+	}
+
 }

From 54bdab4553138a5617da34296a48d07b97434a34 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 7 Jan 2022 15:50:44 +0100
Subject: [PATCH 526/735] Partially upgrade to H2 database 2.0.206

Commit ed4e2289cd introduced support for H2 2.0.x but did not upgrade
the H2 dependency.

This commit upgrades the H2 dependency to version 2.0.206 but also
adds an explicit test dependency on version 1.4.200 in spring-r2dbc,
since r2dbc-h2 does not yet support H2 2.0.x.

Once https://github.com/r2dbc/r2dbc-h2/pull/204 has been included in a
released version of r2dbc-h2 we will be able to upgrade spring-r2dbc's
test dependency on the H2 database to 2.0.x as well.

See gh-27870
See gh-27902
---
 build.gradle                     | 2 +-
 spring-r2dbc/spring-r2dbc.gradle | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1e3da6be1068..743f3d228768 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,7 +94,7 @@ configure(allprojects) { project ->
 			dependency "org.ogce:xpp3:1.1.6"
 			dependency "org.yaml:snakeyaml:1.30"
 
-			dependency "com.h2database:h2:1.4.200"
+			dependency "com.h2database:h2:2.0.206"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
 			dependency "com.github.librepdf:openpdf:1.3.26"
 			dependency "com.rometools:rome:1.16.0"
diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle
index dfb6b1ece9d6..eb86b43f5173 100644
--- a/spring-r2dbc/spring-r2dbc.gradle
+++ b/spring-r2dbc/spring-r2dbc.gradle
@@ -17,6 +17,9 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.r2dbc:r2dbc-h2")
+	testImplementation("com.h2database:h2:1.4.200") {
+		because("r2dbc-h2 does not yet support H2 2.0")
+	}
 	testImplementation("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
 		exclude group: "org.springframework", module: "spring-jdbc"
 	}

From 90072d06fbbeb4e92813f3c9222a37f9ee6cadba Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 7 Jan 2022 16:17:11 +0100
Subject: [PATCH 527/735] Test H2SequenceMaxValueIncrementer against all H2
 2.0.x compatibility modes

See gh-27870
---
 .../incrementer/H2SequenceMaxValueIncrementerTests.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
index 512e82dea0cf..eee479e99127 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
@@ -72,11 +72,9 @@ void incrementsSequenceUsingH2EmbeddedDatabaseConfigurer() {
 
 	/**
 	 * Tests that the incrementer works when using all supported H2 <em>compatibility modes</em>.
-	 *
-	 * <p>The following modes are only supported with H2 2.x or higher: STRICT, LEGACY, MariaDB
 	 */
 	@ParameterizedTest
-	@ValueSource(strings = { "DB2", "Derby", "HSQLDB", "MSSQLServer", "MySQL", "Oracle", "PostgreSQL" })
+	@ValueSource(strings = { "STRICT", "LEGACY", "DB2", "Derby", "HSQLDB", "MariaDB", "MSSQLServer", "MySQL", "Oracle", "PostgreSQL" })
 	void incrementsSequenceWithExplicitH2CompatibilityMode(String compatibilityMode) {
 		String connectionUrl = String.format("jdbc:h2:mem:%s;MODE=%s", UUID.randomUUID().toString(), compatibilityMode);
 		DataSource dataSource = new SimpleDriverDataSource(new org.h2.Driver(), connectionUrl, "sa", "");

From 709a41fd437b7619156a7b74163ea9c5ebde1284 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 8 Jan 2022 16:35:58 +0100
Subject: [PATCH 528/735] Fix broken links to WebSocket support in Spring
 Security & Spring Session

---
 src/docs/asciidoc/web/websocket.adoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 2a8042403d5c..74f4a0765840 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1732,11 +1732,11 @@ the user is already authenticated at the HTTP transport level, and expects that
 the WebSocket or SockJS session contain the authenticated user.
 
 NOTE: Spring Security provides
-https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#websocket[WebSocket sub-protocol authorization]
+https://docs.spring.io/spring-security/reference/servlet/integrations/websocket.html#websocket-authorization[WebSocket sub-protocol authorization]
 that uses a `ChannelInterceptor` to authorize messages based on the user header in them.
-Also, Spring Session provides a
-https://docs.spring.io/spring-session/docs/current/reference/html5/#websocket[WebSocket integration]
-that ensures the user HTTP session does not expire when the WebSocket session is still active.
+Also, Spring Session provides
+https://docs.spring.io/spring-session/reference/web-socket.html[WebSocket integration]
+that ensures the user's HTTP session does not expire while the WebSocket session is still active.
 
 
 

From 3e75ec73ab7177f8006187ee19195d089e8475f6 Mon Sep 17 00:00:00 2001
From: justlikeliuen <justlikeliuen@gmail.com>
Date: Sat, 8 Jan 2022 10:45:16 +0800
Subject: [PATCH 529/735] Fix SpEL withRootObject test

The test case is intended to be for the method 'withRootObject()', but
actually it's copied from the previous test method that does not use
'withRootObject()'.

This commit fixes the propertyReadWriteWithRootObject() test method in
PropertyAccessTests.

Closes gh-27905
---
 .../expression/spel/PropertyAccessTests.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
index b5247527eb58..04bf034fd816 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -232,17 +232,17 @@ public void propertyReadWriteWithRootObject() {
 		assertThat(context.getRootObject().getValue()).isSameAs(target);
 
 		Expression expr = parser.parseExpression("name");
-		assertThat(expr.getValue(context, target)).isEqualTo("p1");
+		assertThat(expr.getValue(context)).isEqualTo("p1");
 		target.setName("p2");
-		assertThat(expr.getValue(context, target)).isEqualTo("p2");
+		assertThat(expr.getValue(context)).isEqualTo("p2");
 
 		parser.parseExpression("name='p3'").getValue(context, target);
 		assertThat(target.getName()).isEqualTo("p3");
-		assertThat(expr.getValue(context, target)).isEqualTo("p3");
+		assertThat(expr.getValue(context)).isEqualTo("p3");
 
-		expr.setValue(context, target, "p4");
+		expr.setValue(context, "p4");
 		assertThat(target.getName()).isEqualTo("p4");
-		assertThat(expr.getValue(context, target)).isEqualTo("p4");
+		assertThat(expr.getValue(context)).isEqualTo("p4");
 	}
 
 	@Test

From 59c6b7e44543d3fdadfb78ae3c6a7c76de2fce91 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 8 Jan 2022 17:05:21 +0100
Subject: [PATCH 530/735] Fix SpEL withTypedRootObject() test

---
 .../expression/spel/PropertyAccessTests.java              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
index 04bf034fd816..bf99547903ba 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
@@ -262,12 +262,12 @@ public void propertyAccessWithInstanceMethodResolver() {
 
 	@Test
 	public void propertyAccessWithInstanceMethodResolverAndTypedRootObject() {
-		Person target = new Person("p1");
+		Person rootObject = new Person("p1");
 		EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().
-				withInstanceMethods().withTypedRootObject(target, TypeDescriptor.valueOf(Object.class)).build();
+				withInstanceMethods().withTypedRootObject(rootObject, TypeDescriptor.valueOf(Object.class)).build();
 
-		assertThat(parser.parseExpression("name.substring(1)").getValue(context, target)).isEqualTo("1");
-		assertThat(context.getRootObject().getValue()).isSameAs(target);
+		assertThat(parser.parseExpression("name.substring(1)").getValue(context)).isEqualTo("1");
+		assertThat(context.getRootObject().getValue()).isSameAs(rootObject);
 		assertThat(context.getRootObject().getTypeDescriptor().getType()).isSameAs(Object.class);
 	}
 

From 518dc6df65bc21ea952844e4ab65bffd77929d3f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 8 Jan 2022 17:06:18 +0100
Subject: [PATCH 531/735] Polishing

---
 .../expression/spel/PropertyAccessTests.java  | 77 +++++++++----------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
index bf99547903ba..6d7d669217db 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
@@ -52,22 +52,22 @@
 public class PropertyAccessTests extends AbstractExpressionTests {
 
 	@Test
-	public void testSimpleAccess01() {
+	void simpleAccess01() {
 		evaluate("name", "Nikola Tesla", String.class);
 	}
 
 	@Test
-	public void testSimpleAccess02() {
+	void simpleAccess02() {
 		evaluate("placeOfBirth.city", "SmilJan", String.class);
 	}
 
 	@Test
-	public void testSimpleAccess03() {
+	void simpleAccess03() {
 		evaluate("stringArrayOfThreeItems.length", "3", Integer.class);
 	}
 
 	@Test
-	public void testNonExistentPropertiesAndMethods() {
+	void nonExistentPropertiesAndMethods() {
 		// madeup does not exist as a property
 		evaluateAndCheckError("madeup", SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE, 0);
 
@@ -80,21 +80,21 @@ public void testNonExistentPropertiesAndMethods() {
 	 * supplied resolver might be able to - so null shouldn't crash the reflection resolver.
 	 */
 	@Test
-	public void testAccessingOnNullObject() {
-		SpelExpression expr = (SpelExpression)parser.parseExpression("madeup");
+	void accessingOnNullObject() {
+		SpelExpression expr = (SpelExpression) parser.parseExpression("madeup");
 		EvaluationContext context = new StandardEvaluationContext(null);
-		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
-				expr.getValue(context))
-			.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL));
+		assertThatExceptionOfType(SpelEvaluationException.class)
+			.isThrownBy(() -> expr.getValue(context))
+			.extracting(SpelEvaluationException::getMessageCode).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL);
 		assertThat(expr.isWritable(context)).isFalse();
-		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
-				expr.setValue(context, "abc"))
-			.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL));
+		assertThatExceptionOfType(SpelEvaluationException.class)
+			.isThrownBy(() -> expr.setValue(context, "abc"))
+			.extracting(SpelEvaluationException::getMessageCode).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL);
 	}
 
 	@Test
 	// Adding a new property accessor just for a particular type
-	public void testAddingSpecificPropertyAccessor() {
+	void addingSpecificPropertyAccessor() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
 
@@ -125,35 +125,34 @@ public void testAddingSpecificPropertyAccessor() {
 	}
 
 	@Test
-	public void testAddingRemovingAccessors() {
+	void addingAndRemovingAccessors() {
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
 
 		// reflective property accessor is the only one by default
-		List<PropertyAccessor> propertyAccessors = ctx.getPropertyAccessors();
-		assertThat(propertyAccessors.size()).isEqualTo(1);
+		assertThat(ctx.getPropertyAccessors()).hasSize(1);
 
 		StringyPropertyAccessor spa = new StringyPropertyAccessor();
 		ctx.addPropertyAccessor(spa);
-		assertThat(ctx.getPropertyAccessors().size()).isEqualTo(2);
+		assertThat(ctx.getPropertyAccessors()).hasSize(2);
 
 		List<PropertyAccessor> copy = new ArrayList<>(ctx.getPropertyAccessors());
 		assertThat(ctx.removePropertyAccessor(spa)).isTrue();
 		assertThat(ctx.removePropertyAccessor(spa)).isFalse();
-		assertThat(ctx.getPropertyAccessors().size()).isEqualTo(1);
+		assertThat(ctx.getPropertyAccessors()).hasSize(1);
 
 		ctx.setPropertyAccessors(copy);
-		assertThat(ctx.getPropertyAccessors().size()).isEqualTo(2);
+		assertThat(ctx.getPropertyAccessors()).hasSize(2);
 	}
 
 	@Test
-	public void testAccessingPropertyOfClass() {
+	void accessingPropertyOfClass() {
 		Expression expression = parser.parseExpression("name");
 		Object value = expression.getValue(new StandardEvaluationContext(String.class));
 		assertThat(value).isEqualTo("java.lang.String");
 	}
 
 	@Test
-	public void shouldAlwaysUsePropertyAccessorFromEvaluationContext() {
+	void shouldAlwaysUsePropertyAccessorFromEvaluationContext() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expression = parser.parseExpression("name");
 
@@ -167,19 +166,19 @@ public void shouldAlwaysUsePropertyAccessorFromEvaluationContext() {
 	}
 
 	@Test
-	public void standardGetClassAccess() {
+	void standardGetClassAccess() {
 		assertThat(parser.parseExpression("'a'.class.name").getValue()).isEqualTo(String.class.getName());
 	}
 
 	@Test
-	public void noGetClassAccess() {
+	void noGetClassAccess() {
 		EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
 		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
 				parser.parseExpression("'a'.class.name").getValue(context));
 	}
 
 	@Test
-	public void propertyReadOnly() {
+	void propertyReadOnly() {
 		EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
 
 		Expression expr = parser.parseExpression("name");
@@ -193,7 +192,7 @@ public void propertyReadOnly() {
 	}
 
 	@Test
-	public void propertyReadOnlyWithRecordStyle() {
+	void propertyReadOnlyWithRecordStyle() {
 		EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
 
 		Expression expr = parser.parseExpression("name");
@@ -207,7 +206,7 @@ public void propertyReadOnlyWithRecordStyle() {
 	}
 
 	@Test
-	public void propertyReadWrite() {
+	void propertyReadWrite() {
 		EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().build();
 
 		Expression expr = parser.parseExpression("name");
@@ -226,27 +225,27 @@ public void propertyReadWrite() {
 	}
 
 	@Test
-	public void propertyReadWriteWithRootObject() {
-		Person target = new Person("p1");
-		EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().withRootObject(target).build();
-		assertThat(context.getRootObject().getValue()).isSameAs(target);
+	void propertyReadWriteWithRootObject() {
+		Person rootObject = new Person("p1");
+		EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().withRootObject(rootObject).build();
+		assertThat(context.getRootObject().getValue()).isSameAs(rootObject);
 
 		Expression expr = parser.parseExpression("name");
 		assertThat(expr.getValue(context)).isEqualTo("p1");
-		target.setName("p2");
+		rootObject.setName("p2");
 		assertThat(expr.getValue(context)).isEqualTo("p2");
 
-		parser.parseExpression("name='p3'").getValue(context, target);
-		assertThat(target.getName()).isEqualTo("p3");
+		parser.parseExpression("name='p3'").getValue(context, rootObject);
+		assertThat(rootObject.getName()).isEqualTo("p3");
 		assertThat(expr.getValue(context)).isEqualTo("p3");
 
 		expr.setValue(context, "p4");
-		assertThat(target.getName()).isEqualTo("p4");
+		assertThat(rootObject.getName()).isEqualTo("p4");
 		assertThat(expr.getValue(context)).isEqualTo("p4");
 	}
 
 	@Test
-	public void propertyAccessWithoutMethodResolver() {
+	void propertyAccessWithoutMethodResolver() {
 		EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
 		Person target = new Person("p1");
 		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
@@ -254,14 +253,14 @@ public void propertyAccessWithoutMethodResolver() {
 	}
 
 	@Test
-	public void propertyAccessWithInstanceMethodResolver() {
+	void propertyAccessWithInstanceMethodResolver() {
 		EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().withInstanceMethods().build();
 		Person target = new Person("p1");
 		assertThat(parser.parseExpression("name.substring(1)").getValue(context, target)).isEqualTo("1");
 	}
 
 	@Test
-	public void propertyAccessWithInstanceMethodResolverAndTypedRootObject() {
+	void propertyAccessWithInstanceMethodResolverAndTypedRootObject() {
 		Person rootObject = new Person("p1");
 		EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().
 				withInstanceMethods().withTypedRootObject(rootObject, TypeDescriptor.valueOf(Object.class)).build();
@@ -277,7 +276,7 @@ void propertyAccessWithArrayIndexOutOfBounds() {
 		Expression expression = parser.parseExpression("stringArrayOfThreeItems[3]");
 		assertThatExceptionOfType(SpelEvaluationException.class)
 			.isThrownBy(() -> expression.getValue(context, new Inventor()))
-			.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.ARRAY_INDEX_OUT_OF_BOUNDS));
+			.extracting(SpelEvaluationException::getMessageCode).isEqualTo(SpelMessage.ARRAY_INDEX_OUT_OF_BOUNDS);
 	}
 
 
@@ -335,7 +334,7 @@ private static class ConfigurablePropertyAccessor implements PropertyAccessor {
 
 		private final Map<String, Object> values;
 
-		public ConfigurablePropertyAccessor(Map<String, Object> values) {
+		ConfigurablePropertyAccessor(Map<String, Object> values) {
 			this.values = values;
 		}
 

From 51d263bd0606b31db0d792cbfdb25ccf5560e883 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 8 Jan 2022 17:24:19 +0100
Subject: [PATCH 532/735] Simplify H2SequenceMaxValueIncrementerTests

@hpoettker made me aware of the ModeEnum in H2 that allows the
parameterized test to be simplified, which was the primary impetus for
this commit.

See gh-27870
---
 .../H2SequenceMaxValueIncrementerTests.java   | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
index eee479e99127..aad0c401fa3f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
@@ -20,18 +20,16 @@
 
 import javax.sql.DataSource;
 
+import org.h2.engine.Mode.ModeEnum;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.EnumSource;
 
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.support.TransactionTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -60,12 +58,7 @@ void incrementsSequenceUsingH2EmbeddedDatabaseConfigurer() {
 				.addScript("classpath:/org/springframework/jdbc/support/incrementer/schema.sql")
 				.build();
 
-		JdbcTemplate jdbcTemplate = new JdbcTemplate(database);
-		assertThat(jdbcTemplate.queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
-
-		H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(database, "SEQ");
-		assertThat(incrementer.nextIntValue()).isEqualTo(2);
-		assertThat(incrementer.nextStringValue()).isEqualTo("3");
+		assertIncrements(database);
 
 		database.shutdown();
 	}
@@ -74,24 +67,24 @@ void incrementsSequenceUsingH2EmbeddedDatabaseConfigurer() {
 	 * Tests that the incrementer works when using all supported H2 <em>compatibility modes</em>.
 	 */
 	@ParameterizedTest
-	@ValueSource(strings = { "STRICT", "LEGACY", "DB2", "Derby", "HSQLDB", "MariaDB", "MSSQLServer", "MySQL", "Oracle", "PostgreSQL" })
-	void incrementsSequenceWithExplicitH2CompatibilityMode(String compatibilityMode) {
-		String connectionUrl = String.format("jdbc:h2:mem:%s;MODE=%s", UUID.randomUUID().toString(), compatibilityMode);
+	@EnumSource(ModeEnum.class)
+	void incrementsSequenceWithExplicitH2CompatibilityMode(ModeEnum mode) {
+		String connectionUrl = String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false;MODE=%s", UUID.randomUUID().toString(), mode);
 		DataSource dataSource = new SimpleDriverDataSource(new org.h2.Driver(), connectionUrl, "sa", "");
 		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-		PlatformTransactionManager transactionManager = new DataSourceTransactionManager(dataSource);
-		TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
+		jdbcTemplate.execute("CREATE SEQUENCE SEQ");
 
-		transactionTemplate.executeWithoutResult(status -> {
-			jdbcTemplate.execute("CREATE SEQUENCE SEQ");
-			assertThat(jdbcTemplate.queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
-
-			H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
-			assertThat(incrementer.nextIntValue()).isEqualTo(2);
-			assertThat(incrementer.nextStringValue()).isEqualTo("3");
-		});
+		assertIncrements(dataSource);
 
 		jdbcTemplate.execute("SHUTDOWN");
 	}
 
+	private void assertIncrements(DataSource dataSource) {
+		assertThat(new JdbcTemplate(dataSource).queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
+
+		H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
+		assertThat(incrementer.nextIntValue()).isEqualTo(2);
+		assertThat(incrementer.nextStringValue()).isEqualTo("3");
+	}
+
 }

From 23ab9ca8ca385d0253cf959ab2849f36d0c19edb Mon Sep 17 00:00:00 2001
From: kth496 <taehongkim496@gmail.com>
Date: Sat, 11 Sep 2021 14:40:24 +0900
Subject: [PATCH 533/735] Refactor tests to use lambda expressions & method
 references

Closes gh-27386
---
 .../core/annotation/MissingMergedAnnotationTests.java    | 2 +-
 .../convert/support/GenericConversionServiceTests.java   | 7 +------
 .../core/convert/support/StreamConverterTests.java       | 8 +-------
 .../java/org/springframework/core/env/ProfilesTests.java | 3 +--
 .../core/env/StandardEnvironmentTests.java               | 2 +-
 .../core/io/buffer/DataBufferUtilsTests.java             | 2 +-
 .../core/task/SimpleAsyncTaskExecutorTests.java          | 9 +--------
 .../util/concurrent/SettableListenableFutureTests.java   | 3 +--
 .../util/xml/AbstractStaxXMLReaderTests.java             | 9 +++------
 9 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java
index 383536912f37..244b75dbfcfe 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java
@@ -257,7 +257,7 @@ void getDefaultValueReturnsEmpty() {
 
 	@Test
 	void synthesizeThrowsNoSuchElementException() {
-		assertThatNoSuchElementException().isThrownBy(() -> this.missing.synthesize());
+		assertThatNoSuchElementException().isThrownBy(this.missing::synthesize);
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
index 01c40274fd7b..c1fc1117d7f5 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
@@ -190,12 +190,7 @@ void convertWrongTypeArgument() {
 
 	@Test
 	void convertSuperSourceType() {
-		conversionService.addConverter(new Converter<CharSequence, Integer>() {
-			@Override
-			public Integer convert(CharSequence source) {
-				return Integer.valueOf(source.toString());
-			}
-		});
+		conversionService.addConverter(CharSequence.class, Integer.class, source -> Integer.valueOf(source.toString()));
 		Integer result = conversionService.convert("3", Integer.class);
 		assertThat((int) result).isEqualTo((int) Integer.valueOf(3));
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java
index 42f4041ca9ae..a7bee74e5a2c 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java
@@ -26,7 +26,6 @@
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.Converter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -134,12 +133,7 @@ void convertFromListToStream() throws NoSuchFieldException {
 	@SuppressWarnings("resource")
 	void convertFromArrayToStream() throws NoSuchFieldException {
 		Integer[] stream = new Integer[] {1, 0, 1};
-		this.conversionService.addConverter(new Converter<Integer, Boolean>() {
-			@Override
-			public Boolean convert(Integer source) {
-				return source == 1;
-			}
-		});
+		this.conversionService.addConverter(Integer.class, Boolean.class, source -> source == 1);
 		TypeDescriptor streamOfBoolean = new TypeDescriptor(Types.class.getField("streamOfBooleans"));
 		Object result = this.conversionService.convert(stream, streamOfBoolean);
 
diff --git a/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java b/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java
index 3e3996979928..dfffcf64c4f1 100644
--- a/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java
@@ -47,8 +47,7 @@ void ofWhenNullThrowsException() {
 
 	@Test
 	void ofWhenEmptyThrowsException() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				Profiles.of())
+		assertThatIllegalArgumentException().isThrownBy(Profiles::of)
 			.withMessageContaining("Must specify at least one profile");
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
index acd6d84acabb..745321416f4f 100644
--- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
@@ -212,7 +212,7 @@ void reservedDefaultProfile() {
 	void defaultProfileWithCircularPlaceholder() {
 		try {
 			System.setProperty(DEFAULT_PROFILES_PROPERTY_NAME, "${spring.profiles.default}");
-			assertThatIllegalArgumentException().isThrownBy(() -> environment.getDefaultProfiles());
+			assertThatIllegalArgumentException().isThrownBy(environment::getDefaultProfiles);
 		}
 		finally {
 			System.clearProperty(DEFAULT_PROFILES_PROPERTY_NAME);
diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
index ba85a1575bc1..1f9a22abd37d 100644
--- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
@@ -80,7 +80,7 @@ void readInputStream(String displayName, DataBufferFactory bufferFactory) {
 		super.bufferFactory = bufferFactory;
 
 		Flux<DataBuffer> flux = DataBufferUtils.readInputStream(
-				() -> this.resource.getInputStream(), super.bufferFactory, 3);
+				this.resource::getInputStream, super.bufferFactory, 3);
 
 		verifyReadData(flux);
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
index c78f9a95f561..3aea9fbadf7b 100644
--- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.core.task;
 
-import java.util.concurrent.ThreadFactory;
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.util.ConcurrencyThrottleSupport;
@@ -61,12 +59,7 @@ void threadNameGetsSetCorrectly() throws Exception {
 	@Test
 	void threadFactoryOverridesDefaults() throws Exception {
 		final Object monitor = new Object();
-		SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor(new ThreadFactory() {
-			@Override
-			public Thread newThread(Runnable r) {
-				return new Thread(r, "test");
-			}
-		});
+		SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor(runnable -> new Thread(runnable, "test"));
 		ThreadNameHarvester task = new ThreadNameHarvester(monitor);
 		executeAndWait(executor, task, monitor);
 		assertThat(task.getThreadName()).isEqualTo("test");
diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
index a14ecf5f4e93..e5b837f61a7a 100644
--- a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
+++ b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
@@ -332,8 +332,7 @@ void setExceptionPreventsCancel() {
 	void cancelStateThrowsExceptionWhenCallingGet() throws ExecutionException, InterruptedException {
 		settableListenableFuture.cancel(true);
 
-		assertThatExceptionOfType(CancellationException.class).isThrownBy(() ->
-				settableListenableFuture.get());
+		assertThatExceptionOfType(CancellationException.class).isThrownBy(settableListenableFuture::get);
 
 		assertThat(settableListenableFuture.isCancelled()).isTrue();
 		assertThat(settableListenableFuture.isDone()).isTrue();
diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
index 317a88b9eb81..454b8629063e 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
@@ -179,12 +179,9 @@ protected final ContentHandler mockContentHandler() throws Exception {
 		ContentHandler contentHandler = mock(ContentHandler.class);
 		willAnswer(new CopyCharsAnswer()).given(contentHandler).characters(any(char[].class), anyInt(), anyInt());
 		willAnswer(new CopyCharsAnswer()).given(contentHandler).ignorableWhitespace(any(char[].class), anyInt(), anyInt());
-		willAnswer(new Answer<Object>() {
-			@Override
-			public Object answer(InvocationOnMock invocation) throws Throwable {
-				invocation.getArguments()[3] = new AttributesImpl((Attributes) invocation.getArguments()[3]);
-				return null;
-			}
+		willAnswer(invocation -> {
+			invocation.getArguments()[3] = new AttributesImpl((Attributes) invocation.getArguments()[3]);
+			return null;
 		}).given(contentHandler).startElement(anyString(), anyString(), anyString(), any(Attributes.class));
 		return contentHandler;
 	}

From 730ad4436f04bf89252fb40e658895918ae4180d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 9 Jan 2022 16:08:12 +0100
Subject: [PATCH 534/735] Polish contribution

---
 .../core/annotation/MissingMergedAnnotationTests.java    | 2 +-
 .../convert/support/GenericConversionServiceTests.java   | 2 +-
 .../java/org/springframework/core/env/ProfilesTests.java | 9 +++++----
 .../core/env/StandardEnvironmentTests.java               | 2 +-
 .../core/io/buffer/DataBufferUtilsTests.java             | 2 +-
 .../core/task/SimpleAsyncTaskExecutorTests.java          | 2 +-
 .../util/concurrent/SettableListenableFutureTests.java   | 2 +-
 .../util/xml/AbstractStaxXMLReaderTests.java             | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java
index 244b75dbfcfe..151b31f3ae0f 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
index c1fc1117d7f5..304dcb15374b 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java b/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java
index dfffcf64c4f1..01454ad10e45 100644
--- a/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/ProfilesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,8 @@ void ofWhenNullThrowsException() {
 
 	@Test
 	void ofWhenEmptyThrowsException() {
-		assertThatIllegalArgumentException().isThrownBy(Profiles::of)
+		assertThatIllegalArgumentException()
+			.isThrownBy(Profiles::of)
 			.withMessageContaining("Must specify at least one profile");
 	}
 
@@ -353,8 +354,8 @@ void equalsAndHashCodeAreNotBasedOnLogicalStructureOfNodesWithinExpressionTree()
 
 
 	private static void assertMalformed(Supplier<Profiles> supplier) {
-		assertThatIllegalArgumentException().isThrownBy(
-				supplier::get)
+		assertThatIllegalArgumentException()
+			.isThrownBy(supplier::get)
 			.withMessageContaining("Malformed");
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
index 745321416f4f..e45f8b189f94 100644
--- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
index 1f9a22abd37d..d20247862395 100644
--- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
index 3aea9fbadf7b..175002cbfbec 100644
--- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
index e5b837f61a7a..5f1c5e041028 100644
--- a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
+++ b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
index 454b8629063e..afdb67d61a93 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From d68bb4eecd2f576e90a79d86e0c73af5ed6602ca Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 9 Jan 2022 16:13:22 +0100
Subject: [PATCH 535/735] Simplify StreamConverterTests

---
 .../convert/support/StreamConverterTests.java | 73 ++++++-------------
 1 file changed, 23 insertions(+), 50 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java
index a7bee74e5a2c..56ec69a20612 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -30,11 +30,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.assertj.core.api.InstanceOfAssertFactories.list;
+import static org.assertj.core.api.InstanceOfAssertFactories.stream;
 
 /**
  * Tests for {@link StreamConverter}.
  *
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 4.2
  */
 class StreamConverterTests {
@@ -56,60 +59,41 @@ void setup() {
 	@Test
 	void convertFromStreamToList() throws NoSuchFieldException {
 		this.conversionService.addConverter(Number.class, String.class, new ObjectToStringConverter());
-		Stream<Integer> stream = Arrays.asList(1, 2, 3).stream();
+		Stream<Integer> stream = Stream.of(1, 2, 3);
 		TypeDescriptor listOfStrings = new TypeDescriptor(Types.class.getField("listOfStrings"));
 		Object result = this.conversionService.convert(stream, listOfStrings);
 
-		assertThat(result).as("Converted object must not be null").isNotNull();
-		boolean condition = result instanceof List;
-		assertThat(condition).as("Converted object must be a list").isTrue();
-		@SuppressWarnings("unchecked")
-		List<String> content = (List<String>) result;
-		assertThat(content.get(0)).isEqualTo("1");
-		assertThat(content.get(1)).isEqualTo("2");
-		assertThat(content.get(2)).isEqualTo("3");
-		assertThat(content.size()).as("Wrong number of elements").isEqualTo(3);
+		assertThat(result).asInstanceOf(list(String.class)).containsExactly("1", "2", "3");
 	}
 
 	@Test
 	void convertFromStreamToArray() throws NoSuchFieldException {
 		this.conversionService.addConverterFactory(new NumberToNumberConverterFactory());
-		Stream<Integer> stream = Arrays.asList(1, 2, 3).stream();
+		Stream<Integer> stream = Stream.of(1, 2, 3);
 		TypeDescriptor arrayOfLongs = new TypeDescriptor(Types.class.getField("arrayOfLongs"));
 		Object result = this.conversionService.convert(stream, arrayOfLongs);
 
 		assertThat(result).as("Converted object must not be null").isNotNull();
 		assertThat(result.getClass().isArray()).as("Converted object must be an array").isTrue();
 		Long[] content = (Long[]) result;
-		assertThat(content[0]).isEqualTo(Long.valueOf(1L));
-		assertThat(content[1]).isEqualTo(Long.valueOf(2L));
-		assertThat(content[2]).isEqualTo(Long.valueOf(3L));
-		assertThat(content.length).as("Wrong number of elements").isEqualTo(3);
+		assertThat(content).containsExactly(1L, 2L, 3L);
 	}
 
 	@Test
 	void convertFromStreamToRawList() throws NoSuchFieldException {
-		Stream<Integer> stream = Arrays.asList(1, 2, 3).stream();
+		Stream<Integer> stream = Stream.of(1, 2, 3);
 		TypeDescriptor listOfStrings = new TypeDescriptor(Types.class.getField("rawList"));
 		Object result = this.conversionService.convert(stream, listOfStrings);
 
-		assertThat(result).as("Converted object must not be null").isNotNull();
-		boolean condition = result instanceof List;
-		assertThat(condition).as("Converted object must be a list").isTrue();
-		@SuppressWarnings("unchecked")
-		List<Object> content = (List<Object>) result;
-		assertThat(content.get(0)).isEqualTo(1);
-		assertThat(content.get(1)).isEqualTo(2);
-		assertThat(content.get(2)).isEqualTo(3);
-		assertThat(content.size()).as("Wrong number of elements").isEqualTo(3);
+		assertThat(result).asInstanceOf(list(Object.class)).containsExactly(1, 2, 3);
 	}
 
 	@Test
 	void convertFromStreamToArrayNoConverter() throws NoSuchFieldException {
-		Stream<Integer> stream = Arrays.asList(1, 2, 3).stream();
+		Stream<Integer> stream = Stream.of(1, 2, 3);
 		TypeDescriptor arrayOfLongs = new TypeDescriptor(Types.class.getField("arrayOfLongs"));
-		assertThatExceptionOfType(ConversionFailedException.class).isThrownBy(() ->
-				this.conversionService.convert(stream, arrayOfLongs))
+		assertThatExceptionOfType(ConversionFailedException.class)
+			.isThrownBy(() -> this.conversionService.convert(stream, arrayOfLongs))
 			.withCauseInstanceOf(ConverterNotFoundException.class);
 	}
 
@@ -117,13 +101,11 @@ void convertFromStreamToArrayNoConverter() throws NoSuchFieldException {
 	@SuppressWarnings("resource")
 	void convertFromListToStream() throws NoSuchFieldException {
 		this.conversionService.addConverterFactory(new StringToNumberConverterFactory());
-		List<String> stream = Arrays.asList("1", "2", "3");
+		List<String> list = Arrays.asList("1", "2", "3");
 		TypeDescriptor streamOfInteger = new TypeDescriptor(Types.class.getField("streamOfIntegers"));
-		Object result = this.conversionService.convert(stream, streamOfInteger);
+		Object result = this.conversionService.convert(list, streamOfInteger);
 
-		assertThat(result).as("Converted object must not be null").isNotNull();
-		boolean condition = result instanceof Stream;
-		assertThat(condition).as("Converted object must be a stream").isTrue();
+		assertThat(result).as("Converted object must be a stream").isInstanceOf(Stream.class);
 		@SuppressWarnings("unchecked")
 		Stream<Integer> content = (Stream<Integer>) result;
 		assertThat(content.mapToInt(x -> x).sum()).isEqualTo(6);
@@ -132,34 +114,25 @@ void convertFromListToStream() throws NoSuchFieldException {
 	@Test
 	@SuppressWarnings("resource")
 	void convertFromArrayToStream() throws NoSuchFieldException {
-		Integer[] stream = new Integer[] {1, 0, 1};
+		Integer[] array = new Integer[] {1, 0, 1};
 		this.conversionService.addConverter(Integer.class, Boolean.class, source -> source == 1);
 		TypeDescriptor streamOfBoolean = new TypeDescriptor(Types.class.getField("streamOfBooleans"));
-		Object result = this.conversionService.convert(stream, streamOfBoolean);
+		Object result = this.conversionService.convert(array, streamOfBoolean);
 
-		assertThat(result).as("Converted object must not be null").isNotNull();
-		boolean condition = result instanceof Stream;
-		assertThat(condition).as("Converted object must be a stream").isTrue();
-		@SuppressWarnings("unchecked")
-		Stream<Boolean> content = (Stream<Boolean>) result;
-		assertThat(content.filter(x -> x).count()).isEqualTo(2);
+		assertThat(result).asInstanceOf(stream(Boolean.class)).filteredOn(x -> x).hasSize(2);
 	}
 
 	@Test
 	@SuppressWarnings("resource")
 	void convertFromListToRawStream() throws NoSuchFieldException {
-		List<String> stream = Arrays.asList("1", "2", "3");
+		List<String> list = Arrays.asList("1", "2", "3");
 		TypeDescriptor streamOfInteger = new TypeDescriptor(Types.class.getField("rawStream"));
-		Object result = this.conversionService.convert(stream, streamOfInteger);
+		Object result = this.conversionService.convert(list, streamOfInteger);
 
-		assertThat(result).as("Converted object must not be null").isNotNull();
-		boolean condition = result instanceof Stream;
-		assertThat(condition).as("Converted object must be a stream").isTrue();
+		assertThat(result).as("Converted object must be a stream").isInstanceOf(Stream.class);
 		@SuppressWarnings("unchecked")
 		Stream<Object> content = (Stream<Object>) result;
-		StringBuilder sb = new StringBuilder();
-		content.forEach(sb::append);
-		assertThat(sb.toString()).isEqualTo("123");
+		assertThat(content).containsExactly("1", "2", "3");
 	}
 
 	@Test

From e41d8651938a88be16743a7dc0fbd9f8b8ac0be9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 9 Jan 2022 16:41:45 +0100
Subject: [PATCH 536/735] Polishing

---
 .../springframework/core/ResolvableType.java  | 30 +++---
 .../core/ResolvableTypeTests.java             | 98 +++++++++----------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
index ae6fe4f0846b..d976d99d5b00 100644
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,11 +48,11 @@
  * {@link #getGeneric(int...) generic parameters} along with the ability to ultimately
  * {@link #resolve() resolve} to a {@link java.lang.Class}.
  *
- * <p>{@code ResolvableTypes} may be obtained from {@link #forField(Field) fields},
- * {@link #forMethodParameter(Method, int) method parameters},
- * {@link #forMethodReturnType(Method) method returns} or
- * {@link #forClass(Class) classes}. Most methods on this class will themselves return
- * {@link ResolvableType ResolvableTypes}, allowing easy navigation. For example:
+ * <p>A {@code ResolvableType} may be obtained from a {@linkplain #forField(Field) field},
+ * a {@linkplain #forMethodParameter(Method, int) method parameter},
+ * a {@linkplain #forMethodReturnType(Method) method return type}, or a
+ * {@linkplain #forClass(Class) class}. Most methods on this class will themselves return
+ * a {@code ResolvableType}, allowing for easy navigation. For example:
  * <pre class="code">
  * private HashMap&lt;Integer, List&lt;String&gt;&gt; myMap;
  *
@@ -182,7 +182,7 @@ private ResolvableType(Type type, @Nullable TypeProvider typeProvider,
 
 	/**
 	 * Private constructor used to create a new {@link ResolvableType} on a {@link Class} basis.
-	 * Avoids all {@code instanceof} checks in order to create a straight {@link Class} wrapper.
+	 * <p>Avoids all {@code instanceof} checks in order to create a straight {@link Class} wrapper.
 	 * @since 4.2
 	 */
 	private ResolvableType(@Nullable Class<?> clazz) {
@@ -406,7 +406,7 @@ public ResolvableType getComponentType() {
 
 	/**
 	 * Convenience method to return this type as a resolvable {@link Collection} type.
-	 * Returns {@link #NONE} if this type does not implement or extend
+	 * <p>Returns {@link #NONE} if this type does not implement or extend
 	 * {@link Collection}.
 	 * @see #as(Class)
 	 * @see #asMap()
@@ -417,7 +417,7 @@ public ResolvableType asCollection() {
 
 	/**
 	 * Convenience method to return this type as a resolvable {@link Map} type.
-	 * Returns {@link #NONE} if this type does not implement or extend
+	 * <p>Returns {@link #NONE} if this type does not implement or extend
 	 * {@link Map}.
 	 * @see #as(Class)
 	 * @see #asCollection()
@@ -458,7 +458,7 @@ public ResolvableType as(Class<?> type) {
 
 	/**
 	 * Return a {@link ResolvableType} representing the direct supertype of this type.
-	 * If no supertype is available this method returns {@link #NONE}.
+	 * <p>If no supertype is available this method returns {@link #NONE}.
 	 * <p>Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}.
 	 * @see #getInterfaces()
 	 */
@@ -608,7 +608,7 @@ private boolean isWildcardWithoutBounds() {
 
 	/**
 	 * Return a {@link ResolvableType} for the specified nesting level.
-	 * See {@link #getNested(int, Map)} for details.
+	 * <p>See {@link #getNested(int, Map)} for details.
 	 * @param nestingLevel the nesting level
 	 * @return the {@link ResolvableType} type, or {@code #NONE}
 	 */
@@ -999,7 +999,7 @@ public String toString() {
 	/**
 	 * Return a {@link ResolvableType} for the specified {@link Class},
 	 * using the full generic type information for assignability checks.
-	 * For example: {@code ResolvableType.forClass(MyArrayList.class)}.
+	 * <p>For example: {@code ResolvableType.forClass(MyArrayList.class)}.
 	 * @param clazz the class to introspect ({@code null} is semantically
 	 * equivalent to {@code Object.class} for typical use cases here)
 	 * @return a {@link ResolvableType} for the specified class
@@ -1014,7 +1014,7 @@ public static ResolvableType forClass(@Nullable Class<?> clazz) {
 	 * Return a {@link ResolvableType} for the specified {@link Class},
 	 * doing assignability checks against the raw class only (analogous to
 	 * {@link Class#isAssignableFrom}, which this serves as a wrapper for.
-	 * For example: {@code ResolvableType.forRawClass(List.class)}.
+	 * <p>For example: {@code ResolvableType.forRawClass(List.class)}.
 	 * @param clazz the class to introspect ({@code null} is semantically
 	 * equivalent to {@code Object.class} for typical use cases here)
 	 * @return a {@link ResolvableType} for the specified class
@@ -1043,7 +1043,7 @@ public boolean isAssignableFrom(ResolvableType other) {
 	/**
 	 * Return a {@link ResolvableType} for the specified base type
 	 * (interface or base class) with a given implementation class.
-	 * For example: {@code ResolvableType.forClass(List.class, MyArrayList.class)}.
+	 * <p>For example: {@code ResolvableType.forClass(List.class, MyArrayList.class)}.
 	 * @param baseType the base type (must not be {@code null})
 	 * @param implementationClass the implementation class
 	 * @return a {@link ResolvableType} for the specified base type backed by the
@@ -1238,7 +1238,7 @@ public static ResolvableType forMethodReturnType(Method method) {
 
 	/**
 	 * Return a {@link ResolvableType} for the specified {@link Method} return type.
-	 * Use this variant when the class that declares the method includes generic
+	 * <p>Use this variant when the class that declares the method includes generic
 	 * parameter variables that are satisfied by the implementation class.
 	 * @param method the source for the method return type
 	 * @param implementationClass the implementation class
diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
index 3ca17918b53e..c153c883860c 100644
--- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -83,19 +83,19 @@ void noneReturnValues() throws Exception {
 		assertThat(none.asMap()).isEqualTo(ResolvableType.NONE);
 		assertThat(none.getComponentType()).isEqualTo(ResolvableType.NONE);
 		assertThat(none.getGeneric(0)).isEqualTo(ResolvableType.NONE);
-		assertThat(none.getGenerics().length).isEqualTo(0);
-		assertThat(none.getInterfaces().length).isEqualTo(0);
+		assertThat(none.getGenerics()).isEmpty();
+		assertThat(none.getInterfaces()).isEmpty();
 		assertThat(none.getSuperType()).isEqualTo(ResolvableType.NONE);
 		assertThat(none.getType()).isEqualTo(ResolvableType.EmptyType.INSTANCE);
-		assertThat(none.hasGenerics()).isEqualTo(false);
-		assertThat(none.isArray()).isEqualTo(false);
+		assertThat(none.hasGenerics()).isFalse();
+		assertThat(none.isArray()).isFalse();
 		assertThat(none.resolve()).isNull();
 		assertThat(none.resolve(String.class)).isEqualTo(String.class);
 		assertThat(none.resolveGeneric(0)).isNull();
-		assertThat(none.resolveGenerics().length).isEqualTo(0);
+		assertThat(none.resolveGenerics()).isEmpty();
 		assertThat(none.toString()).isEqualTo("?");
-		assertThat(none.hasUnresolvableGenerics()).isEqualTo(false);
-		assertThat(none.isAssignableFrom(ResolvableType.forClass(Object.class))).isEqualTo(false);
+		assertThat(none.hasUnresolvableGenerics()).isFalse();
+		assertThat(none.isAssignableFrom(ResolvableType.forClass(Object.class))).isFalse();
 	}
 
 	@Test
@@ -148,9 +148,9 @@ void forRawClassAssignableFromTypeVariable() throws Exception {
 
 	@Test
 	void forInstanceMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forInstance(null))
-			.withMessageContaining("Instance must not be null");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forInstance(null))
+			.withMessage("Instance must not be null");
 	}
 
 	@Test
@@ -201,9 +201,9 @@ void forPrivateField() throws Exception {
 
 	@Test
 	void forFieldMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forField(null))
-			.withMessageContaining("Field must not be null");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forField(null))
+			.withMessage("Field must not be null");
 	}
 
 	@Test
@@ -215,9 +215,9 @@ void forConstructorParameter() throws Exception {
 
 	@Test
 	void forConstructorParameterMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forConstructorParameter(null, 0))
-			.withMessageContaining("Constructor must not be null");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forConstructorParameter(null, 0))
+			.withMessage("Constructor must not be null");
 	}
 
 	@Test
@@ -229,9 +229,9 @@ void forMethodParameterByIndex() throws Exception {
 
 	@Test
 	void forMethodParameterByIndexMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forMethodParameter(null, 0))
-			.withMessageContaining("Method must not be null");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forMethodParameter(null, 0))
+			.withMessage("Method must not be null");
 	}
 
 	@Test
@@ -269,9 +269,9 @@ void forMethodParameterWithNestingAndLevels() throws Exception {
 
 	@Test
 	void forMethodParameterMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forMethodParameter(null))
-			.withMessageContaining("MethodParameter must not be null");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forMethodParameter(null))
+			.withMessage("MethodParameter must not be null");
 	}
 
 	@Test  // SPR-16210
@@ -296,9 +296,9 @@ void forMethodReturn() throws Exception {
 
 	@Test
 	void forMethodReturnMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forMethodReturnType(null))
-			.withMessageContaining("Method must not be null");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forMethodReturnType(null))
+			.withMessage("Method must not be null");
 	}
 
 	@Test
@@ -317,7 +317,7 @@ void parameterizedType() throws Exception {
 	void arrayClassType() throws Exception {
 		ResolvableType type = ResolvableType.forField(Fields.class.getField("arrayClassType"));
 		assertThat(type.getType()).isInstanceOf(Class.class);
-		assertThat(((Class) type.getType()).isArray()).isEqualTo(true);
+		assertThat(((Class) type.getType()).isArray()).isTrue();
 	}
 
 	@Test
@@ -343,7 +343,7 @@ void typeVariableType() throws Exception {
 	void getComponentTypeForClassArray() throws Exception {
 		Field field = Fields.class.getField("arrayClassType");
 		ResolvableType type = ResolvableType.forField(field);
-		assertThat(type.isArray()).isEqualTo(true);
+		assertThat(type.isArray()).isTrue();
 		assertThat(type.getComponentType().getType())
 			.isEqualTo(((Class) field.getGenericType()).getComponentType());
 	}
@@ -351,7 +351,7 @@ void getComponentTypeForClassArray() throws Exception {
 	@Test
 	void getComponentTypeForGenericArrayType() throws Exception {
 		ResolvableType type = ResolvableType.forField(Fields.class.getField("genericArrayType"));
-		assertThat(type.isArray()).isEqualTo(true);
+		assertThat(type.isArray()).isTrue();
 		assertThat(type.getComponentType().getType()).isEqualTo(
 				((GenericArrayType) type.getType()).getGenericComponentType());
 	}
@@ -359,7 +359,7 @@ void getComponentTypeForGenericArrayType() throws Exception {
 	@Test
 	void getComponentTypeForVariableThatResolvesToGenericArray() throws Exception {
 		ResolvableType type = ResolvableType.forClass(ListOfGenericArray.class).asCollection().getGeneric();
-		assertThat(type.isArray()).isEqualTo(true);
+		assertThat(type.isArray()).isTrue();
 		assertThat(type.getType()).isInstanceOf(TypeVariable.class);
 		assertThat(type.getComponentType().getType().toString()).isEqualTo(
 				"java.util.List<java.lang.String>");
@@ -368,7 +368,7 @@ void getComponentTypeForVariableThatResolvesToGenericArray() throws Exception {
 	@Test
 	void getComponentTypeForNonArray() throws Exception {
 		ResolvableType type = ResolvableType.forClass(String.class);
-		assertThat(type.isArray()).isEqualTo(false);
+		assertThat(type.isArray()).isFalse();
 		assertThat(type.getComponentType()).isEqualTo(ResolvableType.NONE);
 	}
 
@@ -438,7 +438,7 @@ void getSuperType() throws Exception {
 	@Test
 	void getInterfaces() throws Exception {
 		ResolvableType type = ResolvableType.forClass(ExtendsList.class);
-		assertThat(type.getInterfaces().length).isEqualTo(0);
+		assertThat(type.getInterfaces()).isEmpty();
 		SortedSet<String> interfaces = new TreeSet<>();
 		for (ResolvableType interfaceType : type.getSuperType().getInterfaces()) {
 			interfaces.add(interfaceType.toString());
@@ -529,8 +529,8 @@ void getGenericOutOfBounds() throws Exception {
 	@Test
 	void hasGenerics() throws Exception {
 		ResolvableType type = ResolvableType.forClass(ExtendsList.class);
-		assertThat(type.hasGenerics()).isEqualTo(false);
-		assertThat(type.asCollection().hasGenerics()).isEqualTo(true);
+		assertThat(type.hasGenerics()).isFalse();
+		assertThat(type.asCollection().hasGenerics()).isTrue();
 	}
 
 	@Test
@@ -553,7 +553,7 @@ void getGenericsFromClass() throws Exception {
 	void noGetGenerics() throws Exception {
 		ResolvableType type = ResolvableType.forClass(ExtendsList.class);
 		ResolvableType[] generics = type.getGenerics();
-		assertThat(generics.length).isEqualTo(0);
+		assertThat(generics).isEmpty();
 	}
 
 	@Test
@@ -602,7 +602,7 @@ void resolveGenericArrayFromGeneric() throws Exception {
 		ResolvableType type = ResolvableType.forField(Fields.class.getField("stringArrayList"));
 		ResolvableType generic = type.asCollection().getGeneric();
 		assertThat(generic.getType().toString()).isEqualTo("E");
-		assertThat(generic.isArray()).isEqualTo(true);
+		assertThat(generic.isArray()).isTrue();
 		assertThat(generic.resolve()).isEqualTo(String[].class);
 	}
 
@@ -610,7 +610,7 @@ void resolveGenericArrayFromGeneric() throws Exception {
 	void resolveVariableGenericArray() throws Exception {
 		ResolvableType type = ResolvableType.forField(Fields.class.getField("variableTypeGenericArray"), TypedFields.class);
 		assertThat(type.getType().toString()).isEqualTo("T[]");
-		assertThat(type.isArray()).isEqualTo(true);
+		assertThat(type.isArray()).isTrue();
 		assertThat(type.resolve()).isEqualTo(String[].class);
 	}
 
@@ -618,7 +618,7 @@ void resolveVariableGenericArray() throws Exception {
 	void resolveVariableGenericArrayUnknown() throws Exception {
 		ResolvableType type = ResolvableType.forField(Fields.class.getField("variableTypeGenericArray"));
 		assertThat(type.getType().toString()).isEqualTo("T[]");
-		assertThat(type.isArray()).isEqualTo(true);
+		assertThat(type.isArray()).isTrue();
 		assertThat(type.resolve()).isNull();
 	}
 
@@ -626,7 +626,7 @@ void resolveVariableGenericArrayUnknown() throws Exception {
 	void resolveVariableGenericArrayUnknownWithFallback() throws Exception {
 		ResolvableType type = ResolvableType.forField(Fields.class.getField("variableTypeGenericArray"));
 		assertThat(type.getType().toString()).isEqualTo("T[]");
-		assertThat(type.isArray()).isEqualTo(true);
+		assertThat(type.isArray()).isTrue();
 		assertThat(type.toClass()).isEqualTo(Object.class);
 	}
 
@@ -965,16 +965,16 @@ void resolveFromClassWithGenerics() throws Exception {
 
 	@Test
 	void isAssignableFromMustNotBeNull() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forClass(Object.class).isAssignableFrom((ResolvableType) null))
-			.withMessageContaining("Type must not be null");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forClass(Object.class).isAssignableFrom((ResolvableType) null))
+			.withMessage("ResolvableType must not be null");
 	}
 
 	@Test
 	void isAssignableFromForNone() throws Exception {
 		ResolvableType objectType = ResolvableType.forClass(Object.class);
-		assertThat(objectType.isAssignableFrom(ResolvableType.NONE)).isEqualTo(false);
-		assertThat(ResolvableType.NONE.isAssignableFrom(objectType)).isEqualTo(false);
+		assertThat(objectType.isAssignableFrom(ResolvableType.NONE)).isFalse();
+		assertThat(ResolvableType.NONE.isAssignableFrom(objectType)).isFalse();
 	}
 
 	@Test
@@ -1262,19 +1262,19 @@ void narrow() throws Exception {
 	@Test
 	void hasUnresolvableGenerics() throws Exception {
 		ResolvableType type = ResolvableType.forField(Fields.class.getField("stringList"));
-		assertThat(type.hasUnresolvableGenerics()).isEqualTo(false);
+		assertThat(type.hasUnresolvableGenerics()).isFalse();
 	}
 
 	@Test
 	void hasUnresolvableGenericsBasedOnOwnGenerics() throws Exception {
 		ResolvableType type = ResolvableType.forClass(List.class);
-		assertThat(type.hasUnresolvableGenerics()).isEqualTo(true);
+		assertThat(type.hasUnresolvableGenerics()).isTrue();
 	}
 
 	@Test
 	void hasUnresolvableGenericsWhenSelfNotResolvable() throws Exception {
 		ResolvableType type = ResolvableType.forClass(List.class).getGeneric();
-		assertThat(type.hasUnresolvableGenerics()).isEqualTo(false);
+		assertThat(type.hasUnresolvableGenerics()).isFalse();
 	}
 
 	@Test
@@ -1283,7 +1283,7 @@ void hasUnresolvableGenericsWhenImplementesRawInterface() throws Exception {
 		for (ResolvableType generic : type.getGenerics()) {
 			assertThat(generic.resolve()).isNotNull();
 		}
-		assertThat(type.hasUnresolvableGenerics()).isEqualTo(true);
+		assertThat(type.hasUnresolvableGenerics()).isTrue();
 	}
 
 	@Test
@@ -1292,7 +1292,7 @@ void hasUnresolvableGenericsWhenExtends() throws Exception {
 		for (ResolvableType generic : type.getGenerics()) {
 			assertThat(generic.resolve()).isNotNull();
 		}
-		assertThat(type.hasUnresolvableGenerics()).isEqualTo(true);
+		assertThat(type.hasUnresolvableGenerics()).isTrue();
 	}
 
 	@Test

From 8087eb69bfc2782bd8c5b81c57d63c849b87ed8c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 9 Jan 2022 16:55:17 +0100
Subject: [PATCH 537/735] Improve error message in
 ResolvableType.forClassWithGenerics()

Prior to this commit, the error message generated for a mismatched
number of generics did not include the information about the class in
question.

This commit improves the error message by providing more context,
specifically the result of invoking toGenericString() on the class.

For example, instead of throwing an IllegalArgumentException with the
error message "Mismatched number of generics specified", the error
message would now be "Mismatched number of generics specified for
public abstract interface java.util.Map<K,V>".

Closes gh-27847
---
 .../main/java/org/springframework/core/ResolvableType.java | 2 +-
 .../java/org/springframework/core/ResolvableTypeTests.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
index d976d99d5b00..6ba088cfd1e0 100644
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -1085,7 +1085,7 @@ public static ResolvableType forClassWithGenerics(Class<?> clazz, ResolvableType
 		Assert.notNull(clazz, "Class must not be null");
 		Assert.notNull(generics, "Generics array must not be null");
 		TypeVariable<?>[] variables = clazz.getTypeParameters();
-		Assert.isTrue(variables.length == generics.length, "Mismatched number of generics specified");
+		Assert.isTrue(variables.length == generics.length, () -> "Mismatched number of generics specified for " + clazz.toGenericString());
 
 		Type[] arguments = new Type[generics.length];
 		for (int i = 0; i < generics.length; i++) {
diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
index c153c883860c..71b17e0da025 100644
--- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
@@ -1221,9 +1221,10 @@ void classWithGenericsAs() throws Exception {
 
 	@Test
 	void forClassWithMismatchedGenerics() throws Exception {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				ResolvableType.forClassWithGenerics(Map.class, Integer.class))
-			.withMessageContaining("Mismatched number of generics specified");
+		assertThatIllegalArgumentException()
+			.isThrownBy(() -> ResolvableType.forClassWithGenerics(Map.class, Integer.class))
+			.withMessageContaining("Mismatched number of generics specified for")
+			.withMessageContaining("java.util.Map<K,V>");
 	}
 
 	@Test

From edabde8a11fbf8987787b3d4a8ab2408a889e79c Mon Sep 17 00:00:00 2001
From: waahhh <waahhh88@gmail.com>
Date: Sun, 9 Jan 2022 19:10:45 +0900
Subject: [PATCH 538/735] Fix syntax in WebFlux Validation example

Closes gh-27907
---
 src/docs/asciidoc/web/webflux.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc
index 1cc302102126..e3670f186c6f 100644
--- a/src/docs/asciidoc/web/webflux.adoc
+++ b/src/docs/asciidoc/web/webflux.adoc
@@ -3845,7 +3845,7 @@ as the following example shows:
 	public class WebConfig implements WebFluxConfigurer {
 
 		@Override
-		public Validator getValidator(); {
+		public Validator getValidator() {
 			// ...
 		}
 

From dca155e4381406fe43d7c02f137816cf09a3d501 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 10 Jan 2022 10:10:59 +0100
Subject: [PATCH 539/735] Reintroduce references to JBoss AS Javadoc

Closes gh-27860
---
 build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle b/build.gradle
index 743f3d228768..7aadbf35e41d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -371,6 +371,8 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
+			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://tiles.apache.org/tiles-request/apidocs/",
 			"https://tiles.apache.org/framework/apidocs/",
 			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",

From 4078b73cec8eb8baad10a7593b1c917b9c7b26d8 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Mon, 10 Jan 2022 10:54:04 +0100
Subject: [PATCH 540/735] NettyHeadersAdapter::putAll does not overwrite
 headers

NettyHeadersAdapter::putAll uses HttpHeaders::add, which does not
overwrite existing headers. putAll should use HttpHeaders::set instead,
just like NettyHeadersAdapter::put does.

Closes gh-27887
---
 .../http/server/reactive/NettyHeadersAdapter.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java
index 08ae3207f91b..92da6c4b1449 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/NettyHeadersAdapter.java
@@ -147,7 +147,7 @@ public List<String> remove(Object key) {
 
 	@Override
 	public void putAll(Map<? extends String, ? extends List<String>> map) {
-		map.forEach(this.headers::add);
+		map.forEach(this.headers::set);
 	}
 
 	@Override

From e24043ab90235cad636fd81d17f388adf76cbde0 Mon Sep 17 00:00:00 2001
From: kuanghc1 <kuanghc1@lenovo.com>
Date: Fri, 7 Jan 2022 10:07:47 +0800
Subject: [PATCH 541/735] Simplify HashMap declaration in test fixture

---
 .../aop/testfixture/advice/MethodCounter.java                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
index 384973bd9aa7..3cdba737e89f 100644
--- a/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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 @@
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Abstract superclass for counting advices etc.
@@ -31,7 +32,7 @@
 public class MethodCounter implements Serializable {
 
 	/** Method name --> count, does not understand overloading */
-	private HashMap<String, Integer> map = new HashMap<>();
+	private Map<String, Integer> map = new HashMap<>();
 
 	private int allCount;
 

From 2a80b64d405815d3b612d2fc844e7beffa713160 Mon Sep 17 00:00:00 2001
From: kuanghc1 <kuanghc1@lenovo.com>
Date: Mon, 10 Jan 2022 11:44:21 +0800
Subject: [PATCH 542/735] Add tests for StringUtils matchesCharacter() method

Closes gh-27909
---
 .../org/springframework/util/StringUtilsTests.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index 2b46f73a56aa..73c679ae960e 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -152,6 +152,14 @@ void trimTrailingCharacter() {
 		assertThat(StringUtils.trimTrailingCharacter(" a b  c ", ' ')).isEqualTo(" a b  c");
 	}
 
+	@Test
+	void matchesCharacter() {
+		assertThat(StringUtils.matchesCharacter(null, '/')).isFalse();
+		assertThat(StringUtils.matchesCharacter("/a", '/')).isFalse();
+		assertThat(StringUtils.matchesCharacter("a", '/')).isFalse();
+		assertThat(StringUtils.matchesCharacter("/", '/')).isTrue();
+	}
+
 	@Test
 	void startsWithIgnoreCase() {
 		String prefix = "fOo";

From df263d01b9518977aced32582b58c198694fbcc9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 10 Jan 2022 14:15:55 +0100
Subject: [PATCH 543/735] Use idiomatic AssertJ assertions for true, false, and
 null

---
 ...ansactionalAnnotationIntegrationTests.java |  4 +-
 .../beans/BeanWrapperEnumTests.java           |  6 +-
 .../DefaultListableBeanFactoryTests.java      |  8 +--
 .../PropertyResourceConfigurerTests.java      |  8 +--
 .../security/CallbacksSecurityTests.java      |  6 +-
 .../beans/factory/xml/FactoryMethodTests.java |  8 +--
 .../xml/UtilNamespaceHandlerTests.java        | 10 +--
 .../factory/xml/XmlBeanCollectionTests.java   |  4 +-
 .../xml/XmlListableBeanFactoryTests.java      |  4 +-
 .../cache/caffeine/CaffeineCacheTests.java    |  4 +-
 .../target/CommonsPool2TargetSourceTests.java |  4 +-
 .../factory/xml/XmlBeanFactoryTests.java      | 16 ++---
 ...PrimitiveBeanLookupAndAutowiringTests.java | 10 +--
 .../CachedExpressionEvaluatorTests.java       |  5 +-
 .../MethodBasedEvaluationContextTests.java    |  9 +--
 ...ertySourcesPlaceholderConfigurerTests.java |  4 +-
 .../FormattingConversionServiceTests.java     |  4 +-
 .../jndi/JndiLocatorDelegateTests.java        |  4 +-
 .../ExecutorBeanDefinitionParserTests.java    | 12 ++--
 .../validation/DataBinderTests.java           |  8 +--
 .../core/GenericTypeResolverTests.java        |  6 +-
 .../core/ReactiveAdapterRegistryTests.java    |  8 +--
 .../annotation/AnnotationAttributesTests.java |  6 +-
 .../DefaultConversionServiceTests.java        | 40 ++++++------
 .../GenericConversionServiceTests.java        |  4 +-
 .../core/env/PropertySourceTests.java         |  4 +-
 .../SystemEnvironmentPropertySourceTests.java | 62 +++++++++----------
 .../core/io/PathResourceTests.java            | 18 +++---
 .../core/type/AnnotationMetadataTests.java    |  4 +-
 .../util/PatternMatchUtilsTests.java          |  6 +-
 .../util/StringUtilsTests.java                | 32 +++++-----
 .../expression/spel/ExpressionStateTests.java |  8 +--
 .../expression/spel/IndexingTests.java        |  4 +-
 .../spel/SpelCompilationCoverageTests.java    | 39 ++++++------
 .../spel/standard/SpelCompilerTests.java      |  7 ++-
 .../AbstractJmsAnnotationDrivenTests.java     |  4 +-
 .../JmsListenerContainerFactoryTests.java     | 16 ++---
 .../jms/config/JmsNamespaceHandlerTests.java  | 24 +++----
 .../MethodJmsListenerEndpointTests.java       |  5 +-
 .../DefaultMessageListenerContainerTests.java | 10 +--
 .../JmsMessageEndpointManagerTests.java       | 14 ++---
 .../JmsMessageHeaderAccessorTests.java        |  4 +-
 .../MessageBrokerConfigurationTests.java      |  4 +-
 .../ExecutorSubscribableChannelTests.java     | 10 +--
 .../oxm/jaxb/Jaxb2MarshallerTests.java        | 18 +++---
 ...TestExecutionListenerIntegrationTests.java |  4 +-
 ...RegisterExtensionSpringExtensionTests.java |  4 +-
 .../junit/jupiter/SpringExtensionTests.java   |  4 +-
 .../test/util/ReflectionTestUtilsTests.java   | 10 +--
 .../htmlunit/HtmlUnitRequestBuilderTests.java | 12 ++--
 ...aTransactionManagerSerializationTests.java |  4 +-
 .../ServletWebRequestHttpMethodsTests.java    |  6 +-
 .../CommonsMultipartResolverTests.java        | 10 +--
 .../web/util/UriComponentsBuilderTests.java   |  6 +-
 .../reactive/config/CorsRegistryTests.java    |  4 +-
 .../condition/RequestMappingInfoTests.java    |  6 +-
 .../GlobalCorsConfigIntegrationTests.java     |  4 +-
 .../view/script/ScriptTemplateViewTests.java  |  9 +--
 ...tationDrivenBeanDefinitionParserTests.java |  5 +-
 .../web/servlet/config/MvcNamespaceTests.java |  7 ++-
 .../config/annotation/CorsRegistryTests.java  |  4 +-
 .../DelegatingWebMvcConfigurationTests.java   |  8 +--
 ...MvcConfigurationSupportExtensionTests.java |  5 +-
 .../i18n/CookieLocaleResolverTests.java       |  8 +--
 .../mvc/method/RequestMappingInfoTests.java   |  6 +-
 ...ExtendedServletRequestDataBinderTests.java |  4 +-
 ...lAndViewMethodReturnValueHandlerTests.java |  4 +-
 .../RequestMappingHandlerAdapterTests.java    |  4 +-
 .../json/MappingJackson2JsonViewTests.java    |  4 +-
 .../view/script/ScriptTemplateViewTests.java  |  9 +--
 .../view/xml/MappingJackson2XmlViewTests.java |  4 +-
 .../view/xml/MarshallingViewTests.java        |  6 +-
 ...essageBrokerBeanDefinitionParserTests.java |  5 +-
 ...essageBrokerConfigurationSupportTests.java |  5 +-
 .../client/ClientSockJsSessionTests.java      | 12 ++--
 75 files changed, 345 insertions(+), 333 deletions(-)

diff --git a/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
index 16db4fc393a1..9062d6e3f615 100644
--- a/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
+++ b/integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -74,7 +74,7 @@ void succeedsWhenSubclassProxyAndScheduledMethodNotPresentOnInterface() throws I
 
 		MyRepository repository = ctx.getBean(MyRepository.class);
 		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
-		assertThat(AopUtils.isCglibProxy(repository)).isEqualTo(true);
+		assertThat(AopUtils.isCglibProxy(repository)).isTrue();
 		assertThat(repository.getInvocationCount()).isGreaterThan(0);
 		assertThat(txManager.commits).isGreaterThan(0);
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
index 3a5ac3717127..95bd30cfb846 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,7 @@ public void testCustomEnumWithNull() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("customEnum", null);
-		assertThat(gb.getCustomEnum()).isEqualTo(null);
+		assertThat(gb.getCustomEnum()).isNull();
 	}
 
 	@Test
@@ -54,7 +54,7 @@ public void testCustomEnumWithEmptyString() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("customEnum", "");
-		assertThat(gb.getCustomEnum()).isEqualTo(null);
+		assertThat(gb.getCustomEnum()).isNull();
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 8d6f823a7583..1617ccdf993f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -433,7 +433,7 @@ void nonStaticPrototypeFactoryMethodFoundByNonEagerTypeMatching() {
 		assertThat(lbf.isTypeMatch("x1", Object.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", Object.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(null);
+		assertThat(lbf.getType("&x1")).isNull();
 		assertThat(TestBeanFactory.initialized).isFalse();
 
 		lbf.registerAlias("x1", "x2");
@@ -2622,8 +2622,8 @@ void initSecurityAwarePrototypeBean() {
 	void containsBeanReturnsTrueEvenForAbstractBeanDefinition() {
 		lbf.registerBeanDefinition("abs", BeanDefinitionBuilder
 				.rootBeanDefinition(TestBean.class).setAbstract(true).getBeanDefinition());
-		assertThat(lbf.containsBean("abs")).isEqualTo(true);
-		assertThat(lbf.containsBean("bogus")).isEqualTo(false);
+		assertThat(lbf.containsBean("abs")).isTrue();
+		assertThat(lbf.containsBean("bogus")).isFalse();
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
index 5dd76865de42..29ecb68699be 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,7 +111,7 @@ public void testPropertyOverrideConfigurer() {
 
 		assertThat(tb1.getAge()).isEqualTo(99);
 		assertThat(tb2.getAge()).isEqualTo(99);
-		assertThat(tb1.getName()).isEqualTo(null);
+		assertThat(tb1.getName()).isNull();
 		assertThat(tb2.getName()).isEqualTo("test");
 	}
 
@@ -310,7 +310,7 @@ public void testPropertyOverrideConfigurerWithIgnoreInvalidKeys() {
 		TestBean tb2 = (TestBean) factory.getBean("tb2");
 		assertThat(tb1.getAge()).isEqualTo(99);
 		assertThat(tb2.getAge()).isEqualTo(99);
-		assertThat(tb1.getName()).isEqualTo(null);
+		assertThat(tb1.getName()).isNull();
 		assertThat(tb2.getName()).isEqualTo("test");
 	}
 
@@ -423,7 +423,7 @@ private void doTestPropertyPlaceholderConfigurer(boolean parentChildSeparation)
 		TestBean inner1 = (TestBean) tb2.getSomeMap().get("key3");
 		TestBean inner2 = (TestBean) tb2.getSomeMap().get("mykey4");
 		assertThat(inner1.getAge()).isEqualTo(0);
-		assertThat(inner1.getName()).isEqualTo(null);
+		assertThat(inner1.getName()).isNull();
 		assertThat(inner1.getCountry()).isEqualTo(System.getProperty("os.name"));
 		assertThat(inner2.getAge()).isEqualTo(98);
 		assertThat(inner2.getName()).isEqualTo("namemyvarmyvar${");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
index 368e0b664725..a2bce0b763dd 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -449,7 +449,7 @@ public void testTrustedExecution() throws Exception {
 			public Object run() {
 				// sanity check
 				assertThat(getCurrentSubjectName()).isEqualTo("user1");
-				assertThat(NonPrivilegedBean.destroyed).isEqualTo(false);
+				assertThat(NonPrivilegedBean.destroyed).isFalse();
 
 				beanFactory.getBean("trusted-spring-callbacks");
 				beanFactory.getBean("trusted-custom-init-destroy");
@@ -465,7 +465,7 @@ public Object run() {
 				beanFactory.getBean("trusted-working-property-injection");
 
 				beanFactory.destroySingletons();
-				assertThat(NonPrivilegedBean.destroyed).isEqualTo(true);
+				assertThat(NonPrivilegedBean.destroyed).isTrue();
 				return null;
 			}
 		}, provider.getAccessControlContext());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
index d2f26ee0fe63..ced4e5098d8f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -100,17 +100,17 @@ public void testFactoryMethodsWithNullValue() {
 
 		FactoryMethods fm = (FactoryMethods) xbf.getBean("fullWithNull");
 		assertThat(fm.getNum()).isEqualTo(27);
-		assertThat(fm.getName()).isEqualTo(null);
+		assertThat(fm.getName()).isNull();
 		assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
 
 		fm = (FactoryMethods) xbf.getBean("fullWithGenericNull");
 		assertThat(fm.getNum()).isEqualTo(27);
-		assertThat(fm.getName()).isEqualTo(null);
+		assertThat(fm.getName()).isNull();
 		assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
 
 		fm = (FactoryMethods) xbf.getBean("fullWithNamedNull");
 		assertThat(fm.getNum()).isEqualTo(27);
-		assertThat(fm.getName()).isEqualTo(null);
+		assertThat(fm.getName()).isNull();
 		assertThat(fm.getTestBean().getName()).isEqualTo("Juergen");
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
index 2260a86c52e9..083d6f9de35e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -342,7 +342,7 @@ public void testNestedInConstructor() {
 	public void testLoadProperties() {
 		Properties props = (Properties) this.beanFactory.getBean("myProperties");
 		assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
-		assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo(null);
+		assertThat(props.get("foo2")).as("Incorrect property value").isNull();
 		Properties props2 = (Properties) this.beanFactory.getBean("myProperties");
 		assertThat(props == props2).isTrue();
 	}
@@ -351,17 +351,17 @@ public void testLoadProperties() {
 	public void testScopedProperties() {
 		Properties props = (Properties) this.beanFactory.getBean("myScopedProperties");
 		assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
-		assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo(null);
+		assertThat(props.get("foo2")).as("Incorrect property value").isNull();
 		Properties props2 = (Properties) this.beanFactory.getBean("myScopedProperties");
 		assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar");
-		assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo(null);
+		assertThat(props.get("foo2")).as("Incorrect property value").isNull();
 		assertThat(props != props2).isTrue();
 	}
 
 	@Test
 	public void testLocalProperties() {
 		Properties props = (Properties) this.beanFactory.getBean("myLocalProperties");
-		assertThat(props.get("foo")).as("Incorrect property value").isEqualTo(null);
+		assertThat(props.get("foo")).as("Incorrect property value").isNull();
 		assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("bar2");
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
index e44f0d9df7a0..b9c66fe39c84 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -283,7 +283,7 @@ public void testPopulatedSet() throws Exception {
 		Iterator it = hasMap.getSet().iterator();
 		assertThat(it.next()).isEqualTo("bar");
 		assertThat(it.next()).isEqualTo(jenny);
-		assertThat(it.next()).isEqualTo(null);
+		assertThat(it.next()).isNull();
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
index d48b55f2cb8d..4b5c005788da 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -181,7 +181,7 @@ public void autoAliasing() {
 		assertThat(beanNames.contains("aliasWithoutId3")).isFalse();
 
 		TestBean tb4 = (TestBean) getBeanFactory().getBean(TestBean.class.getName() + "#0");
-		assertThat(tb4.getName()).isEqualTo(null);
+		assertThat(tb4.getName()).isNull();
 
 		Map drs = getListableBeanFactory().getBeansOfType(DummyReferencer.class, false, false);
 		assertThat(drs.size()).isEqualTo(5);
diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
index 215720353304..7f760354d8b9 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -106,7 +106,7 @@ void testPutIfAbsentNullValue() {
 		Cache.ValueWrapper wrapper = cache.putIfAbsent(key, "anotherValue");
 		// A value is set but is 'null'
 		assertThat(wrapper).isNotNull();
-		assertThat(wrapper.get()).isEqualTo(null);
+		assertThat(wrapper.get()).isNull();
 		// not changed
 		assertThat(cache.get(key).get()).isEqualTo(value);
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
index 0cf766f253e9..6708435685c1 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -196,7 +196,7 @@ void testHitMaxSizeLoadedFromContext() throws Exception {
 	void testSetWhenExhaustedAction() {
 		CommonsPool2TargetSource targetSource = new CommonsPool2TargetSource();
 		targetSource.setBlockWhenExhausted(true);
-		assertThat(targetSource.isBlockWhenExhausted()).isEqualTo(true);
+		assertThat(targetSource.isBlockWhenExhausted()).isTrue();
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
index 6a9e9ede7473..13396f6628e2 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -876,7 +876,7 @@ void autowireByConstructor() {
 		// should have been autowired
 		assertThat(rod1.getSpouse1()).isEqualTo(kerry);
 		assertThat(rod1.getAge()).isEqualTo(0);
-		assertThat(rod1.getName()).isEqualTo(null);
+		assertThat(rod1.getName()).isNull();
 
 		ConstructorDependenciesBean rod2 = (ConstructorDependenciesBean) xbf.getBean("rod2");
 		TestBean kerry1 = (TestBean) xbf.getBean("kerry1");
@@ -885,7 +885,7 @@ void autowireByConstructor() {
 		assertThat(rod2.getSpouse1()).isEqualTo(kerry2);
 		assertThat(rod2.getSpouse2()).isEqualTo(kerry1);
 		assertThat(rod2.getAge()).isEqualTo(0);
-		assertThat(rod2.getName()).isEqualTo(null);
+		assertThat(rod2.getName()).isNull();
 
 		ConstructorDependenciesBean rod = (ConstructorDependenciesBean) xbf.getBean("rod3");
 		IndexedTestBean other = (IndexedTestBean) xbf.getBean("other");
@@ -894,7 +894,7 @@ void autowireByConstructor() {
 		assertThat(rod.getSpouse2()).isEqualTo(kerry);
 		assertThat(rod.getOther()).isEqualTo(other);
 		assertThat(rod.getAge()).isEqualTo(0);
-		assertThat(rod.getName()).isEqualTo(null);
+		assertThat(rod.getName()).isNull();
 
 		xbf.getBean("rod4", ConstructorDependenciesBean.class);
 		// should have been autowired
@@ -902,7 +902,7 @@ void autowireByConstructor() {
 		assertThat(rod.getSpouse2()).isEqualTo(kerry);
 		assertThat(rod.getOther()).isEqualTo(other);
 		assertThat(rod.getAge()).isEqualTo(0);
-		assertThat(rod.getName()).isEqualTo(null);
+		assertThat(rod.getName()).isNull();
 	}
 
 	@Test
@@ -929,7 +929,7 @@ void autowireByConstructorWithSimpleValues() {
 		assertThat(rod6.getSpouse2()).isEqualTo(kerry1);
 		assertThat(rod6.getOther()).isEqualTo(other);
 		assertThat(rod6.getAge()).isEqualTo(0);
-		assertThat(rod6.getName()).isEqualTo(null);
+		assertThat(rod6.getName()).isNull();
 
 		xbf.destroySingletons();
 		assertThat(rod6.destroyed).isTrue();
@@ -967,7 +967,7 @@ void constructorArgResolution() {
 		assertThat(rod9c.getAge()).isEqualTo(97);
 
 		ConstructorDependenciesBean rod10 = (ConstructorDependenciesBean) xbf.getBean("rod10");
-		assertThat(rod10.getName()).isEqualTo(null);
+		assertThat(rod10.getName()).isNull();
 
 		ConstructorDependenciesBean rod11 = (ConstructorDependenciesBean) xbf.getBean("rod11");
 		assertThat(rod11.getSpouse1()).isEqualTo(kerry2);
@@ -1331,7 +1331,7 @@ void replaceMethodOverrideWithSetterInjection() {
 
 		OverrideOneMethodSubclass ooms = (OverrideOneMethodSubclass) xbf.getBean("replaceVoidMethod");
 		DoSomethingReplacer dos = (DoSomethingReplacer) xbf.getBean("doSomethingReplacer");
-		assertThat(dos.lastArg).isEqualTo(null);
+		assertThat(dos.lastArg).isNull();
 		String s1 = "";
 		String s2 = "foo bar black sheep";
 		ooms.doSomething(s1);
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
index 31a2d7c631d7..a93a0437c4fb 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/PrimitiveBeanLookupAndAutowiringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class PrimitiveBeanLookupAndAutowiringTests {
 	public void primitiveLookupByName() {
 		ApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class);
 		boolean b = ctx.getBean("b", boolean.class);
-		assertThat(b).isEqualTo(true);
+		assertThat(b).isTrue();
 		int i = ctx.getBean("i", int.class);
 		assertThat(i).isEqualTo(42);
 	}
@@ -56,7 +56,7 @@ public void primitiveLookupByName() {
 	public void primitiveLookupByType() {
 		ApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class);
 		boolean b = ctx.getBean(boolean.class);
-		assertThat(b).isEqualTo(true);
+		assertThat(b).isTrue();
 		int i = ctx.getBean(int.class);
 		assertThat(i).isEqualTo(42);
 	}
@@ -65,7 +65,7 @@ public void primitiveLookupByType() {
 	public void primitiveAutowiredInjection() {
 		ApplicationContext ctx =
 				new AnnotationConfigApplicationContext(Config.class, AutowiredComponent.class);
-		assertThat(ctx.getBean(AutowiredComponent.class).b).isEqualTo(true);
+		assertThat(ctx.getBean(AutowiredComponent.class).b).isTrue();
 		assertThat(ctx.getBean(AutowiredComponent.class).i).isEqualTo(42);
 	}
 
@@ -73,7 +73,7 @@ public void primitiveAutowiredInjection() {
 	public void primitiveResourceInjection() {
 		ApplicationContext ctx =
 				new AnnotationConfigApplicationContext(Config.class, ResourceComponent.class);
-		assertThat(ctx.getBean(ResourceComponent.class).b).isEqualTo(true);
+		assertThat(ctx.getBean(ResourceComponent.class).b).isTrue();
 		assertThat(ctx.getBean(ResourceComponent.class).i).isEqualTo(42);
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java b/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java
index 1594137c0411..4069558efb0b 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,6 +27,7 @@
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -43,7 +44,7 @@ public void parseNewExpression() {
 		Method method = ReflectionUtils.findMethod(getClass(), "toString");
 		Expression expression = expressionEvaluator.getTestExpression("true", method, getClass());
 		hasParsedExpression("true");
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 		assertThat(expressionEvaluator.testCache.size()).as("Expression should be in cache").isEqualTo(1);
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/expression/MethodBasedEvaluationContextTests.java b/spring-context/src/test/java/org/springframework/context/expression/MethodBasedEvaluationContextTests.java
index de40c7dca4c3..f2f3b151de62 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/MethodBasedEvaluationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/MethodBasedEvaluationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 
 /**
  * Unit tests for {@link MethodBasedEvaluationContext}.
@@ -47,9 +48,9 @@ public void simpleArguments() {
 		assertThat(context.lookupVariable("p0")).isEqualTo("test");
 		assertThat(context.lookupVariable("foo")).isEqualTo("test");
 
-		assertThat(context.lookupVariable("a1")).isEqualTo(true);
-		assertThat(context.lookupVariable("p1")).isEqualTo(true);
-		assertThat(context.lookupVariable("flag")).isEqualTo(true);
+		assertThat(context.lookupVariable("a1")).asInstanceOf(BOOLEAN).isTrue();
+		assertThat(context.lookupVariable("p1")).asInstanceOf(BOOLEAN).isTrue();
+		assertThat(context.lookupVariable("flag")).asInstanceOf(BOOLEAN).isTrue();
 
 		assertThat(context.lookupVariable("a2")).isNull();
 		assertThat(context.lookupVariable("p2")).isNull();
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
index 8717dba116a5..bdb41244bdd5 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -345,7 +345,7 @@ public void multipleLocationsWithDefaultResolvedValue() throws Exception {
 					.addPropertyValue("jedi", "${jedi:false}")
 					.getBeanDefinition());
 		ppc.postProcessBeanFactory(bf);
-		assertThat(bf.getBean(TestBean.class).isJedi()).isEqualTo(true);
+		assertThat(bf.getBean(TestBean.class).isJedi()).isTrue();
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
index 8aff305f22fa..360e6a88921f 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -281,7 +281,7 @@ public void parseNullPrimitiveProperty() {
 	@Test
 	public void printNullDefault() {
 		assertThat(formattingService
-				.convert(null, TypeDescriptor.valueOf(Integer.class), TypeDescriptor.valueOf(String.class))).isEqualTo(null);
+				.convert(null, TypeDescriptor.valueOf(Integer.class), TypeDescriptor.valueOf(String.class))).isNull();
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
index c3601d3b1a26..700860e11d6d 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiLocatorDelegateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -42,7 +42,7 @@ public void isDefaultJndiEnvironmentAvailableFalse() throws Exception {
 		builderField.set(null, null);
 
 		try {
-			assertThat(JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable()).isEqualTo(false);
+			assertThat(JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable()).isFalse();
 		}
 		finally {
 			builderField.set(null, oldBuilder);
diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
index a52f768abdcb..8dbae46f7776 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public void defaultExecutor() throws Exception {
 		assertThat(getMaxPoolSize(executor)).isEqualTo(Integer.MAX_VALUE);
 		assertThat(getQueueCapacity(executor)).isEqualTo(Integer.MAX_VALUE);
 		assertThat(getKeepAliveSeconds(executor)).isEqualTo(60);
-		assertThat(getAllowCoreThreadTimeOut(executor)).isEqualTo(false);
+		assertThat(getAllowCoreThreadTimeOut(executor)).isFalse();
 
 		FutureTask<String> task = new FutureTask<>(new Callable<String>() {
 			@Override
@@ -96,7 +96,7 @@ public void rangeWithUnboundedQueue() {
 		assertThat(getCorePoolSize(executor)).isEqualTo(9);
 		assertThat(getMaxPoolSize(executor)).isEqualTo(9);
 		assertThat(getKeepAliveSeconds(executor)).isEqualTo(37);
-		assertThat(getAllowCoreThreadTimeOut(executor)).isEqualTo(true);
+		assertThat(getAllowCoreThreadTimeOut(executor)).isTrue();
 		assertThat(getQueueCapacity(executor)).isEqualTo(Integer.MAX_VALUE);
 	}
 
@@ -106,7 +106,7 @@ public void propertyPlaceholderWithSingleSize() {
 		assertThat(getCorePoolSize(executor)).isEqualTo(123);
 		assertThat(getMaxPoolSize(executor)).isEqualTo(123);
 		assertThat(getKeepAliveSeconds(executor)).isEqualTo(60);
-		assertThat(getAllowCoreThreadTimeOut(executor)).isEqualTo(false);
+		assertThat(getAllowCoreThreadTimeOut(executor)).isFalse();
 		assertThat(getQueueCapacity(executor)).isEqualTo(Integer.MAX_VALUE);
 	}
 
@@ -115,7 +115,7 @@ public void propertyPlaceholderWithRange() {
 		Object executor = this.context.getBean("propertyPlaceholderWithRange");
 		assertThat(getCorePoolSize(executor)).isEqualTo(5);
 		assertThat(getMaxPoolSize(executor)).isEqualTo(25);
-		assertThat(getAllowCoreThreadTimeOut(executor)).isEqualTo(false);
+		assertThat(getAllowCoreThreadTimeOut(executor)).isFalse();
 		assertThat(getQueueCapacity(executor)).isEqualTo(10);
 	}
 
@@ -124,7 +124,7 @@ public void propertyPlaceholderWithRangeAndCoreThreadTimeout() {
 		Object executor = this.context.getBean("propertyPlaceholderWithRangeAndCoreThreadTimeout");
 		assertThat(getCorePoolSize(executor)).isEqualTo(99);
 		assertThat(getMaxPoolSize(executor)).isEqualTo(99);
-		assertThat(getAllowCoreThreadTimeOut(executor)).isEqualTo(true);
+		assertThat(getAllowCoreThreadTimeOut(executor)).isTrue();
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
index a820d40a6a43..3d39e2ecd309 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -1242,7 +1242,7 @@ void testValidatorWithErrors() {
 		assertThat(errors.getFieldError("name").getCodes()[2]).isEqualTo("NOT_ROD.java.lang.String");
 		assertThat(errors.getFieldError("name").getCodes()[3]).isEqualTo("NOT_ROD");
 		assertThat((errors.getFieldErrors("name").get(0)).getField()).isEqualTo("name");
-		assertThat((errors.getFieldErrors("name").get(0)).getRejectedValue()).isEqualTo(null);
+		assertThat((errors.getFieldErrors("name").get(0)).getRejectedValue()).isNull();
 
 		assertThat(errors.hasFieldErrors("spouse.age")).isTrue();
 		assertThat(errors.getFieldErrorCount("spouse.age")).isEqualTo(1);
@@ -1314,7 +1314,7 @@ void testValidatorWithErrorsAndCodesPrefix() {
 		assertThat(errors.getFieldError("name").getCodes()[2]).isEqualTo("validation.NOT_ROD.java.lang.String");
 		assertThat(errors.getFieldError("name").getCodes()[3]).isEqualTo("validation.NOT_ROD");
 		assertThat((errors.getFieldErrors("name").get(0)).getField()).isEqualTo("name");
-		assertThat((errors.getFieldErrors("name").get(0)).getRejectedValue()).isEqualTo(null);
+		assertThat((errors.getFieldErrors("name").get(0)).getRejectedValue()).isNull();
 
 		assertThat(errors.hasFieldErrors("spouse.age")).isTrue();
 		assertThat(errors.getFieldErrorCount("spouse.age")).isEqualTo(1);
@@ -1339,7 +1339,7 @@ void testValidatorWithNestedObjectNull() {
 		assertThat(errors.getFieldErrorCount("spouse")).isEqualTo(1);
 		assertThat(errors.getFieldError("spouse").getCode()).isEqualTo("SPOUSE_NOT_AVAILABLE");
 		assertThat((errors.getFieldErrors("spouse").get(0)).getObjectName()).isEqualTo("tb");
-		assertThat((errors.getFieldErrors("spouse").get(0)).getRejectedValue()).isEqualTo(null);
+		assertThat((errors.getFieldErrors("spouse").get(0)).getRejectedValue()).isNull();
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
index 21e1d73cbe82..80eee82c8454 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,8 +71,8 @@ void nullIfNotResolvable() {
 	void methodReturnTypes() {
 		assertThat(resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "integer"), MyInterfaceType.class)).isEqualTo(Integer.class);
 		assertThat(resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "string"), MyInterfaceType.class)).isEqualTo(String.class);
-		assertThat(resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "raw"), MyInterfaceType.class)).isEqualTo(null);
-		assertThat(resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "object"), MyInterfaceType.class)).isEqualTo(null);
+		assertThat(resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "raw"), MyInterfaceType.class)).isNull();
+		assertThat(resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "object"), MyInterfaceType.class)).isNull();
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index 25269a4c40fa..35683ac0cbee 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -370,9 +370,9 @@ void defaultAdapterRegistrations() {
 
 		@Test
 		void deferred() {
-			assertThat(getAdapter(CompletableFuture.class).getDescriptor().isDeferred()).isEqualTo(false);
-			assertThat(getAdapter(Deferred.class).getDescriptor().isDeferred()).isEqualTo(true);
-			assertThat(getAdapter(kotlinx.coroutines.flow.Flow.class).getDescriptor().isDeferred()).isEqualTo(true);
+			assertThat(getAdapter(CompletableFuture.class).getDescriptor().isDeferred()).isFalse();
+			assertThat(getAdapter(Deferred.class).getDescriptor().isDeferred()).isTrue();
+			assertThat(getAdapter(kotlinx.coroutines.flow.Flow.class).getDescriptor().isDeferred()).isTrue();
 		}
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
index 4d99c42d9ed2..415e89b979bf 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,8 +60,8 @@ void typeSafeAttributeAccess() {
 
 		assertThat(attributes.getString("name")).isEqualTo("dave");
 		assertThat(attributes.getStringArray("names")).isEqualTo(new String[] {"dave", "frank", "hal"});
-		assertThat(attributes.getBoolean("bool1")).isEqualTo(true);
-		assertThat(attributes.getBoolean("bool2")).isEqualTo(false);
+		assertThat(attributes.getBoolean("bool1")).isTrue();
+		assertThat(attributes.getBoolean("bool2")).isFalse();
 		assertThat(attributes.<Color>getEnum("color")).isEqualTo(Color.RED);
 		assertThat(attributes.getClass("class").equals(Integer.class)).isTrue();
 		assertThat(attributes.getClassArray("classes")).isEqualTo(new Class<?>[] {Number.class, Short.class, Integer.class});
diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
index a538c8da76aa..058a72adf3bf 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -79,7 +79,7 @@ void stringToCharacter() {
 
 	@Test
 	void stringToCharacterEmptyString() {
-		assertThat(conversionService.convert("", Character.class)).isEqualTo(null);
+		assertThat(conversionService.convert("", Character.class)).isNull();
 	}
 
 	@Test
@@ -95,29 +95,29 @@ void characterToString() {
 
 	@Test
 	void stringToBooleanTrue() {
-		assertThat(conversionService.convert("true", Boolean.class)).isEqualTo(true);
-		assertThat(conversionService.convert("on", Boolean.class)).isEqualTo(true);
-		assertThat(conversionService.convert("yes", Boolean.class)).isEqualTo(true);
-		assertThat(conversionService.convert("1", Boolean.class)).isEqualTo(true);
-		assertThat(conversionService.convert("TRUE", Boolean.class)).isEqualTo(true);
-		assertThat(conversionService.convert("ON", Boolean.class)).isEqualTo(true);
-		assertThat(conversionService.convert("YES", Boolean.class)).isEqualTo(true);
+		assertThat(conversionService.convert("true", Boolean.class)).isTrue();
+		assertThat(conversionService.convert("on", Boolean.class)).isTrue();
+		assertThat(conversionService.convert("yes", Boolean.class)).isTrue();
+		assertThat(conversionService.convert("1", Boolean.class)).isTrue();
+		assertThat(conversionService.convert("TRUE", Boolean.class)).isTrue();
+		assertThat(conversionService.convert("ON", Boolean.class)).isTrue();
+		assertThat(conversionService.convert("YES", Boolean.class)).isTrue();
 	}
 
 	@Test
 	void stringToBooleanFalse() {
-		assertThat(conversionService.convert("false", Boolean.class)).isEqualTo(false);
-		assertThat(conversionService.convert("off", Boolean.class)).isEqualTo(false);
-		assertThat(conversionService.convert("no", Boolean.class)).isEqualTo(false);
-		assertThat(conversionService.convert("0", Boolean.class)).isEqualTo(false);
-		assertThat(conversionService.convert("FALSE", Boolean.class)).isEqualTo(false);
-		assertThat(conversionService.convert("OFF", Boolean.class)).isEqualTo(false);
-		assertThat(conversionService.convert("NO", Boolean.class)).isEqualTo(false);
+		assertThat(conversionService.convert("false", Boolean.class)).isFalse();
+		assertThat(conversionService.convert("off", Boolean.class)).isFalse();
+		assertThat(conversionService.convert("no", Boolean.class)).isFalse();
+		assertThat(conversionService.convert("0", Boolean.class)).isFalse();
+		assertThat(conversionService.convert("FALSE", Boolean.class)).isFalse();
+		assertThat(conversionService.convert("OFF", Boolean.class)).isFalse();
+		assertThat(conversionService.convert("NO", Boolean.class)).isFalse();
 	}
 
 	@Test
 	void stringToBooleanEmptyString() {
-		assertThat(conversionService.convert("", Boolean.class)).isEqualTo(null);
+		assertThat(conversionService.convert("", Boolean.class)).isNull();
 	}
 
 	@Test
@@ -219,7 +219,7 @@ void stringToNumber() {
 
 	@Test
 	void stringToNumberEmptyString() {
-		assertThat(conversionService.convert("", Number.class)).isEqualTo(null);
+		assertThat(conversionService.convert("", Number.class)).isNull();
 	}
 
 	@Test
@@ -234,7 +234,7 @@ void stringToEnumWithSubclass() {
 
 	@Test
 	void stringToEnumEmptyString() {
-		assertThat(conversionService.convert("", Foo.class)).isEqualTo(null);
+		assertThat(conversionService.convert("", Foo.class)).isNull();
 	}
 
 	@Test
@@ -254,7 +254,7 @@ void integerToEnumWithSubclass() {
 
 	@Test
 	void integerToEnumNull() {
-		assertThat(conversionService.convert(null, Foo.class)).isEqualTo(null);
+		assertThat(conversionService.convert(null, Foo.class)).isNull();
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
index 304dcb15374b..1dbc0a23a2f4 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -109,7 +109,7 @@ void convert() {
 
 	@Test
 	void convertNullSource() {
-		assertThat(conversionService.convert(null, Integer.class)).isEqualTo(null);
+		assertThat(conversionService.convert(null, Integer.class)).isNull();
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
index 1a7bed2d053a..11f90d5b8cf5 100644
--- a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -79,7 +79,7 @@ void collectionsOperations() {
 		PropertySource<?> ps1 = new MapPropertySource("ps1", map1);
 		ps1.getSource();
 		List<PropertySource<?>> propertySources = new ArrayList<>();
-		assertThat(propertySources.add(ps1)).isEqualTo(true);
+		assertThat(propertySources.add(ps1)).isTrue();
 		assertThat(propertySources.contains(ps1)).isTrue();
 		assertThat(propertySources.contains(PropertySource.named("ps1"))).isTrue();
 
diff --git a/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
index daca3a701318..5dac076f21c1 100644
--- a/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -50,7 +50,7 @@ void setUp() {
 
 	@Test
 	void none() {
-		assertThat(ps.containsProperty("a.key")).isEqualTo(false);
+		assertThat(ps.containsProperty("a.key")).isFalse();
 		assertThat(ps.getProperty("a.key")).isNull();
 	}
 
@@ -58,7 +58,7 @@ void none() {
 	void normalWithoutPeriod() {
 		envMap.put("akey", "avalue");
 
-		assertThat(ps.containsProperty("akey")).isEqualTo(true);
+		assertThat(ps.containsProperty("akey")).isTrue();
 		assertThat(ps.getProperty("akey")).isEqualTo("avalue");
 	}
 
@@ -66,7 +66,7 @@ void normalWithoutPeriod() {
 	void normalWithPeriod() {
 		envMap.put("a.key", "a.value");
 
-		assertThat(ps.containsProperty("a.key")).isEqualTo(true);
+		assertThat(ps.containsProperty("a.key")).isTrue();
 		assertThat(ps.getProperty("a.key")).isEqualTo("a.value");
 	}
 
@@ -74,8 +74,8 @@ void normalWithPeriod() {
 	void withUnderscore() {
 		envMap.put("a_key", "a_value");
 
-		assertThat(ps.containsProperty("a_key")).isEqualTo(true);
-		assertThat(ps.containsProperty("a.key")).isEqualTo(true);
+		assertThat(ps.containsProperty("a_key")).isTrue();
+		assertThat(ps.containsProperty("a.key")).isTrue();
 
 		assertThat(ps.getProperty("a_key")).isEqualTo("a_value");
 		assertThat( ps.getProperty("a.key")).isEqualTo("a_value");
@@ -97,30 +97,30 @@ void withUppercase() {
 		envMap.put("A_DOT.KEY", "a_dot_value");
 		envMap.put("A_HYPHEN-KEY", "a_hyphen_value");
 
-		assertThat(ps.containsProperty("A_KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("a_key")).isEqualTo(true);
-		assertThat(ps.containsProperty("a.key")).isEqualTo(true);
-		assertThat(ps.containsProperty("a-key")).isEqualTo(true);
-		assertThat(ps.containsProperty("A_LONG_KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A.LONG.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A-LONG-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A.LONG-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A-LONG.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A_long_KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A.long.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A-long-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A.long-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A-long.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A_DOT.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A-DOT.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A_dot.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A-dot.KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A_HYPHEN-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A.HYPHEN-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A_hyphen-KEY")).isEqualTo(true);
-		assertThat(ps.containsProperty("A.hyphen-KEY")).isEqualTo(true);
+		assertThat(ps.containsProperty("A_KEY")).isTrue();
+		assertThat(ps.containsProperty("A.KEY")).isTrue();
+		assertThat(ps.containsProperty("A-KEY")).isTrue();
+		assertThat(ps.containsProperty("a_key")).isTrue();
+		assertThat(ps.containsProperty("a.key")).isTrue();
+		assertThat(ps.containsProperty("a-key")).isTrue();
+		assertThat(ps.containsProperty("A_LONG_KEY")).isTrue();
+		assertThat(ps.containsProperty("A.LONG.KEY")).isTrue();
+		assertThat(ps.containsProperty("A-LONG-KEY")).isTrue();
+		assertThat(ps.containsProperty("A.LONG-KEY")).isTrue();
+		assertThat(ps.containsProperty("A-LONG.KEY")).isTrue();
+		assertThat(ps.containsProperty("A_long_KEY")).isTrue();
+		assertThat(ps.containsProperty("A.long.KEY")).isTrue();
+		assertThat(ps.containsProperty("A-long-KEY")).isTrue();
+		assertThat(ps.containsProperty("A.long-KEY")).isTrue();
+		assertThat(ps.containsProperty("A-long.KEY")).isTrue();
+		assertThat(ps.containsProperty("A_DOT.KEY")).isTrue();
+		assertThat(ps.containsProperty("A-DOT.KEY")).isTrue();
+		assertThat(ps.containsProperty("A_dot.KEY")).isTrue();
+		assertThat(ps.containsProperty("A-dot.KEY")).isTrue();
+		assertThat(ps.containsProperty("A_HYPHEN-KEY")).isTrue();
+		assertThat(ps.containsProperty("A.HYPHEN-KEY")).isTrue();
+		assertThat(ps.containsProperty("A_hyphen-KEY")).isTrue();
+		assertThat(ps.containsProperty("A.hyphen-KEY")).isTrue();
 
 		assertThat(ps.getProperty("A_KEY")).isEqualTo("a_value");
 		assertThat(ps.getProperty("A.KEY")).isEqualTo("a_value");
@@ -170,7 +170,7 @@ protected boolean isSecurityManagerPresent() {
 			}
 		};
 
-		assertThat(ps.containsProperty("A_KEY")).isEqualTo(true);
+		assertThat(ps.containsProperty("A_KEY")).isTrue();
 		assertThat(ps.getProperty("A_KEY")).isEqualTo("a_value");
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java
index 59761c1d628d..be5e54e7e970 100644
--- a/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -124,37 +124,37 @@ void getPathForDir() {
 	@Test
 	void fileExists() {
 		PathResource resource = new PathResource(TEST_FILE);
-		assertThat(resource.exists()).isEqualTo(true);
+		assertThat(resource.exists()).isTrue();
 	}
 
 	@Test
 	void dirExists() {
 		PathResource resource = new PathResource(TEST_DIR);
-		assertThat(resource.exists()).isEqualTo(true);
+		assertThat(resource.exists()).isTrue();
 	}
 
 	@Test
 	void fileDoesNotExist() {
 		PathResource resource = new PathResource(NON_EXISTING_FILE);
-		assertThat(resource.exists()).isEqualTo(false);
+		assertThat(resource.exists()).isFalse();
 	}
 
 	@Test
 	void fileIsReadable() {
 		PathResource resource = new PathResource(TEST_FILE);
-		assertThat(resource.isReadable()).isEqualTo(true);
+		assertThat(resource.isReadable()).isTrue();
 	}
 
 	@Test
 	void doesNotExistIsNotReadable() {
 		PathResource resource = new PathResource(NON_EXISTING_FILE);
-		assertThat(resource.isReadable()).isEqualTo(false);
+		assertThat(resource.isReadable()).isFalse();
 	}
 
 	@Test
 	void directoryIsNotReadable() {
 		PathResource resource = new PathResource(TEST_DIR);
-		assertThat(resource.isReadable()).isEqualTo(false);
+		assertThat(resource.isReadable()).isFalse();
 	}
 
 	@Test
@@ -256,13 +256,13 @@ void description() {
 	@Test
 	void fileIsWritable() {
 		PathResource resource = new PathResource(TEST_FILE);
-		assertThat(resource.isWritable()).isEqualTo(true);
+		assertThat(resource.isWritable()).isTrue();
 	}
 
 	@Test
 	void directoryIsNotWritable() {
 		PathResource resource = new PathResource(TEST_DIR);
-		assertThat(resource.isWritable()).isEqualTo(false);
+		assertThat(resource.isWritable()).isFalse();
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
index f1342883bca0..b52d23405343 100644
--- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
+++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -115,7 +115,7 @@ private void doTestSubClassAnnotationInfo(AnnotationMetadata metadata, boolean a
 		assertThat(metadata.getAnnotationAttributes(MetaAnnotation.class.getName(), false)).isNull();
 		assertThat(metadata.getAnnotationAttributes(MetaAnnotation.class.getName(), true)).isNull();
 		assertThat(metadata.getAnnotatedMethods(DirectAnnotation.class.getName()).size()).isEqualTo(0);
-		assertThat(metadata.isAnnotated(IsAnnotatedAnnotation.class.getName())).isEqualTo(false);
+		assertThat(metadata.isAnnotated(IsAnnotatedAnnotation.class.getName())).isFalse();
 		assertThat(metadata.getAllAnnotationAttributes(DirectAnnotation.class.getName())).isNull();
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java b/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
index 7a42db56fe28..a96f21b0d3f1 100644
--- a/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,8 +28,8 @@ class PatternMatchUtilsTests {
 
 	@Test
 	void trivial() {
-		assertThat(PatternMatchUtils.simpleMatch((String) null, "")).isEqualTo(false);
-		assertThat(PatternMatchUtils.simpleMatch("1", null)).isEqualTo(false);
+		assertThat(PatternMatchUtils.simpleMatch((String) null, "")).isFalse();
+		assertThat(PatternMatchUtils.simpleMatch("1", null)).isFalse();
 		doTest("*", "123", true);
 		doTest("123", "123", true);
 	}
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index 73c679ae960e..eaa318b59e9a 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -37,18 +37,18 @@ class StringUtilsTests {
 	@Test
 	void hasTextBlank() {
 		String blank = "          ";
-		assertThat(StringUtils.hasText(blank)).isEqualTo(false);
+		assertThat(StringUtils.hasText(blank)).isFalse();
 	}
 
 	@Test
 	void hasTextNullEmpty() {
-		assertThat(StringUtils.hasText(null)).isEqualTo(false);
-		assertThat(StringUtils.hasText("")).isEqualTo(false);
+		assertThat(StringUtils.hasText(null)).isFalse();
+		assertThat(StringUtils.hasText("")).isFalse();
 	}
 
 	@Test
 	void hasTextValid() {
-		assertThat(StringUtils.hasText("t")).isEqualTo(true);
+		assertThat(StringUtils.hasText("t")).isTrue();
 	}
 
 	@Test
@@ -68,7 +68,7 @@ void containsWhitespace() {
 
 	@Test
 	void trimWhitespace() {
-		assertThat(StringUtils.trimWhitespace(null)).isEqualTo(null);
+		assertThat(StringUtils.trimWhitespace(null)).isNull();
 		assertThat(StringUtils.trimWhitespace("")).isEqualTo("");
 		assertThat(StringUtils.trimWhitespace(" ")).isEqualTo("");
 		assertThat(StringUtils.trimWhitespace("\t")).isEqualTo("");
@@ -83,7 +83,7 @@ void trimWhitespace() {
 
 	@Test
 	void trimAllWhitespace() {
-		assertThat(StringUtils.trimAllWhitespace(null)).isEqualTo(null);
+		assertThat(StringUtils.trimAllWhitespace(null)).isNull();
 		assertThat(StringUtils.trimAllWhitespace("")).isEqualTo("");
 		assertThat(StringUtils.trimAllWhitespace(" ")).isEqualTo("");
 		assertThat(StringUtils.trimAllWhitespace("\t")).isEqualTo("");
@@ -98,7 +98,7 @@ void trimAllWhitespace() {
 
 	@Test
 	void trimLeadingWhitespace() {
-		assertThat(StringUtils.trimLeadingWhitespace(null)).isEqualTo(null);
+		assertThat(StringUtils.trimLeadingWhitespace(null)).isNull();
 		assertThat(StringUtils.trimLeadingWhitespace("")).isEqualTo("");
 		assertThat(StringUtils.trimLeadingWhitespace(" ")).isEqualTo("");
 		assertThat(StringUtils.trimLeadingWhitespace("\t")).isEqualTo("");
@@ -113,7 +113,7 @@ void trimLeadingWhitespace() {
 
 	@Test
 	void trimTrailingWhitespace() {
-		assertThat(StringUtils.trimTrailingWhitespace(null)).isEqualTo(null);
+		assertThat(StringUtils.trimTrailingWhitespace(null)).isNull();
 		assertThat(StringUtils.trimTrailingWhitespace("")).isEqualTo("");
 		assertThat(StringUtils.trimTrailingWhitespace(" ")).isEqualTo("");
 		assertThat(StringUtils.trimTrailingWhitespace("\t")).isEqualTo("");
@@ -128,7 +128,7 @@ void trimTrailingWhitespace() {
 
 	@Test
 	void trimLeadingCharacter() {
-		assertThat(StringUtils.trimLeadingCharacter(null, ' ')).isEqualTo(null);
+		assertThat(StringUtils.trimLeadingCharacter(null, ' ')).isNull();
 		assertThat(StringUtils.trimLeadingCharacter("", ' ')).isEqualTo("");
 		assertThat(StringUtils.trimLeadingCharacter(" ", ' ')).isEqualTo("");
 		assertThat(StringUtils.trimLeadingCharacter("\t", ' ')).isEqualTo("\t");
@@ -141,7 +141,7 @@ void trimLeadingCharacter() {
 
 	@Test
 	void trimTrailingCharacter() {
-		assertThat(StringUtils.trimTrailingCharacter(null, ' ')).isEqualTo(null);
+		assertThat(StringUtils.trimTrailingCharacter(null, ' ')).isNull();
 		assertThat(StringUtils.trimTrailingCharacter("", ' ')).isEqualTo("");
 		assertThat(StringUtils.trimTrailingCharacter(" ", ' ')).isEqualTo("");
 		assertThat(StringUtils.trimTrailingCharacter("\t", ' ')).isEqualTo("\t");
@@ -340,7 +340,7 @@ void uncapitalize() {
 
 	@Test
 	void getFilename() {
-		assertThat(StringUtils.getFilename(null)).isEqualTo(null);
+		assertThat(StringUtils.getFilename(null)).isNull();
 		assertThat(StringUtils.getFilename("")).isEqualTo("");
 		assertThat(StringUtils.getFilename("myfile")).isEqualTo("myfile");
 		assertThat(StringUtils.getFilename("mypath/myfile")).isEqualTo("myfile");
@@ -352,11 +352,11 @@ void getFilename() {
 
 	@Test
 	void getFilenameExtension() {
-		assertThat(StringUtils.getFilenameExtension(null)).isEqualTo(null);
-		assertThat(StringUtils.getFilenameExtension("")).isEqualTo(null);
-		assertThat(StringUtils.getFilenameExtension("myfile")).isEqualTo(null);
-		assertThat(StringUtils.getFilenameExtension("myPath/myfile")).isEqualTo(null);
-		assertThat(StringUtils.getFilenameExtension("/home/user/.m2/settings/myfile")).isEqualTo(null);
+		assertThat(StringUtils.getFilenameExtension(null)).isNull();
+		assertThat(StringUtils.getFilenameExtension("")).isNull();
+		assertThat(StringUtils.getFilenameExtension("myfile")).isNull();
+		assertThat(StringUtils.getFilenameExtension("myPath/myfile")).isNull();
+		assertThat(StringUtils.getFilenameExtension("/home/user/.m2/settings/myfile")).isNull();
 		assertThat(StringUtils.getFilenameExtension("myfile.")).isEqualTo("");
 		assertThat(StringUtils.getFilenameExtension("myPath/myfile.")).isEqualTo("");
 		assertThat(StringUtils.getFilenameExtension("myfile.txt")).isEqualTo("txt");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
index a789b20560e6..bb318afa1f1d 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ public void testLocalVariables() {
 
 		state.setLocalVariable("foo", null);
 		value = state.lookupLocalVariable("foo");
-		assertThat(value).isEqualTo(null);
+		assertThat(value).isNull();
 	}
 
 	@Test
@@ -101,7 +101,7 @@ public void testNoVariableInterference() {
 	@Test
 	public void testLocalVariableNestedScopes() {
 		ExpressionState state = getState();
-		assertThat(state.lookupLocalVariable("foo")).isEqualTo(null);
+		assertThat(state.lookupLocalVariable("foo")).isNull();
 
 		state.setLocalVariable("foo",12);
 		assertThat(state.lookupLocalVariable("foo")).isEqualTo(12);
@@ -134,7 +134,7 @@ public void testRootContextObject() {
 
 
 		((StandardEvaluationContext) state.getEvaluationContext()).setRootObject(null);
-		assertThat(state.getRootContextObject().getValue()).isEqualTo(null);
+		assertThat(state.getRootContextObject().getValue()).isNull();
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
index 69bfa4fb4f4c..6afcf60d1f18 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -150,7 +150,7 @@ void setPropertyContainingMapAutoGrow() {
 		assertThat(expression.getValueTypeDescriptor(this).toString()).isEqualTo("java.util.Map<java.lang.Integer, java.lang.Integer>");
 		assertThat(expression.getValue(this)).isEqualTo(property);
 		expression = parser.parseExpression("parameterizedMap['9']");
-		assertThat(expression.getValue(this)).isEqualTo(null);
+		assertThat(expression.getValue(this)).isNull();
 		expression.setValue(this, "37");
 		assertThat(expression.getValue(this)).isEqualTo(37);
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
index 49fa8c182c44..60087a172958 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,6 +48,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.within;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 
 /**
  * Checks SpelCompiler behavior. This should cover compilation all compiled node types.
@@ -198,9 +199,9 @@ void typeReference() {
 	@Test
 	void operatorInstanceOf() {
 		expression = parse("'xyz' instanceof T(String)");
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 
 		expression = parse("'xyz' instanceof T(Integer)");
 		assertThat(expression.getValue()).isEqualTo(false);
@@ -209,21 +210,21 @@ void operatorInstanceOf() {
 
 		List<String> list = new ArrayList<>();
 		expression = parse("#root instanceof T(java.util.List)");
-		assertThat(expression.getValue(list)).isEqualTo(true);
+		assertThat(expression.getValue(list)).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue(list)).isEqualTo(true);
+		assertThat(expression.getValue(list)).asInstanceOf(BOOLEAN).isTrue();
 
 		List<String>[] arrayOfLists = new List[] {new ArrayList<String>()};
 		expression = parse("#root instanceof T(java.util.List[])");
-		assertThat(expression.getValue(arrayOfLists)).isEqualTo(true);
+		assertThat(expression.getValue(arrayOfLists)).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue(arrayOfLists)).isEqualTo(true);
+		assertThat(expression.getValue(arrayOfLists)).asInstanceOf(BOOLEAN).isTrue();
 
 		int[] intArray = new int[] {1,2,3};
 		expression = parse("#root instanceof T(int[])");
-		assertThat(expression.getValue(intArray)).isEqualTo(true);
+		assertThat(expression.getValue(intArray)).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue(intArray)).isEqualTo(true);
+		assertThat(expression.getValue(intArray)).asInstanceOf(BOOLEAN).isTrue();
 
 		String root = null;
 		expression = parse("#root instanceof T(Integer)");
@@ -239,18 +240,18 @@ void operatorInstanceOf() {
 
 		root = "howdy!";
 		expression = parse("#root instanceof T(java.lang.Object)");
-		assertThat(expression.getValue(root)).isEqualTo(true);
+		assertThat(expression.getValue(root)).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue(root)).isEqualTo(true);
+		assertThat(expression.getValue(root)).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 	@Test
 	void operatorInstanceOf_SPR14250() throws Exception {
 		// primitive left operand - should get boxed, return true
 		expression = parse("3 instanceof T(Integer)");
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 
 		// primitive left operand - should get boxed, return false
 		expression = parse("3 instanceof T(String)");
@@ -266,9 +267,9 @@ void operatorInstanceOf_SPR14250() throws Exception {
 
 		// double slot left operand - should get boxed, return true
 		expression = parse("3.0d instanceof T(Double)");
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 
 		// Only when the right hand operand is a direct type reference
 		// will it be compilable.
@@ -646,9 +647,9 @@ public void operatorNot() throws Exception {
 		assertThat(expression.getValue()).isEqualTo(false);
 
 		expression = parse("!false");
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue()).isEqualTo(true);
+		assertThat(expression.getValue()).asInstanceOf(BOOLEAN).isTrue();
 
 		boolean b = true;
 		expression = parse("!#root");
@@ -658,9 +659,9 @@ public void operatorNot() throws Exception {
 
 		b = false;
 		expression = parse("!#root");
-		assertThat(expression.getValue(b)).isEqualTo(true);
+		assertThat(expression.getValue(b)).asInstanceOf(BOOLEAN).isTrue();
 		assertCanCompile(expression);
-		assertThat(expression.getValue(b)).isEqualTo(true);
+		assertThat(expression.getValue(b)).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
index c230151d562f..5046f58189aa 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 
 /**
  * Tests for the {@link SpelCompiler}.
@@ -69,10 +70,10 @@ void defaultMethodInvocation() {
 		context.setVariable("user", new User());
 		expression = parser.parseExpression("#root.isEditable(#user)");
 		assertThat(SpelCompiler.compile(expression)).isFalse();
-		assertThat(expression.getValue(context)).isEqualTo(true);
+		assertThat(expression.getValue(context)).asInstanceOf(BOOLEAN).isTrue();
 		assertThat(SpelCompiler.compile(expression)).isTrue();
 		SpelCompilationCoverageTests.assertIsCompiled(expression);
-		assertThat(expression.getValue(context)).isEqualTo(true);
+		assertThat(expression.getValue(context)).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
index d0986f527dcd..0bd41eb7ee27 100644
--- a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -189,7 +189,7 @@ protected void testJmsListenerRepeatable(ApplicationContext context) {
 				simpleFactory.getListenerContainer("first").getEndpoint();
 		assertThat(first.getId()).isEqualTo("first");
 		assertThat(first.getDestination()).isEqualTo("myQueue");
-		assertThat(first.getConcurrency()).isEqualTo(null);
+		assertThat(first.getConcurrency()).isNull();
 
 		MethodJmsListenerEndpoint second = (MethodJmsListenerEndpoint)
 				simpleFactory.getListenerContainer("second").getEndpoint();
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
index 865a0edc08fe..30c054b57158 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -179,14 +179,14 @@ private void assertDefaultJmsConfig(AbstractMessageListenerContainer container)
 		assertThat(container.getConnectionFactory()).isEqualTo(this.connectionFactory);
 		assertThat(container.getDestinationResolver()).isEqualTo(this.destinationResolver);
 		assertThat(container.getMessageConverter()).isEqualTo(this.messageConverter);
-		assertThat(container.isSessionTransacted()).isEqualTo(true);
+		assertThat(container.isSessionTransacted()).isTrue();
 		assertThat(container.getSessionAcknowledgeMode()).isEqualTo(Session.DUPS_OK_ACKNOWLEDGE);
-		assertThat(container.isPubSubDomain()).isEqualTo(true);
-		assertThat(container.isReplyPubSubDomain()).isEqualTo(true);
+		assertThat(container.isPubSubDomain()).isTrue();
+		assertThat(container.isReplyPubSubDomain()).isTrue();
 		assertThat(container.getReplyQosSettings()).isEqualTo(new QosSettings(1, 7, 5000));
-		assertThat(container.isSubscriptionDurable()).isEqualTo(true);
+		assertThat(container.isSubscriptionDurable()).isTrue();
 		assertThat(container.getClientId()).isEqualTo("client-1234");
-		assertThat(container.isAutoStartup()).isEqualTo(false);
+		assertThat(container.isAutoStartup()).isFalse();
 	}
 
 	private void setDefaultJcaConfig(DefaultJcaListenerContainerFactory factory) {
@@ -206,9 +206,9 @@ private void assertDefaultJcaConfig(JmsMessageEndpointManager container) {
 		JmsActivationSpecConfig config = container.getActivationSpecConfig();
 		assertThat(config).isNotNull();
 		assertThat(config.getAcknowledgeMode()).isEqualTo(Session.DUPS_OK_ACKNOWLEDGE);
-		assertThat(config.isPubSubDomain()).isEqualTo(true);
+		assertThat(config.isPubSubDomain()).isTrue();
 		assertThat(container.getReplyQosSettings()).isEqualTo(new QosSettings(1, 7, 5000));
-		assertThat(config.isSubscriptionDurable()).isEqualTo(true);
+		assertThat(config.isSubscriptionDurable()).isTrue();
 		assertThat(config.getClientId()).isEqualTo("client-1234");
 	}
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
index 43b9a1a6ca58..3453a23ad375 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -145,8 +145,8 @@ public void testJmsContainerFactoryConfiguration() {
 		assertThat(container.getConnectionFactory()).as("explicit connection factory not set").isEqualTo(context.getBean(EXPLICIT_CONNECTION_FACTORY));
 		assertThat(container.getDestinationResolver()).as("explicit destination resolver not set").isEqualTo(context.getBean("testDestinationResolver"));
 		assertThat(container.getMessageConverter()).as("explicit message converter not set").isEqualTo(context.getBean("testMessageConverter"));
-		assertThat(container.isPubSubDomain()).as("Wrong pub/sub").isEqualTo(true);
-		assertThat(container.isSubscriptionDurable()).as("Wrong durable flag").isEqualTo(true);
+		assertThat(container.isPubSubDomain()).as("Wrong pub/sub").isTrue();
+		assertThat(container.isSubscriptionDurable()).as("Wrong durable flag").isTrue();
 		assertThat(container.getCacheLevel()).as("wrong cache").isEqualTo(DefaultMessageListenerContainer.CACHE_CONNECTION);
 		assertThat(container.getConcurrentConsumers()).as("wrong concurrency").isEqualTo(3);
 		assertThat(container.getMaxConcurrentConsumers()).as("wrong concurrency").isEqualTo(5);
@@ -166,7 +166,7 @@ public void testJcaContainerFactoryConfiguration() {
 				factory.createListenerContainer(createDummyEndpoint());
 		assertThat(container.getResourceAdapter()).as("explicit resource adapter not set").isEqualTo(context.getBean("testResourceAdapter"));
 		assertThat(container.getActivationSpecConfig().getMessageConverter()).as("explicit message converter not set").isEqualTo(context.getBean("testMessageConverter"));
-		assertThat(container.isPubSubDomain()).as("Wrong pub/sub").isEqualTo(true);
+		assertThat(container.isPubSubDomain()).as("Wrong pub/sub").isTrue();
 		assertThat(container.getActivationSpecConfig().getMaxConcurrency()).as("wrong concurrency").isEqualTo(5);
 		assertThat(container.getActivationSpecConfig().getPrefetchSize()).as("Wrong prefetch").isEqualTo(50);
 		assertThat(container.getPhase()).as("Wrong phase").isEqualTo(77);
@@ -248,20 +248,20 @@ public void testResponseDestination() {
 				.getBean("listener1", DefaultMessageListenerContainer.class);
 		DefaultMessageListenerContainer listener2 = this.context
 				.getBean("listener2", DefaultMessageListenerContainer.class);
-		assertThat(listener1.isPubSubDomain()).as("Wrong destination type on listener1").isEqualTo(true);
-		assertThat(listener2.isPubSubDomain()).as("Wrong destination type on listener2").isEqualTo(true);
-		assertThat(listener1.isReplyPubSubDomain()).as("Wrong response destination type on listener1").isEqualTo(false);
-		assertThat(listener2.isReplyPubSubDomain()).as("Wrong response destination type on listener2").isEqualTo(false);
+		assertThat(listener1.isPubSubDomain()).as("Wrong destination type on listener1").isTrue();
+		assertThat(listener2.isPubSubDomain()).as("Wrong destination type on listener2").isTrue();
+		assertThat(listener1.isReplyPubSubDomain()).as("Wrong response destination type on listener1").isFalse();
+		assertThat(listener2.isReplyPubSubDomain()).as("Wrong response destination type on listener2").isFalse();
 
 		// JCA
 		JmsMessageEndpointManager listener3 = this.context
 				.getBean("listener3", JmsMessageEndpointManager.class);
 		JmsMessageEndpointManager listener4 = this.context
 				.getBean("listener4", JmsMessageEndpointManager.class);
-		assertThat(listener3.isPubSubDomain()).as("Wrong destination type on listener3").isEqualTo(true);
-		assertThat(listener4.isPubSubDomain()).as("Wrong destination type on listener4").isEqualTo(true);
-		assertThat(listener3.isReplyPubSubDomain()).as("Wrong response destination type on listener3").isEqualTo(false);
-		assertThat(listener4.isReplyPubSubDomain()).as("Wrong response destination type on listener4").isEqualTo(false);
+		assertThat(listener3.isPubSubDomain()).as("Wrong destination type on listener3").isTrue();
+		assertThat(listener4.isPubSubDomain()).as("Wrong destination type on listener4").isTrue();
+		assertThat(listener3.isReplyPubSubDomain()).as("Wrong response destination type on listener3").isFalse();
+		assertThat(listener4.isReplyPubSubDomain()).as("Wrong response destination type on listener4").isFalse();
 	}
 
 	@Test
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
index 4e74d2dc4090..05de6e473e87 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -65,6 +65,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -570,7 +571,7 @@ public void resolveJmsMessageHeaderAccessor(JmsMessageHeaderAccessor headers) {
 			this.invocations.put("resolveJmsMessageHeaderAccessor", true);
 			assertThat(headers).as("MessageHeaders not injected").isNotNull();
 			assertThat(headers.getPriority()).as("Missing JMS message priority header").isEqualTo(Integer.valueOf(9));
-			assertThat(headers.getHeader("customBoolean")).as("Missing custom header").isEqualTo(true);
+			assertThat(headers.getHeader("customBoolean")).as("Missing custom header").asInstanceOf(BOOLEAN).isTrue();
 		}
 
 		public void resolveObjectPayload(MyBean bean) {
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
index 4a83e858a337..aea9053261f2 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/DefaultMessageListenerContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,11 +52,11 @@ public void applyBackOff() {
 		DefaultMessageListenerContainer container = createContainer(createFailingContainerFactory());
 		container.setBackOff(backOff);
 		container.start();
-		assertThat(container.isRunning()).isEqualTo(true);
+		assertThat(container.isRunning()).isTrue();
 
 		container.refreshConnectionUntilSuccessful();
 
-		assertThat(container.isRunning()).isEqualTo(false);
+		assertThat(container.isRunning()).isFalse();
 		verify(backOff).start();
 		verify(execution).nextBackOff();
 	}
@@ -73,7 +73,7 @@ public void applyBackOffRetry() {
 		container.start();
 		container.refreshConnectionUntilSuccessful();
 
-		assertThat(container.isRunning()).isEqualTo(false);
+		assertThat(container.isRunning()).isFalse();
 		verify(backOff).start();
 		verify(execution, times(2)).nextBackOff();
 	}
@@ -90,7 +90,7 @@ public void recoverResetBackOff() {
 		container.start();
 		container.refreshConnectionUntilSuccessful();
 
-		assertThat(container.isRunning()).isEqualTo(true);
+		assertThat(container.isRunning()).isTrue();
 		verify(backOff).start();
 		verify(execution, times(1)).nextBackOff();  // only on attempt as the second one lead to a recovery
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManagerTests.java
index 22239b5af92b..7b872388b10d 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManagerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,8 +34,8 @@ public void isPubSubDomainWithQueue() {
 		JmsActivationSpecConfig config = new JmsActivationSpecConfig();
 		config.setPubSubDomain(false);
 		endpoint.setActivationSpecConfig(config);
-		assertThat(endpoint.isPubSubDomain()).isEqualTo(false);
-		assertThat(endpoint.isReplyPubSubDomain()).isEqualTo(false);
+		assertThat(endpoint.isPubSubDomain()).isFalse();
+		assertThat(endpoint.isReplyPubSubDomain()).isFalse();
 	}
 
 	@Test
@@ -44,8 +44,8 @@ public void isPubSubDomainWithTopic() {
 		JmsActivationSpecConfig config = new JmsActivationSpecConfig();
 		config.setPubSubDomain(true);
 		endpoint.setActivationSpecConfig(config);
-		assertThat(endpoint.isPubSubDomain()).isEqualTo(true);
-		assertThat(endpoint.isReplyPubSubDomain()).isEqualTo(true);
+		assertThat(endpoint.isPubSubDomain()).isTrue();
+		assertThat(endpoint.isReplyPubSubDomain()).isTrue();
 	}
 
 	@Test
@@ -55,8 +55,8 @@ public void pubSubDomainCustomForReply() {
 		config.setPubSubDomain(true);
 		config.setReplyPubSubDomain(false);
 		endpoint.setActivationSpecConfig(config);
-		assertThat(endpoint.isPubSubDomain()).isEqualTo(true);
-		assertThat(endpoint.isReplyPubSubDomain()).isEqualTo(false);
+		assertThat(endpoint.isPubSubDomain()).isTrue();
+		assertThat(endpoint.isReplyPubSubDomain()).isFalse();
 	}
 
 	@Test
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java
index 2255f34ea5d7..2a0b17907a86 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -65,7 +65,7 @@ public void validateJmsHeaders() throws JMSException {
 		assertThat(headerAccessor.getMessageId()).isEqualTo("abcd-1234");
 		assertThat(headerAccessor.getPriority()).isEqualTo(Integer.valueOf(9));
 		assertThat(headerAccessor.getReplyTo()).isEqualTo(replyTo);
-		assertThat(headerAccessor.getRedelivered()).isEqualTo(true);
+		assertThat(headerAccessor.getRedelivered()).isTrue();
 		assertThat(headerAccessor.getType()).isEqualTo("type");
 		assertThat(headerAccessor.getTimestamp()).isEqualTo(4567);
 
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java
index ca454849a212..b31e95942bef 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -422,7 +422,7 @@ public void customPathMatcher() {
 
 		DefaultUserDestinationResolver resolver = context.getBean(DefaultUserDestinationResolver.class);
 		assertThat(resolver).isNotNull();
-		assertThat(resolver.isRemoveLeadingSlash()).isEqualTo(false);
+		assertThat(resolver.isRemoveLeadingSlash()).isFalse();
 	}
 
 	@Test
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java
index dd8bd71219bc..730769bc7cf5 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,8 +98,8 @@ public void sendWithExecutor() {
 
 	@Test
 	public void subscribeTwice()  {
-		assertThat(this.channel.subscribe(this.handler)).isEqualTo(true);
-		assertThat(this.channel.subscribe(this.handler)).isEqualTo(false);
+		assertThat(this.channel.subscribe(this.handler)).isTrue();
+		assertThat(this.channel.subscribe(this.handler)).isFalse();
 		this.channel.send(this.message);
 		verify(this.handler, times(1)).handleMessage(this.message);
 	}
@@ -107,8 +107,8 @@ public void subscribeTwice()  {
 	@Test
 	public void unsubscribeTwice()  {
 		this.channel.subscribe(this.handler);
-		assertThat(this.channel.unsubscribe(this.handler)).isEqualTo(true);
-		assertThat(this.channel.unsubscribe(this.handler)).isEqualTo(false);
+		assertThat(this.channel.unsubscribe(this.handler)).isTrue();
+		assertThat(this.channel.unsubscribe(this.handler)).isFalse();
 		this.channel.send(this.message);
 		verify(this.handler, never()).handleMessage(this.message);
 	}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
index a0e88fef2689..097064f9f69e 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -322,8 +322,8 @@ public javax.xml.bind.Unmarshaller createUnmarshaller() {
 		verify(unmarshaller).unmarshal(sourceCaptor.capture());
 
 		SAXSource result = sourceCaptor.getValue();
-		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isEqualTo(true);
-		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isEqualTo(false);
+		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isTrue();
+		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isFalse();
 
 		// 2. external-general-entities and dtd support enabled
 
@@ -335,8 +335,8 @@ public javax.xml.bind.Unmarshaller createUnmarshaller() {
 		verify(unmarshaller).unmarshal(sourceCaptor.capture());
 
 		result = sourceCaptor.getValue();
-		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isEqualTo(false);
-		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isEqualTo(true);
+		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isFalse();
+		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isTrue();
 	}
 
 	@Test  // SPR-10806
@@ -356,8 +356,8 @@ public javax.xml.bind.Unmarshaller createUnmarshaller() {
 		verify(unmarshaller).unmarshal(sourceCaptor.capture());
 
 		SAXSource result = sourceCaptor.getValue();
-		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isEqualTo(true);
-		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isEqualTo(false);
+		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isTrue();
+		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isFalse();
 
 		// 2. external-general-entities and dtd support enabled
 
@@ -369,8 +369,8 @@ public javax.xml.bind.Unmarshaller createUnmarshaller() {
 		verify(unmarshaller).unmarshal(sourceCaptor.capture());
 
 		result = sourceCaptor.getValue();
-		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isEqualTo(false);
-		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isEqualTo(true);
+		assertThat(result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl")).isFalse();
+		assertThat(result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities")).isTrue();
 	}
 
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java
index 7cba9a363509..12309c5e2610 100644
--- a/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/event/EventPublishingTestExecutionListenerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -149,7 +149,7 @@ public void beforeTestMethodAnnotationWithFailingAsyncEventListener() throws Exc
 
 		testContextManager.beforeTestMethod(testInstance, method);
 
-		assertThat(countDownLatch.await(2, TimeUnit.SECONDS)).isEqualTo(true);
+		assertThat(countDownLatch.await(2, TimeUnit.SECONDS)).isTrue();
 
 		verify(listener, only()).beforeTestMethod(testContext);
 		assertThat(TrackingAsyncUncaughtExceptionHandler.asyncException.getMessage())
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/RegisterExtensionSpringExtensionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/RegisterExtensionSpringExtensionTests.java
index ea9c627f8f58..7c3783db041e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/RegisterExtensionSpringExtensionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/RegisterExtensionSpringExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -175,7 +175,7 @@ void valueParameterFromPropertyPlaceholder(@Value("${enigma}") Integer enigmaPar
 	@Test
 	void valueParameterFromDefaultValueForPropertyPlaceholder(@Value("${bogus:false}") Boolean defaultValue) {
 		assertThat(defaultValue).as("Default value should have been injected via @Value by Spring").isNotNull();
-		assertThat(defaultValue).as("default value").isEqualTo(false);
+		assertThat(defaultValue).as("default value").isFalse();
 	}
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionTests.java
index 73e9acdd98fc..ee67fa14c9b6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -169,7 +169,7 @@ void valueParameterFromPropertyPlaceholder(@Value("${enigma}") Integer enigmaPar
 	@Test
 	void valueParameterFromDefaultValueForPropertyPlaceholder(@Value("${bogus:false}") Boolean defaultValue) {
 		assertThat(defaultValue).as("Default value should have been injected via @Value by Spring").isNotNull();
-		assertThat(defaultValue).as("default value").isEqualTo(false);
+		assertThat(defaultValue).as("default value").isFalse();
 	}
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
index cdc504961dbd..680ed0bf3737 100644
--- a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -155,7 +155,7 @@ private static void assertSetFieldAndGetFieldBehavior(Person person) {
 		assertThat(person.getName()).as("name (protected field)").isEqualTo("Tom");
 		assertThat(person.getAge()).as("age (private field)").isEqualTo(42);
 		assertThat(person.getEyeColor()).as("eye color (package private field)").isEqualTo("blue");
-		assertThat(person.likesPets()).as("'likes pets' flag (package private boolean field)").isEqualTo(true);
+		assertThat(person.likesPets()).as("'likes pets' flag (package private boolean field)").isTrue();
 		assertThat(person.getFavoriteNumber()).as("'favorite number' (package field)").isEqualTo(PI);
 	}
 
@@ -167,7 +167,7 @@ private static void assertSetFieldAndGetFieldBehaviorForProxy(Person proxy, Pers
 		assertThat(target.getName()).as("name (protected field)").isEqualTo("Tom");
 		assertThat(target.getAge()).as("age (private field)").isEqualTo(42);
 		assertThat(target.getEyeColor()).as("eye color (package private field)").isEqualTo("blue");
-		assertThat(target.likesPets()).as("'likes pets' flag (package private boolean field)").isEqualTo(true);
+		assertThat(target.likesPets()).as("'likes pets' flag (package private boolean field)").isTrue();
 		assertThat(target.getFavoriteNumber()).as("'favorite number' (package field)").isEqualTo(PI);
 	}
 
@@ -260,7 +260,7 @@ void invokeSetterMethodAndInvokeGetterMethodWithExplicitMethodNames() throws Exc
 		assertThat(person.getName()).as("name (private method)").isEqualTo("Jerry");
 		assertThat(person.getAge()).as("age (protected method)").isEqualTo(33);
 		assertThat(person.getEyeColor()).as("eye color (package private method)").isEqualTo("green");
-		assertThat(person.likesPets()).as("'likes pets' flag (protected method for a boolean)").isEqualTo(false);
+		assertThat(person.likesPets()).as("'likes pets' flag (protected method for a boolean)").isFalse();
 		assertThat(person.getFavoriteNumber()).as("'favorite number' (protected method for a Number)").isEqualTo(Integer.valueOf(42));
 
 		assertThat(invokeGetterMethod(person, "getId")).isEqualTo(Long.valueOf(1));
@@ -284,7 +284,7 @@ void invokeSetterMethodAndInvokeGetterMethodWithJavaBeanPropertyNames() throws E
 		assertThat(person.getName()).as("name (private method)").isEqualTo("Tom");
 		assertThat(person.getAge()).as("age (protected method)").isEqualTo(42);
 		assertThat(person.getEyeColor()).as("eye color (package private method)").isEqualTo("blue");
-		assertThat(person.likesPets()).as("'likes pets' flag (protected method for a boolean)").isEqualTo(true);
+		assertThat(person.likesPets()).as("'likes pets' flag (protected method for a boolean)").isTrue();
 		assertThat(person.getFavoriteNumber()).as("'favorite number' (protected method for a Number)").isEqualTo(PI);
 
 		assertThat(invokeGetterMethod(person, "id")).isEqualTo(Long.valueOf(99));
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index 96ebbb4ed529..5c5f5afdfaac 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -851,7 +851,7 @@ public void buildRequestSessionFalseWithExistingSession() throws Exception {
 	public void buildRequestSessionIsNew() throws Exception {
 		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
 
-		assertThat(actualRequest.getSession().isNew()).isEqualTo(true);
+		assertThat(actualRequest.getSession().isNew()).isTrue();
 	}
 
 	@Test
@@ -861,7 +861,7 @@ public void buildRequestSessionIsNewFalse() throws Exception {
 
 		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
 
-		assertThat(actualRequest.getSession().isNew()).isEqualTo(false);
+		assertThat(actualRequest.getSession().isNew()).isFalse();
 	}
 
 	@Test
@@ -873,7 +873,7 @@ public void buildRequestSessionInvalidate() throws Exception {
 		HttpSession sessionToRemove = actualRequest.getSession();
 		sessionToRemove.invalidate();
 
-		assertThat(sessions.containsKey(sessionToRemove.getId())).isEqualTo(false);
+		assertThat(sessions.containsKey(sessionToRemove.getId())).isFalse();
 		assertSingleSessionCookie("JSESSIONID=" + sessionToRemove.getId()
 				+ "; Expires=Thu, 01-Jan-1970 00:00:01 GMT; Path=/test; Domain=example.com");
 
@@ -882,8 +882,8 @@ public void buildRequestSessionInvalidate() throws Exception {
 
 		actualRequest = requestBuilder.buildRequest(servletContext);
 
-		assertThat(actualRequest.getSession().isNew()).isEqualTo(true);
-		assertThat(sessions.containsKey(sessionToRemove.getId())).isEqualTo(false);
+		assertThat(actualRequest.getSession().isNew()).isTrue();
+		assertThat(sessions.containsKey(sessionToRemove.getId())).isFalse();
 	}
 
 	// --- setContextPath
diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
index d5390e33cb0a..dccc388e454b 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -56,7 +56,7 @@ public void serializable() throws Exception {
 				.getUserTransaction() == ut2).as("UserTransaction looked up on client").isTrue();
 		assertThat(serializedJtatm
 				.getTransactionManager()).as("TransactionManager didn't survive").isNull();
-		assertThat(serializedJtatm.isRollbackOnCommitFailure()).isEqualTo(true);
+		assertThat(serializedJtatm.isRollbackOnCommitFailure()).isTrue();
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestHttpMethodsTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestHttpMethodsTests.java
index daac29918891..27a42f96f7b6 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestHttpMethodsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestHttpMethodsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -323,7 +323,7 @@ void checkNotModifiedTimestampConditionalPut(String method) {
 
 		assertThat(request.checkNotModified(oneMinuteAgo)).isFalse();
 		assertThat(servletResponse.getStatus()).isEqualTo(200);
-		assertThat(servletResponse.getHeader("Last-Modified")).isEqualTo(null);
+		assertThat(servletResponse.getHeader("Last-Modified")).isNull();
 	}
 
 	@ParameterizedHttpMethodTest
@@ -337,7 +337,7 @@ void checkNotModifiedTimestampConditionalPutConflict(String method) {
 
 		assertThat(request.checkNotModified(currentEpoch)).isTrue();
 		assertThat(servletResponse.getStatus()).isEqualTo(412);
-		assertThat(servletResponse.getHeader("Last-Modified")).isEqualTo(null);
+		assertThat(servletResponse.getHeader("Last-Modified")).isNull();
 	}
 
 	private void setUpRequest(String method) {
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
index e37bb54c025b..2bf081bb11c3 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -287,8 +287,8 @@ private void doTestBinding(MockCommonsMultipartResolver resolver, MockHttpServle
 			MultipartHttpServletRequest request) throws UnsupportedEncodingException {
 
 		MultipartTestBean1 mtb1 = new MultipartTestBean1();
-		assertThat(mtb1.getField1()).isEqualTo(null);
-		assertThat(mtb1.getField2()).isEqualTo(null);
+		assertThat(mtb1.getField1()).isNull();
+		assertThat(mtb1.getField2()).isNull();
 		ServletRequestDataBinder binder = new ServletRequestDataBinder(mtb1, "mybean");
 		binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
 		binder.bind(request);
@@ -301,8 +301,8 @@ private void doTestBinding(MockCommonsMultipartResolver resolver, MockHttpServle
 		assertThat(new String(mtb1.getField2())).isEqualTo(new String(file2.getBytes()));
 
 		MultipartTestBean2 mtb2 = new MultipartTestBean2();
-		assertThat(mtb2.getField1()).isEqualTo(null);
-		assertThat(mtb2.getField2()).isEqualTo(null);
+		assertThat(mtb2.getField1()).isNull();
+		assertThat(mtb2.getField2()).isNull();
 		binder = new ServletRequestDataBinder(mtb2, "mybean");
 		binder.registerCustomEditor(String.class, "field1", new StringMultipartFileEditor());
 		binder.registerCustomEditor(String.class, "field2", new StringMultipartFileEditor("UTF-16"));
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
index d6d971c4ed5a..2c2138d7ad27 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -1066,7 +1066,7 @@ void testDeepClone() {
 		assertThat(result1.getPath()).isEqualTo("/p1/%s/%s", vars.get("ps1"), vars.get("ps2"));
 		assertThat(result1.getQuery()).isEqualTo("q1");
 		assertThat(result1.getFragment()).isEqualTo("f1");
-		assertThat(result1.getSchemeSpecificPart()).isEqualTo(null);
+		assertThat(result1.getSchemeSpecificPart()).isNull();
 
 		UriComponents result2 = builder2.build();
 		assertThat(result2.getScheme()).isEqualTo("http");
@@ -1075,7 +1075,7 @@ void testDeepClone() {
 		assertThat(result2.getPath()).isEqualTo("/p1/%s/%s", vars.get("ps1"), vars.get("ps2"));
 		assertThat(result2.getQuery()).isEqualTo("q1");
 		assertThat(result2.getFragment()).isEqualTo("f1");
-		assertThat(result1.getSchemeSpecificPart()).isEqualTo(null);
+		assertThat(result1.getSchemeSpecificPart()).isNull();
 	}
 
 	@Test // gh-26466
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java
index a3f632a5e6ec..92cbe9a4f9a8 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ public void customizedMapping() {
 		assertThat(config.getAllowedMethods()).isEqualTo(Collections.singletonList("DELETE"));
 		assertThat(config.getAllowedHeaders()).isEqualTo(Arrays.asList("header1", "header2"));
 		assertThat(config.getExposedHeaders()).isEqualTo(Arrays.asList("header3", "header4"));
-		assertThat(config.getAllowCredentials()).isEqualTo(false);
+		assertThat(config.getAllowCredentials()).isFalse();
 		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(3600));
 	}
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java
index 79d34e2750e9..9e08ded149dd 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,8 +57,8 @@ public void createEmpty() {
 		PathPattern emptyPattern = (new PathPatternParser()).parse("");
 		assertThat(info.getPatternsCondition().getPatterns()).isEqualTo(Collections.singleton(emptyPattern));
 		assertThat(info.getMethodsCondition().getMethods().size()).isEqualTo(0);
-		assertThat(info.getConsumesCondition().isEmpty()).isEqualTo(true);
-		assertThat(info.getProducesCondition().isEmpty()).isEqualTo(true);
+		assertThat(info.getConsumesCondition().isEmpty()).isTrue();
+		assertThat(info.getProducesCondition().isEmpty()).isTrue();
 		assertThat(info.getParamsCondition()).isNotNull();
 		assertThat(info.getHeadersCondition()).isNotNull();
 		assertThat(info.getCustomCondition()).isNull();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java
index 9d8700850682..de3fb9d8b638 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -162,7 +162,7 @@ void preFlightRequestWithAmbiguousMapping(HttpServer httpServer) throws Exceptio
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getHeaders().getAccessControlAllowOrigin()).isEqualTo("*");
 		assertThat(entity.getHeaders().getAccessControlAllowMethods()).containsExactly(HttpMethod.GET, HttpMethod.POST);
-		assertThat(entity.getHeaders().getAccessControlAllowCredentials()).isEqualTo(false);
+		assertThat(entity.getHeaders().getAccessControlAllowCredentials()).isFalse();
 		assertThat(entity.getHeaders().get(HttpHeaders.VARY))
 				.containsExactly(HttpHeaders.ORIGIN, HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD,
 						HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS);
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java
index 6648d729432c..e583e4abbd2d 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
@@ -99,7 +100,7 @@ public void detectScriptTemplateConfigWithEngine() {
 		assertThat(accessor.getPropertyValue("renderObject")).isEqualTo("Template");
 		assertThat(accessor.getPropertyValue("renderFunction")).isEqualTo("render");
 		assertThat(accessor.getPropertyValue("defaultCharset")).isEqualTo(StandardCharsets.ISO_8859_1);
-		assertThat(accessor.getPropertyValue("sharedEngine")).isEqualTo(true);
+		assertThat(accessor.getPropertyValue("sharedEngine")).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 	@Test
@@ -222,7 +223,7 @@ public void engineSupplierWithSharedEngine() {
 		assertThat(engine2).isNotNull();
 		assertThat(accessor.getPropertyValue("renderObject")).isEqualTo("Template");
 		assertThat(accessor.getPropertyValue("renderFunction")).isEqualTo("render");
-		assertThat(accessor.getPropertyValue("sharedEngine")).isEqualTo(true);
+		assertThat(accessor.getPropertyValue("sharedEngine")).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -241,7 +242,7 @@ public void engineSupplierWithNonSharedEngine() {
 		assertThat(engine2).isNotNull();
 		assertThat(accessor.getPropertyValue("renderObject")).isEqualTo("Template");
 		assertThat(accessor.getPropertyValue("renderFunction")).isEqualTo("render");
-		assertThat(accessor.getPropertyValue("sharedEngine")).isEqualTo(false);
+		assertThat(accessor.getPropertyValue("sharedEngine")).asInstanceOf(BOOLEAN).isFalse();
 	}
 
 	private interface InvocableScriptEngine extends ScriptEngine, Invocable {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
index 4acfaf6cffb6..d76ee7bf8ae5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -50,6 +50,7 @@
 import org.springframework.web.util.UrlPathHelper;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 
 /**
  * Test fixture for the configuration in mvc-config-annotation-driven.xml.
@@ -73,7 +74,7 @@ public void testMessageCodesResolver() {
 				((ConfigurableWebBindingInitializer) initializer).getMessageCodesResolver();
 		assertThat(resolver).isNotNull();
 		assertThat(resolver.getClass()).isEqualTo(TestMessageCodesResolver.class);
-		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(false);
+		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).asInstanceOf(BOOLEAN).isFalse();
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
index 1a1c4fcff38f..2787bad0ecdb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -151,6 +151,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 
 /**
  * Tests loading actual MVC namespace configuration.
@@ -212,7 +213,7 @@ public void testDefaultConfig() throws Exception {
 
 		RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class);
 		assertThat(adapter).isNotNull();
-		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(false);
+		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).asInstanceOf(BOOLEAN).isFalse();
 
 		List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
 		assertThat(converters.size() > 0).isTrue();
@@ -327,7 +328,7 @@ private void doTestCustomValidator(String xml) throws Exception {
 
 		RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class);
 		assertThat(adapter).isNotNull();
-		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(true);
+		assertThat(new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect")).asInstanceOf(BOOLEAN).isTrue();
 
 		// default web binding initializer behavior test
 		MockHttpServletRequest request = new MockHttpServletRequest();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java
index 105496ec02c8..9b64d9c26df4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -65,7 +65,7 @@ public void customizedMapping() {
 		assertThat(config.getAllowedMethods()).isEqualTo(Collections.singletonList("DELETE"));
 		assertThat(config.getAllowedHeaders()).isEqualTo(Arrays.asList("header1", "header2"));
 		assertThat(config.getExposedHeaders()).isEqualTo(Arrays.asList("header3", "header4"));
-		assertThat(config.getAllowCredentials()).isEqualTo(false);
+		assertThat(config.getAllowCredentials()).isFalse();
 		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(3600));
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
index 5a5daeaadf37..9460e848ffe5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -245,9 +245,9 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 				webMvcConfig.mvcResourceUrlProvider());
 
 		assertThat(annotationsMapping).isNotNull();
-		assertThat(annotationsMapping.useRegisteredSuffixPatternMatch()).isEqualTo(true);
-		assertThat(annotationsMapping.useSuffixPatternMatch()).isEqualTo(true);
-		assertThat(annotationsMapping.useTrailingSlashMatch()).isEqualTo(false);
+		assertThat(annotationsMapping.useRegisteredSuffixPatternMatch()).isTrue();
+		assertThat(annotationsMapping.useSuffixPatternMatch()).isTrue();
+		assertThat(annotationsMapping.useTrailingSlashMatch()).isFalse();
 		configAssertion.accept(annotationsMapping.getUrlPathHelper(), annotationsMapping.getPathMatcher());
 
 		SimpleUrlHandlerMapping mapping = (SimpleUrlHandlerMapping) webMvcConfig.viewControllerHandlerMapping(
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
index 929cf231ea6a..bcc0fe568d91 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -89,6 +89,7 @@
 import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
 import static com.fasterxml.jackson.databind.MapperFeature.DEFAULT_VIEW_INCLUSION;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 import static org.mockito.Mockito.mock;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
 import static org.springframework.http.MediaType.APPLICATION_XML;
@@ -241,7 +242,7 @@ public void requestMappingHandlerAdapter() throws Exception {
 				(DeferredResultProcessingInterceptor[]) fieldAccessor.getPropertyValue("deferredResultInterceptors");
 		assertThat(deferredResultInterceptors.length).isEqualTo(1);
 
-		assertThat(fieldAccessor.getPropertyValue("ignoreDefaultModelOnRedirect")).isEqualTo(false);
+		assertThat(fieldAccessor.getPropertyValue("ignoreDefaultModelOnRedirect")).asInstanceOf(BOOLEAN).isFalse();
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
index 185ca9d3f695..4e522264fcab 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/CookieLocaleResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -158,7 +158,7 @@ public void testSetAndResolveLocale() {
 		Cookie cookie = response.getCookie(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
 		assertThat(cookie).isNotNull();
 		assertThat(cookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
-		assertThat(cookie.getDomain()).isEqualTo(null);
+		assertThat(cookie.getDomain()).isNull();
 		assertThat(cookie.getPath()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_PATH);
 		assertThat(cookie.getSecure()).isFalse();
 
@@ -244,7 +244,7 @@ public void testSetAndResolveLocaleWithCountry() {
 		Cookie cookie = response.getCookie(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
 		assertThat(cookie).isNotNull();
 		assertThat(cookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
-		assertThat(cookie.getDomain()).isEqualTo(null);
+		assertThat(cookie.getDomain()).isNull();
 		assertThat(cookie.getPath()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_PATH);
 		assertThat(cookie.getSecure()).isFalse();
 		assertThat(cookie.getValue()).isEqualTo("de-AT");
@@ -270,7 +270,7 @@ public void testSetAndResolveLocaleWithCountryAsLegacyJava() {
 		Cookie cookie = response.getCookie(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
 		assertThat(cookie).isNotNull();
 		assertThat(cookie.getName()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_NAME);
-		assertThat(cookie.getDomain()).isEqualTo(null);
+		assertThat(cookie.getDomain()).isNull();
 		assertThat(cookie.getPath()).isEqualTo(CookieLocaleResolver.DEFAULT_COOKIE_PATH);
 		assertThat(cookie.getSecure()).isFalse();
 		assertThat(cookie.getValue()).isEqualTo("de_AT");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
index 11a435d25d9c..985ed0456894 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -63,8 +63,8 @@ void createEmpty(RequestMappingInfo.Builder infoBuilder) {
 		assertThat(info.getMethodsCondition().getMethods().size()).isEqualTo(0);
 		assertThat(info.getParamsCondition()).isNotNull();
 		assertThat(info.getHeadersCondition()).isNotNull();
-		assertThat(info.getConsumesCondition().isEmpty()).isEqualTo(true);
-		assertThat(info.getProducesCondition().isEmpty()).isEqualTo(true);
+		assertThat(info.getConsumesCondition().isEmpty()).isTrue();
+		assertThat(info.getProducesCondition().isEmpty()).isTrue();
 		assertThat(info.getCustomCondition()).isNull();
 
 		RequestMappingInfo anotherInfo = infoBuilder.build();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
index 51ee2085843f..9371009aadc5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -82,7 +82,7 @@ public void noUriTemplateVars() throws Exception {
 		WebDataBinder binder = new ExtendedServletRequestDataBinder(target, "");
 		((ServletRequestDataBinder) binder).bind(request);
 
-		assertThat(target.getName()).isEqualTo(null);
+		assertThat(target.getName()).isNull();
 		assertThat(target.getAge()).isEqualTo(0);
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
index c6307a8dd137..906df78d0228 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -139,7 +139,7 @@ public void handleRedirectAttributesWithoutRedirect() throws Exception {
 		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
 
 		ModelMap model = mavContainer.getModel();
-		assertThat(mavContainer.getView()).isEqualTo(null);
+		assertThat(mavContainer.getView()).isNull();
 		assertThat(mavContainer.getModel().isEmpty()).isTrue();
 		assertThat(model).as("RedirectAttributes should not be used if controller doesn't redirect").isNotSameAs(redirectAttributes);
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
index 4ccdca2f66f9..32ecd653d704 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -247,7 +247,7 @@ public void modelAttributePackageNameAdvice() throws Exception {
 
 		assertThat(mav.getModel().get("attr1")).isEqualTo("lAttr1");
 		assertThat(mav.getModel().get("attr2")).isEqualTo("gAttr2");
-		assertThat(mav.getModel().get("attr3")).isEqualTo(null);
+		assertThat(mav.getModel().get("attr3")).isNull();
 	}
 
 	// SPR-10859
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
index d44dae46ac89..4860edbd045b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -76,7 +76,7 @@ public class MappingJackson2JsonViewTests {
 
 	@Test
 	public void isExposePathVars() {
-		assertThat(view.isExposePathVariables()).as("Must not expose path variables").isEqualTo(false);
+		assertThat(view.isExposePathVariables()).as("Must not expose path variables").isFalse();
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java
index 3e35cf26cb09..d546737cb80d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 import static org.junit.jupiter.api.condition.JRE.JAVA_15;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
@@ -113,7 +114,7 @@ public void detectScriptTemplateConfigWithEngine() {
 		assertThat(accessor.getPropertyValue("renderFunction")).isEqualTo("render");
 		assertThat(accessor.getPropertyValue("contentType")).isEqualTo(MediaType.TEXT_PLAIN_VALUE);
 		assertThat(accessor.getPropertyValue("charset")).isEqualTo(StandardCharsets.ISO_8859_1);
-		assertThat(accessor.getPropertyValue("sharedEngine")).isEqualTo(true);
+		assertThat(accessor.getPropertyValue("sharedEngine")).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 	@Test
@@ -301,7 +302,7 @@ public void engineSupplierWithSharedEngine() {
 		assertThat(engine2).isNotNull();
 		assertThat(accessor.getPropertyValue("renderObject")).isEqualTo("Template");
 		assertThat(accessor.getPropertyValue("renderFunction")).isEqualTo("render");
-		assertThat(accessor.getPropertyValue("sharedEngine")).isEqualTo(true);
+		assertThat(accessor.getPropertyValue("sharedEngine")).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 	@Test  // gh-23258
@@ -319,7 +320,7 @@ public void engineSupplierWithNonSharedEngine() {
 		assertThat(engine2).isNotNull();
 		assertThat(accessor.getPropertyValue("renderObject")).isEqualTo("Template");
 		assertThat(accessor.getPropertyValue("renderFunction")).isEqualTo("render");
-		assertThat(accessor.getPropertyValue("sharedEngine")).isEqualTo(false);
+		assertThat(accessor.getPropertyValue("sharedEngine")).asInstanceOf(BOOLEAN).isFalse();
 	}
 
 	private interface InvocableScriptEngine extends ScriptEngine, Invocable {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlViewTests.java
index 1ac1a7858616..797ff6379279 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public class MappingJackson2XmlViewTests {
 
 	@Test
 	public void isExposePathVars() {
-		assertThat(view.isExposePathVariables()).as("Must not expose path variables").isEqualTo(false);
+		assertThat(view.isExposePathVariables()).as("Must not expose path variables").isFalse();
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
index 8a03c1028ca7..73b28604b646 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,12 +66,12 @@ public void getContentType() {
 
 	@Test
 	public void isExposePathVars() {
-		assertThat(view.isExposePathVariables()).as("Must not expose path variables").isEqualTo(false);
+		assertThat(view.isExposePathVariables()).as("Must not expose path variables").isFalse();
 	}
 
 	@Test
 	public void isExposePathVarsDefaultConstructor() {
-		assertThat(new MarshallingView().isExposePathVariables()).as("Must not expose path variables").isEqualTo(false);
+		assertThat(new MarshallingView().isExposePathVariables()).as("Must not expose path variables").isFalse();
 	}
 
 	@Test
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
index fda305a34f54..fdaea640baea 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -91,6 +91,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 
 /**
  * Test fixture for {@link MessageBrokerBeanDefinitionParser}.
@@ -128,7 +129,7 @@ public void simpleBroker() throws Exception {
 
 		WebSocketSession session = new TestWebSocketSession("id");
 		wsHttpRequestHandler.getWebSocketHandler().afterConnectionEstablished(session);
-		assertThat(session.getAttributes().get("decorated")).isEqualTo(true);
+		assertThat(session.getAttributes().get("decorated")).asInstanceOf(BOOLEAN).isTrue();
 
 		WebSocketHandler wsHandler = wsHttpRequestHandler.getWebSocketHandler();
 		assertThat(wsHandler).isInstanceOf(ExceptionWebSocketHandlerDecorator.class);
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
index fe61f0b8ba12..c56ae0f5c539 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,7 @@
 import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.BOOLEAN;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -190,7 +191,7 @@ void webSocketHandlerDecorator() throws Exception {
 
 		WebSocketSession session = new TestWebSocketSession("id");
 		handler.afterConnectionEstablished(session);
-		assertThat(session.getAttributes().get("decorated")).isEqualTo(true);
+		assertThat(session.getAttributes().get("decorated")).asInstanceOf(BOOLEAN).isTrue();
 	}
 
 
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java
index e5095a6aa125..5968fb591ee1 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/ClientSockJsSessionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,7 +119,7 @@ public void handleFrameMessageWhenNotOpen() throws Exception {
 	public void handleFrameMessageWithBadData() throws Exception {
 		this.session.handleFrame(SockJsFrame.openFrame().getContent());
 		this.session.handleFrame("a['bad data");
-		assertThat(this.session.isOpen()).isEqualTo(false);
+		assertThat(this.session.isOpen()).isFalse();
 		assertThat(this.session.disconnectStatus).isEqualTo(CloseStatus.BAD_DATA);
 		verify(this.handler).afterConnectionEstablished(this.session);
 		verifyNoMoreInteractions(this.handler);
@@ -133,7 +133,7 @@ public void handleFrameMessageWithWebSocketHandlerException() throws Exception {
 		willThrow(new IllegalStateException("Fake error")).given(this.handler)
 				.handleMessage(this.session, new TextMessage("bar"));
 		this.session.handleFrame(SockJsFrame.messageFrame(CODEC, "foo", "bar").getContent());
-		assertThat(this.session.isOpen()).isEqualTo(true);
+		assertThat(this.session.isOpen()).isTrue();
 		verify(this.handler).afterConnectionEstablished(this.session);
 		verify(this.handler).handleMessage(this.session, new TextMessage("foo"));
 		verify(this.handler).handleMessage(this.session, new TextMessage("bar"));
@@ -144,7 +144,7 @@ public void handleFrameMessageWithWebSocketHandlerException() throws Exception {
 	public void handleFrameClose() throws Exception {
 		this.session.handleFrame(SockJsFrame.openFrame().getContent());
 		this.session.handleFrame(SockJsFrame.closeFrame(1007, "").getContent());
-		assertThat(this.session.isOpen()).isEqualTo(false);
+		assertThat(this.session.isOpen()).isFalse();
 		assertThat(this.session.disconnectStatus).isEqualTo(new CloseStatus(1007, ""));
 		verify(this.handler).afterConnectionEstablished(this.session);
 		verifyNoMoreInteractions(this.handler);
@@ -162,7 +162,7 @@ public void handleTransportError() throws Exception {
 	public void afterTransportClosed() throws Exception {
 		this.session.handleFrame(SockJsFrame.openFrame().getContent());
 		this.session.afterTransportClosed(CloseStatus.SERVER_ERROR);
-		assertThat(this.session.isOpen()).isEqualTo(false);
+		assertThat(this.session.isOpen()).isFalse();
 		verify(this.handler).afterConnectionEstablished(this.session);
 		verify(this.handler).afterConnectionClosed(this.session, CloseStatus.SERVER_ERROR);
 		verifyNoMoreInteractions(this.handler);
@@ -172,7 +172,7 @@ public void afterTransportClosed() throws Exception {
 	public void close() throws Exception {
 		this.session.handleFrame(SockJsFrame.openFrame().getContent());
 		this.session.close();
-		assertThat(this.session.isOpen()).isEqualTo(false);
+		assertThat(this.session.isOpen()).isFalse();
 		assertThat(this.session.disconnectStatus).isEqualTo(CloseStatus.NORMAL);
 		verify(this.handler).afterConnectionEstablished(this.session);
 		verifyNoMoreInteractions(this.handler);

From 368201975a0b9e65b051a71d0894783bcbc4c593 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Mon, 10 Jan 2022 16:07:14 +0000
Subject: [PATCH 544/735] Hide default SockJS TaskScheduler for
 @EnableWebSocket

Closes gh-27903
---
 .../WebSocketConfigurationSupport.java        | 70 ++++++++++++++-----
 1 file changed, 52 insertions(+), 18 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
index 7a2cb8981b78..3a6994cb7ee4 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.web.socket.config.annotation;
 
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.lang.Nullable;
 import org.springframework.scheduling.TaskScheduler;
@@ -35,16 +37,13 @@ public class WebSocketConfigurationSupport {
 	@Nullable
 	private ServletWebSocketHandlerRegistry handlerRegistry;
 
-	@Nullable
-	private TaskScheduler scheduler;
-
 
 	@Bean
-	public HandlerMapping webSocketHandlerMapping(@Nullable TaskScheduler defaultSockJsTaskScheduler) {
+	public HandlerMapping webSocketHandlerMapping(DefaultSockJsSchedulerContainer schedulerContainer) {
 		ServletWebSocketHandlerRegistry registry = initHandlerRegistry();
 		if (registry.requiresTaskScheduler()) {
-			TaskScheduler scheduler = defaultSockJsTaskScheduler;
-			Assert.notNull(scheduler, "Expected default TaskScheduler bean");
+			TaskScheduler scheduler = schedulerContainer.getScheduler();
+			Assert.notNull(scheduler, "TaskScheduler is required but not initialized");
 			registry.setTaskScheduler(scheduler);
 		}
 		return registry.getHandlerMapping();
@@ -62,8 +61,9 @@ protected void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
 	}
 
 	/**
-	 * The default TaskScheduler to use if none is registered explicitly via
-	 * {@link SockJsServiceRegistration#setTaskScheduler}:
+	 * A container of the default TaskScheduler to use if none was registered
+	 * explicitly via {@link SockJsServiceRegistration#setTaskScheduler} as
+	 * follows:
 	 * <pre class="code">
 	 * &#064;Configuration
 	 * &#064;EnableWebSocket
@@ -80,16 +80,50 @@ protected void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
 	 * </pre>
 	 */
 	@Bean
-	@Nullable
-	public TaskScheduler defaultSockJsTaskScheduler() {
-		if (initHandlerRegistry().requiresTaskScheduler()) {
-			ThreadPoolTaskScheduler threadPoolScheduler = new ThreadPoolTaskScheduler();
-			threadPoolScheduler.setThreadNamePrefix("SockJS-");
-			threadPoolScheduler.setPoolSize(Runtime.getRuntime().availableProcessors());
-			threadPoolScheduler.setRemoveOnCancelPolicy(true);
-			this.scheduler = threadPoolScheduler;
+	public DefaultSockJsSchedulerContainer defaultSockJsSchedulerContainer() {
+		return (initHandlerRegistry().requiresTaskScheduler() ?
+				new DefaultSockJsSchedulerContainer(initDefaultSockJsScheduler()) :
+				new DefaultSockJsSchedulerContainer(null));
+	}
+
+	private ThreadPoolTaskScheduler initDefaultSockJsScheduler() {
+		ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+		scheduler.setThreadNamePrefix("SockJS-");
+		scheduler.setPoolSize(Runtime.getRuntime().availableProcessors());
+		scheduler.setRemoveOnCancelPolicy(true);
+		return scheduler;
+	}
+
+
+	private static class DefaultSockJsSchedulerContainer implements InitializingBean, DisposableBean {
+
+		@Nullable
+		private final ThreadPoolTaskScheduler scheduler;
+
+		DefaultSockJsSchedulerContainer(@Nullable ThreadPoolTaskScheduler scheduler) {
+			this.scheduler = scheduler;
+		}
+
+		@Nullable
+		public ThreadPoolTaskScheduler getScheduler() {
+			return this.scheduler;
+		}
+
+		@Override
+		public void afterPropertiesSet() throws Exception {
+			if (this.scheduler != null) {
+				this.scheduler.afterPropertiesSet();
+			}
 		}
-		return this.scheduler;
+
+		@Override
+		public void destroy() throws Exception {
+			if (this.scheduler != null) {
+				this.scheduler.destroy();
+			}
+		}
+
 	}
 
+
 }

From a490723f02f61d450b4556965db1f328e0ab8306 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 11 Jan 2022 13:33:15 +0100
Subject: [PATCH 545/735] NettyHeadersAdapter::putAll does not overwrite
 headers

Similar to 4078b73cec8eb8baad10a7593b1c917b9c7b26d8, but for the
client-side NettyHeadersAdapter::putAll.

See gh-27887
---
 .../http/client/reactive/NettyHeadersAdapter.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java
index 382203b34b99..fc35a13fcd8e 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/NettyHeadersAdapter.java
@@ -147,7 +147,7 @@ public List<String> remove(Object key) {
 
 	@Override
 	public void putAll(Map<? extends String, ? extends List<String>> map) {
-		map.forEach(this.headers::add);
+		map.forEach(this.headers::set);
 	}
 
 	@Override

From 6ecb48832777c715c786885aecbb25beb7db6048 Mon Sep 17 00:00:00 2001
From: v_vyqyxiong <v_vyqyxiong@tencent.com>
Date: Tue, 28 Dec 2021 14:59:23 +0800
Subject: [PATCH 546/735] Remove unnecessary check in isBridgedCandidateFor()

In BridgeMethodResolver#isBridgedCandidateFor, candidateMethod is never
not bridged, so it's unnecessary to judge whether candidateMethod and
bridgeMethod are the same.

Closes gh-27862
---
 .../java/org/springframework/core/BridgeMethodResolver.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
index 7ea7e9cb6e93..4f85e324553f 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -98,7 +98,7 @@ public static Method findBridgedMethod(Method bridgeMethod) {
 	 * checks and can be used quickly filter for a set of possible matches.
 	 */
 	private static boolean isBridgedCandidateFor(Method candidateMethod, Method bridgeMethod) {
-		return (!candidateMethod.isBridge() && !candidateMethod.equals(bridgeMethod) &&
+		return (!candidateMethod.isBridge() &&
 				candidateMethod.getName().equals(bridgeMethod.getName()) &&
 				candidateMethod.getParameterCount() == bridgeMethod.getParameterCount());
 	}

From f2fe8a87fa9f1d9ec37841e34c025afe63755773 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 11 Jan 2022 14:11:07 +0100
Subject: [PATCH 547/735] Polish contribution

See gh-27862
---
 .../java/org/springframework/core/BridgeMethodResolver.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
index 4f85e324553f..c8d1ce5ebc82 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,9 +93,9 @@ public static Method findBridgedMethod(Method bridgeMethod) {
 
 	/**
 	 * Returns {@code true} if the supplied '{@code candidateMethod}' can be
-	 * consider a validate candidate for the {@link Method} that is {@link Method#isBridge() bridged}
+	 * considered a validate candidate for the {@link Method} that is {@link Method#isBridge() bridged}
 	 * by the supplied {@link Method bridge Method}. This method performs inexpensive
-	 * checks and can be used quickly filter for a set of possible matches.
+	 * checks and can be used to quickly filter for a set of possible matches.
 	 */
 	private static boolean isBridgedCandidateFor(Method candidateMethod, Method bridgeMethod) {
 		return (!candidateMethod.isBridge() &&

From 5aefcd2fdb9de0a1fab5ea5b5a1e61f717ba644e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 11 Jan 2022 14:54:59 +0100
Subject: [PATCH 548/735] Re-enable BlockHound integration tests

Prior to this commit, our BlockHound integration tests were disabled
after the migration to a JDK 17 baseline since the build now always
runs on JDK 14 or higher.

To re-enable the tests we now supply the deprecated
-XX:+AllowRedefinitionToAddDeleteMethods command-line argument to the JVM
for tests in the Gradle build. Users can also configure this manually
within an IDE to run SpringCoreBlockHoundIntegrationTests.

If that command-line argument is removed from the JVM at some point in
the future, we will need to investigate an alternative solution.

See https://github.com/reactor/BlockHound/issues/33 for details.
---
 spring-core/spring-core.gradle                 |  6 ++++++
 .../SpringCoreBlockHoundIntegrationTests.java  | 18 ++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index 79dd105c9e0b..7e49806e0dc1 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -92,4 +92,10 @@ test {
 	// Make sure the classes dir is used on the test classpath (required by ResourceTests).
 	// When test fixtures are involved, the JAR is used by default.
 	classpath = sourceSets.main.output.classesDirs + classpath - files(jar.archiveFile)
+
+	// Ensure that BlockHound tests run on JDK 13+. For details, see:
+	// https://github.com/reactor/BlockHound/issues/33
+	jvmArgs += [
+		"-XX:+AllowRedefinitionToAddDeleteMethods"
+	]
 }
diff --git a/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java b/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
index ea4b7fbbd552..370eb36a4569 100644
--- a/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
+++ b/spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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 org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
 import reactor.blockhound.BlockHound;
 import reactor.core.scheduler.ReactorBlockHoundIntegration;
 import reactor.core.scheduler.Schedulers;
@@ -32,16 +31,23 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.condition.JRE.JAVA_14;
 
 /**
  * Tests to verify the spring-core BlockHound integration rules.
  *
+ * <p>NOTE: to run this test class in the IDE, you need to specify the following
+ * JVM argument. For details, see
+ * <a href="https://github.com/reactor/BlockHound/issues/33">BlockHound issue 33</a>.
+ *
+ * <pre style="code">
+ * -XX:+AllowRedefinitionToAddDeleteMethods
+ * </pre>
+ *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 5.2.4
  */
-@DisabledForJreRange(min = JAVA_14)
-public class SpringCoreBlockHoundIntegrationTests {
+class SpringCoreBlockHoundIntegrationTests {
 
 
 	@BeforeAll
@@ -64,7 +70,7 @@ void localVariableTableParameterNameDiscoverer() {
 		testNonBlockingTask(() -> {
 			Method setName = TestObject.class.getMethod("setName", String.class);
 			String[] names = new LocalVariableTableParameterNameDiscoverer().getParameterNames(setName);
-			assertThat(names).isEqualTo(new String[] {"name"});
+			assertThat(names).containsExactly("name");
 		});
 	}
 

From 29fe1094403264c4f9583619fdd9e904fc463e8c Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Tue, 11 Jan 2022 13:58:36 +0000
Subject: [PATCH 549/735] SockJS TaskScheduler container bean is package
 private

See gh-27903
---
 .../socket/config/annotation/WebSocketConfigurationSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
index 3a6994cb7ee4..7ef20771e096 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
@@ -80,7 +80,7 @@ protected void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
 	 * </pre>
 	 */
 	@Bean
-	public DefaultSockJsSchedulerContainer defaultSockJsSchedulerContainer() {
+	DefaultSockJsSchedulerContainer defaultSockJsSchedulerContainer() {
 		return (initHandlerRegistry().requiresTaskScheduler() ?
 				new DefaultSockJsSchedulerContainer(initDefaultSockJsScheduler()) :
 				new DefaultSockJsSchedulerContainer(null));

From 9346c89f5c215456167799159ca5a8150762855d Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Tue, 11 Jan 2022 14:33:12 +0000
Subject: [PATCH 550/735] Polishing in HtmlUnitRequestBuilder

Order methods according to Spring Framework conventions.
Order request initialization by URI component.

See gh-27837
---
 .../htmlunit/HtmlUnitRequestBuilder.java      | 206 ++++++++----------
 1 file changed, 93 insertions(+), 113 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index e897ae5aa80c..e25422230ee3 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -32,7 +31,6 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import com.gargoylesoftware.htmlunit.CookieManager;
 import com.gargoylesoftware.htmlunit.FormEncodingType;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
@@ -69,6 +67,7 @@
  *
  * @author Rob Winch
  * @author Sam Brannen
+ * @author Rossen Stoyanchev
  * @since 4.2
  * @see MockMvcWebConnection
  */
@@ -111,54 +110,60 @@ public HtmlUnitRequestBuilder(Map<String, MockHttpSession> sessions, WebClient w
 	}
 
 
+	/**
+	 * Set the contextPath to be used.
+	 * <p>The value may be null in which case the first path segment of the
+	 * URL is turned into the contextPath. Otherwise it must conform to
+	 * {@link HttpServletRequest#getContextPath()} which states it can be
+	 * an empty string, or it must start with a "/" and not end with a "/".
+	 * @param contextPath a valid contextPath
+	 * @throws IllegalArgumentException if the contextPath is not a valid
+	 * {@link HttpServletRequest#getContextPath()}
+	 */
+	public void setContextPath(@Nullable String contextPath) {
+		MockMvcWebConnection.validateContextPath(contextPath);
+		this.contextPath = contextPath;
+	}
+
+	public void setForwardPostProcessor(RequestPostProcessor forwardPostProcessor) {
+		this.forwardPostProcessor = forwardPostProcessor;
+	}
+
+
 	@Override
 	public MockHttpServletRequest buildRequest(ServletContext servletContext) {
-		Charset charset = getCharset();
 		String httpMethod = this.webRequest.getHttpMethod().name();
-		UriComponents uriComponents = uriComponents();
-		String path = uriComponents.getPath();
+		UriComponents uri = UriComponentsBuilder.fromUriString(this.webRequest.getUrl().toExternalForm()).build();
 
-		MockHttpServletRequest request =
-				new HtmlUnitMockHttpServletRequest(servletContext, httpMethod, (path != null ? path : ""));
+		MockHttpServletRequest request = new HtmlUnitMockHttpServletRequest(
+				servletContext, httpMethod, (uri.getPath() != null ? uri.getPath() : ""));
 
 		parent(request, this.parentBuilder);
-		String host = uriComponents.getHost();
-		request.setServerName(host != null ? host : "");  // needs to be first for additional headers
+
+		request.setProtocol("HTTP/1.1");
+		request.setScheme(uri.getScheme() != null ? uri.getScheme() : "");
+		request.setServerName(uri.getHost() != null ? uri.getHost() : "");  // needs to be first for additional headers
+		ports(uri, request);
 		authType(request);
+		contextPath(request, uri);
+		servletPath(uri, request);
+		request.setPathInfo(null);
+
+		Charset charset = this.webRequest.getCharset();
+		charset = (charset != null ? charset : StandardCharsets.ISO_8859_1);
 		request.setCharacterEncoding(charset.name());
 		content(request, charset);
-		contextPath(request, uriComponents);
 		contentType(request);
+
 		cookies(request);
-		headers(request);
+		this.webRequest.getAdditionalHeaders().forEach(request::addHeader);
 		locales(request);
-		servletPath(uriComponents, request);
-		params(request, uriComponents);
-		ports(uriComponents, request);
-		request.setProtocol("HTTP/1.1");
-		request.setQueryString(uriComponents.getQuery());
-		String scheme = uriComponents.getScheme();
-		request.setScheme(scheme != null ? scheme : "");
-		request.setPathInfo(null);
+		params(request, uri);
+		request.setQueryString(uri.getQuery());
 
 		return postProcess(request);
 	}
 
-	private Charset getCharset() {
-		Charset charset = this.webRequest.getCharset();
-		return (charset != null ? charset : StandardCharsets.ISO_8859_1);
-	}
-
-	private MockHttpServletRequest postProcess(MockHttpServletRequest request) {
-		if (this.parentPostProcessor != null) {
-			request = this.parentPostProcessor.postProcessRequest(request);
-		}
-		if (this.forwardPostProcessor != null) {
-			request = this.forwardPostProcessor.postProcessRequest(request);
-		}
-		return request;
-	}
-
 	private void parent(MockHttpServletRequest request, @Nullable RequestBuilder parent) {
 		if (parent == null) {
 			return;
@@ -208,50 +213,30 @@ private void parent(MockHttpServletRequest request, @Nullable RequestBuilder par
 		}
 	}
 
-	/**
-	 * Set the contextPath to be used.
-	 * <p>The value may be null in which case the first path segment of the
-	 * URL is turned into the contextPath. Otherwise it must conform to
-	 * {@link HttpServletRequest#getContextPath()} which states it can be
-	 * an empty string, or it must start with a "/" and not end with a "/".
-	 * @param contextPath a valid contextPath
-	 * @throws IllegalArgumentException if the contextPath is not a valid
-	 * {@link HttpServletRequest#getContextPath()}
-	 */
-	public void setContextPath(@Nullable String contextPath) {
-		MockMvcWebConnection.validateContextPath(contextPath);
-		this.contextPath = contextPath;
-	}
-
-	public void setForwardPostProcessor(RequestPostProcessor forwardPostProcessor) {
-		this.forwardPostProcessor = forwardPostProcessor;
+	private void ports(UriComponents uriComponents, MockHttpServletRequest request) {
+		int serverPort = uriComponents.getPort();
+		request.setServerPort(serverPort);
+		if (serverPort == -1) {
+			int portConnection = this.webRequest.getUrl().getDefaultPort();
+			request.setLocalPort(serverPort);
+			request.setRemotePort(portConnection);
+		}
+		else {
+			request.setRemotePort(serverPort);
+		}
 	}
 
 	private void authType(MockHttpServletRequest request) {
-		String authorization = header("Authorization");
+		String authorization = getHeader("Authorization");
 		String[] authSplit = StringUtils.split(authorization, ": ");
 		if (authSplit != null) {
 			request.setAuthType(authSplit[0]);
 		}
 	}
 
-	private void content(MockHttpServletRequest request, Charset charset) {
-		String requestBody = this.webRequest.getRequestBody();
-		if (requestBody == null) {
-			return;
-		}
-		request.setContent(requestBody.getBytes(charset));
-	}
-
-	private void contentType(MockHttpServletRequest request) {
-		String contentType = header("Content-Type");
-		if (contentType == null) {
-			FormEncodingType encodingType = this.webRequest.getEncodingType();
-			if (encodingType != null) {
-				contentType = encodingType.getName();
-			}
-		}
-		request.setContentType(contentType != null ? contentType : MediaType.ALL_VALUE);
+	@Nullable
+	private String getHeader(String headerName) {
+		return this.webRequest.getAdditionalHeaders().get(headerName);
 	}
 
 	private void contextPath(MockHttpServletRequest request, UriComponents uriComponents) {
@@ -273,10 +258,36 @@ private void contextPath(MockHttpServletRequest request, UriComponents uriCompon
 		}
 	}
 
+	private void servletPath(UriComponents uriComponents, MockHttpServletRequest request) {
+		String path = uriComponents.getPath();
+		String requestPath = (path != null ? path : "");
+		String servletPath = requestPath.substring(request.getContextPath().length());
+		request.setServletPath(servletPath);
+	}
+
+	private void content(MockHttpServletRequest request, Charset charset) {
+		String requestBody = this.webRequest.getRequestBody();
+		if (requestBody == null) {
+			return;
+		}
+		request.setContent(requestBody.getBytes(charset));
+	}
+
+	private void contentType(MockHttpServletRequest request) {
+		String contentType = getHeader("Content-Type");
+		if (contentType == null) {
+			FormEncodingType encodingType = this.webRequest.getEncodingType();
+			if (encodingType != null) {
+				contentType = encodingType.getName();
+			}
+		}
+		request.setContentType(contentType != null ? contentType : MediaType.ALL_VALUE);
+	}
+
 	private void cookies(MockHttpServletRequest request) {
 		List<Cookie> cookies = new ArrayList<>();
 
-		String cookieHeaderValue = header("Cookie");
+		String cookieHeaderValue = getHeader("Cookie");
 		if (cookieHeaderValue != null) {
 			StringTokenizer tokens = new StringTokenizer(cookieHeaderValue, "=;");
 			while (tokens.hasMoreTokens()) {
@@ -312,15 +323,6 @@ private void processCookie(MockHttpServletRequest request, List<Cookie> cookies,
 		}
 	}
 
-	@Nullable
-	private String header(String headerName) {
-		return this.webRequest.getAdditionalHeaders().get(headerName);
-	}
-
-	private void headers(MockHttpServletRequest request) {
-		this.webRequest.getAdditionalHeaders().forEach(request::addHeader);
-	}
-
 	private MockHttpSession httpSession(MockHttpServletRequest request, final String sessionid) {
 		MockHttpSession session;
 		synchronized (this.sessions) {
@@ -341,11 +343,11 @@ private MockHttpSession httpSession(MockHttpServletRequest request, final String
 	}
 
 	private void addSessionCookie(MockHttpServletRequest request, String sessionid) {
-		getCookieManager().addCookie(createCookie(request, sessionid));
+		this.webClient.getCookieManager().addCookie(createCookie(request, sessionid));
 	}
 
 	private void removeSessionCookie(MockHttpServletRequest request, String sessionid) {
-		getCookieManager().removeCookie(createCookie(request, sessionid));
+		this.webClient.getCookieManager().removeCookie(createCookie(request, sessionid));
 	}
 
 	private com.gargoylesoftware.htmlunit.util.Cookie createCookie(MockHttpServletRequest request, String sessionid) {
@@ -354,7 +356,7 @@ private com.gargoylesoftware.htmlunit.util.Cookie createCookie(MockHttpServletRe
 	}
 
 	private void locales(MockHttpServletRequest request) {
-		String locale = header("Accept-Language");
+		String locale = getHeader("Accept-Language");
 		if (locale == null) {
 			request.addPreferredLocale(Locale.getDefault());
 		}
@@ -407,36 +409,18 @@ private byte[] readAllBytes(File file) {
 		}
 	}
 
-	private void servletPath(MockHttpServletRequest request, String requestPath) {
-		String servletPath = requestPath.substring(request.getContextPath().length());
-		request.setServletPath(servletPath);
-	}
-
-	private void servletPath(UriComponents uriComponents, MockHttpServletRequest request) {
-		if ("".equals(request.getPathInfo())) {
-			request.setPathInfo(null);
-		}
-		String path = uriComponents.getPath();
-		servletPath(request, (path != null ? path : ""));
-	}
-
-	private void ports(UriComponents uriComponents, MockHttpServletRequest request) {
-		int serverPort = uriComponents.getPort();
-		request.setServerPort(serverPort);
-		if (serverPort == -1) {
-			int portConnection = this.webRequest.getUrl().getDefaultPort();
-			request.setLocalPort(serverPort);
-			request.setRemotePort(portConnection);
+	private MockHttpServletRequest postProcess(MockHttpServletRequest request) {
+		if (this.parentPostProcessor != null) {
+			request = this.parentPostProcessor.postProcessRequest(request);
 		}
-		else {
-			request.setRemotePort(serverPort);
+		if (this.forwardPostProcessor != null) {
+			request = this.forwardPostProcessor.postProcessRequest(request);
 		}
+		return request;
 	}
 
-	private UriComponents uriComponents() {
-		URL url = this.webRequest.getUrl();
-		return UriComponentsBuilder.fromUriString(url.toExternalForm()).build();
-	}
+
+	/* Mergeable methods */
 
 	@Override
 	public boolean isMergeEnabled() {
@@ -461,10 +445,6 @@ public Object merge(@Nullable Object parent) {
 		return this;
 	}
 
-	private CookieManager getCookieManager() {
-		return this.webClient.getCookieManager();
-	}
-
 
 	/**
 	 * An extension to {@link MockHttpServletRequest} that ensures that when a

From 3477ec0a35c5d19d55431f756cc9c6056ee788da Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Tue, 11 Jan 2022 14:54:14 +0000
Subject: [PATCH 551/735] Decode servletPath in HtmlUnitRequestBuilder

Closes gh-27837
---
 .../web/servlet/htmlunit/HtmlUnitRequestBuilder.java   |  2 ++
 .../servlet/htmlunit/HtmlUnitRequestBuilderTests.java  | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index e25422230ee3..863a0ddf728c 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -57,6 +57,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.util.UriUtils;
 
 /**
  * Internal class used to transform a {@link WebRequest} into a
@@ -262,6 +263,7 @@ private void servletPath(UriComponents uriComponents, MockHttpServletRequest req
 		String path = uriComponents.getPath();
 		String requestPath = (path != null ? path : "");
 		String servletPath = requestPath.substring(request.getContextPath().length());
+		servletPath = UriUtils.decode(servletPath, StandardCharsets.UTF_8);
 		request.setServletPath(servletPath);
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index a1d4d99beec2..25e5d23a25ff 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -782,6 +782,16 @@ public void buildRequestServletPath() throws Exception {
 		assertThat(actualRequest.getServletPath()).isEqualTo("/this/here");
 	}
 
+	@Test // gh-27837
+	public void buildRequestServletPathWithEncodedUrl() throws Exception {
+		webRequest.setUrl(new URL("http://localhost/test/Fr%C3%BChling%20Sommer%20Herbst%20Winter"));
+
+		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
+
+		assertThat(actualRequest.getRequestURI()).isEqualTo("/test/Fr%C3%BChling%20Sommer%20Herbst%20Winter");
+		assertThat(actualRequest.getServletPath()).isEqualTo("/Frühling Sommer Herbst Winter");
+	}
+
 	@Test
 	public void buildRequestSession() throws Exception {
 		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);

From bd1f34e17403dd26f3cb7473bd3d49b2c5f6705f Mon Sep 17 00:00:00 2001
From: sokomishalov <sokomishalov@mail.ru>
Date: Mon, 10 Jan 2022 11:51:55 +0300
Subject: [PATCH 552/735] Apply adapters to client request headers after
 committed

See gh-27768
---
 .../reactive/AbstractClientHttpRequest.java   | 11 ++++--
 .../HttpComponentsClientHttpRequest.java      |  5 +++
 .../HttpComponentsHeadersAdapter.java         | 36 +++++++++----------
 .../reactive/JettyClientHttpRequest.java      |  4 +++
 .../reactive/ReactorClientHttpRequest.java    |  6 ++++
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java
index 8734521f0486..d1e67ae9c4c1 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java
@@ -74,14 +74,13 @@ public AbstractClientHttpRequest(HttpHeaders headers) {
 		this.cookies = new LinkedMultiValueMap<>();
 	}
 
-
 	@Override
 	public HttpHeaders getHeaders() {
 		if (this.readOnlyHeaders != null) {
 			return this.readOnlyHeaders;
 		}
 		else if (State.COMMITTED.equals(this.state.get())) {
-			this.readOnlyHeaders = HttpHeaders.readOnlyHttpHeaders(this.headers);
+			this.readOnlyHeaders = initReadOnlyHeaders();
 			return this.readOnlyHeaders;
 		}
 		else {
@@ -144,6 +143,14 @@ protected Mono<Void> doCommit(@Nullable Supplier<? extends Publisher<Void>> writ
 		return Flux.concat(actions).then();
 	}
 
+	/**
+	 * Initialize read-only headers with underlying request headers.
+	 * @return read-only headers
+	 */
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(this.headers);
+	}
+
 
 	/**
 	 * Apply header changes from {@link #getHeaders()} to the underlying request.
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
index 440fc681860b..a4317c817dc9 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
@@ -118,6 +118,11 @@ public Mono<Void> setComplete() {
 		return doCommit();
 	}
 
+	@Override
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(new HttpComponentsHeadersAdapter(this.httpRequest));
+	}
+
 	@Override
 	protected void applyHeaders() {
 		HttpHeaders headers = getHeaders();
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java
index f24d77cb86d6..944703f8e166 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsHeadersAdapter.java
@@ -28,7 +28,7 @@
 import java.util.Set;
 
 import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpMessage;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
@@ -44,23 +44,23 @@
  */
 class HttpComponentsHeadersAdapter implements MultiValueMap<String, String> {
 
-	private final HttpResponse response;
+	private final HttpMessage message;
 
 
-	HttpComponentsHeadersAdapter(HttpResponse response) {
-		this.response = response;
+	HttpComponentsHeadersAdapter(HttpMessage message) {
+		this.message = message;
 	}
 
 
 	@Override
 	public String getFirst(String key) {
-		Header header = this.response.getFirstHeader(key);
+		Header header = this.message.getFirstHeader(key);
 		return (header != null ? header.getValue() : null);
 	}
 
 	@Override
 	public void add(String key, @Nullable String value) {
-		this.response.addHeader(key, value);
+		this.message.addHeader(key, value);
 	}
 
 	@Override
@@ -75,7 +75,7 @@ public void addAll(MultiValueMap<String, String> values) {
 
 	@Override
 	public void set(String key, @Nullable String value) {
-		this.response.setHeader(key, value);
+		this.message.setHeader(key, value);
 	}
 
 	@Override
@@ -86,29 +86,29 @@ public void setAll(Map<String, String> values) {
 	@Override
 	public Map<String, String> toSingleValueMap() {
 		Map<String, String> map = CollectionUtils.newLinkedHashMap(size());
-		this.response.headerIterator().forEachRemaining(h -> map.putIfAbsent(h.getName(), h.getValue()));
+		this.message.headerIterator().forEachRemaining(h -> map.putIfAbsent(h.getName(), h.getValue()));
 		return map;
 	}
 
 	@Override
 	public int size() {
-		return this.response.getHeaders().length;
+		return this.message.getHeaders().length;
 	}
 
 	@Override
 	public boolean isEmpty() {
-		return (this.response.getHeaders().length == 0);
+		return (this.message.getHeaders().length == 0);
 	}
 
 	@Override
 	public boolean containsKey(Object key) {
-		return (key instanceof String && this.response.containsHeader((String) key));
+		return (key instanceof String && this.message.containsHeader((String) key));
 	}
 
 	@Override
 	public boolean containsValue(Object value) {
 		return (value instanceof String &&
-				Arrays.stream(this.response.getHeaders()).anyMatch(h -> h.getValue().equals(value)));
+				Arrays.stream(this.message.getHeaders()).anyMatch(h -> h.getValue().equals(value)));
 	}
 
 	@Nullable
@@ -116,7 +116,7 @@ public boolean containsValue(Object value) {
 	public List<String> get(Object key) {
 		List<String> values = null;
 		if (containsKey(key)) {
-			Header[] headers = this.response.getHeaders((String) key);
+			Header[] headers = this.message.getHeaders((String) key);
 			values = new ArrayList<>(headers.length);
 			for (Header header : headers) {
 				values.add(header.getValue());
@@ -138,7 +138,7 @@ public List<String> put(String key, List<String> values) {
 	public List<String> remove(Object key) {
 		if (key instanceof String) {
 			List<String> oldValues = get(key);
-			this.response.removeHeaders((String) key);
+			this.message.removeHeaders((String) key);
 			return oldValues;
 		}
 		return null;
@@ -151,13 +151,13 @@ public void putAll(Map<? extends String, ? extends List<String>> map) {
 
 	@Override
 	public void clear() {
-		this.response.setHeaders();
+		this.message.setHeaders();
 	}
 
 	@Override
 	public Set<String> keySet() {
 		Set<String> keys = new LinkedHashSet<>(size());
-		for (Header header : this.response.getHeaders()) {
+		for (Header header : this.message.getHeaders()) {
 			keys.add(header.getName());
 		}
 		return keys;
@@ -166,7 +166,7 @@ public Set<String> keySet() {
 	@Override
 	public Collection<List<String>> values() {
 		Collection<List<String>> values = new ArrayList<>(size());
-		for (Header header : this.response.getHeaders()) {
+		for (Header header : this.message.getHeaders()) {
 			values.add(get(header.getName()));
 		}
 		return values;
@@ -196,7 +196,7 @@ public String toString() {
 
 	private class EntryIterator implements Iterator<Entry<String, List<String>>> {
 
-		private Iterator<Header> iterator = response.headerIterator();
+		private final Iterator<Header> iterator = message.headerIterator();
 
 		@Override
 		public boolean hasNext() {
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
index 8aabf8957927..b2bfded60512 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
@@ -126,6 +126,10 @@ public void failed(Throwable t) {
 		});
 	}
 
+	@Override
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(new JettyHeadersAdapter(this.jettyRequest.getHeaders()));
+	}
 
 	@Override
 	protected void applyCookies() {
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
index f098f8594ba3..836b4b7b17df 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
@@ -31,6 +31,7 @@
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.NettyDataBufferFactory;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ZeroCopyHttpOutputMessage;
 
@@ -121,6 +122,11 @@ public Mono<Void> setComplete() {
 		return doCommit(this.outbound::then);
 	}
 
+	@Override
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(new NettyHeadersAdapter(this.request.requestHeaders()));
+	}
+
 	@Override
 	protected void applyHeaders() {
 		getHeaders().forEach((key, value) -> this.request.requestHeaders().set(key, value));

From e8e7fbba94165df1572d48e62fbbc5b637a616ed Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Tue, 11 Jan 2022 17:07:26 +0000
Subject: [PATCH 553/735] Polishing contribution and fix failing test

The failing test is for Apache HttpComponents where we cannot apply the
Content-Length together with other headers, and must pass it instead
explicitly to ReactiveEntityProducer when writing at which point it gets
set in the native headers.

Closes gh-27768
---
 .../reactive/AbstractClientHttpRequest.java   | 21 +++++++++++--------
 .../HttpComponentsClientHttpRequest.java      | 20 +++++++++++-------
 .../reactive/JettyClientHttpRequest.java      | 13 ++++++------
 .../reactive/ReactorClientHttpRequest.java    | 12 +++++------
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java
index d1e67ae9c4c1..8a9e1a3f90bf 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/AbstractClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -74,6 +74,7 @@ public AbstractClientHttpRequest(HttpHeaders headers) {
 		this.cookies = new LinkedMultiValueMap<>();
 	}
 
+
 	@Override
 	public HttpHeaders getHeaders() {
 		if (this.readOnlyHeaders != null) {
@@ -88,6 +89,16 @@ else if (State.COMMITTED.equals(this.state.get())) {
 		}
 	}
 
+	/**
+	 * Initialize the read-only headers after the request is committed.
+	 * <p>By default, this method simply applies a read-only wrapper.
+	 * Subclasses can do the same for headers from the native request.
+	 * @since 5.3.15
+	 */
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(this.headers);
+	}
+
 	@Override
 	public MultiValueMap<String, HttpCookie> getCookies() {
 		if (State.COMMITTED.equals(this.state.get())) {
@@ -143,14 +154,6 @@ protected Mono<Void> doCommit(@Nullable Supplier<? extends Publisher<Void>> writ
 		return Flux.concat(actions).then();
 	}
 
-	/**
-	 * Initialize read-only headers with underlying request headers.
-	 * @return read-only headers
-	 */
-	protected HttpHeaders initReadOnlyHeaders() {
-		return HttpHeaders.readOnlyHttpHeaders(this.headers);
-	}
-
 
 	/**
 	 * Apply header changes from {@link #getHeaders()} to the underlying request.
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
index a4317c817dc9..fd48945d5fe2 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -62,6 +62,8 @@ class HttpComponentsClientHttpRequest extends AbstractClientHttpRequest {
 	@Nullable
 	private Flux<ByteBuffer> byteBufferFlux;
 
+	private transient long contentLength = -1;
+
 
 	public HttpComponentsClientHttpRequest(HttpMethod method, URI uri, HttpClientContext context,
 			DataBufferFactory dataBufferFactory) {
@@ -118,11 +120,6 @@ public Mono<Void> setComplete() {
 		return doCommit();
 	}
 
-	@Override
-	protected HttpHeaders initReadOnlyHeaders() {
-		return HttpHeaders.readOnlyHttpHeaders(new HttpComponentsHeadersAdapter(this.httpRequest));
-	}
-
 	@Override
 	protected void applyHeaders() {
 		HttpHeaders headers = getHeaders();
@@ -135,6 +132,8 @@ protected void applyHeaders() {
 		if (!this.httpRequest.containsHeader(HttpHeaders.ACCEPT)) {
 			this.httpRequest.addHeader(HttpHeaders.ACCEPT, ALL_VALUE);
 		}
+
+		this.contentLength = headers.getContentLength();
 	}
 
 	@Override
@@ -156,6 +155,11 @@ protected void applyCookies() {
 				});
 	}
 
+	@Override
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(new HttpComponentsHeadersAdapter(this.httpRequest));
+	}
+
 	public AsyncRequestProducer toRequestProducer() {
 		ReactiveEntityProducer reactiveEntityProducer = null;
 
@@ -165,8 +169,8 @@ public AsyncRequestProducer toRequestProducer() {
 			if (getHeaders().getContentType() != null) {
 				contentType = ContentType.parse(getHeaders().getContentType().toString());
 			}
-			reactiveEntityProducer = new ReactiveEntityProducer(this.byteBufferFlux, getHeaders().getContentLength(),
-					contentType, contentEncoding);
+			reactiveEntityProducer = new ReactiveEntityProducer(
+					this.byteBufferFlux, this.contentLength, contentType, contentEncoding);
 		}
 
 		return new BasicRequestProducer(this.httpRequest, reactiveEntityProducer);
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
index b2bfded60512..4e1df906eb21 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -126,11 +126,6 @@ public void failed(Throwable t) {
 		});
 	}
 
-	@Override
-	protected HttpHeaders initReadOnlyHeaders() {
-		return HttpHeaders.readOnlyHttpHeaders(new JettyHeadersAdapter(this.jettyRequest.getHeaders()));
-	}
-
 	@Override
 	protected void applyCookies() {
 		getCookies().values().stream().flatMap(Collection::stream)
@@ -147,9 +142,13 @@ protected void applyHeaders() {
 		}
 	}
 
+	@Override
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(new JettyHeadersAdapter(this.jettyRequest.getHeaders()));
+	}
+
 	public ReactiveRequest toReactiveRequest() {
 		return this.builder.build();
 	}
 
-
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
index 836b4b7b17df..332183457e6d 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -122,11 +122,6 @@ public Mono<Void> setComplete() {
 		return doCommit(this.outbound::then);
 	}
 
-	@Override
-	protected HttpHeaders initReadOnlyHeaders() {
-		return HttpHeaders.readOnlyHttpHeaders(new NettyHeadersAdapter(this.request.requestHeaders()));
-	}
-
 	@Override
 	protected void applyHeaders() {
 		getHeaders().forEach((key, value) -> this.request.requestHeaders().set(key, value));
@@ -139,4 +134,9 @@ protected void applyCookies() {
 				.forEach(this.request::addCookie);
 	}
 
+	@Override
+	protected HttpHeaders initReadOnlyHeaders() {
+		return HttpHeaders.readOnlyHttpHeaders(new NettyHeadersAdapter(this.request.requestHeaders()));
+	}
+
 }

From e52fc2176d4faf11a9a32d1b89df68ad50477dd2 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 12 Jan 2022 09:39:09 +0100
Subject: [PATCH 554/735] Upgrade to Reactor 2020.0.15

Closes gh-27897
---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7aadbf35e41d..da794c5b620d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
 			mavenBom "io.netty:netty-bom:4.1.72.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.15-SNAPSHOT"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.15"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR11"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,7 +292,6 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
-			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From caaf48d4ec8dc660387f7ed05db6956c20a547a8 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 12 Jan 2022 07:00:45 +0000
Subject: [PATCH 555/735] Add missing overrides to ServerHttpResponseDecorator

Closes gh-27889
---
 .../server/reactive/ServerHttpResponseDecorator.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java
index 79a6c0c8bd44..c6574c26f3bc 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -65,6 +65,16 @@ public HttpStatus getStatusCode() {
 		return getDelegate().getStatusCode();
 	}
 
+	@Override
+	public boolean setRawStatusCode(@Nullable Integer value) {
+		return getDelegate().setRawStatusCode(value);
+	}
+
+	@Override
+	public Integer getRawStatusCode() {
+		return getDelegate().getRawStatusCode();
+	}
+
 	@Override
 	public HttpHeaders getHeaders() {
 		return getDelegate().getHeaders();

From f63a106c85f3135d82c5ceca375e8f9e6c8a5535 Mon Sep 17 00:00:00 2001
From: Max Demydenko <demkom58@gmail.com>
Date: Wed, 5 Jan 2022 01:41:37 +0200
Subject: [PATCH 556/735] clear() method also clears argument resolver cache

See gh-27888
---
 .../invocation/HandlerMethodArgumentResolverComposite.java       | 1 +
 .../reactive/HandlerMethodArgumentResolverComposite.java         | 1 +
 .../method/support/HandlerMethodArgumentResolverComposite.java   | 1 +
 .../result/method/HandlerMethodArgumentResolverComposite.java    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
index 7bde7fb3d37a..22584b700ad8 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
@@ -88,6 +88,7 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();
+		this.argumentResolverCache.clear();
 	}
 
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java
index 3009a05e5619..5fd91af84115 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java
@@ -90,6 +90,7 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();
+		this.argumentResolverCache.clear();
 	}
 
 
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
index 60a27b9ae5b6..cc13867d20c9 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
@@ -90,6 +90,7 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();
+		this.argumentResolverCache.clear();
 	}
 
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java
index 46baa13c5f4d..b2013e22e265 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java
@@ -87,6 +87,7 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();
+		this.argumentResolverCache.clear();
 	}
 
 

From 7665424ea83034456af87324edc5db9b29a1a948 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 12 Jan 2022 07:08:01 +0000
Subject: [PATCH 557/735] Polishing contribution

Closes gh-27888
---
 .../invocation/HandlerMethodArgumentResolverComposite.java    | 4 ++--
 .../reactive/HandlerMethodArgumentResolverComposite.java      | 4 ++--
 .../support/HandlerMethodArgumentResolverComposite.java       | 4 ++--
 .../result/method/HandlerMethodArgumentResolverComposite.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
index 22584b700ad8..966fa7083496 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 	}
 
 	/**
-	 * Clear the list of configured resolvers.
+	 * Clear the list of configured resolvers and the resolver cache.
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java
index 5fd91af84115..fc73bf63dea7 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolverComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 	}
 
 	/**
-	 * Clear the list of configured resolvers.
+	 * Clear the list of configured resolvers and the resolver cache.
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
index cc13867d20c9..e9b5f6056c1c 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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 List<HandlerMethodArgumentResolver> getResolvers() {
 	}
 
 	/**
-	 * Clear the list of configured resolvers.
+	 * Clear the list of configured resolvers and the resolver cache.
 	 * @since 4.3
 	 */
 	public void clear() {
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java
index b2013e22e265..351badb98e88 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolverComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -83,7 +83,7 @@ public List<HandlerMethodArgumentResolver> getResolvers() {
 	}
 
 	/**
-	 * Clear the list of configured resolvers.
+	 * Clear the list of configured resolvers and the resolver cache.
 	 */
 	public void clear() {
 		this.argumentResolvers.clear();

From 01231fe923659cfef2cb1e91b8b15ae6caf0da01 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 12 Jan 2022 07:20:58 +0000
Subject: [PATCH 558/735] Minor refactoring in STOMP documentation

Closes gh-27906
---
 src/docs/asciidoc/web/websocket.adoc | 30 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 74f4a0765840..c943dbe82756 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1724,19 +1724,11 @@ HTTP session (which is then associated with WebSocket or SockJS sessions created
 for that user) and results in a user header being stamped on every `Message` flowing
 through the application.
 
-Note that the STOMP protocol does have `login` and `passcode` headers
-on the `CONNECT` frame. Those were originally designed for and are still needed,
-for example, for STOMP over TCP. However, for STOMP over WebSocket, by default,
-Spring ignores authorization headers at the STOMP protocol level, assumes that
-the user is already authenticated at the HTTP transport level, and expects that
-the WebSocket or SockJS session contain the authenticated user.
-
-NOTE: Spring Security provides
-https://docs.spring.io/spring-security/reference/servlet/integrations/websocket.html#websocket-authorization[WebSocket sub-protocol authorization]
-that uses a `ChannelInterceptor` to authorize messages based on the user header in them.
-Also, Spring Session provides
-https://docs.spring.io/spring-session/reference/web-socket.html[WebSocket integration]
-that ensures the user's HTTP session does not expire while the WebSocket session is still active.
+The STOMP protocol does have `login` and `passcode` headers on the `CONNECT` frame.
+Those were originally designed for and are needed for STOMP over TCP. However, for STOMP
+over WebSocket, by default, Spring ignores authentication headers at the STOMP protocol
+level, and assumes that the user is already authenticated at the HTTP transport level.
+The expectation is that the WebSocket or SockJS session contain the authenticated user.
 
 
 
@@ -1814,6 +1806,18 @@ its own implementation of `WebSocketMessageBrokerConfigurer` that is marked with
 
 
 
+[[websocket-stomp-authorization]]
+=== Authorization
+
+Spring Security provides
+https://docs.spring.io/spring-security/reference/servlet/integrations/websocket.html#websocket-authorization[WebSocket sub-protocol authorization]
+that uses a `ChannelInterceptor` to authorize messages based on the user header in them.
+Also, Spring Session provides
+https://docs.spring.io/spring-session/reference/web-socket.html[WebSocket integration]
+that ensures the user's HTTP session does not expire while the WebSocket session is still active.
+
+
+
 [[websocket-stomp-user-destination]]
 === User Destinations
 

From 34cb5df8599f72401fc30e8d0b05ca0ac10a0840 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 12 Jan 2022 08:55:22 +0000
Subject: [PATCH 559/735] Consistent id for ReactorServerHttpRequest

Closes gh-27885
---
 .../reactive/AbstractServerHttpRequest.java   | 13 ++++++++++--
 .../reactive/ReactorServerHttpRequest.java    | 20 +++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java
index 3b8bb8ad7046..6c0ac9374e0e 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -218,9 +218,18 @@ public SslInfo getSslInfo() {
 	 */
 	String getLogPrefix() {
 		if (this.logPrefix == null) {
-			this.logPrefix = "[" + getId() + "] ";
+			this.logPrefix = "[" + initLogPrefix() + "] ";
 		}
 		return this.logPrefix;
 	}
 
+	/**
+	 * Subclasses can override this to provide the prefix to use for log messages.
+	 * <p>By default, this is {@link #getId()}.
+	 * @since 5.3.15
+	 */
+	protected String initLogPrefix() {
+		return getId();
+	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
index 35db4de36c87..72cdc1f9fc21 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -77,7 +77,7 @@ public ReactorServerHttpRequest(HttpServerRequest request, NettyDataBufferFactor
 
 	private static URI initUri(HttpServerRequest request) throws URISyntaxException {
 		Assert.notNull(request, "HttpServerRequest must not be null");
-		return new URI(resolveBaseUrl(request).toString() + resolveRequestUri(request));
+		return new URI(resolveBaseUrl(request) + resolveRequestUri(request));
 	}
 
 	private static URI resolveBaseUrl(HttpServerRequest request) throws URISyntaxException {
@@ -197,14 +197,26 @@ public <T> T getNativeRequest() {
 	@Override
 	@Nullable
 	protected String initId() {
+		if (this.request instanceof Connection) {
+			return ((Connection) this.request).channel().id().asShortText() +
+					"-" + logPrefixIndex.incrementAndGet();
+		}
+		return null;
+	}
+
+	@Override
+	protected String initLogPrefix() {
 		if (reactorNettyRequestChannelOperationsIdPresent) {
-			return (ChannelOperationsIdHelper.getId(this.request));
+			String id = (ChannelOperationsIdHelper.getId(this.request));
+			if (id != null) {
+				return id;
+			}
 		}
 		if (this.request instanceof Connection) {
 			return ((Connection) this.request).channel().id().asShortText() +
 					"-" + logPrefixIndex.incrementAndGet();
 		}
-		return null;
+		return getId();
 	}
 
 

From 7067461d711f9b830386761494fa0fdee02a025d Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 12 Jan 2022 15:04:05 +0000
Subject: [PATCH 560/735] Fix exception in Jetty10RequestUpgradeStrategy

Closes gh-27899
---
 .../socket/server/upgrade/Jetty10RequestUpgradeStrategy.java  | 4 ++--
 .../socket/server/jetty/Jetty10RequestUpgradeStrategy.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java
index cf5ab945817c..4629c969802e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/Jetty10RequestUpgradeStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -149,7 +149,7 @@ public WebSocketCreatorInterceptor(
 		public Object invoke(@NonNull MethodInvocation invocation) {
 			if (this.protocol != null) {
 				ReflectionUtils.invokeMethod(
-						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
+						setAcceptedSubProtocol, invocation.getArguments()[1], this.protocol);
 			}
 			return this.adapter;
 		}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java
index 1ba175654779..0391bbf5f949 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -158,7 +158,7 @@ public WebSocketCreatorInterceptor(
 		public Object invoke(@NonNull MethodInvocation invocation) {
 			if (this.protocol != null) {
 				ReflectionUtils.invokeMethod(
-						setAcceptedSubProtocol, invocation.getArguments()[2], this.protocol);
+						setAcceptedSubProtocol, invocation.getArguments()[1], this.protocol);
 			}
 			return this.adapter;
 		}

From cf5b86369d91dcba00cbd8e796b7bace2aeb5c75 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 12 Jan 2022 16:31:39 +0100
Subject: [PATCH 561/735] Explicitly close InputStream after resolution in
 RequestPartMethodArgumentResolver

Closes gh-27773
---
 ...essageConverterMethodArgumentResolver.java | 18 +++++-
 .../RequestPartMethodArgumentResolver.java    | 17 ++++-
 ...equestPartMethodArgumentResolverTests.java | 64 ++++++++++++-------
 3 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
index 1dbc559e2ccf..535ed2160836 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -169,7 +169,7 @@ protected <T> Object readWithMessageConverters(HttpInputMessage inputMessage, Me
 		HttpMethod httpMethod = (inputMessage instanceof HttpRequest ? ((HttpRequest) inputMessage).getMethod() : null);
 		Object body = NO_VALUE;
 
-		EmptyBodyCheckingHttpInputMessage message;
+		EmptyBodyCheckingHttpInputMessage message = null;
 		try {
 			message = new EmptyBodyCheckingHttpInputMessage(inputMessage);
 
@@ -196,6 +196,11 @@ protected <T> Object readWithMessageConverters(HttpInputMessage inputMessage, Me
 		catch (IOException ex) {
 			throw new HttpMessageNotReadableException("I/O error while reading input message", ex, inputMessage);
 		}
+		finally {
+			if (message != null && message.hasBody()) {
+				closeStreamIfNecessary(message.getBody());
+			}
+		}
 
 		if (body == NO_VALUE) {
 			if (httpMethod == null || !SUPPORTED_METHODS.contains(httpMethod) ||
@@ -298,6 +303,15 @@ protected Object adaptArgumentIfNecessary(@Nullable Object arg, MethodParameter
 		return arg;
 	}
 
+	/**
+	 * Allow for closing the body stream if necessary,
+	 * e.g. for part streams in a multipart request.
+	 */
+	void closeStreamIfNecessary(InputStream body) {
+		// No-op by default: A standard HttpInputMessage exposes the HTTP request stream
+		// (ServletRequest#getInputStream), with its lifecycle managed by the container.
+	}
+
 
 	private static class EmptyBodyCheckingHttpInputMessage implements HttpInputMessage {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
index e828239d7100..eff6744eba90 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -180,4 +182,17 @@ private String getPartName(MethodParameter methodParam, @Nullable RequestPart re
 		return partName;
 	}
 
+	@Override
+	void closeStreamIfNecessary(InputStream body) {
+		// RequestPartServletServerHttpRequest exposes individual part streams,
+		// potentially from temporary files -> explicit close call after resolution
+		// in order to prevent file descriptor leaks.
+		try {
+			body.close();
+		}
+		catch (IOException ex) {
+			// ignore
+		}
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
index 9cf34618a62e..cbde3c20b23f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,9 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -83,6 +86,8 @@ public class RequestPartMethodArgumentResolverTests {
 
 	private MultipartFile multipartFile2;
 
+	private CloseTrackingInputStream trackedStream;
+
 	private MockMultipartHttpServletRequest multipartRequest;
 
 	private NativeWebRequest webRequest;
@@ -116,7 +121,14 @@ public void setup() throws Exception {
 		reset(messageConverter);
 
 		byte[] content = "doesn't matter as long as not empty".getBytes(StandardCharsets.UTF_8);
-		multipartFile1 = new MockMultipartFile("requestPart", "", "text/plain", content);
+		multipartFile1 = new MockMultipartFile("requestPart", "", "text/plain", content) {
+			@Override
+			public InputStream getInputStream() throws IOException {
+				CloseTrackingInputStream in = new CloseTrackingInputStream(super.getInputStream());
+				trackedStream = in;
+				return in;
+			}
+		};
 		multipartFile2 = new MockMultipartFile("requestPart", "", "text/plain", content);
 		multipartRequest = new MockMultipartHttpServletRequest();
 		multipartRequest.addFile(multipartFile1);
@@ -182,8 +194,7 @@ public void resolveMultipartFile() throws Exception {
 	@Test
 	public void resolveMultipartFileList() throws Exception {
 		Object actual = resolver.resolveArgument(paramMultipartFileList, null, webRequest, null);
-		boolean condition = actual instanceof List;
-		assertThat(condition).isTrue();
+		assertThat(actual instanceof List).isTrue();
 		assertThat(actual).isEqualTo(Arrays.asList(multipartFile1, multipartFile2));
 	}
 
@@ -191,8 +202,7 @@ public void resolveMultipartFileList() throws Exception {
 	public void resolveMultipartFileArray() throws Exception {
 		Object actual = resolver.resolveArgument(paramMultipartFileArray, null, webRequest, null);
 		assertThat(actual).isNotNull();
-		boolean condition = actual instanceof MultipartFile[];
-		assertThat(condition).isTrue();
+		assertThat(actual instanceof MultipartFile[]).isTrue();
 		MultipartFile[] parts = (MultipartFile[]) actual;
 		assertThat(parts.length).isEqualTo(2);
 		assertThat(multipartFile1).isEqualTo(parts[0]);
@@ -209,8 +219,7 @@ public void resolveMultipartFileNotAnnotArgument() throws Exception {
 
 		Object result = resolver.resolveArgument(paramMultipartFileNotAnnot, null, webRequest, null);
 
-		boolean condition = result instanceof MultipartFile;
-		assertThat(condition).isTrue();
+		assertThat(result instanceof MultipartFile).isTrue();
 		assertThat(result).as("Invalid result").isEqualTo(expected);
 	}
 
@@ -225,8 +234,7 @@ public void resolvePartArgument() throws Exception {
 		webRequest = new ServletWebRequest(request);
 
 		Object result = resolver.resolveArgument(paramPart, null, webRequest, null);
-		boolean condition = result instanceof Part;
-		assertThat(condition).isTrue();
+		assertThat(result instanceof Part).isTrue();
 		assertThat(result).as("Invalid result").isEqualTo(expected);
 	}
 
@@ -243,8 +251,7 @@ public void resolvePartListArgument() throws Exception {
 		webRequest = new ServletWebRequest(request);
 
 		Object result = resolver.resolveArgument(paramPartList, null, webRequest, null);
-		boolean condition = result instanceof List;
-		assertThat(condition).isTrue();
+		assertThat(result instanceof List).isTrue();
 		assertThat(result).isEqualTo(Arrays.asList(part1, part2));
 	}
 
@@ -261,8 +268,7 @@ public void resolvePartArrayArgument() throws Exception {
 		webRequest = new ServletWebRequest(request);
 
 		Object result = resolver.resolveArgument(paramPartArray, null, webRequest, null);
-		boolean condition = result instanceof Part[];
-		assertThat(condition).isTrue();
+		assertThat(result instanceof Part[]).isTrue();
 		Part[] parts = (Part[]) result;
 		assertThat(parts.length).isEqualTo(2);
 		assertThat(part1).isEqualTo(parts[0]);
@@ -357,8 +363,7 @@ public void resolveOptionalMultipartFileArgument() throws Exception {
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 
 		actualValue = resolver.resolveArgument(optionalMultipartFile, null, webRequest, null);
-		boolean condition = actualValue instanceof Optional;
-		assertThat(condition).isTrue();
+		assertThat(actualValue instanceof Optional).isTrue();
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 	}
 
@@ -399,8 +404,7 @@ public void resolveOptionalMultipartFileList() throws Exception {
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 
 		actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null);
-		boolean condition = actualValue instanceof Optional;
-		assertThat(condition).isTrue();
+		assertThat(actualValue instanceof Optional).isTrue();
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 	}
 
@@ -443,8 +447,7 @@ public void resolveOptionalPartArgument() throws Exception {
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 
 		actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null);
-		boolean condition = actualValue instanceof Optional;
-		assertThat(condition).isTrue();
+		assertThat(actualValue instanceof Optional).isTrue();
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(expected);
 	}
 
@@ -489,8 +492,7 @@ public void resolveOptionalPartList() throws Exception {
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 
 		actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null);
-		boolean condition = actualValue instanceof Optional;
-		assertThat(condition).isTrue();
+		assertThat(actualValue instanceof Optional).isTrue();
 		assertThat(((Optional<?>) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected));
 	}
 
@@ -572,6 +574,7 @@ private void testResolveArgument(SimpleBean argValue, MethodParameter parameter)
 		Object actualValue = resolver.resolveArgument(parameter, mavContainer, webRequest, new ValidatingBinderFactory());
 		assertThat(actualValue).as("Invalid argument value").isEqualTo(argValue);
 		assertThat(mavContainer.isRequestHandled()).as("The requestHandled flag shouldn't change").isFalse();
+		assertThat(trackedStream != null && trackedStream.closed).isTrue();
 	}
 
 
@@ -591,7 +594,7 @@ public String getName() {
 	}
 
 
-	private final class ValidatingBinderFactory implements WebDataBinderFactory {
+	private static class ValidatingBinderFactory implements WebDataBinderFactory {
 
 		@Override
 		public WebDataBinder createBinder(NativeWebRequest webRequest, @Nullable Object target,
@@ -606,6 +609,21 @@ public WebDataBinder createBinder(NativeWebRequest webRequest, @Nullable Object
 	}
 
 
+	private static class CloseTrackingInputStream extends FilterInputStream {
+
+		public boolean closed = false;
+
+		public CloseTrackingInputStream(InputStream in) {
+			super(in);
+		}
+
+		@Override
+		public void close() {
+			this.closed = true;
+		}
+	}
+
+
 	@SuppressWarnings("unused")
 	public void handle(
 			@RequestPart SimpleBean requestPart,

From 6b3052200a2a476a3fdbc41dc4f3cbf2080dfc14 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 12 Jan 2022 16:35:42 +0100
Subject: [PATCH 562/735] Skip "data:" lines without content

Closes gh-27923
---
 .../ServerSentEventHttpMessageReader.java     | 22 ++++++++-------
 ...ServerSentEventHttpMessageReaderTests.java | 28 ++++++++++---------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
index d21ec4fe6196..f012b9283978 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -42,6 +42,7 @@
  *
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 5.0
  */
 public class ServerSentEventHttpMessageReader implements HttpMessageReader<Object> {
@@ -140,22 +141,23 @@ public Flux<Object> read(
 	private Object buildEvent(List<String> lines, ResolvableType valueType, boolean shouldWrap,
 			Map<String, Object> hints) {
 
-		ServerSentEvent.Builder<Object> sseBuilder = shouldWrap ? ServerSentEvent.builder() : null;
+		ServerSentEvent.Builder<Object> sseBuilder = (shouldWrap ? ServerSentEvent.builder() : null);
 		StringBuilder data = null;
 		StringBuilder comment = null;
 
 		for (String line : lines) {
 			if (line.startsWith("data:")) {
-				data = (data != null ? data : new StringBuilder());
-				if (line.charAt(5) != ' ') {
-					data.append(line, 5, line.length());
+				int length = line.length();
+				if (length > 5) {
+					int index = (line.charAt(5) != ' ' ? 5 : 6);
+					if (length > index) {
+						data = (data != null ? data : new StringBuilder());
+						data.append(line, index, line.length());
+						data.append('\n');
+					}
 				}
-				else {
-					data.append(line, 6, line.length());
-				}
-				data.append('\n');
 			}
-			if (shouldWrap) {
+			else if (shouldWrap) {
 				if (line.startsWith("id:")) {
 					sseBuilder.id(line.substring(3).trim());
 				}
diff --git a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
index 82602a526ebd..9079ea38961a 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@
  * Unit tests for {@link ServerSentEventHttpMessageReader}.
  *
  * @author Sebastien Deleuze
+ * @author Juergen Hoeller
  */
 public class ServerSentEventHttpMessageReaderTests extends AbstractLeakCheckingTests {
 
@@ -66,7 +67,7 @@ public void readServerSentEvents() {
 		MockServerHttpRequest request = MockServerHttpRequest.post("/")
 				.body(Mono.just(stringBuffer(
 						"id:c42\nevent:foo\nretry:123\n:bla\n:bla bla\n:bla bla bla\ndata:bar\n\n" +
-						"id:c43\nevent:bar\nretry:456\ndata:baz\n\n")));
+						"id:c43\nevent:bar\nretry:456\ndata:baz\n\ndata:\n\ndata: \n\n")));
 
 		Flux<ServerSentEvent> events = this.reader
 				.read(ResolvableType.forClassWithGenerics(ServerSentEvent.class, String.class),
@@ -87,6 +88,8 @@ public void readServerSentEvents() {
 					assertThat(event.comment()).isNull();
 					assertThat(event.data()).isEqualTo("baz");
 				})
+				.consumeNextWith(event -> assertThat(event.data()).isNull())
+				.consumeNextWith(event -> assertThat(event.data()).isNull())
 				.expectComplete()
 				.verify();
 	}
@@ -175,7 +178,7 @@ public void readPojo() {
 				.verify();
 	}
 
-	@Test // gh-24389
+	@Test  // gh-24389
 	void readPojoWithCommentOnly() {
 		MockServerHttpRequest request = MockServerHttpRequest.post("/")
 				.body(Flux.just(stringBuffer(":ping\n"), stringBuffer("\n")));
@@ -221,7 +224,6 @@ public void readError() {
 
 	@Test
 	public void maxInMemoryLimit() {
-
 		this.reader.setMaxInMemorySize(17);
 
 		MockServerHttpRequest request = MockServerHttpRequest.post("/")
@@ -235,9 +237,8 @@ public void maxInMemoryLimit() {
 				.verify();
 	}
 
-	@Test // gh-24312
+	@Test  // gh-24312
 	public void maxInMemoryLimitAllowsReadingPojoLargerThanDefaultSize() {
-
 		int limit = this.jsonDecoder.getMaxInMemorySize();
 
 		String fooValue = getStringOfSize(limit) + "and then some more";
@@ -259,13 +260,6 @@ public void maxInMemoryLimitAllowsReadingPojoLargerThanDefaultSize() {
 				.verify();
 	}
 
-	private static String getStringOfSize(long size) {
-		StringBuilder content = new StringBuilder("Aa");
-		while (content.length() < size) {
-			content.append(content);
-		}
-		return content.toString();
-	}
 
 	private DataBuffer stringBuffer(String value) {
 		byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
@@ -274,4 +268,12 @@ private DataBuffer stringBuffer(String value) {
 		return buffer;
 	}
 
+	private static String getStringOfSize(long size) {
+		StringBuilder content = new StringBuilder("Aa");
+		while (content.length() < size) {
+			content.append(content);
+		}
+		return content.toString();
+	}
+
 }

From 67c4b4182f787a821a9ff9013b4dddac541e6547 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 12 Jan 2022 16:36:18 +0100
Subject: [PATCH 563/735] Upgrade to Hibernate ORM 5.4.33, Hibernate Validator
 6.2.1, Mockito 4.2, AssertJ 3.22, HtmlUnit 2.56, XMLUnit 2.8.4

---
 build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index da794c5b620d..6012af4ccc51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -123,8 +123,8 @@ configure(allprojects) { project ->
 			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-validator:6.2.0.Final"
+			dependency "org.hibernate:hibernate-core:5.4.33.Final"
+			dependency "org.hibernate:hibernate-validator:6.2.1.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
@@ -191,14 +191,14 @@ configure(allprojects) { project ->
 			dependency "org.junit.support:testng-engine:1.0.1"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.21.0"
-			dependencySet(group: 'org.xmlunit', version: '2.8.3') {
+			dependency "org.assertj:assertj-core:3.22.0"
+			dependencySet(group: 'org.xmlunit', version: '2.8.4') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '4.1.0') {
+			dependencySet(group: 'org.mockito', version: '4.2.0') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
@@ -206,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.1"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.55.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.56.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.55.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.56.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {

From 4b68dfb6f51086115ab2adbe9691188cfcbc958a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 12 Jan 2022 16:42:15 +0100
Subject: [PATCH 564/735] Upgrade to Hibernate ORM 5.6.3, Hibernate Validator
 7.0.2, Jackson 2.13.1

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index d0b043bcc8fe..6a8daed7214a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ configure(allprojects) { project ->
 
 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.13.0"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.13.1"
 			mavenBom "io.netty:netty-bom:4.1.72.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.15"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR11"
@@ -112,8 +112,8 @@ configure(allprojects) { project ->
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core-jakarta:5.6.2.Final"
-			dependency "org.hibernate:hibernate-validator:7.0.1.Final"
+			dependency "org.hibernate:hibernate-core-jakarta:5.6.3.Final"
+			dependency "org.hibernate:hibernate-validator:7.0.2.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 

From 5fb58e51e5d58da884499197928b2a4447b47033 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 12 Jan 2022 17:07:45 +0100
Subject: [PATCH 565/735] Infer UTF-8 encoding for JSON response with MockMvc's
 andDo(print(...))

Prior to this commit, the PrintingResultHandler in MockMvc -- typically
invoked via .andDo(print()) -- printed an `application/json` response
body using the default encoding (ISO-8859-1), which resulted in UTF-8
characters being garbled.

Since an `application/json` response is implicitly encoded using UTF-8,
the PrintingResultHandler now infers UTF-8 encoding for such response
bodies.

Closes gh-27926
---
 .../servlet/result/PrintingResultHandler.java |  8 ++++--
 ...PrintingResultHandlerIntegrationTests.java | 25 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
index f0ea1c5b658d..aae8c3d72546 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.servlet.result;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map;
@@ -27,6 +28,7 @@
 
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -249,7 +251,9 @@ protected void printResponse(MockHttpServletResponse response) throws Exception
 		this.printer.printValue("Error message", response.getErrorMessage());
 		this.printer.printValue("Headers", getResponseHeaders(response));
 		this.printer.printValue("Content type", response.getContentType());
-		this.printer.printValue("Body", response.getContentAsString());
+		String body = (MediaType.APPLICATION_JSON_VALUE.equals(response.getContentType()) ?
+				response.getContentAsString(StandardCharsets.UTF_8) : response.getContentAsString());
+		this.printer.printValue("Body", body);
 		this.printer.printValue("Forwarded URL", response.getForwardedUrl());
 		this.printer.printValue("Redirected URL", response.getRedirectedUrl());
 		printCookies(response.getCookies());
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
index 9d47134e0fb6..21822d731767 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,10 +23,12 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.result.PrintingResultHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -61,6 +63,22 @@ void printMvcResultsToWriter() throws Exception {
 			.contains("Headers = [Set-Cookie:\"enigma=42\", Content-Type:\"text/plain;charset=ISO-8859-1\", Content-Length:\"14\"]");
 	}
 
+	@Test
+	void printMvcResultsToWriterWithJsonResponseBodyInterpretedAsUtf8() throws Exception {
+		StringWriter writer = new StringWriter();
+
+		standaloneSetup(new SimpleController()).build()
+			// "Hallöchen" is German slang for "hello".
+			.perform(get("/utf8").accept(MediaType.APPLICATION_JSON).content("Hallöchen, Welt!".getBytes()).characterEncoding(UTF_8))
+			.andDo(print(writer))
+			// "Grüß dich!" is German for "greetings to you".
+			.andExpect(content().bytes("Grüß dich!".getBytes()));
+
+		assertThat(writer).asString()
+			.contains("Body = Hallöchen, Welt!")
+			.contains("Body = Grüß dich!");
+	}
+
 	@Test
 	void printMvcResultsToWriterWithFailingGlobalResultMatcher() throws Exception {
 		StringWriter writer = new StringWriter();
@@ -92,6 +110,11 @@ String hello(HttpServletResponse response) {
 			response.addCookie(new Cookie("enigma", "42"));
 			return "Hello Response";
 		}
+
+		@GetMapping("/utf8")
+		String utf8(HttpServletResponse response) {
+			return "Grüß dich!";
+		}
 	}
 
 }

From cfefcee788272d04b811849be626afed5c3e21ac Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 13 Jan 2022 08:07:08 +0100
Subject: [PATCH 566/735] Polishing

See gh-27926
---
 .../resulthandlers/PrintingResultHandlerIntegrationTests.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
index 21822d731767..afe8da964e97 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
@@ -69,10 +69,10 @@ void printMvcResultsToWriterWithJsonResponseBodyInterpretedAsUtf8() throws Excep
 
 		standaloneSetup(new SimpleController()).build()
 			// "Hallöchen" is German slang for "hello".
-			.perform(get("/utf8").accept(MediaType.APPLICATION_JSON).content("Hallöchen, Welt!".getBytes()).characterEncoding(UTF_8))
+			.perform(get("/utf8").accept(MediaType.APPLICATION_JSON).content("Hallöchen, Welt!".getBytes(UTF_8)).characterEncoding(UTF_8))
 			.andDo(print(writer))
 			// "Grüß dich!" is German for "greetings to you".
-			.andExpect(content().bytes("Grüß dich!".getBytes()));
+			.andExpect(content().bytes("Grüß dich!".getBytes(UTF_8)));
 
 		assertThat(writer).asString()
 			.contains("Body = Hallöchen, Welt!")

From 3631d2f36ede38086e9209293a4adf6446cd8569 Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Thu, 13 Jan 2022 11:22:39 +0000
Subject: [PATCH 567/735] Next development version (v5.3.16-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 74ccc5d2080b..ce5199c44137 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.15-SNAPSHOT
+version=5.3.16-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From 2d9c9fe9cca01f0851158424134467e96f6debcf Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Thu, 13 Jan 2022 12:24:39 +0100
Subject: [PATCH 568/735] Configure Spring Milestone repository for apiDiff
 task

Prior to this commit, the `apiDiff` custom Gradle task would only use
the configured repositories in the build to generated the API diff
report. This causes issues when the report has to be generated against a
previous milestone: the Spring Framework build only relies on Maven
Central and a specific `libs-spring-framework-build` repository for
building the project. In this case, the task cannot resolve the previous
milestone artifacts to generate the report.

This commit improves the `ApiDiffPlugin` to automatically add the Spring
Milestone repository to the root project configuration when the task is
executed.

Fixes gh-27928
---
 .../org/springframework/build/api/ApiDiffPlugin.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java b/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java
index 931fd1022116..bebd656bf2da 100644
--- a/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java
@@ -16,6 +16,7 @@
 package org.springframework.build.api;
 
 import java.io.File;
+import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
@@ -23,10 +24,14 @@
 
 import me.champeau.gradle.japicmp.JapicmpPlugin;
 import me.champeau.gradle.japicmp.JapicmpTask;
+import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.artifacts.repositories.ArtifactRepository;
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
+import org.gradle.api.artifacts.repositories.RepositoryContentDescriptor;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
@@ -52,6 +57,8 @@ public class ApiDiffPlugin implements Plugin<Project> {
 
 	private static final List<String> PACKAGE_INCLUDES = Collections.singletonList("org.springframework.*");
 
+	private static final URI SPRING_MILESTONE_REPOSITORY = URI.create("https://repo.spring.io/milestone");
+
 	@Override
 	public void apply(Project project) {
 		if (project.hasProperty(BASELINE_VERSION_PROPERTY) && project.equals(project.getRootProject())) {
@@ -68,6 +75,10 @@ private void applyApiDiffConventions(Project project) {
 
 	private void createApiDiffTask(String baselineVersion, Project project) {
 		if (isProjectEligible(project)) {
+			// Add Spring Milestone repository for generating diffs against previous milestones
+			project.getRootProject()
+					.getRepositories()
+					.maven(mavenArtifactRepository -> mavenArtifactRepository.setUrl(SPRING_MILESTONE_REPOSITORY));
 			JapicmpTask apiDiff = project.getTasks().create(TASK_NAME, JapicmpTask.class);
 			apiDiff.setDescription("Generates an API diff report with japicmp");
 			apiDiff.setGroup(JavaBasePlugin.DOCUMENTATION_GROUP);

From 9e8b6feb546982dac33922b34e1f2432c8681ab6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 12 Jan 2022 17:36:48 +0100
Subject: [PATCH 569/735] Polishing

---
 .../util/xml/XmlValidationModeDetector.java   | 27 ++++++++++++-------
 .../xml/XmlValidationModeDetectorTests.java   | 15 ++++++++---
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java b/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
index 19814c2b83f7..32e81c6f1f37 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -58,7 +58,7 @@ public class XmlValidationModeDetector {
 
 
 	/**
-	 * The token in a XML document that declares the DTD to use for validation
+	 * The token in an XML document that declares the DTD to use for validation
 	 * and thus that DTD validation is being used.
 	 */
 	private static final String DOCTYPE = "DOCTYPE";
@@ -82,13 +82,15 @@ public class XmlValidationModeDetector {
 
 	/**
 	 * Detect the validation mode for the XML document in the supplied {@link InputStream}.
-	 * Note that the supplied {@link InputStream} is closed by this method before returning.
+	 * <p>Note that the supplied {@link InputStream} is closed by this method before returning.
 	 * @param inputStream the InputStream to parse
 	 * @throws IOException in case of I/O failure
 	 * @see #VALIDATION_DTD
 	 * @see #VALIDATION_XSD
 	 */
 	public int detectValidationMode(InputStream inputStream) throws IOException {
+		this.inComment = false;
+
 		// Peek into the file to look for DOCTYPE.
 		try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
 			boolean isDtdValidated = false;
@@ -125,9 +127,11 @@ private boolean hasDoctype(String content) {
 	}
 
 	/**
-	 * Does the supplied content contain an XML opening tag. If the parse state is currently
-	 * in an XML comment then this method always returns false. It is expected that all comment
-	 * tokens will have consumed for the supplied content before passing the remainder to this method.
+	 * Determine if the supplied content contains an XML opening tag.
+	 * <p>It is expected that all comment tokens will have been consumed for the
+	 * supplied content before passing the remainder to this method. However, as
+	 * a sanity check, if the parse state is currently in an XML comment this
+	 * method always returns {@code false}.
 	 */
 	private boolean hasOpeningTag(String content) {
 		if (this.inComment) {
@@ -166,7 +170,7 @@ private String consumeCommentTokens(String line) {
 	}
 
 	/**
-	 * Consume the next comment token, update the "inComment" flag
+	 * Consume the next comment token, update the "inComment" flag,
 	 * and return the remaining content.
 	 */
 	@Nullable
@@ -183,14 +187,19 @@ private int startComment(String line) {
 		return commentToken(line, START_COMMENT, true);
 	}
 
+	/**
+	 * Try to consume the {@link #END_COMMENT} token.
+	 * @see #commentToken(String, String, boolean)
+	 */
 	private int endComment(String line) {
 		return commentToken(line, END_COMMENT, false);
 	}
 
 	/**
 	 * Try to consume the supplied token against the supplied content and update the
-	 * in comment parse state to the supplied value. Returns the index into the content
-	 * which is after the token or -1 if the token is not found.
+	 * "in comment" parse state to the supplied value.
+	 * <p>Returns the index into the content which is after the token or -1 if the
+	 * token is not found.
 	 */
 	private int commentToken(String line, String token, boolean inCommentIfPresent) {
 		int index = line.indexOf(token);
diff --git a/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java b/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java
index 631a61d4f742..5951d29830b6 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.util.xml;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 import org.junit.jupiter.params.ParameterizedTest;
@@ -39,8 +40,16 @@ class XmlValidationModeDetectorTests {
 	@ValueSource(strings = { "dtdWithTrailingComment.xml", "dtdWithLeadingComment.xml", "dtdWithCommentOnNextLine.xml",
 		"dtdWithMultipleComments.xml" })
 	void dtdDetection(String fileName) throws Exception {
-		InputStream inputStream = getClass().getResourceAsStream(fileName);
-		assertThat(xmlValidationModeDetector.detectValidationMode(inputStream)).isEqualTo(VALIDATION_DTD);
+		assertValidationMode(fileName, VALIDATION_DTD);
+	}
+
+
+	private void assertValidationMode(String fileName, int expectedValidationMode) throws IOException {
+		try (InputStream inputStream = getClass().getResourceAsStream(fileName)) {
+			assertThat(xmlValidationModeDetector.detectValidationMode(inputStream))
+				.as("Validation Mode")
+				.isEqualTo(expectedValidationMode);
+		}
 	}
 
 }

From 4b1b25496bfd72c288c3af07c741183d0d90567a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 13 Jan 2022 14:44:05 +0100
Subject: [PATCH 570/735] Improve comment parsing in DTD/XSD detection
 algorithm

Prior to this commit, XmlValidationModeDetector did not properly parse
all categories of comments (described below). When such categories of
comments were encountered XmlValidationModeDetector may have
incorrectly detected that an XML file used a DTD when it used an XSD,
or vice versa.

This commit revises the parsing algorithm in XmlValidationModeDetector
so that multi-line comments and multiple comments on a single line are
properly recognized.

Specifically, with this commit the following categories of comments are
now handled properly.

- Multiple comments on a single line
- Multi-line comment: beginning on one line and then ending on another
  line with an additional comment following on that same line.
- Multi-line comment: beginning at the end of XML content on one line
  and then spanning multiple lines.

Closes gh-27915
---
 .../util/xml/XmlValidationModeDetector.java   | 19 +++++++---------
 .../xml/XmlValidationModeDetectorTests.java   | 22 +++++++++++++++++--
 .../util/xml/dtdWithNoComments.xml            |  6 +++++
 ...WithTrailingCommentAcrossMultipleLines.xml |  6 +++++
 .../util/xml/xsdWithDoctypeInComment.xml      |  8 +++++++
 ...CommentWithAdditionalCommentOnSameLine.xml |  9 ++++++++
 .../util/xml/xsdWithMultipleComments.xml      | 10 +++++++++
 .../util/xml/xsdWithNoComments.xml            |  8 +++++++
 8 files changed, 75 insertions(+), 13 deletions(-)
 create mode 100644 spring-core/src/test/resources/org/springframework/util/xml/dtdWithNoComments.xml
 create mode 100644 spring-core/src/test/resources/org/springframework/util/xml/dtdWithTrailingCommentAcrossMultipleLines.xml
 create mode 100644 spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInComment.xml
 create mode 100644 spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInOpenCommentWithAdditionalCommentOnSameLine.xml
 create mode 100644 spring-core/src/test/resources/org/springframework/util/xml/xsdWithMultipleComments.xml
 create mode 100644 spring-core/src/test/resources/org/springframework/util/xml/xsdWithNoComments.xml

diff --git a/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java b/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
index 32e81c6f1f37..869f9ca051bb 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
@@ -97,7 +97,7 @@ public int detectValidationMode(InputStream inputStream) throws IOException {
 			String content;
 			while ((content = reader.readLine()) != null) {
 				content = consumeCommentTokens(content);
-				if (this.inComment || !StringUtils.hasText(content)) {
+				if (!StringUtils.hasText(content)) {
 					continue;
 				}
 				if (hasDoctype(content)) {
@@ -143,11 +143,10 @@ private boolean hasOpeningTag(String content) {
 	}
 
 	/**
-	 * Consume all leading and trailing comments in the given String and return
-	 * the remaining content, which may be empty since the supplied content might
-	 * be all comment data.
+	 * Consume all comments in the given String and return the remaining content,
+	 * which may be empty since the supplied content might be all comment data.
+	 * <p>This method takes the current "in comment" parsing state into account.
 	 */
-	@Nullable
 	private String consumeCommentTokens(String line) {
 		int indexOfStartComment = line.indexOf(START_COMMENT);
 		if (indexOfStartComment == -1 && !line.contains(END_COMMENT)) {
@@ -156,17 +155,15 @@ private String consumeCommentTokens(String line) {
 
 		String result = "";
 		String currLine = line;
-		if (indexOfStartComment >= 0) {
+		if (!this.inComment && (indexOfStartComment >= 0)) {
 			result = line.substring(0, indexOfStartComment);
 			currLine = line.substring(indexOfStartComment);
 		}
 
-		while ((currLine = consume(currLine)) != null) {
-			if (!this.inComment && !currLine.trim().startsWith(START_COMMENT)) {
-				return result + currLine;
-			}
+		if ((currLine = consume(currLine)) != null) {
+			result += consumeCommentTokens(currLine);
 		}
-		return null;
+		return result;
 	}
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java b/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java
index 5951d29830b6..35a5e13222ca 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/XmlValidationModeDetectorTests.java
@@ -24,6 +24,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.util.xml.XmlValidationModeDetector.VALIDATION_DTD;
+import static org.springframework.util.xml.XmlValidationModeDetector.VALIDATION_XSD;
 
 /**
  * Unit tests for {@link XmlValidationModeDetector}.
@@ -37,12 +38,29 @@ class XmlValidationModeDetectorTests {
 
 
 	@ParameterizedTest
-	@ValueSource(strings = { "dtdWithTrailingComment.xml", "dtdWithLeadingComment.xml", "dtdWithCommentOnNextLine.xml",
-		"dtdWithMultipleComments.xml" })
+	@ValueSource(strings = {
+		"dtdWithNoComments.xml",
+		"dtdWithLeadingComment.xml",
+		"dtdWithTrailingComment.xml",
+		"dtdWithTrailingCommentAcrossMultipleLines.xml",
+		"dtdWithCommentOnNextLine.xml",
+		"dtdWithMultipleComments.xml"
+	})
 	void dtdDetection(String fileName) throws Exception {
 		assertValidationMode(fileName, VALIDATION_DTD);
 	}
 
+	@ParameterizedTest
+	@ValueSource(strings = {
+		"xsdWithNoComments.xml",
+		"xsdWithMultipleComments.xml",
+		"xsdWithDoctypeInComment.xml",
+		"xsdWithDoctypeInOpenCommentWithAdditionalCommentOnSameLine.xml"
+	})
+	void xsdDetection(String fileName) throws Exception {
+		assertValidationMode(fileName, VALIDATION_XSD);
+	}
+
 
 	private void assertValidationMode(String fileName, int expectedValidationMode) throws IOException {
 		try (InputStream inputStream = getClass().getResourceAsStream(fileName)) {
diff --git a/spring-core/src/test/resources/org/springframework/util/xml/dtdWithNoComments.xml b/spring-core/src/test/resources/org/springframework/util/xml/dtdWithNoComments.xml
new file mode 100644
index 000000000000..299c52abef96
--- /dev/null
+++ b/spring-core/src/test/resources/org/springframework/util/xml/dtdWithNoComments.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+</beans>
diff --git a/spring-core/src/test/resources/org/springframework/util/xml/dtdWithTrailingCommentAcrossMultipleLines.xml b/spring-core/src/test/resources/org/springframework/util/xml/dtdWithTrailingCommentAcrossMultipleLines.xml
new file mode 100644
index 000000000000..68776b4f61ff
--- /dev/null
+++ b/spring-core/src/test/resources/org/springframework/util/xml/dtdWithTrailingCommentAcrossMultipleLines.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd"><!-- comment --><beans><!--
+trailing comment across multiple lines -->
+
+
+</beans>
diff --git a/spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInComment.xml b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInComment.xml
new file mode 100644
index 000000000000..3f0fd05ed936
--- /dev/null
+++ b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInComment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd"> -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://www.springframework.org/schema/beans
+		https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+</beans>
diff --git a/spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInOpenCommentWithAdditionalCommentOnSameLine.xml b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInOpenCommentWithAdditionalCommentOnSameLine.xml
new file mode 100644
index 000000000000..3d831932a9d9
--- /dev/null
+++ b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithDoctypeInOpenCommentWithAdditionalCommentOnSameLine.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd"> -->    <!-- additional comment on same line -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://www.springframework.org/schema/beans
+		https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+</beans>
diff --git a/spring-core/src/test/resources/org/springframework/util/xml/xsdWithMultipleComments.xml b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithMultipleComments.xml
new file mode 100644
index 000000000000..8843539e4ad4
--- /dev/null
+++ b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithMultipleComments.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- comment #1 -->  <!-- comment #2 -->  <beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://www.springframework.org/schema/beans
+		https://www.springframework.org/schema/beans/spring-beans.xsd"><!--
+trailing  
+      comment
+-->
+
+</beans>
diff --git a/spring-core/src/test/resources/org/springframework/util/xml/xsdWithNoComments.xml b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithNoComments.xml
new file mode 100644
index 000000000000..4f178c702f1c
--- /dev/null
+++ b/spring-core/src/test/resources/org/springframework/util/xml/xsdWithNoComments.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://www.springframework.org/schema/beans
+		https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+</beans>

From c92b9bc7fe3c6a57cf5f15f53dd4afabd0b3e5ad Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 13 Jan 2022 17:55:37 +0100
Subject: [PATCH 571/735] Properly abort transferTo test for Undertow

Instead of simply returning prematurely and allowing the tests to be
marked as SUCCESS, this commit uses a failed assumption to abort the
the trasferTo tests for Undertow, resulting in the parameterized test
invocation properly being marked as ABORTED.

See gh-25310
---
 .../reactive/function/MultipartIntegrationTests.java   | 10 +++++-----
 .../method/annotation/MultipartIntegrationTests.java   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
index a1f28b1b63fe..a67e7c352d87 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.springframework.web.reactive.function.server.RouterFunctions.route;
 
 /**
@@ -94,10 +95,9 @@ void parts(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void transferTo(HttpServer httpServer) throws Exception {
-		// TODO: check why Undertow fails
-		if (httpServer instanceof UndertowHttpServer) {
-			return;
-		}
+		// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
+		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
+
 		startServer(httpServer);
 
 		Mono<String> result = webClient
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java
index 1b49442ce2bd..98da50cd66fd 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,7 @@
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
@@ -164,10 +165,9 @@ void filePartsMono(HttpServer httpServer) throws Exception {
 
 	@ParameterizedHttpServerTest
 	void transferTo(HttpServer httpServer) throws Exception {
-		// TODO: check why Undertow fails
-		if (httpServer instanceof UndertowHttpServer) {
-			return;
-		}
+		// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
+		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
+
 		startServer(httpServer);
 
 		Flux<String> result = webClient

From f43fb41bcebfa646c24f2f757fc23ecaf3fc8dd2 Mon Sep 17 00:00:00 2001
From: Frank Chen <chenjt5@lenovo.com>
Date: Fri, 14 Jan 2022 20:20:18 +0800
Subject: [PATCH 572/735] Simplify debugging of Undertow transferTo issue

This commit introduces a dedicated (disabled) transferToWithUndertow()
test method to simplify debugging of transferTo issues with Undertow.

See gh-25310
Closes gh-27908
---
 .../reactive/function/MultipartIntegrationTests.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
index eff17588a57e..4a76b157d37a 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
@@ -23,6 +23,8 @@
 import java.time.Duration;
 import java.util.Map;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 import reactor.test.StepVerifier;
@@ -101,6 +103,16 @@ void transferTo(HttpServer httpServer) throws Exception {
 		// TODO Determine why Undertow fails: https://github.com/spring-projects/spring-framework/issues/25310
 		assumeFalse(httpServer instanceof UndertowHttpServer, "Undertow currently fails with transferTo");
 
+		verifyTransferTo(httpServer);
+	}
+
+	@Disabled("Unstable on Undertow,Use @RepeatedTest(100) for verify")
+	@Test
+	void transferToWithUndertow() throws Exception {
+		verifyTransferTo(new UndertowHttpServer());
+	}
+
+	private void verifyTransferTo(HttpServer httpServer) throws Exception {
 		startServer(httpServer);
 
 		Mono<String> result = webClient

From 316e84f04f3dbec3ea5ab8563cc920fb21f49749 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 14 Jan 2022 15:53:41 +0100
Subject: [PATCH 573/735] Polish contribution

See gh-27908
---
 .../web/reactive/function/MultipartIntegrationTests.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
index 4a76b157d37a..c73aa7dc3a26 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
@@ -106,7 +106,8 @@ void transferTo(HttpServer httpServer) throws Exception {
 		verifyTransferTo(httpServer);
 	}
 
-	@Disabled("Unstable on Undertow,Use @RepeatedTest(100) for verify")
+	@Disabled("Unstable on Undertow: https://github.com/spring-projects/spring-framework/issues/25310")
+	// Using @RepeatedTest(100), this test fails approximately 10% - 20% of the time.
 	@Test
 	void transferToWithUndertow() throws Exception {
 		verifyTransferTo(new UndertowHttpServer());

From 261bc2ad6acf974933267bbfcc2586c286cccad0 Mon Sep 17 00:00:00 2001
From: Marten Deinum <mdeinum@gmail.com>
Date: Mon, 17 Jan 2022 07:54:07 +0100
Subject: [PATCH 574/735] Fix regression in
 BeanPropertyRowMapper.underscoreName(String)

Commit 6316a35 introduced a regression for property names starting with
multiple uppercase letters (such as setEMail(...)).

This commit fixes that regression and includes an additional test to
cover this case.

See gh-27929
Closes gh-27941
---
 .../jdbc/core/BeanPropertyRowMapper.java      |  5 +-
 .../jdbc/core/AbstractRowMapperTests.java     | 16 +++-
 .../jdbc/core/BeanPropertyRowMapperTests.java | 14 +++-
 .../jdbc/core/test/EmailPerson.java           | 78 +++++++++++++++++++
 4 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/core/test/EmailPerson.java

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
index 446ef64c5e4a..5399e9c4741b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -273,7 +273,8 @@ protected String underscoreName(String name) {
 		}
 
 		StringBuilder result = new StringBuilder();
-		for (int i = 0; i < name.length(); i++) {
+		result.append(Character.toLowerCase(name.charAt(0)));
+		for (int i = 1; i < name.length(); i++) {
 			char c = name.charAt(i);
 			if (Character.isUpperCase(c)) {
 				result.append('_').append(Character.toLowerCase(c));
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
index 601bbdfd7a1d..bee0bade090f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -30,6 +30,7 @@
 import org.springframework.jdbc.core.test.ConcretePerson;
 import org.springframework.jdbc.core.test.ConstructorPerson;
 import org.springframework.jdbc.core.test.DatePerson;
+import org.springframework.jdbc.core.test.EmailPerson;
 import org.springframework.jdbc.core.test.Person;
 import org.springframework.jdbc.core.test.SpacePerson;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
@@ -97,6 +98,14 @@ private void verifyPersonViaBeanWrapper(Object person) {
 		assertThat(bw.getPropertyValue("balance")).isEqualTo(new BigDecimal("1234.56"));
 	}
 
+	protected void verifyPerson(EmailPerson person) {
+		assertThat(person.getName()).isEqualTo("Bubba");
+		assertThat(person.getAge()).isEqualTo(22L);
+		assertThat(person.getBirth_date()).usingComparator(Date::compareTo).isEqualTo(new java.util.Date(1221222L));
+		assertThat(person.getBalance()).isEqualTo(new BigDecimal("1234.56"));
+		assertThat(person.getEMail()).isEqualTo("hello@world.info");
+	}
+
 
 	protected enum MockType {ONE, TWO, THREE};
 
@@ -136,19 +145,22 @@ public Mock(MockType type) throws Exception {
 			given(resultSet.getDate(3)).willReturn(new java.sql.Date(1221222L));
 			given(resultSet.getBigDecimal(4)).willReturn(new BigDecimal("1234.56"));
 			given(resultSet.getObject(4)).willReturn(new BigDecimal("1234.56"));
+			given(resultSet.getString(5)).willReturn("hello@world.info");
 			given(resultSet.wasNull()).willReturn(type == MockType.TWO);
 
-			given(resultSetMetaData.getColumnCount()).willReturn(4);
+			given(resultSetMetaData.getColumnCount()).willReturn(5);
 			given(resultSetMetaData.getColumnLabel(1)).willReturn(
 					type == MockType.THREE ? "Last Name" : "name");
 			given(resultSetMetaData.getColumnLabel(2)).willReturn("age");
 			given(resultSetMetaData.getColumnLabel(3)).willReturn("birth_date");
 			given(resultSetMetaData.getColumnLabel(4)).willReturn("balance");
+			given(resultSetMetaData.getColumnLabel(5)).willReturn("e_mail");
 
 			given(resultSet.findColumn("name")).willReturn(1);
 			given(resultSet.findColumn("age")).willReturn(2);
 			given(resultSet.findColumn("birth_date")).willReturn(3);
 			given(resultSet.findColumn("balance")).willReturn(4);
+			given(resultSet.findColumn("e_mail")).willReturn(5);
 
 			jdbcTemplate = new JdbcTemplate();
 			jdbcTemplate.setDataSource(new SingleConnectionDataSource(connection, false));
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
index 6e1f84a632d5..c61bab0a297a 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,6 +24,7 @@
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.jdbc.core.test.ConcretePerson;
 import org.springframework.jdbc.core.test.DatePerson;
+import org.springframework.jdbc.core.test.EmailPerson;
 import org.springframework.jdbc.core.test.ExtendedPerson;
 import org.springframework.jdbc.core.test.Person;
 import org.springframework.jdbc.core.test.SpacePerson;
@@ -134,4 +135,15 @@ public void testQueryWithSpaceInColumnNameAndLocalDate() throws Exception {
 		mock.verifyClosed();
 	}
 
+	@Test
+	public void testQueryWithUnderscoreAndPersonWithMultipleAdjacentUppercaseLettersInPropertyName() throws Exception {
+		Mock mock = new Mock();
+		List<EmailPerson> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance, e_mail from people",
+				new BeanPropertyRowMapper<>(EmailPerson.class));
+		assertThat(result.size()).isEqualTo(1);
+		verifyPerson(result.get(0));
+		mock.verifyClosed();
+	}
+
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/EmailPerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/EmailPerson.java
new file mode 100644
index 000000000000..f9c6996f7ab8
--- /dev/null
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/EmailPerson.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2022 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.jdbc.core.test;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Thomas Risberg
+ * @author Marten Deinum
+ */
+public class EmailPerson {
+
+	private String name;
+
+	private long age;
+
+	private Date birth_date;
+
+	private BigDecimal balance;
+
+	private String eMail;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public long getAge() {
+		return age;
+	}
+
+	public void setAge(long age) {
+		this.age = age;
+	}
+
+	public Date getBirth_date() {
+		return birth_date;
+	}
+
+	public void setBirth_date(Date birth_date) {
+		this.birth_date = birth_date;
+	}
+
+	public BigDecimal getBalance() {
+		return balance;
+	}
+
+	public void setBalance(BigDecimal balance) {
+		this.balance = balance;
+	}
+
+	public void setEMail(String email) {
+		this.eMail=email;
+	}
+
+	public String getEMail() {
+		return this.eMail;
+	}
+
+}

From 420ff46b2acfc91a945a12a1ae0ea11f61b43e3e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 17 Jan 2022 16:46:00 +0100
Subject: [PATCH 575/735] Polishing

---
 .../jdbc/core/BeanPropertyRowMapperTests.java | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
index c61bab0a297a..8cb5cd45d796 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
@@ -31,74 +31,77 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 /**
+ * Tests for {@link BeanPropertyRowMapper}.
+ *
  * @author Thomas Risberg
  * @author Juergen Hoeller
+ * @author Sam Brannen
  */
-public class BeanPropertyRowMapperTests extends AbstractRowMapperTests {
+class BeanPropertyRowMapperTests extends AbstractRowMapperTests {
 
 	@Test
 	@SuppressWarnings({"unchecked", "rawtypes"})
-	public void testOverridingDifferentClassDefinedForMapping() {
+	void overridingDifferentClassDefinedForMapping() {
 		BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class);
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() ->
 				mapper.setMappedClass(Long.class));
 	}
 
 	@Test
-	public void testOverridingSameClassDefinedForMapping() {
+	void overridingSameClassDefinedForMapping() {
 		BeanPropertyRowMapper<Person> mapper = new BeanPropertyRowMapper<>(Person.class);
-		mapper.setMappedClass(Person.class);
+		assertThatNoException().isThrownBy(() -> mapper.setMappedClass(Person.class));
 	}
 
 	@Test
-	public void testStaticQueryWithRowMapper() throws Exception {
+	void staticQueryWithRowMapper() throws Exception {
 		Mock mock = new Mock();
 		List<Person> result = mock.getJdbcTemplate().query(
 				"select name, age, birth_date, balance from people",
 				new BeanPropertyRowMapper<>(Person.class));
-		assertThat(result.size()).isEqualTo(1);
+		assertThat(result).hasSize(1);
 		verifyPerson(result.get(0));
 		mock.verifyClosed();
 	}
 
 	@Test
-	public void testMappingWithInheritance() throws Exception {
+	void mappingWithInheritance() throws Exception {
 		Mock mock = new Mock();
 		List<ConcretePerson> result = mock.getJdbcTemplate().query(
 				"select name, age, birth_date, balance from people",
 				new BeanPropertyRowMapper<>(ConcretePerson.class));
-		assertThat(result.size()).isEqualTo(1);
+		assertThat(result).hasSize(1);
 		verifyPerson(result.get(0));
 		mock.verifyClosed();
 	}
 
 	@Test
-	public void testMappingWithNoUnpopulatedFieldsFound() throws Exception {
+	void mappingWithNoUnpopulatedFieldsFound() throws Exception {
 		Mock mock = new Mock();
 		List<ConcretePerson> result = mock.getJdbcTemplate().query(
 				"select name, age, birth_date, balance from people",
 				new BeanPropertyRowMapper<>(ConcretePerson.class, true));
-		assertThat(result.size()).isEqualTo(1);
+		assertThat(result).hasSize(1);
 		verifyPerson(result.get(0));
 		mock.verifyClosed();
 	}
 
 	@Test
-	public void testMappingWithUnpopulatedFieldsNotChecked() throws Exception {
+	void mappingWithUnpopulatedFieldsNotChecked() throws Exception {
 		Mock mock = new Mock();
 		List<ExtendedPerson> result = mock.getJdbcTemplate().query(
 				"select name, age, birth_date, balance from people",
 				new BeanPropertyRowMapper<>(ExtendedPerson.class));
-		assertThat(result.size()).isEqualTo(1);
-		ExtendedPerson bean = result.get(0);
-		verifyPerson(bean);
+		assertThat(result).hasSize(1);
+		verifyPerson(result.get(0));
 		mock.verifyClosed();
 	}
 
 	@Test
-	public void testMappingWithUnpopulatedFieldsNotAccepted() throws Exception {
+	void mappingWithUnpopulatedFieldsNotAccepted() throws Exception {
 		Mock mock = new Mock();
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() ->
 				mock.getJdbcTemplate().query("select name, age, birth_date, balance from people",
@@ -106,7 +109,7 @@ public void testMappingWithUnpopulatedFieldsNotAccepted() throws Exception {
 	}
 
 	@Test
-	public void testMappingNullValue() throws Exception {
+	void mappingNullValue() throws Exception {
 		BeanPropertyRowMapper<Person> mapper = new BeanPropertyRowMapper<>(Person.class);
 		Mock mock = new Mock(MockType.TWO);
 		assertThatExceptionOfType(TypeMismatchException.class).isThrownBy(() ->
@@ -114,34 +117,34 @@ public void testMappingNullValue() throws Exception {
 	}
 
 	@Test
-	public void testQueryWithSpaceInColumnNameAndLocalDateTime() throws Exception {
+	void queryWithSpaceInColumnNameAndLocalDateTime() throws Exception {
 		Mock mock = new Mock(MockType.THREE);
 		List<SpacePerson> result = mock.getJdbcTemplate().query(
 				"select last_name as \"Last Name\", age, birth_date, balance from people",
 				new BeanPropertyRowMapper<>(SpacePerson.class));
-		assertThat(result.size()).isEqualTo(1);
+		assertThat(result).hasSize(1);
 		verifyPerson(result.get(0));
 		mock.verifyClosed();
 	}
 
 	@Test
-	public void testQueryWithSpaceInColumnNameAndLocalDate() throws Exception {
+	void queryWithSpaceInColumnNameAndLocalDate() throws Exception {
 		Mock mock = new Mock(MockType.THREE);
 		List<DatePerson> result = mock.getJdbcTemplate().query(
 				"select last_name as \"Last Name\", age, birth_date, balance from people",
 				new BeanPropertyRowMapper<>(DatePerson.class));
-		assertThat(result.size()).isEqualTo(1);
+		assertThat(result).hasSize(1);
 		verifyPerson(result.get(0));
 		mock.verifyClosed();
 	}
 
 	@Test
-	public void testQueryWithUnderscoreAndPersonWithMultipleAdjacentUppercaseLettersInPropertyName() throws Exception {
+	void queryWithUnderscoreInColumnNameAndPersonWithMultipleAdjacentUppercaseLettersInPropertyName() throws Exception {
 		Mock mock = new Mock();
 		List<EmailPerson> result = mock.getJdbcTemplate().query(
 				"select name, age, birth_date, balance, e_mail from people",
 				new BeanPropertyRowMapper<>(EmailPerson.class));
-		assertThat(result.size()).isEqualTo(1);
+		assertThat(result).hasSize(1);
 		verifyPerson(result.get(0));
 		mock.verifyClosed();
 	}

From 420c4f3df3809f5d394fd54a338ea0a1d91a14fe Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 17 Jan 2022 16:47:16 +0100
Subject: [PATCH 576/735] Explicitly test
 BeanPropertyRowMapper.underscoreName(String)

See gh-27929
---
 .../jdbc/core/BeanPropertyRowMapperTests.java    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
index 8cb5cd45d796..99e9eb416274 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
@@ -19,6 +19,8 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -149,4 +151,18 @@ void queryWithUnderscoreInColumnNameAndPersonWithMultipleAdjacentUppercaseLetter
 		mock.verifyClosed();
 	}
 
+	@ParameterizedTest
+	@CsvSource({
+		"age, age",
+		"lastName, last_name",
+		"Name, name",
+		"FirstName, first_name",
+		"EMail, e_mail",
+		"URL, u_r_l", // likely undesirable, but that's the status quo
+	})
+	void underscoreName(String input, String expected) {
+		BeanPropertyRowMapper<?> mapper = new BeanPropertyRowMapper<>(Object.class);
+		assertThat(mapper.underscoreName(input)).isEqualTo(expected);
+	}
+
 }

From 71f74695788fda416b7aeba510c98180fb589187 Mon Sep 17 00:00:00 2001
From: Jerome Prinet <jprinet@gradle.com>
Date: Mon, 17 Jan 2022 15:18:14 +0100
Subject: [PATCH 577/735] Upgrade to Gradle Enterprise 3.8.1

Closes gh-27942
---
 settings.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 0f97d1fcaa87..247d88ee6668 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,8 +6,8 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.7.2"
-	id "io.spring.ge.conventions" version "0.0.7"
+	id "com.gradle.enterprise" version "3.8.1"
+	id "io.spring.ge.conventions" version "0.0.9"
 }
 
 include "spring-aop"

From d02d5adb5465d51885d374c55bce8bbb8dbd6279 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 17 Jan 2022 18:03:27 +0100
Subject: [PATCH 578/735] Download gradle-enterprise-conventions plugin from
 "release" repo

See gh-27942
---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 247d88ee6668..6913d57d47dd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven { url "https://repo.spring.io/plugins-release" }
+		maven { url "https://repo.spring.io/release" }
 	}
 }
 

From 5c76ff5ef68c995852b82996501458a7defd914f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 18 Jan 2022 16:00:50 +0100
Subject: [PATCH 579/735] Ensure unresolvable placeholders can be ignored with
 @Value

Prior to this commit, if a PropertySourcesPlaceholderConfigurer bean
was configured with its ignoreUnresolvablePlaceholders flag set to
true, unresolvable placeholders in an @Value annotation were not
ignored, resulting in a BeanCreationException for the bean using @Value.

For example, given a property declared as `my.app.var = ${var}` without
a corresponding `var` property declared, an attempt to resolve
`@Value("${my.app.var}")` resulted in the following exception.

java.lang.IllegalArgumentException: Could not resolve placeholder 'var' in value "${var}"

This commit fixes this by modifying
PropertySourcesPlaceholderConfigurer's postProcessBeanFactory(...)
method so that a local PropertyResolver is created if the
ignoreUnresolvablePlaceholders flag is set to true. The local
PropertyResolver then enforces that flag, since the Environment in the
ApplicationContext is most likely not configured with
ignoreUnresolvablePlaceholders set to true.

Closes gh-27947
---
 .../PropertySourcesPlaceholderConfigurer.java | 20 ++++-
 ...ertySourcesPlaceholderConfigurerTests.java | 73 ++++++++++++++++++-
 2 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
index a0907a1f3a15..6b5824cea5e1 100644
--- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,12 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
 import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.ConfigurablePropertyResolver;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.env.PropertyResolver;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.PropertySources;
 import org.springframework.core.env.PropertySourcesPropertyResolver;
@@ -57,6 +59,7 @@
  *
  * @author Chris Beams
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.1
  * @see org.springframework.core.env.ConfigurableEnvironment
  * @see org.springframework.beans.factory.config.PlaceholderConfigurerSupport
@@ -129,12 +132,25 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 		if (this.propertySources == null) {
 			this.propertySources = new MutablePropertySources();
 			if (this.environment != null) {
+				PropertyResolver propertyResolver = this.environment;
+				// If the ignoreUnresolvablePlaceholders flag is set to true, we have to create a
+				// local PropertyResolver to enforce that setting, since the Environment is most
+				// likely not configured with ignoreUnresolvablePlaceholders set to true.
+				// See https://github.com/spring-projects/spring-framework/issues/27947
+				if (this.ignoreUnresolvablePlaceholders && (this.environment instanceof ConfigurableEnvironment)) {
+					ConfigurableEnvironment configurableEnvironment = (ConfigurableEnvironment) this.environment;
+					PropertySourcesPropertyResolver resolver =
+							new PropertySourcesPropertyResolver(configurableEnvironment.getPropertySources());
+					resolver.setIgnoreUnresolvableNestedPlaceholders(true);
+					propertyResolver = resolver;
+				}
+				PropertyResolver propertyResolverToUse = propertyResolver;
 				this.propertySources.addLast(
 					new PropertySource<Environment>(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, this.environment) {
 						@Override
 						@Nullable
 						public String getProperty(String key) {
-							return this.source.getProperty(key);
+							return propertyResolverToUse.getProperty(key);
 						}
 					}
 				);
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
index bdb41244bdd5..42fe1a715e28 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
@@ -21,9 +21,14 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.testfixture.beans.TestBean;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
@@ -40,8 +45,11 @@
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 
 /**
+ * Tests for {@link PropertySourcesPlaceholderConfigurer}.
+ *
  * @author Chris Beams
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.1
  */
 public class PropertySourcesPlaceholderConfigurerTests {
@@ -159,8 +167,11 @@ public void ignoreUnresolvablePlaceholders_falseIsDefault() {
 
 		PropertySourcesPlaceholderConfigurer ppc = new PropertySourcesPlaceholderConfigurer();
 		//pc.setIgnoreUnresolvablePlaceholders(false); // the default
-		assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(() ->
-				ppc.postProcessBeanFactory(bf));
+		assertThatExceptionOfType(BeanDefinitionStoreException.class)
+			.isThrownBy(() -> ppc.postProcessBeanFactory(bf))
+			.havingCause()
+				.isExactlyInstanceOf(IllegalArgumentException.class)
+				.withMessage("Could not resolve placeholder 'my.name' in value \"${my.name}\"");
 	}
 
 	@Test
@@ -177,6 +188,38 @@ public void ignoreUnresolvablePlaceholders_true() {
 		assertThat(bf.getBean(TestBean.class).getName()).isEqualTo("${my.name}");
 	}
 
+	@Test
+	// https://github.com/spring-projects/spring-framework/issues/27947
+	public void ignoreUnresolvablePlaceholdersInAtValueAnnotation__falseIsDefault() {
+		MockPropertySource mockPropertySource = new MockPropertySource("test");
+		mockPropertySource.setProperty("my.key", "${enigma}");
+		@SuppressWarnings("resource")
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.getEnvironment().getPropertySources().addLast(mockPropertySource);
+		context.register(IgnoreUnresolvablePlaceholdersFalseConfig.class);
+
+		assertThatExceptionOfType(BeanCreationException.class)
+			.isThrownBy(context::refresh)
+			.havingCause()
+				.isExactlyInstanceOf(IllegalArgumentException.class)
+				.withMessage("Could not resolve placeholder 'enigma' in value \"${enigma}\"");
+	}
+
+	@Test
+	// https://github.com/spring-projects/spring-framework/issues/27947
+	public void ignoreUnresolvablePlaceholdersInAtValueAnnotation_true() {
+		MockPropertySource mockPropertySource = new MockPropertySource("test");
+		mockPropertySource.setProperty("my.key", "${enigma}");
+		@SuppressWarnings("resource")
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.getEnvironment().getPropertySources().addLast(mockPropertySource);
+		context.register(IgnoreUnresolvablePlaceholdersTrueConfig.class);
+		context.refresh();
+
+		IgnoreUnresolvablePlaceholdersTrueConfig config = context.getBean(IgnoreUnresolvablePlaceholdersTrueConfig.class);
+		assertThat(config.value).isEqualTo("${enigma}");
+	}
+
 	@Test
 	@SuppressWarnings("serial")
 	public void nestedUnresolvablePlaceholder() {
@@ -402,4 +445,30 @@ public void setName(Optional<String> name) {
 		}
 	}
 
+	@Configuration
+	static class IgnoreUnresolvablePlaceholdersFalseConfig {
+
+		@Value("${my.key}")
+		String value;
+
+		@Bean
+		static PropertySourcesPlaceholderConfigurer pspc() {
+			return new PropertySourcesPlaceholderConfigurer();
+		}
+	}
+
+	@Configuration
+	static class IgnoreUnresolvablePlaceholdersTrueConfig {
+
+		@Value("${my.key}")
+		String value;
+
+		@Bean
+		static PropertySourcesPlaceholderConfigurer pspc() {
+			PropertySourcesPlaceholderConfigurer pspc = new PropertySourcesPlaceholderConfigurer();
+			pspc.setIgnoreUnresolvablePlaceholders(true);
+			return pspc;
+		}
+	}
+
 }

From d72cf89ebf48b92b402ba3e724887f5a25b2a1d2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 18 Jan 2022 16:21:26 +0100
Subject: [PATCH 580/735] Make PropertySourcesPlaceholderConfigurerTests pass
 on JDK 17

This change is required in Eclipse IDE but not for the Gradle build.

See gh-27947
---
 .../support/PropertySourcesPlaceholderConfigurerTests.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
index 42fe1a715e28..839b4c5395bd 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
@@ -445,7 +445,7 @@ public void setName(Optional<String> name) {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class IgnoreUnresolvablePlaceholdersFalseConfig {
 
 		@Value("${my.key}")
@@ -457,7 +457,7 @@ static PropertySourcesPlaceholderConfigurer pspc() {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class IgnoreUnresolvablePlaceholdersTrueConfig {
 
 		@Value("${my.key}")

From e565d2cabb01539933195b0d1bc3b55992fb9c84 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 18 Jan 2022 16:23:41 +0100
Subject: [PATCH 581/735] Apply "instanceof pattern matching" in
 PropertySourcesPlaceholderConfigurer

See gh-27947
---
 .../context/support/PropertySourcesPlaceholderConfigurer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
index bb0e79791f64..293c4fa2f269 100644
--- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
@@ -137,8 +137,8 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 				// local PropertyResolver to enforce that setting, since the Environment is most
 				// likely not configured with ignoreUnresolvablePlaceholders set to true.
 				// See https://github.com/spring-projects/spring-framework/issues/27947
-				if (this.ignoreUnresolvablePlaceholders && (this.environment instanceof ConfigurableEnvironment)) {
-					ConfigurableEnvironment configurableEnvironment = (ConfigurableEnvironment) this.environment;
+				if (this.ignoreUnresolvablePlaceholders &&
+						(this.environment instanceof ConfigurableEnvironment configurableEnvironment)) {
 					PropertySourcesPropertyResolver resolver =
 							new PropertySourcesPropertyResolver(configurableEnvironment.getPropertySources());
 					resolver.setIgnoreUnresolvableNestedPlaceholders(true);

From 537aced28baff5b514dab2c6c59475c0f0e0f8f0 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 19 Jan 2022 13:53:38 +0100
Subject: [PATCH 582/735] Avoid message listener recovery in case of
 persistence exceptions on commit

Closes gh-1807
---
 ...AbstractPollingMessageListenerContainer.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
index 0a6287169a40..bbf71620798b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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,6 +29,7 @@
 import org.springframework.jms.support.JmsUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.transaction.support.ResourceTransactionManager;
@@ -248,7 +249,19 @@ protected boolean receiveAndExecute(
 				rollbackOnException(this.transactionManager, status, ex);
 				throw ex;
 			}
-			this.transactionManager.commit(status);
+			try {
+				this.transactionManager.commit(status);
+			}
+			catch (TransactionException ex) {
+				// Propagate transaction system exceptions as infrastructure problems.
+				throw ex;
+			}
+			catch (RuntimeException ex) {
+				// Typically a late persistence exception from a listener-used resource
+				// -> handle it as listener exception, not as an infrastructure problem.
+				// E.g. a database locking failure should not lead to listener shutdown.
+				handleListenerException(ex);
+			}
 			return messageReceived;
 		}
 

From 86be03945b5a3d887a22e055d9b12981238159c6 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 19 Jan 2022 13:54:03 +0100
Subject: [PATCH 583/735] Polishing

---
 .../java/org/springframework/core/SimpleAliasRegistry.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java b/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
index 1eee8f2c3aa2..15c93e742639 100644
--- a/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 
 /**
  * Simple implementation of the {@link AliasRegistry} interface.
+ *
  * <p>Serves as base class for
  * {@link org.springframework.beans.factory.support.BeanDefinitionRegistry}
  * implementations.
@@ -101,8 +102,8 @@ protected boolean allowAliasOverriding() {
 	 */
 	public boolean hasAlias(String name, String alias) {
 		String registeredName = this.aliasMap.get(alias);
-		return ObjectUtils.nullSafeEquals(registeredName, name) || (registeredName != null
-				&& hasAlias(name, registeredName));
+		return ObjectUtils.nullSafeEquals(registeredName, name) ||
+				(registeredName != null && hasAlias(name, registeredName));
 	}
 
 	@Override

From 148eac0200ae4f1ab61034d133528ab6dad8ea1d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 19 Jan 2022 13:54:22 +0100
Subject: [PATCH 584/735] Upgrade to SLF4J 1.7.33, Netty 4.1.73, R2DBC
 Arabba-SR12

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6012af4ccc51..4ff69c724721 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,9 +28,9 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
-			mavenBom "io.netty:netty-bom:4.1.72.Final"
+			mavenBom "io.netty:netty-bom:4.1.73.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.15"
-			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR11"
+			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR12"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
@@ -45,7 +45,7 @@ configure(allprojects) { project ->
 				entry 'log4j-jul'
 				entry 'log4j-slf4j-impl'
 			}
-			dependency "org.slf4j:slf4j-api:1.7.32"
+			dependency "org.slf4j:slf4j-api:1.7.33"
 			dependency("com.google.code.findbugs:findbugs:3.0.1") {
 				exclude group: "dom4j", name: "dom4j"
 			}

From 72119120570c7607d34e77973726a5346184b083 Mon Sep 17 00:00:00 2001
From: shirohoo <shirohoo4102@gmail.com>
Date: Thu, 20 Jan 2022 14:06:13 +0900
Subject: [PATCH 585/735] Polish tests in spring-web

This PR polishes trivial things in tests in spring-web.

Closes gh-27958
---
 .../ContentCachingRequestWrapperTests.java    | 40 ++++++++++++-------
 .../web/util/WebUtilsTests.java               | 14 +++----
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/util/ContentCachingRequestWrapperTests.java b/spring-web/src/test/java/org/springframework/web/util/ContentCachingRequestWrapperTests.java
index 8f8ac90629bd..d9132561a26c 100644
--- a/spring-web/src/test/java/org/springframework/web/util/ContentCachingRequestWrapperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/ContentCachingRequestWrapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,12 @@
 
 package org.springframework.web.util;
 
+import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.Test;
 
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
@@ -29,16 +33,22 @@
  */
 public class ContentCachingRequestWrapperTests {
 
-	protected static final String FORM_CONTENT_TYPE = "application/x-www-form-urlencoded";
+	protected static final String FORM_CONTENT_TYPE = MediaType.APPLICATION_FORM_URLENCODED_VALUE;
+
+	protected static final String CHARSET = StandardCharsets.UTF_8.name();
+
+	protected static final String GET = HttpMethod.GET.name();
+
+	protected static final String POST = HttpMethod.POST.name();
 
-	protected static final String CHARSET = "UTF-8";
+	protected static final int CONTENT_CACHE_LIMIT = 3;
 
 	private final MockHttpServletRequest request = new MockHttpServletRequest();
 
 
 	@Test
-	public void cachedContent() throws Exception {
-		this.request.setMethod("GET");
+	void cachedContent() throws Exception {
+		this.request.setMethod(GET);
 		this.request.setCharacterEncoding(CHARSET);
 		this.request.setContent("Hello World".getBytes(CHARSET));
 
@@ -48,24 +58,24 @@ public void cachedContent() throws Exception {
 	}
 
 	@Test
-	public void cachedContentWithLimit() throws Exception {
-		this.request.setMethod("GET");
+	void cachedContentWithLimit() throws Exception {
+		this.request.setMethod(GET);
 		this.request.setCharacterEncoding(CHARSET);
 		this.request.setContent("Hello World".getBytes(CHARSET));
 
-		ContentCachingRequestWrapper wrapper = new ContentCachingRequestWrapper(this.request, 3);
+		ContentCachingRequestWrapper wrapper = new ContentCachingRequestWrapper(this.request, CONTENT_CACHE_LIMIT);
 		byte[] response = FileCopyUtils.copyToByteArray(wrapper.getInputStream());
 		assertThat(response).isEqualTo("Hello World".getBytes(CHARSET));
 		assertThat(wrapper.getContentAsByteArray()).isEqualTo("Hel".getBytes(CHARSET));
 	}
 
 	@Test
-	public void cachedContentWithOverflow() throws Exception {
-		this.request.setMethod("GET");
+	void cachedContentWithOverflow() throws Exception {
+		this.request.setMethod(GET);
 		this.request.setCharacterEncoding(CHARSET);
 		this.request.setContent("Hello World".getBytes(CHARSET));
 
-		ContentCachingRequestWrapper wrapper = new ContentCachingRequestWrapper(this.request, 3) {
+		ContentCachingRequestWrapper wrapper = new ContentCachingRequestWrapper(this.request, CONTENT_CACHE_LIMIT) {
 			@Override
 			protected void handleContentOverflow(int contentCacheLimit) {
 				throw new IllegalStateException(String.valueOf(contentCacheLimit));
@@ -78,8 +88,8 @@ protected void handleContentOverflow(int contentCacheLimit) {
 	}
 
 	@Test
-	public void requestParams() throws Exception {
-		this.request.setMethod("POST");
+	void requestParams() throws Exception {
+		this.request.setMethod(POST);
 		this.request.setContentType(FORM_CONTENT_TYPE);
 		this.request.setCharacterEncoding(CHARSET);
 		this.request.setParameter("first", "value");
@@ -94,8 +104,8 @@ public void requestParams() throws Exception {
 	}
 
 	@Test  // SPR-12810
-	public void inputStreamFormPostRequest() throws Exception {
-		this.request.setMethod("POST");
+	void inputStreamFormPostRequest() throws Exception {
+		this.request.setMethod(POST);
 		this.request.setContentType(FORM_CONTENT_TYPE);
 		this.request.setCharacterEncoding(CHARSET);
 		this.request.setParameter("first", "value");
diff --git a/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
index 998af1c9eb16..074b9b5c5c8d 100644
--- a/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@
 public class WebUtilsTests {
 
 	@Test
-	public void findParameterValue() {
+	void findParameterValue() {
 		Map<String, Object> params = new HashMap<>();
 		params.put("myKey1", "myValue1");
 		params.put("myKey2_myValue2", "xxx");
@@ -60,7 +60,7 @@ public void findParameterValue() {
 	}
 
 	@Test
-	public void parseMatrixVariablesString() {
+	void parseMatrixVariablesString() {
 		MultiValueMap<String, String> variables;
 
 		variables = WebUtils.parseMatrixVariables(null);
@@ -103,7 +103,7 @@ public void parseMatrixVariablesString() {
 	}
 
 	@Test
-	public void isValidOrigin() {
+	void isValidOrigin() {
 		List<String> allowed = Collections.emptyList();
 		assertThat(checkValidOrigin("mydomain1.example", -1, "http://mydomain1.example", allowed)).isTrue();
 		assertThat(checkValidOrigin("mydomain1.example", -1, "http://mydomain2.example", allowed)).isFalse();
@@ -117,7 +117,7 @@ public void isValidOrigin() {
 	}
 
 	@Test
-	public void isSameOrigin() {
+	void isSameOrigin() {
 		assertThat(checkSameOrigin("http", "mydomain1.example", -1, "http://mydomain1.example")).isTrue();
 		assertThat(checkSameOrigin("http", "mydomain1.example", -1, "http://mydomain1.example:80")).isTrue();
 		assertThat(checkSameOrigin("https", "mydomain1.example", 443, "https://mydomain1.example")).isTrue();
@@ -156,7 +156,7 @@ public void isSameOrigin() {
 	}
 
 	@Test  // SPR-16262
-	public void isSameOriginWithXForwardedHeaders() throws Exception {
+	void isSameOriginWithXForwardedHeaders() throws Exception {
 		String server = "mydomain1.example";
 		testWithXForwardedHeaders(server, -1, "https", null, -1, "https://mydomain1.example");
 		testWithXForwardedHeaders(server, 123, "https", null, -1, "https://mydomain1.example");
@@ -167,7 +167,7 @@ public void isSameOriginWithXForwardedHeaders() throws Exception {
 	}
 
 	@Test  // SPR-16262
-	public void isSameOriginWithForwardedHeader() throws Exception {
+	void isSameOriginWithForwardedHeader() throws Exception {
 		String server = "mydomain1.example";
 		testWithForwardedHeader(server, -1, "proto=https", "https://mydomain1.example");
 		testWithForwardedHeader(server, 123, "proto=https", "https://mydomain1.example");

From f7c3706361d7663f261731418a5106113d39c8a1 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Tue, 18 Jan 2022 11:18:15 +0000
Subject: [PATCH 586/735] Port GroovyDynamicElementReader to Java

Prior to this commit, GroovyDynamicElementReader was implemented in
Groovy, which required that developers have Groovy language support
installed and configured in their IDEs.

This commit ports GroovyDynamicElementReader from Groovy to Java,
making the compilation much simpler and allowing developers to open the
project in Eclipse or VSCode (or other IDEs without Groovy support)
without compiler errors.

This commit also converts related tests from Groovy to Java.

Closes gh-27945
---
 spring-beans/spring-beans.gradle              |   24 +-
 .../groovy/GroovyDynamicElementReader.groovy  |  125 --
 .../AutowiredAnnotationBeanPostProcessor.java |    3 +-
 .../groovy/GroovyDynamicElementReader.java    |  144 ++
 .../factory/support/AbstractBeanFactory.java  |    1 +
 spring-context/spring-context.gradle          |    1 -
 .../GroovyBeanDefinitionReaderTests.groovy    | 1063 --------------
 ...ationContextDynamicBeanPropertyTests.java} |   38 +-
 .../GroovyBeanDefinitionReaderTests.java      | 1298 +++++++++++++++++
 9 files changed, 1466 insertions(+), 1231 deletions(-)
 delete mode 100644 spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
 delete mode 100644 spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy
 rename spring-context/src/test/{groovy/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.groovy => java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java} (50%)
 create mode 100644 spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java

diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index 3c5d34179e77..ddc008baf973 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -1,6 +1,5 @@
 description = "Spring Beans"
 
-apply plugin: "groovy"
 apply plugin: "kotlin"
 
 dependencies {
@@ -14,25 +13,4 @@ dependencies {
 	testImplementation("jakarta.annotation:jakarta.annotation-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
-}
-
-// This module does joint compilation for Java and Groovy code with the compileGroovy task.
-sourceSets {
-	main.groovy.srcDirs += "src/main/java"
-	main.java.srcDirs = []
-}
-
-compileGroovy {
-	options.compilerArgs += "-Werror"
-}
-
-// This module also builds Kotlin code and the compileKotlin task naturally depends on
-// compileJava. We need to redefine dependencies to break task cycles.
-tasks.named('compileGroovy') {
-	// Groovy only needs the declared dependencies (and not the result of Java compilation)
-	classpath = sourceSets.main.compileClasspath
-}
-tasks.named('compileKotlin') {
-	// Kotlin also depends on the result of Groovy compilation
-	classpath += files(sourceSets.main.groovy.classesDirectory)
-}
+}
\ No newline at end of file
diff --git a/spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy b/spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy
deleted file mode 100644
index 8157450773b4..000000000000
--- a/spring-beans/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.beans.factory.groovy
-
-import groovy.xml.StreamingMarkupBuilder
-import org.springframework.beans.factory.config.BeanDefinitionHolder
-import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate
-import org.w3c.dom.Element
-
-/**
- * Used by GroovyBeanDefinitionReader to read a Spring XML namespace expression
- * in the Groovy DSL.
- *
- * @author Jeff Brown
- * @author Juergen Hoeller
- * @since 4.0
- */
-@groovy.transform.PackageScope
-class GroovyDynamicElementReader extends GroovyObjectSupport {
-
-	private final String rootNamespace
-
-	private final Map<String, String> xmlNamespaces
-
-	private final BeanDefinitionParserDelegate delegate
-
-	private final GroovyBeanDefinitionWrapper beanDefinition
-
-	protected final Boolean decorating;
-
-	private boolean callAfterInvocation = true
-
-
-	public GroovyDynamicElementReader(String namespace, Map<String, String> namespaceMap,
-			BeanDefinitionParserDelegate delegate, GroovyBeanDefinitionWrapper beanDefinition, boolean decorating) {
-		super();
-		this.rootNamespace = namespace
-		this.xmlNamespaces = namespaceMap
-		this.delegate = delegate
-		this.beanDefinition = beanDefinition;
-		this.decorating = decorating;
-	}
-
-
-	@Override
-	public Object invokeMethod(String name, Object args) {
-		if (name.equals("doCall")) {
-			def callable = args[0]
-			callable.resolveStrategy = Closure.DELEGATE_FIRST
-			callable.delegate = this
-			def result = callable.call()
-
-			if (this.callAfterInvocation) {
-				afterInvocation()
-				this.callAfterInvocation = false
-			}
-			return result
-		}
-
-		else {
-			StreamingMarkupBuilder builder = new StreamingMarkupBuilder();
-			def myNamespace = this.rootNamespace
-			def myNamespaces = this.xmlNamespaces
-
-			def callable = {
-				for (namespace in myNamespaces) {
-					mkp.declareNamespace([(namespace.key):namespace.value])
-				}
-				if (args && (args[-1] instanceof Closure)) {
-					args[-1].resolveStrategy = Closure.DELEGATE_FIRST
-					args[-1].delegate = builder
-				}
-				delegate."$myNamespace"."$name"(*args)
-			}
-
-			callable.resolveStrategy = Closure.DELEGATE_FIRST
-			callable.delegate = builder
-			def writable = builder.bind(callable)
-			def sw = new StringWriter()
-			writable.writeTo(sw)
-
-			Element element = this.delegate.readerContext.readDocumentFromString(sw.toString()).documentElement
-			this.delegate.initDefaults(element)
-			if (this.decorating) {
-				BeanDefinitionHolder holder = this.beanDefinition.beanDefinitionHolder;
-				holder = this.delegate.decorateIfRequired(element, holder, null)
-				this.beanDefinition.setBeanDefinitionHolder(holder)
-			}
-			else {
-				def beanDefinition = this.delegate.parseCustomElement(element)
-				if (beanDefinition) {
-					this.beanDefinition.setBeanDefinition(beanDefinition)
-				}
-			}
-			if (this.callAfterInvocation) {
-				afterInvocation()
-				this.callAfterInvocation = false
-			}
-			return element
-		}
-	}
-
-	/**
-	 * Hook that subclass or anonymous classes can overwrite to implement custom behavior
-	 * after invocation completes.
-	 */
-	protected void afterInvocation() {
-		// NOOP
-	}
-
-}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 2ded080cd5d5..00e1b73f342b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -541,9 +541,8 @@ private MergedAnnotation<?> findAutowiredAnnotation(AccessibleObject ao) {
 	 * @param ann the Autowired annotation
 	 * @return whether the annotation indicates that a dependency is required
 	 */
+	@SuppressWarnings("cast")
 	protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
-		// Cast to (AnnotationAttributes) is required. Otherwise, the :spring-beans:compileGroovy
-		// task fails in the Gradle build.
 		return determineRequiredStatus((AnnotationAttributes)
 				ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
new file mode 100644
index 000000000000..7cd9e852b6e9
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.groovy;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Map;
+
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.GroovyObjectSupport;
+import groovy.lang.Writable;
+import groovy.xml.StreamingMarkupBuilder;
+import org.w3c.dom.Element;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
+
+/**
+ * Used by GroovyBeanDefinitionReader to read a Spring XML namespace expression
+ * in the Groovy DSL.
+ *
+ * @author Jeff Brown
+ * @author Juergen Hoeller
+ * @author Dave Syer
+ * @since 4.0
+ */
+class GroovyDynamicElementReader extends GroovyObjectSupport {
+
+	private final String rootNamespace;
+
+	private final Map<String, String> xmlNamespaces;
+
+	private final BeanDefinitionParserDelegate delegate;
+
+	private final GroovyBeanDefinitionWrapper beanDefinition;
+
+	protected final boolean decorating;
+
+	private boolean callAfterInvocation = true;
+
+
+	public GroovyDynamicElementReader(String namespace, Map<String, String> namespaceMap,
+			BeanDefinitionParserDelegate delegate, GroovyBeanDefinitionWrapper beanDefinition, boolean decorating) {
+		super();
+		this.rootNamespace = namespace;
+		this.xmlNamespaces = namespaceMap;
+		this.delegate = delegate;
+		this.beanDefinition = beanDefinition;
+		this.decorating = decorating;
+	}
+
+
+	@Override
+	public Object invokeMethod(String name, Object obj) {
+		Object[] args = (Object[]) obj;
+		if (name.equals("doCall")) {
+			@SuppressWarnings("unchecked")
+			Closure<Object> callable = (Closure<Object>) args[0];
+			callable.setResolveStrategy(Closure.DELEGATE_FIRST);
+			callable.setDelegate(this);
+			Object result = callable.call();
+
+			if (this.callAfterInvocation) {
+				afterInvocation();
+				this.callAfterInvocation = false;
+			}
+			return result;
+		}
+		else {
+			StreamingMarkupBuilder builder = new StreamingMarkupBuilder();
+			String myNamespace = this.rootNamespace;
+			Map<String, String> myNamespaces = this.xmlNamespaces;
+
+			Closure<Object> callable = new Closure<>(this) {
+				@Override
+				public Object call(Object... arguments) {
+					((GroovyObject) getProperty("mkp")).invokeMethod("declareNamespace", new Object[] {myNamespaces});
+					int len = args.length;
+					if (len > 0 && args[len-1] instanceof Closure<?> callable) {
+						callable.setResolveStrategy(Closure.DELEGATE_FIRST);
+						callable.setDelegate(builder);
+					}
+					return ((GroovyObject) ((GroovyObject) getDelegate()).getProperty(myNamespace)).invokeMethod(name, args);
+				}
+			};
+
+			callable.setResolveStrategy(Closure.DELEGATE_FIRST);
+			callable.setDelegate(builder);
+			Writable writable = (Writable) builder.bind(callable);
+			StringWriter sw = new StringWriter();
+			try {
+				writable.writeTo(sw);
+			}
+			catch (IOException ex) {
+				throw new IllegalStateException(ex);
+			}
+
+			Element element = this.delegate.getReaderContext().readDocumentFromString(sw.toString()).getDocumentElement();
+			this.delegate.initDefaults(element);
+			if (this.decorating) {
+				BeanDefinitionHolder holder = this.beanDefinition.getBeanDefinitionHolder();
+				holder = this.delegate.decorateIfRequired(element, holder, null);
+				this.beanDefinition.setBeanDefinitionHolder(holder);
+			}
+			else {
+				BeanDefinition beanDefinition = this.delegate.parseCustomElement(element);
+				if (beanDefinition != null) {
+					this.beanDefinition.setBeanDefinition((AbstractBeanDefinition) beanDefinition);
+				}
+			}
+			if (this.callAfterInvocation) {
+				afterInvocation();
+				this.callAfterInvocation = false;
+			}
+			return element;
+		}
+	}
+
+	/**
+	 * Hook that subclasses or anonymous classes can override to implement custom behavior
+	 * after invocation completes.
+	 */
+	protected void afterInvocation() {
+		// NOOP
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index 6c2e05068c26..9c00e0fcf38e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1935,6 +1935,7 @@ protected abstract Object createBean(String beanName, RootBeanDefinition mbd, @N
 	 *
 	 * @since 5.3
 	 */
+	@SuppressWarnings("serial")
 	private class BeanPostProcessorCacheAwareList extends CopyOnWriteArrayList<BeanPostProcessor> {
 
 		@Override
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index f7bb843fcc17..601300320462 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -1,6 +1,5 @@
 description = "Spring Context"
 
-apply plugin: "groovy"
 apply plugin: "kotlin"
 
 dependencies {
diff --git a/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy b/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy
deleted file mode 100644
index eac5493d907a..000000000000
--- a/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy
+++ /dev/null
@@ -1,1063 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context.groovy
-
-import org.junit.jupiter.api.Test
-
-import org.springframework.aop.SpringProxy
-import org.springframework.beans.factory.ObjectFactory
-import org.springframework.beans.factory.config.Scope
-import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader
-import org.springframework.context.support.GenericApplicationContext
-import org.springframework.context.support.GenericGroovyApplicationContext
-import org.springframework.stereotype.Component
-
-import static groovy.test.GroovyAssert.*
-
-/**
- * @author Jeff Brown
- * @author Sam Brannen
- */
-class GroovyBeanDefinitionReaderTests {
-
-	@Test
-	void importSpringXml() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			importBeans "classpath:org/springframework/context/groovy/test.xml"
-		}
-
-		appCtx.refresh()
-
-		def foo = appCtx.getBean("foo")
-		assertEquals "hello", foo
-	}
-
-	@Test
-	void importBeansFromGroovy() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			importBeans "classpath:org/springframework/context/groovy/applicationContext.groovy"
-		}
-
-		appCtx.refresh()
-
-		def foo = appCtx.getBean("foo")
-		assertEquals "hello", foo
-	}
-
-	@Test
-	void singletonPropertyOnBeanDefinition() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			singletonBean(Bean1) { bean ->
-				bean.singleton = true
-			}
-			nonSingletonBean(Bean1) { bean ->
-				bean.singleton = false
-			}
-			unSpecifiedScopeBean(Bean1)
-		}
-		appCtx.refresh()
-
-		assertTrue 'singletonBean should have been a singleton', appCtx.isSingleton('singletonBean')
-		assertFalse 'nonSingletonBean should not have been a singleton', appCtx.isSingleton('nonSingletonBean')
-		assertTrue 'unSpecifiedScopeBean should not have been a singleton', appCtx.isSingleton('unSpecifiedScopeBean')
-	}
-
-	@Test
-	void inheritPropertiesFromAbstractBean() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			myB(Bean1){
-				person = "wombat"
-			}
-
-			myAbstractA(Bean2){ bean ->
-				bean.'abstract' = true
-				age = 10
-				bean1 = myB
-			}
-			myConcreteB {
-				it.parent = myAbstractA
-			}
-		}
-
-		appCtx.refresh()
-
-		def bean = appCtx.getBean("myConcreteB")
-		assertEquals 10, bean.age
-		assertNotNull bean.bean1
-	}
-
-	@Test
-	void contextComponentScanSpringTag() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			xmlns context:"http://www.springframework.org/schema/context"
-
-			context.'component-scan'( 'base-package' :" org.springframework.context.groovy" )
-		}
-
-		appCtx.refresh()
-
-		def p = appCtx.getBean("person")
-		assertTrue(p instanceof AdvisedPerson)
-	}
-
-	@Test
-	void useSpringNamespaceAsMethod() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
-
-			fred(AdvisedPerson) {
-				name = "Fred"
-				age = 45
-			}
-			birthdayCardSenderAspect(BirthdayCardSender)
-
-			aop {
-				config("proxy-target-class":true) {
-					aspect( id:"sendBirthdayCard",ref:"birthdayCardSenderAspect" ) {
-						after method:"onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
-					}
-				}
-			}
-		}
-
-		appCtx.refresh()
-
-		def fred = appCtx.getBean("fred")
-		assertTrue (fred instanceof SpringProxy)
-		fred.birthday()
-
-		BirthdayCardSender birthDaySender = appCtx.getBean("birthdayCardSenderAspect")
-
-		assertEquals 1, birthDaySender.peopleSentCards.size()
-		assertEquals "Fred", birthDaySender.peopleSentCards[0].name
-	}
-
-	@Test
-	void useTwoSpringNamespaces() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		TestScope scope = new TestScope()
-		appCtx.getBeanFactory().registerScope("test", scope)
-
-		reader.beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
-			xmlns util:"http://www.springframework.org/schema/util"
-			scopedList(ArrayList) { bean ->
-				bean.scope = "test"
-				aop.'scoped-proxy'()
-			}
-			util.list(id: 'foo') {
-				value 'one'
-				value 'two'
-			}
-		}
-		appCtx.refresh()
-
-		assert ['one', 'two'] == appCtx.getBean("foo")
-
-		assertNotNull appCtx.getBean("scopedList")
-		assertNotNull appCtx.getBean("scopedList").size()
-		assertNotNull appCtx.getBean("scopedList").size()
-
-		// should only be true because bean not initialized until proxy called
-		assertEquals 2, scope.instanceCount
-
-		appCtx = new GenericApplicationContext()
-		reader = new GroovyBeanDefinitionReader(appCtx)
-		appCtx.getBeanFactory().registerScope("test", scope)
-
-		reader.beans {
-			xmlns aop:"http://www.springframework.org/schema/aop",
-				  util:"http://www.springframework.org/schema/util"
-			scopedList(ArrayList) { bean ->
-				bean.scope = "test"
-				aop.'scoped-proxy'()
-			}
-			util.list(id: 'foo') {
-				value 'one'
-				value 'two'
-			}
-		}
-		appCtx.refresh()
-
-		assert ['one', 'two'] == appCtx.getBean("foo")
-
-		assertNotNull appCtx.getBean("scopedList")
-		assertNotNull appCtx.getBean("scopedList").size()
-		assertNotNull appCtx.getBean("scopedList").size()
-
-		// should only be true because bean not initialized until proxy called
-		assertEquals 4, scope.instanceCount
-	}
-
-	@Test
-	void springAopSupport() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
-
-			fred(AdvisedPerson) {
-				name = "Fred"
-				age = 45
-			}
-			birthdayCardSenderAspect(BirthdayCardSender)
-
-			aop.config("proxy-target-class":true) {
-				aspect( id:"sendBirthdayCard",ref:"birthdayCardSenderAspect" ) {
-					after method:"onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
-				}
-			}
-		}
-
-		appCtx.refresh()
-
-		def fred = appCtx.getBean("fred")
-		assertTrue (fred instanceof SpringProxy)
-		fred.birthday()
-
-		BirthdayCardSender birthDaySender = appCtx.getBean("birthdayCardSenderAspect")
-
-		assertEquals 1, birthDaySender.peopleSentCards.size()
-		assertEquals "Fred", birthDaySender.peopleSentCards[0].name
-	}
-
-	@Test
-	void springScopedProxyBean() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		TestScope scope = new TestScope()
-		appCtx.getBeanFactory().registerScope("test", scope)
-		reader.beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
-			scopedList(ArrayList) { bean ->
-				bean.scope = "test"
-				aop.'scoped-proxy'()
-			}
-		}
-		appCtx.refresh()
-
-		assertNotNull appCtx.getBean("scopedList")
-		assertNotNull appCtx.getBean("scopedList").size()
-		assertNotNull appCtx.getBean("scopedList").size()
-
-		// should only be true because bean not initialized until proxy called
-		assertEquals 2, scope.instanceCount
-	}
-
-	@Test
-	void springNamespaceBean() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			xmlns util: 'http://www.springframework.org/schema/util'
-			util.list(id: 'foo') {
-				value 'one'
-				value 'two'
-			}
-		}
-		appCtx.refresh()
-
-		assert ['one', 'two'] == appCtx.getBean('foo')
-	}
-
-	@Test
-	void namedArgumentConstructor() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			holyGrail(HolyGrailQuest)
-			knights(KnightOfTheRoundTable, "Camelot", leader:"lancelot", quest: holyGrail)
-		}
-		appCtx.refresh()
-
-		KnightOfTheRoundTable knights = appCtx.getBean("knights")
-		HolyGrailQuest quest = appCtx.getBean("holyGrail")
-
-		assertEquals "Camelot", knights.name
-		assertEquals "lancelot", knights.leader
-		assertEquals quest, knights.quest
-	}
-
-	@Test
-	void abstractBeanDefinition() {
-		def appCtx = new GenericGroovyApplicationContext()
-		appCtx.reader.beans {
-			abstractBean {
-				leader = "Lancelot"
-			}
-			quest(HolyGrailQuest)
-			knights(KnightOfTheRoundTable, "Camelot") { bean ->
-				bean.parent = abstractBean
-				quest = quest
-			}
-		}
-		appCtx.refresh()
-
-		def knights = appCtx.knights
-		assert knights
-		shouldFail(org.springframework.beans.factory.BeanIsAbstractException) {
-			appCtx.abstractBean
-		}
-		assertEquals "Lancelot", knights.leader
-	}
-
-	@Test
-	void abstractBeanDefinitionWithClass() {
-		def appCtx = new GenericGroovyApplicationContext()
-		appCtx.reader.beans {
-			abstractBean(KnightOfTheRoundTable) { bean ->
-				bean.'abstract' = true
-				leader = "Lancelot"
-			}
-			quest(HolyGrailQuest)
-			knights("Camelot") { bean ->
-				bean.parent = abstractBean
-				quest = quest
-			}
-		}
-		appCtx.refresh()
-
-		shouldFail(org.springframework.beans.factory.BeanIsAbstractException) {
-			appCtx.abstractBean
-		}
-		def knights = appCtx.knights
-		assert knights
-		assertEquals "Lancelot", knights.leader
-	}
-
-	@Test
-	void scopes() {
-		def appCtx = new GenericGroovyApplicationContext()
-		appCtx.reader.beans {
-			myBean(ScopeTestBean) { bean ->
-				bean.scope = "prototype"
-			}
-			myBean2(ScopeTestBean)
-		}
-		appCtx.refresh()
-
-		def b1 = appCtx.myBean
-		def b2 = appCtx.myBean
-
-		assert b1 != b2
-
-		b1 = appCtx.myBean2
-		b2 = appCtx.myBean2
-
-		assertEquals b1, b2
-	}
-
-	@Test
-	void simpleBean() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			bean1(Bean1) {
-				person = "homer"
-				age = 45
-				props = [overweight:true, height:"1.8m"]
-				children = ["bart", "lisa"]
-			}
-		}
-		appCtx.refresh()
-
-		assert appCtx.containsBean("bean1")
-		def bean1 = appCtx.getBean("bean1")
-
-		assertEquals "homer", bean1.person
-		assertEquals 45, bean1.age
-		assertEquals true, bean1.props?.overweight
-		assertEquals "1.8m", bean1.props?.height
-		assertEquals(["bart", "lisa"], bean1.children)
-
-	}
-
-	@Test
-	void beanWithParentRef() {
-		def parentAppCtx = new GenericApplicationContext()
-		def parentBeanReader = new GroovyBeanDefinitionReader(parentAppCtx)
-		parentBeanReader.beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-				props = [overweight:true, height:"1.8m"]
-				children = ["bart", "lisa"]
-			}
-		}
-		parentAppCtx.refresh()
-
-		def appCtx = new GenericApplicationContext(parentAppCtx)
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			bart(Bean2) {
-				person = "bart"
-				parent = ref("homer", true)
-			}
-		}
-		appCtx.refresh()
-
-		assert appCtx.containsBean("bart")
-		def bart = appCtx.getBean("bart")
-		assertEquals "homer",bart.parent?.person
-	}
-
-	@Test
-	void withAnonymousInnerBean() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 =  { Bean1 b ->
-							 person = "homer"
-							age = 45
-							props = [overweight:true, height:"1.8m"]
-							children = ["bart", "lisa"] }
-				children = [bart, lisa]
-			}
-		}
-		appCtx.refresh()
-
-		def marge = appCtx.getBean("marge")
-		assertEquals "homer", marge.bean1.person
-	}
-
-	@Test
-	void withUntypedAnonymousInnerBean() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			homer(Bean1Factory)
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 =  { bean ->
-							bean.factoryBean = "homer"
-							bean.factoryMethod = "newInstance"
-							person = "homer" }
-				children = [bart, lisa]
-			}
-		}
-		appCtx.refresh()
-
-		def marge = appCtx.getBean("marge")
-		assertEquals "homer", marge.bean1.person
-	}
-
-	@Test
-	void beanReferences() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-				props = [overweight:true, height:"1.8m"]
-				children = ["bart", "lisa"]
-			}
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 = homer
-				children = [bart, lisa]
-			}
-		}
-		appCtx.refresh()
-
-		def homer = appCtx.getBean("homer")
-		def marge = appCtx.getBean("marge")
-		def bart = appCtx.getBean("bart")
-		def lisa = appCtx.getBean("lisa")
-
-		assertEquals homer, marge.bean1
-		assertEquals 2, marge.children.size()
-
-		assertTrue marge.children.contains(bart)
-		assertTrue marge.children.contains(lisa)
-	}
-
-	@Test
-	void beanWithConstructor() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-			}
-			marge(Bean3, "marge", homer) {
-				age = 40
-			}
-		}
-		appCtx.refresh()
-
-		def marge = appCtx.getBean("marge")
-		assertEquals "marge", marge.person
-		assertEquals "homer", marge.bean1.person
-		assertEquals 40, marge.age
-	}
-
-	@Test
-	void beanWithFactoryMethod() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-			}
-			def marge = marge(Bean4) {
-				person = "marge"
-			}
-			marge.factoryMethod = "getInstance"
-		}
-		appCtx.refresh()
-
-		def marge = appCtx.getBean("marge")
-
-		assert "marge", marge.person
-	}
-
-	@Test
-	void beanWithFactoryMethodUsingClosureArgs() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-			}
-			marge(Bean4) { bean ->
-				bean.factoryMethod = "getInstance"
-				person = "marge"
-			}
-		}
-		appCtx.refresh()
-
-		def marge = appCtx.getBean("marge")
-		assert "marge", marge.person
-	}
-
-	@Test
-	void beanWithFactoryMethodWithConstructorArgs() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			beanFactory(Bean1FactoryWithArgs){}
-
-			homer(beanFactory:"newInstance", "homer") {
-				age = 45
-			}
-			//Test with no closure body
-			marge(beanFactory:"newInstance", "marge")
-
-			//Test more verbose method
-			mcBain("mcBain"){
-				bean ->
-				bean.factoryBean="beanFactory"
-				bean.factoryMethod="newInstance"
-
-			}
-		}
-		appCtx.refresh()
-
-		def homer = appCtx.getBean("homer")
-
-		assert "homer", homer.person
-		assert 45, homer.age
-
-		assert "marge", appCtx.getBean("marge").person
-
-		assert "mcBain", appCtx.getBean("mcBain").person
-	}
-
-	@Test
-	void getBeanDefinitions() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			jeff(Bean1) {
-				person = 'jeff'
-			}
-			graeme(Bean1) {
-				person = 'graeme'
-			}
-			guillaume(Bean1) {
-				person = 'guillaume'
-			}
-		}
-
-		assertEquals 'beanDefinitions was the wrong size', 3, reader.registry.beanDefinitionCount
-		assertNotNull 'beanDefinitions did not contain jeff', reader.registry.getBeanDefinition('jeff')
-		assertNotNull 'beanDefinitions did not contain guillaume', reader.registry.getBeanDefinition('guillaume')
-		assertNotNull 'beanDefinitions did not contain graeme', reader.registry.getBeanDefinition('graeme')
-	}
-
-	@Test
-	void beanWithFactoryBean() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			myFactory(Bean1Factory)
-
-			homer(myFactory) { bean ->
-				bean.factoryMethod = "newInstance"
-				person = "homer"
-				age = 45
-			}
-		}
-		appCtx.refresh()
-
-		def homer = appCtx.getBean("homer")
-
-		assertEquals "homer", homer.person
-	}
-
-	@Test
-	void beanWithFactoryBeanAndMethod() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			myFactory(Bean1Factory)
-
-			homer(myFactory:"newInstance") { bean ->
-				person = "homer"
-				age = 45
-			}
-		}
-
-		appCtx.refresh()
-
-		def homer = appCtx.getBean("homer")
-		assertEquals "homer", homer.person
-	}
-
-	@Test
-	void loadExternalBeans() {
-		def appCtx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy")
-
-		assert appCtx.containsBean("foo")
-		def foo = appCtx.getBean("foo")
-	}
-
-	@Test
-	void loadExternalBeansWithExplicitRefresh() {
-		def appCtx = new GenericGroovyApplicationContext()
-		appCtx.load("org/springframework/context/groovy/applicationContext.groovy")
-		appCtx.refresh()
-
-		assert appCtx.containsBean("foo")
-		def foo = appCtx.getBean("foo")
-	}
-
-	@Test
-	void holyGrailWiring() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-		quest(HolyGrailQuest)
-
-		knight(KnightOfTheRoundTable, "Bedivere") {
-		quest = ref("quest")
-		}
-		}
-
-		appCtx.refresh()
-
-		def knight = appCtx.getBean("knight")
-		knight.embarkOnQuest()
-	}
-
-	@Test
-	void abstractBeanSpecifyingClass() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			abstractKnight(KnightOfTheRoundTable) { bean ->
-				bean.'abstract' = true
-				leader = "King Arthur"
-			}
-
-			lancelot("lancelot") { bean ->
-				bean.parent = ref("abstractKnight")
-			}
-
-			abstractPerson(Bean1) { bean ->
-				bean.'abstract'=true
-				age = 45
-			}
-			homerBean { bean ->
-				bean.parent = ref("abstractPerson")
-				person = "homer"
-			}
-		}
-		appCtx.refresh()
-
-		def lancelot = appCtx.getBean("lancelot")
-		assertEquals "King Arthur", lancelot.leader
-		assertEquals "lancelot", lancelot.name
-
-		def homerBean = appCtx.getBean("homerBean")
-
-		assertEquals 45, homerBean.age
-		assertEquals "homer", homerBean.person
-	}
-
-	@Test
-	void groovyBeanDefinitionReaderWithScript() {
-		def script = '''
-def appCtx = new org.springframework.context.support.GenericGroovyApplicationContext()
-appCtx.reader.beans {
-quest(org.springframework.context.groovy.HolyGrailQuest) {}
-
-knight(org.springframework.context.groovy.KnightOfTheRoundTable, "Bedivere") { quest = quest }
-}
-appCtx.refresh()
-return appCtx
-'''
-		def appCtx = new GroovyShell().evaluate(script)
-
-		def knight = appCtx.getBean('knight')
-		knight.embarkOnQuest()
-	}
-
-	// test for GRAILS-5057
-	@Test
-	void registerBeans() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-		   personA(AdvisedPerson) {
-			   name = "Bob"
-		   }
-		}
-
-		appCtx.refresh()
-		assertEquals "Bob", appCtx.getBean("personA").name
-
-		appCtx = new GenericApplicationContext()
-		reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			personA(AdvisedPerson) {
-				name = "Fred"
-			}
-		}
-
-		appCtx.refresh()
-		assertEquals "Fred", appCtx.getBean("personA").name
-	}
-
-	@Test
-	void listOfBeansAsConstructorArg() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-
-		reader.beans {
-			someotherbean(SomeOtherClass, new File('somefile.txt'))
-			someotherbean2(SomeOtherClass, new File('somefile.txt'))
-
-			somebean(SomeClass,  [someotherbean, someotherbean2])
-		}
-
-		assert appCtx.containsBean('someotherbean')
-		assert appCtx.containsBean('someotherbean2')
-		assert appCtx.containsBean('somebean')
-	}
-
-	@Test
-	void beanWithListAndMapConstructor() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-
-			beanWithList(Bean5, [bart, lisa])
-
-			// test runtime references both as ref() and as plain name
-			beanWithMap(Bean6, [bart:bart, lisa:ref('lisa')])
-		}
-		appCtx.refresh()
-
-		def beanWithList = appCtx.getBean("beanWithList")
-		assertEquals 2, beanWithList.people.size()
-		assertEquals "bart", beanWithList.people[0].person
-
-		def beanWithMap = appCtx.getBean("beanWithMap")
-		assertEquals 9, beanWithMap.peopleByName.lisa.age
-		assertEquals "bart", beanWithMap.peopleByName.bart.person
-	}
-
-	@Test
-	void anonymousInnerBeanViaBeanMethod() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 =  bean(Bean1) {
-					person = "homer"
-					age = 45
-					props = [overweight:true, height:"1.8m"]
-					children = ["bart", "lisa"]
-				}
-				children = [bart, lisa]
-			}
-		}
-		appCtx.refresh()
-
-		def marge = appCtx.getBean("marge")
-		assertEquals "homer", marge.bean1.person
-	}
-
-	@Test
-	void anonymousInnerBeanViaBeanMethodWithConstructorArgs() {
-		def appCtx = new GenericApplicationContext()
-		def reader = new GroovyBeanDefinitionReader(appCtx)
-		reader.beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean3 =  bean(Bean3, "homer", lisa) {
-					person = "homer"
-					age = 45
-				}
-				children = [bart, lisa]
-			}
-		}
-		appCtx.refresh()
-
-		def marge = appCtx.getBean("marge")
-
-		assertEquals "homer", marge.bean3.person
-		assertEquals "lisa", marge.bean3.bean1.person
-	}
-}
-
-
-class HolyGrailQuest {
-	void start() { println "lets begin" }
-}
-
-class KnightOfTheRoundTable {
-	String name
-	String leader
-
-	KnightOfTheRoundTable(String n) {
-  		this.name = n
-	}
-
-	HolyGrailQuest quest
-
-	void embarkOnQuest() {
-		quest.start()
-	}
-}
-
-// simple bean
-class Bean1 {
-	String person
-	int age
-	Properties props
-	List children
-}
-
-// bean referencing other bean
-class Bean2 {
-	int age
-	String person
-	Bean1 bean1
-	Bean3 bean3
-	Properties props
-	List children
-	Bean1 parent
-}
-
-// bean with constructor args
-class Bean3 {
-	Bean3(String person, Bean1 bean1) {
-		this.person = person
-		this.bean1 = bean1
-	}
-	String person
-	Bean1 bean1
-	int age
-}
-
-// bean with factory method
-class Bean4 {
-	private Bean4() {}
-	static Bean4 getInstance() {
-		return new Bean4()
-	}
-	String person
-}
-
-// bean with List-valued constructor arg
-class Bean5 {
-	Bean5(List<Bean1> people) {
-		this.people = people
-	}
-	List<Bean1> people
-}
-
-// bean with Map-valued constructor arg
-class Bean6 {
-	Bean6(Map<String, Bean1> peopleByName) {
-		this.peopleByName = peopleByName
-	}
-	Map<String, Bean1> peopleByName
-}
-
-// a factory bean
-class Bean1Factory {
-	Bean1 newInstance() {
-		return new Bean1()
-	}
-}
-
-class ScopeTestBean {
-}
-
-class TestScope implements Scope {
-
-	int instanceCount
-
-	@Override
-	public Object remove(String name) {
-		 // do nothing
-	}
-
-	@Override
-	public void registerDestructionCallback(String name, Runnable callback) {
-	}
-
-	@Override
-	public String getConversationId() {
-		return "mock"
-	}
-
-	@Override
-	public Object get(String name, ObjectFactory<?> objectFactory) {
-		instanceCount++
-		objectFactory.getObject()
-	}
-
-	@Override
-	public Object resolveContextualObject(String s) {
-		return null;  // noop
-	}
-}
-
-class BirthdayCardSender {
-	List peopleSentCards = []
-
-	public void onBirthday(AdvisedPerson person) {
- 		peopleSentCards << person
-	}
-}
-
-@Component(value = "person")
-public class AdvisedPerson {
-	int age;
-	String name;
-
-	public void birthday() {
-		++age;
-	}
-}
-
-class SomeClass {
-	public SomeClass(List<SomeOtherClass> soc) {}
-}
-
-class SomeOtherClass {
-	public SomeOtherClass(File f) {}
-}
-
-// a factory bean that takes arguments
-class Bean1FactoryWithArgs {
-	Bean1 newInstance(String name) {
-		new Bean1(person:name)
-	}
-}
diff --git a/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.groovy b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
similarity index 50%
rename from spring-context/src/test/groovy/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.groovy
rename to spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
index 948fef89ea23..51ba8d349fcf 100644
--- a/spring-context/src/test/groovy/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.groovy
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.context.groovy
+package org.springframework.context.groovy;
 
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Test;
 
-import org.springframework.beans.factory.NoSuchBeanDefinitionException
-import org.springframework.context.support.GenericGroovyApplicationContext
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.support.GenericGroovyApplicationContext;
 
-import static groovy.test.GroovyAssert.*
+import static groovy.test.GroovyAssert.assertEquals;
+import static groovy.test.GroovyAssert.assertNotNull;
+import static groovy.test.GroovyAssert.assertThrows;
 
 /**
  * @author Jeff Brown
@@ -31,24 +33,26 @@ class GroovyApplicationContextDynamicBeanPropertyTests {
 
 	@Test
 	void testAccessDynamicBeanProperties() {
-		def ctx = new GenericGroovyApplicationContext();
-		ctx.reader.loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
-		ctx.refresh()
-
-		def framework = ctx.framework
-		assertNotNull 'could not find framework bean', framework
-		assertEquals 'Grails', framework
+		var ctx = new GenericGroovyApplicationContext();
+		ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
+		ctx.refresh();
+
+		var framework = ctx.getProperty("framework");
+		assertNotNull("could not find framework bean", framework);
+		assertEquals("Grails", framework);
+		ctx.close();
 	}
 
 	@Test
 	void testAccessingNonExistentBeanViaDynamicProperty() {
-		def ctx = new GenericGroovyApplicationContext();
-		ctx.reader.loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
-		ctx.refresh()
+		var ctx = new GenericGroovyApplicationContext();
+		ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
+		ctx.refresh();
 
-		def err = shouldFail NoSuchBeanDefinitionException, { ctx.someNonExistentBean }
+		var err = assertThrows(NoSuchBeanDefinitionException.class, () -> ctx.getProperty("someNonExistentBean"));
 
-		assertEquals "No bean named 'someNonExistentBean' available", err.message
+		assertEquals("No bean named 'someNonExistentBean' available", err.getMessage());
+		ctx.close();
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
new file mode 100644
index 000000000000..fa3fe2ea5c97
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
@@ -0,0 +1,1298 @@
+/*
+ * Copyright 2002-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.groovy;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import groovy.lang.GroovyShell;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aop.SpringProxy;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.Scope;
+import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.context.support.GenericGroovyApplicationContext;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.stereotype.Component;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+public class GroovyBeanDefinitionReaderTests {
+
+	@Test
+	void importSpringXml() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+			beans {
+				importBeans "classpath:org/springframework/context/groovy/test.xml"
+			}
+			""").getBytes()));
+
+		appCtx.refresh();
+
+		var foo = appCtx.getBean("foo");
+		assertThat(foo).isEqualTo("hello");
+	}
+
+	@Test
+	void importBeansFromGroovy() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+			beans {
+				importBeans "classpath:org/springframework/context/groovy/applicationContext.groovy"
+			}
+			""").getBytes()));
+
+		appCtx.refresh();
+
+		var foo = appCtx.getBean("foo");
+		assertThat(foo).isEqualTo("hello");
+	}
+
+	@Test
+	void singletonPropertyOnBeanDefinition() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy;
+		beans {
+			singletonBean(Bean1) { bean ->
+				bean.singleton = true
+			}
+			nonSingletonBean(Bean1) { bean ->
+				bean.singleton = false
+			}
+			unSpecifiedScopeBean(Bean1)
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThat(appCtx.isSingleton("singletonBean")).as("singletonBean should have been a singleton").isTrue();
+		assertThat(appCtx.isSingleton("nonSingletonBean")).as("nonSingletonBean should not have been a singleton").isFalse();
+		assertThat(appCtx.isSingleton("unSpecifiedScopeBean")).as("unSpecifiedScopeBean should not have been a singleton").isTrue();
+	}
+
+	@Test
+	void inheritPropertiesFromAbstractBean() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy;
+		beans {
+			myB(Bean1){
+				person = "wombat"
+			}
+
+			myAbstractA(Bean2){ bean ->
+				bean."abstract" = true
+				age = 10
+				bean1 = myB
+			}
+			myConcreteB {
+				it.parent = myAbstractA
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean2 bean = (Bean2) appCtx.getBean("myConcreteB");
+		assertThat(bean.age).isEqualTo(10);
+		assertThat(bean.bean1).isNotNull();
+	}
+
+	@Test
+	void contextComponentScanSpringTag() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		beans {
+			xmlns context:"http://www.springframework.org/schema/context"
+
+			context.'component-scan'( 'base-package':"org.springframework.context.groovy" )
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		var p = appCtx.getBean("person");
+		assertThat(p).isInstanceOf(AdvisedPerson.class);
+	}
+
+	@Test
+	void useSpringNamespaceAsMethod() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy;
+		beans {
+			xmlns aop:"http://www.springframework.org/schema/aop"
+
+			fred(AdvisedPerson) {
+				name = "Fred"
+				age = 45
+			}
+			birthdayCardSenderAspect(BirthdayCardSender)
+
+			aop {
+				config("proxy-target-class":true) {
+					aspect( id:"sendBirthdayCard",ref:"birthdayCardSenderAspect" ) {
+						after method:"onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
+					}
+				}
+			}
+		}
+		""").getBytes()));
+
+		appCtx.refresh();
+
+		AdvisedPerson fred = (AdvisedPerson) appCtx.getBean("fred");
+		assertThat(fred).isInstanceOf(SpringProxy.class);
+		fred.birthday();
+
+		BirthdayCardSender birthDaySender = (BirthdayCardSender) appCtx.getBean("birthdayCardSenderAspect");
+
+		assertThat(birthDaySender.peopleSentCards).hasSize(1);
+		assertThat(birthDaySender.peopleSentCards.get(0).getName()).isEqualTo("Fred");
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	void useTwoSpringNamespaces() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		TestScope scope = new TestScope();
+		appCtx.getBeanFactory().registerScope("test", scope);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			xmlns aop:"http://www.springframework.org/schema/aop"
+			xmlns util:"http://www.springframework.org/schema/util"
+			bean1(Bean1) { bean ->
+				bean.scope = "test"
+				aop.'scoped-proxy'()
+			}
+			util.list(id: 'foo') {
+				value 'one'
+				value 'two'
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThat((List<String>)appCtx.getBean("foo")).containsExactly("one", "two");
+
+		assertThat(appCtx.getBean("bean1")).isNotNull();
+		assertThat(((Bean1)appCtx.getBean("bean1")).getPerson()).isNull();
+		assertThat(((Bean1)appCtx.getBean("bean1")).getPerson()).isNull();
+
+		// should only be true because bean not initialized until proxy called
+		assertThat(scope.instanceCount).isEqualTo(2);
+
+		appCtx = new GenericApplicationContext();
+		reader = new GroovyBeanDefinitionReader(appCtx);
+		appCtx.getBeanFactory().registerScope("test", scope);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		import java.util.ArrayList
+		beans {
+			xmlns aop:"http://www.springframework.org/schema/aop",
+				util:"http://www.springframework.org/schema/util"
+			bean1(Bean1) { bean ->
+				bean.scope = "test"
+				aop.'scoped-proxy'()
+			}
+			util.list(id: 'foo') {
+				value 'one'
+				value 'two'
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThat((List<String>)appCtx.getBean("foo")).containsExactly("one", "two");
+
+		assertThat(appCtx.getBean("bean1")).isNotNull();
+		assertThat(((Bean1)appCtx.getBean("bean1")).getPerson()).isNull();
+		assertThat(((Bean1)appCtx.getBean("bean1")).getPerson()).isNull();
+
+		// should only be true because bean not initialized until proxy called
+		assertThat(scope.instanceCount).isEqualTo(4);
+	}
+
+	@Test
+	void springAopSupport() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			xmlns aop:"http://www.springframework.org/schema/aop"
+
+			fred(AdvisedPerson) {
+				name = "Fred"
+				age = 45
+			}
+			birthdayCardSenderAspect(BirthdayCardSender)
+
+			aop.config("proxy-target-class":true) {
+				aspect( id:"sendBirthdayCard",ref:"birthdayCardSenderAspect" ) {
+					after method:"onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
+				}
+			}
+		}
+		""").getBytes()));
+
+		appCtx.refresh();
+
+		AdvisedPerson fred = (AdvisedPerson) appCtx.getBean("fred");
+		assertThat(fred).isInstanceOf(SpringProxy.class);
+		fred.birthday();
+
+		BirthdayCardSender birthDaySender = (BirthdayCardSender) appCtx.getBean("birthdayCardSenderAspect");
+
+		assertThat(birthDaySender.peopleSentCards).hasSize(1);
+		assertThat(birthDaySender.peopleSentCards.get(0).getName()).isEqualTo("Fred");
+	}
+
+	@Test
+	void springScopedProxyBean() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		TestScope scope = new TestScope();
+		appCtx.getBeanFactory().registerScope("test", scope);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			xmlns aop:"http://www.springframework.org/schema/aop"
+			scopedList(Bean1) { bean ->
+				bean.scope = "test"
+				aop.'scoped-proxy'()
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThat(appCtx.getBean("scopedList")).isNotNull();
+		assertThat(((Bean1)appCtx.getBean("scopedList")).getPerson()).isNull();
+		assertThat(((Bean1)appCtx.getBean("scopedList")).getPerson()).isNull();
+
+		// should only be true because bean not initialized until proxy called
+		assertThat(scope.instanceCount).isEqualTo(2);
+	}
+
+	@Test
+	void springNamespaceBean() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			xmlns util: 'http://www.springframework.org/schema/util'
+			util.list(id: 'foo') {
+				value 'one'
+				value 'two'
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThat((List<String>)appCtx.getBean("foo")).contains("one", "two");
+	}
+
+	@Test
+	void namedArgumentConstructor() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			holyGrail(HolyGrailQuest)
+			knights(KnightOfTheRoundTable, "Camelot", leader:"lancelot", quest: holyGrail)
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		KnightOfTheRoundTable knights = (KnightOfTheRoundTable) appCtx.getBean("knights");
+		HolyGrailQuest quest = (HolyGrailQuest) appCtx.getBean("holyGrail");
+
+		assertThat(knights.getName()).isEqualTo("Camelot");
+		assertThat(knights.leader).isEqualTo("lancelot");
+		assertThat(knights.quest).isEqualTo(quest);
+	}
+
+	@Test
+	void abstractBeanDefinition() {
+		var appCtx = new GenericGroovyApplicationContext();
+		appCtx.getReader().loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			abstractBean {
+				leader = "Lancelot"
+			}
+			quest(HolyGrailQuest)
+			knights(KnightOfTheRoundTable, "Camelot") { bean ->
+				bean.parent = abstractBean
+				quest = quest
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		KnightOfTheRoundTable knights = (KnightOfTheRoundTable) appCtx.getProperty("knights");
+		assertThat(knights).isNotNull();
+		assertThatExceptionOfType(org.springframework.beans.factory.BeanIsAbstractException.class).isThrownBy(() ->
+			appCtx.getProperty("abstractBean"));
+		assertThat(knights.leader).isEqualTo("Lancelot");
+	}
+
+	@Test
+	void abstractBeanDefinitionWithClass() {
+		var appCtx = new GenericGroovyApplicationContext();
+		appCtx.getReader().loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			abstractBean(KnightOfTheRoundTable) { bean ->
+				bean.'abstract' = true
+				leader = "Lancelot"
+			}
+			quest(HolyGrailQuest)
+			knights("Camelot") { bean ->
+				bean.parent = abstractBean
+				quest = quest
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThatExceptionOfType(org.springframework.beans.factory.BeanIsAbstractException.class).isThrownBy(() ->
+			appCtx.getProperty("abstractBean"));
+
+		KnightOfTheRoundTable knights = (KnightOfTheRoundTable) appCtx.getProperty("knights");
+		assertThat(knights).isNotNull();
+		assertThat(knights.leader).isEqualTo("Lancelot");
+	}
+
+	@Test
+	void scopes() {
+		var appCtx = new GenericGroovyApplicationContext();
+		appCtx.getReader().loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			myBean(ScopeTestBean) { bean ->
+				bean.scope = "prototype"
+			}
+			myBean2(ScopeTestBean)
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		var b1 = appCtx.getProperty("myBean");
+		var b2 = appCtx.getProperty("myBean");
+
+		assertThat(b1).isNotSameAs(b2);
+
+		b1 = appCtx.getProperty("myBean2");
+		b2 = appCtx.getProperty("myBean2");
+
+		assertThat(b1).isEqualTo(b2);
+	}
+
+	@Test
+	void simpleBean() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			bean1(Bean1) {
+				person = "homer"
+				age = 45
+				props = [overweight:"true", height:"1.8m"]
+				children = ["bart", "lisa"]
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThat(appCtx.containsBean("bean1")).isTrue();
+		Bean1 bean1 = (Bean1) appCtx.getBean("bean1");
+
+		assertThat(bean1.person).isEqualTo("homer");
+		assertThat(bean1.age).isEqualTo(45);
+		assertThat(bean1.props.getProperty("overweight")).isEqualTo("true");
+		assertThat(bean1.props.getProperty("height")).isEqualTo("1.8m");
+		assertThat(bean1.children).containsExactly("bart", "lisa");
+
+	}
+
+	@Test
+	void beanWithParentRef() {
+		var parentAppCtx = new GenericApplicationContext();
+		var parentBeanReader = new GroovyBeanDefinitionReader(parentAppCtx);
+		parentBeanReader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			homer(Bean1) {
+				person = "homer"
+				age = 45
+				props = [overweight:true, height:"1.8m"]
+				children = ["bart", "lisa"]
+			}
+		}
+		""").getBytes()));
+		parentAppCtx.refresh();
+
+		var appCtx = new GenericApplicationContext(parentAppCtx);
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			bart(Bean2) {
+				person = "bart"
+				parent = ref("homer", true)
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		assertThat(appCtx.containsBean("bart")).isTrue();
+		Bean2 bart = (Bean2) appCtx.getBean("bart");
+		assertThat(bart.parent.person).isEqualTo("homer");
+	}
+
+	@Test
+	void withAnonymousInnerBean() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			bart(Bean1) {
+				person = "bart"
+				age = 11
+			}
+			lisa(Bean1) {
+				person = "lisa"
+				age = 9
+			}
+			marge(Bean2) {
+				person = "marge"
+				bean1 =  { Bean1 b ->
+							person = "homer"
+							age = 45
+							props = [overweight:true, height:"1.8m"]
+							children = ["bart", "lisa"] }
+				children = [bart, lisa]
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean2 marge = (Bean2) appCtx.getBean("marge");
+		assertThat(marge.bean1.person).isEqualTo("homer");
+	}
+
+	@Test
+	void withUntypedAnonymousInnerBean() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			homer(Bean1Factory)
+			bart(Bean1) {
+				person = "bart"
+				age = 11
+			}
+			lisa(Bean1) {
+				person = "lisa"
+				age = 9
+			}
+			marge(Bean2) {
+				person = "marge"
+				bean1 =  { bean ->
+							bean.factoryBean = "homer"
+							bean.factoryMethod = "newInstance"
+							person = "homer" }
+				children = [bart, lisa]
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean2 marge = (Bean2) appCtx.getBean("marge");
+		assertThat(marge.bean1.person).isEqualTo("homer");
+	}
+
+	@Test
+	void beanReferences() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			homer(Bean1) {
+				person = "homer"
+				age = 45
+				props = [overweight:true, height:"1.8m"]
+				children = ["bart", "lisa"]
+			}
+			bart(Bean1) {
+				person = "bart"
+				age = 11
+			}
+			lisa(Bean1) {
+				person = "lisa"
+				age = 9
+			}
+			marge(Bean2) {
+				person = "marge"
+				bean1 = homer
+				children = [bart, lisa]
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		var homer = appCtx.getBean("homer");
+		Bean2 marge = (Bean2) appCtx.getBean("marge");
+		Bean1 bart = (Bean1) appCtx.getBean("bart");
+		Bean1 lisa = (Bean1) appCtx.getBean("lisa");
+
+		assertThat(marge.bean1).isEqualTo(homer);
+		assertThat(marge.children).hasSize(2);
+
+		assertThat(marge.children).containsExactlyInAnyOrder(bart, lisa);
+	}
+
+	@Test
+	void beanWithConstructor() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			homer(Bean1) {
+				person = "homer"
+				age = 45
+			}
+			marge(Bean3, "marge", homer) {
+				age = 40
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean3 marge = (Bean3) appCtx.getBean("marge");
+		assertThat(marge.person).isEqualTo("marge");
+		assertThat(marge.bean1.person).isEqualTo("homer");
+		assertThat(marge.age).isEqualTo(40);
+	}
+
+	@Test
+	void beanWithFactoryMethod() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			homer(Bean1) {
+				person = "homer"
+				age = 45
+			}
+			def marge = marge(Bean4) {
+				person = "marge"
+			}
+			marge.factoryMethod = "getInstance"
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean4 marge = (Bean4) appCtx.getBean("marge");
+		assertThat(marge.person).isEqualTo("marge");
+	}
+
+	@Test
+	void beanWithFactoryMethodUsingClosureArgs() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			homer(Bean1) {
+				person = "homer"
+				age = 45
+			}
+			marge(Bean4) { bean ->
+				bean.factoryMethod = "getInstance"
+				person = "marge"
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean4 marge = (Bean4) appCtx.getBean("marge");
+		assertThat(marge.person).isEqualTo("marge");
+	}
+
+	@Test
+	void beanWithFactoryMethodWithConstructorArgs() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			beanFactory(Bean1FactoryWithArgs){}
+
+			homer(beanFactory:"newInstance", "homer") {
+				age = 45
+			}
+			//Test with no closure body
+			marge(beanFactory:"newInstance", "marge")
+
+			//Test more verbose method
+			mcBain("mcBain"){
+				bean ->
+				bean.factoryBean="beanFactory"
+				bean.factoryMethod="newInstance"
+
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean1 homer = (Bean1) appCtx.getBean("homer");
+
+		assertThat(homer.person).isEqualTo("homer");
+		assertThat(homer.age).isEqualTo(45);
+
+		assertThat(((Bean1)appCtx.getBean("marge")).person).isEqualTo("marge");
+
+		assertThat(((Bean1)appCtx.getBean("mcBain")).person).isEqualTo("mcBain");
+	}
+
+	@Test
+	void getBeanDefinitions() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			jeff(Bean1) {
+				person = 'jeff'
+			}
+			graeme(Bean1) {
+				person = 'graeme'
+			}
+			guillaume(Bean1) {
+				person = 'guillaume'
+			}
+		}
+		""").getBytes()));
+
+		assertThat(reader.getRegistry().getBeanDefinitionCount()).as("beanDefinitions was the wrong size").isEqualTo(3);
+		assertThat(reader.getRegistry().getBeanDefinition("jeff")).as("beanDefinitions did not contain jeff").isNotNull();
+		assertThat(reader.getRegistry().getBeanDefinition("guillaume")).as("beanDefinitions did not contain guillaume").isNotNull();
+		assertThat(reader.getRegistry().getBeanDefinition("graeme")).as("beanDefinitions did not contain graeme").isNotNull();
+	}
+
+	@Test
+	void beanWithFactoryBean() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			myFactory(Bean1Factory)
+
+			homer(myFactory) { bean ->
+				bean.factoryMethod = "newInstance"
+				person = "homer"
+				age = 45
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean1 homer = (Bean1) appCtx.getBean("homer");
+
+		assertThat(homer.person).isEqualTo("homer");
+	}
+
+	@Test
+	void beanWithFactoryBeanAndMethod() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			myFactory(Bean1Factory)
+
+			homer(myFactory:"newInstance") { bean ->
+				person = "homer"
+				age = 45
+			}
+		}
+		""").getBytes()));
+
+		appCtx.refresh();
+
+		Bean1 homer = (Bean1) appCtx.getBean("homer");
+		assertThat(homer.person).isEqualTo("homer");
+	}
+
+	@Test
+	void loadExternalBeans() {
+		var appCtx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy");
+
+		assertThat(appCtx.containsBean("foo")).isTrue();
+		var foo = appCtx.getBean("foo");
+		assertThat(foo).isEqualTo("hello");
+	}
+
+	@Test
+	void loadExternalBeansWithExplicitRefresh() {
+		var appCtx = new GenericGroovyApplicationContext();
+		appCtx.load("org/springframework/context/groovy/applicationContext.groovy");
+		appCtx.refresh();
+
+		assertThat(appCtx.containsBean("foo")).isTrue();
+		var foo = appCtx.getBean("foo");
+		assertThat(foo).isEqualTo("hello");
+	}
+
+	@Test
+	void holyGrailWiring() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			quest(HolyGrailQuest)
+
+			knight(KnightOfTheRoundTable, "Bedivere") {
+				quest = ref("quest")
+			}
+		}
+		""").getBytes()));
+
+		appCtx.refresh();
+
+		KnightOfTheRoundTable knight = (KnightOfTheRoundTable) appCtx.getBean("knight");
+		knight.embarkOnQuest();
+	}
+
+	@Test
+	void abstractBeanSpecifyingClass() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			abstractKnight(KnightOfTheRoundTable) { bean ->
+				bean.'abstract' = true
+				leader = "King Arthur"
+			}
+
+			lancelot("lancelot") { bean ->
+				bean.parent = ref("abstractKnight")
+			}
+
+			abstractPerson(Bean1) { bean ->
+				bean.'abstract'=true
+				age = 45
+			}
+			homerBean { bean ->
+				bean.parent = ref("abstractPerson")
+				person = "homer"
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		KnightOfTheRoundTable lancelot = (KnightOfTheRoundTable) appCtx.getBean("lancelot");
+		assertThat(lancelot.leader).isEqualTo("King Arthur");
+		assertThat(lancelot.name).isEqualTo("lancelot");
+
+		Bean1 homerBean = (Bean1) appCtx.getBean("homerBean");
+
+		assertThat(homerBean.age).isEqualTo(45);
+		assertThat(homerBean.person).isEqualTo("homer");
+	}
+
+	@Test
+	void groovyBeanDefinitionReaderWithScript() throws Exception {
+		var script = """
+def appCtx = new org.springframework.context.support.GenericGroovyApplicationContext()
+appCtx.reader.beans {
+quest(org.springframework.context.groovy.HolyGrailQuest) {}
+
+knight(org.springframework.context.groovy.KnightOfTheRoundTable, "Bedivere") { quest = quest }
+}
+appCtx.refresh()
+return appCtx
+""";
+		GenericGroovyApplicationContext appCtx = (GenericGroovyApplicationContext) new GroovyShell().evaluate(script);
+
+		KnightOfTheRoundTable knight = (KnightOfTheRoundTable) appCtx.getBean("knight");
+		knight.embarkOnQuest();
+	}
+
+	// test for GRAILS-5057
+	@Test
+	void registerBeans() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			personA(AdvisedPerson) {
+				name = "Bob"
+			}
+		}
+		""").getBytes()));
+
+		appCtx.refresh();
+		assertThat(((AdvisedPerson)appCtx.getBean("personA")).name).isEqualTo("Bob");
+
+		appCtx = new GenericApplicationContext();
+		reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			personA(AdvisedPerson) {
+				name = "Fred"
+			}
+		}
+		""").getBytes()));
+
+		appCtx.refresh();
+		assertThat(((AdvisedPerson)appCtx.getBean("personA")).name).isEqualTo("Fred");
+	}
+
+	@Test
+	void listOfBeansAsConstructorArg() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			someotherbean(SomeOtherClass, new File('somefile.txt'))
+			someotherbean2(SomeOtherClass, new File('somefile.txt'))
+
+			somebean(SomeClass,  [someotherbean, someotherbean2])
+		}
+		""").getBytes()));
+
+		assertThat(appCtx.containsBean("someotherbean")).isTrue();
+		assertThat(appCtx.containsBean("someotherbean2")).isTrue();
+		assertThat(appCtx.containsBean("somebean")).isTrue();
+	}
+
+	@Test
+	void beanWithListAndMapConstructor() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			bart(Bean1) {
+				person = "bart"
+				age = 11
+			}
+			lisa(Bean1) {
+				person = "lisa"
+				age = 9
+			}
+
+			beanWithList(Bean5, [bart, lisa])
+
+			// test runtime references both as ref() and as plain name
+			beanWithMap(Bean6, [bart:bart, lisa:ref('lisa')])
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean5 beanWithList = (Bean5) appCtx.getBean("beanWithList");
+		assertThat(beanWithList.people).hasSize(2);
+		assertThat(beanWithList.people.get(0).person).isEqualTo("bart");
+
+		Bean6 beanWithMap = (Bean6) appCtx.getBean("beanWithMap");
+		assertThat(beanWithMap.peopleByName.get("lisa").age).isEqualTo(9);
+		assertThat(beanWithMap.peopleByName.get("bart").person).isEqualTo("bart");
+	}
+
+	@Test
+	void anonymousInnerBeanViaBeanMethod() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			bart(Bean1) {
+				person = "bart"
+				age = 11
+			}
+			lisa(Bean1) {
+				person = "lisa"
+				age = 9
+			}
+			marge(Bean2) {
+				person = "marge"
+				bean1 =  bean(Bean1) {
+					person = "homer"
+					age = 45
+					props = [overweight:true, height:"1.8m"]
+					children = ["bart", "lisa"]
+				}
+				children = [bart, lisa]
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean2 marge = (Bean2) appCtx.getBean("marge");
+		assertThat(marge.bean1.person).isEqualTo("homer");
+	}
+
+	@Test
+	void anonymousInnerBeanViaBeanMethodWithConstructorArgs() {
+		var appCtx = new GenericApplicationContext();
+		var reader = new GroovyBeanDefinitionReader(appCtx);
+		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		package org.springframework.context.groovy
+		beans {
+			bart(Bean1) {
+				person = "bart"
+				age = 11
+			}
+			lisa(Bean1) {
+				person = "lisa"
+				age = 9
+			}
+			marge(Bean2) {
+				person = "marge"
+				bean3 =  bean(Bean3, "homer", lisa) {
+					person = "homer"
+					age = 45
+				}
+				children = [bart, lisa]
+			}
+		}
+		""").getBytes()));
+		appCtx.refresh();
+
+		Bean2 marge = (Bean2) appCtx.getBean("marge");
+
+		assertThat(marge.bean3.person).isEqualTo("homer");
+		assertThat(marge.bean3.bean1.person).isEqualTo("lisa");
+	}
+
+}
+
+class HolyGrailQuest {
+	void start() { System.out.println("lets begin"); }
+}
+
+class KnightOfTheRoundTable {
+	String name;
+	String leader;
+
+	KnightOfTheRoundTable(String n) {
+		this.name = n;
+	}
+
+	HolyGrailQuest quest;
+
+	void embarkOnQuest() {
+		quest.start();
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getLeader() {
+		return leader;
+	}
+
+	public void setLeader(String leader) {
+		this.leader = leader;
+	}
+
+	public HolyGrailQuest getQuest() {
+		return quest;
+	}
+
+	public void setQuest(HolyGrailQuest quest) {
+		this.quest = quest;
+	}
+}
+
+// simple bean
+class Bean1 {
+	String person;
+	int age;
+	Properties props = new Properties();
+	List<String> children = new ArrayList<>();
+	public String getPerson() {
+		return person;
+	}
+	public void setPerson(String person) {
+		this.person = person;
+	}
+	public int getAge() {
+		return age;
+	}
+	public void setAge(int age) {
+		this.age = age;
+	}
+	public Properties getProps() {
+		return props;
+	}
+	public void setProps(Properties props) {
+		this.props.putAll(props);
+	}
+	public List<String> getChildren() {
+		return children;
+	}
+	public void setChildren(List<String> children) {
+		this.children = children;
+	}
+}
+
+// bean referencing other bean
+class Bean2 {
+	int age;
+	Bean1 bean1;
+	Bean3 bean3;
+	String person;
+	Bean1 parent;
+	List<Bean1> children = new ArrayList<>();
+	public int getAge() {
+		return age;
+	}
+	public void setAge(int age) {
+		this.age = age;
+	}
+	public String getPerson() {
+		return person;
+	}
+	public void setPerson(String person) {
+		this.person = person;
+	}
+	public Bean1 getParent() {
+		return parent;
+	}
+	public void setParent(Bean1 parent) {
+		this.parent = parent;
+	}
+	public Bean1 getBean1() {
+		return bean1;
+	}
+	public void setBean1(Bean1 bean1) {
+		this.bean1 = bean1;
+	}
+	public Bean3 getBean3() {
+		return bean3;
+	}
+	public void setBean3(Bean3 bean3) {
+		this.bean3 = bean3;
+	}
+	public List<Bean1> getChildren() {
+		return children;
+	}
+	public void setChildren(List<Bean1> children) {
+		this.children = children;
+	}
+}
+
+// bean with constructor args
+class Bean3 {
+	Bean3(String person, Bean1 bean1) {
+		this.person = person;
+		this.bean1 = bean1;
+	}
+	String person;
+	Bean1 bean1;
+	int age;
+	public int getAge() {
+		return age;
+	}
+	public void setAge(int age) {
+		this.age = age;
+	}
+	public String getPerson() {
+		return person;
+	}
+	public void setPerson(String person) {
+		this.person = person;
+	}
+	public Bean1 getBean1() {
+		return bean1;
+	}
+	public void setBean1(Bean1 bean1) {
+		this.bean1 = bean1;
+	}
+}
+
+// bean with factory method
+class Bean4 {
+	private Bean4() {}
+	static Bean4 getInstance() {
+		return new Bean4();
+	}
+	String person;
+	public String getPerson() {
+		return person;
+	}
+	public void setPerson(String person) {
+		this.person = person;
+	}
+}
+
+// bean with List-valued constructor arg
+class Bean5 {
+	Bean5(List<Bean1> people) {
+		this.people = people;
+	}
+	List<Bean1> people;
+}
+
+// bean with Map-valued constructor arg
+class Bean6 {
+	Bean6(Map<String, Bean1> peopleByName) {
+		this.peopleByName = peopleByName;
+	}
+	Map<String, Bean1> peopleByName;
+}
+
+// a factory bean
+class Bean1Factory {
+	Bean1 newInstance() {
+		return new Bean1();
+	}
+}
+
+class ScopeTestBean {
+}
+
+class TestScope implements Scope {
+
+	int instanceCount;
+
+	@Override
+	public Object remove(String name) {
+		// do nothing
+		return null;
+	}
+
+	@Override
+	public void registerDestructionCallback(String name, Runnable callback) {
+	}
+
+	@Override
+	public String getConversationId() {
+		return "mock";
+	}
+
+	@Override
+	public Object get(String name, ObjectFactory<?> objectFactory) {
+		instanceCount++;
+		return objectFactory.getObject();
+	}
+
+	@Override
+	public Object resolveContextualObject(String s) {
+		return null;  // noop
+	}
+}
+
+class BirthdayCardSender {
+	List<AdvisedPerson> peopleSentCards = new ArrayList<>();
+
+	public void onBirthday(AdvisedPerson person) {
+		peopleSentCards.add(person);
+	}
+}
+
+@Component(value = "person")
+class AdvisedPerson {
+	int age;
+	String name;
+
+	public void birthday() {
+		++age;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}
+
+class SomeClass {
+	public SomeClass(List<SomeOtherClass> soc) {}
+}
+
+class SomeOtherClass {
+	public SomeOtherClass(File f) {}
+}
+
+// a factory bean that takes arguments
+class Bean1FactoryWithArgs {
+	Bean1 newInstance(String name) {
+		Bean1 bean = new Bean1();
+		bean.person = name;
+		return bean;
+	}
+}

From a6deac3ffe8d9ed5d15802eca8b46fa21c765ac3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 21 Jan 2022 10:33:32 +0100
Subject: [PATCH 587/735] Polish contribution

See gh-27945
---
 .../annotation/AutowiredAnnotationBeanPostProcessor.java   | 7 +++----
 .../beans/factory/groovy/GroovyDynamicElementReader.java   | 2 +-
 .../beans/factory/support/AbstractBeanFactory.java         | 2 +-
 .../GroovyApplicationContextDynamicBeanPropertyTests.java  | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 00e1b73f342b..9e7fabe5c33f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -541,10 +541,9 @@ private MergedAnnotation<?> findAutowiredAnnotation(AccessibleObject ao) {
 	 * @param ann the Autowired annotation
 	 * @return whether the annotation indicates that a dependency is required
 	 */
-	@SuppressWarnings("cast")
 	protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
-		return determineRequiredStatus((AnnotationAttributes)
-				ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
+		return determineRequiredStatus(ann.<AnnotationAttributes> asMap(
+				mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
index 7cd9e852b6e9..bcab348fece4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
@@ -58,7 +58,7 @@ class GroovyDynamicElementReader extends GroovyObjectSupport {
 
 	public GroovyDynamicElementReader(String namespace, Map<String, String> namespaceMap,
 			BeanDefinitionParserDelegate delegate, GroovyBeanDefinitionWrapper beanDefinition, boolean decorating) {
-		super();
+
 		this.rootNamespace = namespace;
 		this.xmlNamespaces = namespaceMap;
 		this.delegate = delegate;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index 9c00e0fcf38e..d003326cc327 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
index 51ba8d349fcf..533396107843 100644
--- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
@@ -28,6 +28,7 @@
 /**
  * @author Jeff Brown
  * @author Sam Brannen
+ * @author Dave Syer
  */
 class GroovyApplicationContextDynamicBeanPropertyTests {
 

From 1cf2960eb673cc0360de3a591251994e912ba497 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 21 Jan 2022 10:34:12 +0100
Subject: [PATCH 588/735] Use AssertJ instead of Groovy Assertions

See gh-27945
---
 spring-context/spring-context.gradle          |  1 -
 ...cationContextDynamicBeanPropertyTests.java | 21 ++++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 601300320462..ac2b497d0e3e 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -27,7 +27,6 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("io.projectreactor:reactor-core")
 	testImplementation("org.codehaus.groovy:groovy-jsr223")
-	testImplementation("org.codehaus.groovy:groovy-test")
 	testImplementation("org.codehaus.groovy:groovy-xml")
 	testImplementation("org.apache.commons:commons-pool2")
 	testImplementation("org.awaitility:awaitility")
diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
index 533396107843..2238807b0bc1 100644
--- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 +21,8 @@
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.support.GenericGroovyApplicationContext;
 
-import static groovy.test.GroovyAssert.assertEquals;
-import static groovy.test.GroovyAssert.assertNotNull;
-import static groovy.test.GroovyAssert.assertThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Jeff Brown
@@ -33,26 +32,28 @@
 class GroovyApplicationContextDynamicBeanPropertyTests {
 
 	@Test
-	void testAccessDynamicBeanProperties() {
+	void accessDynamicBeanProperties() {
 		var ctx = new GenericGroovyApplicationContext();
 		ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
 		ctx.refresh();
 
 		var framework = ctx.getProperty("framework");
-		assertNotNull("could not find framework bean", framework);
-		assertEquals("Grails", framework);
+		assertThat(framework).as("could not find framework bean").isNotNull();
+		assertThat(framework).isEqualTo("Grails");
+
 		ctx.close();
 	}
 
 	@Test
-	void testAccessingNonExistentBeanViaDynamicProperty() {
+	void accessingNonExistentBeanViaDynamicProperty() {
 		var ctx = new GenericGroovyApplicationContext();
 		ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
 		ctx.refresh();
 
-		var err = assertThrows(NoSuchBeanDefinitionException.class, () -> ctx.getProperty("someNonExistentBean"));
+		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
+			.isThrownBy(() -> ctx.getProperty("someNonExistentBean"))
+			.withMessage("No bean named 'someNonExistentBean' available");
 
-		assertEquals("No bean named 'someNonExistentBean' available", err.getMessage());
 		ctx.close();
 	}
 

From e94e67cd93372945ceb9affc45aea97b246be017 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 21 Jan 2022 10:36:17 +0100
Subject: [PATCH 589/735] Polish GroovyApplicationContextTests

See gh-27945
---
 .../groovy/GroovyApplicationContextTests.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextTests.java
index c4caed253763..e59566baf577 100644
--- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,20 +28,22 @@
  * @author Jeff Brown
  * @author Juergen Hoeller
  */
-public class GroovyApplicationContextTests {
+class GroovyApplicationContextTests {
 
 	@Test
-	public void testLoadingConfigFile() {
+	void loadingConfigFile() {
 		GenericGroovyApplicationContext ctx = new GenericGroovyApplicationContext(
 				"org/springframework/context/groovy/applicationContext.groovy");
 
 		Object framework = ctx.getBean("framework");
 		assertThat(framework).as("could not find framework bean").isNotNull();
 		assertThat(framework).isEqualTo("Grails");
+
+		ctx.close();
 	}
 
 	@Test
-	public void testLoadingMultipleConfigFiles() {
+	void loadingMultipleConfigFiles() {
 		GenericGroovyApplicationContext ctx = new GenericGroovyApplicationContext(
 				"org/springframework/context/groovy/applicationContext2.groovy",
 				"org/springframework/context/groovy/applicationContext.groovy");
@@ -53,10 +55,12 @@ public void testLoadingMultipleConfigFiles() {
 		Object company = ctx.getBean("company");
 		assertThat(company).as("could not find company bean").isNotNull();
 		assertThat(company).isEqualTo("SpringSource");
+
+		ctx.close();
 	}
 
 	@Test
-	public void testLoadingMultipleConfigFilesWithRelativeClass() {
+	void loadingMultipleConfigFilesWithRelativeClass() {
 		GenericGroovyApplicationContext ctx = new GenericGroovyApplicationContext();
 		ctx.load(GroovyApplicationContextTests.class, "applicationContext2.groovy", "applicationContext.groovy");
 		ctx.refresh();
@@ -68,10 +72,12 @@ public void testLoadingMultipleConfigFilesWithRelativeClass() {
 		Object company = ctx.getBean("company");
 		assertThat(company).as("could not find company bean").isNotNull();
 		assertThat(company).isEqualTo("SpringSource");
+
+		ctx.close();
 	}
 
 	@Test
-	public void testConfigFileParsingError() {
+	void configFileParsingError() {
 		assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(() ->
 				new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext-error.groovy"));
 	}

From 9af2c9d55d4ed41b23f32d4dc38d47bd1dce30e7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 21 Jan 2022 10:45:45 +0100
Subject: [PATCH 590/735] Overhaul GroovyBeanDefinitionReaderTests

This commit switches from CGLIB-based proxies to JDK dynamic proxies
for AOP and scoped-bean tests, in order to be able to run tests in the
Eclipse IDE without special Run Configuration setup for the Java module
system.

This commit also simplifies the loading of beans defined with the Groovy
DSL.

See gh-27945
---
 .../GroovyBeanDefinitionReaderTests.java      | 1186 ++++++++---------
 1 file changed, 593 insertions(+), 593 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
index fa3fe2ea5c97..f55dbc825192 100644
--- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.SpringProxy;
+import org.springframework.beans.factory.BeanIsAbstractException;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.Scope;
 import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
@@ -37,59 +38,57 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class GroovyBeanDefinitionReaderTests {
+/**
+ * Tests for {@link GroovyBeanDefinitionReader}.
+ *
+ * @author Jeff Brown
+ * @author Dave Syer
+ * @author Sam Brannen
+ */
+class GroovyBeanDefinitionReaderTests {
 
 	@Test
 	void importSpringXml() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		loadGroovyDsl(appCtx, """
 			beans {
 				importBeans "classpath:org/springframework/context/groovy/test.xml"
 			}
-			""").getBytes()));
+			""");
 
-		appCtx.refresh();
-
-		var foo = appCtx.getBean("foo");
-		assertThat(foo).isEqualTo("hello");
+		assertThat(appCtx.getBean("foo")).isEqualTo("hello");
 	}
 
 	@Test
 	void importBeansFromGroovy() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
+		loadGroovyDsl(appCtx, """
 			beans {
 				importBeans "classpath:org/springframework/context/groovy/applicationContext.groovy"
 			}
-			""").getBytes()));
+			""");
 
-		appCtx.refresh();
-
-		var foo = appCtx.getBean("foo");
-		assertThat(foo).isEqualTo("hello");
+		assertThat(appCtx.getBean("foo")).isEqualTo("hello");
 	}
 
 	@Test
 	void singletonPropertyOnBeanDefinition() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy;
-		beans {
-			singletonBean(Bean1) { bean ->
-				bean.singleton = true
-			}
-			nonSingletonBean(Bean1) { bean ->
-				bean.singleton = false
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy;
+			beans {
+				singletonBean(Bean1Impl) { bean ->
+					bean.singleton = true
+				}
+				nonSingletonBean(Bean1Impl) { bean ->
+					bean.singleton = false
+				}
+				unSpecifiedScopeBean(Bean1Impl)
 			}
-			unSpecifiedScopeBean(Bean1)
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		assertThat(appCtx.isSingleton("singletonBean")).as("singletonBean should have been a singleton").isTrue();
 		assertThat(appCtx.isSingleton("nonSingletonBean")).as("nonSingletonBean should not have been a singleton").isFalse();
@@ -99,77 +98,69 @@ void singletonPropertyOnBeanDefinition() {
 	@Test
 	void inheritPropertiesFromAbstractBean() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy;
-		beans {
-			myB(Bean1){
-				person = "wombat"
-			}
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy;
+			beans {
+				myB(Bean1Impl) {
+					person = "wombat"
+				}
 
-			myAbstractA(Bean2){ bean ->
-				bean."abstract" = true
-				age = 10
-				bean1 = myB
-			}
-			myConcreteB {
-				it.parent = myAbstractA
+				myAbstractA(Bean2) { bean ->
+					bean."abstract" = true
+					age = 10
+					bean1 = myB
+				}
+				myConcreteB {
+					it.parent = myAbstractA
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean2 bean = (Bean2) appCtx.getBean("myConcreteB");
-		assertThat(bean.age).isEqualTo(10);
+		assertThat(bean.getAge()).isEqualTo(10);
 		assertThat(bean.bean1).isNotNull();
 	}
 
 	@Test
 	void contextComponentScanSpringTag() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		beans {
-			xmlns context:"http://www.springframework.org/schema/context"
+		loadGroovyDsl(appCtx, """
+			beans {
+				xmlns context:"http://www.springframework.org/schema/context"
 
-			context.'component-scan'( 'base-package':"org.springframework.context.groovy" )
-		}
-		""").getBytes()));
-		appCtx.refresh();
+				context.'component-scan'( 'base-package':"org.springframework.context.groovy" )
+			}
+			""");
 
-		var p = appCtx.getBean("person");
-		assertThat(p).isInstanceOf(AdvisedPerson.class);
+		assertThat(appCtx.getBean("person")).isInstanceOf(AdvisedPerson.class);
 	}
 
 	@Test
 	void useSpringNamespaceAsMethod() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy;
-		beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy;
+			beans {
+				xmlns aop:"http://www.springframework.org/schema/aop"
 
-			fred(AdvisedPerson) {
-				name = "Fred"
-				age = 45
-			}
-			birthdayCardSenderAspect(BirthdayCardSender)
+				fred(AdvisedPersonImpl) {
+					name = "Fred"
+					age = 45
+				}
+				birthdayCardSenderAspect(BirthdayCardSender)
 
-			aop {
-				config("proxy-target-class":true) {
-					aspect( id:"sendBirthdayCard",ref:"birthdayCardSenderAspect" ) {
-						after method:"onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
+				aop {
+					config("proxy-target-class": false) {
+						aspect(id: "sendBirthdayCard", ref: "birthdayCardSenderAspect") {
+							after method: "onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
+						}
 					}
 				}
 			}
-		}
-		""").getBytes()));
-
-		appCtx.refresh();
+			""");
 
 		AdvisedPerson fred = (AdvisedPerson) appCtx.getBean("fred");
 		assertThat(fred).isInstanceOf(SpringProxy.class);
@@ -181,30 +172,28 @@ void useSpringNamespaceAsMethod() {
 		assertThat(birthDaySender.peopleSentCards.get(0).getName()).isEqualTo("Fred");
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
+	@SuppressWarnings("unchecked")
 	void useTwoSpringNamespaces() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 		TestScope scope = new TestScope();
 		appCtx.getBeanFactory().registerScope("test", scope);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
-			xmlns util:"http://www.springframework.org/schema/util"
-			bean1(Bean1) { bean ->
-				bean.scope = "test"
-				aop.'scoped-proxy'()
-			}
-			util.list(id: 'foo') {
-				value 'one'
-				value 'two'
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				xmlns aop:"http://www.springframework.org/schema/aop"
+				xmlns util:"http://www.springframework.org/schema/util"
+				bean1(Bean1Impl) { bean ->
+					bean.scope = "test"
+					aop.'scoped-proxy'("proxy-target-class": false)
+				}
+				util.list(id: 'foo') {
+					value 'one'
+					value 'two'
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		assertThat((List<String>)appCtx.getBean("foo")).containsExactly("one", "two");
 
@@ -216,26 +205,23 @@ void useTwoSpringNamespaces() {
 		assertThat(scope.instanceCount).isEqualTo(2);
 
 		appCtx = new GenericApplicationContext();
-		reader = new GroovyBeanDefinitionReader(appCtx);
 		appCtx.getBeanFactory().registerScope("test", scope);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		import java.util.ArrayList
-		beans {
-			xmlns aop:"http://www.springframework.org/schema/aop",
-				util:"http://www.springframework.org/schema/util"
-			bean1(Bean1) { bean ->
-				bean.scope = "test"
-				aop.'scoped-proxy'()
-			}
-			util.list(id: 'foo') {
-				value 'one'
-				value 'two'
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			import java.util.ArrayList
+			beans {
+				xmlns aop:"http://www.springframework.org/schema/aop", util:"http://www.springframework.org/schema/util"
+				bean1(Bean1Impl) { bean ->
+					bean.scope = "test"
+					aop.'scoped-proxy'("proxy-target-class": false)
+				}
+				util.list(id: 'foo') {
+					value 'one'
+					value 'two'
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		assertThat((List<String>)appCtx.getBean("foo")).containsExactly("one", "two");
 
@@ -250,28 +236,25 @@ void useTwoSpringNamespaces() {
 	@Test
 	void springAopSupport() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				xmlns aop:"http://www.springframework.org/schema/aop"
 
-			fred(AdvisedPerson) {
-				name = "Fred"
-				age = 45
-			}
-			birthdayCardSenderAspect(BirthdayCardSender)
+				fred(AdvisedPersonImpl) {
+					name = "Fred"
+					age = 45
+				}
+				birthdayCardSenderAspect(BirthdayCardSender)
 
-			aop.config("proxy-target-class":true) {
-				aspect( id:"sendBirthdayCard",ref:"birthdayCardSenderAspect" ) {
-					after method:"onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
+				aop.config("proxy-target-class": false) {
+					aspect(id: "sendBirthdayCard", ref: "birthdayCardSenderAspect") {
+						after method:"onBirthday", pointcut: "execution(void org.springframework.context.groovy.AdvisedPerson.birthday()) and this(person)"
+					}
 				}
 			}
-		}
-		""").getBytes()));
-
-		appCtx.refresh();
+			""");
 
 		AdvisedPerson fred = (AdvisedPerson) appCtx.getBean("fred");
 		assertThat(fred).isInstanceOf(SpringProxy.class);
@@ -286,63 +269,60 @@ void springAopSupport() {
 	@Test
 	void springScopedProxyBean() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
 		TestScope scope = new TestScope();
 		appCtx.getBeanFactory().registerScope("test", scope);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			xmlns aop:"http://www.springframework.org/schema/aop"
-			scopedList(Bean1) { bean ->
-				bean.scope = "test"
-				aop.'scoped-proxy'()
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				xmlns aop:"http://www.springframework.org/schema/aop"
+				bean1(Bean1Impl) { bean ->
+					bean.scope = "test"
+					aop.'scoped-proxy'('proxy-target-class': false)
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
-		assertThat(appCtx.getBean("scopedList")).isNotNull();
-		assertThat(((Bean1)appCtx.getBean("scopedList")).getPerson()).isNull();
-		assertThat(((Bean1)appCtx.getBean("scopedList")).getPerson()).isNull();
+		assertThat(appCtx.getBean("bean1")).isNotNull();
+		assertThat(((Bean1)appCtx.getBean("bean1")).getPerson()).isNull();
+		assertThat(((Bean1)appCtx.getBean("bean1")).getPerson()).isNull();
 
 		// should only be true because bean not initialized until proxy called
 		assertThat(scope.instanceCount).isEqualTo(2);
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	void springNamespaceBean() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			xmlns util: 'http://www.springframework.org/schema/util'
-			util.list(id: 'foo') {
-				value 'one'
-				value 'two'
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				xmlns util: 'http://www.springframework.org/schema/util'
+				util.list(id: 'foo') {
+					value 'one'
+					value 'two'
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
-		assertThat((List<String>)appCtx.getBean("foo")).contains("one", "two");
+		assertThat((List<String>) appCtx.getBean("foo")).containsExactly("one", "two");
 	}
 
 	@Test
 	void namedArgumentConstructor() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			holyGrail(HolyGrailQuest)
-			knights(KnightOfTheRoundTable, "Camelot", leader:"lancelot", quest: holyGrail)
-		}
-		""").getBytes()));
-		appCtx.refresh();
 
-		KnightOfTheRoundTable knights = (KnightOfTheRoundTable) appCtx.getBean("knights");
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				holyGrail(HolyGrailQuest)
+				knights(KnightsOfTheRoundTable, "Camelot", leader: "lancelot", quest: holyGrail)
+			}
+			""");
+
+		KnightsOfTheRoundTable knights = (KnightsOfTheRoundTable) appCtx.getBean("knights");
 		HolyGrailQuest quest = (HolyGrailQuest) appCtx.getBean("holyGrail");
 
 		assertThat(knights.getName()).isEqualTo("Camelot");
@@ -352,237 +332,233 @@ void namedArgumentConstructor() {
 
 	@Test
 	void abstractBeanDefinition() {
-		var appCtx = new GenericGroovyApplicationContext();
-		appCtx.getReader().loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			abstractBean {
-				leader = "Lancelot"
-			}
-			quest(HolyGrailQuest)
-			knights(KnightOfTheRoundTable, "Camelot") { bean ->
-				bean.parent = abstractBean
-				quest = quest
+		var appCtx = new GenericApplicationContext();
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				abstractBean {
+					leader = "Lancelot"
+				}
+				quest(HolyGrailQuest)
+				knights(KnightsOfTheRoundTable, "Camelot") { bean ->
+					bean.parent = abstractBean
+					quest = quest
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
-		KnightOfTheRoundTable knights = (KnightOfTheRoundTable) appCtx.getProperty("knights");
+		KnightsOfTheRoundTable knights = (KnightsOfTheRoundTable) appCtx.getBean("knights");
 		assertThat(knights).isNotNull();
-		assertThatExceptionOfType(org.springframework.beans.factory.BeanIsAbstractException.class).isThrownBy(() ->
-			appCtx.getProperty("abstractBean"));
+		assertThatExceptionOfType(BeanIsAbstractException.class)
+			.isThrownBy(() -> appCtx.getBean("abstractBean"));
 		assertThat(knights.leader).isEqualTo("Lancelot");
+
+		appCtx.close();
 	}
 
 	@Test
 	void abstractBeanDefinitionWithClass() {
-		var appCtx = new GenericGroovyApplicationContext();
-		appCtx.getReader().loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			abstractBean(KnightOfTheRoundTable) { bean ->
-				bean.'abstract' = true
-				leader = "Lancelot"
-			}
-			quest(HolyGrailQuest)
-			knights("Camelot") { bean ->
-				bean.parent = abstractBean
-				quest = quest
+		var appCtx = new GenericApplicationContext();
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				abstractBean(KnightsOfTheRoundTable) { bean ->
+					bean.'abstract' = true
+					leader = "Lancelot"
+				}
+				quest(HolyGrailQuest)
+				knights("Camelot") { bean ->
+					bean.parent = abstractBean
+					quest = quest
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
-		assertThatExceptionOfType(org.springframework.beans.factory.BeanIsAbstractException.class).isThrownBy(() ->
-			appCtx.getProperty("abstractBean"));
+		assertThatExceptionOfType(BeanIsAbstractException.class)
+			.isThrownBy(() -> appCtx.getBean("abstractBean"));
 
-		KnightOfTheRoundTable knights = (KnightOfTheRoundTable) appCtx.getProperty("knights");
+		KnightsOfTheRoundTable knights = (KnightsOfTheRoundTable) appCtx.getBean("knights");
 		assertThat(knights).isNotNull();
 		assertThat(knights.leader).isEqualTo("Lancelot");
+
+		appCtx.close();
 	}
 
 	@Test
 	void scopes() {
-		var appCtx = new GenericGroovyApplicationContext();
-		appCtx.getReader().loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			myBean(ScopeTestBean) { bean ->
-				bean.scope = "prototype"
+		var appCtx = new GenericApplicationContext();
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				myBean(ScopeTestBean) { bean ->
+					bean.scope = "prototype"
+				}
+				myBean2(ScopeTestBean)
 			}
-			myBean2(ScopeTestBean)
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
-		var b1 = appCtx.getProperty("myBean");
-		var b2 = appCtx.getProperty("myBean");
+		var b1 = appCtx.getBean("myBean");
+		var b2 = appCtx.getBean("myBean");
 
 		assertThat(b1).isNotSameAs(b2);
 
-		b1 = appCtx.getProperty("myBean2");
-		b2 = appCtx.getProperty("myBean2");
+		b1 = appCtx.getBean("myBean2");
+		b2 = appCtx.getBean("myBean2");
 
 		assertThat(b1).isEqualTo(b2);
+
+		appCtx.close();
 	}
 
 	@Test
 	void simpleBean() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			bean1(Bean1) {
-				person = "homer"
-				age = 45
-				props = [overweight:"true", height:"1.8m"]
-				children = ["bart", "lisa"]
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				bean1(Bean1Impl) {
+					person = "homer"
+					age = 45
+					props = [overweight:"true", height:"1.8m"]
+					children = ["bart", "lisa"]
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		assertThat(appCtx.containsBean("bean1")).isTrue();
 		Bean1 bean1 = (Bean1) appCtx.getBean("bean1");
 
-		assertThat(bean1.person).isEqualTo("homer");
-		assertThat(bean1.age).isEqualTo(45);
-		assertThat(bean1.props.getProperty("overweight")).isEqualTo("true");
-		assertThat(bean1.props.getProperty("height")).isEqualTo("1.8m");
-		assertThat(bean1.children).containsExactly("bart", "lisa");
+		assertThat(bean1.getPerson()).isEqualTo("homer");
+		assertThat(bean1.getAge()).isEqualTo(45);
+		assertThat(bean1.getProps().getProperty("overweight")).isEqualTo("true");
+		assertThat(bean1.getProps().getProperty("height")).isEqualTo("1.8m");
+		assertThat(bean1.getChildren()).containsExactly("bart", "lisa");
 
+		appCtx.close();
 	}
 
 	@Test
 	void beanWithParentRef() {
 		var parentAppCtx = new GenericApplicationContext();
-		var parentBeanReader = new GroovyBeanDefinitionReader(parentAppCtx);
-		parentBeanReader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-				props = [overweight:true, height:"1.8m"]
-				children = ["bart", "lisa"]
+		loadGroovyDsl(parentAppCtx, """
+			package org.springframework.context.groovy
+			beans {
+				homer(Bean1Impl) {
+					person = "homer"
+					age = 45
+					props = [overweight:true, height:"1.8m"]
+					children = ["bart", "lisa"]
+				}
 			}
-		}
-		""").getBytes()));
-		parentAppCtx.refresh();
+			""");
 
 		var appCtx = new GenericApplicationContext(parentAppCtx);
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			bart(Bean2) {
-				person = "bart"
-				parent = ref("homer", true)
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				bart(Bean2) {
+					person = "bart"
+					parent = ref("homer", true)
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		assertThat(appCtx.containsBean("bart")).isTrue();
 		Bean2 bart = (Bean2) appCtx.getBean("bart");
-		assertThat(bart.parent.person).isEqualTo("homer");
+		assertThat(bart.parent.getPerson()).isEqualTo("homer");
 	}
 
 	@Test
 	void withAnonymousInnerBean() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 =  { Bean1 b ->
-							person = "homer"
-							age = 45
-							props = [overweight:true, height:"1.8m"]
-							children = ["bart", "lisa"] }
-				children = [bart, lisa]
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				bart(Bean1Impl) {
+					person = "bart"
+					age = 11
+				}
+				lisa(Bean1Impl) {
+					person = "lisa"
+					age = 9
+				}
+				marge(Bean2) {
+					person = "marge"
+					bean1 =  { Bean1Impl b ->
+								person = "homer"
+								age = 45
+								props = [overweight:true, height:"1.8m"]
+								children = ["bart", "lisa"] }
+					children = [bart, lisa]
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean2 marge = (Bean2) appCtx.getBean("marge");
-		assertThat(marge.bean1.person).isEqualTo("homer");
+		assertThat(marge.bean1.getPerson()).isEqualTo("homer");
 	}
 
 	@Test
 	void withUntypedAnonymousInnerBean() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			homer(Bean1Factory)
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 =  { bean ->
-							bean.factoryBean = "homer"
-							bean.factoryMethod = "newInstance"
-							person = "homer" }
-				children = [bart, lisa]
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				homer(Bean1Factory)
+				bart(Bean1Impl) {
+					person = "bart"
+					age = 11
+				}
+				lisa(Bean1Impl) {
+					person = "lisa"
+					age = 9
+				}
+				marge(Bean2) {
+					person = "marge"
+					bean1 =  { bean ->
+								bean.factoryBean = "homer"
+								bean.factoryMethod = "newInstance"
+								person = "homer" }
+					children = [bart, lisa]
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean2 marge = (Bean2) appCtx.getBean("marge");
-		assertThat(marge.bean1.person).isEqualTo("homer");
+		assertThat(marge.bean1.getPerson()).isEqualTo("homer");
 	}
 
 	@Test
 	void beanReferences() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-				props = [overweight:true, height:"1.8m"]
-				children = ["bart", "lisa"]
-			}
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 = homer
-				children = [bart, lisa]
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				homer(Bean1Impl) {
+					person = "homer"
+					age = 45
+					props = [overweight:true, height:"1.8m"]
+					children = ["bart", "lisa"]
+				}
+				bart(Bean1Impl) {
+					person = "bart"
+					age = 11
+				}
+				lisa(Bean1Impl) {
+					person = "lisa"
+					age = 9
+				}
+				marge(Bean2) {
+					person = "marge"
+					bean1 = homer
+					children = [bart, lisa]
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		var homer = appCtx.getBean("homer");
 		Bean2 marge = (Bean2) appCtx.getBean("marge");
@@ -590,135 +566,131 @@ void beanReferences() {
 		Bean1 lisa = (Bean1) appCtx.getBean("lisa");
 
 		assertThat(marge.bean1).isEqualTo(homer);
-		assertThat(marge.children).hasSize(2);
+		assertThat(marge.getChildren()).hasSize(2);
 
-		assertThat(marge.children).containsExactlyInAnyOrder(bart, lisa);
+		assertThat(marge.getChildren()).containsExactly(bart, lisa);
 	}
 
 	@Test
 	void beanWithConstructor() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-			}
-			marge(Bean3, "marge", homer) {
-				age = 40
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				homer(Bean1Impl) {
+					person = "homer"
+					age = 45
+				}
+				marge(Bean3, "marge", homer) {
+					age = 40
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean3 marge = (Bean3) appCtx.getBean("marge");
-		assertThat(marge.person).isEqualTo("marge");
-		assertThat(marge.bean1.person).isEqualTo("homer");
-		assertThat(marge.age).isEqualTo(40);
+		assertThat(marge.getPerson()).isEqualTo("marge");
+		assertThat(marge.bean1.getPerson()).isEqualTo("homer");
+		assertThat(marge.getAge()).isEqualTo(40);
 	}
 
 	@Test
 	void beanWithFactoryMethod() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-			}
-			def marge = marge(Bean4) {
-				person = "marge"
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				homer(Bean1Impl) {
+					person = "homer"
+					age = 45
+				}
+				def marge = marge(Bean4) {
+					person = "marge"
+				}
+				marge.factoryMethod = "getInstance"
 			}
-			marge.factoryMethod = "getInstance"
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean4 marge = (Bean4) appCtx.getBean("marge");
-		assertThat(marge.person).isEqualTo("marge");
+		assertThat(marge.getPerson()).isEqualTo("marge");
 	}
 
 	@Test
 	void beanWithFactoryMethodUsingClosureArgs() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			homer(Bean1) {
-				person = "homer"
-				age = 45
-			}
-			marge(Bean4) { bean ->
-				bean.factoryMethod = "getInstance"
-				person = "marge"
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				homer(Bean1Impl) {
+					person = "homer"
+					age = 45
+				}
+				marge(Bean4) { bean ->
+					bean.factoryMethod = "getInstance"
+					person = "marge"
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean4 marge = (Bean4) appCtx.getBean("marge");
-		assertThat(marge.person).isEqualTo("marge");
+		assertThat(marge.getPerson()).isEqualTo("marge");
 	}
 
 	@Test
 	void beanWithFactoryMethodWithConstructorArgs() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			beanFactory(Bean1FactoryWithArgs){}
 
-			homer(beanFactory:"newInstance", "homer") {
-				age = 45
-			}
-			//Test with no closure body
-			marge(beanFactory:"newInstance", "marge")
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				beanFactory(Bean1FactoryWithArgs){}
 
-			//Test more verbose method
-			mcBain("mcBain"){
-				bean ->
-				bean.factoryBean="beanFactory"
-				bean.factoryMethod="newInstance"
+				homer(beanFactory:"newInstance", "homer") {
+					age = 45
+				}
+				//Test with no closure body
+				marge(beanFactory:"newInstance", "marge")
 
+				//Test more verbose method
+				mcBain("mcBain") { bean ->
+					bean.factoryBean="beanFactory"
+					bean.factoryMethod="newInstance"
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean1 homer = (Bean1) appCtx.getBean("homer");
 
-		assertThat(homer.person).isEqualTo("homer");
-		assertThat(homer.age).isEqualTo(45);
+		assertThat(homer.getPerson()).isEqualTo("homer");
+		assertThat(homer.getAge()).isEqualTo(45);
 
-		assertThat(((Bean1)appCtx.getBean("marge")).person).isEqualTo("marge");
-
-		assertThat(((Bean1)appCtx.getBean("mcBain")).person).isEqualTo("mcBain");
+		assertThat(((Bean1)appCtx.getBean("marge")).getPerson()).isEqualTo("marge");
+		assertThat(((Bean1)appCtx.getBean("mcBain")).getPerson()).isEqualTo("mcBain");
 	}
 
 	@Test
 	void getBeanDefinitions() {
 		var appCtx = new GenericApplicationContext();
 		var reader = new GroovyBeanDefinitionReader(appCtx);
+
 		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			jeff(Bean1) {
-				person = 'jeff'
-			}
-			graeme(Bean1) {
-				person = 'graeme'
-			}
-			guillaume(Bean1) {
-				person = 'guillaume'
+			package org.springframework.context.groovy
+			beans {
+				jeff(Bean1Impl) {
+					person = 'jeff'
+				}
+				graeme(Bean1Impl) {
+					person = 'graeme'
+				}
+				guillaume(Bean1Impl) {
+					person = 'guillaume'
+				}
 			}
-		}
-		""").getBytes()));
+			""").getBytes()));
+
+		appCtx.refresh();
 
 		assertThat(reader.getRegistry().getBeanDefinitionCount()).as("beanDefinitions was the wrong size").isEqualTo(3);
 		assertThat(reader.getRegistry().getBeanDefinition("jeff")).as("beanDefinitions did not contain jeff").isNotNull();
@@ -729,46 +701,43 @@ void getBeanDefinitions() {
 	@Test
 	void beanWithFactoryBean() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			myFactory(Bean1Factory)
-
-			homer(myFactory) { bean ->
-				bean.factoryMethod = "newInstance"
-				person = "homer"
-				age = 45
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				myFactory(Bean1Factory)
+
+				homer(myFactory) { bean ->
+					bean.factoryMethod = "newInstance"
+					person = "homer"
+					age = 45
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean1 homer = (Bean1) appCtx.getBean("homer");
 
-		assertThat(homer.person).isEqualTo("homer");
+		assertThat(homer.getPerson()).isEqualTo("homer");
 	}
 
 	@Test
 	void beanWithFactoryBeanAndMethod() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			myFactory(Bean1Factory)
 
-			homer(myFactory:"newInstance") { bean ->
-				person = "homer"
-				age = 45
-			}
-		}
-		""").getBytes()));
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				myFactory(Bean1Factory)
 
-		appCtx.refresh();
+				homer(myFactory:"newInstance") { bean ->
+					person = "homer"
+					age = 45
+				}
+			}
+			""");
 
 		Bean1 homer = (Bean1) appCtx.getBean("homer");
-		assertThat(homer.person).isEqualTo("homer");
+		assertThat(homer.getPerson()).isEqualTo("homer");
 	}
 
 	@Test
@@ -776,8 +745,9 @@ void loadExternalBeans() {
 		var appCtx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy");
 
 		assertThat(appCtx.containsBean("foo")).isTrue();
-		var foo = appCtx.getBean("foo");
-		assertThat(foo).isEqualTo("hello");
+		assertThat(appCtx.getBean("foo")).isEqualTo("hello");
+
+		appCtx.close();
 	}
 
 	@Test
@@ -787,136 +757,130 @@ void loadExternalBeansWithExplicitRefresh() {
 		appCtx.refresh();
 
 		assertThat(appCtx.containsBean("foo")).isTrue();
-		var foo = appCtx.getBean("foo");
-		assertThat(foo).isEqualTo("hello");
+		assertThat(appCtx.getBean("foo")).isEqualTo("hello");
+
+		appCtx.close();
 	}
 
 	@Test
 	void holyGrailWiring() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			quest(HolyGrailQuest)
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				quest(HolyGrailQuest)
 
-			knight(KnightOfTheRoundTable, "Bedivere") {
-				quest = ref("quest")
+				knights(KnightsOfTheRoundTable, "Bedivere") {
+					quest = ref("quest")
+				}
 			}
-		}
-		""").getBytes()));
+			""");
 
-		appCtx.refresh();
-
-		KnightOfTheRoundTable knight = (KnightOfTheRoundTable) appCtx.getBean("knight");
-		knight.embarkOnQuest();
+		KnightsOfTheRoundTable knights = (KnightsOfTheRoundTable) appCtx.getBean("knights");
+		knights.embarkOnQuest();
 	}
 
 	@Test
 	void abstractBeanSpecifyingClass() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			abstractKnight(KnightOfTheRoundTable) { bean ->
-				bean.'abstract' = true
-				leader = "King Arthur"
-			}
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				abstractKnight(KnightsOfTheRoundTable) { bean ->
+					bean.'abstract' = true
+					leader = "King Arthur"
+				}
 
-			lancelot("lancelot") { bean ->
-				bean.parent = ref("abstractKnight")
-			}
+				lancelot("lancelot") { bean ->
+					bean.parent = ref("abstractKnight")
+				}
 
-			abstractPerson(Bean1) { bean ->
-				bean.'abstract'=true
-				age = 45
-			}
-			homerBean { bean ->
-				bean.parent = ref("abstractPerson")
-				person = "homer"
+				abstractPerson(Bean1Impl) { bean ->
+					bean.'abstract'=true
+					age = 45
+				}
+				homerBean { bean ->
+					bean.parent = ref("abstractPerson")
+					person = "homer"
+				}
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
-		KnightOfTheRoundTable lancelot = (KnightOfTheRoundTable) appCtx.getBean("lancelot");
+		KnightsOfTheRoundTable lancelot = (KnightsOfTheRoundTable) appCtx.getBean("lancelot");
 		assertThat(lancelot.leader).isEqualTo("King Arthur");
 		assertThat(lancelot.name).isEqualTo("lancelot");
 
 		Bean1 homerBean = (Bean1) appCtx.getBean("homerBean");
 
-		assertThat(homerBean.age).isEqualTo(45);
-		assertThat(homerBean.person).isEqualTo("homer");
+		assertThat(homerBean.getAge()).isEqualTo(45);
+		assertThat(homerBean.getPerson()).isEqualTo("homer");
 	}
 
 	@Test
 	void groovyBeanDefinitionReaderWithScript() throws Exception {
 		var script = """
-def appCtx = new org.springframework.context.support.GenericGroovyApplicationContext()
-appCtx.reader.beans {
-quest(org.springframework.context.groovy.HolyGrailQuest) {}
+			def appCtx = new org.springframework.context.support.GenericGroovyApplicationContext()
+			appCtx.reader.beans {
+				quest(org.springframework.context.groovy.HolyGrailQuest)
+
+				knights(org.springframework.context.groovy.KnightsOfTheRoundTable, "Bedivere") {
+					quest = quest
+				}
+			}
+			appCtx.refresh()
+			return appCtx
+			""";
 
-knight(org.springframework.context.groovy.KnightOfTheRoundTable, "Bedivere") { quest = quest }
-}
-appCtx.refresh()
-return appCtx
-""";
 		GenericGroovyApplicationContext appCtx = (GenericGroovyApplicationContext) new GroovyShell().evaluate(script);
 
-		KnightOfTheRoundTable knight = (KnightOfTheRoundTable) appCtx.getBean("knight");
-		knight.embarkOnQuest();
+		KnightsOfTheRoundTable knights = (KnightsOfTheRoundTable) appCtx.getBean("knights");
+		knights.embarkOnQuest();
 	}
 
 	// test for GRAILS-5057
 	@Test
 	void registerBeans() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			personA(AdvisedPerson) {
-				name = "Bob"
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				personA(AdvisedPersonImpl) {
+					name = "Bob"
+				}
 			}
-		}
-		""").getBytes()));
+			""");
 
-		appCtx.refresh();
-		assertThat(((AdvisedPerson)appCtx.getBean("personA")).name).isEqualTo("Bob");
+		assertThat(((AdvisedPerson)appCtx.getBean("personA")).getName()).isEqualTo("Bob");
 
 		appCtx = new GenericApplicationContext();
-		reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			personA(AdvisedPerson) {
-				name = "Fred"
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				personA(AdvisedPersonImpl) {
+					name = "Fred"
+				}
 			}
-		}
-		""").getBytes()));
+			""");
 
-		appCtx.refresh();
-		assertThat(((AdvisedPerson)appCtx.getBean("personA")).name).isEqualTo("Fred");
+		assertThat(((AdvisedPerson)appCtx.getBean("personA")).getName()).isEqualTo("Fred");
 	}
 
 	@Test
 	void listOfBeansAsConstructorArg() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
 
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			someotherbean(SomeOtherClass, new File('somefile.txt'))
-			someotherbean2(SomeOtherClass, new File('somefile.txt'))
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				someotherbean(SomeOtherClass, new File('somefile.txt'))
+				someotherbean2(SomeOtherClass, new File('somefile.txt'))
 
-			somebean(SomeClass,  [someotherbean, someotherbean2])
-		}
-		""").getBytes()));
+				somebean(SomeClass, [someotherbean, someotherbean2])
+			}
+			""");
 
 		assertThat(appCtx.containsBean("someotherbean")).isTrue();
 		assertThat(appCtx.containsBean("someotherbean2")).isTrue();
@@ -926,113 +890,117 @@ void listOfBeansAsConstructorArg() {
 	@Test
 	void beanWithListAndMapConstructor() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
 
-			beanWithList(Bean5, [bart, lisa])
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				bart(Bean1Impl) {
+					person = "bart"
+					age = 11
+				}
+				lisa(Bean1Impl) {
+					person = "lisa"
+					age = 9
+				}
+
+				beanWithList(Bean5, [bart, lisa])
 
-			// test runtime references both as ref() and as plain name
-			beanWithMap(Bean6, [bart:bart, lisa:ref('lisa')])
-		}
-		""").getBytes()));
-		appCtx.refresh();
+				// test runtime references both as ref() and as plain name
+				beanWithMap(Bean6, [bart:bart, lisa:ref('lisa')])
+			}
+			""");
 
 		Bean5 beanWithList = (Bean5) appCtx.getBean("beanWithList");
-		assertThat(beanWithList.people).hasSize(2);
-		assertThat(beanWithList.people.get(0).person).isEqualTo("bart");
+		assertThat(beanWithList.people).extracting(Bean1::getPerson).containsExactly("bart", "lisa");
 
 		Bean6 beanWithMap = (Bean6) appCtx.getBean("beanWithMap");
-		assertThat(beanWithMap.peopleByName.get("lisa").age).isEqualTo(9);
-		assertThat(beanWithMap.peopleByName.get("bart").person).isEqualTo("bart");
+		assertThat(beanWithMap.peopleByName).hasSize(2);
+		assertThat(beanWithMap.peopleByName.get("lisa").getAge()).isEqualTo(9);
+		assertThat(beanWithMap.peopleByName.get("bart").getPerson()).isEqualTo("bart");
 	}
 
 	@Test
 	void anonymousInnerBeanViaBeanMethod() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean1 =  bean(Bean1) {
-					person = "homer"
-					age = 45
-					props = [overweight:true, height:"1.8m"]
-					children = ["bart", "lisa"]
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				bart(Bean1Impl) {
+					person = "bart"
+					age = 11
+				}
+				lisa(Bean1Impl) {
+					person = "lisa"
+					age = 9
+				}
+				marge(Bean2) {
+					person = "marge"
+					bean1 =  bean(Bean1Impl) {
+						person = "homer"
+						age = 45
+						props = [overweight:true, height:"1.8m"]
+						children = ["bart", "lisa"]
+					}
+					children = [bart, lisa]
 				}
-				children = [bart, lisa]
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean2 marge = (Bean2) appCtx.getBean("marge");
-		assertThat(marge.bean1.person).isEqualTo("homer");
+		assertThat(marge.bean1.getPerson()).isEqualTo("homer");
 	}
 
 	@Test
 	void anonymousInnerBeanViaBeanMethodWithConstructorArgs() {
 		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
-		reader.loadBeanDefinitions(new ByteArrayResource(("""
-		package org.springframework.context.groovy
-		beans {
-			bart(Bean1) {
-				person = "bart"
-				age = 11
-			}
-			lisa(Bean1) {
-				person = "lisa"
-				age = 9
-			}
-			marge(Bean2) {
-				person = "marge"
-				bean3 =  bean(Bean3, "homer", lisa) {
-					person = "homer"
-					age = 45
+
+		loadGroovyDsl(appCtx, """
+			package org.springframework.context.groovy
+			beans {
+				bart(Bean1Impl) {
+					person = "bart"
+					age = 11
+				}
+				lisa(Bean1Impl) {
+					person = "lisa"
+					age = 9
+				}
+				marge(Bean2) {
+					person = "marge"
+					bean3 =  bean(Bean3, "homer", lisa) {
+						person = "homer"
+						age = 45
+					}
+					children = [bart, lisa]
 				}
-				children = [bart, lisa]
 			}
-		}
-		""").getBytes()));
-		appCtx.refresh();
+			""");
 
 		Bean2 marge = (Bean2) appCtx.getBean("marge");
 
-		assertThat(marge.bean3.person).isEqualTo("homer");
-		assertThat(marge.bean3.bean1.person).isEqualTo("lisa");
+		assertThat(marge.bean3.getPerson()).isEqualTo("homer");
+		assertThat(marge.bean3.bean1.getPerson()).isEqualTo("lisa");
+	}
+
+	private static void loadGroovyDsl(GenericApplicationContext context, String script) {
+		new GroovyBeanDefinitionReader(context).loadBeanDefinitions(new ByteArrayResource((script).getBytes()));
+		context.refresh();
 	}
 
 }
 
 class HolyGrailQuest {
-	void start() { System.out.println("lets begin"); }
+	void start() {
+		/* no-op */
+	}
 }
 
-class KnightOfTheRoundTable {
+class KnightsOfTheRoundTable {
 	String name;
 	String leader;
 
-	KnightOfTheRoundTable(String n) {
+	KnightsOfTheRoundTable(String n) {
 		this.name = n;
 	}
 
@@ -1068,32 +1036,51 @@ public void setQuest(HolyGrailQuest quest) {
 }
 
 // simple bean
-class Bean1 {
+interface Bean1 {
+	String getPerson();
+	void setPerson(String person);
+	int getAge();
+	void setAge(int age);
+	Properties getProps();
+	void setProps(Properties props);
+	List<String> getChildren();
+	void setChildren(List<String> children);
+}
+
+class Bean1Impl implements Bean1 {
 	String person;
 	int age;
 	Properties props = new Properties();
 	List<String> children = new ArrayList<>();
+	@Override
 	public String getPerson() {
 		return person;
 	}
+	@Override
 	public void setPerson(String person) {
 		this.person = person;
 	}
+	@Override
 	public int getAge() {
 		return age;
 	}
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
+	@Override
 	public Properties getProps() {
 		return props;
 	}
+	@Override
 	public void setProps(Properties props) {
 		this.props.putAll(props);
 	}
+	@Override
 	public List<String> getChildren() {
 		return children;
 	}
+	@Override
 	public void setChildren(List<String> children) {
 		this.children = children;
 	}
@@ -1208,7 +1195,7 @@ class Bean6 {
 // a factory bean
 class Bean1Factory {
 	Bean1 newInstance() {
-		return new Bean1();
+		return new Bean1Impl();
 	}
 }
 
@@ -1231,7 +1218,7 @@ public void registerDestructionCallback(String name, Runnable callback) {
 
 	@Override
 	public String getConversationId() {
-		return "mock";
+		return null;
 	}
 
 	@Override
@@ -1242,7 +1229,7 @@ public Object get(String name, ObjectFactory<?> objectFactory) {
 
 	@Override
 	public Object resolveContextualObject(String s) {
-		return null;  // noop
+		return null;
 	}
 }
 
@@ -1254,27 +1241,40 @@ public void onBirthday(AdvisedPerson person) {
 	}
 }
 
-@Component(value = "person")
-class AdvisedPerson {
+interface AdvisedPerson {
+	void birthday();
+	int getAge();
+	void setAge(int age);
+	String getName();
+	void setName(String name);
+}
+
+@Component("person")
+class AdvisedPersonImpl implements AdvisedPerson {
 	int age;
 	String name;
 
+	@Override
 	public void birthday() {
 		++age;
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -1291,8 +1291,8 @@ public SomeOtherClass(File f) {}
 // a factory bean that takes arguments
 class Bean1FactoryWithArgs {
 	Bean1 newInstance(String name) {
-		Bean1 bean = new Bean1();
-		bean.person = name;
+		Bean1 bean = new Bean1Impl();
+		bean.setPerson(name);
 		return bean;
 	}
 }

From a323c39e97db924a078e2abea73719d1b57af395 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 21 Jan 2022 11:27:09 +0100
Subject: [PATCH 591/735] Remove Groovy from "Eclipse/STS Project Import Guide"

Groovy support is no longer required in the IDE due to gh-27945.
---
 import-into-eclipse.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/import-into-eclipse.md b/import-into-eclipse.md
index d2a8b154bbd5..9258de40dba5 100644
--- a/import-into-eclipse.md
+++ b/import-into-eclipse.md
@@ -3,7 +3,7 @@
 This document will guide you through the process of importing the Spring Framework
 projects into Eclipse or the Spring Tool Suite (_STS_). It is recommended that you
 have a recent version of Eclipse. As a bare minimum you will need Eclipse with full Java
-17 support, Eclipse Buildship, and the Groovy plugin.
+17 support and Eclipse Buildship.
 
 The following instructions have been tested against [STS](https://spring.io/tools) 4.12.0
 ([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-4120-changelog))
@@ -20,10 +20,6 @@ from the Eclipse Marketplace.
 
 _When instructed to execute `./gradlew` from the command line, be sure to execute it within your locally cloned `spring-framework` working directory._
 
-1. Install the [Groovy Development Tools](https://marketplace.eclipse.org/content/groovy-development-tools).
-   - **NOTE**: As of October 12, 2021, the Groovy Development Tools do not work in Eclipse 2021-09 (4.21). See [Groovy Eclipse #1303](https://github.com/groovy/groovy-eclipse/issues/1303) for details.
-1. Switch to Groovy 3.0 in Eclipse (Preferences &#8594; Groovy &#8594; Compiler &#8594; Switch to 3.0...).
-   - If you encounter build errors stating something similar to _"Groovy: compiler mismatch: project level is 2.5, workspace level is 3.0"_, change the Groovy compiler version to 3.0 for each affected project.
 1. Ensure that the _Forbidden reference (access rule)_ in Eclipse is set to `Info`
 (Preferences &#8594; Java &#8594; Compiler &#8594; Errors/Warnings &#8594; Deprecated and restricted API &#8594; Forbidden reference (access rule)).
 1. Optionally install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) if you need to execute Kotlin-based tests or develop Kotlin extensions.

From a681d6af229146c73e4175b6c58292d677e8bc27 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 21 Jan 2022 15:52:09 +0100
Subject: [PATCH 592/735] Fix Javadoc links to JSR 305 annotations where
 feasible

Prior to this commit, we only (indirectly) configured external Javadoc
links for types in the javax.annotation package for JSR 250, since
those types are part of Java 8 SE. However, an external Javadoc link
for types from JSR 305 was not configured.

To address this issue, this commit now configures an external Javadoc
link for JSR 305 types. However, the external Javadoc link for JSR 305
must be configured last to ensure that types from JSR 250 (such as
@PostConstruct) are still supported. This is due to the fact that JSR
250 and JSR 305 both define types in javax.annotation, which results in
a split package, and the javadoc tool does not support split packages
across multiple external Javadoc sites. Instead, the Javadoc tool
iterates over all external links, and the first external site that
claims to support a given package (via the package-list file) wins.

This means:

- Javadoc for JSR 250 annotations is fully supported.
- Javadoc for JSR 305 annotations in the javax.annotation package will
  continue to result in a 404 (page not found) error.
- Javadoc for JSR 305 annotations in the javax.annotation.meta package
  is fully supported.

For Spring Framework 6.0, the Javadoc for JSR 250 types in
jakarta.annotation package is served from the JBoss Application Server
Javadoc site instead of from Oracle's Java SE documentation site, since
JSR 250 annotations are no longer included in Java SE.

Closes gh-27904
---
 build.gradle | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4ff69c724721..d2b3fcf89fdd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -388,7 +388,13 @@ configure([rootProject] + javaProjects) { project ->
 			// "https://junit.org/junit5/docs/5.8.2/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
-			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"
+			"https://r2dbc.io/spec/0.8.5.RELEASE/api/",
+			// The external Javadoc link for JSR 305 must come last to ensure that types from
+			// JSR 250 (such as @PostConstruct) are still supported. This is due to the fact
+			// that JSR 250 and JSR 305 both define types in javax.annotation, which results
+			// in a split package, and the javadoc tool does not support split packages
+			// across multiple external Javadoc sites.
+			"https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/"
 	] as String[]
 }
 

From 54c7f53eff4b4abf5e288d2e8d3bfc4ff6eecf17 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 21 Jan 2022 19:25:44 +0100
Subject: [PATCH 593/735] Avoid use of `var` declarations

See gh-27945.
---
 ...cationContextDynamicBeanPropertyTests.java | 14 ++--
 .../GroovyBeanDefinitionReaderTests.java      | 84 +++++++++----------
 2 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
index 2238807b0bc1..e1d3986f6077 100644
--- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java
@@ -33,11 +33,9 @@ class GroovyApplicationContextDynamicBeanPropertyTests {
 
 	@Test
 	void accessDynamicBeanProperties() {
-		var ctx = new GenericGroovyApplicationContext();
-		ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
-		ctx.refresh();
+		GenericGroovyApplicationContext ctx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy");
 
-		var framework = ctx.getProperty("framework");
+		Object framework = ctx.getBean("framework");
 		assertThat(framework).as("could not find framework bean").isNotNull();
 		assertThat(framework).isEqualTo("Grails");
 
@@ -45,13 +43,11 @@ void accessDynamicBeanProperties() {
 	}
 
 	@Test
-	void accessingNonExistentBeanViaDynamicProperty() {
-		var ctx = new GenericGroovyApplicationContext();
-		ctx.getReader().loadBeanDefinitions("org/springframework/context/groovy/applicationContext.groovy");
-		ctx.refresh();
+	void accessNonExistentBeanViaDynamicProperty() {
+		GenericGroovyApplicationContext ctx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy");
 
 		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
-			.isThrownBy(() -> ctx.getProperty("someNonExistentBean"))
+			.isThrownBy(() -> ctx.getBean("someNonExistentBean"))
 			.withMessage("No bean named 'someNonExistentBean' available");
 
 		ctx.close();
diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
index f55dbc825192..61db547400fd 100644
--- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
+++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
@@ -49,7 +49,7 @@ class GroovyBeanDefinitionReaderTests {
 
 	@Test
 	void importSpringXml() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			beans {
@@ -62,7 +62,7 @@ void importSpringXml() {
 
 	@Test
 	void importBeansFromGroovy() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			beans {
@@ -75,7 +75,7 @@ void importBeansFromGroovy() {
 
 	@Test
 	void singletonPropertyOnBeanDefinition() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy;
@@ -97,7 +97,7 @@ void singletonPropertyOnBeanDefinition() {
 
 	@Test
 	void inheritPropertiesFromAbstractBean() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy;
@@ -124,7 +124,7 @@ void inheritPropertiesFromAbstractBean() {
 
 	@Test
 	void contextComponentScanSpringTag() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			beans {
@@ -139,7 +139,7 @@ void contextComponentScanSpringTag() {
 
 	@Test
 	void useSpringNamespaceAsMethod() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy;
@@ -175,7 +175,7 @@ void useSpringNamespaceAsMethod() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void useTwoSpringNamespaces() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 		TestScope scope = new TestScope();
 		appCtx.getBeanFactory().registerScope("test", scope);
 
@@ -235,7 +235,7 @@ void useTwoSpringNamespaces() {
 
 	@Test
 	void springAopSupport() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -268,7 +268,7 @@ void springAopSupport() {
 
 	@Test
 	void springScopedProxyBean() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		TestScope scope = new TestScope();
 		appCtx.getBeanFactory().registerScope("test", scope);
@@ -294,7 +294,7 @@ void springScopedProxyBean() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void springNamespaceBean() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -312,7 +312,7 @@ void springNamespaceBean() {
 
 	@Test
 	void namedArgumentConstructor() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -332,7 +332,7 @@ void namedArgumentConstructor() {
 
 	@Test
 	void abstractBeanDefinition() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
 			beans {
@@ -358,7 +358,7 @@ void abstractBeanDefinition() {
 
 	@Test
 	void abstractBeanDefinitionWithClass() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
 			beans {
@@ -386,7 +386,7 @@ void abstractBeanDefinitionWithClass() {
 
 	@Test
 	void scopes() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
 			beans {
@@ -397,8 +397,8 @@ void scopes() {
 			}
 			""");
 
-		var b1 = appCtx.getBean("myBean");
-		var b2 = appCtx.getBean("myBean");
+		Object b1 = appCtx.getBean("myBean");
+		Object b2 = appCtx.getBean("myBean");
 
 		assertThat(b1).isNotSameAs(b2);
 
@@ -412,7 +412,7 @@ void scopes() {
 
 	@Test
 	void simpleBean() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -440,7 +440,7 @@ void simpleBean() {
 
 	@Test
 	void beanWithParentRef() {
-		var parentAppCtx = new GenericApplicationContext();
+		GenericApplicationContext parentAppCtx = new GenericApplicationContext();
 		loadGroovyDsl(parentAppCtx, """
 			package org.springframework.context.groovy
 			beans {
@@ -453,7 +453,7 @@ void beanWithParentRef() {
 			}
 			""");
 
-		var appCtx = new GenericApplicationContext(parentAppCtx);
+		GenericApplicationContext appCtx = new GenericApplicationContext(parentAppCtx);
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
 			beans {
@@ -471,7 +471,7 @@ void beanWithParentRef() {
 
 	@Test
 	void withAnonymousInnerBean() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -502,7 +502,7 @@ void withAnonymousInnerBean() {
 
 	@Test
 	void withUntypedAnonymousInnerBean() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -533,7 +533,7 @@ void withUntypedAnonymousInnerBean() {
 
 	@Test
 	void beanReferences() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -560,7 +560,7 @@ void beanReferences() {
 			}
 			""");
 
-		var homer = appCtx.getBean("homer");
+		Object homer = appCtx.getBean("homer");
 		Bean2 marge = (Bean2) appCtx.getBean("marge");
 		Bean1 bart = (Bean1) appCtx.getBean("bart");
 		Bean1 lisa = (Bean1) appCtx.getBean("lisa");
@@ -573,7 +573,7 @@ void beanReferences() {
 
 	@Test
 	void beanWithConstructor() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -596,7 +596,7 @@ void beanWithConstructor() {
 
 	@Test
 	void beanWithFactoryMethod() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -618,7 +618,7 @@ void beanWithFactoryMethod() {
 
 	@Test
 	void beanWithFactoryMethodUsingClosureArgs() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -640,7 +640,7 @@ void beanWithFactoryMethodUsingClosureArgs() {
 
 	@Test
 	void beanWithFactoryMethodWithConstructorArgs() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -672,8 +672,8 @@ void beanWithFactoryMethodWithConstructorArgs() {
 
 	@Test
 	void getBeanDefinitions() {
-		var appCtx = new GenericApplicationContext();
-		var reader = new GroovyBeanDefinitionReader(appCtx);
+		GenericApplicationContext appCtx = new GenericApplicationContext();
+		GroovyBeanDefinitionReader reader = new GroovyBeanDefinitionReader(appCtx);
 
 		reader.loadBeanDefinitions(new ByteArrayResource(("""
 			package org.springframework.context.groovy
@@ -700,7 +700,7 @@ void getBeanDefinitions() {
 
 	@Test
 	void beanWithFactoryBean() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -722,7 +722,7 @@ void beanWithFactoryBean() {
 
 	@Test
 	void beanWithFactoryBeanAndMethod() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -742,7 +742,7 @@ void beanWithFactoryBeanAndMethod() {
 
 	@Test
 	void loadExternalBeans() {
-		var appCtx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy");
+		GenericApplicationContext appCtx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy");
 
 		assertThat(appCtx.containsBean("foo")).isTrue();
 		assertThat(appCtx.getBean("foo")).isEqualTo("hello");
@@ -752,9 +752,7 @@ void loadExternalBeans() {
 
 	@Test
 	void loadExternalBeansWithExplicitRefresh() {
-		var appCtx = new GenericGroovyApplicationContext();
-		appCtx.load("org/springframework/context/groovy/applicationContext.groovy");
-		appCtx.refresh();
+		GenericGroovyApplicationContext appCtx = new GenericGroovyApplicationContext("org/springframework/context/groovy/applicationContext.groovy");
 
 		assertThat(appCtx.containsBean("foo")).isTrue();
 		assertThat(appCtx.getBean("foo")).isEqualTo("hello");
@@ -764,7 +762,7 @@ void loadExternalBeansWithExplicitRefresh() {
 
 	@Test
 	void holyGrailWiring() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -783,7 +781,7 @@ void holyGrailWiring() {
 
 	@Test
 	void abstractBeanSpecifyingClass() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -820,7 +818,7 @@ void abstractBeanSpecifyingClass() {
 
 	@Test
 	void groovyBeanDefinitionReaderWithScript() throws Exception {
-		var script = """
+		String script = """
 			def appCtx = new org.springframework.context.support.GenericGroovyApplicationContext()
 			appCtx.reader.beans {
 				quest(org.springframework.context.groovy.HolyGrailQuest)
@@ -842,7 +840,7 @@ void groovyBeanDefinitionReaderWithScript() throws Exception {
 	// test for GRAILS-5057
 	@Test
 	void registerBeans() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -870,7 +868,7 @@ void registerBeans() {
 
 	@Test
 	void listOfBeansAsConstructorArg() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -889,7 +887,7 @@ void listOfBeansAsConstructorArg() {
 
 	@Test
 	void beanWithListAndMapConstructor() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -921,7 +919,7 @@ void beanWithListAndMapConstructor() {
 
 	@Test
 	void anonymousInnerBeanViaBeanMethod() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy
@@ -953,7 +951,7 @@ void anonymousInnerBeanViaBeanMethod() {
 
 	@Test
 	void anonymousInnerBeanViaBeanMethodWithConstructorArgs() {
-		var appCtx = new GenericApplicationContext();
+		GenericApplicationContext appCtx = new GenericApplicationContext();
 
 		loadGroovyDsl(appCtx, """
 			package org.springframework.context.groovy

From 316764cad04b247cbf69de6a5b3c974d642e5dd6 Mon Sep 17 00:00:00 2001
From: Antoine Rey <antoine.rey@gmail.com>
Date: Fri, 21 Jan 2022 19:52:37 +0100
Subject: [PATCH 594/735] Fix CaffeineCacheManager configuration example in
 reference doc

See gh-27967
---
 src/docs/asciidoc/integration.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 9ea8f646d7d5..db96de5d1804 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -6573,7 +6573,7 @@ are made available by the manager. The following example shows how to do so:
 [source,xml,indent=0,subs="verbatim,quotes"]
 ----
 	<bean id="cacheManager" class="org.springframework.cache.caffeine.CaffeineCacheManager">
-		<property name="caches">
+		<property name="cacheNames">
 			<set>
 				<value>default</value>
 				<value>books</value>

From d698446f7ce0018bcd35c17fe579db13e42f04a5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 24 Jan 2022 13:45:09 +0100
Subject: [PATCH 595/735] Polish ReflectionUtils[Tests]

---
 .../springframework/util/ReflectionUtils.java |  4 ++--
 .../util/ReflectionUtilsTests.java            | 23 +++++++------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
index 2177481f0d30..36dfaa1e5eb6 100644
--- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -46,7 +46,7 @@
 public abstract class ReflectionUtils {
 
 	/**
-	 * Pre-built MethodFilter that matches all non-bridge non-synthetic methods
+	 * Pre-built {@link MethodFilter} that matches all non-bridge non-synthetic methods
 	 * which are not declared on {@code java.lang.Object}.
 	 * @since 3.0.5
 	 */
@@ -354,7 +354,6 @@ public static void doWithMethods(Class<?> clazz, MethodCallback mc) {
 	 * @throws IllegalStateException if introspection fails
 	 */
 	public static void doWithMethods(Class<?> clazz, MethodCallback mc, @Nullable MethodFilter mf) {
-		// Keep backing up the inheritance hierarchy.
 		Method[] methods = getDeclaredMethods(clazz, false);
 		for (Method method : methods) {
 			if (mf != null && !mf.matches(method)) {
@@ -367,6 +366,7 @@ public static void doWithMethods(Class<?> clazz, MethodCallback mc, @Nullable Me
 				throw new IllegalStateException("Not allowed to access method '" + method.getName() + "': " + ex);
 			}
 		}
+		// Keep backing up the inheritance hierarchy.
 		if (clazz.getSuperclass() != null && (mf != USER_DECLARED_METHODS || clazz.getSuperclass() != Object.class)) {
 			doWithMethods(clazz.getSuperclass(), mc, mf);
 		}
diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index 8ca69ddc9a05..06e2df61444a 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -184,27 +184,20 @@ private void testValidCopy(TestObject src, TestObject dest) {
 	}
 
 	@Test
-	void doWithProtectedMethods() {
+	void doWithMethodsUsingProtectedFilter() {
 		ListSavingMethodCallback mc = new ListSavingMethodCallback();
 		ReflectionUtils.doWithMethods(TestObject.class, mc, method -> Modifier.isProtected(method.getModifiers()));
-		assertThat(mc.getMethodNames().isEmpty()).isFalse();
-		assertThat(mc.getMethodNames().contains("clone")).as("Must find protected method on Object").isTrue();
-		assertThat(mc.getMethodNames().contains("finalize")).as("Must find protected method on Object").isTrue();
-		assertThat(mc.getMethodNames().contains("hashCode")).as("Public, not protected").isFalse();
-		assertThat(mc.getMethodNames().contains("absquatulate")).as("Public, not protected").isFalse();
+		assertThat(mc.getMethodNames())
+			.hasSizeGreaterThanOrEqualTo(2)
+			.as("Must find protected methods on Object").contains("clone", "finalize")
+			.as("Public, not protected").doesNotContain("hashCode", "absquatulate");
 	}
 
 	@Test
-	void duplicatesFound() {
+	void doWithMethodsFindsDuplicatesInClassHierarchy() {
 		ListSavingMethodCallback mc = new ListSavingMethodCallback();
 		ReflectionUtils.doWithMethods(TestObjectSubclass.class, mc);
-		int absquatulateCount = 0;
-		for (String name : mc.getMethodNames()) {
-			if (name.equals("absquatulate")) {
-				++absquatulateCount;
-			}
-		}
-		assertThat(absquatulateCount).as("Found 2 absquatulates").isEqualTo(2);
+		assertThat(mc.getMethodNames().stream()).filteredOn("absquatulate"::equals).as("Found 2 absquatulates").hasSize(2);
 	}
 
 	@Test

From d01dca14e94b6ead5d8ed98c99ba4c7dfed0fefb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 24 Jan 2022 17:03:16 +0100
Subject: [PATCH 596/735] Filter methods in Object in
 ReflectionUtils.USER_DECLARED_METHODS

Prior to this commit, the USER_DECLARED_METHODS MethodFilter in
ReflectionUtils did not actually filter methods declared in
java.lang.Object as stated in its Javadoc.

Consequently, if ReflectionUtils.doWithMethods was invoked with
USER_DECLARED_METHODS and Object.class as the class to introspect, all
non-bridge non-synthetic methods declared in java.lang.Object were
passed to the supplied MethodCallback, which breaks the contract of
USER_DECLARED_METHODS.

In addition, if USER_DECLARED_METHODS was composed with a custom
MethodFilter using `USER_DECLARED_METHODS.and(<custom MethodFilter>)`,
that composed method filter allowed all non-bridge non-synthetic
methods declared in java.lang.Object to be passed to the supplied
MethodCallback, which also breaks the contract of
USER_DECLARED_METHODS. This behavior resulted in regressions in code
that had previously used USER_DECLARED_METHODS by itself and then began
using USER_DECLARED_METHODS in a composed filter. For example, since
commit c419ea7ba7 ReflectiveAspectJAdvisorFactory has incorrectly
processed methods in java.lang.Object as candidates for advice methods.

This commit fixes this bug and associated regressions by ensuring that
USER_DECLARED_METHODS actually filters methods declared in
java.lang.Object. In addition, ReflectionUtils.doWithMethods now aborts
its search algorithm early if invoked with the USER_DECLARED_METHODS
filter and Object.class as the class to introspect.

Closes gh-27970
---
 .../springframework/util/ReflectionUtils.java |  6 ++++-
 .../util/ReflectionUtilsTests.java            | 27 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
index 36dfaa1e5eb6..274cb7188703 100644
--- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -51,7 +51,7 @@ public abstract class ReflectionUtils {
 	 * @since 3.0.5
 	 */
 	public static final MethodFilter USER_DECLARED_METHODS =
-			(method -> !method.isBridge() && !method.isSynthetic());
+			(method -> !method.isBridge() && !method.isSynthetic() && (method.getDeclaringClass() != Object.class));
 
 	/**
 	 * Pre-built FieldFilter that matches all non-static, non-final fields.
@@ -354,6 +354,10 @@ public static void doWithMethods(Class<?> clazz, MethodCallback mc) {
 	 * @throws IllegalStateException if introspection fails
 	 */
 	public static void doWithMethods(Class<?> clazz, MethodCallback mc, @Nullable MethodFilter mf) {
+		if (mf == USER_DECLARED_METHODS && clazz == Object.class) {
+			// nothing to introspect
+			return;
+		}
 		Method[] methods = getDeclaredMethods(clazz, false);
 		for (Method method : methods) {
 			if (mf != null && !mf.matches(method)) {
diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index 06e2df61444a..ef0897552519 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.tests.sample.objects.TestObject;
+import org.springframework.util.ReflectionUtils.MethodFilter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -193,6 +194,32 @@ void doWithMethodsUsingProtectedFilter() {
 			.as("Public, not protected").doesNotContain("hashCode", "absquatulate");
 	}
 
+	@Test
+	void doWithMethodsUsingUserDeclaredMethodsFilterStartingWithObject() {
+		ListSavingMethodCallback mc = new ListSavingMethodCallback();
+		ReflectionUtils.doWithMethods(Object.class, mc, ReflectionUtils.USER_DECLARED_METHODS);
+		assertThat(mc.getMethodNames()).isEmpty();
+	}
+
+	@Test
+	void doWithMethodsUsingUserDeclaredMethodsFilterStartingWithTestObject() {
+		ListSavingMethodCallback mc = new ListSavingMethodCallback();
+		ReflectionUtils.doWithMethods(TestObject.class, mc, ReflectionUtils.USER_DECLARED_METHODS);
+		assertThat(mc.getMethodNames())
+			.as("user declared methods").contains("absquatulate", "compareTo", "getName", "setName", "getAge", "setAge", "getSpouse", "setSpouse")
+			.as("methods on Object").doesNotContain("equals", "hashCode", "toString", "clone", "finalize", "getClass", "notify", "notifyAll", "wait");
+	}
+
+	@Test
+	void doWithMethodsUsingUserDeclaredMethodsComposedFilter() {
+		ListSavingMethodCallback mc = new ListSavingMethodCallback();
+		// "q" because both absquatulate() and equals() contain "q"
+		MethodFilter isSetterMethodOrNameContainsQ = m -> m.getName().startsWith("set") || m.getName().contains("q");
+		MethodFilter methodFilter = ReflectionUtils.USER_DECLARED_METHODS.and(isSetterMethodOrNameContainsQ);
+		ReflectionUtils.doWithMethods(TestObject.class, mc, methodFilter);
+		assertThat(mc.getMethodNames()).containsExactlyInAnyOrder("setName", "setAge", "setSpouse", "absquatulate");
+	}
+
 	@Test
 	void doWithMethodsFindsDuplicatesInClassHierarchy() {
 		ListSavingMethodCallback mc = new ListSavingMethodCallback();

From cb3fa89946858203fc84f6eb1a897cf353d34445 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 25 Jan 2022 09:57:36 +0100
Subject: [PATCH 597/735] Polish ReflectionUtilsTests

---
 .../util/ReflectionUtilsTests.java            | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index ef0897552519..f71d789f6cbc 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -228,7 +228,7 @@ void doWithMethodsFindsDuplicatesInClassHierarchy() {
 	}
 
 	@Test
-	void findMethod() throws Exception {
+	void findMethod() {
 		assertThat(ReflectionUtils.findMethod(B.class, "bar", String.class)).isNotNull();
 		assertThat(ReflectionUtils.findMethod(B.class, "foo", Integer.class)).isNotNull();
 		assertThat(ReflectionUtils.findMethod(B.class, "getClass")).isNotNull();
@@ -236,7 +236,7 @@ void findMethod() throws Exception {
 
 	@Disabled("[SPR-8644] findMethod() does not currently support var-args")
 	@Test
-	void findMethodWithVarArgs() throws Exception {
+	void findMethodWithVarArgs() {
 		assertThat(ReflectionUtils.findMethod(B.class, "add", int.class, int.class, int.class)).isNotNull();
 	}
 
@@ -279,37 +279,27 @@ public void m1() {
 	}
 
 	@Test
-	void getAllDeclaredMethods() throws Exception {
+	void getAllDeclaredMethods() {
 		class Foo {
 			@Override
 			public String toString() {
 				return super.toString();
 			}
 		}
-		int toStringMethodCount = 0;
-		for (Method method : ReflectionUtils.getAllDeclaredMethods(Foo.class)) {
-			if (method.getName().equals("toString")) {
-				toStringMethodCount++;
-			}
-		}
-		assertThat(toStringMethodCount).isEqualTo(2);
+		Method[] allDeclaredMethods = ReflectionUtils.getAllDeclaredMethods(Foo.class);
+		assertThat(allDeclaredMethods).extracting(Method::getName).filteredOn("toString"::equals).hasSize(2);
 	}
 
 	@Test
-	void getUniqueDeclaredMethods() throws Exception {
+	void getUniqueDeclaredMethods() {
 		class Foo {
 			@Override
 			public String toString() {
 				return super.toString();
 			}
 		}
-		int toStringMethodCount = 0;
-		for (Method method : ReflectionUtils.getUniqueDeclaredMethods(Foo.class)) {
-			if (method.getName().equals("toString")) {
-				toStringMethodCount++;
-			}
-		}
-		assertThat(toStringMethodCount).isEqualTo(1);
+		Method[] uniqueDeclaredMethods = ReflectionUtils.getUniqueDeclaredMethods(Foo.class);
+		assertThat(uniqueDeclaredMethods).extracting(Method::getName).filteredOn("toString"::equals).hasSize(1);
 	}
 
 	@Test
@@ -326,16 +316,10 @@ public Integer m1() {
 				return Integer.valueOf(42);
 			}
 		}
-		int m1MethodCount = 0;
 		Method[] methods = ReflectionUtils.getUniqueDeclaredMethods(Leaf.class);
-		for (Method method : methods) {
-			if (method.getName().equals("m1")) {
-				m1MethodCount++;
-			}
-		}
-		assertThat(m1MethodCount).isEqualTo(1);
-		assertThat(ObjectUtils.containsElement(methods, Leaf.class.getMethod("m1"))).isTrue();
-		assertThat(ObjectUtils.containsElement(methods, Parent.class.getMethod("m1"))).isFalse();
+		assertThat(methods).extracting(Method::getName).filteredOn("m1"::equals).hasSize(1);
+		assertThat(methods).contains(Leaf.class.getMethod("m1"));
+		assertThat(methods).doesNotContain(Parent.class.getMethod("m1"));
 	}
 
 	@Test

From 652c13a6eae11c3ce28410a6643f5860fe32b04d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 25 Jan 2022 09:58:57 +0100
Subject: [PATCH 598/735] Enable ReflectionUtilsTests.findMethodWithVarArgs()

See gh-13286
---
 .../java/org/springframework/util/ReflectionUtilsTests.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index f71d789f6cbc..4109426e8fe7 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.tests.sample.objects.TestObject;
@@ -234,10 +233,9 @@ void findMethod() {
 		assertThat(ReflectionUtils.findMethod(B.class, "getClass")).isNotNull();
 	}
 
-	@Disabled("[SPR-8644] findMethod() does not currently support var-args")
 	@Test
 	void findMethodWithVarArgs() {
-		assertThat(ReflectionUtils.findMethod(B.class, "add", int.class, int.class, int.class)).isNotNull();
+		assertThat(ReflectionUtils.findMethod(B.class, "add", int[].class)).isNotNull();
 	}
 
 	@Test

From 48ce714d159f0c648f836a5abdf18c12cb4c6f40 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 21 Dec 2021 09:20:12 +0100
Subject: [PATCH 599/735] Provide an API to record various runtime hints

This commit provides an API to record the need for reflection,
resources, serialization, and proxies so that the runtime can be
optimized accordingly.

`RuntimeHints` provides an entry point to register the following:

* Reflection hints: individual elements of a type can be defined, as
well as a predefined categories (identified by the `MemberCategory`
enum). A method or constructor hint can refine whether the executable
should only be introspected or also invoked.
* Resource hints: patterns using includes/excludes identify the
resources to include at runtime. Resource bundles are also supported.
* Java Serialization hints: types that use java serialization can be
registered.
* Proxy hints: both interfaces-based (JDK) proxy and class-based proxy
can be defined.

This commit also introduces a `TypeReference` abstraction that permits
to record hints for types that are not available on the classpath, or
not compiled yet (generated code).

Closes gh-27829
---
 .../core/hint/AbstractTypeReference.java      |  52 ++++
 .../core/hint/ClassProxyHint.java             | 141 ++++++++++
 .../core/hint/ExecutableHint.java             | 136 ++++++++++
 .../core/hint/ExecutableMode.java             |  40 +++
 .../springframework/core/hint/FieldHint.java  | 102 +++++++
 .../core/hint/JavaSerializationHints.java     |  70 +++++
 .../core/hint/JdkProxyHint.java               | 107 ++++++++
 .../core/hint/MemberCategory.java             | 127 +++++++++
 .../springframework/core/hint/MemberHint.java |  44 +++
 .../springframework/core/hint/ProxyHints.java | 123 +++++++++
 .../core/hint/ReflectionHints.java            | 145 ++++++++++
 .../core/hint/ReflectionTypeReference.java    |  64 +++++
 .../core/hint/ResourceBundleHint.java         |  44 +++
 .../core/hint/ResourceHints.java              | 148 ++++++++++
 .../core/hint/ResourcePatternHint.java        | 104 +++++++
 .../core/hint/RuntimeHints.java               |  76 ++++++
 .../core/hint/SimpleTypeReference.java        |  97 +++++++
 .../springframework/core/hint/TypeHint.java   | 253 ++++++++++++++++++
 .../core/hint/TypeReference.java              |  78 ++++++
 .../core/hint/package-info.java               |   5 +
 .../core/hint/ClassProxyHintTests.java        |  93 +++++++
 .../hint/JavaSerializationHintsTests.java     |  42 +++
 .../core/hint/JdkProxyHintTests.java          |  72 +++++
 .../core/hint/ProxyHintsTests.java            | 116 ++++++++
 .../core/hint/ReflectionHintsTests.java       | 130 +++++++++
 .../core/hint/ResourceHintsTests.java         | 132 +++++++++
 .../core/hint/RuntimeHintsTests.java          |  69 +++++
 .../core/hint/TypeHintTests.java              | 140 ++++++++++
 .../core/hint/TypeReferenceTests.java         |  88 ++++++
 29 files changed, 2838 insertions(+)
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/AbstractTypeReference.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ClassProxyHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ExecutableHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ExecutableMode.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/FieldHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/JavaSerializationHints.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/JdkProxyHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/MemberCategory.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/MemberHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ProxyHints.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ReflectionHints.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ReflectionTypeReference.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ResourceBundleHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ResourceHints.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/ResourcePatternHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/RuntimeHints.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/SimpleTypeReference.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/TypeHint.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/TypeReference.java
 create mode 100644 spring-core/src/main/java/org/springframework/core/hint/package-info.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/ClassProxyHintTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/JavaSerializationHintsTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/JdkProxyHintTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/ProxyHintsTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/ReflectionHintsTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/ResourceHintsTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/RuntimeHintsTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/TypeHintTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/core/hint/TypeReferenceTests.java

diff --git a/spring-core/src/main/java/org/springframework/core/hint/AbstractTypeReference.java b/spring-core/src/main/java/org/springframework/core/hint/AbstractTypeReference.java
new file mode 100644
index 000000000000..bbe77ec818ae
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/AbstractTypeReference.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.Objects;
+
+/**
+ * Base {@link TypeReference} implementation that ensures consistent behaviour
+ * for {@code equals()}, {@code hashCode()}, and {@code toString()} based on
+ * the {@linkplain #getCanonicalName() canonical name}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public abstract class AbstractTypeReference implements TypeReference {
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(getCanonicalName());
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof TypeReference otherReference)) {
+			return false;
+		}
+		return getCanonicalName().equals(otherReference.getCanonicalName());
+	}
+
+	@Override
+	public String toString() {
+		return getCanonicalName();
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ClassProxyHint.java b/spring-core/src/main/java/org/springframework/core/hint/ClassProxyHint.java
new file mode 100644
index 000000000000..f7862fef21fd
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ClassProxyHint.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * A hint that describes the need for a proxy against a concrete class.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class ClassProxyHint {
+
+	private final TypeReference targetClass;
+
+	private final List<TypeReference> proxiedInterfaces;
+
+
+	private ClassProxyHint(Builder builder) {
+		this.targetClass = builder.targetClass;
+		this.proxiedInterfaces = builder.proxiedInterfaces.stream().distinct().toList();
+	}
+
+	/**
+	 * Initialize a builder with the target class to use.
+	 * @param targetClass the target class of the proxy
+	 * @return a builder for the hint
+	 */
+	public static Builder of(TypeReference targetClass) {
+		return new Builder(targetClass);
+	}
+
+	/**
+	 * Initialize a builder with the target class to use.
+	 * @param targetClass the target class of the proxy
+	 * @return a builder for the hint
+	 */
+	public static Builder of(Class<?> targetClass) {
+		return of(TypeReference.of(targetClass));
+	}
+
+	/**
+	 * Return the target class of the proxy.
+	 * @return the target class
+	 */
+	public TypeReference getTargetClass() {
+		return this.targetClass;
+	}
+
+	/**
+	 * Return the interfaces to be proxied.
+	 * @return the interfaces that the proxy should implement
+	 */
+	public List<TypeReference> getProxiedInterfaces() {
+		return this.proxiedInterfaces;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		ClassProxyHint that = (ClassProxyHint) o;
+		return this.targetClass.equals(that.targetClass)
+				&& this.proxiedInterfaces.equals(that.proxiedInterfaces);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(this.targetClass, this.proxiedInterfaces);
+	}
+
+
+	/**
+	 * Builder for {@link ClassProxyHint}.
+	 */
+	public static class Builder {
+
+		private final TypeReference targetClass;
+
+		private final LinkedList<TypeReference> proxiedInterfaces = new LinkedList<>();
+
+
+		public Builder(TypeReference targetClass) {
+			this.targetClass = targetClass;
+		}
+
+		/**
+		 * Add the specified interfaces that the proxy should implement.
+		 * @param proxiedInterfaces the interfaces the proxy should implement
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder proxiedInterfaces(TypeReference... proxiedInterfaces) {
+			this.proxiedInterfaces.addAll(Arrays.asList(proxiedInterfaces));
+			return this;
+		}
+
+		/**
+		 * Add the specified interfaces that the proxy should implement.
+		 * @param proxiedInterfaces the interfaces the proxy should implement
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder proxiedInterfaces(Class<?>... proxiedInterfaces) {
+			this.proxiedInterfaces.addAll(Arrays.stream(proxiedInterfaces)
+					.map(TypeReference::of).collect(Collectors.toList()));
+			return this;
+		}
+
+		/**
+		 * Create a {@link ClassProxyHint} based on the state of this builder.
+		 * @return a class proxy hint
+		 */
+		public ClassProxyHint build() {
+			return new ClassProxyHint(this);
+		}
+
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ExecutableHint.java b/spring-core/src/main/java/org/springframework/core/hint/ExecutableHint.java
new file mode 100644
index 000000000000..c45dae559849
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ExecutableHint.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.util.ObjectUtils;
+
+/**
+ * A hint that describes the need for reflection on a {@link Method} or
+ * {@link Constructor}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class ExecutableHint extends MemberHint {
+
+	private final List<TypeReference> parameterTypes;
+
+	private final List<ExecutableMode> modes;
+
+
+	private ExecutableHint(Builder builder) {
+		super(builder.name);
+		this.parameterTypes = List.copyOf(builder.parameterTypes);
+		this.modes = List.copyOf(builder.modes);
+	}
+
+	/**
+	 * Initialize a builder with the parameter types of a constructor.
+	 * @param parameterTypes the parameter types of the constructor
+	 * @return a builder
+	 */
+	public static Builder ofConstructor(List<TypeReference> parameterTypes) {
+		return new Builder("<init>", parameterTypes);
+	}
+
+	/**
+	 * Initialize a builder with the name and parameters types of a method.
+	 * @param name the name of the method
+	 * @param parameterTypes the parameter types of the method
+	 * @return a builder
+	 */
+	public static Builder ofMethod(String name, List<TypeReference> parameterTypes) {
+		return new Builder(name, parameterTypes);
+	}
+
+	/**
+	 * Return the parameter types of the executable.
+	 * @return the parameter types
+	 * @see Executable#getParameterTypes()
+	 */
+	public List<TypeReference> getParameterTypes() {
+		return this.parameterTypes;
+	}
+
+	/**
+	 * Return the {@linkplain ExecutableMode modes} that apply to this hint.
+	 * @return the modes
+	 */
+	public List<ExecutableMode> getModes() {
+		return this.modes;
+	}
+
+
+	/**
+	 * Builder for {@link ExecutableHint}.
+	 */
+	public static final class Builder {
+
+		private final String name;
+
+		private final List<TypeReference> parameterTypes;
+
+		private final Set<ExecutableMode> modes = new LinkedHashSet<>();
+
+
+		private Builder(String name, List<TypeReference> parameterTypes) {
+			this.name = name;
+			this.parameterTypes = parameterTypes;
+		}
+
+		/**
+		 * Add the specified {@linkplain ExecutableMode mode} if necessary.
+		 * @param mode the mode to add
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder withMode(ExecutableMode mode) {
+			this.modes.add(mode);
+			return this;
+		}
+
+		/**
+		 * Set the {@linkplain ExecutableMode modes} to use.
+		 * @param modes the mode to use
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder setModes(ExecutableMode... modes) {
+			this.modes.clear();
+			if (!ObjectUtils.isEmpty(modes)) {
+				this.modes.addAll(Arrays.asList(modes));
+			}
+			return this;
+		}
+
+		/**
+		 * Create an {@link ExecutableHint} based on the state of this builder.
+		 * @return an executable hint
+		 */
+		public ExecutableHint build() {
+			return new ExecutableHint(this);
+		}
+
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ExecutableMode.java b/spring-core/src/main/java/org/springframework/core/hint/ExecutableMode.java
new file mode 100644
index 000000000000..c562eef6b254
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ExecutableMode.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.lang.reflect.Executable;
+
+/**
+ * Represent the need of reflection for a given {@link Executable}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public enum ExecutableMode {
+
+	/**
+	 * Only retrieving the {@link Executable} and its metadata is required.
+	 */
+	INTROSPECT,
+
+	/**
+	 * Full reflection support is required, including the ability to invoke
+	 * the {@link Executable}.
+	 */
+	INVOKE;
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/FieldHint.java b/spring-core/src/main/java/org/springframework/core/hint/FieldHint.java
new file mode 100644
index 000000000000..f40ae9843777
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/FieldHint.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.lang.reflect.Field;
+
+/**
+ * A hint that describes the need of reflection on a {@link Field}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class FieldHint extends MemberHint {
+
+	private final boolean allowWrite;
+
+	private final boolean allowUnsafeAccess;
+
+
+	private FieldHint(Builder builder) {
+		super(builder.name);
+		this.allowWrite = builder.allowWrite;
+		this.allowUnsafeAccess = builder.allowUnsafeAccess;
+	}
+
+	/**
+	 * Return whether setting the value of the field should be allowed.
+	 * @return {@code true} to allow {@link Field#set(Object, Object)}.
+	 */
+	public boolean isAllowWrite() {
+		return this.allowWrite;
+	}
+
+	/**
+	 * Return whether if using {@code Unsafe} on the field should be allowed.
+	 * @return {@code true} to allow unsafe access
+	 */
+	public boolean isAllowUnsafeAccess() {
+		return this.allowUnsafeAccess;
+	}
+
+
+	/**
+	 * Builder for {@link FieldHint}.
+	 */
+	public static class Builder {
+
+		private final String name;
+
+		private boolean allowWrite;
+
+		private boolean allowUnsafeAccess;
+
+
+		public Builder(String name) {
+			this.name = name;
+		}
+
+		/**
+		 * Specify if setting the value of the field should be allowed.
+		 * @param allowWrite {@code true} to allow {@link Field#set(Object, Object)}
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder allowWrite(boolean allowWrite) {
+			this.allowWrite = allowWrite;
+			return this;
+		}
+
+		/**
+		 * Specify if using {@code Unsafe} on the field should be allowed.
+		 * @param allowUnsafeAccess {@code true} to allow unsafe access
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder allowUnsafeAccess(boolean allowUnsafeAccess) {
+			this.allowUnsafeAccess = allowUnsafeAccess;
+			return this;
+		}
+
+		/**
+		 * Create a {@link FieldHint} based on the state of this builder.
+		 * @return a field hint
+		 */
+		public FieldHint build() {
+			return new FieldHint(this);
+		}
+
+	}
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/JavaSerializationHints.java b/spring-core/src/main/java/org/springframework/core/hint/JavaSerializationHints.java
new file mode 100644
index 000000000000..b8d06a1ca261
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/JavaSerializationHints.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.io.Serializable;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
+/**
+ * Gather the need for Java serialization at runtime.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ * @see Serializable
+ */
+public class JavaSerializationHints {
+
+	private final Set<TypeReference> types;
+
+
+	public JavaSerializationHints() {
+		this.types = new LinkedHashSet<>();
+	}
+
+	/**
+	 * Return the {@link TypeReference types} that need to be serialized using
+	 * Java serialization at runtime.
+	 * @return a stream of {@link Serializable} types
+	 */
+	public Stream<TypeReference> types() {
+		return this.types.stream();
+	}
+
+	/**
+	 * Register that the type defined by the specified {@link TypeReference}
+	 * need to be serialized using java serialization.
+	 * @param type the type to register
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public JavaSerializationHints registerType(TypeReference type) {
+		this.types.add(type);
+		return this;
+	}
+
+	/**
+	 * Register that the specified type need to be serialized using java
+	 * serialization.
+	 * @param type the type to register
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public JavaSerializationHints registerType(Class<? extends Serializable> type) {
+		return registerType(TypeReference.of(type));
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/JdkProxyHint.java b/spring-core/src/main/java/org/springframework/core/hint/JdkProxyHint.java
new file mode 100644
index 000000000000..4429ac9f7d1a
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/JdkProxyHint.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * A hint that describes the need of a JDK {@link Proxy}, that is an
+ * interfaces-based proxy.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class JdkProxyHint {
+
+	private final List<TypeReference> proxiedInterfaces;
+
+
+	private JdkProxyHint(Builder builder) {
+		this.proxiedInterfaces = List.copyOf(builder.proxiedInterfaces);
+	}
+
+	/**
+	 * Return the interfaces to be proxied.
+	 * @return the interfaces that the proxy should implement
+	 */
+	public List<TypeReference> getProxiedInterfaces() {
+		return this.proxiedInterfaces;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		JdkProxyHint that = (JdkProxyHint) o;
+		return this.proxiedInterfaces.equals(that.proxiedInterfaces);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(this.proxiedInterfaces);
+	}
+
+
+	/**
+	 * Builder for {@link JdkProxyHint}.
+	 */
+	public static class Builder {
+
+		private final LinkedList<TypeReference> proxiedInterfaces = new LinkedList<>();
+
+
+		/**
+		 * Add the specified interfaces that the proxy should implement.
+		 * @param proxiedInterfaces the interfaces the proxy should implement
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder proxiedInterfaces(TypeReference... proxiedInterfaces) {
+			this.proxiedInterfaces.addAll(Arrays.asList(proxiedInterfaces));
+			return this;
+		}
+
+		/**
+		 * Add the specified interfaces that the proxy should implement.
+		 * @param proxiedInterfaces the interfaces the proxy should implement
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder proxiedInterfaces(Class<?>... proxiedInterfaces) {
+			this.proxiedInterfaces.addAll(Arrays.stream(proxiedInterfaces)
+					.map(TypeReference::of).collect(Collectors.toList()));
+			return this;
+		}
+
+		/**
+		 * Create a {@link JdkProxyHint} based on the state of this builder.
+		 * @return a jdk proxy hint
+		 */
+		public JdkProxyHint build() {
+			return new JdkProxyHint(this);
+		}
+
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/MemberCategory.java b/spring-core/src/main/java/org/springframework/core/hint/MemberCategory.java
new file mode 100644
index 000000000000..6cf0b44fd814
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/MemberCategory.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+
+/**
+ * Represent predefined {@linkplain Member members} groups.
+ *
+ * @author Andy Clement
+ * @author Sebastien Deleuze
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public enum MemberCategory {
+
+	/**
+	 * A category that represents public {@linkplain Field fields}.
+	 * @see Class#getFields()
+	 */
+	PUBLIC_FIELDS,
+
+	/**
+	 * A category that represents {@linkplain Class#getDeclaredFields() declared
+	 * fields}, that is all fields defined by the class, but not inherited ones.
+	 * @see Class#getDeclaredFields()
+	 */
+	DECLARED_FIELDS,
+
+	/**
+	 * A category that defines public {@linkplain Constructor constructors} can
+	 * be introspected, but not invoked.
+	 * @see Class#getConstructors()
+	 * @see ExecutableMode#INTROSPECT
+	 */
+	INTROSPECT_PUBLIC_CONSTRUCTORS,
+
+	/**
+	 * A category that defines {@linkplain Class#getDeclaredConstructors() all
+	 * constructors} can be introspected, but not invoked.
+	 * @see Class#getDeclaredConstructors()
+	 * @see ExecutableMode#INTROSPECT
+	 */
+	INTROSPECT_DECLARED_CONSTRUCTORS,
+
+	/**
+	 * A category that defines public {@linkplain Constructor constructors} can
+	 * be invoked.
+	 * @see Class#getConstructors()
+	 * @see ExecutableMode#INVOKE
+	 */
+	INVOKE_PUBLIC_CONSTRUCTORS,
+
+	/**
+	 * A category that defines {@linkplain Class#getDeclaredConstructors() all
+	 * constructors} can be invoked.
+	 * @see Class#getDeclaredConstructors()
+	 * @see ExecutableMode#INVOKE
+	 */
+	INVOKE_DECLARED_CONSTRUCTORS,
+
+	/**
+	 * A category that defines public {@linkplain Method methods}, including
+	 * inherited ones can be introspect, but not invoked.
+	 * @see Class#getMethods()
+	 * @see ExecutableMode#INTROSPECT
+	 */
+	INTROSPECT_PUBLIC_METHODS,
+
+	/**
+	 * A category that defines {@linkplain Class#getDeclaredMethods() all
+	 * methods}, excluding inherited ones can be introspected, but not invoked.
+	 * @see Class#getDeclaredMethods()
+	 * @see ExecutableMode#INTROSPECT
+	 */
+	INTROSPECT_DECLARED_METHODS,
+
+	/**
+	 * A category that defines public {@linkplain Method methods}, including
+	 * inherited ones can be invoked.
+	 * @see Class#getMethods()
+	 * @see ExecutableMode#INVOKE
+	 */
+	INVOKE_PUBLIC_METHODS,
+
+	/**
+	 * A category that defines {@linkplain Class#getDeclaredMethods() all
+	 * methods}, excluding inherited ones can be invoked.
+	 * @see Class#getDeclaredMethods()
+	 * @see ExecutableMode#INVOKE
+	 */
+	INVOKE_DECLARED_METHODS,
+
+	/**
+	 * A category that represents public {@linkplain Class#getClasses() inner
+	 * classes}. Contrary to other categories, this does not register any
+	 * particular reflection for them but rather make sure they are available
+	 * via a call to {@link Class#getClasses}.
+	 */
+	PUBLIC_CLASSES,
+
+	/**
+	 * A category that represents all {@linkplain Class#getDeclaredClasses()
+	 * inner classes}. Contrary to other categories, this does not register any
+	 * particular reflection for them but rather make sure they are available
+	 * via a call to {@link Class#getDeclaredClasses}.
+	 */
+	DECLARED_CLASSES;
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/MemberHint.java b/spring-core/src/main/java/org/springframework/core/hint/MemberHint.java
new file mode 100644
index 000000000000..16edee664834
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/MemberHint.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.lang.reflect.Member;
+
+/**
+ * Base hint that describes the need for reflection on a {@link Member}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public abstract class MemberHint {
+
+	private final String name;
+
+
+	protected MemberHint(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Return the name of the member.
+	 * @return the name
+	 */
+	public String getName() {
+		return this.name;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ProxyHints.java b/spring-core/src/main/java/org/springframework/core/hint/ProxyHints.java
new file mode 100644
index 000000000000..e542212d88c1
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ProxyHints.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.springframework.core.hint.ClassProxyHint.Builder;
+
+/**
+ * Gather the need of using proxies at runtime.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class ProxyHints {
+
+	private final Set<JdkProxyHint> jdkProxies = new LinkedHashSet<>();
+
+	private final Set<ClassProxyHint> classProxies = new LinkedHashSet<>();
+
+
+	/**
+	 * Return the interfaces-based proxies that are required.
+	 * @return a stream of {@link JdkProxyHint}
+	 */
+	public Stream<JdkProxyHint> jdkProxies() {
+		return this.jdkProxies.stream();
+	}
+
+	/**
+	 * Return the class-based proxies that are required.
+	 * @return a stream of {@link ClassProxyHint}
+	 */
+	public Stream<ClassProxyHint> classProxies() {
+		return this.classProxies.stream();
+	}
+
+	/**
+	 * Register a {@link JdkProxyHint}.
+	 * @param hint the supplier to the hint
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ProxyHints registerJdkProxy(Supplier<JdkProxyHint> hint) {
+		this.jdkProxies.add(hint.get());
+		return this;
+	}
+
+	/**
+	 * Register that a JDK proxy implementing the interfaces defined by the
+	 * specified {@link TypeReference type references} is required.
+	 * @param proxiedInterfaces the interfaces the proxy should implement
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ProxyHints registerJdkProxy(TypeReference... proxiedInterfaces) {
+		return registerJdkProxy(() -> new JdkProxyHint.Builder()
+				.proxiedInterfaces(proxiedInterfaces).build());
+	}
+
+	/**
+	 * Register that a JDK proxy implementing the specified interfaces is
+	 * required.
+	 * @param proxiedInterfaces the interfaces the proxy should implement
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ProxyHints registerJdkProxy(Class<?>... proxiedInterfaces) {
+		List<String> concreteTypes = Arrays.stream(proxiedInterfaces)
+				.filter(candidate -> !candidate.isInterface()).map(Class::getName).collect(Collectors.toList());
+		if (!concreteTypes.isEmpty()) {
+			throw new IllegalArgumentException("Not an interface: " + concreteTypes);
+		}
+		return registerJdkProxy(() -> new JdkProxyHint.Builder()
+				.proxiedInterfaces(proxiedInterfaces).build());
+	}
+
+	/**
+	 * Register that a class proxy is required for the class defined by the
+	 * specified {@link TypeReference}.
+	 * @param targetClass the target class of the proxy
+	 * @param classProxyHint a builder to further customize the hint for that proxy
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ProxyHints registerClassProxy(TypeReference targetClass, Consumer<Builder> classProxyHint) {
+		Builder builder = ClassProxyHint.of(targetClass);
+		classProxyHint.accept(builder);
+		this.classProxies.add(builder.build());
+		return this;
+	}
+
+	/**
+	 * Register that a class proxy is required for the specified class.
+	 * @param targetClass the target class of the proxy
+	 * @param classProxyHint a builder to further customize the hint for that proxy
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ProxyHints registerClassProxy(Class<?> targetClass, Consumer<Builder> classProxyHint) {
+		if (targetClass.isInterface()) {
+			throw new IllegalArgumentException("Should not be an interface: " + targetClass);
+		}
+		return registerClassProxy(TypeReference.of(targetClass), classProxyHint);
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ReflectionHints.java b/spring-core/src/main/java/org/springframework/core/hint/ReflectionHints.java
new file mode 100644
index 000000000000..1a8493e7e85d
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ReflectionHints.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.springframework.core.hint.TypeHint.Builder;
+
+/**
+ * Gather the need for reflection at runtime.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class ReflectionHints {
+
+	private final Map<TypeReference, TypeHint.Builder> types = new HashMap<>();
+
+
+	/**
+	 * Return the types that require reflection.
+	 * @return the type hints
+	 */
+	public Stream<TypeHint> typeHints() {
+		return this.types.values().stream().map(TypeHint.Builder::build);
+	}
+
+	/**
+	 * Register or customize reflection hints for the type defined by the
+	 * specified {@link TypeReference}.
+	 * @param type the type to customize
+	 * @param typeHint a builder to further customize hints for that type
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerType(TypeReference type, Consumer<TypeHint.Builder> typeHint) {
+		Builder builder = this.types.computeIfAbsent(type, TypeHint.Builder::new);
+		typeHint.accept(builder);
+		return this;
+	}
+
+	/**
+	 * Register or customize reflection hints for the specified type.
+	 * @param type the type to customize
+	 * @param typeHint a builder to further customize hints for that type
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerType(Class<?> type, Consumer<TypeHint.Builder> typeHint) {
+		return registerType(TypeReference.of(type), typeHint);
+	}
+
+	/**
+	 * Register the need for reflection on the specified {@link Field}.
+	 * @param field the field that requires reflection
+	 * @param fieldHint a builder to further customize the hints of this field
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerField(Field field, Consumer<FieldHint.Builder> fieldHint) {
+		return registerType(TypeReference.of(field.getDeclaringClass()),
+				typeHint -> typeHint.withField(field.getName(), fieldHint));
+	}
+
+	/**
+	 * Register the need for reflection on the specified {@link Field},
+	 * enabling write access.
+	 * @param field the field that requires reflection
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerField(Field field) {
+		return registerField(field, fieldHint -> fieldHint.allowWrite(true));
+	}
+
+	/**
+	 * Register the need for reflection on the specified {@link Constructor}.
+	 * @param constructor the constructor that requires reflection
+	 * @param constructorHint a builder to further customize the hints of this
+	 * constructor
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerConstructor(Constructor<?> constructor, Consumer<ExecutableHint.Builder> constructorHint) {
+		return registerType(TypeReference.of(constructor.getDeclaringClass()),
+				typeHint -> typeHint.withConstructor(mapParameters(constructor), constructorHint));
+	}
+
+	/**
+	 * Register the need for reflection on the specified {@link Constructor},
+	 * enabling {@link ExecutableMode#INVOKE}.
+	 * @param constructor the constructor that requires reflection
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerConstructor(Constructor<?> constructor) {
+		return registerConstructor(constructor, constructorHint ->
+				constructorHint.withMode(ExecutableMode.INVOKE));
+	}
+
+	/**
+	 * Register the need for reflection on the specified {@link Method}.
+	 * @param method the method that requires reflection
+	 * @param methodHint a builder to further customize the hints of this method
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerMethod(Method method, Consumer<ExecutableHint.Builder> methodHint) {
+		return registerType(TypeReference.of(method.getDeclaringClass()),
+				typeHint -> typeHint.withMethod(method.getName(), mapParameters(method), methodHint));
+	}
+
+	/**
+	 * Register the need for reflection on the specified {@link Method},
+	 * enabling {@link ExecutableMode#INVOKE}.
+	 * @param method the method that requires reflection
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ReflectionHints registerMethod(Method method) {
+		return registerMethod(method, methodHint -> methodHint.withMode(ExecutableMode.INVOKE));
+	}
+
+	private List<TypeReference> mapParameters(Executable executable) {
+		return Arrays.stream(executable.getParameterTypes()).map(TypeReference::of)
+				.collect(Collectors.toList());
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ReflectionTypeReference.java b/spring-core/src/main/java/org/springframework/core/hint/ReflectionTypeReference.java
new file mode 100644
index 000000000000..85d8d05dc101
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ReflectionTypeReference.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * A {@link TypeReference} based on a {@link Class}.
+ *
+ * @author Stephane Nicoll
+ */
+final class ReflectionTypeReference extends AbstractTypeReference {
+
+	private final Class<?> type;
+
+	@Nullable
+	private final TypeReference enclosing;
+
+
+	private ReflectionTypeReference(Class<?> type) {
+		this.type = type;
+		this.enclosing = (type.getEnclosingClass() != null
+				? TypeReference.of(type.getEnclosingClass()) : null);
+	}
+
+	static ReflectionTypeReference of(Class<?> type) {
+		return new ReflectionTypeReference(type);
+	}
+
+	@Override
+	public String getCanonicalName() {
+		return this.type.getCanonicalName();
+	}
+
+	@Override
+	public String getPackageName() {
+		return this.type.getPackageName();
+	}
+
+	@Override
+	public String getSimpleName() {
+		return this.type.getSimpleName();
+	}
+
+	@Override
+	public TypeReference getEnclosingType() {
+		return this.enclosing;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ResourceBundleHint.java b/spring-core/src/main/java/org/springframework/core/hint/ResourceBundleHint.java
new file mode 100644
index 000000000000..0586d3f4cbd3
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ResourceBundleHint.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.ResourceBundle;
+
+/**
+ * A hint that describes the need to access to a {@link ResourceBundle}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class ResourceBundleHint {
+
+	private final String baseName;
+
+
+	ResourceBundleHint(String baseName) {
+		this.baseName = baseName;
+	}
+
+	/**
+	 * Return the {@code baseName} of the resource bundle.
+	 * @return the base name
+	 */
+	public String getBaseName() {
+		return this.baseName;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ResourceHints.java b/spring-core/src/main/java/org/springframework/core/hint/ResourceHints.java
new file mode 100644
index 000000000000..bfeb162ecc93
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ResourceHints.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+import org.springframework.core.hint.ResourcePatternHint.Builder;
+
+/**
+ * Gather the need for resources available at runtime.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class ResourceHints {
+
+	private final Set<TypeReference> types;
+
+	private final List<Builder> resourcePatternHints;
+
+	private final Set<String> resourceBundleHints;
+
+
+	public ResourceHints() {
+		this.types = new HashSet<>();
+		this.resourcePatternHints = new ArrayList<>();
+		this.resourceBundleHints = new LinkedHashSet<>();
+	}
+
+	/**
+	 * Return the resources that should be made available at runtime.
+	 * @return a stream of {@link ResourcePatternHint}
+	 */
+	public Stream<ResourcePatternHint> resourcePatterns() {
+		Stream<ResourcePatternHint> patterns = this.resourcePatternHints.stream().map(Builder::build);
+		return (this.types.isEmpty() ? patterns
+				: Stream.concat(Stream.of(typesPatternResourceHint()), patterns));
+	}
+
+	/**
+	 * Return the resource bundles that should be made available at runtime.
+	 * @return a stream of {@link ResourceBundleHint}
+	 */
+	public Stream<ResourceBundleHint> resourceBundles() {
+		return this.resourceBundleHints.stream().map(ResourceBundleHint::new);
+	}
+
+	/**
+	 * Register that the resources matching the specified pattern should be
+	 * made available at runtime.
+	 * @param include a pattern of the resources to include
+	 * @param resourceHint a builder to further customize the resource pattern
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ResourceHints registerPattern(String include, Consumer<Builder> resourceHint) {
+		Builder builder = new Builder().includes(include);
+		if (resourceHint != null) {
+			resourceHint.accept(builder);
+		}
+		this.resourcePatternHints.add(builder);
+		return this;
+	}
+
+	/**
+	 * Register that the resources matching the specified pattern should be
+	 * made available at runtime.
+	 * @param include a pattern of the resources to include
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ResourceHints registerPattern(String include) {
+		return registerPattern(include, null);
+	}
+
+	/**
+	 * Register that the bytecode of the type defined by the specified
+	 * {@link TypeReference} should be made available at runtime.
+	 * @param type the type to include
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ResourceHints registerType(TypeReference type) {
+		this.types.add(type);
+		return this;
+	}
+
+	/**
+	 * Register that the bytecode of the specified type should be made
+	 * available at runtime.
+	 * @param type the type to include
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ResourceHints registerType(Class<?> type) {
+		return registerType(TypeReference.of(type));
+	}
+
+	/**
+	 * Register that the resource bundle with the specified base name should
+	 * be made available at runtime.
+	 * @param baseName the base name of the resource bundle
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public ResourceHints registerResourceBundle(String baseName) {
+		this.resourceBundleHints.add(baseName);
+		return this;
+	}
+
+	private ResourcePatternHint typesPatternResourceHint() {
+		Builder builder = new Builder();
+		this.types.forEach(type -> builder.includes(toIncludePattern(type)));
+		return builder.build();
+	}
+
+	private String toIncludePattern(TypeReference type) {
+		StringBuilder names = new StringBuilder();
+		buildName(type, names);
+		String candidate = type.getPackageName() + "." + names;
+		return candidate.replace(".", "/") + ".class";
+	}
+
+	private void buildName(TypeReference type, StringBuilder sb) {
+		if (type == null) {
+			return;
+		}
+		String typeName = (type.getEnclosingType() != null) ? "$" + type.getSimpleName() : type.getSimpleName();
+		sb.insert(0, typeName);
+		buildName(type.getEnclosingType(), sb);
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ResourcePatternHint.java b/spring-core/src/main/java/org/springframework/core/hint/ResourcePatternHint.java
new file mode 100644
index 000000000000..87ae0c2587d1
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/ResourcePatternHint.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A hint that describes resources that should be made available at runtime.
+ *
+ * <p>The patterns may be a simple path which has a one-to-one mapping to a
+ * resource on the classpath, or alternatively may contain the special
+ * {@code *} character to indicate a wildcard search.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class ResourcePatternHint {
+
+	private final List<String> includes;
+
+	private final List<String> excludes;
+
+
+	private ResourcePatternHint(Builder builder) {
+		this.includes = new ArrayList<>(builder.includes);
+		this.excludes = new ArrayList<>(builder.excludes);
+	}
+
+	/**
+	 * Return the include patterns to use to identify the resources to match.
+	 * @return the include patterns
+	 */
+	public List<String> getIncludes() {
+		return this.includes;
+	}
+
+	/**
+	 * Return the exclude patterns to use to identify the resources to match.
+	 * @return the exclude patterns
+	 */
+	public List<String> getExcludes() {
+		return this.excludes;
+	}
+
+
+	/**
+	 * Builder for {@link ResourcePatternHint}.
+	 */
+	public static class Builder {
+
+		private final Set<String> includes = new LinkedHashSet<>();
+
+		private final Set<String> excludes = new LinkedHashSet<>();
+
+
+		/**
+		 * Includes the resources matching the specified pattern.
+		 * @param includes the include patterns
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder includes(String... includes) {
+			this.includes.addAll(Arrays.asList(includes));
+			return this;
+		}
+
+		/**
+		 * Exclude resources matching the specified pattern.
+		 * @param excludes the excludes pattern
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder excludes(String... excludes) {
+			this.excludes.addAll(Arrays.asList(excludes));
+			return this;
+		}
+
+		/**
+		 * Creates a {@link ResourcePatternHint} based on the state of this
+		 * builder.
+		 * @return a resource pattern hint
+		 */
+		public ResourcePatternHint build() {
+			return new ResourcePatternHint(this);
+		}
+
+	}
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/RuntimeHints.java b/spring-core/src/main/java/org/springframework/core/hint/RuntimeHints.java
new file mode 100644
index 000000000000..0b869fd68ecd
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/RuntimeHints.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+/**
+ * Gather hints that can be used to optimize the application runtime.
+ *
+ * <p>Use of reflection can be recorded for individual members of a type, as
+ * well as broader {@linkplain MemberCategory member categories}. Access to
+ * resources can be specified using patterns or the base name of a resource
+ * bundle.
+ *
+ * <p>Hints that require the need for Java serialization of proxies can be
+ * recorded as well.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class RuntimeHints {
+
+	private final ReflectionHints reflection = new ReflectionHints();
+
+	private final ResourceHints resources = new ResourceHints();
+
+	private final JavaSerializationHints javaSerialization = new JavaSerializationHints();
+
+	private final ProxyHints proxies = new ProxyHints();
+
+
+	/**
+	 * Provide access to reflection-based hints.
+	 * @return reflection hints
+	 */
+	public ReflectionHints reflection() {
+		return this.reflection;
+	}
+
+	/**
+	 * Provide access to resource-based hints.
+	 * @return resource hints
+	 */
+	public ResourceHints resources() {
+		return this.resources;
+	}
+
+	/**
+	 * Provide access to serialization-based hints.
+	 * @return java serialization hints
+	 */
+	public JavaSerializationHints javaSerialization() {
+		return this.javaSerialization;
+	}
+
+	/**
+	 * Provide access to proxy-based hints.
+	 * @return proxy hints
+	 */
+	public ProxyHints proxies() {
+		return this.proxies;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/SimpleTypeReference.java b/spring-core/src/main/java/org/springframework/core/hint/SimpleTypeReference.java
new file mode 100644
index 000000000000..f19568c95cab
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/SimpleTypeReference.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * A {@link TypeReference} based on fully qualified name.
+ *
+ * @author Stephane Nicoll
+ */
+final class SimpleTypeReference extends AbstractTypeReference {
+
+	private String canonicalName;
+
+	private final String packageName;
+
+	private final String simpleName;
+
+	@Nullable
+	private final TypeReference enclosingType;
+
+
+	SimpleTypeReference(String packageName, String simpleName, @Nullable TypeReference enclosingType) {
+		this.packageName = packageName;
+		this.simpleName = simpleName;
+		this.enclosingType = enclosingType;
+	}
+
+	static SimpleTypeReference of(String className) {
+		Assert.notNull(className, "ClassName must not be null");
+		if (!className.contains("$")) {
+			return createTypeReference(className);
+		}
+		String[] elements = className.split("\\$");
+		SimpleTypeReference typeReference = createTypeReference(elements[0]);
+		for (int i = 1; i < elements.length; i++) {
+			typeReference = new SimpleTypeReference(typeReference.getPackageName(), elements[i], typeReference);
+		}
+		return typeReference;
+	}
+
+	private static SimpleTypeReference createTypeReference(String className) {
+		int i = className.lastIndexOf('.');
+		return new SimpleTypeReference(className.substring(0, i), className.substring(i + 1), null);
+	}
+
+	@Override
+	public String getCanonicalName() {
+		if (this.canonicalName == null) {
+			StringBuilder names = new StringBuilder();
+			buildName(this, names);
+			this.canonicalName = this.packageName + "." + names;
+		}
+		return this.canonicalName;
+	}
+
+	private static void buildName(TypeReference type, StringBuilder sb) {
+		if (type == null) {
+			return;
+		}
+		String typeName = (type.getEnclosingType() != null) ? "." + type.getSimpleName() : type.getSimpleName();
+		sb.insert(0, typeName);
+		buildName(type.getEnclosingType(), sb);
+	}
+
+	@Override
+	public String getPackageName() {
+		return this.packageName;
+	}
+
+	@Override
+	public String getSimpleName() {
+		return this.simpleName;
+	}
+
+	@Override
+	public TypeReference getEnclosingType() {
+		return this.enclosingType;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/TypeHint.java b/spring-core/src/main/java/org/springframework/core/hint/TypeHint.java
new file mode 100644
index 000000000000..16dfeddcf662
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/TypeHint.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.springframework.util.Assert;
+
+/**
+ * A hint that describes the need for reflection on a type.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class TypeHint {
+
+	private final TypeReference type;
+
+	private final TypeReference reachableType;
+
+	private final Set<FieldHint> fields;
+
+	private final Set<ExecutableHint> constructors;
+
+	private final Set<ExecutableHint> methods;
+
+	private final Set<MemberCategory> memberCategories;
+
+
+	private TypeHint(Builder builder) {
+		this.type = builder.type;
+		this.reachableType = builder.reachableType;
+		this.memberCategories = Set.copyOf(builder.memberCategories);
+		this.fields = builder.fields.values().stream().map(FieldHint.Builder::build).collect(Collectors.toSet());
+		this.constructors = builder.constructors.values().stream().map(ExecutableHint.Builder::build).collect(Collectors.toSet());
+		this.methods = builder.methods.values().stream().map(ExecutableHint.Builder::build).collect(Collectors.toSet());
+	}
+
+	/**
+	 * Initialize a builder for the type defined by the specified
+	 * {@link TypeReference}.
+	 * @param type the type to use
+	 * @return a builder
+	 */
+	public static Builder of(TypeReference type) {
+		Assert.notNull(type, "Type must not be null");
+		return new Builder(type);
+	}
+
+	/**
+	 * Return the type that this hint handles.
+	 * @return the type
+	 */
+	public TypeReference getType() {
+		return this.type;
+	}
+
+	/**
+	 * Return the type that should be reachable for this hint to apply, or
+	 * {@code null} if this hint should always been applied.
+	 * @return the reachable type, if any
+	 */
+	public TypeReference getReachableType() {
+		return this.reachableType;
+	}
+
+	/**
+	 * Return the fields that require reflection.
+	 * @return a stream of {@link FieldHint}
+	 */
+	public Stream<FieldHint> fields() {
+		return this.fields.stream();
+	}
+
+	/**
+	 * Return the constructors that require reflection.
+	 * @return a stream of {@link ExecutableHint}
+	 */
+	public Stream<ExecutableHint> constructors() {
+		return this.constructors.stream();
+	}
+
+	/**
+	 * Return the methods that require reflection.
+	 * @return a stream of {@link ExecutableHint}
+	 */
+	public Stream<ExecutableHint> methods() {
+		return this.methods.stream();
+	}
+
+	/**
+	 * Return the member categories that apply.
+	 * @return the member categories to enable
+	 */
+	public Set<MemberCategory> getMemberCategories() {
+		return this.memberCategories;
+	}
+
+
+	/**
+	 * Builder for {@link TypeHint}.
+	 */
+	public static class Builder {
+
+		private final TypeReference type;
+
+		private TypeReference reachableType;
+
+		private final Map<String, FieldHint.Builder> fields = new HashMap<>();
+
+		private final Map<ExecutableKey, ExecutableHint.Builder> constructors = new HashMap<>();
+
+		private final Map<ExecutableKey, ExecutableHint.Builder> methods = new HashMap<>();
+
+		private final Set<MemberCategory> memberCategories = new HashSet<>();
+
+
+		public Builder(TypeReference type) {
+			this.type = type;
+		}
+
+		/**
+		 * Make this hint conditional on the fact that the specified type
+		 * can be resolved.
+		 * @param reachableType the type that should be reachable for this
+		 * hint to apply
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder onReachableType(TypeReference reachableType) {
+			this.reachableType = reachableType;
+			return this;
+		}
+
+		/**
+		 * Register the need for reflection on the field with the specified name.
+		 * @param name the name of the field
+		 * @param fieldHint a builder to further customize the hints of this field
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder withField(String name, Consumer<FieldHint.Builder> fieldHint) {
+			FieldHint.Builder builder = this.fields.computeIfAbsent(name, FieldHint.Builder::new);
+			fieldHint.accept(builder);
+			return this;
+		}
+
+		/**
+		 * Register the need for reflection on the constructor with the specified
+		 * parameter types.
+		 * @param parameterTypes the parameter types of the constructor
+		 * @param constructorHint a builder to further customize the hints of this
+		 * constructor
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder withConstructor(List<TypeReference> parameterTypes, Consumer<ExecutableHint.Builder> constructorHint) {
+			ExecutableKey key = new ExecutableKey("<init>", parameterTypes);
+			ExecutableHint.Builder builder = this.constructors.computeIfAbsent(key,
+					k -> ExecutableHint.ofConstructor(parameterTypes));
+			constructorHint.accept(builder);
+			return this;
+		}
+
+		/**
+		 * Register the need for reflection on the method with the specified name
+		 * and parameter types.
+		 * @param name the name of the method
+		 * @param parameterTypes the parameter types of the constructor
+		 * @param methodHint a builder to further customize the hints of this method
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder withMethod(String name, List<TypeReference> parameterTypes, Consumer<ExecutableHint.Builder> methodHint) {
+			ExecutableKey key = new ExecutableKey(name, parameterTypes);
+			ExecutableHint.Builder builder = this.methods.computeIfAbsent(key,
+					k -> ExecutableHint.ofMethod(name, parameterTypes));
+			methodHint.accept(builder);
+			return this;
+		}
+
+		/**
+		 * Adds the specified {@linkplain MemberCategory member categories}.
+		 * @param memberCategories the categories to apply
+		 * @return {@code this}, to facilitate method chaining
+		 */
+		public Builder withMembers(MemberCategory... memberCategories) {
+			this.memberCategories.addAll(Arrays.asList(memberCategories));
+			return this;
+		}
+
+		/**
+		 * Create a {@link TypeHint} based on the state of this builder.
+		 * @return a type hint
+		 */
+		public TypeHint build() {
+			return new TypeHint(this);
+		}
+
+	}
+
+	private static final class ExecutableKey {
+
+		private final String name;
+
+		private final List<String> parameterTypes;
+
+
+		private ExecutableKey(String name, List<TypeReference> parameterTypes) {
+			this.name = name;
+			this.parameterTypes = parameterTypes.stream().map(TypeReference::getCanonicalName)
+					.collect(Collectors.toList());
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ExecutableKey that = (ExecutableKey) o;
+			return this.name.equals(that.name) && this.parameterTypes.equals(that.parameterTypes);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(this.name, this.parameterTypes);
+		}
+
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/TypeReference.java b/spring-core/src/main/java/org/springframework/core/hint/TypeReference.java
new file mode 100644
index 000000000000..f39260de8284
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/TypeReference.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * Type abstraction that can be used to refer to types that are not available as
+ * a {@link Class} yet.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public interface TypeReference {
+
+	/**
+	 * Return the {@linkplain Class#getCanonicalName() canonical name} of this
+	 * type reference.
+	 * @return the canonical name
+	 */
+	String getCanonicalName();
+
+	/**
+	 * Return the package name of this type.
+	 * @return the package name
+	 */
+	String getPackageName();
+
+	/**
+	 * Return the {@linkplain Class#getSimpleName() simple name} of this type
+	 * reference.
+	 * @return the simple name
+	 */
+	String getSimpleName();
+
+	/**
+	 * Return the enclosing type reference, or {@code null} if this type reference
+	 * does not have an enclosing type.
+	 * @return the enclosing type, if any
+	 */
+	@Nullable
+	TypeReference getEnclosingType();
+
+	/**
+	 * Create an instance based on the specified type.
+	 * @param type the type to wrap
+	 * @return a type reference for the specified type
+	 */
+	static TypeReference of(Class<?> type) {
+		return ReflectionTypeReference.of(type);
+	}
+
+	/**
+	 * Create an instance based on the specified class name.
+	 * The format of the class name must follow {@linkplain Class#getName()},
+	 * in particular inner classes should be separated by a {@code $}.
+	 * @param className the class name of the type to wrap
+	 * @return a type reference for the specified class name
+	 */
+	static TypeReference of(String className) {
+		return SimpleTypeReference.of(className);
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/hint/package-info.java b/spring-core/src/main/java/org/springframework/core/hint/package-info.java
new file mode 100644
index 000000000000..8baf2b0d215d
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/hint/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Support for registering the need for reflection, resources, java serialization
+ * and proxies.
+ */
+package org.springframework.core.hint;
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ClassProxyHintTests.java b/spring-core/src/test/java/org/springframework/core/hint/ClassProxyHintTests.java
new file mode 100644
index 000000000000..215f8bda603b
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/ClassProxyHintTests.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.io.Closeable;
+import java.io.Serializable;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.function.Function;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.hint.JdkProxyHint.Builder;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link ClassProxyHint}.
+ *
+ * @author Stephane Nicoll
+ */
+class ClassProxyHintTests {
+
+	@Test
+	void equalsWithWithSameInstanceIsTrue() {
+		ClassProxyHint hint = ClassProxyHint.of(Properties.class).build();
+		assertThat(hint).isEqualTo(hint);
+	}
+
+	@Test
+	void equalsWithWithSameTargetClassIsTrue() {
+		ClassProxyHint first = ClassProxyHint.of(Properties.class).build();
+		ClassProxyHint second = ClassProxyHint.of(TypeReference.of(Properties.class)).build();
+		assertThat(first).isEqualTo(second);
+	}
+
+	@Test
+	void equalsWithWithSameProxiedInterfacesIsTrue() {
+		ClassProxyHint first = ClassProxyHint.of(Properties.class)
+				.proxiedInterfaces(Serializable.class).build();
+		ClassProxyHint second = ClassProxyHint.of(Properties.class)
+				.proxiedInterfaces(TypeReference.of(Serializable.class)).build();
+		assertThat(first).isEqualTo(second);
+	}
+
+	@Test
+	void equalsWithWithDifferentTargetClassIsFalse() {
+		ClassProxyHint first = ClassProxyHint.of(Properties.class).build();
+		ClassProxyHint second = ClassProxyHint.of(Hashtable.class).build();
+		assertThat(first).isNotEqualTo(second);
+	}
+
+	@Test
+	void equalsWithWithSameProxiedInterfacesDifferentOrderIsFalse() {
+		ClassProxyHint first = ClassProxyHint.of(Properties.class)
+				.proxiedInterfaces(Serializable.class, Closeable.class).build();
+		ClassProxyHint second = ClassProxyHint.of(Properties.class)
+				.proxiedInterfaces(TypeReference.of(Closeable.class), TypeReference.of(Serializable.class))
+				.build();
+		assertThat(first).isNotEqualTo(second);
+	}
+
+	@Test
+	void equalsWithWithDifferentProxiedInterfacesIsFalse() {
+		ClassProxyHint first = ClassProxyHint.of(Properties.class)
+				.proxiedInterfaces(Serializable.class).build();
+		ClassProxyHint second = ClassProxyHint.of(Properties.class)
+				.proxiedInterfaces(TypeReference.of(Closeable.class)).build();
+		assertThat(first).isNotEqualTo(second);
+	}
+
+	@Test
+	void equalsWithNonClassProxyHintIsFalse() {
+		ClassProxyHint first = ClassProxyHint.of(Properties.class).build();
+		JdkProxyHint second = new Builder().proxiedInterfaces(Function.class).build();
+		assertThat(first).isNotEqualTo(second);
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/JavaSerializationHintsTests.java b/spring-core/src/test/java/org/springframework/core/hint/JavaSerializationHintsTests.java
new file mode 100644
index 000000000000..3eb632cdcf9d
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/JavaSerializationHintsTests.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.net.URL;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link JavaSerializationHints}.
+ *
+ * @author Stephane Nicoll
+ */
+class JavaSerializationHintsTests {
+
+	private final JavaSerializationHints javaSerializationHints = new JavaSerializationHints();
+
+	@Test
+	void registerTypeTwiceExposesOneHint() {
+		this.javaSerializationHints.registerType(URL.class);
+		this.javaSerializationHints.registerType(TypeReference.of(URL.class.getName()));
+		assertThat(this.javaSerializationHints.types()).singleElement()
+				.isEqualTo(TypeReference.of(URL.class));
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/JdkProxyHintTests.java b/spring-core/src/test/java/org/springframework/core/hint/JdkProxyHintTests.java
new file mode 100644
index 000000000000..89a7669dfdd0
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/JdkProxyHintTests.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.hint.JdkProxyHint.Builder;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link JdkProxyHint}.
+ *
+ * @author Stephane Nicoll
+ */
+class JdkProxyHintTests {
+
+	@Test
+	void equalsWithWithSameInstanceIsTrue() {
+		JdkProxyHint hint = new Builder().proxiedInterfaces(Function.class, Consumer.class).build();
+		assertThat(hint).isEqualTo(hint);
+	}
+
+	@Test
+	void equalsWithWithSameProxiedInterfacesIsTrue() {
+		JdkProxyHint first = new Builder().proxiedInterfaces(Function.class, Consumer.class).build();
+		JdkProxyHint second = new Builder().proxiedInterfaces(TypeReference.of(Function.class.getName()),
+				TypeReference.of(Consumer.class)).build();
+		assertThat(first).isEqualTo(second);
+	}
+
+	@Test
+	void equalsWithWithSameProxiedInterfacesDifferentOrderIsFalse() {
+		JdkProxyHint first = new Builder().proxiedInterfaces(Function.class, Consumer.class).build();
+		JdkProxyHint second = new Builder().proxiedInterfaces(TypeReference.of(Consumer.class),
+				TypeReference.of(Function.class.getName())).build();
+		assertThat(first).isNotEqualTo(second);
+	}
+
+	@Test
+	void equalsWithWithDifferentProxiedInterfacesIsFalse() {
+		JdkProxyHint first = new Builder().proxiedInterfaces(Function.class).build();
+		JdkProxyHint second = new Builder().proxiedInterfaces(TypeReference.of(Function.class.getName()),
+				TypeReference.of(Consumer.class)).build();
+		assertThat(first).isNotEqualTo(second);
+	}
+
+	@Test
+	void equalsWithNonJdkProxyHintIsFalse() {
+		JdkProxyHint first = new Builder().proxiedInterfaces(Function.class).build();
+		TypeReference second = TypeReference.of(Function.class);
+		assertThat(first).isNotEqualTo(second);
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ProxyHintsTests.java b/spring-core/src/test/java/org/springframework/core/hint/ProxyHintsTests.java
new file mode 100644
index 000000000000..9fe36f0ded67
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/ProxyHintsTests.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.hint.JdkProxyHint.Builder;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+
+/**
+ * Tests for {@link ProxyHints}.
+ *
+ * @author Stephane Nicoll
+ */
+class ProxyHintsTests {
+
+	private final ProxyHints proxyHints = new ProxyHints();
+
+
+	@Test
+	void registerJdkProxyWithInterfaceClass() {
+		this.proxyHints.registerJdkProxy(Function.class);
+		assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(Function.class));
+	}
+
+	@Test
+	void registerJdkProxyWithConcreteClass() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.proxyHints.registerJdkProxy(String.class))
+				.withMessageContaining(String.class.getName());
+	}
+
+	@Test
+	void registerJdkProxyWithInterfaceClassNames() {
+		this.proxyHints.registerJdkProxy(TypeReference.of(Function.class),
+				TypeReference.of("com.example.Advised"));
+		assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(
+				Function.class.getName(), "com.example.Advised"));
+	}
+
+	@Test
+	void registerJdkProxyWithSupplier() {
+		this.proxyHints.registerJdkProxy(springProxy(TypeReference.of("com.example.Test")));
+		assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(
+				"org.springframework.aop.SpringProxy",
+				"org.springframework.aop.framework.Advised",
+				"org.springframework.core.DecoratingProxy",
+				"com.example.Test"));
+	}
+
+	@Test
+	void registerJdkProxyTwiceExposesOneHint() {
+		this.proxyHints.registerJdkProxy(Function.class);
+		this.proxyHints.registerJdkProxy(TypeReference.of(Function.class.getName()));
+		assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(Function.class));
+	}
+
+	@Test
+	void registerClassProxyWithTargetClass() {
+		this.proxyHints.registerClassProxy(Properties.class, classProxyHint ->
+				classProxyHint.proxiedInterfaces(Serializable.class));
+		assertThat(this.proxyHints.classProxies()).singleElement().satisfies(classProxyHint -> {
+			assertThat(classProxyHint.getTargetClass()).isEqualTo(TypeReference.of(Properties.class));
+			assertThat(classProxyHint.getProxiedInterfaces()).containsOnly(TypeReference.of(Serializable.class));
+		});
+	}
+
+	@Test
+	void registerClassProxyWithTargetInterface() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.proxyHints.registerClassProxy(Serializable.class, classProxyHint -> {
+		})).withMessageContaining(Serializable.class.getName());
+	}
+
+	private static Supplier<JdkProxyHint> springProxy(TypeReference proxiedInterface) {
+		return () -> new Builder().proxiedInterfaces(Stream.of("org.springframework.aop.SpringProxy",
+								"org.springframework.aop.framework.Advised", "org.springframework.core.DecoratingProxy")
+						.map(TypeReference::of).toArray(TypeReference[]::new))
+				.proxiedInterfaces(proxiedInterface).build();
+	}
+
+	private Consumer<JdkProxyHint> proxiedInterfaces(String... proxiedInterfaces) {
+		return jdkProxyHint -> assertThat(jdkProxyHint.getProxiedInterfaces())
+				.containsExactly(Arrays.stream(proxiedInterfaces)
+						.map(TypeReference::of).toArray(TypeReference[]::new));
+	}
+
+	private Consumer<JdkProxyHint> proxiedInterfaces(Class<?>... proxiedInterfaces) {
+		return jdkProxyHint -> assertThat(jdkProxyHint.getProxiedInterfaces())
+				.containsExactly(Arrays.stream(proxiedInterfaces)
+						.map(TypeReference::of).toArray(TypeReference[]::new));
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ReflectionHintsTests.java b/spring-core/src/test/java/org/springframework/core/hint/ReflectionHintsTests.java
new file mode 100644
index 000000000000..27460dcbf541
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/ReflectionHintsTests.java
@@ -0,0 +1,130 @@
+/*
+ * 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.core.hint;
+
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link ReflectionHints}.
+ *
+ * @author Stephane Nicoll
+ */
+class ReflectionHintsTests {
+
+	private final ReflectionHints reflectionHints = new ReflectionHints();
+
+	@Test
+	void registerType() {
+		this.reflectionHints.registerType(TypeReference.of(String.class),
+				hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS));
+		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(
+				typeWithMemberCategories(String.class, MemberCategory.DECLARED_FIELDS));
+	}
+
+	@Test
+	void registerTypeReuseBuilder() {
+		this.reflectionHints.registerType(TypeReference.of(String.class),
+				typeHint -> typeHint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS));
+		this.reflectionHints.registerField(ReflectionUtils.findField(String.class, "value"));
+		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(String.class.getCanonicalName());
+			assertThat(typeHint.fields()).singleElement().satisfies(fieldHint -> assertThat(fieldHint.getName()).isEqualTo("value"));
+			assertThat(typeHint.getMemberCategories()).containsOnly(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+		});
+	}
+
+	@Test
+	void registerClass() {
+		this.reflectionHints.registerType(Integer.class,
+				hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
+		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(
+				typeWithMemberCategories(Integer.class, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
+	}
+
+	@Test
+	void registerField() {
+		this.reflectionHints.registerField(ReflectionUtils.findField(TestType.class, "field"));
+		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(TestType.class.getCanonicalName());
+			assertThat(typeHint.fields()).singleElement().satisfies(fieldHint ->
+					assertThat(fieldHint.getName()).isEqualTo("field"));
+			assertThat(typeHint.constructors()).isEmpty();
+			assertThat(typeHint.methods()).isEmpty();
+			assertThat(typeHint.getMemberCategories()).isEmpty();
+		});
+	}
+
+	@Test
+	void registerConstructor() {
+		this.reflectionHints.registerConstructor(TestType.class.getDeclaredConstructors()[0]);
+		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getMemberCategories()).isEmpty();
+			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(TestType.class.getCanonicalName());
+			assertThat(typeHint.fields()).isEmpty();
+			assertThat(typeHint.constructors()).singleElement().satisfies(constructorHint -> {
+				assertThat(constructorHint.getParameterTypes()).isEmpty();
+				assertThat(constructorHint.getModes()).containsOnly(ExecutableMode.INVOKE);
+			});
+			assertThat(typeHint.methods()).isEmpty();
+			assertThat(typeHint.getMemberCategories()).isEmpty();
+		});
+	}
+
+	@Test
+	void registerMethod() {
+		this.reflectionHints.registerMethod(ReflectionUtils.findMethod(TestType.class, "setName", String.class));
+		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(TestType.class.getCanonicalName());
+			assertThat(typeHint.fields()).isEmpty();
+			assertThat(typeHint.constructors()).isEmpty();
+			assertThat(typeHint.methods()).singleElement().satisfies(methodHint -> {
+				assertThat(methodHint.getName()).isEqualTo("setName");
+				assertThat(methodHint.getParameterTypes()).containsOnly(TypeReference.of(String.class));
+				assertThat(methodHint.getModes()).containsOnly(ExecutableMode.INVOKE);
+			});
+		});
+	}
+
+	private Consumer<TypeHint> typeWithMemberCategories(Class<?> type, MemberCategory... memberCategories) {
+		return typeHint -> {
+			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(type.getCanonicalName());
+			assertThat(typeHint.fields()).isEmpty();
+			assertThat(typeHint.constructors()).isEmpty();
+			assertThat(typeHint.methods()).isEmpty();
+			assertThat(typeHint.getMemberCategories()).containsExactly(memberCategories);
+		};
+	}
+
+
+	@SuppressWarnings("unused")
+	static class TestType {
+
+		private String field;
+
+		void setName(String name) {
+
+		}
+
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ResourceHintsTests.java b/spring-core/src/test/java/org/springframework/core/hint/ResourceHintsTests.java
new file mode 100644
index 000000000000..9ec2ed129b22
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/ResourceHintsTests.java
@@ -0,0 +1,132 @@
+/*
+ * 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.core.hint;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.hint.ResourceHintsTests.Nested.Inner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link ResourceHints}.
+ *
+ * @author Stephane Nicoll
+ */
+class ResourceHintsTests {
+
+	private final ResourceHints resourceHints = new ResourceHints();
+
+	@Test
+	void registerType() {
+		this.resourceHints.registerType(String.class);
+		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
+				patternOf("java/lang/String.class"));
+	}
+
+	@Test
+	void registerTypeWithNestedType() {
+		this.resourceHints.registerType(TypeReference.of(Nested.class));
+		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
+				patternOf("org/springframework/core/hint/ResourceHintsTests$Nested.class"));
+	}
+
+	@Test
+	void registerTypeWithInnerNestedType() {
+		this.resourceHints.registerType(TypeReference.of(Inner.class));
+		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
+				patternOf("org/springframework/core/hint/ResourceHintsTests$Nested$Inner.class"));
+	}
+
+	@Test
+	void registerTypeSeveralTimesAddsOnlyOneEntry() {
+		this.resourceHints.registerType(String.class);
+		this.resourceHints.registerType(TypeReference.of(String.class));
+		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
+				patternOf("java/lang/String.class"));
+	}
+
+	@Test
+	void registerExactMatch() {
+		this.resourceHints.registerPattern("com/example/test.properties");
+		this.resourceHints.registerPattern("com/example/another.properties");
+		assertThat(this.resourceHints.resourcePatterns())
+				.anySatisfy(patternOf("com/example/test.properties"))
+				.anySatisfy(patternOf("com/example/another.properties"))
+				.hasSize(2);
+	}
+
+	@Test
+	void registerPattern() {
+		this.resourceHints.registerPattern("com/example/*.properties");
+		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
+				patternOf("com/example/*.properties"));
+	}
+
+	@Test
+	void registerPatternWithIncludesAndExcludes() {
+		this.resourceHints.registerPattern("com/example/*.properties",
+				resourceHint -> resourceHint.excludes("com/example/to-ignore.properties"));
+		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(patternOf(
+				List.of("com/example/*.properties"),
+				List.of("com/example/to-ignore.properties")));
+	}
+
+	@Test
+	void registerResourceBundle() {
+		this.resourceHints.registerResourceBundle("com.example.message");
+		assertThat(this.resourceHints.resourceBundles()).singleElement()
+				.satisfies(resourceBundle("com.example.message"));
+	}
+
+	@Test
+	void registerResourceBundleSeveralTimesAddsOneEntry() {
+		this.resourceHints.registerResourceBundle("com.example.message")
+				.registerResourceBundle("com.example.message");
+		assertThat(this.resourceHints.resourceBundles()).singleElement()
+				.satisfies(resourceBundle("com.example.message"));
+	}
+
+
+	private Consumer<ResourcePatternHint> patternOf(String... includes) {
+		return patternOf(Arrays.asList(includes), Collections.emptyList());
+	}
+
+	private Consumer<ResourceBundleHint> resourceBundle(String baseName) {
+		return resourceBundleHint -> assertThat(resourceBundleHint.getBaseName()).isEqualTo(baseName);
+	}
+
+	private Consumer<ResourcePatternHint> patternOf(List<String> includes, List<String> excludes) {
+		return pattern -> {
+			assertThat(pattern.getIncludes()).containsExactlyElementsOf(includes);
+			assertThat(pattern.getExcludes()).containsExactlyElementsOf(excludes);
+		};
+	}
+
+	static class Nested {
+
+		static class Inner {
+
+		}
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/RuntimeHintsTests.java b/spring-core/src/test/java/org/springframework/core/hint/RuntimeHintsTests.java
new file mode 100644
index 000000000000..46cec4a50cb4
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/RuntimeHintsTests.java
@@ -0,0 +1,69 @@
+/*
+ * 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.core.hint;
+
+import java.util.function.Function;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link RuntimeHints}.
+ *
+ * @author Stephane Nicoll
+ */
+class RuntimeHintsTests {
+
+	private final RuntimeHints hints = new RuntimeHints();
+
+	@Test
+	void reflectionHintWithClass() {
+		this.hints.reflection().registerType(String.class,
+				hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
+		assertThat(this.hints.reflection().typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(String.class.getCanonicalName());
+			assertThat(typeHint.fields()).isEmpty();
+			assertThat(typeHint.constructors()).isEmpty();
+			assertThat(typeHint.methods()).isEmpty();
+			assertThat(typeHint.getMemberCategories()).containsOnly(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
+		});
+	}
+
+	@Test
+	void resourceHintWithClass() {
+		this.hints.resources().registerType(String.class);
+		assertThat(this.hints.resources().resourcePatterns()).singleElement().satisfies(resourceHint -> {
+			assertThat(resourceHint.getIncludes()).containsExactly("java/lang/String.class");
+			assertThat(resourceHint.getExcludes()).isEmpty();
+		});
+	}
+
+	@Test
+	void javaSerializationHintWithClass() {
+		this.hints.javaSerialization().registerType(String.class);
+		assertThat(this.hints.javaSerialization().types()).containsExactly(TypeReference.of(String.class));
+	}
+
+	@Test
+	void jdkProxyWithClass() {
+		this.hints.proxies().registerJdkProxy(Function.class);
+		assertThat(this.hints.proxies().jdkProxies()).singleElement().satisfies(jdkProxyHint ->
+				assertThat(jdkProxyHint.getProxiedInterfaces()).containsExactly(TypeReference.of(Function.class)));
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/TypeHintTests.java b/spring-core/src/test/java/org/springframework/core/hint/TypeHintTests.java
new file mode 100644
index 000000000000..3916c7447314
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/TypeHintTests.java
@@ -0,0 +1,140 @@
+/*
+ * 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.core.hint;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.hint.TypeHint.Builder;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+
+/**
+ * Tests for {@link TypeHint}.
+ *
+ * @author Stephane Nicoll
+ */
+class TypeHintTests {
+
+	@Test
+	void createWithNullTypeReference() {
+		assertThatIllegalArgumentException().isThrownBy(() -> TypeHint.of(null));
+	}
+
+	@Test
+	void createWithType() {
+		TypeHint hint = TypeHint.of(TypeReference.of(String.class)).build();
+		assertThat(hint).isNotNull();
+		assertThat(hint.getType().getCanonicalName()).isEqualTo("java.lang.String");
+	}
+
+	@Test
+	void createWithTypeAndReachableType() {
+		TypeHint hint = TypeHint.of(TypeReference.of(String.class))
+				.onReachableType(TypeReference.of("com.example.Test")).build();
+		assertThat(hint).isNotNull();
+		assertThat(hint.getReachableType()).isNotNull();
+		assertThat(hint.getReachableType().getCanonicalName()).isEqualTo("com.example.Test");
+	}
+
+	@Test
+	void createWithField() {
+		TypeHint hint = TypeHint.of(TypeReference.of(String.class))
+				.withField("value", fieldHint -> fieldHint.allowWrite(true)).build();
+		assertThat(hint.fields()).singleElement().satisfies(fieldHint -> {
+			assertThat(fieldHint.getName()).isEqualTo("value");
+			assertThat(fieldHint.isAllowWrite()).isTrue();
+			assertThat(fieldHint.isAllowUnsafeAccess()).isFalse();
+		});
+	}
+
+	@Test
+	void createWithFieldReuseBuilder() {
+		Builder builder = TypeHint.of(TypeReference.of(String.class));
+		builder.withField("value", fieldHint -> fieldHint.allowUnsafeAccess(true));
+		builder.withField("value", fieldHint -> {
+			fieldHint.allowWrite(true);
+			fieldHint.allowUnsafeAccess(false);
+		});
+		TypeHint hint = builder.build();
+		assertThat(hint.fields()).singleElement().satisfies(fieldHint -> {
+			assertThat(fieldHint.getName()).isEqualTo("value");
+			assertThat(fieldHint.isAllowWrite()).isTrue();
+			assertThat(fieldHint.isAllowUnsafeAccess()).isFalse();
+		});
+	}
+
+	@Test
+	void createWithConstructor() {
+		List<TypeReference> parameterTypes = List.of(TypeReference.of(byte[].class), TypeReference.of(int.class));
+		TypeHint hint = TypeHint.of(TypeReference.of(String.class)).withConstructor(parameterTypes,
+				constructorHint -> constructorHint.withMode(ExecutableMode.INVOKE)).build();
+		assertThat(hint.constructors()).singleElement().satisfies(constructorHint -> {
+			assertThat(constructorHint.getParameterTypes()).containsOnlyOnceElementsOf(parameterTypes);
+			assertThat(constructorHint.getModes()).containsOnly(ExecutableMode.INVOKE);
+		});
+	}
+
+	@Test
+	void createConstructorReuseBuilder() {
+		List<TypeReference> parameterTypes = List.of(TypeReference.of(byte[].class), TypeReference.of(int.class));
+		Builder builder = TypeHint.of(TypeReference.of(String.class)).withConstructor(parameterTypes,
+				constructorHint -> constructorHint.withMode(ExecutableMode.INVOKE));
+		TypeHint hint = builder.withConstructor(parameterTypes, constructorHint ->
+				constructorHint.withMode(ExecutableMode.INTROSPECT)).build();
+		assertThat(hint.constructors()).singleElement().satisfies(constructorHint -> {
+			assertThat(constructorHint.getParameterTypes()).containsExactlyElementsOf(parameterTypes);
+			assertThat(constructorHint.getModes()).containsOnly(ExecutableMode.INVOKE, ExecutableMode.INTROSPECT);
+		});
+	}
+
+	@Test
+	void createWithMethod() {
+		List<TypeReference> parameterTypes = List.of(TypeReference.of(char[].class));
+		TypeHint hint = TypeHint.of(TypeReference.of(String.class)).withMethod("valueOf", parameterTypes,
+				methodHint -> methodHint.withMode(ExecutableMode.INVOKE)).build();
+		assertThat(hint.methods()).singleElement().satisfies(methodHint -> {
+			assertThat(methodHint.getName()).isEqualTo("valueOf");
+			assertThat(methodHint.getParameterTypes()).containsExactlyElementsOf(parameterTypes);
+			assertThat(methodHint.getModes()).containsOnly(ExecutableMode.INVOKE);
+		});
+	}
+
+	@Test
+	void createWithMethodReuseBuilder() {
+		List<TypeReference> parameterTypes = List.of(TypeReference.of(char[].class));
+		Builder builder = TypeHint.of(TypeReference.of(String.class)).withMethod("valueOf", parameterTypes,
+				methodHint -> methodHint.withMode(ExecutableMode.INVOKE));
+		TypeHint hint = builder.withMethod("valueOf", parameterTypes,
+				methodHint -> methodHint.setModes(ExecutableMode.INTROSPECT)).build();
+		assertThat(hint.methods()).singleElement().satisfies(methodHint -> {
+			assertThat(methodHint.getName()).isEqualTo("valueOf");
+			assertThat(methodHint.getParameterTypes()).containsExactlyElementsOf(parameterTypes);
+			assertThat(methodHint.getModes()).containsOnly(ExecutableMode.INTROSPECT);
+		});
+	}
+
+	@Test
+	void createWithMemberCategory() {
+		TypeHint hint = TypeHint.of(TypeReference.of(String.class))
+				.withMembers(MemberCategory.DECLARED_FIELDS).build();
+		assertThat(hint.getMemberCategories()).containsOnly(MemberCategory.DECLARED_FIELDS);
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/hint/TypeReferenceTests.java b/spring-core/src/test/java/org/springframework/core/hint/TypeReferenceTests.java
new file mode 100644
index 000000000000..e60dfd3d49aa
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/hint/TypeReferenceTests.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2002-2022 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.core.hint;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link TypeReference}.
+ *
+ * @author Stephane Nicoll
+ */
+class TypeReferenceTests {
+
+	@Test
+	void typeReferenceWithClassName() {
+		TypeReference type = TypeReference.of("java.lang.String");
+		assertThat(type.getCanonicalName()).isEqualTo("java.lang.String");
+		assertThat(type.getPackageName()).isEqualTo("java.lang");
+		assertThat(type.getSimpleName()).isEqualTo("String");
+		assertThat(type.getEnclosingType()).isNull();
+	}
+
+	@Test
+	void typeReferenceWithInnerClassName() {
+		TypeReference type = TypeReference.of("com.example.Example$Inner");
+		assertThat(type.getCanonicalName()).isEqualTo("com.example.Example.Inner");
+		assertThat(type.getPackageName()).isEqualTo("com.example");
+		assertThat(type.getSimpleName()).isEqualTo("Inner");
+		assertThat(type.getEnclosingType()).satisfies(enclosingType -> {
+			assertThat(enclosingType.getCanonicalName()).isEqualTo("com.example.Example");
+			assertThat(enclosingType.getPackageName()).isEqualTo("com.example");
+			assertThat(enclosingType.getSimpleName()).isEqualTo("Example");
+			assertThat(enclosingType.getEnclosingType()).isNull();
+		});
+	}
+
+	@Test
+	void typeReferenceWithNestedInnerClassName() {
+		TypeReference type = TypeReference.of("com.example.Example$Inner$Nested");
+		assertThat(type.getCanonicalName()).isEqualTo("com.example.Example.Inner.Nested");
+		assertThat(type.getPackageName()).isEqualTo("com.example");
+		assertThat(type.getSimpleName()).isEqualTo("Nested");
+		assertThat(type.getEnclosingType()).satisfies(enclosingType -> {
+			assertThat(enclosingType.getCanonicalName()).isEqualTo("com.example.Example.Inner");
+			assertThat(enclosingType.getPackageName()).isEqualTo("com.example");
+			assertThat(enclosingType.getSimpleName()).isEqualTo("Inner");
+			assertThat(enclosingType.getEnclosingType()).satisfies(parentEnclosingType -> {
+				assertThat(parentEnclosingType.getCanonicalName()).isEqualTo("com.example.Example");
+				assertThat(parentEnclosingType.getPackageName()).isEqualTo("com.example");
+				assertThat(parentEnclosingType.getSimpleName()).isEqualTo("Example");
+				assertThat(parentEnclosingType.getEnclosingType()).isNull();
+			});
+		});
+	}
+
+	@Test
+	void equalsWithIdenticalNameIsTrue() {
+		assertThat(TypeReference.of(String.class)).isEqualTo(
+				TypeReference.of("java.lang.String"));
+	}
+
+	@Test
+	void equalsWithNonTypeReferenceIsFalse() {
+		assertThat(TypeReference.of(String.class)).isNotEqualTo("java.lang.String");
+	}
+
+	@Test
+	void toStringUsesCanonicalName() {
+		assertThat(TypeReference.of(String.class)).hasToString("java.lang.String");
+	}
+
+}

From 0a92d84778dcb03dd5bf2860f2d997d1db2687f4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 25 Jan 2022 23:50:45 +0100
Subject: [PATCH 600/735] Check open status before close call (aligned with
 EntityManagerFactoryUtils)

Closes gh-27972
---
 .../springframework/orm/hibernate5/SessionFactoryUtils.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
index d3b61969aac0..f9e482cd93f4 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -133,7 +133,9 @@ static void flush(Session session, boolean synch) throws DataAccessException {
 	public static void closeSession(@Nullable Session session) {
 		if (session != null) {
 			try {
-				session.close();
+				if (session.isOpen()) {
+					session.close();
+				}
 			}
 			catch (Throwable ex) {
 				logger.error("Failed to release Hibernate Session", ex);

From 993b6d1351d6a92eb27b60e47d77cab8083b1b87 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 25 Jan 2022 23:51:22 +0100
Subject: [PATCH 601/735] Upgrade to Tomcat 9.0.58, Protobuf 3.19.3, Rome 1.18,
 H2 2.1.210, SLF4J 1.7.35, Mockito 4.3.1, HtmlUnit 2.57, XMLUnit 2.9,
 Checkstyle 9.2.1

---
 build.gradle | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index d2b3fcf89fdd..0b73d65a8de0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ configure(allprojects) { project ->
 				entry 'log4j-jul'
 				entry 'log4j-slf4j-impl'
 			}
-			dependency "org.slf4j:slf4j-api:1.7.33"
+			dependency "org.slf4j:slf4j-api:1.7.35"
 			dependency("com.google.code.findbugs:findbugs:3.0.1") {
 				exclude group: "dom4j", name: "dom4j"
 			}
@@ -77,7 +77,7 @@ configure(allprojects) { project ->
 				exclude group: "stax", name: "stax-api"
 			}
 			dependency "com.google.code.gson:gson:2.8.9"
-			dependency "com.google.protobuf:protobuf-java-util:3.19.1"
+			dependency "com.google.protobuf:protobuf-java-util:3.19.3"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
 			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
 				exclude group: "xpp3", name: "xpp3_min"
@@ -94,10 +94,10 @@ configure(allprojects) { project ->
 			dependency "org.ogce:xpp3:1.1.6"
 			dependency "org.yaml:snakeyaml:1.30"
 
-			dependency "com.h2database:h2:2.0.206"
+			dependency "com.h2database:h2:2.1.210"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
 			dependency "com.github.librepdf:openpdf:1.3.26"
-			dependency "com.rometools:rome:1.16.0"
+			dependency "com.rometools:rome:1.18.0"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.4"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
@@ -128,14 +128,14 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.56') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.58') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.56') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.58') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
@@ -192,13 +192,13 @@ configure(allprojects) { project ->
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
 			dependency "org.assertj:assertj-core:3.22.0"
-			dependencySet(group: 'org.xmlunit', version: '2.8.4') {
+			dependencySet(group: 'org.xmlunit', version: '2.9.0') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '4.2.0') {
+			dependencySet(group: 'org.mockito', version: '4.3.1') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
@@ -206,7 +206,7 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.1"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.56.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.57.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:htmlunit-driver:2.56.0") {
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "9.2"
+		toolVersion = "9.2.1"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 

From 1272cd557d14f1ecf28e518b6bbd6edcd62e0536 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 26 Jan 2022 00:02:12 +0100
Subject: [PATCH 602/735] Upgrade to SmallRye Mutiny 1.3.1, Aalto 1.3.1,
 Woodstox 6.2.8

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0b73d65a8de0..993049364999 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,12 +68,12 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.3"
-			dependency "io.smallrye.reactive:mutiny:1.2.0"
+			dependency "io.smallrye.reactive:mutiny:1.3.1"
 			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
-			dependency "com.fasterxml:aalto-xml:1.3.0"
-			dependency("com.fasterxml.woodstox:woodstox-core:6.2.7") {
+			dependency "com.fasterxml:aalto-xml:1.3.1"
+			dependency("com.fasterxml.woodstox:woodstox-core:6.2.8") {
 				exclude group: "stax", name: "stax-api"
 			}
 			dependency "com.google.code.gson:gson:2.8.9"

From c58885fc35ce129f56ed9e9d175833dece565e3d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 26 Jan 2022 00:24:01 +0100
Subject: [PATCH 603/735] Upgrade to Hibernate ORM 5.6.5, Eclipse Yasson 2.0.4,
 JRuby 9.3.3

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index fb8303f5bbb1..294612c27601 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,7 +79,7 @@ configure(allprojects) { project ->
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.eclipse:yasson:2.0.3"
+			dependency "org.eclipse:yasson:2.0.4"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -112,7 +112,7 @@ configure(allprojects) { project ->
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core-jakarta:5.6.3.Final"
+			dependency "org.hibernate:hibernate-core-jakarta:5.6.5.Final"
 			dependency "org.hibernate:hibernate-validator:7.0.2.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
@@ -145,7 +145,7 @@ configure(allprojects) { project ->
 				entry 'mockwebserver'
 			}
 
-			dependency "org.jruby:jruby:9.3.2.0"
+			dependency "org.jruby:jruby:9.3.3.0"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"
 

From bf1cf549b1f6d410d830945157ef2f4294f77783 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Jan 2022 12:15:10 +0100
Subject: [PATCH 604/735] Delete unused XML config in AOP namespace tests

See gh-22246
---
 .../aop/config/AopNamespaceHandlerEventTests.java           | 4 ++--
 .../aop/config/AopNamespaceHandlerEventTests-context.xml    | 6 ------
 ...mespaceHandlerPointcutErrorTests-pointcutDuplication.xml | 4 ----
 ...opNamespaceHandlerPointcutErrorTests-pointcutMissing.xml | 4 ----
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
index d4c774424d04..5c5dd5689fce 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -153,7 +153,7 @@ public void testAdvisorEventsWithDirectPointcut() {
 	public void testAspectEvent() {
 		this.reader.loadBeanDefinitions(CONTEXT);
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
-		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(5);
+		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(2);
 
 		boolean condition = componentDefinitions[0] instanceof CompositeComponentDefinition;
 		assertThat(condition).as("No holder with nested components").isTrue();
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
index 6acd17a85671..1c2ba7c237b5 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
@@ -16,12 +16,6 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
-
 	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
index 7c8f47124e6b..75ca4e9d364b 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
@@ -12,10 +12,6 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
-
 	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
index 847f864eb114..0524b1071c61 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
@@ -12,10 +12,6 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
-
 	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
 
 </beans>

From f4f5cee76cc9b9b5a7ba8efbfd37fd4b55dfe8a1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Jan 2022 12:29:30 +0100
Subject: [PATCH 605/735] Polish AOP namespace tests

---
 .../config/AopNamespaceHandlerEventTests.java | 82 ++++++++-----------
 ...AopNamespaceHandlerPointcutErrorTests.java |  8 +-
 .../aop/config/TopLevelAopTagTests.java       |  6 +-
 3 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
index 5c5dd5689fce..ffb270cdd9b4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.aop.config;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -40,7 +41,7 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  */
-public class AopNamespaceHandlerEventTests {
+class AopNamespaceHandlerEventTests {
 
 	private static final Class<?> CLASS = AopNamespaceHandlerEventTests.class;
 
@@ -57,25 +58,24 @@ public class AopNamespaceHandlerEventTests {
 
 
 	@BeforeEach
-	public void setup() {
+	void setup() {
 		this.reader = new XmlBeanDefinitionReader(this.beanFactory);
 		this.reader.setEventListener(this.eventListener);
 	}
 
 
 	@Test
-	public void testPointcutEvents() {
+	void pointcutEvents() {
 		this.reader.loadBeanDefinitions(POINTCUT_EVENTS_CONTEXT);
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
-		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(1);
-		boolean condition = componentDefinitions[0] instanceof CompositeComponentDefinition;
-		assertThat(condition).as("No holder with nested components").isTrue();
+		assertThat(componentDefinitions).as("Incorrect number of events fired").hasSize(1);
+		assertThat(componentDefinitions[0]).as("No holder with nested components").isInstanceOf(CompositeComponentDefinition.class);
 
 		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
 		assertThat(compositeDef.getName()).isEqualTo("aop:config");
 
 		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
-		assertThat(nestedComponentDefs.length).as("Incorrect number of inner components").isEqualTo(2);
+		assertThat(nestedComponentDefs).as("Incorrect number of inner components").hasSize(2);
 		PointcutComponentDefinition pcd = null;
 		for (ComponentDefinition componentDefinition : nestedComponentDefs) {
 			if (componentDefinition instanceof PointcutComponentDefinition) {
@@ -84,84 +84,77 @@ public void testPointcutEvents() {
 			}
 		}
 		assertThat(pcd).as("PointcutComponentDefinition not found").isNotNull();
-		assertThat(pcd.getBeanDefinitions().length).as("Incorrect number of BeanDefinitions").isEqualTo(1);
+		assertThat(pcd.getBeanDefinitions()).as("Incorrect number of BeanDefinitions").hasSize(1);
 	}
 
 	@Test
-	public void testAdvisorEventsWithPointcutRef() {
+	void advisorEventsWithPointcutRef() {
 		this.reader.loadBeanDefinitions(POINTCUT_REF_CONTEXT);
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
-		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(2);
+		assertThat(componentDefinitions).as("Incorrect number of events fired").hasSize(2);
 
-		boolean condition1 = componentDefinitions[0] instanceof CompositeComponentDefinition;
-		assertThat(condition1).as("No holder with nested components").isTrue();
+		assertThat(componentDefinitions[0]).as("No holder with nested components").isInstanceOf(CompositeComponentDefinition.class);
 		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
 		assertThat(compositeDef.getName()).isEqualTo("aop:config");
 
 		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
-		assertThat(nestedComponentDefs.length).as("Incorrect number of inner components").isEqualTo(3);
+		assertThat(nestedComponentDefs).as("Incorrect number of inner components").hasSize(3);
 		AdvisorComponentDefinition acd = null;
-		for (int i = 0; i < nestedComponentDefs.length; i++) {
-			ComponentDefinition componentDefinition = nestedComponentDefs[i];
+		for (ComponentDefinition componentDefinition : nestedComponentDefs) {
 			if (componentDefinition instanceof AdvisorComponentDefinition) {
 				acd = (AdvisorComponentDefinition) componentDefinition;
 				break;
 			}
 		}
 		assertThat(acd).as("AdvisorComponentDefinition not found").isNotNull();
-		assertThat(acd.getBeanDefinitions().length).isEqualTo(1);
-		assertThat(acd.getBeanReferences().length).isEqualTo(2);
+		assertThat(acd.getBeanDefinitions()).hasSize(1);
+		assertThat(acd.getBeanReferences()).hasSize(2);
 
-		boolean condition = componentDefinitions[1] instanceof BeanComponentDefinition;
-		assertThat(condition).as("No advice bean found").isTrue();
+		assertThat(componentDefinitions[1]).as("No advice bean found").isInstanceOf(BeanComponentDefinition.class);
 		BeanComponentDefinition adviceDef = (BeanComponentDefinition) componentDefinitions[1];
 		assertThat(adviceDef.getBeanName()).isEqualTo("countingAdvice");
 	}
 
 	@Test
-	public void testAdvisorEventsWithDirectPointcut() {
+	void advisorEventsWithDirectPointcut() {
 		this.reader.loadBeanDefinitions(DIRECT_POINTCUT_EVENTS_CONTEXT);
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
-		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(2);
+		assertThat(componentDefinitions).as("Incorrect number of events fired").hasSize(2);
 
-		boolean condition1 = componentDefinitions[0] instanceof CompositeComponentDefinition;
-		assertThat(condition1).as("No holder with nested components").isTrue();
+		assertThat(componentDefinitions[0]).as("No holder with nested components").isInstanceOf(CompositeComponentDefinition.class);
 		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
 		assertThat(compositeDef.getName()).isEqualTo("aop:config");
 
 		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
-		assertThat(nestedComponentDefs.length).as("Incorrect number of inner components").isEqualTo(2);
+		assertThat(nestedComponentDefs).as("Incorrect number of inner components").hasSize(2);
 		AdvisorComponentDefinition acd = null;
-		for (int i = 0; i < nestedComponentDefs.length; i++) {
-			ComponentDefinition componentDefinition = nestedComponentDefs[i];
+		for (ComponentDefinition componentDefinition : nestedComponentDefs) {
 			if (componentDefinition instanceof AdvisorComponentDefinition) {
 				acd = (AdvisorComponentDefinition) componentDefinition;
 				break;
 			}
 		}
 		assertThat(acd).as("AdvisorComponentDefinition not found").isNotNull();
-		assertThat(acd.getBeanDefinitions().length).isEqualTo(2);
-		assertThat(acd.getBeanReferences().length).isEqualTo(1);
+		assertThat(acd.getBeanDefinitions()).hasSize(2);
+		assertThat(acd.getBeanReferences()).hasSize(1);
 
-		boolean condition = componentDefinitions[1] instanceof BeanComponentDefinition;
-		assertThat(condition).as("No advice bean found").isTrue();
+		assertThat(componentDefinitions[1]).as("No advice bean found").isInstanceOf(BeanComponentDefinition.class);
 		BeanComponentDefinition adviceDef = (BeanComponentDefinition) componentDefinitions[1];
 		assertThat(adviceDef.getBeanName()).isEqualTo("countingAdvice");
 	}
 
 	@Test
-	public void testAspectEvent() {
+	void aspectEvent() {
 		this.reader.loadBeanDefinitions(CONTEXT);
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
-		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(2);
+		assertThat(componentDefinitions).as("Incorrect number of events fired").hasSize(2);
 
-		boolean condition = componentDefinitions[0] instanceof CompositeComponentDefinition;
-		assertThat(condition).as("No holder with nested components").isTrue();
+		assertThat(componentDefinitions[0]).as("No holder with nested components").isInstanceOf(CompositeComponentDefinition.class);
 		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
 		assertThat(compositeDef.getName()).isEqualTo("aop:config");
 
 		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
-		assertThat(nestedComponentDefs.length).as("Incorrect number of inner components").isEqualTo(2);
+		assertThat(nestedComponentDefs).as("Incorrect number of inner components").hasSize(2);
 		AspectComponentDefinition acd = null;
 		for (ComponentDefinition componentDefinition : nestedComponentDefs) {
 			if (componentDefinition instanceof AspectComponentDefinition) {
@@ -172,9 +165,9 @@ public void testAspectEvent() {
 
 		assertThat(acd).as("AspectComponentDefinition not found").isNotNull();
 		BeanDefinition[] beanDefinitions = acd.getBeanDefinitions();
-		assertThat(beanDefinitions.length).isEqualTo(5);
+		assertThat(beanDefinitions).hasSize(5);
 		BeanReference[] beanReferences = acd.getBeanReferences();
-		assertThat(beanReferences.length).isEqualTo(6);
+		assertThat(beanReferences).hasSize(6);
 
 		Set<String> expectedReferences = new HashSet<>();
 		expectedReferences.add("pc");
@@ -182,19 +175,16 @@ public void testAspectEvent() {
 		for (BeanReference beanReference : beanReferences) {
 			expectedReferences.remove(beanReference.getBeanName());
 		}
-		assertThat(expectedReferences.size()).as("Incorrect references found").isEqualTo(0);
+		assertThat(expectedReferences).as("Incorrect references found").isEmpty();
 
-		for (int i = 1; i < componentDefinitions.length; i++) {
-			boolean condition1 = componentDefinitions[i] instanceof BeanComponentDefinition;
-			assertThat(condition1).isTrue();
-		}
+		Arrays.stream(componentDefinitions).skip(1).forEach(definition ->
+			assertThat(definition).isInstanceOf(BeanComponentDefinition.class));
 
 		ComponentDefinition[] nestedComponentDefs2 = acd.getNestedComponents();
-		assertThat(nestedComponentDefs2.length).as("Inner PointcutComponentDefinition not found").isEqualTo(1);
-		boolean condition1 = nestedComponentDefs2[0] instanceof PointcutComponentDefinition;
-		assertThat(condition1).isTrue();
+		assertThat(nestedComponentDefs2).as("Inner PointcutComponentDefinition not found").hasSize(1);
+		assertThat(nestedComponentDefs2[0]).isInstanceOf(PointcutComponentDefinition.class);
 		PointcutComponentDefinition pcd = (PointcutComponentDefinition) nestedComponentDefs2[0];
-		assertThat(pcd.getBeanDefinitions().length).as("Incorrect number of BeanDefinitions").isEqualTo(1);
+		assertThat(pcd.getBeanDefinitions()).as("Incorrect number of BeanDefinitions").hasSize(1);
 	}
 
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
index 6a01b03ad7b2..db5fdd5fdc51 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -30,10 +30,10 @@
  * @author Mark Fisher
  * @author Chris Beams
  */
-public class AopNamespaceHandlerPointcutErrorTests {
+class AopNamespaceHandlerPointcutErrorTests {
 
 	@Test
-	public void testDuplicatePointcutConfig() {
+	void duplicatePointcutConfig() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(() ->
 				new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
@@ -42,7 +42,7 @@ public void testDuplicatePointcutConfig() {
 	}
 
 	@Test
-	public void testMissingPointcutConfig() {
+	void missingPointcutConfig() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		assertThatExceptionOfType(BeanDefinitionStoreException.class).isThrownBy(() ->
 				new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
index f1ab7f273db9..7e34bc23ef32 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -30,10 +30,10 @@
  * @author Rob Harrop
  * @author Chris Beams
  */
-public class TopLevelAopTagTests {
+class TopLevelAopTagTests {
 
 	@Test
-	public void testParse() {
+	void parse() {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(
 				qualifiedResource(TopLevelAopTagTests.class, "context.xml"));

From f64cc08b6210f67924185e65643d600e5bfb968e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Jan 2022 13:49:50 +0100
Subject: [PATCH 606/735] Apply "instanceof pattern matching" in additional
 core classes

---
 .../AnnotatedGenericBeanDefinition.java       |   4 +-
 .../support/AbstractBeanDefinition.java       |  15 +--
 .../factory/support/AbstractBeanFactory.java  | 104 +++++++++---------
 .../support/DefaultListableBeanFactory.java   |  84 +++++++-------
 ...onfigurationClassBeanDefinitionReader.java |  14 +--
 5 files changed, 100 insertions(+), 121 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
index c0cf85a172f1..b8cb9070636c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
@@ -70,8 +70,8 @@ public AnnotatedGenericBeanDefinition(Class<?> beanClass) {
 	 */
 	public AnnotatedGenericBeanDefinition(AnnotationMetadata metadata) {
 		Assert.notNull(metadata, "AnnotationMetadata must not be null");
-		if (metadata instanceof StandardAnnotationMetadata) {
-			setBeanClass(((StandardAnnotationMetadata) metadata).getIntrospectedClass());
+		if (metadata instanceof StandardAnnotationMetadata sam) {
+			setBeanClass(sam.getIntrospectedClass());
 		}
 		else {
 			setBeanClassName(metadata.getClassName());
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
index 09bbf79d1943..847574dbd2ec 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
@@ -390,13 +390,7 @@ public void setBeanClassName(@Nullable String beanClassName) {
 	@Override
 	@Nullable
 	public String getBeanClassName() {
-		Object beanClassObject = this.beanClass;
-		if (beanClassObject instanceof Class) {
-			return ((Class<?>) beanClassObject).getName();
-		}
-		else {
-			return (String) beanClassObject;
-		}
+		return (this.beanClass instanceof Class<?> clazz ? clazz.getName() : (String) this.beanClass);
 	}
 
 	/**
@@ -433,11 +427,11 @@ public Class<?> getBeanClass() throws IllegalStateException {
 		if (beanClassObject == null) {
 			throw new IllegalStateException("No bean class specified on bean definition");
 		}
-		if (!(beanClassObject instanceof Class)) {
+		if (!(beanClassObject instanceof Class<?> clazz)) {
 			throw new IllegalStateException(
 					"Bean class name [" + beanClassObject + "] has not been resolved into an actual Class");
 		}
-		return (Class<?>) beanClassObject;
+		return clazz;
 	}
 
 	/**
@@ -1102,8 +1096,7 @@ public void setOriginatingBeanDefinition(BeanDefinition originatingBd) {
 	@Override
 	@Nullable
 	public BeanDefinition getOriginatingBeanDefinition() {
-		return (this.resource instanceof BeanDefinitionResource ?
-				((BeanDefinitionResource) this.resource).getBeanDefinition() : null);
+		return (this.resource instanceof BeanDefinitionResource bdr ? bdr.getBeanDefinition() : null);
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index d003326cc327..c99741dcef66 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -107,6 +107,7 @@
  * @author Costin Leau
  * @author Chris Beams
  * @author Phillip Webb
+ * @author Sam Brannen
  * @since 15 April 2001
  * @see #getBeanDefinition
  * @see #createBean
@@ -270,9 +271,8 @@ protected <T> T doGetBean(
 			if (parentBeanFactory != null && !containsBeanDefinition(beanName)) {
 				// Not found -> check parent.
 				String nameToLookup = originalBeanName(name);
-				if (parentBeanFactory instanceof AbstractBeanFactory) {
-					return ((AbstractBeanFactory) parentBeanFactory).doGetBean(
-							nameToLookup, requiredType, args, typeCheckOnly);
+				if (parentBeanFactory instanceof AbstractBeanFactory abf) {
+					return abf.doGetBean(nameToLookup, requiredType, args, typeCheckOnly);
 				}
 				else if (args != null) {
 					// Delegation to parent with explicit args.
@@ -428,8 +428,8 @@ public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 
 		Object beanInstance = getSingleton(beanName, false);
 		if (beanInstance != null) {
-			if (beanInstance instanceof FactoryBean) {
-				return (BeanFactoryUtils.isFactoryDereference(name) || ((FactoryBean<?>) beanInstance).isSingleton());
+			if (beanInstance instanceof FactoryBean<?> factoryBean) {
+				return (BeanFactoryUtils.isFactoryDereference(name) || factoryBean.isSingleton());
 			}
 			else {
 				return !BeanFactoryUtils.isFactoryDereference(name);
@@ -486,7 +486,7 @@ public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		}
 		if (isFactoryBean(beanName, mbd)) {
 			FactoryBean<?> fb = (FactoryBean<?>) getBean(FACTORY_BEAN_PREFIX + beanName);
-			return ((fb instanceof SmartFactoryBean && ((SmartFactoryBean<?>) fb).isPrototype()) ||
+			return ((fb instanceof SmartFactoryBean<?> smartFactoryBean && smartFactoryBean.isPrototype()) ||
 					!fb.isSingleton());
 		}
 		else {
@@ -522,9 +522,9 @@ protected boolean isTypeMatch(String name, ResolvableType typeToMatch, boolean a
 		// Check manually registered singletons.
 		Object beanInstance = getSingleton(beanName, false);
 		if (beanInstance != null && beanInstance.getClass() != NullBean.class) {
-			if (beanInstance instanceof FactoryBean) {
+			if (beanInstance instanceof FactoryBean<?> factoryBean) {
 				if (!isFactoryDereference) {
-					Class<?> type = getTypeForFactoryBean((FactoryBean<?>) beanInstance);
+					Class<?> type = getTypeForFactoryBean(factoryBean);
 					return (type != null && typeToMatch.isAssignableFrom(type));
 				}
 				else {
@@ -673,8 +673,8 @@ public Class<?> getType(String name, boolean allowFactoryBeanInit) throws NoSuch
 		// Check manually registered singletons.
 		Object beanInstance = getSingleton(beanName, false);
 		if (beanInstance != null && beanInstance.getClass() != NullBean.class) {
-			if (beanInstance instanceof FactoryBean && !BeanFactoryUtils.isFactoryDereference(name)) {
-				return getTypeForFactoryBean((FactoryBean<?>) beanInstance);
+			if (beanInstance instanceof FactoryBean<?> factoryBean && !BeanFactoryUtils.isFactoryDereference(name)) {
+				return getTypeForFactoryBean(factoryBean);
 			}
 			else {
 				return beanInstance.getClass();
@@ -962,26 +962,26 @@ public List<BeanPostProcessor> getBeanPostProcessors() {
 	 * @since 5.3
 	 */
 	BeanPostProcessorCache getBeanPostProcessorCache() {
-		BeanPostProcessorCache bpCache = this.beanPostProcessorCache;
-		if (bpCache == null) {
-			bpCache = new BeanPostProcessorCache();
-			for (BeanPostProcessor bp : this.beanPostProcessors) {
-				if (bp instanceof InstantiationAwareBeanPostProcessor) {
-					bpCache.instantiationAware.add((InstantiationAwareBeanPostProcessor) bp);
-					if (bp instanceof SmartInstantiationAwareBeanPostProcessor) {
-						bpCache.smartInstantiationAware.add((SmartInstantiationAwareBeanPostProcessor) bp);
+		BeanPostProcessorCache bppCache = this.beanPostProcessorCache;
+		if (bppCache == null) {
+			bppCache = new BeanPostProcessorCache();
+			for (BeanPostProcessor bpp : this.beanPostProcessors) {
+				if (bpp instanceof InstantiationAwareBeanPostProcessor instantiationAwareBpp) {
+					bppCache.instantiationAware.add(instantiationAwareBpp);
+					if (bpp instanceof SmartInstantiationAwareBeanPostProcessor smartInstantiationAwareBpp) {
+						bppCache.smartInstantiationAware.add(smartInstantiationAwareBpp);
 					}
 				}
-				if (bp instanceof DestructionAwareBeanPostProcessor) {
-					bpCache.destructionAware.add((DestructionAwareBeanPostProcessor) bp);
+				if (bpp instanceof DestructionAwareBeanPostProcessor destructionAwareBpp) {
+					bppCache.destructionAware.add(destructionAwareBpp);
 				}
-				if (bp instanceof MergedBeanDefinitionPostProcessor) {
-					bpCache.mergedDefinition.add((MergedBeanDefinitionPostProcessor) bp);
+				if (bpp instanceof MergedBeanDefinitionPostProcessor mergedBeanDefBpp) {
+					bppCache.mergedDefinition.add(mergedBeanDefBpp);
 				}
 			}
-			this.beanPostProcessorCache = bpCache;
+			this.beanPostProcessorCache = bppCache;
 		}
-		return bpCache;
+		return bppCache;
 	}
 
 	/**
@@ -1085,8 +1085,8 @@ public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 	public BeanDefinition getMergedBeanDefinition(String name) throws BeansException {
 		String beanName = transformedBeanName(name);
 		// Efficiently check whether bean definition exists in this factory.
-		if (!containsBeanDefinition(beanName) && getParentBeanFactory() instanceof ConfigurableBeanFactory) {
-			return ((ConfigurableBeanFactory) getParentBeanFactory()).getMergedBeanDefinition(beanName);
+		if (!containsBeanDefinition(beanName) && getParentBeanFactory() instanceof ConfigurableBeanFactory parent) {
+			return parent.getMergedBeanDefinition(beanName);
 		}
 		// Resolve merged bean definition locally.
 		return getMergedLocalBeanDefinition(beanName);
@@ -1100,9 +1100,9 @@ public boolean isFactoryBean(String name) throws NoSuchBeanDefinitionException {
 			return (beanInstance instanceof FactoryBean);
 		}
 		// No singleton instance found -> check bean definition.
-		if (!containsBeanDefinition(beanName) && getParentBeanFactory() instanceof ConfigurableBeanFactory) {
+		if (!containsBeanDefinition(beanName) && getParentBeanFactory() instanceof ConfigurableBeanFactory cbf) {
 			// No bean definition found in this factory -> delegate to parent.
-			return ((ConfigurableBeanFactory) getParentBeanFactory()).isFactoryBean(name);
+			return cbf.isFactoryBean(name);
 		}
 		return isFactoryBean(beanName, getMergedLocalBeanDefinition(beanName));
 	}
@@ -1120,12 +1120,12 @@ public boolean isActuallyInCreation(String beanName) {
 	protected boolean isPrototypeCurrentlyInCreation(String beanName) {
 		Object curVal = this.prototypesCurrentlyInCreation.get();
 		return (curVal != null &&
-				(curVal.equals(beanName) || (curVal instanceof Set && ((Set<?>) curVal).contains(beanName))));
+				(curVal.equals(beanName) || (curVal instanceof Set<?> set && set.contains(beanName))));
 	}
 
 	/**
 	 * Callback before prototype creation.
-	 * <p>The default implementation register the prototype as currently in creation.
+	 * <p>The default implementation registers the prototype as currently in creation.
 	 * @param beanName the name of the prototype about to be created
 	 * @see #isPrototypeCurrentlyInCreation
 	 */
@@ -1135,9 +1135,9 @@ protected void beforePrototypeCreation(String beanName) {
 		if (curVal == null) {
 			this.prototypesCurrentlyInCreation.set(beanName);
 		}
-		else if (curVal instanceof String) {
+		else if (curVal instanceof String strValue) {
 			Set<String> beanNameSet = new HashSet<>(2);
-			beanNameSet.add((String) curVal);
+			beanNameSet.add(strValue);
 			beanNameSet.add(beanName);
 			this.prototypesCurrentlyInCreation.set(beanNameSet);
 		}
@@ -1159,8 +1159,7 @@ protected void afterPrototypeCreation(String beanName) {
 		if (curVal instanceof String) {
 			this.prototypesCurrentlyInCreation.remove();
 		}
-		else if (curVal instanceof Set) {
-			Set<String> beanNameSet = (Set<String>) curVal;
+		else if (curVal instanceof Set<?> beanNameSet) {
 			beanNameSet.remove(beanName);
 			if (beanNameSet.isEmpty()) {
 				this.prototypesCurrentlyInCreation.remove();
@@ -1253,8 +1252,8 @@ protected void initBeanWrapper(BeanWrapper bw) {
 	 * @param registry the PropertyEditorRegistry to initialize
 	 */
 	protected void registerCustomEditors(PropertyEditorRegistry registry) {
-		if (registry instanceof PropertyEditorRegistrySupport) {
-			((PropertyEditorRegistrySupport) registry).useConfigValueEditors();
+		if (registry instanceof PropertyEditorRegistrySupport registrySupport) {
+			registrySupport.useConfigValueEditors();
 		}
 		if (!this.propertyEditorRegistrars.isEmpty()) {
 			for (PropertyEditorRegistrar registrar : this.propertyEditorRegistrars) {
@@ -1263,8 +1262,7 @@ protected void registerCustomEditors(PropertyEditorRegistry registry) {
 				}
 				catch (BeanCreationException ex) {
 					Throwable rootCause = ex.getMostSpecificCause();
-					if (rootCause instanceof BeanCurrentlyInCreationException) {
-						BeanCreationException bce = (BeanCreationException) rootCause;
+					if (rootCause instanceof BeanCurrentlyInCreationException bce) {
 						String bceBeanName = bce.getBeanName();
 						if (bceBeanName != null && isCurrentlyInCreation(bceBeanName)) {
 							if (logger.isDebugEnabled()) {
@@ -1345,8 +1343,8 @@ protected RootBeanDefinition getMergedBeanDefinition(
 				previous = mbd;
 				if (bd.getParentName() == null) {
 					// Use copy of given root bean definition.
-					if (bd instanceof RootBeanDefinition) {
-						mbd = ((RootBeanDefinition) bd).cloneBeanDefinition();
+					if (bd instanceof RootBeanDefinition rootBeanDef) {
+						mbd = rootBeanDef.cloneBeanDefinition();
 					}
 					else {
 						mbd = new RootBeanDefinition(bd);
@@ -1361,9 +1359,8 @@ protected RootBeanDefinition getMergedBeanDefinition(
 							pbd = getMergedBeanDefinition(parentBeanName);
 						}
 						else {
-							BeanFactory parent = getParentBeanFactory();
-							if (parent instanceof ConfigurableBeanFactory) {
-								pbd = ((ConfigurableBeanFactory) parent).getMergedBeanDefinition(parentBeanName);
+							if (getParentBeanFactory() instanceof ConfigurableBeanFactory parent) {
+								pbd = parent.getMergedBeanDefinition(parentBeanName);
 							}
 							else {
 								throw new NoSuchBeanDefinitionException(parentBeanName,
@@ -1524,11 +1521,11 @@ private Class<?> doResolveBeanClass(RootBeanDefinition mbd, Class<?>... typesToM
 			Object evaluated = evaluateBeanDefinitionString(className, mbd);
 			if (!className.equals(evaluated)) {
 				// A dynamically resolved expression, supported as of 4.2...
-				if (evaluated instanceof Class) {
-					return (Class<?>) evaluated;
+				if (evaluated instanceof Class<?> clazz) {
+					return clazz;
 				}
-				else if (evaluated instanceof String) {
-					className = (String) evaluated;
+				else if (evaluated instanceof String str) {
+					className = str;
 					freshResolve = true;
 				}
 				else {
@@ -1685,11 +1682,11 @@ else if (mbd.isLazyInit()) {
 	 */
 	ResolvableType getTypeForFactoryBeanFromAttributes(AttributeAccessor attributes) {
 		Object attribute = attributes.getAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE);
-		if (attribute instanceof ResolvableType) {
-			return (ResolvableType) attribute;
+		if (attribute instanceof ResolvableType resolvableType) {
+			return resolvableType;
 		}
-		if (attribute instanceof Class) {
-			return ResolvableType.forClass((Class<?>) attribute);
+		if (attribute instanceof Class<?> clazz) {
+			return ResolvableType.forClass(clazz);
 		}
 		return ResolvableType.NONE;
 	}
@@ -1789,7 +1786,7 @@ protected Object getObjectForBeanInstance(
 		// Now we have the bean instance, which may be a normal bean or a FactoryBean.
 		// If it's a FactoryBean, we use it to create a bean instance, unless the
 		// caller actually wants a reference to the factory.
-		if (!(beanInstance instanceof FactoryBean)) {
+		if (!(beanInstance instanceof FactoryBean<?> factoryBean)) {
 			return beanInstance;
 		}
 
@@ -1802,13 +1799,12 @@ protected Object getObjectForBeanInstance(
 		}
 		if (object == null) {
 			// Return bean instance from factory.
-			FactoryBean<?> factory = (FactoryBean<?>) beanInstance;
 			// Caches object obtained from FactoryBean if it is a singleton.
 			if (mbd == null && containsBeanDefinition(beanName)) {
 				mbd = getMergedLocalBeanDefinition(beanName);
 			}
 			boolean synthetic = (mbd != null && mbd.isSynthetic());
-			object = getObjectFromFactoryBean(factory, beanName, !synthetic);
+			object = getObjectFromFactoryBean(factoryBean, beanName, !synthetic);
 		}
 		return object;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index f84f724174e3..4186000c3031 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -54,7 +54,6 @@
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
 import org.springframework.beans.factory.CannotLoadBeanClassException;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InjectionPoint;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
@@ -294,8 +293,8 @@ public Comparator<Object> getDependencyComparator() {
 	 */
 	public void setAutowireCandidateResolver(AutowireCandidateResolver autowireCandidateResolver) {
 		Assert.notNull(autowireCandidateResolver, "AutowireCandidateResolver must not be null");
-		if (autowireCandidateResolver instanceof BeanFactoryAware) {
-			((BeanFactoryAware) autowireCandidateResolver).setBeanFactory(this);
+		if (autowireCandidateResolver instanceof BeanFactoryAware beanFactoryAware) {
+			beanFactoryAware.setBeanFactory(this);
 		}
 		this.autowireCandidateResolver = autowireCandidateResolver;
 	}
@@ -486,8 +485,8 @@ private <T> T resolveBean(ResolvableType requiredType, @Nullable Object[] args,
 			return namedBean.getBeanInstance();
 		}
 		BeanFactory parent = getParentBeanFactory();
-		if (parent instanceof DefaultListableBeanFactory) {
-			return ((DefaultListableBeanFactory) parent).resolveBean(requiredType, args, nonUniqueAsNull);
+		if (parent instanceof DefaultListableBeanFactory dlfb) {
+			return dlfb.resolveBean(requiredType, args, nonUniqueAsNull);
 		}
 		else if (parent != null) {
 			ObjectProvider<T> parentProvider = parent.getBeanProvider(requiredType);
@@ -665,8 +664,7 @@ public <T> Map<String, T> getBeansOfType(
 			}
 			catch (BeanCreationException ex) {
 				Throwable rootCause = ex.getMostSpecificCause();
-				if (rootCause instanceof BeanCurrentlyInCreationException) {
-					BeanCreationException bce = (BeanCreationException) rootCause;
+				if (rootCause instanceof BeanCurrentlyInCreationException bce) {
 					String exBeanName = bce.getBeanName();
 					if (exBeanName != null && isCurrentlyInCreation(exBeanName)) {
 						if (logger.isTraceEnabled()) {
@@ -815,13 +813,13 @@ else if (containsSingleton(beanName)) {
 		}
 
 		BeanFactory parent = getParentBeanFactory();
-		if (parent instanceof DefaultListableBeanFactory) {
+		if (parent instanceof DefaultListableBeanFactory dlfb) {
 			// No bean definition found in this factory -> delegate to parent.
-			return ((DefaultListableBeanFactory) parent).isAutowireCandidate(beanName, descriptor, resolver);
+			return dlfb.isAutowireCandidate(beanName, descriptor, resolver);
 		}
-		else if (parent instanceof ConfigurableListableBeanFactory) {
+		else if (parent instanceof ConfigurableListableBeanFactory clfb) {
 			// If no DefaultListableBeanFactory, can't pass the resolver along.
-			return ((ConfigurableListableBeanFactory) parent).isAutowireCandidate(beanName, descriptor);
+			return clfb.isAutowireCandidate(beanName, descriptor);
 		}
 		else {
 			return true;
@@ -922,12 +920,8 @@ public void preInstantiateSingletons() throws BeansException {
 			if (!bd.isAbstract() && bd.isSingleton() && !bd.isLazyInit()) {
 				if (isFactoryBean(beanName)) {
 					Object bean = getBean(FACTORY_BEAN_PREFIX + beanName);
-					if (bean instanceof FactoryBean<?> factory) {
-						boolean isEagerInit = (factory instanceof SmartFactoryBean &&
-								((SmartFactoryBean<?>) factory).isEagerInit());
-						if (isEagerInit) {
-							getBean(beanName);
-						}
+					if (bean instanceof SmartFactoryBean<?> smartFactoryBean && smartFactoryBean.isEagerInit()) {
+						getBean(beanName);
 					}
 				}
 				else {
@@ -960,9 +954,9 @@ public void registerBeanDefinition(String beanName, BeanDefinition beanDefinitio
 		Assert.hasText(beanName, "Bean name must not be empty");
 		Assert.notNull(beanDefinition, "BeanDefinition must not be null");
 
-		if (beanDefinition instanceof AbstractBeanDefinition) {
+		if (beanDefinition instanceof AbstractBeanDefinition abd) {
 			try {
-				((AbstractBeanDefinition) beanDefinition).validate();
+				abd.validate();
 			}
 			catch (BeanDefinitionValidationException ex) {
 				throw new BeanDefinitionStoreException(beanDefinition.getResourceDescription(), beanName,
@@ -1185,8 +1179,8 @@ public <T> NamedBeanHolder<T> resolveNamedBean(Class<T> requiredType) throws Bea
 			return namedBean;
 		}
 		BeanFactory parent = getParentBeanFactory();
-		if (parent instanceof AutowireCapableBeanFactory) {
-			return ((AutowireCapableBeanFactory) parent).resolveNamedBean(requiredType);
+		if (parent instanceof AutowireCapableBeanFactory acbf) {
+			return acbf.resolveNamedBean(requiredType);
 		}
 		throw new NoSuchBeanDefinitionException(requiredType);
 	}
@@ -1383,7 +1377,7 @@ private Object resolveMultipleBeans(DependencyDescriptor descriptor, @Nullable S
 
 		Class<?> type = descriptor.getDependencyType();
 
-		if (descriptor instanceof StreamDependencyDescriptor) {
+		if (descriptor instanceof StreamDependencyDescriptor streamDependencyDescriptor) {
 			Map<String, Object> matchingBeans = findAutowireCandidates(beanName, type, descriptor);
 			if (autowiredBeanNames != null) {
 				autowiredBeanNames.addAll(matchingBeans.keySet());
@@ -1391,7 +1385,7 @@ private Object resolveMultipleBeans(DependencyDescriptor descriptor, @Nullable S
 			Stream<Object> stream = matchingBeans.keySet().stream()
 					.map(name -> descriptor.resolveCandidate(name, type, this))
 					.filter(bean -> !(bean instanceof NullBean));
-			if (((StreamDependencyDescriptor) descriptor).isOrdered()) {
+			if (streamDependencyDescriptor.isOrdered()) {
 				stream = stream.sorted(adaptOrderComparator(matchingBeans));
 			}
 			return stream;
@@ -1416,10 +1410,10 @@ else if (type.isArray()) {
 			}
 			TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter());
 			Object result = converter.convertIfNecessary(matchingBeans.values(), resolvedArrayType);
-			if (result instanceof Object[]) {
+			if (result instanceof Object[] array) {
 				Comparator<Object> comparator = adaptDependencyComparator(matchingBeans);
 				if (comparator != null) {
-					Arrays.sort((Object[]) result, comparator);
+					Arrays.sort(array, comparator);
 				}
 			}
 			return result;
@@ -1439,12 +1433,10 @@ else if (Collection.class.isAssignableFrom(type) && type.isInterface()) {
 			}
 			TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter());
 			Object result = converter.convertIfNecessary(matchingBeans.values(), type);
-			if (result instanceof List) {
-				if (((List<?>) result).size() > 1) {
-					Comparator<Object> comparator = adaptDependencyComparator(matchingBeans);
-					if (comparator != null) {
-						((List<?>) result).sort(comparator);
-					}
+			if (result instanceof List<?> list && list.size() > 1) {
+				Comparator<Object> comparator = adaptDependencyComparator(matchingBeans);
+				if (comparator != null) {
+					list.sort(comparator);
 				}
 			}
 			return result;
@@ -1486,8 +1478,8 @@ private boolean indicatesMultipleBeans(Class<?> type) {
 	@Nullable
 	private Comparator<Object> adaptDependencyComparator(Map<String, ?> matchingBeans) {
 		Comparator<Object> comparator = getDependencyComparator();
-		if (comparator instanceof OrderComparator) {
-			return ((OrderComparator) comparator).withSourceProvider(
+		if (comparator instanceof OrderComparator orderComparator) {
+			return orderComparator.withSourceProvider(
 					createFactoryAwareOrderSourceProvider(matchingBeans));
 		}
 		else {
@@ -1497,8 +1489,8 @@ private Comparator<Object> adaptDependencyComparator(Map<String, ?> matchingBean
 
 	private Comparator<Object> adaptOrderComparator(Map<String, ?> matchingBeans) {
 		Comparator<Object> dependencyComparator = getDependencyComparator();
-		OrderComparator comparator = (dependencyComparator instanceof OrderComparator ?
-				(OrderComparator) dependencyComparator : OrderComparator.INSTANCE);
+		OrderComparator comparator = (dependencyComparator instanceof OrderComparator orderComparator ?
+				orderComparator : OrderComparator.INSTANCE);
 		return comparator.withSourceProvider(createFactoryAwareOrderSourceProvider(matchingBeans));
 	}
 
@@ -1581,8 +1573,8 @@ private void addCandidateEntry(Map<String, Object> candidates, String candidateN
 				candidates.put(candidateName, beanInstance);
 			}
 		}
-		else if (containsSingleton(candidateName) || (descriptor instanceof StreamDependencyDescriptor &&
-				((StreamDependencyDescriptor) descriptor).isOrdered())) {
+		else if (containsSingleton(candidateName) || (descriptor instanceof StreamDependencyDescriptor streamDescriptor &&
+				streamDescriptor.isOrdered())) {
 			Object beanInstance = descriptor.resolveCandidate(candidateName, requiredType, this);
 			candidates.put(candidateName, (beanInstance instanceof NullBean ? null : beanInstance));
 		}
@@ -1711,9 +1703,8 @@ protected boolean isPrimary(String beanName, Object beanInstance) {
 		if (containsBeanDefinition(transformedBeanName)) {
 			return getMergedLocalBeanDefinition(transformedBeanName).isPrimary();
 		}
-		BeanFactory parent = getParentBeanFactory();
-		return (parent instanceof DefaultListableBeanFactory &&
-				((DefaultListableBeanFactory) parent).isPrimary(transformedBeanName, beanInstance));
+		return (getParentBeanFactory() instanceof DefaultListableBeanFactory parent &&
+				parent.isPrimary(transformedBeanName, beanInstance));
 	}
 
 	/**
@@ -1731,8 +1722,8 @@ protected boolean isPrimary(String beanName, Object beanInstance) {
 	@Nullable
 	protected Integer getPriority(Object beanInstance) {
 		Comparator<Object> comparator = getDependencyComparator();
-		if (comparator instanceof OrderComparator) {
-			return ((OrderComparator) comparator).getPriority(beanInstance);
+		if (comparator instanceof OrderComparator orderComparator) {
+			return orderComparator.getPriority(beanInstance);
 		}
 		return null;
 	}
@@ -1796,9 +1787,8 @@ private void checkBeanNotOfRequiredType(Class<?> type, DependencyDescriptor desc
 			}
 		}
 
-		BeanFactory parent = getParentBeanFactory();
-		if (parent instanceof DefaultListableBeanFactory) {
-			((DefaultListableBeanFactory) parent).checkBeanNotOfRequiredType(type, descriptor);
+		if (getParentBeanFactory() instanceof DefaultListableBeanFactory parent) {
+			parent.checkBeanNotOfRequiredType(type, descriptor);
 		}
 	}
 
@@ -1820,7 +1810,7 @@ public Object resolveCandidate(String beanName, Class<?> requiredType, BeanFacto
 			}
 		};
 		Object result = doResolveDependency(descriptorToUse, beanName, null, null);
-		return (result instanceof Optional ? (Optional<?>) result : Optional.ofNullable(result));
+		return (result instanceof Optional<?> optional ? optional : Optional.ofNullable(result));
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
index 72edc2a49f51..93f22542f6b5 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -223,8 +223,8 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 
 		if (metadata.isStatic()) {
 			// static @Bean method
-			if (configClass.getMetadata() instanceof StandardAnnotationMetadata) {
-				beanDef.setBeanClass(((StandardAnnotationMetadata) configClass.getMetadata()).getIntrospectedClass());
+			if (configClass.getMetadata() instanceof StandardAnnotationMetadata sam) {
+				beanDef.setBeanClass(sam.getIntrospectedClass());
 			}
 			else {
 				beanDef.setBeanClassName(configClass.getMetadata().getClassName());
@@ -237,8 +237,8 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 			beanDef.setUniqueFactoryMethodName(methodName);
 		}
 
-		if (metadata instanceof StandardMethodMetadata) {
-			beanDef.setResolvedFactoryMethod(((StandardMethodMetadata) metadata).getIntrospectedMethod());
+		if (metadata instanceof StandardMethodMetadata sam) {
+			beanDef.setResolvedFactoryMethod(sam.getIntrospectedMethod());
 		}
 
 		beanDef.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
@@ -322,8 +322,8 @@ protected boolean isOverriddenByExistingDefinition(BeanMethod beanMethod, String
 
 		// At this point, it's a top-level override (probably XML), just having been parsed
 		// before configuration class processing kicks in...
-		if (this.registry instanceof DefaultListableBeanFactory &&
-				!((DefaultListableBeanFactory) this.registry).isAllowBeanDefinitionOverriding()) {
+		if (this.registry instanceof DefaultListableBeanFactory dlbf &&
+				!dlbf.isAllowBeanDefinitionOverriding()) {
 			throw new BeanDefinitionStoreException(beanMethod.getConfigurationClass().getResource().getDescription(),
 					beanName, "@Bean definition illegally overridden by existing bean definition: " + existingBeanDef);
 		}

From 5c9fbcc23c59ae5b6f8f067198d8050a747a5a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Ostro=C5=BEl=C3=ADk?= <adamostrozlik@yandex.com>
Date: Thu, 16 Dec 2021 11:15:23 +0100
Subject: [PATCH 607/735] Add CacheErrorHandler implementation that logs
 exceptions

See gh-27826
---
 .../interceptor/LoggingCacheErrorHandler.java | 111 ++++++++++++++++++
 .../LoggingCacheErrorHandlerTests.java        |  63 ++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java
 create mode 100644 spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java

diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java b/spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java
new file mode 100644
index 000000000000..d1fefcafa420
--- /dev/null
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java
@@ -0,0 +1,111 @@
+/*
+ * 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.cache.interceptor;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.cache.Cache;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * A {@link CacheErrorHandler} implementation that simply logs error message.
+ *
+ * @author Adam Ostrožlík
+ * @since 5.3
+ */
+public final class LoggingCacheErrorHandler implements CacheErrorHandler {
+
+	private final Log logger;
+	private final boolean includeStacktrace;
+
+	/**
+	 * Construct new {@link LoggingCacheErrorHandler} that may log stacktraces.
+	 * @param includeStacktrace whether to log or not log stacktraces.
+	 * @param logger custom logger.
+	 */
+	private LoggingCacheErrorHandler(boolean includeStacktrace, Log logger) {
+		Assert.notNull(logger, "logger cannot be null");
+		this.includeStacktrace = includeStacktrace;
+		this.logger = logger;
+	}
+
+	@Override
+	public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {
+		logCacheError("Cache '" + cache.getName() + "' failed to get entry with key '" + key + "'", exception);
+	}
+
+	@Override
+	public void handleCachePutError(RuntimeException exception, Cache cache, Object key, @Nullable Object value) {
+		logCacheError("Cache '" + cache.getName() + "' failed to put entry with key '" + key + "'", exception);
+	}
+
+	@Override
+	public void handleCacheEvictError(RuntimeException exception, Cache cache, Object key) {
+		logCacheError("Cache '" + cache.getName() + "' failed to evict entry with key '" + key + "'", exception);
+	}
+
+	@Override
+	public void handleCacheClearError(RuntimeException exception, Cache cache) {
+		logCacheError("Cache '" + cache.getName() + "' failed to clear itself", exception);
+	}
+
+	private void logCacheError(String msg, RuntimeException ex) {
+		if (this.includeStacktrace) {
+			logger.warn(msg, ex);
+		}
+		else {
+			logger.warn(msg);
+		}
+	}
+
+	/**
+	 * Builder class for {@link LoggingCacheErrorHandler}.
+	 */
+	public static class Builder {
+		private Log logger;
+		private boolean includeStacktrace;
+
+		/**
+		 * Overrides default logger.
+		 * @param logger new logger.
+		 * @return this builder.
+		 */
+		public Builder setLogger(Log logger) {
+			this.logger = logger;
+			return this;
+		}
+
+		/**
+		 * Enable/disable logging of stacktraces.
+		 * @param includeStacktrace true - include stacktraces; false otherwise.
+		 * @return this builder.
+		 */
+		public Builder setIncludeStacktrace(boolean includeStacktrace) {
+			this.includeStacktrace = includeStacktrace;
+			return this;
+		}
+
+		public LoggingCacheErrorHandler build() {
+			if (logger == null) {
+				return new LoggingCacheErrorHandler(this.includeStacktrace, LogFactory.getLog(LoggingCacheErrorHandler.class));
+			}
+			return new LoggingCacheErrorHandler(this.includeStacktrace, logger);
+		}
+	}
+}
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java
new file mode 100644
index 000000000000..f7618be9f402
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java
@@ -0,0 +1,63 @@
+/*
+ * 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.cache.interceptor;
+
+import org.apache.commons.logging.Log;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.cache.support.NoOpCache;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Tests for {@link LoggingCacheErrorHandler}.
+ *
+ * @author Adam Ostrožlík
+ */
+@ExtendWith(MockitoExtension.class)
+public class LoggingCacheErrorHandlerTests {
+
+	@Mock
+	Log logger;
+
+	@Test
+	void givenHandlerWhenHandleGetErrorThenLogWithoutException() {
+		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler.Builder()
+				.setLogger(logger)
+				.build();
+		handler.handleCacheGetError(new RuntimeException(), new NoOpCache("NOOP"), "key");
+		verify(logger, times(1)).warn(anyString());
+	}
+
+	@Test
+	void givenHandlerWhenHandleGetErrorThenLogWithException() {
+		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler.Builder()
+				.setLogger(logger)
+				.setIncludeStacktrace(true)
+				.build();
+		RuntimeException exception = new RuntimeException();
+		handler.handleCacheGetError(exception, new NoOpCache("NOOP"), "key");
+		verify(logger, times(1)).warn(anyString(), eq(exception));
+	}
+
+}

From 6a6c7df824675476a0f7b5bed80c503a9b279c01 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 26 Jan 2022 14:08:17 +0100
Subject: [PATCH 608/735] Polish "Add CacheErrorHandler implementation that
 logs exceptions"

See gh-27826
---
 .../interceptor/LoggingCacheErrorHandler.java | 98 +++++++++----------
 .../LoggingCacheErrorHandlerTests.java        | 59 ++++++-----
 2 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java b/spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java
index d1fefcafa420..e2f6c33127d4 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/LoggingCacheErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,88 +24,82 @@
 import org.springframework.util.Assert;
 
 /**
- * A {@link CacheErrorHandler} implementation that simply logs error message.
+ * A {@link CacheErrorHandler} implementation that logs error message. Can be
+ * used when underlying cache errors should be ignored.
  *
  * @author Adam Ostrožlík
- * @since 5.3
+ * @author Stephane Nicoll
+ * @since 5.3.16
  */
-public final class LoggingCacheErrorHandler implements CacheErrorHandler {
+public class LoggingCacheErrorHandler implements CacheErrorHandler {
 
 	private final Log logger;
-	private final boolean includeStacktrace;
+
+	private final boolean logStacktrace;
+
 
 	/**
-	 * Construct new {@link LoggingCacheErrorHandler} that may log stacktraces.
-	 * @param includeStacktrace whether to log or not log stacktraces.
-	 * @param logger custom logger.
+	 * Create an instance with the {@link Log logger} to use.
+	 * @param logger the logger to use
+	 * @param logStacktrace whether to log stack trace
 	 */
-	private LoggingCacheErrorHandler(boolean includeStacktrace, Log logger) {
-		Assert.notNull(logger, "logger cannot be null");
-		this.includeStacktrace = includeStacktrace;
+	public LoggingCacheErrorHandler(Log logger, boolean logStacktrace) {
+		Assert.notNull(logger, "Logger must not be null");
 		this.logger = logger;
+		this.logStacktrace = logStacktrace;
 	}
 
+	/**
+	 * Create an instance that does not log stack traces.
+	 */
+	public LoggingCacheErrorHandler() {
+		this(LogFactory.getLog(LoggingCacheErrorHandler.class), false);
+	}
+
+
 	@Override
 	public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {
-		logCacheError("Cache '" + cache.getName() + "' failed to get entry with key '" + key + "'", exception);
+		logCacheError(logger,
+				createMessage(cache, "failed to get entry with key '" + key + "'"),
+				exception);
 	}
 
 	@Override
 	public void handleCachePutError(RuntimeException exception, Cache cache, Object key, @Nullable Object value) {
-		logCacheError("Cache '" + cache.getName() + "' failed to put entry with key '" + key + "'", exception);
+		logCacheError(logger,
+				createMessage(cache, "failed to put entry with key '" + key + "'"),
+				exception);
 	}
 
 	@Override
 	public void handleCacheEvictError(RuntimeException exception, Cache cache, Object key) {
-		logCacheError("Cache '" + cache.getName() + "' failed to evict entry with key '" + key + "'", exception);
+		logCacheError(logger,
+				createMessage(cache, "failed to evict entry with key '" + key + "'"),
+				exception);
 	}
 
 	@Override
 	public void handleCacheClearError(RuntimeException exception, Cache cache) {
-		logCacheError("Cache '" + cache.getName() + "' failed to clear itself", exception);
-	}
-
-	private void logCacheError(String msg, RuntimeException ex) {
-		if (this.includeStacktrace) {
-			logger.warn(msg, ex);
-		}
-		else {
-			logger.warn(msg);
-		}
+		logCacheError(logger, createMessage(cache, "failed to clear entries"), exception);
 	}
 
 	/**
-	 * Builder class for {@link LoggingCacheErrorHandler}.
+	 * Log the specified message.
+	 * @param logger the logger
+	 * @param message the message
+	 * @param ex the exception
 	 */
-	public static class Builder {
-		private Log logger;
-		private boolean includeStacktrace;
-
-		/**
-		 * Overrides default logger.
-		 * @param logger new logger.
-		 * @return this builder.
-		 */
-		public Builder setLogger(Log logger) {
-			this.logger = logger;
-			return this;
+	protected void logCacheError(Log logger, String message, RuntimeException ex) {
+		if (this.logStacktrace) {
+			logger.warn(message, ex);
 		}
-
-		/**
-		 * Enable/disable logging of stacktraces.
-		 * @param includeStacktrace true - include stacktraces; false otherwise.
-		 * @return this builder.
-		 */
-		public Builder setIncludeStacktrace(boolean includeStacktrace) {
-			this.includeStacktrace = includeStacktrace;
-			return this;
+		else {
+			logger.warn(message);
 		}
+	}
 
-		public LoggingCacheErrorHandler build() {
-			if (logger == null) {
-				return new LoggingCacheErrorHandler(this.includeStacktrace, LogFactory.getLog(LoggingCacheErrorHandler.class));
-			}
-			return new LoggingCacheErrorHandler(this.includeStacktrace, logger);
-		}
+	private String createMessage(Cache cache, String reason) {
+		return String.format("Cache '%s' %s", cache.getName(), reason);
 	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java
index f7618be9f402..39525d715ae6 100644
--- a/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/LoggingCacheErrorHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,46 +18,59 @@
 
 import org.apache.commons.logging.Log;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.cache.support.NoOpCache;
 
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 /**
  * Tests for {@link LoggingCacheErrorHandler}.
  *
  * @author Adam Ostrožlík
+ * @author Stephane Nicoll
  */
-@ExtendWith(MockitoExtension.class)
 public class LoggingCacheErrorHandlerTests {
 
-	@Mock
-	Log logger;
-
 	@Test
-	void givenHandlerWhenHandleGetErrorThenLogWithoutException() {
-		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler.Builder()
-				.setLogger(logger)
-				.build();
+	void handleGetCacheErrorLogsAppropriateMessage() {
+		Log logger = mock(Log.class);
+		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler(logger, false);
 		handler.handleCacheGetError(new RuntimeException(), new NoOpCache("NOOP"), "key");
-		verify(logger, times(1)).warn(anyString());
+		verify(logger).warn("Cache 'NOOP' failed to get entry with key 'key'");
+	}
+
+	@Test
+	void handlePutCacheErrorLogsAppropriateMessage() {
+		Log logger = mock(Log.class);
+		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler(logger, false);
+		handler.handleCachePutError(new RuntimeException(), new NoOpCache("NOOP"), "key", new Object());
+		verify(logger).warn("Cache 'NOOP' failed to put entry with key 'key'");
+	}
+
+	@Test
+	void handleEvictCacheErrorLogsAppropriateMessage() {
+		Log logger = mock(Log.class);
+		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler(logger, false);
+		handler.handleCacheEvictError(new RuntimeException(), new NoOpCache("NOOP"), "key");
+		verify(logger).warn("Cache 'NOOP' failed to evict entry with key 'key'");
+	}
+
+	@Test
+	void handleClearErrorLogsAppropriateMessage() {
+		Log logger = mock(Log.class);
+		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler(logger, false);
+		handler.handleCacheClearError(new RuntimeException(), new NoOpCache("NOOP"));
+		verify(logger).warn("Cache 'NOOP' failed to clear entries");
 	}
 
 	@Test
-	void givenHandlerWhenHandleGetErrorThenLogWithException() {
-		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler.Builder()
-				.setLogger(logger)
-				.setIncludeStacktrace(true)
-				.build();
+	void handleCacheErrorWithStacktrace() {
+		Log logger = mock(Log.class);
+		LoggingCacheErrorHandler handler = new LoggingCacheErrorHandler(logger, true);
 		RuntimeException exception = new RuntimeException();
 		handler.handleCacheGetError(exception, new NoOpCache("NOOP"), "key");
-		verify(logger, times(1)).warn(anyString(), eq(exception));
+		verify(logger).warn("Cache 'NOOP' failed to get entry with key 'key'", exception);
 	}
 
 }

From 9095f1d584d16f9b50536e3a76c9628d0e4d0660 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Jan 2022 17:32:07 +0100
Subject: [PATCH 609/735] Polish AspectJ documentation

---
 src/docs/asciidoc/core/core-aop.adoc | 50 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc
index 6479f329b5d9..7a539acff574 100644
--- a/src/docs/asciidoc/core/core-aop.adoc
+++ b/src/docs/asciidoc/core/core-aop.adoc
@@ -770,7 +770,7 @@ sub-packages:
 	this(com.xyz.service.AccountService)
 ----
 +
-NOTE: 'this' is more commonly used in a binding form. See the section on <<aop-advice>>
+NOTE: `this` is more commonly used in a binding form. See the section on <<aop-advice>>
 for how to make the proxy object available in the advice body.
 
 * Any join point (method execution only in Spring AOP) where the target object
@@ -781,7 +781,7 @@ implements the `AccountService` interface:
 	target(com.xyz.service.AccountService)
 ----
 +
-NOTE: 'target' is more commonly used in a binding form. See the <<aop-advice>> section
+NOTE: `target` is more commonly used in a binding form. See the <<aop-advice>> section
 for how to make the target object available in the advice body.
 
 * Any join point (method execution only in Spring AOP) that takes a single parameter
@@ -792,7 +792,7 @@ and where the argument passed at runtime is `Serializable`:
 	args(java.io.Serializable)
 ----
 +
-NOTE: 'args' is more commonly used in a binding form. See the <<aop-advice>> section
+NOTE: `args` is more commonly used in a binding form. See the <<aop-advice>> section
 for how to make the method arguments available in the advice body.
 +
 Note that the pointcut given in this example is different from `execution(*
@@ -808,7 +808,7 @@ parameter of type `Serializable`.
 	@target(org.springframework.transaction.annotation.Transactional)
 ----
 +
-NOTE: You can also use '@target' in a binding form. See the <<aop-advice>> section for
+NOTE: You can also use `@target` in a binding form. See the <<aop-advice>> section for
 how to make the annotation object available in the advice body.
 
 * Any join point (method execution only in Spring AOP) where the declared type of the
@@ -819,7 +819,7 @@ target object has an `@Transactional` annotation:
 	@within(org.springframework.transaction.annotation.Transactional)
 ----
 +
-NOTE: You can also use '@within' in a binding form. See the <<aop-advice>> section for
+NOTE: You can also use `@within` in a binding form. See the <<aop-advice>> section for
 how to make the annotation object available in the advice body.
 
 * Any join point (method execution only in Spring AOP) where the executing method has an
@@ -830,7 +830,7 @@ how to make the annotation object available in the advice body.
 	@annotation(org.springframework.transaction.annotation.Transactional)
 ----
 +
-NOTE: You can also use '@annotation' in a binding form. See the <<aop-advice>> section
+NOTE: You can also use `@annotation` in a binding form. See the <<aop-advice>> section
 for how to make the annotation object available in the advice body.
 
 * Any join point (method execution only in Spring AOP) which takes a single parameter,
@@ -841,7 +841,7 @@ and where the runtime type of the argument passed has the `@Classified` annotati
 	@args(com.xyz.security.Classified)
 ----
 +
-NOTE: You can also use '@args' in a binding form. See the <<aop-advice>> section
+NOTE: You can also use `@args` in a binding form. See the <<aop-advice>> section
 how to make the annotation object(s) available in the advice body.
 
 * Any join point (method execution only in Spring AOP) on a Spring bean named
@@ -1213,7 +1213,7 @@ in contrast to `@AfterReturning` which only applies to successful normal returns
 [[aop-ataspectj-around-advice]]
 ==== Around Advice
 
-The last kind of advice is around advice. Around advice runs "`around`" a matched
+The last kind of advice is _around_ advice. Around advice runs "around" a matched
 method's execution. It has the opportunity to do work both before and after the method
 runs and to determine when, how, and even if the method actually gets to run at all.
 Around advice is often used if you need to share state before and after a method
@@ -1301,8 +1301,9 @@ write generic advice that can find out about the method the advice is currently
 ===== Access to the Current `JoinPoint`
 
 Any advice method may declare, as its first parameter, a parameter of type
-`org.aspectj.lang.JoinPoint` (note that around advice is required to declare a first
+`org.aspectj.lang.JoinPoint`. Note that around advice is required to declare a first
 parameter of type `ProceedingJoinPoint`, which is a subclass of `JoinPoint`.
+
 The `JoinPoint` interface provides a number of useful methods:
 
 * `getArgs()`: Returns the method arguments.
@@ -1319,7 +1320,7 @@ See the https://www.eclipse.org/aspectj/doc/released/runtime-api/org/aspectj/lan
 We have already seen how to bind the returned value or exception value (using after
 returning and after throwing advice). To make argument values available to the advice
 body, you can use the binding form of `args`. If you use a parameter name in place of a
-type name in an args expression, the value of the corresponding argument is passed as
+type name in an `args` expression, the value of the corresponding argument is passed as
 the parameter value when the advice is invoked. An example should make this clearer.
 Suppose you want to advise the execution of DAO operations that take an `Account`
 object as the first parameter, and you need access to the account in the advice body.
@@ -1348,7 +1349,7 @@ parameter, and the argument passed to that parameter is an instance of `Account`
 Second, it makes the actual `Account` object available to the advice through the `account`
 parameter.
 
-Another way of writing this is to declare a pointcut that "`provides`" the `Account`
+Another way of writing this is to declare a pointcut that "provides" the `Account`
 object value when it matches a join point, and then refer to the named pointcut
 from the advice. This would look as follows:
 
@@ -1376,13 +1377,12 @@ from the advice. This would look as follows:
 	}
 ----
 
-See the AspectJ programming guide for more
-details.
+See the AspectJ programming guide for more details.
 
-The proxy object ( `this`), target object ( `target`), and annotations ( `@within`,
-`@target`, `@annotation`, and `@args`) can all be bound in a similar fashion. The next two
-examples show how to match the execution of methods annotated with an
-`@Auditable` annotation and extract the audit code:
+The proxy object (`this`), target object (`target`), and annotations (`@within`,
+`@target`, `@annotation`, and `@args`) can all be bound in a similar fashion. The next
+two examples show how to match the execution of methods annotated with an `@Auditable`
+annotation and extract the audit code:
 
 The first of the two examples shows the definition of the `@Auditable` annotation:
 
@@ -1448,7 +1448,7 @@ you have a generic type like the following:
 ----
 
 You can restrict interception of method types to certain parameter types by
-typing the advice parameter to the parameter type for which you want to intercept the method:
+tying the advice parameter to the parameter type for which you want to intercept the method:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -1575,18 +1575,18 @@ the `argNames` attribute:
 	}
 ----
 
-* Using the `'argNames'` attribute is a little clumsy, so if the `'argNames'` attribute
+* Using the `argNames` attribute is a little clumsy, so if the `argNames` attribute
   has not been specified,  Spring AOP looks at the debug information for the
   class and tries to determine the parameter names from the local variable table. This
   information is present as long as the classes have been compiled with debug
-  information ( `'-g:vars'` at a minimum). The consequences of compiling with this flag
+  information (`-g:vars` at a minimum). The consequences of compiling with this flag
   on are: (1) your code is slightly easier to understand (reverse engineer), (2)
   the class file sizes are very slightly bigger (typically inconsequential), (3) the
-  optimization to remove unused local variables is not  applied by your compiler. In
+  optimization to remove unused local variables is not applied by your compiler. In
   other words, you should encounter no difficulties by building with this flag on.
 +
-NOTE: If an @AspectJ aspect has been compiled by the AspectJ compiler (ajc) even without the
-debug information, you need not add the `argNames` attribute, as the compiler
+NOTE: If an @AspectJ aspect has been compiled by the AspectJ compiler (`ajc`) even
+without the debug information, you need not add the `argNames` attribute, as the compiler
 retain the needed information.
 
 * If the code has been compiled without the necessary debug information, Spring AOP
@@ -2542,7 +2542,7 @@ With such a Boot class, we would get output similar to the following on standard
 
 [literal,subs="verbatim,quotes"]
 ----
-StopWatch 'Profiling for 'Pengo' and '12'': running time (millis) = 0
+StopWatch 'Profiling for 'Pengo' and '12': running time (millis) = 0
 -----------------------------------------
 ms     %     Task name
 -----------------------------------------
@@ -3540,7 +3540,7 @@ with references to beans defined in the child (servlet-specific) contexts by usi
 
 When deploying multiple web applications within the same container, ensure that each
 web application loads the types in `spring-aspects.jar` by using its own classloader
-(for example, by placing `spring-aspects.jar` in `'WEB-INF/lib'`). If `spring-aspects.jar`
+(for example, by placing `spring-aspects.jar` in `WEB-INF/lib`). If `spring-aspects.jar`
 is added only to the container-wide classpath (and hence loaded by the shared parent
 classloader), all web applications share the same aspect instance (which is probably
 not what you want).

From 7f65e17ff2e728a2b1848da8db894f35fb09434f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Jan 2022 17:32:36 +0100
Subject: [PATCH 610/735] Improve documentation for implementing AspectJ around
 advice

Closes gh-27980
---
 src/docs/asciidoc/core/core-aop.adoc | 111 +++++++++++++++++----------
 1 file changed, 71 insertions(+), 40 deletions(-)

diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc
index 7a539acff574..3901669e6075 100644
--- a/src/docs/asciidoc/core/core-aop.adoc
+++ b/src/docs/asciidoc/core/core-aop.adoc
@@ -1217,29 +1217,56 @@ The last kind of advice is _around_ advice. Around advice runs "around" a matche
 method's execution. It has the opportunity to do work both before and after the method
 runs and to determine when, how, and even if the method actually gets to run at all.
 Around advice is often used if you need to share state before and after a method
-execution in a thread-safe manner (starting and stopping a timer, for example).
-Always use the least powerful form of advice that meets your requirements (that is,
-do not use around advice if before advice would do).
-
-Around advice is declared by using the `@Around` annotation. The first parameter of the
-advice method must be of type `ProceedingJoinPoint`. Within the body of the advice,
-calling `proceed()` on the `ProceedingJoinPoint` causes the underlying method to run.
-The `proceed` method can also pass in an `Object[]`. The values in the array are used
-as the arguments to the method execution when it proceeds.
-
-NOTE: The behavior of `proceed` when called with an `Object[]` is a little different than
-the behavior of `proceed` for around advice compiled by the AspectJ compiler. For around
+execution in a thread-safe manner – for example, starting and stopping a timer.
+
+[TIP]
+====
+Always use the least powerful form of advice that meets your requirements.
+
+For example, do not use _around_ advice if _before_ advice is sufficient for your needs.
+====
+
+Around advice is declared by annotating a method with the `@Around` annotation. The
+method should declare `Object` as its return type, and the first parameter of the method
+must be of type `ProceedingJoinPoint`. Within the body of the advice method, you must
+invoke `proceed()` on the `ProceedingJoinPoint` in order for the underlying method to
+run. Invoking `proceed()` without arguments will result in the caller's original
+arguments being supplied to the underlying method when it is invoked. For advanced use
+cases, there is an overloaded variant of the `proceed()` method which accepts an array of
+arguments (`Object[]`). The values in the array will be used as the arguments to the
+underlying method when it is invoked.
+
+[NOTE]
+====
+The behavior of `proceed` when called with an `Object[]` is a little different than the
+behavior of `proceed` for around advice compiled by the AspectJ compiler. For around
 advice written using the traditional AspectJ language, the number of arguments passed to
 `proceed` must match the number of arguments passed to the around advice (not the number
 of arguments taken by the underlying join point), and the value passed to proceed in a
-given argument position supplants the original value at the join point for the entity
-the value was bound to (do not worry if this does not make sense right now). The approach
-taken by Spring is simpler and a better match to its proxy-based, execution-only
-semantics. You only need to be aware of this difference if you compile @AspectJ
-aspects written for Spring and use `proceed` with arguments with the AspectJ compiler
-and weaver. There is a way to write such aspects that is 100% compatible across both
-Spring AOP and AspectJ, and this is discussed in the
-<<aop-ataspectj-advice-params, following section on advice parameters>>.
+given argument position supplants the original value at the join point for the entity the
+value was bound to (do not worry if this does not make sense right now).
+
+The approach taken by Spring is simpler and a better match to its proxy-based,
+execution-only semantics. You only need to be aware of this difference if you compile
+`@AspectJ` aspects written for Spring and use `proceed` with arguments with the AspectJ
+compiler and weaver. There is a way to write such aspects that is 100% compatible across
+both Spring AOP and AspectJ, and this is discussed in the
+<<aop-ataspectj-advice-proceeding-with-the-call, following section on advice parameters>>.
+====
+
+The value returned by the around advice is the return value seen by the caller of the
+method. For example, a simple caching aspect could return a value from a cache if it has
+one or invoke `proceed()` (and return that value) if it does not. Note that `proceed`
+may be invoked once, many times, or not at all within the body of the around advice. All
+of these are legal.
+
+WARNING: If you declare the return type of your around advice method as `void`, `null`
+will always be returned to the caller, effectively ignoring the result of any invocation
+of `proceed()`. It is therefore recommended that an around advice method declare a return
+type of `Object`. The advice method should typically return the value returned from an
+invocation of `proceed()`, even if the underlying method has a `void` return type.
+However, the advice may optionally return a cached value, a wrapped value, or some other
+value depending on the use case.
 
 The following example shows how to use around advice:
 
@@ -1282,12 +1309,6 @@ The following example shows how to use around advice:
 	}
 ----
 
-The value returned by the around advice is the return value seen by the caller of the
-method. For example, a simple caching aspect could return a value from a cache if it
-has one and invoke `proceed()` if it does not. Note that `proceed` may be invoked once,
-many times, or not at all within the body of the around advice. All of these are legal.
-
-
 [[aop-ataspectj-advice-params]]
 ==== Advice Parameters
 
@@ -2315,20 +2336,30 @@ You can declare it by using the `after` element, as the following example shows:
 [[aop-schema-advice-around]]
 ==== Around Advice
 
-The last kind of advice is around advice. Around advice runs "around" a matched method
-execution. It has the opportunity to do work both before and after the method runs
-and to determine when, how, and even if the method actually gets to run at all.
-Around advice is often used to share state before and after a method execution in a
-thread-safe manner (starting and stopping a timer, for example). Always use the least
-powerful form of advice that meets your requirements. Do not use around advice if
-before advice can do the job.
-
-You can declare around advice by using the `aop:around` element. The first parameter of
-the advice method must be of type `ProceedingJoinPoint`. Within the body of the advice,
-calling `proceed()` on the `ProceedingJoinPoint` causes the underlying method to run.
-The `proceed` method may also be called with an `Object[]`. The values in the array
-are used as the arguments to the method execution when it proceeds.
-See <<aop-ataspectj-around-advice>> for notes on calling `proceed` with an `Object[]`.
+The last kind of advice is _around_ advice. Around advice runs "around" a matched
+method's execution. It has the opportunity to do work both before and after the method
+runs and to determine when, how, and even if the method actually gets to run at all.
+Around advice is often used if you need to share state before and after a method
+execution in a thread-safe manner – for example, starting and stopping a timer.
+
+[TIP]
+====
+Always use the least powerful form of advice that meets your requirements.
+
+For example, do not use _around_ advice if _before_ advice is sufficient for your needs.
+====
+
+You can declare around advice by using the `aop:around` element. The advice method should
+declare `Object` as its return type, and the first parameter of the method must be of
+type `ProceedingJoinPoint`. Within the body of the advice method, you must invoke
+`proceed()` on the `ProceedingJoinPoint` in order for the underlying method to run.
+Invoking `proceed()` without arguments will result in the caller's original arguments
+being supplied to the underlying method when it is invoked. For advanced use cases, there
+is an overloaded variant of the `proceed()` method which accepts an array of arguments
+(`Object[]`). The values in the array will be used as the arguments to the underlying
+method when it is invoked. See <<aop-ataspectj-around-advice>> for notes on calling
+`proceed` with an `Object[]`.
+
 The following example shows how to declare around advice in XML:
 
 [source,xml,indent=0,subs="verbatim,quotes"]

From bd6d697395efceab68521e598964dca78995a60d Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 27 Jan 2022 09:52:25 +0100
Subject: [PATCH 611/735] Upgrade Java versions in CI image

---
 ci/images/get-jdk-url.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index e170d55171c3..530866224d1a 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -3,10 +3,10 @@ set -e
 
 case "$1" in
 	java8)
-		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz"
+		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
+		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz"
 	;;
   java16)
 		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"

From e32f94bf8cbf5280d04434b0c5777fba73ab3e18 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Jan 2022 20:21:13 +0100
Subject: [PATCH 612/735] Polish GenericWebApplicationContext and
 AnnotationConfigWebApplicationContext

---
 ...AnnotationConfigWebApplicationContext.java |  9 +--
 .../support/GenericWebApplicationContext.java | 55 ++++++++++---------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
index 5de3b4352b2e..635a2c76c2c0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,12 +36,13 @@
 /**
  * {@link org.springframework.web.context.WebApplicationContext WebApplicationContext}
  * implementation which accepts <em>component classes</em> as input &mdash; in particular
- * {@link org.springframework.context.annotation.Configuration @Configuration}-annotated
+ * {@link org.springframework.context.annotation.Configuration @Configuration}
  * classes, but also plain {@link org.springframework.stereotype.Component @Component}
- * classes and JSR-330 compliant classes using {@code javax.inject} annotations.
+ * classes as well as JSR-330 compliant classes using {@code javax.inject} annotations.
  *
  * <p>Allows for registering classes one by one (specifying class names as config
- * location) as well as for classpath scanning (specifying base packages as config location).
+ * locations) as well as via classpath scanning (specifying base packages as config
+ * locations).
  *
  * <p>This is essentially the equivalent of
  * {@link org.springframework.context.annotation.AnnotationConfigApplicationContext
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
index c8a39cb2908b..eb28a675e7a0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -39,23 +39,24 @@
 /**
  * Subclass of {@link GenericApplicationContext}, suitable for web environments.
  *
- * <p>Implements {@link org.springframework.web.context.ConfigurableWebApplicationContext},
- * but is not intended for declarative setup in {@code web.xml}. Instead, it is designed
- * for programmatic setup, for example for building nested contexts or for use within
+ * <p>Implements {@link ConfigurableWebApplicationContext}, but is not intended for
+ * declarative setup in {@code web.xml}. Instead, it is designed for programmatic setup,
+ * for example for building nested contexts or for use within
  * {@link org.springframework.web.WebApplicationInitializer WebApplicationInitializers}.
  *
- * <p><b>If you intend to implement a WebApplicationContext that reads bean definitions
- * from configuration files, consider deriving from AbstractRefreshableWebApplicationContext,
- * reading the bean definitions in an implementation of the {@code loadBeanDefinitions}
- * method.</b>
- *
  * <p>Interprets resource paths as servlet context resources, i.e. as paths beneath
- * the web application root. Absolute paths, e.g. for files outside the web app root,
- * can be accessed via "file:" URLs, as implemented by AbstractApplicationContext.
+ * the web application root. Absolute paths &mdash; for example, for files outside
+ * the web app root &mdash; can be accessed via {@code file:} URLs, as implemented
+ * by {@code AbstractApplicationContext}.
  *
  * <p>In addition to the special beans detected by
- * {@link org.springframework.context.support.AbstractApplicationContext},
- * this class detects a ThemeSource bean in the context, with the name "themeSource".
+ * {@link org.springframework.context.support.AbstractApplicationContext AbstractApplicationContext},
+ * this class detects a {@link ThemeSource} bean in the context, with the name "themeSource".
+ *
+ * <p>If you intend to implement a {@code WebApplicationContext} that reads bean definitions
+ * from configuration files, consider deriving from {@link AbstractRefreshableWebApplicationContext},
+ * reading the bean definitions in an implementation of the {@code loadBeanDefinitions}
+ * method.
  *
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -72,7 +73,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext
 
 
 	/**
-	 * Create a new GenericWebApplicationContext.
+	 * Create a new {@code GenericWebApplicationContext}.
 	 * @see #setServletContext
 	 * @see #registerBeanDefinition
 	 * @see #refresh
@@ -82,8 +83,8 @@ public GenericWebApplicationContext() {
 	}
 
 	/**
-	 * Create a new GenericWebApplicationContext for the given ServletContext.
-	 * @param servletContext the ServletContext to run in
+	 * Create a new {@code GenericWebApplicationContext} for the given {@link ServletContext}.
+	 * @param servletContext the {@code ServletContext} to run in
 	 * @see #registerBeanDefinition
 	 * @see #refresh
 	 */
@@ -92,8 +93,8 @@ public GenericWebApplicationContext(ServletContext servletContext) {
 	}
 
 	/**
-	 * Create a new GenericWebApplicationContext with the given DefaultListableBeanFactory.
-	 * @param beanFactory the DefaultListableBeanFactory instance to use for this context
+	 * Create a new {@code GenericWebApplicationContext} with the given {@link DefaultListableBeanFactory}.
+	 * @param beanFactory the {@code DefaultListableBeanFactory} instance to use for this context
 	 * @see #setServletContext
 	 * @see #registerBeanDefinition
 	 * @see #refresh
@@ -103,9 +104,10 @@ public GenericWebApplicationContext(DefaultListableBeanFactory beanFactory) {
 	}
 
 	/**
-	 * Create a new GenericWebApplicationContext with the given DefaultListableBeanFactory.
-	 * @param beanFactory the DefaultListableBeanFactory instance to use for this context
-	 * @param servletContext the ServletContext to run in
+	 * Create a new {@code GenericWebApplicationContext} with the given {@link DefaultListableBeanFactory}
+	 * and {@link ServletContext}.
+	 * @param beanFactory the {@code DefaultListableBeanFactory} instance to use for this context
+	 * @param servletContext the {@code ServletContext} to run in
 	 * @see #registerBeanDefinition
 	 * @see #refresh
 	 */
@@ -116,7 +118,7 @@ public GenericWebApplicationContext(DefaultListableBeanFactory beanFactory, Serv
 
 
 	/**
-	 * Set the ServletContext that this WebApplicationContext runs in.
+	 * Set the {@link ServletContext} that this {@code WebApplicationContext} runs in.
 	 */
 	@Override
 	public void setServletContext(@Nullable ServletContext servletContext) {
@@ -143,8 +145,7 @@ protected ConfigurableEnvironment createEnvironment() {
 	}
 
 	/**
-	 * Register ServletContextAwareProcessor.
-	 * @see ServletContextAwareProcessor
+	 * Register request/session scopes, environment beans, a {@link ServletContextAwareProcessor}, etc.
 	 */
 	@Override
 	protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
@@ -157,7 +158,7 @@ protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactor
 	}
 
 	/**
-	 * This implementation supports file paths beneath the root of the ServletContext.
+	 * This implementation supports file paths beneath the root of the {@link ServletContext}.
 	 * @see ServletContextResource
 	 */
 	@Override
@@ -236,7 +237,7 @@ public void setConfigLocation(String configLocation) {
 		if (StringUtils.hasText(configLocation)) {
 			throw new UnsupportedOperationException(
 					"GenericWebApplicationContext does not support setConfigLocation(). " +
-					"Do you still have an 'contextConfigLocations' init-param set?");
+					"Do you still have a 'contextConfigLocation' init-param set?");
 		}
 	}
 
@@ -245,7 +246,7 @@ public void setConfigLocations(String... configLocations) {
 		if (!ObjectUtils.isEmpty(configLocations)) {
 			throw new UnsupportedOperationException(
 					"GenericWebApplicationContext does not support setConfigLocations(). " +
-					"Do you still have an 'contextConfigLocations' init-param set?");
+					"Do you still have a 'contextConfigLocations' init-param set?");
 		}
 	}
 

From 6647023151771e6baa59e7fa923d24a009fcbb33 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 27 Jan 2022 15:47:21 +0100
Subject: [PATCH 613/735] Document how to register annotated classes in a
 GenericWebApplicationContext

Closes gh-27778
---
 .../AnnotationConfigWebApplicationContext.java    | 14 +++++++++++++-
 .../support/GenericWebApplicationContext.java     | 15 +++++++++++++++
 src/docs/asciidoc/core/core-beans.adoc            |  4 ++++
 src/docs/asciidoc/web/webmvc.adoc                 |  5 +++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
index 635a2c76c2c0..97253608dfca 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
@@ -46,7 +46,17 @@
  *
  * <p>This is essentially the equivalent of
  * {@link org.springframework.context.annotation.AnnotationConfigApplicationContext
- * AnnotationConfigApplicationContext} for a web environment.
+ * AnnotationConfigApplicationContext} for a web environment. However, in contrast to
+ * {@code AnnotationConfigApplicationContext}, this class does not extend
+ * {@link org.springframework.context.support.GenericApplicationContext
+ * GenericApplicationContext} and therefore does not provide some of the convenient
+ * {@code registerBean(...)} methods available in a {@code GenericApplicationContext}.
+ * If you wish to register annotated <em>component classes</em> with a
+ * {@code GenericApplicationContext} in a web environment, you may use a
+ * {@code GenericWebApplicationContext} with an
+ * {@link org.springframework.context.annotation.AnnotatedBeanDefinitionReader
+ * AnnotatedBeanDefinitionReader}. See the Javadoc for {@link GenericWebApplicationContext}
+ * for details and an example.
  *
  * <p>To make use of this application context, the
  * {@linkplain ContextLoader#CONTEXT_CLASS_PARAM "contextClass"} context-param for
@@ -81,8 +91,10 @@
  *
  * @author Chris Beams
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.0
  * @see org.springframework.context.annotation.AnnotationConfigApplicationContext
+ * @see org.springframework.web.context.support.GenericWebApplicationContext
  */
 public class AnnotationConfigWebApplicationContext extends AbstractRefreshableWebApplicationContext
 		implements AnnotationConfigRegistry {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
index eb28a675e7a0..fed8f1d01c9c 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
@@ -53,6 +53,20 @@
  * {@link org.springframework.context.support.AbstractApplicationContext AbstractApplicationContext},
  * this class detects a {@link ThemeSource} bean in the context, with the name "themeSource".
  *
+ * <p>If you wish to register annotated <em>component classes</em> with a
+ * {@code GenericWebApplicationContext}, you can use an
+ * {@link org.springframework.context.annotation.AnnotatedBeanDefinitionReader
+ * AnnotatedBeanDefinitionReader}, as demonstrated in the following example.
+ * Component classes include in particular
+ * {@link org.springframework.context.annotation.Configuration @Configuration}
+ * classes but also plain {@link org.springframework.stereotype.Component @Component}
+ * classes as well as JSR-330 compliant classes using {@code javax.inject} annotations.
+ *
+ * <pre class="code">
+ * GenericWebApplicationContext context = new GenericWebApplicationContext();
+ * AnnotatedBeanDefinitionReader reader = new AnnotatedBeanDefinitionReader(context);
+ * reader.register(AppConfig.class, UserController.class, UserRepository.class);</pre>
+ *
  * <p>If you intend to implement a {@code WebApplicationContext} that reads bean definitions
  * from configuration files, consider deriving from {@link AbstractRefreshableWebApplicationContext},
  * reading the bean definitions in an implementation of the {@code loadBeanDefinitions}
@@ -60,6 +74,7 @@
  *
  * @author Juergen Hoeller
  * @author Chris Beams
+ * @author Sam Brannen
  * @since 1.2
  */
 public class GenericWebApplicationContext extends GenericApplicationContext
diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 72138867377e..95881a0d2cc9 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -7900,6 +7900,10 @@ init-param):
 	</web-app>
 ----
 
+NOTE: For programmatic use cases, a `GenericWebApplicationContext` can be used as an
+alternative to `AnnotationConfigWebApplicationContext`. See the
+{api-spring-framework}/web/context/support/GenericWebApplicationContext.html[`GenericWebApplicationContext`]
+javadoc for details.
 
 
 [[beans-java-bean-annotation]]
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 33b49bef56a5..7bca08dd9d2c 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -84,6 +84,11 @@ NOTE: In addition to using the ServletContext API directly, you can also extend
 `AbstractAnnotationConfigDispatcherServletInitializer` and override specific methods
 (see the example under <<mvc-servlet-context-hierarchy>>).
 
+NOTE: For programmatic use cases, a `GenericWebApplicationContext` can be used as an
+alternative to `AnnotationConfigWebApplicationContext`. See the
+{api-spring-framework}/web/context/support/GenericWebApplicationContext.html[`GenericWebApplicationContext`]
+javadoc for details.
+
 The following example of `web.xml` configuration registers and initializes the `DispatcherServlet`:
 
 [source,xml,indent=0,subs="verbatim,quotes"]

From caa13690e8a7d726808e43394e92e000cc3b60d6 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Fri, 28 Jan 2022 13:41:51 +0100
Subject: [PATCH 614/735] Support multiple boundary buffers in MultipartParser

In a small minority of cases, the multipart boundary can spread across
three incoming buffers.

Prior to this commit, MultipartParser.BodyState only supported two
buffers. If the boundary is spread across three buffers, the first
buffer of the three is sent as a whole, even though it contains the
first bytes of the boundary.

This commit fixes this bug, by enqueuing all prior buffers in a queue,
and emitting the ones that cannot contain boundary bytes.

Closes gh-27939
---
 .../http/codec/multipart/MultipartParser.java | 91 +++++++++++++------
 .../annotation/MultipartIntegrationTests.java |  3 +-
 2 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
index d797b99f4b1b..ff1344424aa6 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
@@ -17,8 +17,12 @@
 package org.springframework.http.codec.multipart;
 
 import java.nio.charset.Charset;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
+import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -477,11 +481,14 @@ private final class BodyState implements State {
 
 		private final DataBufferUtils.Matcher boundary;
 
-		private final AtomicReference<DataBuffer> previous = new AtomicReference<>();
+		private final int boundaryLength;
+
+		private final Deque<DataBuffer> queue = new ConcurrentLinkedDeque<>();
 
 		public BodyState() {
-			this.boundary = DataBufferUtils.matcher(
-					MultipartUtils.concat(CR_LF, TWO_HYPHENS, MultipartParser.this.boundary));
+			byte[] delimiter = MultipartUtils.concat(CR_LF, TWO_HYPHENS, MultipartParser.this.boundary);
+			this.boundary = DataBufferUtils.matcher(delimiter);
+			this.boundaryLength = delimiter.length;
 		}
 
 		/**
@@ -499,31 +506,38 @@ public void onNext(DataBuffer buffer) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("Boundary found @" + endIdx + " in " + buffer);
 				}
-				int len = endIdx - buffer.readPosition() - this.boundary.delimiter().length + 1;
+				int len = endIdx - buffer.readPosition() - this.boundaryLength + 1;
 				if (len > 0) {
-					// buffer contains complete delimiter, let's slice it and flush it
+					// whole boundary in buffer.
+					// slice off the body part, and flush
 					DataBuffer body = buffer.retainedSlice(buffer.readPosition(), len);
 					enqueue(body);
-					enqueue(null);
+					flush();
 				}
 				else if (len < 0) {
-					// buffer starts with the end of the delimiter, let's slice the previous buffer and flush it
-					DataBuffer previous = this.previous.get();
-					int prevLen = previous.readableByteCount() + len;
-					if (prevLen > 0) {
-						DataBuffer body = previous.retainedSlice(previous.readPosition(), prevLen);
-						DataBufferUtils.release(previous);
-						this.previous.set(body);
-						enqueue(null);
-					}
-					else {
-						DataBufferUtils.release(previous);
-						this.previous.set(null);
+					// boundary spans multiple buffers, and we've just found the end
+					// iterate over buffers in reverse order
+					DataBuffer prev;
+					while ((prev = this.queue.pollLast()) != null) {
+						int prevLen = prev.readableByteCount() + len;
+						if (prevLen > 0) {
+							// slice body part of previous buffer, and flush it
+							DataBuffer body = prev.retainedSlice(prev.readPosition(), prevLen);
+							DataBufferUtils.release(prev);
+							enqueue(body);
+							flush();
+							break;
+						}
+						else {
+							// previous buffer only contains boundary bytes
+							DataBufferUtils.release(prev);
+							len += prev.readableByteCount();
+						}
 					}
 				}
-				else /* if (sliceLength == 0) */ {
-					// buffer starts with complete delimiter, flush out the previous buffer
-					enqueue(null);
+				else /* if (len == 0) */ {
+					// buffer starts with complete delimiter, flush out the previous buffers
+					flush();
 				}
 
 				DataBuffer remainder = MultipartUtils.sliceFrom(buffer, endIdx);
@@ -538,13 +552,32 @@ else if (len < 0) {
 		}
 
 		/**
-		 * Stores the given buffer and sends out the previous buffer.
+		 * Store the given buffer. Emit buffers that cannot contain boundary bytes,
+		 * by iterating over the queue in reverse order, and summing buffer sizes.
+		 * The first buffer that passes the boundary length and subsequent buffers
+		 * are emitted (in the correct, non-reverse order).
 		 */
-		private void enqueue(@Nullable DataBuffer buf) {
-			DataBuffer previous = this.previous.getAndSet(buf);
-			if (previous != null) {
-				emitBody(previous);
+		private void enqueue(DataBuffer buf) {
+			this.queue.add(buf);
+
+			int len = 0;
+			Deque<DataBuffer> emit = new ArrayDeque<>();
+			for (Iterator<DataBuffer> iterator = this.queue.descendingIterator(); iterator.hasNext(); ) {
+				DataBuffer previous = iterator.next();
+				if (len > this.boundaryLength) {
+					// addFirst to negate iterating in reverse order
+					emit.addFirst(previous);
+					iterator.remove();
+				}
+				len += previous.readableByteCount();
 			}
+
+			emit.forEach(MultipartParser.this::emitBody);
+		}
+
+		private void flush() {
+			this.queue.forEach(MultipartParser.this::emitBody);
+			this.queue.clear();
 		}
 
 		@Override
@@ -556,10 +589,8 @@ public void onComplete() {
 
 		@Override
 		public void dispose() {
-			DataBuffer previous = this.previous.getAndSet(null);
-			if (previous != null) {
-				DataBufferUtils.release(previous);
-			}
+			this.queue.forEach(DataBufferUtils::release);
+			this.queue.clear();
 		}
 
 		@Override
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java
index 98da50cd66fd..b60587452ac1 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java
@@ -211,10 +211,9 @@ private MultiValueMap<String, HttpEntity<?>> generateBody() {
 
 	private static void verifyContents(Path tempFile, Resource resource) {
 		try {
-			byte[] tempBytes = Files.readAllBytes(tempFile);
 			// Use FileCopyUtils since the resource might reside in a JAR instead of in the file system.
 			byte[] resourceBytes = FileCopyUtils.copyToByteArray(resource.getInputStream());
-			assertThat(tempBytes).isEqualTo(resourceBytes);
+			assertThat(tempFile).hasBinaryContent(resourceBytes);
 		}
 		catch (IOException ex) {
 			throw new AssertionError(ex);

From fadfcf4e43725f4ce5180618a88c21010d55055a Mon Sep 17 00:00:00 2001
From: wkwkhautbois <kuwahautbois@gmail.com>
Date: Fri, 28 Jan 2022 23:06:32 +0900
Subject: [PATCH 615/735] Fix ServletUriComponentsBuilder examples in ref docs

Closes gh-27984
---
 src/docs/asciidoc/web/webmvc.adoc | 46 +++++++++++++++++--------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 7bca08dd9d2c..52e6d0db4d4f 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -4109,10 +4109,9 @@ as the following example shows:
 
 	// Re-uses host, scheme, port, path and query string...
 
-	ServletUriComponentsBuilder ucb = ServletUriComponentsBuilder.fromRequest(request)
-			.replaceQueryParam("accountId", "{id}").build()
-			.expand("123")
-			.encode();
+	URI uri = ServletUriComponentsBuilder.fromRequest(request)
+			.replaceQueryParam("accountId", "{id}")
+			.build("123");
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
@@ -4121,10 +4120,9 @@ as the following example shows:
 
 	// Re-uses host, scheme, port, path and query string...
 
-	val ucb = ServletUriComponentsBuilder.fromRequest(request)
-			.replaceQueryParam("accountId", "{id}").build()
-			.expand("123")
-			.encode()
+	val uri = ServletUriComponentsBuilder.fromRequest(request)
+			.replaceQueryParam("accountId", "{id}")
+			.build("123")
 ----
 
 You can create URIs relative to the context path, as the following example shows:
@@ -4132,18 +4130,22 @@ You can create URIs relative to the context path, as the following example shows
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	// Re-uses host, port and context path...
+	// Re-uses host, port, scheme and context path...
 
-	ServletUriComponentsBuilder ucb = ServletUriComponentsBuilder.fromContextPath(request)
-			.path("/accounts").build()
+	URI uri = ServletUriComponentsBuilder.fromContextPath(request)
+			.path("/accounts")
+			.build()
+			.toUri();
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	// Re-uses host, port and context path...
+	// Re-uses host, port, scheme and context path...
 
-	val ucb = ServletUriComponentsBuilder.fromContextPath(request)
-			.path("/accounts").build()
+	val uri = ServletUriComponentsBuilder.fromContextPath(request)
+			.path("/accounts")
+			.build()
+			.toUri()
 ----
 
 You can create URIs relative to a Servlet (for example, `/main/{asterisk}`),
@@ -4152,18 +4154,22 @@ as the following example shows:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	// Re-uses host, port, context path, and Servlet prefix...
+	// Re-uses host, port, scheme, context path, and Servlet prefix...
 
-	ServletUriComponentsBuilder ucb = ServletUriComponentsBuilder.fromServletMapping(request)
-			.path("/accounts").build()
+	URI uri = ServletUriComponentsBuilder.fromServletMapping(request)
+			.path("/accounts")
+			.build()
+			.toUri();
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	// Re-uses host, port, context path, and Servlet prefix...
+	// Re-uses host, port, scheme, context path, and Servlet prefix...
 
-	val ucb = ServletUriComponentsBuilder.fromServletMapping(request)
-			.path("/accounts").build()
+	val uri = ServletUriComponentsBuilder.fromServletMapping(request)
+			.path("/accounts")
+			.build()
+			.toUri()
 ----
 
 NOTE: As of 5.1, `ServletUriComponentsBuilder` ignores information from the `Forwarded` and

From 0e670b1c1546522b8f158bff6d1092b1b8035ea2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 28 Jan 2022 16:15:21 +0100
Subject: [PATCH 616/735] Polish contribution

See gh-27984
---
 src/docs/asciidoc/web/webmvc.adoc | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 52e6d0db4d4f..b34860566c99 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -4107,7 +4107,7 @@ as the following example shows:
 ----
 	HttpServletRequest request = ...
 
-	// Re-uses host, scheme, port, path and query string...
+	// Re-uses scheme, host, port, path, and query string...
 
 	URI uri = ServletUriComponentsBuilder.fromRequest(request)
 			.replaceQueryParam("accountId", "{id}")
@@ -4118,7 +4118,7 @@ as the following example shows:
 ----
 	val request: HttpServletRequest = ...
 
-	// Re-uses host, scheme, port, path and query string...
+	// Re-uses scheme, host, port, path, and query string...
 
 	val uri = ServletUriComponentsBuilder.fromRequest(request)
 			.replaceQueryParam("accountId", "{id}")
@@ -4130,7 +4130,9 @@ You can create URIs relative to the context path, as the following example shows
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	// Re-uses host, port, scheme and context path...
+	HttpServletRequest request = ...
+
+	// Re-uses scheme, host, port, and context path...
 
 	URI uri = ServletUriComponentsBuilder.fromContextPath(request)
 			.path("/accounts")
@@ -4140,7 +4142,9 @@ You can create URIs relative to the context path, as the following example shows
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	// Re-uses host, port, scheme and context path...
+	val request: HttpServletRequest = ...
+
+	// Re-uses scheme, host, port, and context path...
 
 	val uri = ServletUriComponentsBuilder.fromContextPath(request)
 			.path("/accounts")
@@ -4154,7 +4158,9 @@ as the following example shows:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-	// Re-uses host, port, scheme, context path, and Servlet prefix...
+	HttpServletRequest request = ...
+
+	// Re-uses scheme, host, port, context path, and Servlet mapping prefix...
 
 	URI uri = ServletUriComponentsBuilder.fromServletMapping(request)
 			.path("/accounts")
@@ -4164,7 +4170,9 @@ as the following example shows:
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	// Re-uses host, port, scheme, context path, and Servlet prefix...
+	val request: HttpServletRequest = ...
+
+	// Re-uses scheme, host, port, context path, and Servlet mapping prefix...
 
 	val uri = ServletUriComponentsBuilder.fromServletMapping(request)
 			.path("/accounts")

From fb312d0ed5d55752df5755be29833023e5a21258 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 28 Jan 2022 16:40:35 +0100
Subject: [PATCH 617/735] Improve Javadoc for DatabasePopulator

See gh-27008
---
 .../jdbc/datasource/init/DatabasePopulator.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
index 45262b8025ba..70e0083fb3f9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2022 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,15 +35,17 @@ public interface DatabasePopulator {
 	/**
 	 * Populate, initialize, or clean up the database using the provided JDBC
 	 * connection.
+	 * <p><strong>Warning</strong>: Concrete implementations should not close
+	 * the provided {@link Connection}.
 	 * <p>Concrete implementations <em>may</em> throw an {@link SQLException} if
 	 * an error is encountered but are <em>strongly encouraged</em> to throw a
 	 * specific {@link ScriptException} instead. For example, Spring's
 	 * {@link ResourceDatabasePopulator} and {@link DatabasePopulatorUtils} wrap
 	 * all {@code SQLExceptions} in {@code ScriptExceptions}.
-	 * @param connection the JDBC connection to use to populate the db; already
-	 * configured and ready to use; never {@code null}
+	 * @param connection the JDBC connection to use; already configured and
+	 * ready to use; never {@code null}
 	 * @throws SQLException if an unrecoverable data access exception occurs
-	 * during database population
+	 * while interacting with the database
 	 * @throws ScriptException in all other error cases
 	 * @see DatabasePopulatorUtils#execute
 	 */

From ed2696287aca5e3772d0def087ca6d4719fc73d4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 28 Jan 2022 16:55:05 +0100
Subject: [PATCH 618/735] Stop applying Groovy plugin for the root Gradle
 project

The root project does not rely on the Groovy plugin.

See gh-27945
---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 294612c27601..9b3dc6cdc10b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -363,7 +363,6 @@ configure(moduleProjects) { project ->
 configure(rootProject) {
 	description = "Spring Framework"
 
-	apply plugin: "groovy"
 	apply plugin: "kotlin"
 	apply plugin: "io.spring.nohttp"
 	apply plugin: 'org.springframework.build.api-diff'

From dbeae27d3ca70eabd617538a09f4ac952f19126b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 29 Jan 2022 12:41:39 +0100
Subject: [PATCH 619/735] Reduce build time by reducing shutdown wait period
 for Jetty tests

---
 .../server/reactive/bootstrap/JettyHttpServer.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java
index 93f828bc3ddf..c5e3b3127b48 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 
 /**
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  */
 public class JettyHttpServer extends AbstractHttpServer {
 
@@ -73,7 +74,10 @@ protected void stopInternal() throws Exception {
 		finally {
 			try {
 				if (this.jettyServer.isRunning()) {
-					this.jettyServer.setStopTimeout(5000);
+					// Do not configure a large stop timeout. For example, setting a stop timeout
+					// of 5000 adds an additional 1-2 seconds to the runtime of each test using
+					// the Jetty sever, resulting in 2-4 extra minutes of overall build time.
+					this.jettyServer.setStopTimeout(100);
 					this.jettyServer.stop();
 					this.jettyServer.destroy();
 				}
@@ -88,7 +92,10 @@ protected void stopInternal() throws Exception {
 	protected void resetInternal() {
 		try {
 			if (this.jettyServer.isRunning()) {
-				this.jettyServer.setStopTimeout(5000);
+				// Do not configure a large stop timeout. For example, setting a stop timeout
+				// of 5000 adds an additional 1-2 seconds to the runtime of each test using
+				// the Jetty sever, resulting in 2-4 extra minutes of overall build time.
+				this.jettyServer.setStopTimeout(100);
 				this.jettyServer.stop();
 				this.jettyServer.destroy();
 			}

From e3529453d1682257162fdfeaa0e3f0c12008a67e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 29 Jan 2022 17:29:31 +0100
Subject: [PATCH 620/735] Remove dependency management for groovy-test

groovy-test is no longer used in the build.

See gh-27945
---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9b3dc6cdc10b..3f1c37500b33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,7 +60,6 @@ configure(allprojects) { project ->
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
-				entry 'groovy-test'
 				entry 'groovy-xml'
 			}
 

From 7072aab53b765ccd57898bc54eec0f293fb4a700 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 29 Jan 2022 17:51:13 +0100
Subject: [PATCH 621/735] Improve log message when searching for default
 executor for async processing

Closes gh-27983
---
 .../aop/interceptor/AsyncExecutionAspectSupport.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
index 8908cab491d2..a559a9f765fa 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -233,7 +233,8 @@ protected Executor getDefaultExecutor(@Nullable BeanFactory beanFactory) {
 				return beanFactory.getBean(TaskExecutor.class);
 			}
 			catch (NoUniqueBeanDefinitionException ex) {
-				logger.debug("Could not find unique TaskExecutor bean", ex);
+				logger.debug("Could not find unique TaskExecutor bean. " +
+						"Continuing search for an Executor bean named 'taskExecutor'", ex);
 				try {
 					return beanFactory.getBean(DEFAULT_TASK_EXECUTOR_BEAN_NAME, Executor.class);
 				}
@@ -246,7 +247,8 @@ protected Executor getDefaultExecutor(@Nullable BeanFactory beanFactory) {
 				}
 			}
 			catch (NoSuchBeanDefinitionException ex) {
-				logger.debug("Could not find default TaskExecutor bean", ex);
+				logger.debug("Could not find default TaskExecutor bean. " +
+						"Continuing search for an Executor bean named 'taskExecutor'", ex);
 				try {
 					return beanFactory.getBean(DEFAULT_TASK_EXECUTOR_BEAN_NAME, Executor.class);
 				}

From a749a6bf54ad4b715bd99144acf75c40817797a5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 28 Jan 2022 16:55:05 +0100
Subject: [PATCH 622/735] Stop applying Groovy plugin for the root Gradle
 project

The root project does not rely on the Groovy plugin.

See gh-27945
---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 993049364999..f9068aaac302 100644
--- a/build.gradle
+++ b/build.gradle
@@ -405,7 +405,6 @@ configure(moduleProjects) { project ->
 configure(rootProject) {
 	description = "Spring Framework"
 
-	apply plugin: "groovy"
 	apply plugin: "kotlin"
 	apply plugin: "io.spring.nohttp"
 	apply plugin: 'org.springframework.build.api-diff'

From 136bd2002e898d7692a8d4e9f5b0728128e53dca Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 31 Jan 2022 09:34:12 +0100
Subject: [PATCH 623/735] Upgrade to spring javaformat 0.0.30

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f9068aaac302..23f6a57a0126 100644
--- a/build.gradle
+++ b/build.gradle
@@ -362,7 +362,7 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.29")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.30")
 	}
 
 	ext.javadocLinks = [

From 8f9a1cdc0c2ab2bee112dddad00a94bb501a3181 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Tue, 1 Feb 2022 13:51:40 +0100
Subject: [PATCH 624/735] Consider current date in "1W" cron expressions

Prior to this commit, the QuartzCronField::weekdayNearestTo would elapse
until the next month before checking if the current day matched.

After this commit, the current day is checked before we elapse until
the next month.

Closes gh-27966
---
 .../scheduling/support/QuartzCronField.java   | 39 ++++++++++---------
 .../support/CronExpressionTests.java          | 25 ++++++++++--
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
index 0b72a273ab2c..36c70c088312 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/QuartzCronField.java
@@ -251,43 +251,46 @@ private static TemporalAdjuster lastDayWithOffset(int offset) {
 	private static TemporalAdjuster weekdayNearestTo(int dayOfMonth) {
 		return temporal -> {
 			int current = Type.DAY_OF_MONTH.get(temporal);
-			int dayOfWeek = temporal.get(ChronoField.DAY_OF_WEEK);
+			DayOfWeek dayOfWeek = DayOfWeek.from(temporal);
 
-			if ((current == dayOfMonth && dayOfWeek < 6) || // dayOfMonth is a weekday
-					(dayOfWeek == 5 && current == dayOfMonth - 1) || // dayOfMonth is a Saturday, so Friday before
-					(dayOfWeek == 1 && current == dayOfMonth + 1) || // dayOfMonth is a Sunday, so Monday after
-					(dayOfWeek == 1 && dayOfMonth == 1 && current == 3)) { // dayOfMonth is the 1st, so Monday 3rd
+			if ((current == dayOfMonth && isWeekday(dayOfWeek)) || // dayOfMonth is a weekday
+					(dayOfWeek == DayOfWeek.FRIDAY && current == dayOfMonth - 1) || // dayOfMonth is a Saturday, so Friday before
+					(dayOfWeek == DayOfWeek.MONDAY && current == dayOfMonth + 1) || // dayOfMonth is a Sunday, so Monday after
+					(dayOfWeek == DayOfWeek.MONDAY && dayOfMonth == 1 && current == 3)) { // dayOfMonth is Saturday 1st, so Monday 3rd
 				return temporal;
 			}
 			int count = 0;
 			while (count++ < CronExpression.MAX_ATTEMPTS) {
-				temporal = Type.DAY_OF_MONTH.elapseUntil(cast(temporal), dayOfMonth);
-				temporal = atMidnight().adjustInto(temporal);
-				current = Type.DAY_OF_MONTH.get(temporal);
 				if (current == dayOfMonth) {
-					dayOfWeek = temporal.get(ChronoField.DAY_OF_WEEK);
+					dayOfWeek = DayOfWeek.from(temporal);
 
-					if (dayOfWeek == 6) { // Saturday
+					if (dayOfWeek == DayOfWeek.SATURDAY) {
 						if (dayOfMonth != 1) {
-							return temporal.minus(1, ChronoUnit.DAYS);
+							temporal = temporal.minus(1, ChronoUnit.DAYS);
 						}
 						else {
-							// exception for "1W" fields: execute on nearest Monday
-							return temporal.plus(2, ChronoUnit.DAYS);
+							// exception for "1W" fields: execute on next Monday
+							temporal = temporal.plus(2, ChronoUnit.DAYS);
 						}
 					}
-					else if (dayOfWeek == 7) { // Sunday
-						return temporal.plus(1, ChronoUnit.DAYS);
-					}
-					else {
-						return temporal;
+					else if (dayOfWeek == DayOfWeek.SUNDAY) {
+						temporal = temporal.plus(1, ChronoUnit.DAYS);
 					}
+					return atMidnight().adjustInto(temporal);
+				}
+				else {
+					temporal = Type.DAY_OF_MONTH.elapseUntil(cast(temporal), dayOfMonth);
+					current = Type.DAY_OF_MONTH.get(temporal);
 				}
 			}
 			return null;
 		};
 	}
 
+	private static boolean isWeekday(DayOfWeek dayOfWeek) {
+		return dayOfWeek != DayOfWeek.SATURDAY && dayOfWeek != DayOfWeek.SUNDAY;
+	}
+
 	/**
 	 * Return a temporal adjuster that finds the last of the given doy-of-week
 	 * in a month.
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
index 3a21f984aa2d..5abce9e2de30 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
@@ -16,13 +16,13 @@
 
 package org.springframework.scheduling.support;
 
+import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.Year;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import java.time.temporal.ChronoField;
 import java.time.temporal.Temporal;
 
 import org.assertj.core.api.Condition;
@@ -30,6 +30,7 @@
 
 import static java.time.DayOfWeek.FRIDAY;
 import static java.time.DayOfWeek.MONDAY;
+import static java.time.DayOfWeek.SATURDAY;
 import static java.time.DayOfWeek.SUNDAY;
 import static java.time.DayOfWeek.THURSDAY;
 import static java.time.DayOfWeek.TUESDAY;
@@ -46,8 +47,8 @@ class CronExpressionTests {
 
 		@Override
 		public boolean matches(Temporal value) {
-			int dayOfWeek = value.get(ChronoField.DAY_OF_WEEK);
-			return dayOfWeek != 6 && dayOfWeek != 7;
+			DayOfWeek dayOfWeek = DayOfWeek.from(value);
+			return dayOfWeek != SATURDAY && dayOfWeek != SUNDAY;
 		}
 	};
 
@@ -958,6 +959,24 @@ void quartzWeekdayNearestTo1() {
 		assertThat(actual).isNotNull();
 		assertThat(actual).isEqualTo(expected);
 		assertThat(actual).is(weekday);
+
+		last = LocalDateTime.of(2022, 1, 1, 0, 0);
+		assertThat(last.getDayOfWeek()).isEqualTo(SATURDAY);
+		expected = LocalDateTime.of(2022, 1, 3, 0, 0);
+		assertThat(expected.getDayOfWeek()).isEqualTo(MONDAY);
+		actual = expression.next(last);
+		assertThat(actual).isNotNull();
+		assertThat(actual).isEqualTo(expected);
+		assertThat(actual).is(weekday);
+
+		last = LocalDateTime.of(2021, 8, 1, 0,0);
+		assertThat(last.getDayOfWeek()).isEqualTo(SUNDAY);
+		expected = LocalDateTime.of(2021, 8, 2, 0, 0);
+		assertThat(expected.getDayOfWeek()).isEqualTo(MONDAY);
+		actual = expression.next(last);
+		assertThat(actual).isNotNull();
+		assertThat(actual).isEqualTo(expected);
+		assertThat(actual).is(weekday);
 	}
 
 	@Test

From 4effca35b500fda26f1f7d8322bc622468e5e93a Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Mon, 31 Jan 2022 13:51:40 +0100
Subject: [PATCH 625/735] Ignore Content-Type that is invalid (not concrete)

Closes gh-27957
---
 .../http/server/ServletServerHttpRequest.java            | 6 ++++--
 .../http/server/ServletServerHttpRequestTests.java       | 9 ++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index b136e3fbcf2f..82f722310c3b 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -158,7 +158,9 @@ public HttpHeaders getHeaders() {
 					String requestContentType = this.servletRequest.getContentType();
 					if (StringUtils.hasLength(requestContentType)) {
 						contentType = MediaType.parseMediaType(requestContentType);
-						this.headers.setContentType(contentType);
+						if (contentType.isConcrete()) {
+							this.headers.setContentType(contentType);
+						}
 					}
 				}
 				if (contentType != null && contentType.getCharset() == null) {
diff --git a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
index de0779a4c3ce..6b24f916134d 100644
--- a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -151,6 +151,13 @@ void getHeadersWithEmptyContentTypeAndEncoding() {
 		assertThat(headers.getContentType()).isNull();
 	}
 
+	@Test // gh-27957
+	void getHeadersWithWildcardContentType() {
+		mockRequest.setContentType("*/*");
+		mockRequest.removeHeader("Content-Type");
+		assertThat(request.getHeaders()).as("Invalid content-type should not raise exception").hasSize(0);
+	}
+
 	@Test
 	void getBody() throws IOException {
 		byte[] content = "Hello World".getBytes(StandardCharsets.UTF_8);

From 8d5a6520ce033c38c57a9ec026102e17bd598acc Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 2 Feb 2022 15:32:21 +0000
Subject: [PATCH 626/735] Ensure all converters don't close InputStream

Closes gh-27969
---
 .../BufferedImageHttpMessageConverter.java         |  2 ++
 .../feed/AbstractWireFeedHttpMessageConverter.java |  7 +++++--
 .../json/AbstractJackson2HttpMessageConverter.java | 12 +++++++-----
 .../xml/AbstractXmlHttpMessageConverter.java       |  7 +++++--
 .../converter/xml/SourceHttpMessageConverter.java  |  4 ++--
 .../BufferedImageHttpMessageConverterTests.java    | 11 +++++++++--
 .../feed/AtomFeedHttpMessageConverterTests.java    | 11 ++++++++---
 .../feed/RssChannelHttpMessageConverterTests.java  | 11 ++++++++---
 .../json/GsonHttpMessageConverterTests.java        | 12 ++++++++++--
 .../json/JsonbHttpMessageConverterTests.java       | 12 ++++++++++--
 .../MappingJackson2HttpMessageConverterTests.java  |  9 +++++++--
 .../ProtobufHttpMessageConverterTests.java         |  9 ++++++++-
 ...rotobufJsonFormatHttpMessageConverterTests.java |  9 ++++++++-
 ...pingJackson2SmileHttpMessageConverterTests.java | 12 ++++++++++--
 .../Jaxb2CollectionHttpMessageConverterTests.java  | 12 ++++++++++--
 .../Jaxb2RootElementHttpMessageConverterTests.java | 12 ++++++++++--
 ...appingJackson2XmlHttpMessageConverterTests.java | 12 ++++++++++--
 .../xml/MarshallingHttpMessageConverterTests.java  | 14 ++++++++++++--
 .../xml/SourceHttpMessageConverterTests.java       | 12 ++++++++++--
 19 files changed, 151 insertions(+), 39 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
index 0dbfc02f098b..62a899f9b3aa 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
@@ -45,6 +45,7 @@
 import org.springframework.http.StreamingHttpOutputMessage;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -207,6 +208,7 @@ public BufferedImage read(@Nullable Class<? extends BufferedImage> clazz, HttpIn
 	}
 
 	private ImageInputStream createImageInputStream(InputStream is) throws IOException {
+		is = StreamUtils.nonClosing(is);
 		if (this.cacheDir != null) {
 			return new FileCacheImageInputStream(is, this.cacheDir);
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
index 5a62697950cd..60d9ecc0220b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.http.converter.feed;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
@@ -35,6 +36,7 @@
 import org.springframework.http.converter.AbstractHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
+import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -74,7 +76,8 @@ protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage
 		Charset charset = (contentType != null && contentType.getCharset() != null ?
 				contentType.getCharset() : DEFAULT_CHARSET);
 		try {
-			Reader reader = new InputStreamReader(inputMessage.getBody(), charset);
+			InputStream inputStream = StreamUtils.nonClosing(inputMessage.getBody());
+			Reader reader = new InputStreamReader(inputStream, charset);
 			return (T) feedInput.build(reader);
 		}
 		catch (FeedException ex) {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
index 19b22fef2c81..b5273919e4d5 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.http.converter.json;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -361,24 +362,25 @@ private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) th
 				"UTF-16".equals(charset.name()) ||
 				"UTF-32".equals(charset.name());
 		try {
+			InputStream inputStream = StreamUtils.nonClosing(inputMessage.getBody());
 			if (inputMessage instanceof MappingJacksonInputMessage) {
 				Class<?> deserializationView = ((MappingJacksonInputMessage) inputMessage).getDeserializationView();
 				if (deserializationView != null) {
 					ObjectReader objectReader = objectMapper.readerWithView(deserializationView).forType(javaType);
 					if (isUnicode) {
-						return objectReader.readValue(inputMessage.getBody());
+						return objectReader.readValue(inputStream);
 					}
 					else {
-						Reader reader = new InputStreamReader(inputMessage.getBody(), charset);
+						Reader reader = new InputStreamReader(inputStream, charset);
 						return objectReader.readValue(reader);
 					}
 				}
 			}
 			if (isUnicode) {
-				return objectMapper.readValue(inputMessage.getBody(), javaType);
+				return objectMapper.readValue(inputStream, javaType);
 			}
 			else {
-				Reader reader = new InputStreamReader(inputMessage.getBody(), charset);
+				Reader reader = new InputStreamReader(inputStream, charset);
 				return objectMapper.readValue(reader, javaType);
 			}
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java
index 9da6bcb42c11..19d95e4bef3a 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.http.converter.xml;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -33,6 +34,7 @@
 import org.springframework.http.converter.HttpMessageConversionException;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
+import org.springframework.util.StreamUtils;
 
 /**
  * Abstract base class for {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverters}
@@ -66,7 +68,8 @@ public final T readInternal(Class<? extends T> clazz, HttpInputMessage inputMess
 			throws IOException, HttpMessageNotReadableException {
 
 		try {
-			return readFromSource(clazz, inputMessage.getHeaders(), new StreamSource(inputMessage.getBody()));
+			InputStream inputStream = StreamUtils.nonClosing(inputMessage.getBody());
+			return readFromSource(clazz, inputMessage.getHeaders(), new StreamSource(inputStream));
 		}
 		catch (IOException | HttpMessageConversionException ex) {
 			throw ex;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
index 63c70e30c643..468152e2ce3f 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,7 @@ public boolean supports(Class<?> clazz) {
 	protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
 
-		InputStream body = inputMessage.getBody();
+		InputStream body = StreamUtils.nonClosing(inputMessage.getBody());
 		if (DOMSource.class == clazz) {
 			return (T) readDOMSource(body, inputMessage);
 		}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java
index b91f6b429e34..477cd7138cda 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/BufferedImageHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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 @@
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 import javax.imageio.ImageIO;
 
@@ -33,6 +34,9 @@
 import org.springframework.util.FileCopyUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Unit tests for BufferedImageHttpMessageConverter.
@@ -65,11 +69,13 @@ public void canWrite() {
 	public void read() throws IOException {
 		Resource logo = new ClassPathResource("logo.jpg", BufferedImageHttpMessageConverterTests.class);
 		byte[] body = FileCopyUtils.copyToByteArray(logo.getInputStream());
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
+		InputStream inputStream = spy(new ByteArrayInputStream(body));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(new MediaType("image", "jpeg"));
 		BufferedImage result = converter.read(BufferedImage.class, inputMessage);
 		assertThat(result.getHeight()).as("Invalid height").isEqualTo(500);
 		assertThat(result.getWidth()).as("Invalid width").isEqualTo(750);
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -84,6 +90,7 @@ public void write() throws IOException {
 		BufferedImage result = ImageIO.read(new ByteArrayInputStream(outputMessage.getBodyAsBytes()));
 		assertThat(result.getHeight()).as("Invalid height").isEqualTo(500);
 		assertThat(result.getWidth()).as("Invalid width").isEqualTo(750);
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
index 856dcd787067..cd71fa9f3976 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,9 @@
 
 import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * @author Arjen Poutsma
@@ -71,8 +74,8 @@ public void canWrite() {
 
 	@Test
 	public void read() throws IOException {
-		InputStream is = getClass().getResourceAsStream("atom.xml");
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(is);
+		InputStream inputStream = spy(getClass().getResourceAsStream("atom.xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(ATOM_XML_UTF8);
 		Feed result = converter.read(Feed.class, inputMessage);
 		assertThat(result.getTitle()).isEqualTo("title");
@@ -87,6 +90,7 @@ public void read() throws IOException {
 		Entry entry2 = (Entry) entries.get(1);
 		assertThat(entry2.getId()).isEqualTo("id2");
 		assertThat(entry2.getTitle()).isEqualTo("title2");
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -119,6 +123,7 @@ public void write() throws IOException {
 		NodeMatcher nm = new DefaultNodeMatcher(ElementSelectors.byName);
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 				.isSimilarToIgnoringWhitespace(expected, nm);
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
index 5d1e01f32871..b537604ad3e6 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,9 @@
 
 import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * @author Arjen Poutsma
@@ -56,8 +59,8 @@ public void canReadAndWrite() {
 
 	@Test
 	public void read() throws IOException {
-		InputStream is = getClass().getResourceAsStream("rss.xml");
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(is);
+		InputStream inputStream = spy(getClass().getResourceAsStream("rss.xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(RSS_XML_UTF8);
 		Channel result = converter.read(Channel.class, inputMessage);
 		assertThat(result.getTitle()).isEqualTo("title");
@@ -72,6 +75,7 @@ public void read() throws IOException {
 
 		Item item2 = (Item) items.get(1);
 		assertThat(item2.getTitle()).isEqualTo("title2");
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -105,6 +109,7 @@ public void write() throws IOException {
 				"</channel></rss>";
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 				.isSimilarToIgnoringWhitespace(expected);
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
index aa2c777ae4cd..60d7306c47ab 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.json;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
@@ -38,6 +40,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.within;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Gson 2.x converter tests.
@@ -72,7 +77,8 @@ public void canReadAndWriteMicroformats() {
 	public void readTyped() throws IOException {
 		String body = "{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," +
 				"\"number\":42,\"string\":\"Foo\",\"bool\":true,\"fraction\":42.0}";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		InputStream inputStream = spy(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 		MyBean result = (MyBean) this.converter.read(MyBean.class, inputMessage);
 
@@ -83,6 +89,7 @@ public void readTyped() throws IOException {
 		assertThat(result.getArray()).isEqualTo(new String[] {"Foo", "Bar"});
 		assertThat(result.isBool()).isTrue();
 		assertThat(result.getBytes()).isEqualTo(new byte[] {0x1, 0x2});
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -132,6 +139,7 @@ public void write() throws IOException {
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":[1,2]")).isTrue();
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
index 44e14ac57612..d2aad2f424e8 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.json;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
@@ -38,6 +40,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.within;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Integration tests for the JSON Binding API, running against Apache Johnzon.
@@ -72,7 +77,8 @@ public void canReadAndWriteMicroformats() {
 	public void readTyped() throws IOException {
 		String body = "{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," +
 				"\"number\":42,\"string\":\"Foo\",\"bool\":true,\"fraction\":42.0}";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
+		InputStream inputStream = spy(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 		MyBean result = (MyBean) this.converter.read(MyBean.class, inputMessage);
 
@@ -83,6 +89,7 @@ public void readTyped() throws IOException {
 		assertThat(result.getArray()).isEqualTo(new String[] {"Foo", "Bar"});
 		assertThat(result.isBool()).isTrue();
 		assertThat(result.getBytes()).isEqualTo(new byte[] {0x1, 0x2});
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -132,6 +139,7 @@ public void write() throws IOException {
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":[1,2]")).isTrue();
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
index cea6e8c7cf76..f67a56433e45 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.json;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -48,6 +50,7 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.assertj.core.api.Assertions.within;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
 /**
@@ -134,7 +137,8 @@ public void readTyped() throws IOException {
 				"\"string\":\"Foo\"," +
 				"\"bool\":true," +
 				"\"fraction\":42.0}";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		InputStream inputStream = spy(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 		MyBean result = (MyBean) converter.read(MyBean.class, inputMessage);
 		assertThat(result.getString()).isEqualTo("Foo");
@@ -143,6 +147,7 @@ public void readTyped() throws IOException {
 		assertThat(result.getArray()).isEqualTo(new String[] {"Foo", "Bar"});
 		assertThat(result.isBool()).isTrue();
 		assertThat(result.getBytes()).isEqualTo(new byte[] {0x1, 0x2});
+		verify(inputStream, never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
index 26106e13d3d2..f0b83166da1f 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.protobuf;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 
 import com.google.protobuf.ExtensionRegistry;
@@ -34,6 +36,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -108,10 +112,12 @@ public void canWrite() {
 	@Test
 	public void read() throws IOException {
 		byte[] body = this.testMsg.toByteArray();
+		InputStream inputStream = spy(new ByteArrayInputStream(body));
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
 		inputMessage.getHeaders().setContentType(ProtobufHttpMessageConverter.PROTOBUF);
 		Message result = this.converter.read(Msg.class, inputMessage);
 		assertThat(result).isEqualTo(this.testMsg);
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -138,6 +144,7 @@ public void writeProtobuf() throws IOException {
 		String schemaHeader =
 				outputMessage.getHeaders().getFirst(ProtobufHttpMessageConverter.X_PROTOBUF_SCHEMA_HEADER);
 		assertThat(schemaHeader).isEqualTo("sample.proto");
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java
index 296efbd8b3b1..c933c4262286 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.protobuf;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
@@ -32,6 +34,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -88,10 +92,12 @@ public void canWrite() {
 	@Test
 	public void read() throws IOException {
 		byte[] body = this.testMsg.toByteArray();
+		InputStream inputStream = spy(new ByteArrayInputStream(body));
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
 		inputMessage.getHeaders().setContentType(ProtobufHttpMessageConverter.PROTOBUF);
 		Message result = this.converter.read(Msg.class, inputMessage);
 		assertThat(result).isEqualTo(this.testMsg);
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -118,6 +124,7 @@ public void write() throws IOException {
 		String schemaHeader =
 				outputMessage.getHeaders().getFirst(ProtobufHttpMessageConverter.X_PROTOBUF_SCHEMA_HEADER);
 		assertThat(schemaHeader).isEqualTo("sample.proto");
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java
index 2cbb22bdef35..9d3e8470a7b6 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.smile;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
@@ -28,6 +30,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.within;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Jackson 2.x Smile converter tests.
@@ -63,7 +68,8 @@ public void read() throws IOException {
 		body.setArray(new String[]{"Foo", "Bar"});
 		body.setBool(true);
 		body.setBytes(new byte[]{0x1, 0x2});
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(mapper.writeValueAsBytes(body));
+		InputStream inputStream = spy(new ByteArrayInputStream(mapper.writeValueAsBytes(body)));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(new MediaType("application", "x-jackson-smile"));
 		MyBean result = (MyBean) converter.read(MyBean.class, inputMessage);
 		assertThat(result.getString()).isEqualTo("Foo");
@@ -73,6 +79,7 @@ public void read() throws IOException {
 		assertThat(result.getArray()).isEqualTo(new String[]{"Foo", "Bar"});
 		assertThat(result.isBool()).isTrue();
 		assertThat(result.getBytes()).isEqualTo(new byte[]{0x1, 0x2});
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -88,6 +95,7 @@ public void write() throws IOException {
 		converter.write(body, null, outputMessage);
 		assertThat(outputMessage.getBodyAsBytes()).isEqualTo(mapper.writeValueAsBytes(body));
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "x-jackson-smile"));
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
index 0b02ce6ae1f2..9c0c08646f64 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,10 @@
 
 package org.springframework.http.converter.xml;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -38,6 +41,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Test fixture for {@link Jaxb2CollectionHttpMessageConverter}.
@@ -79,12 +85,14 @@ public void canRead() {
 	@SuppressWarnings("unchecked")
 	public void readXmlRootElementList() throws Exception {
 		String content = "<list><rootElement><type s=\"1\"/></rootElement><rootElement><type s=\"2\"/></rootElement></list>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		InputStream inputStream = spy(new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		List<RootElement> result = (List<RootElement>) converter.read(rootElementListType, null, inputMessage);
 
 		assertThat(result.size()).as("Invalid result").isEqualTo(2);
 		assertThat(result.get(0).type.s).as("Invalid result").isEqualTo("1");
 		assertThat(result.get(1).type.s).as("Invalid result").isEqualTo("2");
+		verify(inputStream, never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
index cf5fa05d46cd..202776f6856f 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.http.converter.xml;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
 import javax.xml.bind.Marshaller;
@@ -44,6 +46,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.xmlunit.diff.ComparisonType.XML_STANDALONE;
 import static org.xmlunit.diff.DifferenceEvaluators.Default;
 import static org.xmlunit.diff.DifferenceEvaluators.chain;
@@ -95,9 +100,11 @@ public void canWrite() {
 	@Test
 	public void readXmlRootElement() throws Exception {
 		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes("UTF-8");
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
+		InputStream inputStream = spy(new ByteArrayInputStream(body));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		RootElement result = (RootElement) converter.read(RootElement.class, inputMessage);
 		assertThat(result.type.s).as("Invalid result").isEqualTo("Hello World");
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -177,6 +184,7 @@ public void writeXmlRootElement() throws Exception {
 		DifferenceEvaluator ev = chain(Default, downgradeDifferencesToEqual(XML_STANDALONE));
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 			.isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev);
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
index ab8c617b6f91..631ff4848e71 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.xml;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
@@ -34,6 +36,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.within;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Jackson 2.x XML converter tests.
@@ -74,7 +79,8 @@ public void read() throws IOException {
 				"<array>Bar</array></array>" +
 				"<bool>true</bool>" +
 				"<bytes>AQI=</bytes></MyBean>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		InputStream inputStream = spy(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 		MyBean result = (MyBean) converter.read(MyBean.class, inputMessage);
 		assertThat(result.getString()).isEqualTo("Foo");
@@ -83,6 +89,7 @@ public void read() throws IOException {
 		assertThat(result.getArray()).isEqualTo(new String[]{"Foo", "Bar"});
 		assertThat(result.isBool()).isTrue();
 		assertThat(result.getBytes()).isEqualTo(new byte[]{0x1, 0x2});
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -104,6 +111,7 @@ public void write() throws IOException {
 		assertThat(result.contains("<bool>true</bool>")).isTrue();
 		assertThat(result.contains("<bytes>AQI=</bytes>")).isTrue();
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml", StandardCharsets.UTF_8));
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
index b3f95c9c81b1..d79f9dc5ac8a 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.http.converter.xml;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
 import javax.xml.transform.Result;
 import javax.xml.transform.stream.StreamSource;
 
@@ -40,6 +44,9 @@
 import static org.mockito.BDDMockito.willDoNothing;
 import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * Tests for {@link MarshallingHttpMessageConverter}.
@@ -81,7 +88,8 @@ public void canWrite() {
 	@Test
 	public void read() throws Exception {
 		String body = "<root>Hello World</root>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		InputStream inputStream = spy(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 
 		Unmarshaller unmarshaller = mock(Unmarshaller.class);
 		given(unmarshaller.unmarshal(isA(StreamSource.class))).willReturn(body);
@@ -91,6 +99,7 @@ public void read() throws Exception {
 
 		String result = (String) converter.read(Object.class, inputMessage);
 		assertThat(result).as("Invalid result").isEqualTo(body);
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -135,6 +144,7 @@ public void write() throws Exception {
 		converter.write(body, null, outputMessage);
 
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
index a54e6895efb7..c2341a9bed86 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 @@
 
 package org.springframework.http.converter.xml;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
@@ -50,6 +52,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 /**
  * @author Arjen Poutsma
@@ -90,11 +95,13 @@ public void canWrite() {
 
 	@Test
 	public void readDOMSource() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
+		InputStream inputStream = spy(new ByteArrayInputStream(BODY.getBytes("UTF-8")));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 		DOMSource result = (DOMSource) converter.read(DOMSource.class, inputMessage);
 		Document document = (Document) result.getNode();
 		assertThat(document.getDocumentElement().getLocalName()).as("Invalid result").isEqualTo("root");
+		verify(inputStream, never()).close();
 	}
 
 	@Test
@@ -294,6 +301,7 @@ public void writeDOMSource() throws Exception {
 				.isSimilarTo("<root>Hello World</root>");
 		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
 		assertThat(outputMessage.getHeaders().getContentLength()).as("Invalid content-length").isEqualTo(outputMessage.getBodyAsBytes().length);
+		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test

From c4e362500be18bd2e277535d568f45e8a059b0db Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 2 Feb 2022 17:09:04 +0000
Subject: [PATCH 627/735] Polishing tests

---
 .../ByteArrayHttpMessageConverterTests.java   |  6 +-
 .../FormHttpMessageConverterTests.java        |  9 ++-
 .../ResourceHttpMessageConverterTests.java    |  6 +-
 .../json/GsonHttpMessageConverterTests.java   |  8 ++-
 .../json/JsonbHttpMessageConverterTests.java  |  6 +-
 ...pingJackson2HttpMessageConverterTests.java | 34 ++++++-----
 .../ProtobufHttpMessageConverterTests.java    |  9 +--
 ...ackson2SmileHttpMessageConverterTests.java |  3 +-
 ...b2CollectionHttpMessageConverterTests.java | 18 +++---
 ...2RootElementHttpMessageConverterTests.java | 38 +++++++-----
 ...gJackson2XmlHttpMessageConverterTests.java | 19 +++---
 .../MarshallingHttpMessageConverterTests.java | 23 ++++---
 .../xml/SourceHttpMessageConverterTests.java  | 60 ++++++++++---------
 13 files changed, 132 insertions(+), 107 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java
index d868e2666ee2..63c9b5aa3221 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java
@@ -63,8 +63,10 @@ public void write() throws IOException {
 		byte[] body = new byte[]{0x1, 0x2};
 		converter.write(body, null, outputMessage);
 		assertThat(outputMessage.getBodyAsBytes()).as("Invalid result").isEqualTo(body);
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "octet-stream"));
-		assertThat(outputMessage.getHeaders().getContentLength()).as("Invalid content-length").isEqualTo(2);
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_OCTET_STREAM);
+		assertThat(outputMessage.getHeaders().getContentLength())
+				.as("Invalid content-length").isEqualTo(2);
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
index 05669acc9962..1c3b8729abd8 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
@@ -147,9 +147,12 @@ public void writeForm() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		this.converter.write(body, APPLICATION_FORM_URLENCODED, outputMessage);
 
-		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8)).as("Invalid result").isEqualTo("name+1=value+1&name+2=value+2%2B1&name+2=value+2%2B2&name+3");
-		assertThat(outputMessage.getHeaders().getContentType().toString()).as("Invalid content-type").isEqualTo("application/x-www-form-urlencoded;charset=UTF-8");
-		assertThat(outputMessage.getHeaders().getContentLength()).as("Invalid content-length").isEqualTo(outputMessage.getBodyAsBytes().length);
+		assertThat(outputMessage.getBodyAsString(StandardCharsets.UTF_8))
+				.as("Invalid result").isEqualTo("name+1=value+1&name+2=value+2%2B1&name+2=value+2%2B2&name+3");
+		assertThat(outputMessage.getHeaders().getContentType().toString())
+				.as("Invalid content-type").isEqualTo("application/x-www-form-urlencoded;charset=UTF-8");
+		assertThat(outputMessage.getHeaders().getContentLength())
+				.as("Invalid content-length").isEqualTo(outputMessage.getBodyAsBytes().length);
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
index 3c98fe538d8d..3bf1b9d3e3eb 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
@@ -106,8 +106,10 @@ public void shouldWriteImageResource() throws IOException {
 		Resource body = new ClassPathResource("logo.jpg", getClass());
 		converter.write(body, null, outputMessage);
 
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(MediaType.IMAGE_JPEG);
-		assertThat(outputMessage.getHeaders().getContentLength()).as("Invalid content-length").isEqualTo(body.getFile().length());
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.IMAGE_JPEG);
+		assertThat(outputMessage.getHeaders().getContentLength())
+				.as("Invalid content-length").isEqualTo(body.getFile().length());
 	}
 
 	@Test  // SPR-10848
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
index 60d7306c47ab..6d5cf1453dce 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
@@ -138,7 +138,8 @@ public void write() throws IOException {
 		assertThat(result.contains("\"array\":[\"Foo\",\"Bar\"]")).isTrue();
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":[1,2]")).isTrue();
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
 		verify(outputMessage.getBody(), never()).close();
 	}
 
@@ -161,7 +162,8 @@ public void writeWithBaseType() throws IOException {
 		assertThat(result.contains("\"array\":[\"Foo\",\"Bar\"]")).isTrue();
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":[1,2]")).isTrue();
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
 	}
 
 	@Test
@@ -177,7 +179,7 @@ public void writeUTF16() throws IOException {
 	@Test
 	public void readInvalidJson() throws IOException {
 		String body = "FooBar";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
 				this.converter.read(MyBean.class, inputMessage));
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
index d2aad2f424e8..2519005f6672 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
@@ -138,7 +138,8 @@ public void write() throws IOException {
 		assertThat(result.contains("\"array\":[\"Foo\",\"Bar\"]")).isTrue();
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":[1,2]")).isTrue();
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
 		verify(outputMessage.getBody(), never()).close();
 	}
 
@@ -161,7 +162,8 @@ public void writeWithBaseType() throws IOException {
 		assertThat(result.contains("\"array\":[\"Foo\",\"Bar\"]")).isTrue();
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":[1,2]")).isTrue();
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(new MediaType("application", "json", utf8));
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
index f67a56433e45..b06544ac239a 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -160,7 +160,7 @@ public void readUntyped() throws IOException {
 				"\"string\":\"Foo\"," +
 				"\"bool\":true," +
 				"\"fraction\":42.0}";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 		HashMap<String, Object> result = (HashMap<String, Object>) converter.read(HashMap.class, inputMessage);
 		assertThat(result.get("string")).isEqualTo("Foo");
@@ -192,7 +192,8 @@ public void write() throws IOException {
 		assertThat(result.contains("\"array\":[\"Foo\",\"Bar\"]")).isTrue();
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":\"AQI=\"")).isTrue();
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(MediaType.APPLICATION_JSON);
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_JSON);
 		verify(outputMessage.getBody(), never()).close();
 	}
 
@@ -214,7 +215,8 @@ public void writeWithBaseType() throws IOException {
 		assertThat(result.contains("\"array\":[\"Foo\",\"Bar\"]")).isTrue();
 		assertThat(result.contains("\"bool\":true")).isTrue();
 		assertThat(result.contains("\"bytes\":\"AQI=\"")).isTrue();
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(MediaType.APPLICATION_JSON);
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_JSON);
 	}
 
 	@Test
@@ -230,16 +232,16 @@ public void writeUTF16() throws IOException {
 	@Test
 	public void readInvalidJson() throws IOException {
 		String body = "FooBar";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
-		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
-				converter.read(MyBean.class, inputMessage));
+		assertThatExceptionOfType(HttpMessageNotReadableException.class)
+				.isThrownBy(() -> converter.read(MyBean.class, inputMessage));
 	}
 
 	@Test
 	public void readValidJsonWithUnknownProperty() throws IOException {
 		String body = "{\"string\":\"string\",\"unknownProperty\":\"value\"}";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 		converter.read(MyBean.class, inputMessage);
 		// Assert no HttpMessageNotReadableException is thrown
@@ -266,7 +268,7 @@ protected JavaType getJavaType(Type type, @Nullable Class<?> contextClass) {
 				"\"string\":\"Foo\"," +
 				"\"bool\":true," +
 				"\"fraction\":42.0}]";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 
 		List<MyBean> results = (List<MyBean>) converter.read(List.class, inputMessage);
@@ -280,7 +282,7 @@ protected JavaType getJavaType(Type type, @Nullable Class<?> contextClass) {
 		assertThat(result.getBytes()).isEqualTo(new byte[] {0x1, 0x2});
 
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		converter.write(results, new MediaType("application", "json"), outputMessage);
+		converter.write(results, MediaType.APPLICATION_JSON, outputMessage);
 		JSONAssert.assertEquals(body, outputMessage.getBodyAsString(StandardCharsets.UTF_8), true);
 	}
 
@@ -296,8 +298,8 @@ public void readAndWriteParameterizedType() throws Exception {
 				"\"string\":\"Foo\"," +
 				"\"bool\":true," +
 				"\"fraction\":42.0}]";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_JSON);
 
 		MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
 		List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
@@ -311,7 +313,7 @@ public void readAndWriteParameterizedType() throws Exception {
 		assertThat(result.getBytes()).isEqualTo(new byte[] {0x1, 0x2});
 
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		converter.write(results, beansList.getType(), new MediaType("application", "json"), outputMessage);
+		converter.write(results, beansList.getType(), MediaType.APPLICATION_JSON, outputMessage);
 		JSONAssert.assertEquals(body, outputMessage.getBodyAsString(StandardCharsets.UTF_8), true);
 	}
 
@@ -328,8 +330,8 @@ public void writeParameterizedBaseType() throws Exception {
 				"\"string\":\"Foo\"," +
 				"\"bool\":true," +
 				"\"fraction\":42.0}]";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_JSON);
 
 		MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
 		List<MyBean> results = (List<MyBean>) converter.read(beansList.getType(), null, inputMessage);
@@ -343,7 +345,7 @@ public void writeParameterizedBaseType() throws Exception {
 		assertThat(result.getBytes()).isEqualTo(new byte[] {0x1, 0x2});
 
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		converter.write(results, baseList.getType(), new MediaType("application", "json"), outputMessage);
+		converter.write(results, baseList.getType(), MediaType.APPLICATION_JSON, outputMessage);
 		JSONAssert.assertEquals(body, outputMessage.getBodyAsString(StandardCharsets.UTF_8), true);
 	}
 
@@ -489,7 +491,7 @@ public void writeSubTypeList() throws Exception {
 	public void readWithNoDefaultConstructor() throws Exception {
 		String body = "{\"property1\":\"foo\",\"property2\":\"bar\"}";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_JSON);
 		assertThatExceptionOfType(HttpMessageConversionException.class).isThrownBy(() ->
 				converter.read(BeanWithNoDefaultConstructor.class, inputMessage))
 			.withMessageStartingWith("Type definition error:");
diff --git a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
index f0b83166da1f..01dc97d84f94 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java
@@ -19,7 +19,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
@@ -158,7 +158,7 @@ public void writeJsonWithGoogleProtobuf() throws IOException {
 
 		assertThat(outputMessage.getHeaders().getContentType()).isEqualTo(contentType);
 
-		final String body = outputMessage.getBodyAsString(Charset.forName("UTF-8"));
+		final String body = outputMessage.getBodyAsString(StandardCharsets.UTF_8);
 		assertThat(body.isEmpty()).as("body is empty").isFalse();
 
 		Msg.Builder builder = Msg.newBuilder();
@@ -182,7 +182,7 @@ public void writeJsonWithJavaFormat() throws IOException {
 
 		assertThat(outputMessage.getHeaders().getContentType()).isEqualTo(contentType);
 
-		final String body = outputMessage.getBodyAsString(Charset.forName("UTF-8"));
+		final String body = outputMessage.getBodyAsString(StandardCharsets.UTF_8);
 		assertThat(body.isEmpty()).as("body is empty").isFalse();
 
 		Msg.Builder builder = Msg.newBuilder();
@@ -197,7 +197,8 @@ public void writeJsonWithJavaFormat() throws IOException {
 
 	@Test
 	public void defaultContentType() throws Exception {
-		assertThat(this.converter.getDefaultContentType(this.testMsg)).isEqualTo(ProtobufHttpMessageConverter.PROTOBUF);
+		assertThat(this.converter.getDefaultContentType(this.testMsg))
+				.isEqualTo(ProtobufHttpMessageConverter.PROTOBUF);
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java
index 9d3e8470a7b6..231d00306060 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverterTests.java
@@ -94,7 +94,8 @@ public void write() throws IOException {
 		body.setBytes(new byte[]{0x1, 0x2});
 		converter.write(body, null, outputMessage);
 		assertThat(outputMessage.getBodyAsBytes()).isEqualTo(mapper.writeValueAsBytes(body));
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "x-jackson-smile"));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(new MediaType("application", "x-jackson-smile"));
 		verify(outputMessage.getBody(), never()).close();
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
index 9c0c08646f64..399e2e0b4bc4 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
@@ -99,7 +99,7 @@ public void readXmlRootElementList() throws Exception {
 	@SuppressWarnings("unchecked")
 	public void readXmlRootElementSet() throws Exception {
 		String content = "<set><rootElement><type s=\"1\"/></rootElement><rootElement><type s=\"2\"/></rootElement></set>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		Set<RootElement> result = (Set<RootElement>) converter.read(rootElementSetType, null, inputMessage);
 
 		assertThat(result.size()).as("Invalid result").isEqualTo(2);
@@ -111,7 +111,7 @@ public void readXmlRootElementSet() throws Exception {
 	@SuppressWarnings("unchecked")
 	public void readXmlTypeList() throws Exception {
 		String content = "<list><foo s=\"1\"/><bar s=\"2\"/></list>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		List<TestType> result = (List<TestType>) converter.read(typeListType, null, inputMessage);
 
 		assertThat(result.size()).as("Invalid result").isEqualTo(2);
@@ -123,7 +123,7 @@ public void readXmlTypeList() throws Exception {
 	@SuppressWarnings("unchecked")
 	public void readXmlTypeSet() throws Exception {
 		String content = "<set><foo s=\"1\"/><bar s=\"2\"/></set>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		Set<TestType> result = (Set<TestType>) converter.read(typeSetType, null, inputMessage);
 
 		assertThat(result.size()).as("Invalid result").isEqualTo(2);
@@ -139,7 +139,7 @@ public void readXmlRootElementExternalEntityDisabled() throws Exception {
 				"  <!ELEMENT external ANY >\n" +
 				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
 				"  <list><rootElement><type s=\"1\"/><external>&ext;</external></rootElement></list>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 
 		converter = new Jaxb2CollectionHttpMessageConverter<Collection<Object>>() {
 			@Override
@@ -168,7 +168,7 @@ public void readXmlRootElementExternalEntityEnabled() throws Exception {
 				"  <!ELEMENT external ANY >\n" +
 				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
 				"  <list><rootElement><type s=\"1\"/><external>&ext;</external></rootElement></list>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 
 		Jaxb2CollectionHttpMessageConverter<?> c = new Jaxb2CollectionHttpMessageConverter<Collection<Object>>() {
 			@Override
@@ -203,10 +203,10 @@ public void testXmlBomb() throws Exception {
 				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
 				"]>\n" +
 				"<list><rootElement><external>&lol9;</external></rootElement></list>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
-				this.converter.read(this.rootElementListType, null, inputMessage))
-			.withMessageContaining("\"lol9\"");
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
+		assertThatExceptionOfType(HttpMessageNotReadableException.class)
+				.isThrownBy(() -> this.converter.read(this.rootElementListType, null, inputMessage))
+				.withMessageContaining("\"lol9\"");
 	}
 
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
index 202776f6856f..0324edcc10c5 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
@@ -85,21 +85,27 @@ public void setup() {
 
 	@Test
 	public void canRead() {
-		assertThat(converter.canRead(RootElement.class, null)).as("Converter does not support reading @XmlRootElement").isTrue();
-		assertThat(converter.canRead(Type.class, null)).as("Converter does not support reading @XmlType").isTrue();
+		assertThat(converter.canRead(RootElement.class, null))
+				.as("Converter does not support reading @XmlRootElement").isTrue();
+		assertThat(converter.canRead(Type.class, null))
+				.as("Converter does not support reading @XmlType").isTrue();
 	}
 
 	@Test
 	public void canWrite() {
-		assertThat(converter.canWrite(RootElement.class, null)).as("Converter does not support writing @XmlRootElement").isTrue();
-		assertThat(converter.canWrite(RootElementSubclass.class, null)).as("Converter does not support writing @XmlRootElement subclass").isTrue();
-		assertThat(converter.canWrite(rootElementCglib.getClass(), null)).as("Converter does not support writing @XmlRootElement subclass").isTrue();
-		assertThat(converter.canWrite(Type.class, null)).as("Converter supports writing @XmlType").isFalse();
+		assertThat(converter.canWrite(RootElement.class, null))
+				.as("Converter does not support writing @XmlRootElement").isTrue();
+		assertThat(converter.canWrite(RootElementSubclass.class, null))
+				.as("Converter does not support writing @XmlRootElement subclass").isTrue();
+		assertThat(converter.canWrite(rootElementCglib.getClass(), null))
+				.as("Converter does not support writing @XmlRootElement subclass").isTrue();
+		assertThat(converter.canWrite(Type.class, null))
+				.as("Converter supports writing @XmlType").isFalse();
 	}
 
 	@Test
 	public void readXmlRootElement() throws Exception {
-		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes("UTF-8");
+		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes(StandardCharsets.UTF_8);
 		InputStream inputStream = spy(new ByteArrayInputStream(body));
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
 		RootElement result = (RootElement) converter.read(RootElement.class, inputMessage);
@@ -109,7 +115,7 @@ public void readXmlRootElement() throws Exception {
 
 	@Test
 	public void readXmlRootElementSubclass() throws Exception {
-		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes("UTF-8");
+		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes(StandardCharsets.UTF_8);
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
 		RootElementSubclass result = (RootElementSubclass) converter.read(RootElementSubclass.class, inputMessage);
 		assertThat(result.getType().s).as("Invalid result").isEqualTo("Hello World");
@@ -117,7 +123,7 @@ public void readXmlRootElementSubclass() throws Exception {
 
 	@Test
 	public void readXmlType() throws Exception {
-		byte[] body = "<foo s=\"Hello World\"/>".getBytes("UTF-8");
+		byte[] body = "<foo s=\"Hello World\"/>".getBytes(StandardCharsets.UTF_8);
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
 		Type result = (Type) converter.read(Type.class, inputMessage);
 		assertThat(result.s).as("Invalid result").isEqualTo("Hello World");
@@ -130,7 +136,7 @@ public void readXmlRootElementExternalEntityDisabled() throws Exception {
 				"  <!ELEMENT external ANY >\n" +
 				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
 				"  <rootElement><external>&ext;</external></rootElement>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		converter.setSupportDtd(true);
 		RootElement rootElement = (RootElement) converter.read(RootElement.class, inputMessage);
 
@@ -144,7 +150,7 @@ public void readXmlRootElementExternalEntityEnabled() throws Exception {
 				"  <!ELEMENT external ANY >\n" +
 				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
 				"  <rootElement><external>&ext;</external></rootElement>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		this.converter.setProcessExternalEntities(true);
 		RootElement rootElement = (RootElement) converter.read(RootElement.class, inputMessage);
 
@@ -170,7 +176,7 @@ public void testXmlBomb() throws Exception {
 				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
 				"]>\n" +
 				"<rootElement><external>&lol9;</external></rootElement>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
 				this.converter.read(RootElement.class, inputMessage))
 			.withMessageContaining("DOCTYPE");
@@ -180,7 +186,8 @@ public void testXmlBomb() throws Exception {
 	public void writeXmlRootElement() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		converter.write(rootElement, null, outputMessage);
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
 		DifferenceEvaluator ev = chain(Default, downgradeDifferencesToEqual(XML_STANDALONE));
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 			.isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev);
@@ -191,7 +198,8 @@ public void writeXmlRootElement() throws Exception {
 	public void writeXmlRootElementSubclass() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		converter.write(rootElementCglib, null, outputMessage);
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
 		DifferenceEvaluator ev = chain(Default, downgradeDifferencesToEqual(XML_STANDALONE));
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 				.isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev);
@@ -211,7 +219,7 @@ public void customizeMarshaller() throws Exception {
 
 	@Test
 	public void customizeUnmarshaller() throws Exception {
-		byte[] body = "<myRootElement><element>a|||b</element></myRootElement>".getBytes("UTF-8");
+		byte[] body = "<myRootElement><element>a|||b</element></myRootElement>".getBytes(StandardCharsets.UTF_8);
 		MyJaxb2RootElementHttpMessageConverter myConverter = new MyJaxb2RootElementHttpMessageConverter();
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
 		MyRootElement result = (MyRootElement) myConverter.read(MyRootElement.class, inputMessage);
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
index 631ff4848e71..1deac303b701 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
@@ -110,15 +110,16 @@ public void write() throws IOException {
 		assertThat(result.contains("<array><array>Foo</array><array>Bar</array></array>")).isTrue();
 		assertThat(result.contains("<bool>true</bool>")).isTrue();
 		assertThat(result.contains("<bytes>AQI=</bytes>")).isTrue();
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml", StandardCharsets.UTF_8));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(new MediaType("application", "xml", StandardCharsets.UTF_8));
 		verify(outputMessage.getBody(), never()).close();
 	}
 
 	@Test
 	public void readInvalidXml() throws IOException {
 		String body = "FooBar";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
 				converter.read(MyBean.class, inputMessage));
 	}
@@ -126,8 +127,8 @@ public void readInvalidXml() throws IOException {
 	@Test
 	public void readValidXmlWithUnknownProperty() throws IOException {
 		String body = "<MyBean><string>string</string><unknownProperty>value</unknownProperty></MyBean>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		converter.read(MyBean.class, inputMessage);
 		// Assert no HttpMessageNotReadableException is thrown
 	}
@@ -164,8 +165,8 @@ public void readWithExternalReference() throws IOException {
 				new ClassPathResource("external.txt", getClass()).getURI() +
 				"\" >]><MyBean><string>&ext;</string></MyBean>";
 
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 
 		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
 				this.converter.read(MyBean.class, inputMessage));
@@ -191,8 +192,8 @@ public void readWithXmlBomb() throws IOException {
 				"]>\n" +
 				"<MyBean>&lol9;</MyBean>";
 
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 
 		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
 				this.converter.read(MyBean.class, inputMessage));
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
index d79f9dc5ac8a..3bb9c6f8877b 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java
@@ -108,12 +108,12 @@ public void readWithTypeMismatchException() throws Exception {
 
 		Marshaller marshaller = mock(Marshaller.class);
 		Unmarshaller unmarshaller = mock(Unmarshaller.class);
-		given(unmarshaller.unmarshal(isA(StreamSource.class))).willReturn(Integer.valueOf(3));
+		given(unmarshaller.unmarshal(isA(StreamSource.class))).willReturn(3);
 
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller, unmarshaller);
-		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
-				converter.read(String.class, inputMessage))
-			.withCauseInstanceOf(TypeMismatchException.class);
+		assertThatExceptionOfType(HttpMessageNotReadableException.class)
+				.isThrownBy(() -> converter.read(String.class, inputMessage))
+				.withCauseInstanceOf(TypeMismatchException.class);
 	}
 
 	@Test
@@ -127,9 +127,8 @@ public void readWithMarshallingFailureException() throws Exception {
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter();
 		converter.setUnmarshaller(unmarshaller);
 
-		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
-				converter.read(Object.class, inputMessage))
-			.withCause(ex);
+		assertThatExceptionOfType(HttpMessageNotReadableException.class)
+				.isThrownBy(() -> converter.read(Object.class, inputMessage)).withCause(ex);
 	}
 
 	@Test
@@ -143,7 +142,8 @@ public void write() throws Exception {
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller);
 		converter.write(body, null, outputMessage);
 
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
 		verify(outputMessage.getBody(), never()).close();
 	}
 
@@ -157,13 +157,12 @@ public void writeWithMarshallingFailureException() throws Exception {
 		willThrow(ex).given(marshaller).marshal(eq(body), isA(Result.class));
 
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller);
-		assertThatExceptionOfType(HttpMessageNotWritableException.class).isThrownBy(() ->
-				converter.write(body, null, outputMessage))
-			.withCause(ex);
+		assertThatExceptionOfType(HttpMessageNotWritableException.class)
+				.isThrownBy(() -> converter.write(body, null, outputMessage)).withCause(ex);
 	}
 
 	@Test
-	public void supports() throws Exception {
+	public void supports() {
 		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() ->
 				new MarshallingHttpMessageConverter().supports(Object.class));
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
index c2341a9bed86..54f2fd1322cb 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
@@ -95,9 +95,9 @@ public void canWrite() {
 
 	@Test
 	public void readDOMSource() throws Exception {
-		InputStream inputStream = spy(new ByteArrayInputStream(BODY.getBytes("UTF-8")));
+		InputStream inputStream = spy(new ByteArrayInputStream(BODY.getBytes(StandardCharsets.UTF_8)));
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(inputStream);
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		DOMSource result = (DOMSource) converter.read(DOMSource.class, inputMessage);
 		Document document = (Document) result.getNode();
 		assertThat(document.getDocumentElement().getLocalName()).as("Invalid result").isEqualTo("root");
@@ -106,8 +106,8 @@ public void readDOMSource() throws Exception {
 
 	@Test
 	public void readDOMSourceExternal() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		converter.setSupportDtd(true);
 		DOMSource result = (DOMSource) converter.read(DOMSource.class, inputMessage);
 		Document document = (Document) result.getNode();
@@ -134,7 +134,7 @@ public void readDomSourceWithXmlBomb() throws Exception {
 				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
 				"]>\n" +
 				"<root>&lol9;</root>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 
 		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
 				this.converter.read(DOMSource.class, inputMessage))
@@ -143,8 +143,8 @@ public void readDomSourceWithXmlBomb() throws Exception {
 
 	@Test
 	public void readSAXSource() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		SAXSource result = (SAXSource) converter.read(SAXSource.class, inputMessage);
 		InputSource inputSource = result.getInputSource();
 		String s = FileCopyUtils.copyToString(new InputStreamReader(inputSource.getByteStream()));
@@ -153,8 +153,8 @@ public void readSAXSource() throws Exception {
 
 	@Test
 	public void readSAXSourceExternal() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		converter.setSupportDtd(true);
 		SAXSource result = (SAXSource) converter.read(SAXSource.class, inputMessage);
 		InputSource inputSource = result.getInputSource();
@@ -189,20 +189,19 @@ public void readSAXSourceWithXmlBomb() throws Exception {
 				"]>\n" +
 				"<root>&lol9;</root>";
 
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		SAXSource result = (SAXSource) this.converter.read(SAXSource.class, inputMessage);
 
 		InputSource inputSource = result.getInputSource();
 		XMLReader reader = result.getXMLReader();
-		assertThatExceptionOfType(SAXException.class).isThrownBy(() ->
-				reader.parse(inputSource))
-			.withMessageContaining("DOCTYPE");
+		assertThatExceptionOfType(SAXException.class)
+				.isThrownBy(() -> reader.parse(inputSource)).withMessageContaining("DOCTYPE");
 	}
 
 	@Test
 	public void readStAXSource() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		StAXSource result = (StAXSource) converter.read(StAXSource.class, inputMessage);
 		XMLStreamReader streamReader = result.getXMLStreamReader();
 		assertThat(streamReader.hasNext()).isTrue();
@@ -216,8 +215,8 @@ public void readStAXSource() throws Exception {
 
 	@Test
 	public void readStAXSourceExternal() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		converter.setSupportDtd(true);
 		StAXSource result = (StAXSource) converter.read(StAXSource.class, inputMessage);
 		XMLStreamReader streamReader = result.getXMLStreamReader();
@@ -255,7 +254,7 @@ public void readStAXSourceWithXmlBomb() throws Exception {
 				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
 				"]>\n" +
 				"<root>&lol9;</root>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
 		StAXSource result = (StAXSource) this.converter.read(StAXSource.class, inputMessage);
 
 		XMLStreamReader streamReader = result.getXMLStreamReader();
@@ -264,15 +263,14 @@ public void readStAXSourceWithXmlBomb() throws Exception {
 		streamReader.next();
 		String s = streamReader.getLocalName();
 		assertThat(s).isEqualTo("root");
-		assertThatExceptionOfType(XMLStreamException.class).isThrownBy(() ->
-				streamReader.getElementText())
-			.withMessageContaining("\"lol9\"");
+		assertThatExceptionOfType(XMLStreamException.class)
+				.isThrownBy(streamReader::getElementText).withMessageContaining("\"lol9\"");
 	}
 
 	@Test
 	public void readStreamSource() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		StreamSource result = (StreamSource) converter.read(StreamSource.class, inputMessage);
 		String s = FileCopyUtils.copyToString(new InputStreamReader(result.getInputStream()));
 		assertThat(XmlContent.of(s)).isSimilarTo(BODY);
@@ -280,8 +278,8 @@ public void readStreamSource() throws Exception {
 
 	@Test
 	public void readSource() throws Exception {
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
-		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes(StandardCharsets.UTF_8));
+		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_XML);
 		converter.read(Source.class, inputMessage);
 	}
 
@@ -299,8 +297,10 @@ public void writeDOMSource() throws Exception {
 		converter.write(domSource, null, outputMessage);
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 				.isSimilarTo("<root>Hello World</root>");
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
-		assertThat(outputMessage.getHeaders().getContentLength()).as("Invalid content-length").isEqualTo(outputMessage.getBodyAsBytes().length);
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
+		assertThat(outputMessage.getHeaders().getContentLength())
+				.as("Invalid content-length").isEqualTo(outputMessage.getBodyAsBytes().length);
 		verify(outputMessage.getBody(), never()).close();
 	}
 
@@ -313,7 +313,8 @@ public void writeSAXSource() throws Exception {
 		converter.write(saxSource, null, outputMessage);
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 				.isSimilarTo("<root>Hello World</root>");
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
 	}
 
 	@Test
@@ -325,7 +326,8 @@ public void writeStreamSource() throws Exception {
 		converter.write(streamSource, null, outputMessage);
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
 				.isSimilarTo("<root>Hello World</root>");
-		assertThat(outputMessage.getHeaders().getContentType()).as("Invalid content-type").isEqualTo(new MediaType("application", "xml"));
+		assertThat(outputMessage.getHeaders().getContentType())
+				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
 	}
 
 }

From e702c22da45016cdb15cdc4b47fb361c5063c8b0 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 3 Feb 2022 08:48:52 +0100
Subject: [PATCH 628/735] Upgrade Ubuntu version in CI image

---
 ci/images/ci-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index df1be9f33457..c38b735bb7b7 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210827
+FROM ubuntu:focal-20220113
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

From 82a2544918bac14301bece7c651114c278919f30 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 3 Feb 2022 08:49:16 +0100
Subject: [PATCH 629/735] Upgrade to spring javaformat 0.0.31

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 23f6a57a0126..dfb10e777ad1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -362,7 +362,7 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.30")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.31")
 	}
 
 	ext.javadocLinks = [

From 5ad261228da962d21195e0995c30cc2bcbf302b8 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Thu, 3 Feb 2022 10:22:43 +0100
Subject: [PATCH 630/735] Upgrade JDK 17 and JDK 18 versions in CI image

---
 ci/images/get-jdk-url.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index 6f37fa9be510..1124d695ca9a 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -3,10 +3,10 @@ set -e
 
 case "$1" in
   java17)
-    echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz"
+    echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz"
   ;;
   java18)
-    echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-2021-11-17-08-12-beta/OpenJDK-jdk_x64_linux_hotspot_2021-11-16-23-30.tar.gz"
+    echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-02-03-05-48-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-02-03-05-48.tar.gz"
   ;;
   *)
     echo $"Unknown java version"

From f8a5a8d7be6040e60c21107c14fc394e67e75e6b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 3 Feb 2022 14:50:10 +0100
Subject: [PATCH 631/735] Use modern language features in tests

---
 ...ionScannerJsr330ScopeIntegrationTests.java |  40 +--
 .../ConcurrencyThrottleInterceptorTests.java  |  11 +-
 .../beans/AbstractPropertyValuesTests.java    |   8 +-
 .../beans/factory/BeanFactoryUtilsTests.java  |   1 +
 .../DefaultListableBeanFactoryTests.java      |  37 +-
 ...wiredAnnotationBeanPostProcessorTests.java |   8 +-
 .../config/CustomEditorConfigurerTests.java   |   8 +-
 .../MethodInvokingFactoryBeanTests.java       |  10 +-
 .../support/BeanFactoryGenericsTests.java     |  24 +-
 .../DefaultSingletonBeanRegistryTests.java    |   9 +-
 .../testfixture/beans/MustBeInitialized.java  |   3 +-
 .../beans/testfixture/beans/Pet.java          |  12 +-
 .../caffeine/CaffeineCacheManagerTests.java   |  11 +-
 .../mail/javamail/JavaMailSenderTests.java    |  34 +-
 .../AspectJAutoProxyCreatorTests.java         |   9 +-
 .../aop/framework/AbstractAopProxyTests.java  | 109 +++---
 .../aop/framework/JdkDynamicProxyTests.java   |  12 +-
 .../aop/framework/ProxyFactoryBeanTests.java  |  16 +-
 .../autoproxy/AutoProxyCreatorTests.java      |  13 +-
 .../target/CommonsPool2TargetSourceTests.java |   4 +-
 .../context/LifecycleContextBean.java         |   9 +-
 ...notationConfigApplicationContextTests.java |  15 +-
 ...ommonAnnotationBeanPostProcessorTests.java |   7 +-
 .../ConfigurationClassAndBFPPTests.java       |  16 +-
 .../ConfigurationClassWithConditionTests.java |  16 +-
 ...figurationClassAspectIntegrationTests.java |   5 +-
 .../ConfigurationClassProcessingTests.java    |  10 +-
 .../event/ApplicationContextEventTests.java   |  19 +-
 .../event/PayloadApplicationEventTests.java   |   2 +-
 .../event/test/AbstractIdentifiable.java      |   8 +-
 .../context/event/test/GenericEventPojo.java  |   8 +-
 .../test/IdentifiableApplicationEvent.java    |   8 +-
 .../ConversionServiceFactoryBeanTests.java    |   5 +-
 .../format/number/NumberFormattingTests.java  |  16 +-
 ...tingConversionServiceFactoryBeanTests.java |  16 +-
 .../export/MBeanExporterOperationsTests.java  |  15 +-
 .../jmx/export/MBeanExporterTests.java        |   7 +-
 .../jmx/export/NotificationListenerTests.java |  26 +-
 .../assembler/AbstractJmxAssemblerTests.java  |  12 +-
 .../annotation/AsyncExecutionTests.java       |  31 +-
 .../ExecutorBeanDefinitionParserTests.java    |   8 +-
 .../scripting/groovy/MyBytecodeProcessor.java |   2 +-
 .../org/springframework/ui/ModelMapTests.java |  11 +-
 .../src/test/java/test/mixin/LockMixin.java   |   3 +-
 .../context/testfixture/SimpleMapScope.java   |   4 +-
 .../annotation/MergedAnnotationsTests.java    |   4 +-
 .../converter/ConvertingComparatorTests.java  |   2 +-
 .../util/AutoPopulatingListTests.java         |   2 +-
 .../util/ConcurrentReferenceHashMapTests.java |   2 +-
 .../util/ReflectionUtilsTests.java            |   4 +-
 .../util/StringUtilsTests.java                |  10 +-
 .../jdbc/core/AbstractRowMapperTests.java     |   2 +-
 .../jdbc/core/JdbcTemplateQueryTests.java     |   8 +-
 .../jdbc/core/JdbcTemplateTests.java          |  30 +-
 .../namedparam/NamedParameterQueryTests.java  |   8 +-
 .../jdbc/object/StoredProcedureTests.java     |  77 ++--
 ...LErrorCodeSQLExceptionTranslatorTests.java |   4 +-
 .../jms/core/JmsTemplateTests.java            |  48 +--
 .../SimpleMessageListenerContainerTests.java  |  59 ++--
 .../MessagingMessageListenerAdapterTests.java |   4 +-
 .../support/SimpleMessageConverterTests.java  |   9 +-
 .../MappingJackson2MessageConverterTests.java |   4 +-
 .../MappingJackson2MessageConverterTests.java |   4 +-
 .../core/GenericMessagingTemplateTests.java   |  16 +-
 .../MessageMappingMessageHandlerTests.java    |   2 +-
 ...faultMessageHandlerMethodFactoryTests.java |   8 +-
 .../SimpAttributesContextHolderTests.java     |   3 +-
 ...criptionMethodReturnValueHandlerTests.java |   4 +-
 .../StompBrokerRelayMessageHandlerTests.java  |   8 +-
 .../orm/jpa/JpaTransactionManagerTests.java   | 334 +++++++-----------
 ...rceptingClientHttpRequestFactoryTests.java |  70 +---
 ...gJackson2XmlHttpMessageConverterTests.java |   4 +-
 .../bind/ServletRequestDataBinderTests.java   |   8 +-
 .../request/async/DeferredResultTests.java    |   9 +-
 .../async/WebAsyncManagerErrorTests.java      |  15 +-
 .../async/WebAsyncManagerTimeoutTests.java    |   7 +-
 .../filter/HiddenHttpMethodFilterTests.java   |  15 +-
 .../annotation/ModelFactoryOrderingTests.java |  45 +--
 .../function/BodyExtractorsTests.java         |   2 +-
 .../function/server/RouterFunctionsTests.java |  10 +-
 .../resource/ResourceUrlProviderTests.java    |   2 +-
 .../context/LifecycleContextBean.java         |   9 +-
 .../XmlWebApplicationContextTests.java        |  29 +-
 .../support/HttpRequestHandlerTests.java      |  39 +-
 ...MvcConfigurationSupportExtensionTests.java |   8 +-
 .../DefaultEntityResponseBuilderTests.java    |   9 +-
 .../DefaultRenderingResponseTests.java        |  10 +-
 .../function/DefaultServerRequestTests.java   |   7 +-
 .../DefaultServerResponseBuilderTests.java    |  10 +-
 .../web/servlet/tags/form/SelectTagTests.java |   8 +-
 .../DefaultSimpUserRegistryTests.java         |   8 +-
 91 files changed, 578 insertions(+), 1060 deletions(-)

diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
index bd86cc9041d1..2f13da238f4e 100644
--- a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
+++ b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,6 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.ClassPathBeanDefinitionScanner;
 import org.springframework.context.annotation.ScopeMetadata;
-import org.springframework.context.annotation.ScopeMetadataResolver;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
@@ -307,29 +306,26 @@ private ApplicationContext createContext(final ScopedProxyMode scopedProxyMode)
 		GenericWebApplicationContext context = new GenericWebApplicationContext();
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		scanner.setIncludeAnnotationConfig(false);
-		scanner.setScopeMetadataResolver(new ScopeMetadataResolver() {
-			@Override
-			public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
-				ScopeMetadata metadata = new ScopeMetadata();
-				if (definition instanceof AnnotatedBeanDefinition) {
-					AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
-					for (String type : annDef.getMetadata().getAnnotationTypes()) {
-						if (type.equals(javax.inject.Singleton.class.getName())) {
-							metadata.setScopeName(BeanDefinition.SCOPE_SINGLETON);
-							break;
-						}
-						else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(javax.inject.Scope.class.getName())) {
-							metadata.setScopeName(type.substring(type.length() - 13, type.length() - 6).toLowerCase());
-							metadata.setScopedProxyMode(scopedProxyMode);
-							break;
-						}
-						else if (type.startsWith("javax.inject")) {
-							metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
-						}
+		scanner.setScopeMetadataResolver(definition -> {
+			ScopeMetadata metadata = new ScopeMetadata();
+			if (definition instanceof AnnotatedBeanDefinition) {
+				AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
+				for (String type : annDef.getMetadata().getAnnotationTypes()) {
+					if (type.equals(javax.inject.Singleton.class.getName())) {
+						metadata.setScopeName(BeanDefinition.SCOPE_SINGLETON);
+						break;
+					}
+					else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(javax.inject.Scope.class.getName())) {
+						metadata.setScopeName(type.substring(type.length() - 13, type.length() - 6).toLowerCase());
+						metadata.setScopedProxyMode(scopedProxyMode);
+						break;
+					}
+					else if (type.startsWith("javax.inject")) {
+						metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
 					}
 				}
-				return metadata;
 			}
+			return metadata;
 		});
 
 		// Scan twice in order to find errors in the bean definition compatibility check.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
index 9936573300d4..d135689decca 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
@@ -125,16 +125,7 @@ public void run() {
 				try {
 					this.proxy.exceptional(this.ex);
 				}
-				catch (RuntimeException ex) {
-					if (ex == this.ex) {
-						logger.debug("Expected exception thrown", ex);
-					}
-					else {
-						// should never happen
-						ex.printStackTrace();
-					}
-				}
-				catch (Error err) {
+				catch (RuntimeException | Error err) {
 					if (err == this.ex) {
 						logger.debug("Expected exception thrown", err);
 					}
diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
index 9f3bd08ec9f3..7569be3d881b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
@@ -43,13 +43,13 @@ protected void doTestTony(PropertyValues pvs) {
 		m.put("forname", "Tony");
 		m.put("surname", "Blair");
 		m.put("age", "50");
-		for (int i = 0; i < ps.length; i++) {
-			Object val = m.get(ps[i].getName());
+		for (PropertyValue element : ps) {
+			Object val = m.get(element.getName());
 			assertThat(val != null).as("Can't have unexpected value").isTrue();
 			boolean condition = val instanceof String;
 			assertThat(condition).as("Val i string").isTrue();
-			assertThat(val.equals(ps[i].getValue())).as("val matches expected").isTrue();
-			m.remove(ps[i].getName());
+			assertThat(val.equals(element.getValue())).as("val matches expected").isTrue();
+			m.remove(element.getName());
 		}
 		assertThat(m.size() == 0).as("Map size is 0").isTrue();
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
index e869c9c6c906..b3230e53e0ee 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
@@ -483,6 +483,7 @@ public Class<TestBean> getObjectType() {
 			return TestBean.class;
 		}
 
+		@Override
 		public TestBean getObject() {
 			// We don't really care if the actual instance is a singleton or prototype
 			// for the tests that use this factory.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 1617ccdf993f..d76579eaf218 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -48,8 +48,6 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.NotWritablePropertyException;
-import org.springframework.beans.PropertyEditorRegistrar;
-import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.TypeConverter;
 import org.springframework.beans.TypeMismatchException;
@@ -84,7 +82,6 @@
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.core.io.Resource;
@@ -990,16 +987,13 @@ void customEditor() {
 	@Test
 	void customConverter() {
 		GenericConversionService conversionService = new DefaultConversionService();
-		conversionService.addConverter(new Converter<String, Float>() {
-			@Override
-			public Float convert(String source) {
-				try {
-					NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
-					return nf.parse(source).floatValue();
-				}
-				catch (ParseException ex) {
-					throw new IllegalArgumentException(ex);
-				}
+		conversionService.addConverter(String.class, Float.class, source -> {
+			try {
+				NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
+				return nf.parse(source).floatValue();
+			}
+			catch (ParseException ex) {
+				throw new IllegalArgumentException(ex);
 			}
 		});
 		lbf.setConversionService(conversionService);
@@ -1014,12 +1008,9 @@ public Float convert(String source) {
 
 	@Test
 	void customEditorWithBeanReference() {
-		lbf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
-			@Override
-			public void registerCustomEditors(PropertyEditorRegistry registry) {
-				NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
-				registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true));
-			}
+		lbf.addPropertyEditorRegistrar(registry -> {
+			NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
+			registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true));
 		});
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("myFloat", new RuntimeBeanReference("myFloat"));
@@ -2718,8 +2709,12 @@ public void setBeanName(String name) {
 
 		@Override
 		public boolean equals(Object o) {
-			if (this == o) return true;
-			if (o == null || getClass() != o.getClass()) return false;
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
 			ConstructorDependency that = (ConstructorDependency) o;
 			return spouseAge == that.spouseAge &&
 					Objects.equals(spouse, that.spouse) &&
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
index c746f21949e8..b2ad93854e2a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -3660,11 +3659,8 @@ public static class MocksControl {
 		@SuppressWarnings("unchecked")
 		public <T> T createMock(Class<T> toMock) {
 			return (T) Proxy.newProxyInstance(AutowiredAnnotationBeanPostProcessorTests.class.getClassLoader(), new Class<?>[] {toMock},
-					new InvocationHandler() {
-						@Override
-						public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-							throw new UnsupportedOperationException("mocked!");
-						}
+					(InvocationHandler) (proxy, method, args) -> {
+						throw new UnsupportedOperationException("mocked!");
 					});
 		}
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
index a94425ccf1aa..48a87a9a7739 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
@@ -29,7 +29,6 @@
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyEditorRegistrar;
-import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -50,12 +49,7 @@ public void testCustomEditorConfigurerWithPropertyEditorRegistrar() throws Parse
 		CustomEditorConfigurer cec = new CustomEditorConfigurer();
 		final DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN);
 		cec.setPropertyEditorRegistrars(new PropertyEditorRegistrar[] {
-				new PropertyEditorRegistrar() {
-					@Override
-					public void registerCustomEditors(PropertyEditorRegistry registry) {
-						registry.registerCustomEditor(Date.class, new CustomDateEditor(df, true));
-					}
-				}});
+				registry -> registry.registerCustomEditor(Date.class, new CustomDateEditor(df, true))});
 		cec.postProcessBeanFactory(bf);
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
index fae712817bd5..810b24778330 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
@@ -113,7 +113,7 @@ public void testGetObjectType() throws Exception {
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello");
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<>(), "hello");
 		mcfb.afterPropertiesSet();
 		mcfb.getObjectType();
 
@@ -184,7 +184,7 @@ public void testGetObject() throws Exception {
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello");
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<>(), "hello");
 		// should pass
 		mcfb.afterPropertiesSet();
 	}
@@ -194,7 +194,7 @@ public void testArgumentConversion() throws Exception {
 		MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello", "bogus");
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<>(), "hello", "bogus");
 		assertThatExceptionOfType(NoSuchMethodException.class).as(
 				"Matched method with wrong number of args").isThrownBy(
 						mcfb::afterPropertiesSet);
@@ -210,14 +210,14 @@ public void testArgumentConversion() throws Exception {
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes2");
-		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello", "bogus");
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<>(), "hello", "bogus");
 		mcfb.afterPropertiesSet();
 		assertThat(mcfb.getObject()).isEqualTo("hello");
 
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes2");
-		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), new Object());
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<>(), new Object());
 		assertThatExceptionOfType(NoSuchMethodException.class).as(
 				"Matched method when shouldn't have matched").isThrownBy(
 						mcfb::afterPropertiesSet);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index 5a981f91e54c..ef53180c6a60 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -17,7 +17,6 @@
 package org.springframework.beans.factory.support;
 
 import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -34,8 +33,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import org.springframework.beans.PropertyEditorRegistrar;
-import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.beans.factory.ObjectProvider;
@@ -409,12 +406,7 @@ void testGenericMapWithKeyTypeConstructor() {
 	@Test
 	void testGenericMapWithCollectionValueConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
-			@Override
-			public void registerCustomEditors(PropertyEditorRegistry registry) {
-				registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false));
-			}
-		});
+		bf.addPropertyEditorRegistrar(registry -> registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)));
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
 		Map<String, AbstractCollection<?>> input = new HashMap<>();
@@ -568,12 +560,7 @@ void testGenericMapWithKeyTypeFactoryMethod() {
 	@Test
 	void testGenericMapWithCollectionValueFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
-			@Override
-			public void registerCustomEditors(PropertyEditorRegistry registry) {
-				registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false));
-			}
-		});
+		bf.addPropertyEditorRegistrar(registry -> registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)));
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
 
@@ -1010,11 +997,8 @@ public static class MocksControl {
 		@SuppressWarnings("unchecked")
 		public <T> T createMock(Class<T> toMock) {
 			return (T) Proxy.newProxyInstance(BeanFactoryGenericsTests.class.getClassLoader(), new Class<?>[] {toMock},
-					new InvocationHandler() {
-						@Override
-						public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-							throw new UnsupportedOperationException("mocked!");
-						}
+					(InvocationHandler) (proxy, method, args) -> {
+						throw new UnsupportedOperationException("mocked!");
 					});
 		}
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
index 6e3f8465e9e8..b7bc696c68d5 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
@@ -18,8 +18,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.testfixture.beans.DerivedTestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 
@@ -40,12 +38,7 @@ public void testSingletons() {
 		beanRegistry.registerSingleton("tb", tb);
 		assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
 
-		TestBean tb2 = (TestBean) beanRegistry.getSingleton("tb2", new ObjectFactory<Object>() {
-			@Override
-			public Object getObject() throws BeansException {
-				return new TestBean();
-			}
-		});
+		TestBean tb2 = (TestBean) beanRegistry.getSingleton("tb2", () -> new TestBean());
 		assertThat(beanRegistry.getSingleton("tb2")).isSameAs(tb2);
 
 		assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/MustBeInitialized.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/MustBeInitialized.java
index 2e53ce2f885a..3ca9a82d72f3 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/MustBeInitialized.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/MustBeInitialized.java
@@ -40,8 +40,9 @@ public void afterPropertiesSet() throws Exception {
 	 * managed the bean's lifecycle correctly
 	 */
 	public void businessMethod() {
-		if (!this.inited)
+		if (!this.inited) {
 			throw new RuntimeException("Factory didn't call afterPropertiesSet() on MustBeInitialized object");
+		}
 	}
 
 }
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Pet.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Pet.java
index 661eff92feb7..7b725d39c9b5 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Pet.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/Pet.java
@@ -39,12 +39,18 @@ public String toString() {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 
 		final Pet pet = (Pet) o;
 
-		if (name != null ? !name.equals(pet.name) : pet.name != null) return false;
+		if (name != null ? !name.equals(pet.name) : pet.name != null) {
+			return false;
+		}
 
 		return true;
 	}
diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java
index e90a3ece9363..f8c0de21f2d7 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java
@@ -178,14 +178,11 @@ public void setCacheNameNullRestoreDynamicMode() {
 	@Test
 	public void cacheLoaderUseLoadingCache() {
 		CaffeineCacheManager cm = new CaffeineCacheManager("c1");
-		cm.setCacheLoader(new CacheLoader<Object, Object>() {
-			@Override
-			public Object load(Object key) throws Exception {
-				if ("ping".equals(key)) {
-					return "pong";
-				}
-				throw new IllegalArgumentException("I only know ping");
+		cm.setCacheLoader(key -> {
+			if ("ping".equals(key)) {
+				return "pong";
 			}
+			throw new IllegalArgumentException("I only know ping");
 		});
 		Cache cache1 = cm.getCache("c1");
 		Cache.ValueWrapper value = cache1.get("ping");
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
index 3bd467b9106e..47045905723c 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
+++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
@@ -182,12 +182,9 @@ public void javaMailSenderWithMimeMessagePreparator() {
 
 		final List<Message> messages = new ArrayList<>();
 
-		MimeMessagePreparator preparator = new MimeMessagePreparator() {
-			@Override
-			public void prepare(MimeMessage mimeMessage) throws MessagingException {
-				mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("you@mail.org"));
-				messages.add(mimeMessage);
-			}
+		MimeMessagePreparator preparator = mimeMessage -> {
+			mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("you@mail.org"));
+			messages.add(mimeMessage);
 		};
 		sender.send(preparator);
 
@@ -208,19 +205,13 @@ public void javaMailSenderWithMimeMessagePreparators() {
 
 		final List<Message> messages = new ArrayList<>();
 
-		MimeMessagePreparator preparator1 = new MimeMessagePreparator() {
-			@Override
-			public void prepare(MimeMessage mimeMessage) throws MessagingException {
-				mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("he@mail.org"));
-				messages.add(mimeMessage);
-			}
+		MimeMessagePreparator preparator1 = mimeMessage -> {
+			mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("he@mail.org"));
+			messages.add(mimeMessage);
 		};
-		MimeMessagePreparator preparator2 = new MimeMessagePreparator() {
-			@Override
-			public void prepare(MimeMessage mimeMessage) throws MessagingException {
-				mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("she@mail.org"));
-				messages.add(mimeMessage);
-			}
+		MimeMessagePreparator preparator2 = mimeMessage -> {
+			mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("she@mail.org"));
+			messages.add(mimeMessage);
 		};
 		sender.send(preparator1, preparator2);
 
@@ -323,12 +314,7 @@ public void javaMailSenderWithParseExceptionOnSimpleMessage() {
 	@Test
 	public void javaMailSenderWithParseExceptionOnMimeMessagePreparator() {
 		MockJavaMailSender sender = new MockJavaMailSender();
-		MimeMessagePreparator preparator = new MimeMessagePreparator() {
-			@Override
-			public void prepare(MimeMessage mimeMessage) throws MessagingException {
-				mimeMessage.setFrom(new InternetAddress(""));
-			}
-		};
+		MimeMessagePreparator preparator = mimeMessage -> mimeMessage.setFrom(new InternetAddress(""));
 		try {
 			sender.send(preparator);
 		}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index d841044f2650..91e58722fea2 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -557,12 +557,7 @@ class TestBeanAdvisor extends StaticMethodMatcherPointcutAdvisor {
 	public int count;
 
 	public TestBeanAdvisor() {
-		setAdvice(new MethodBeforeAdvice() {
-			@Override
-			public void before(Method method, Object[] args, @Nullable Object target) throws Throwable {
-				++count;
-			}
-		});
+		setAdvice((MethodBeforeAdvice) (method, args, target) -> ++count);
 	}
 
 	@Override
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
index db27a571fc40..76b7d336af56 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -372,17 +372,14 @@ public void testNoContext() throws Throwable {
 	private void testContext(final boolean context) throws Throwable {
 		final String s = "foo";
 		// Test return value
-		MethodInterceptor mi = new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation invocation) throws Throwable {
-				if (!context) {
-					assertNoInvocationContext();
-				}
-				else {
-					assertThat(ExposeInvocationInterceptor.currentInvocation()).as("have context").isNotNull();
-				}
-				return s;
+		MethodInterceptor mi = invocation -> {
+			if (!context) {
+				assertNoInvocationContext();
 			}
+			else {
+				assertThat(ExposeInvocationInterceptor.currentInvocation()).as("have context").isNotNull();
+			}
+			return s;
 		};
 		AdvisedSupport pc = new AdvisedSupport(ITestBean.class);
 		if (context) {
@@ -422,11 +419,8 @@ public void testTargetReturnsThis() throws Throwable {
 	public void testDeclaredException() throws Throwable {
 		final Exception expectedException = new Exception();
 		// Test return value
-		MethodInterceptor mi = new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation invocation) throws Throwable {
-				throw expectedException;
-			}
+		MethodInterceptor mi = invocation -> {
+			throw expectedException;
 		};
 		AdvisedSupport pc = new AdvisedSupport(ITestBean.class);
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
@@ -453,11 +447,8 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 	public void testUndeclaredCheckedException() throws Throwable {
 		final Exception unexpectedException = new Exception();
 		// Test return value
-		MethodInterceptor mi = new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation invocation) throws Throwable {
-				throw unexpectedException;
-			}
+		MethodInterceptor mi = invocation -> {
+			throw unexpectedException;
 		};
 		AdvisedSupport pc = new AdvisedSupport(ITestBean.class);
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
@@ -477,11 +468,8 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 	public void testUndeclaredUncheckedException() throws Throwable {
 		final RuntimeException unexpectedException = new RuntimeException();
 		// Test return value
-		MethodInterceptor mi = new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation invocation) throws Throwable {
-				throw unexpectedException;
-			}
+		MethodInterceptor mi = invocation -> {
+			throw unexpectedException;
 		};
 		AdvisedSupport pc = new AdvisedSupport(ITestBean.class);
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
@@ -660,12 +648,7 @@ public void testAdviceImplementsIntroductionInfo() throws Throwable {
 		NopInterceptor di = new NopInterceptor();
 		pc.addAdvice(di);
 		final long ts = 37;
-		pc.addAdvice(new DelegatingIntroductionInterceptor(new TimeStamped() {
-			@Override
-			public long getTimeStamp() {
-				return ts;
-			}
-		}));
+		pc.addAdvice(new DelegatingIntroductionInterceptor((TimeStamped) () -> ts));
 
 		ITestBean proxied = (ITestBean) createProxy(pc);
 		assertThat(proxied.getName()).isEqualTo(name);
@@ -1039,17 +1022,14 @@ public void testCloneInvocationToProceedThreeTimes() throws Throwable {
 		ProxyFactory pc = new ProxyFactory(tb);
 		pc.addInterface(ITestBean.class);
 
-		MethodInterceptor twoBirthdayInterceptor = new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation mi) throws Throwable {
-				// Clone the invocation to proceed three times
-				// "The Moor's Last Sigh": this technology can cause premature aging
-				MethodInvocation clone1 = ((ReflectiveMethodInvocation) mi).invocableClone();
-				MethodInvocation clone2 = ((ReflectiveMethodInvocation) mi).invocableClone();
-				clone1.proceed();
-				clone2.proceed();
-				return mi.proceed();
-			}
+		MethodInterceptor twoBirthdayInterceptor = mi -> {
+			// Clone the invocation to proceed three times
+			// "The Moor's Last Sigh": this technology can cause premature aging
+			MethodInvocation clone1 = ((ReflectiveMethodInvocation) mi).invocableClone();
+			MethodInvocation clone2 = ((ReflectiveMethodInvocation) mi).invocableClone();
+			clone1.proceed();
+			clone2.proceed();
+			return mi.proceed();
 		};
 		@SuppressWarnings("serial")
 		StaticMethodMatcherPointcutAdvisor advisor = new StaticMethodMatcherPointcutAdvisor(twoBirthdayInterceptor) {
@@ -1082,16 +1062,13 @@ public void testCanChangeArgumentsIndependentlyOnClonedInvocation() throws Throw
 		/**
 		 * Changes the name, then changes it back.
 		 */
-		MethodInterceptor nameReverter = new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation mi) throws Throwable {
-				MethodInvocation clone = ((ReflectiveMethodInvocation) mi).invocableClone();
-				String oldName = ((ITestBean) mi.getThis()).getName();
-				clone.getArguments()[0] = oldName;
-				// Original method invocation should be unaffected by changes to argument list of clone
-				mi.proceed();
-				return clone.proceed();
-			}
+		MethodInterceptor nameReverter = mi -> {
+			MethodInvocation clone = ((ReflectiveMethodInvocation) mi).invocableClone();
+			String oldName = ((ITestBean) mi.getThis()).getName();
+			clone.getArguments()[0] = oldName;
+			// Original method invocation should be unaffected by changes to argument list of clone
+			mi.proceed();
+			return clone.proceed();
 		};
 
 		class NameSaver implements MethodInterceptor {
@@ -1347,8 +1324,9 @@ public void testBeforeAdviceThrowsException() {
 			@Override
 			public void before(Method m, Object[] args, Object target) throws Throwable {
 				super.before(m, args, target);
-				if (m.getName().startsWith("set"))
+				if (m.getName().startsWith("set")) {
 					throw rex;
+				}
 			}
 		};
 
@@ -1563,13 +1541,10 @@ public Object invoke(MethodInvocation mi) throws Throwable {
 	@SuppressWarnings("serial")
 	protected static class StringSetterNullReplacementAdvice extends DefaultPointcutAdvisor {
 
-		private static MethodInterceptor cleaner = new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation mi) throws Throwable {
-				// We know it can only be invoked if there's a single parameter of type string
-				mi.getArguments()[0] = "";
-				return mi.proceed();
-			}
+		private static MethodInterceptor cleaner = mi -> {
+			// We know it can only be invoked if there's a single parameter of type string
+			mi.getArguments()[0] = "";
+			return mi.proceed();
 		};
 
 		public StringSetterNullReplacementAdvice() {
@@ -1601,7 +1576,9 @@ public TestDynamicPointcutAdvice(MethodInterceptor mi, final String pattern) {
 				@Override
 				public boolean matches(Method m, @Nullable Class<?> targetClass, Object... args) {
 					boolean run = m.getName().contains(pattern);
-					if (run) ++count;
+					if (run) {
+						++count;
+					}
 					return run;
 				}
 			});
@@ -1620,7 +1597,9 @@ public TestDynamicPointcutForSettersOnly(MethodInterceptor mi, final String patt
 				@Override
 				public boolean matches(Method m, @Nullable Class<?> targetClass, Object... args) {
 					boolean run = m.getName().contains(pattern);
-					if (run) ++count;
+					if (run) {
+						++count;
+					}
 					return run;
 				}
 				@Override
@@ -1924,8 +1903,9 @@ public Object getTarget() throws Exception {
 		 */
 		@Override
 		public void releaseTarget(Object pTarget) throws Exception {
-			if (pTarget != this.target)
+			if (pTarget != this.target) {
 				throw new RuntimeException("Released wrong target");
+			}
 			++releases;
 		}
 
@@ -1934,8 +1914,9 @@ public void releaseTarget(Object pTarget) throws Exception {
 		 *
 		 */
 		public void verify() {
-			if (gets != releases)
+			if (gets != releases) {
 				throw new RuntimeException("Expectation failed: " + gets + " gets and " + releases + " releases");
+			}
 		}
 
 		/**
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
index 306c3d49909d..50b26ed19f9e 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -198,10 +198,16 @@ public String getName() {
 
 		@Override
 		public boolean equals(Object o) {
-			if (this == o) return true;
-			if (o == null || getClass() != o.getClass()) return false;
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
 			Person person = (Person) o;
-			if (!name.equals(person.name)) return false;
+			if (!name.equals(person.name)) {
+				return false;
+			}
 			return true;
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index 91d85d35dadd..3495ae05f92c 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -304,11 +304,8 @@ public void testCanGetFactoryReferenceAndManipulate() {
 
 		final Exception ex = new UnsupportedOperationException("invoke");
 		// Add evil interceptor to head of list
-		config.addAdvice(0, new MethodInterceptor() {
-			@Override
-			public Object invoke(MethodInvocation invocation) throws Throwable {
-				throw ex;
-			}
+		config.addAdvice(0, (MethodInterceptor) invocation -> {
+			throw ex;
 		});
 		assertThat(config.getAdvisors().length).as("Have correct advisor count").isEqualTo(2);
 
@@ -691,12 +688,9 @@ public static void reset() {
 		}
 
 		public PointcutForVoid() {
-			setAdvice(new MethodInterceptor() {
-				@Override
-				public Object invoke(MethodInvocation invocation) throws Throwable {
-					methodNames.add(invocation.getMethod().getName());
-					return invocation.proceed();
-				}
+			setAdvice((MethodInterceptor) invocation -> {
+				methodNames.add(invocation.getMethod().getName());
+				return invocation.proceed();
 			});
 			setPointcut(new DynamicMethodMatcherPointcut() {
 				@Override
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
index eb39f93218cf..901c88665d5f 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 package org.springframework.aop.framework.autoproxy;
 
 import java.io.Serializable;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
 import org.aopalliance.intercept.MethodInterceptor;
@@ -434,6 +432,7 @@ public FallbackTestAutoProxyCreator() {
 	@SuppressWarnings("serial")
 	public static class IntroductionTestAutoProxyCreator extends TestAutoProxyCreator {
 
+		@Override
 		protected Object[] getAdvicesAndAdvisors() {
 			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(this.testInterceptor);
 			advisor.addInterface(Serializable.class);
@@ -491,12 +490,8 @@ public static class CustomProxyFactoryBean implements FactoryBean<ITestBean> {
 
 		@Override
 		public ITestBean getObject() {
-			return (ITestBean) Proxy.newProxyInstance(CustomProxyFactoryBean.class.getClassLoader(), new Class<?>[]{ITestBean.class}, new InvocationHandler() {
-				@Override
-				public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-					return ReflectionUtils.invokeMethod(method, tb, args);
-				}
-			});
+			return (ITestBean) Proxy.newProxyInstance(CustomProxyFactoryBean.class.getClassLoader(), new Class<?>[]{ITestBean.class},
+					(proxy, method, args) -> ReflectionUtils.invokeMethod(method, tb, args));
 		}
 
 		@Override
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
index 6708435685c1..d366fb6c6052 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
@@ -158,8 +158,8 @@ void testHitMaxSize() throws Exception {
 		pooledInstances[9] = targetSource.getTarget();
 
 		// release all objects
-		for (int i = 0; i < pooledInstances.length; i++) {
-			targetSource.releaseTarget(pooledInstances[i]);
+		for (Object element : pooledInstances) {
+			targetSource.releaseTarget(element);
 		}
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
index 1f04eb182ccc..b05fcb658b76 100644
--- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -33,21 +33,24 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		super.setBeanFactory(beanFactory);
-		if (this.owningContext != null)
+		if (this.owningContext != null) {
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
+		}
 	}
 
 	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
-		if (this.owningContext == null)
+		if (this.owningContext == null) {
 			throw new RuntimeException("Factory didn't call setApplicationContext before afterPropertiesSet on lifecycle bean");
+		}
 	}
 
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		if (this.owningFactory == null)
+		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
+		}
 
 		this.owningContext = applicationContext;
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
index 336432ff0c77..566a445288c4 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
@@ -544,19 +544,24 @@ public int hashCode() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		TestBean other = (TestBean) obj;
 		if (name == null) {
-			if (other.name != null)
+			if (other.name != null) {
 				return false;
+			}
 		}
-		else if (!name.equals(other.name))
+		else if (!name.equals(other.name)) {
 			return false;
+		}
 		return true;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
index 3d300b71dbe0..e943d4d8f2fd 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
@@ -215,12 +215,7 @@ public void testResourceInjectionWithResolvableDependencyType() {
 		bf.registerBeanDefinition("testBean4", tbd);
 
 		bf.registerResolvableDependency(BeanFactory.class, bf);
-		bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory<Object>() {
-			@Override
-			public Object getObject() throws BeansException {
-				return new NestedTestBean();
-			}
-		});
+		bf.registerResolvableDependency(INestedTestBean.class, (ObjectFactory<Object>) () -> new NestedTestBean());
 
 		@SuppressWarnings("deprecation")
 		org.springframework.beans.factory.config.PropertyPlaceholderConfigurer ppc = new org.springframework.beans.factory.config.PropertyPlaceholderConfigurer();
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
index 21324a769edc..641b4d7ceaae 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
@@ -18,10 +18,8 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.testfixture.beans.TestBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -72,11 +70,8 @@ static class AutowiredConfigWithBFPPAsInstanceMethod {
 
 		@Bean
 		public BeanFactoryPostProcessor bfpp() {
-			return new BeanFactoryPostProcessor() {
-				@Override
-				public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-					// no-op
-				}
+			return beanFactory -> {
+				// no-op
 			};
 		}
 	}
@@ -88,11 +83,8 @@ static class AutowiredConfigWithBFPPAsStaticMethod {
 
 		@Bean
 		public static final BeanFactoryPostProcessor bfpp() {
-			return new BeanFactoryPostProcessor() {
-				@Override
-				public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-					// no-op
-				}
+			return beanFactory -> {
+				// no-op
 			};
 		}
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java
index 5a434faa2074..e5593c5d8731 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java
@@ -291,7 +291,9 @@ public ExampleBean bean1() {
 	static class ImportsNotCreated {
 
 		static {
-			if (true) throw new RuntimeException();
+			if (true) {
+				throw new RuntimeException();
+			}
 		}
 	}
 
@@ -299,14 +301,18 @@ static class ImportsNotCreated {
 	static class ConfigurationNotCreated {
 
 		static {
-			if (true) throw new RuntimeException();
+			if (true) {
+				throw new RuntimeException();
+			}
 		}
 	}
 
 	static class RegistrarNotCreated implements ImportBeanDefinitionRegistrar {
 
 		static {
-			if (true) throw new RuntimeException();
+			if (true) {
+				throw new RuntimeException();
+			}
 		}
 
 		@Override
@@ -318,7 +324,9 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
 	static class ImportSelectorNotCreated implements ImportSelector {
 
 		static {
-			if (true) throw new RuntimeException();
+			if (true) {
+				throw new RuntimeException();
+			}
 		}
 
 		@Override
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
index d46c3a44f548..28f8ce8e23d5 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
@@ -136,10 +136,7 @@ public static class Application {
 
 		@Bean
 		Runnable fromInnerClass() {
-			return new Runnable() {
-				@Override
-				public void run() {
-				}
+			return () -> {
 			};
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
index ce9033334c04..a9660103ed83 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
@@ -39,7 +39,6 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.config.ListFactoryBean;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
@@ -559,12 +558,9 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 
 		// @Bean
 		public BeanFactoryPostProcessor beanFactoryPostProcessor() {
-			return new BeanFactoryPostProcessor() {
-				@Override
-				public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
-					BeanDefinition bd = beanFactory.getBeanDefinition("beanPostProcessor");
-					bd.getPropertyValues().addPropertyValue("nameSuffix", "-processed-" + myProp);
-				}
+			return beanFactory -> {
+				BeanDefinition bd = beanFactory.getBeanDefinition("beanPostProcessor");
+				bd.getPropertyValues().addPropertyValue("nameSuffix", "-processed-" + myProp);
 			};
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 331336a848ad..ff72d9780e7f 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,7 +20,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.Executor;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.jupiter.api.Test;
@@ -141,12 +140,9 @@ public void simpleApplicationEventMulticasterWithTaskExecutor() {
 		ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext());
 
 		SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster();
-		smc.setTaskExecutor(new Executor() {
-			@Override
-			public void execute(Runnable command) {
-				command.run();
-				command.run();
-			}
+		smc.setTaskExecutor(command -> {
+			command.run();
+			command.run();
 		});
 		smc.addApplicationListener(listener);
 
@@ -429,12 +425,7 @@ public void innerBeanAsListener() {
 	public void anonymousClassAsListener() {
 		final Set<MyEvent> seenEvents = new HashSet<>();
 		StaticApplicationContext context = new StaticApplicationContext();
-		context.addApplicationListener(new ApplicationListener<MyEvent>() {
-			@Override
-			public void onApplicationEvent(MyEvent event) {
-				seenEvents.add(event);
-			}
-		});
+		context.addApplicationListener((MyEvent event) -> seenEvents.add(event));
 		context.refresh();
 
 		MyEvent event1 = new MyEvent(context);
diff --git a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
index c752623bb55f..2bcef2d552a1 100644
--- a/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/PayloadApplicationEventTests.java
@@ -65,7 +65,7 @@ public void testProgrammaticEventListener() {
 	public void testProgrammaticPayloadListener() {
 		List<String> events = new ArrayList<>();
 		ApplicationListener<PayloadApplicationEvent<String>> listener = ApplicationListener.forPayload(events::add);
-		ApplicationListener<PayloadApplicationEvent<Integer>> mismatch = ApplicationListener.forPayload(payload -> payload.intValue());
+		ApplicationListener<PayloadApplicationEvent<Integer>> mismatch = ApplicationListener.forPayload(Integer::intValue);
 
 		ConfigurableApplicationContext ac = new GenericApplicationContext();
 		ac.addApplicationListener(listener);
diff --git a/spring-context/src/test/java/org/springframework/context/event/test/AbstractIdentifiable.java b/spring-context/src/test/java/org/springframework/context/event/test/AbstractIdentifiable.java
index 7dd8f260ce5f..3a19e4a69223 100644
--- a/spring-context/src/test/java/org/springframework/context/event/test/AbstractIdentifiable.java
+++ b/spring-context/src/test/java/org/springframework/context/event/test/AbstractIdentifiable.java
@@ -36,8 +36,12 @@ public String getId() {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 
 		AbstractIdentifiable that = (AbstractIdentifiable) o;
 
diff --git a/spring-context/src/test/java/org/springframework/context/event/test/GenericEventPojo.java b/spring-context/src/test/java/org/springframework/context/event/test/GenericEventPojo.java
index b2d1bc6b6f9f..79554e0f6460 100644
--- a/spring-context/src/test/java/org/springframework/context/event/test/GenericEventPojo.java
+++ b/spring-context/src/test/java/org/springframework/context/event/test/GenericEventPojo.java
@@ -38,8 +38,12 @@ public ResolvableType getResolvableType() {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 
 		GenericEventPojo<?> that = (GenericEventPojo<?>) o;
 
diff --git a/spring-context/src/test/java/org/springframework/context/event/test/IdentifiableApplicationEvent.java b/spring-context/src/test/java/org/springframework/context/event/test/IdentifiableApplicationEvent.java
index b22517905572..20b84cf49988 100644
--- a/spring-context/src/test/java/org/springframework/context/event/test/IdentifiableApplicationEvent.java
+++ b/spring-context/src/test/java/org/springframework/context/event/test/IdentifiableApplicationEvent.java
@@ -50,8 +50,12 @@ public String getId() {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 
 		IdentifiableApplicationEvent that = (IdentifiableApplicationEvent) o;
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index ec96b605143c..d46d9fb61fa9 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -99,8 +99,7 @@ public void createDefaultConversionServiceWithInvalidSupplements() {
 		Set<Object> converters = new HashSet<>();
 		converters.add("bogus");
 		factory.setConverters(converters);
-		assertThatIllegalArgumentException().isThrownBy(
-				factory::afterPropertiesSet);
+		assertThatIllegalArgumentException().isThrownBy(factory::afterPropertiesSet);
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
index 406d6549f9e3..609927bdf05e 100644
--- a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
+++ b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
@@ -30,7 +30,6 @@
 import org.springframework.format.annotation.NumberFormat;
 import org.springframework.format.annotation.NumberFormat.Style;
 import org.springframework.format.support.FormattingConversionService;
-import org.springframework.util.StringValueResolver;
 import org.springframework.validation.DataBinder;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -49,15 +48,12 @@ public class NumberFormattingTests {
 	@BeforeEach
 	public void setUp() {
 		DefaultConversionService.addDefaultConverters(conversionService);
-		conversionService.setEmbeddedValueResolver(new StringValueResolver() {
-			@Override
-			public String resolveStringValue(String strVal) {
-				if ("${pattern}".equals(strVal)) {
-					return "#,##.00";
-				}
-				else {
-					return strVal;
-				}
+		conversionService.setEmbeddedValueResolver(strVal -> {
+			if ("${pattern}".equals(strVal)) {
+				return "#,##.00";
+			}
+			else {
+				return strVal;
 			}
 		});
 		conversionService.addFormatterForFieldType(Number.class, new NumberStyleFormatter());
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
index 8b8aacf6dd56..ddfdeb002d91 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -189,24 +189,14 @@ public Set<Class<?>> getFieldTypes() {
 		public Printer<?> getPrinter(SpecialInt annotation, Class<?> fieldType) {
 			assertThat(annotation.value()).isEqualTo("aliased");
 			assertThat(annotation.alias()).isEqualTo("aliased");
-			return new Printer<Integer>() {
-				@Override
-				public String print(Integer object, Locale locale) {
-					return ":" + object.toString();
-				}
-			};
+			return (object, locale) -> ":" + object.toString();
 		}
 
 		@Override
 		public Parser<?> getParser(SpecialInt annotation, Class<?> fieldType) {
 			assertThat(annotation.value()).isEqualTo("aliased");
 			assertThat(annotation.alias()).isEqualTo("aliased");
-			return new Parser<Integer>() {
-				@Override
-				public Integer parse(String text, Locale locale) throws ParseException {
-					return Integer.parseInt(text.substring(1));
-				}
-			};
+			return (text, locale) -> Integer.parseInt(text.substring(1));
 		}
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
index b850799ebdbe..c6f1a444dac9 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
@@ -27,7 +27,6 @@
 
 import org.springframework.jmx.AbstractMBeanServerTests;
 import org.springframework.jmx.JmxTestBean;
-import org.springframework.jmx.export.naming.ObjectNamingStrategy;
 import org.springframework.jmx.support.ObjectNameManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -74,12 +73,7 @@ void testRegisterManagedResourceWithGeneratedObjectName() throws Exception {
 
 		MBeanExporter exporter = new MBeanExporter();
 		exporter.setServer(getServer());
-		exporter.setNamingStrategy(new ObjectNamingStrategy() {
-			@Override
-			public ObjectName getObjectName(Object managedBean, String beanKey) {
-				return objectNameTemplate;
-			}
-		});
+		exporter.setNamingStrategy((managedBean, beanKey) -> objectNameTemplate);
 
 		JmxTestBean bean1 = new JmxTestBean();
 		JmxTestBean bean2 = new JmxTestBean();
@@ -101,12 +95,7 @@ void testRegisterManagedResourceWithGeneratedObjectNameWithoutUniqueness() throw
 		MBeanExporter exporter = new MBeanExporter();
 		exporter.setServer(getServer());
 		exporter.setEnsureUniqueRuntimeObjectNames(false);
-		exporter.setNamingStrategy(new ObjectNamingStrategy() {
-			@Override
-			public ObjectName getObjectName(Object managedBean, String beanKey) {
-				return objectNameTemplate;
-			}
-		});
+		exporter.setNamingStrategy((managedBean, beanKey) -> objectNameTemplate);
 
 		JmxTestBean bean1 = new JmxTestBean();
 		JmxTestBean bean2 = new JmxTestBean();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
index 988e068a0b1b..20affb977458 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
@@ -90,11 +90,8 @@ void testRegisterNullNotificationListenerType() throws Exception {
 	@Test
 	void testRegisterNotificationListenerForNonExistentMBean() throws Exception {
 		Map<String, NotificationListener> listeners = new HashMap<>();
-		NotificationListener dummyListener = new NotificationListener() {
-			@Override
-			public void handleNotification(Notification notification, Object handback) {
-				throw new UnsupportedOperationException();
-			}
+		NotificationListener dummyListener = (notification, handback) -> {
+			throw new UnsupportedOperationException();
 		};
 		// the MBean with the supplied object name does not exist...
 		listeners.put("spring:type=Test", dummyListener);
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
index d38eb831901a..c842a656fd37 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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 javax.management.AttributeChangeNotification;
 import javax.management.MalformedObjectNameException;
 import javax.management.Notification;
-import javax.management.NotificationFilter;
 import javax.management.NotificationListener;
 import javax.management.ObjectName;
 
@@ -117,7 +116,7 @@ public void testRegisterNotificationListenerWithHandback() throws Exception {
 		MBeanExporter exporter = new MBeanExporter();
 		exporter.setServer(server);
 		exporter.setBeans(beans);
-		exporter.setNotificationListeners(new NotificationListenerBean[] { listenerBean });
+		exporter.setNotificationListeners(listenerBean);
 		start(exporter);
 
 		// update the attribute
@@ -145,7 +144,7 @@ public void testRegisterNotificationListenerForAllMBeans() throws Exception {
 		MBeanExporter exporter = new MBeanExporter();
 		exporter.setServer(server);
 		exporter.setBeans(beans);
-		exporter.setNotificationListeners(new NotificationListenerBean[] { listenerBean });
+		exporter.setNotificationListeners(listenerBean);
 		start(exporter);
 
 		// update the attribute
@@ -168,23 +167,20 @@ public void testRegisterNotificationListenerWithFilter() throws Exception {
 
 		NotificationListenerBean listenerBean = new NotificationListenerBean();
 		listenerBean.setNotificationListener(listener);
-		listenerBean.setNotificationFilter(new NotificationFilter() {
-			@Override
-			public boolean isNotificationEnabled(Notification notification) {
-				if (notification instanceof AttributeChangeNotification) {
-					AttributeChangeNotification changeNotification = (AttributeChangeNotification) notification;
-					return "Name".equals(changeNotification.getAttributeName());
-				}
-				else {
-					return false;
-				}
+		listenerBean.setNotificationFilter(notification -> {
+			if (notification instanceof AttributeChangeNotification) {
+				AttributeChangeNotification changeNotification = (AttributeChangeNotification) notification;
+				return "Name".equals(changeNotification.getAttributeName());
+			}
+			else {
+				return false;
 			}
 		});
 
 		MBeanExporter exporter = new MBeanExporter();
 		exporter.setServer(server);
 		exporter.setBeans(beans);
-		exporter.setNotificationListeners(new NotificationListenerBean[] { listenerBean });
+		exporter.setNotificationListeners(listenerBean);
 		start(exporter);
 
 		// update the attributes
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
index c754af69ca15..b685aa9caf78 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
@@ -83,9 +83,9 @@ public void testGetMBeanAttributeInfo() throws Exception {
 		MBeanAttributeInfo[] inf = info.getAttributes();
 		assertThat(inf).as("Invalid number of Attributes returned").hasSize(getExpectedAttributeCount());
 
-		for (int x = 0; x < inf.length; x++) {
-			assertThat(inf[x]).as("MBeanAttributeInfo should not be null").isNotNull();
-			assertThat(inf[x].getDescription()).as("Description for MBeanAttributeInfo should not be null").isNotNull();
+		for (MBeanAttributeInfo element : inf) {
+			assertThat(element).as("MBeanAttributeInfo should not be null").isNotNull();
+			assertThat(element.getDescription()).as("Description for MBeanAttributeInfo should not be null").isNotNull();
 		}
 	}
 
@@ -95,9 +95,9 @@ public void testGetMBeanOperationInfo() throws Exception {
 		MBeanOperationInfo[] inf = info.getOperations();
 		assertThat(inf).as("Invalid number of Operations returned").hasSize(getExpectedOperationCount());
 
-		for (int x = 0; x < inf.length; x++) {
-			assertThat(inf[x]).as("MBeanOperationInfo should not be null").isNotNull();
-			assertThat(inf[x].getDescription()).as("Description for MBeanOperationInfo should not be null").isNotNull();
+		for (MBeanOperationInfo element : inf) {
+			assertThat(element).as("MBeanOperationInfo should not be null").isNotNull();
+			assertThat(element.getDescription()).as("Description for MBeanOperationInfo should not be null").isNotNull();
 		}
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
index 9fb8494cd436..70c97851a4e0 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
@@ -27,7 +27,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Test;
 
@@ -613,16 +612,13 @@ public static class DynamicAsyncInterfaceBean implements FactoryBean<AsyncInterf
 
 		public DynamicAsyncInterfaceBean() {
 			ProxyFactory pf = new ProxyFactory(new HashMap<>());
-			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(new MethodInterceptor() {
-				@Override
-				public Object invoke(MethodInvocation invocation) throws Throwable {
-					boolean condition = !Thread.currentThread().getName().equals(originalThreadName);
-					assertThat(condition).isTrue();
-					if (Future.class.equals(invocation.getMethod().getReturnType())) {
-						return new AsyncResult<>(invocation.getArguments()[0].toString());
-					}
-					return null;
+			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor((MethodInterceptor) invocation -> {
+				boolean condition = !Thread.currentThread().getName().equals(originalThreadName);
+				assertThat(condition).isTrue();
+				if (Future.class.equals(invocation.getMethod().getReturnType())) {
+					return new AsyncResult<>(invocation.getArguments()[0].toString());
 				}
+				return null;
 			});
 			advisor.addInterface(AsyncInterface.class);
 			pf.addAdvisor(advisor);
@@ -686,16 +682,13 @@ public static class DynamicAsyncMethodsInterfaceBean implements FactoryBean<Asyn
 
 		public DynamicAsyncMethodsInterfaceBean() {
 			ProxyFactory pf = new ProxyFactory(new HashMap<>());
-			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(new MethodInterceptor() {
-				@Override
-				public Object invoke(MethodInvocation invocation) throws Throwable {
-					boolean condition = !Thread.currentThread().getName().equals(originalThreadName);
-					assertThat(condition).isTrue();
-					if (Future.class.equals(invocation.getMethod().getReturnType())) {
-						return new AsyncResult<>(invocation.getArguments()[0].toString());
-					}
-					return null;
+			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor((MethodInterceptor) invocation -> {
+				boolean condition = !Thread.currentThread().getName().equals(originalThreadName);
+				assertThat(condition).isTrue();
+				if (Future.class.equals(invocation.getMethod().getReturnType())) {
+					return new AsyncResult<>(invocation.getArguments()[0].toString());
 				}
+				return null;
 			});
 			advisor.addInterface(AsyncMethodsInterface.class);
 			pf.addAdvisor(advisor);
diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
index 8dbae46f7776..ef8f32846ef3 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.scheduling.config;
 
-import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
 import java.util.concurrent.FutureTask;
 
@@ -59,12 +58,7 @@ public void defaultExecutor() throws Exception {
 		assertThat(getKeepAliveSeconds(executor)).isEqualTo(60);
 		assertThat(getAllowCoreThreadTimeOut(executor)).isFalse();
 
-		FutureTask<String> task = new FutureTask<>(new Callable<String>() {
-			@Override
-			public String call() throws Exception {
-				return "foo";
-			}
-		});
+		FutureTask<String> task = new FutureTask<>(() -> "foo");
 		executor.execute(task);
 		assertThat(task.get()).isEqualTo("foo");
 	}
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/MyBytecodeProcessor.java b/spring-context/src/test/java/org/springframework/scripting/groovy/MyBytecodeProcessor.java
index fc73d71c77fb..48aac053ca21 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/MyBytecodeProcessor.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/MyBytecodeProcessor.java
@@ -26,7 +26,7 @@
  */
 public class MyBytecodeProcessor implements BytecodeProcessor {
 
-	public final Set<String> processed = new HashSet<String>();
+	public final Set<String> processed = new HashSet<>();
 
 	@Override
 	public byte[] processBytecode(String name, byte[] original) {
diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
index 376d8a131072..93669ec3b215 100644
--- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
+++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 package org.springframework.ui;
 
 import java.io.Serializable;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -281,12 +279,7 @@ public void testRawJdkProxy() throws Exception {
 		Object proxy = Proxy.newProxyInstance(
 				getClass().getClassLoader(),
 				new Class<?>[] {Map.class},
-				new InvocationHandler() {
-					@Override
-					public Object invoke(Object proxy, Method method, Object[] args) {
-						return "proxy";
-					}
-				});
+				(proxy1, method, args) -> "proxy");
 		map.addAttribute(proxy);
 		assertThat(map.get("map")).isSameAs(proxy);
 	}
diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java
index 96a78ad11314..12915b678b34 100644
--- a/spring-context/src/test/java/test/mixin/LockMixin.java
+++ b/spring-context/src/test/java/test/mixin/LockMixin.java
@@ -61,8 +61,9 @@ public boolean locked() {
 	 */
 	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
-		if (locked() && invocation.getMethod().getName().indexOf("set") == 0)
+		if (locked() && invocation.getMethod().getName().indexOf("set") == 0) {
 			throw new LockedException();
+		}
 		return super.invoke(invocation);
 	}
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java
index 3b29b783bfd1..6a41c4fec173 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java
@@ -19,7 +19,6 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -75,8 +74,7 @@ public Object resolveContextualObject(String key) {
 	}
 
 	public void close() {
-		for (Iterator<Runnable> it = this.callbacks.iterator(); it.hasNext();) {
-			Runnable runnable = it.next();
+		for (Runnable runnable : this.callbacks) {
 			runnable.run();
 		}
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index e9e3586bb6a4..0c7708eee4be 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -1700,7 +1700,7 @@ void synthesizeFromMapWithNestedMap() throws Exception {
 		assertThat(componentScan).isNotNull();
 		assertThat(componentScan.value().pattern()).isEqualTo("*Foo");
 		Map<String, Object> map = MergedAnnotation.from(componentScan).asMap(
-				annotation -> new LinkedHashMap<String, Object>(),
+				annotation -> new LinkedHashMap<>(),
 				Adapt.ANNOTATION_TO_MAP);
 		Map<String, Object> filterMap = (Map<String, Object>) map.get("value");
 		assertThat(filterMap.get("pattern")).isEqualTo("*Foo");
@@ -1720,7 +1720,7 @@ void synthesizeFromMapWithNestedArrayOfMaps() throws Exception {
 				ComponentScan.class);
 		assertThat(componentScan).isNotNull();
 		Map<String, Object> map = MergedAnnotation.from(componentScan).asMap(
-				annotation -> new LinkedHashMap<String, Object>(),
+				annotation -> new LinkedHashMap<>(),
 				Adapt.ANNOTATION_TO_MAP);
 		Map<String, Object>[] filters = (Map[]) map.get("excludeFilters");
 		List<String> patterns = Arrays.stream(filters).map(
diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java
index 93eb3659a99c..b7903d069752 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java
@@ -140,7 +140,7 @@ public int compare(Integer o1, Integer o2) {
 			assertThat(o2).isInstanceOf(Integer.class);
 			this.called = true;
 			return super.compare(o1, o2);
-		};
+		}
 
 		public void assertCalled() {
 			assertThat(this.called).isTrue();
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
index b3d553ff5ce6..1be14c376474 100644
--- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -48,7 +48,7 @@ void withElementFactory() throws Exception {
 
 	@Test
 	void withElementFactoryAndUserSuppliedBackingList() throws Exception {
-		doTestWithElementFactory(new AutoPopulatingList<Object>(new ArrayList<>(), new MockElementFactory()));
+		doTestWithElementFactory(new AutoPopulatingList<>(new ArrayList<>(), new MockElementFactory()));
 	}
 
 	private void doTestWithClass(AutoPopulatingList<Object> list) {
diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
index e50168ee4e9e..ca9c41147c41 100644
--- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
@@ -51,7 +51,7 @@
  */
 class ConcurrentReferenceHashMapTests {
 
-	private static final Comparator<? super String> NULL_SAFE_STRING_SORT = new NullSafeComparator<String>(
+	private static final Comparator<? super String> NULL_SAFE_STRING_SORT = new NullSafeComparator<>(
 			new ComparableComparator<String>(), true);
 
 	private TestWeakConcurrentCache<Integer, String> map = new TestWeakConcurrentCache<>();
diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index 4109426e8fe7..bbb05b743a86 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -391,8 +391,8 @@ void bar(String s) throws IllegalArgumentException {
 
 		int add(int... args) {
 			int sum = 0;
-			for (int i = 0; i < args.length; i++) {
-				sum += args[i];
+			for (int arg : args) {
+				sum += arg;
 			}
 			return sum;
 		}
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index eaa318b59e9a..4609e6832cb8 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -620,14 +620,8 @@ void commaDelimitedListToStringArrayEmptyStrings() {
 	}
 
 	private void doTestCommaDelimitedListToStringArrayLegalMatch(String[] components) {
-		StringBuilder sb = new StringBuilder();
-		for (int i = 0; i < components.length; i++) {
-			if (i != 0) {
-				sb.append(',');
-			}
-			sb.append(components[i]);
-		}
-		String[] sa = StringUtils.commaDelimitedListToStringArray(sb.toString());
+		String sb = String.join(String.valueOf(','), components);
+		String[] sa = StringUtils.commaDelimitedListToStringArray(sb);
 		assertThat(sa != null).as("String array isn't null with legal match").isTrue();
 		assertThat(sa.length).as("String array length is correct with legal match").isEqualTo(components.length);
 		assertThat(Arrays.equals(sa, components)).as("Output equals input").isTrue();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
index bee0bade090f..1c0a86ffed97 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
@@ -107,7 +107,7 @@ protected void verifyPerson(EmailPerson person) {
 	}
 
 
-	protected enum MockType {ONE, TWO, THREE};
+	protected enum MockType {ONE, TWO, THREE}
 
 
 	protected static class Mock {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
index 337f5f34a506..1470e9d6c977 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
@@ -22,7 +22,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
 import java.util.Map;
@@ -160,12 +159,7 @@ public void testQueryForObjectWithRowMapper() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
 		given(this.resultSet.next()).willReturn(true, false);
 		given(this.resultSet.getInt(1)).willReturn(22);
-		Object o = this.template.queryForObject(sql, new RowMapper<Integer>() {
-			@Override
-			public Integer mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return rs.getInt(1);
-			}
-		});
+		Object o = this.template.queryForObject(sql, (RowMapper<Integer>) (rs, rowNum) -> rs.getInt(1));
 		assertThat(o instanceof Integer).as("Correct result type").isTrue();
 		verify(this.resultSet).close();
 		verify(this.statement).close();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index 339bec58385f..456d59dd5bfd 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -152,12 +152,12 @@ public void testBogusUpdate() throws Exception {
 
 	@Test
 	public void testStringsWithStaticSql() throws Exception {
-		doTestStrings(null, null, null, null, (template, sql, rch) -> template.query(sql, rch));
+		doTestStrings(null, null, null, null, JdbcTemplate::query);
 	}
 
 	@Test
 	public void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception {
-		doTestStrings(10, 20, 30, null, (template, sql, rch) -> template.query(sql, rch));
+		doTestStrings(10, 20, 30, null, JdbcTemplate::query);
 	}
 
 	@Test
@@ -268,28 +268,22 @@ public void testLeaveConnectionOpenOnRequest() throws Exception {
 
 	@Test
 	public void testConnectionCallback() throws Exception {
-		String result = this.template.execute(new ConnectionCallback<String>() {
-			@Override
-			public String doInConnection(Connection con) {
-				assertThat(con instanceof ConnectionProxy).isTrue();
-				assertThat(((ConnectionProxy) con).getTargetConnection()).isSameAs(JdbcTemplateTests.this.connection);
-				return "test";
-			}
+		String result = this.template.execute((ConnectionCallback<String>) con -> {
+			assertThat(con instanceof ConnectionProxy).isTrue();
+			assertThat(((ConnectionProxy) con).getTargetConnection()).isSameAs(JdbcTemplateTests.this.connection);
+			return "test";
 		});
 		assertThat(result).isEqualTo("test");
 	}
 
 	@Test
 	public void testConnectionCallbackWithStatementSettings() throws Exception {
-		String result = this.template.execute(new ConnectionCallback<String>() {
-			@Override
-			public String doInConnection(Connection con) throws SQLException {
-				PreparedStatement ps = con.prepareStatement("some SQL");
-				ps.setFetchSize(10);
-				ps.setMaxRows(20);
-				ps.close();
-				return "test";
-			}
+		String result = this.template.execute((ConnectionCallback<String>) con -> {
+			PreparedStatement ps = con.prepareStatement("some SQL");
+			ps.setFetchSize(10);
+			ps.setMaxRows(20);
+			ps.close();
+			return "test";
 		});
 
 		assertThat(result).isEqualTo("test");
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
index 25ccf1eaa870..1a2c61469908 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
@@ -20,7 +20,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -176,12 +175,7 @@ public void testQueryForObjectWithParamMapAndRowMapper() throws Exception {
 		MapSqlParameterSource params = new MapSqlParameterSource();
 		params.addValue("id", 3);
 		Object o = template.queryForObject("SELECT AGE FROM CUSTMR WHERE ID = :id",
-				params, new RowMapper<Object>() {
-			@Override
-			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return rs.getInt(1);
-			}
-		});
+				params, (RowMapper<Object>) (rs, rowNum) -> rs.getInt(1));
 
 		boolean condition = o instanceof Integer;
 		assertThat(condition).as("Correct result type").isTrue();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
index ee7b13e1a73f..02441425f81f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,9 +46,7 @@
 import org.springframework.jdbc.core.SqlReturnResultSet;
 import org.springframework.jdbc.core.support.AbstractSqlTypeValue;
 import org.springframework.jdbc.datasource.ConnectionHolder;
-import org.springframework.jdbc.support.SQLExceptionTranslator;
 import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator;
-import org.springframework.lang.Nullable;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -148,8 +146,7 @@ public void testAddInvoicesWithinTransaction() throws Exception {
 		given(callableStatement.execute()).willReturn(false);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
 		given(callableStatement.getObject(3)).willReturn(4);
-		given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}")).willReturn(callableStatement);
 		TransactionSynchronizationManager.bindResource(dataSource, new ConnectionHolder(connection));
 		try {
 			testAddInvoice(1106, 3);
@@ -174,8 +171,7 @@ public void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTrans
 		given(callableStatement.execute()).willReturn(false);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
 		given(callableStatement.getObject(2)).willReturn(5);
-		given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}")).willReturn(callableStatement);
 
 		class TestJdbcTemplate extends JdbcTemplate {
 
@@ -210,8 +206,7 @@ public void testStoredProcedureConfiguredViaJdbcTemplate() throws Exception {
 		given(callableStatement.execute()).willReturn(false);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
 		given(callableStatement.getObject(2)).willReturn(4);
-		given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}")).willReturn(callableStatement);
 		JdbcTemplate t = new JdbcTemplate();
 		t.setDataSource(dataSource);
 		StoredProcedureConfiguredViaJdbcTemplate sp = new StoredProcedureConfiguredViaJdbcTemplate(t);
@@ -234,28 +229,24 @@ public void testNullArg() throws Exception {
 	public void testUnnamedParameter() throws Exception {
 		this.verifyClosedAfter = false;
 		// Shouldn't succeed in creating stored procedure with unnamed parameter
-		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() ->
-		new UnnamedParameterStoredProcedure(dataSource));
+		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
+			.isThrownBy(() -> new UnnamedParameterStoredProcedure(dataSource));
 	}
 
 	@Test
 	public void testMissingParameter() throws Exception {
 		this.verifyClosedAfter = false;
 		MissingParameterStoredProcedure mp = new MissingParameterStoredProcedure(dataSource);
-		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(
-				mp::execute);
+		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(mp::execute);
 	}
 
 	@Test
 	public void testStoredProcedureExceptionTranslator() throws Exception {
-		SQLException sqlException = new SQLException(
-				"Syntax error or access violation exception", "42000");
+		SQLException sqlException = new SQLException("Syntax error or access violation exception", "42000");
 		given(callableStatement.execute()).willThrow(sqlException);
-		given(connection.prepareCall("{call " + StoredProcedureExceptionTranslator.SQL + "()}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureExceptionTranslator.SQL + "()}")).willReturn(callableStatement);
 		StoredProcedureExceptionTranslator sproc = new StoredProcedureExceptionTranslator(dataSource);
-		assertThatExceptionOfType(CustomDataException.class).isThrownBy(
-				sproc::execute);
+		assertThatExceptionOfType(CustomDataException.class).isThrownBy(sproc::execute);
 	}
 
 	@Test
@@ -266,8 +257,7 @@ public void testStoredProcedureWithResultSet() throws Exception {
 		given(callableStatement.getUpdateCount()).willReturn(-1);
 		given(callableStatement.getResultSet()).willReturn(resultSet);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
-		given(connection.prepareCall("{call " + StoredProcedureWithResultSet.SQL + "()}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSet.SQL + "()}")).willReturn(callableStatement);
 		StoredProcedureWithResultSet sproc = new StoredProcedureWithResultSet(dataSource);
 		sproc.execute();
 		assertThat(sproc.getCount()).isEqualTo(2);
@@ -285,14 +275,11 @@ public void testStoredProcedureWithResultSetMapped() throws Exception {
 		given(callableStatement.getResultSet()).willReturn(resultSet);
 		given(callableStatement.getMoreResults()).willReturn(false);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
-		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")).willReturn(callableStatement);
 		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(dataSource);
 		Map<String, Object> res = sproc.execute();
 		List<String> rs = (List<String>) res.get("rs");
-		assertThat(rs.size()).isEqualTo(2);
-		assertThat(rs.get(0)).isEqualTo("Foo");
-		assertThat(rs.get(1)).isEqualTo("Bar");
+		assertThat(rs).containsExactly("Foo", "Bar");
 		verify(resultSet).close();
 	}
 
@@ -319,8 +306,7 @@ public void testStoredProcedureWithUndeclaredResults() throws Exception {
 		given(callableStatement.getResultSet()).willReturn(resultSet1, resultSet2);
 		given(callableStatement.getMoreResults()).willReturn(true, false, false);
 		given(callableStatement.getUpdateCount()).willReturn(-1, -1, 0, -1);
-		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")).willReturn(callableStatement);
 
 		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(dataSource);
 		Map<String, Object> res = sproc.execute();
@@ -328,15 +314,12 @@ public void testStoredProcedureWithUndeclaredResults() throws Exception {
 		assertThat(res.size()).as("incorrect number of returns").isEqualTo(3);
 
 		List<String> rs1 = (List<String>) res.get("rs");
-		assertThat(rs1.size()).isEqualTo(2);
-		assertThat(rs1.get(0)).isEqualTo("Foo");
-		assertThat(rs1.get(1)).isEqualTo("Bar");
+		assertThat(rs1).containsExactly("Foo", "Bar");
 
 		List<Object> rs2 = (List<Object>) res.get("#result-set-2");
 		assertThat(rs2.size()).isEqualTo(1);
 		Object o2 = rs2.get(0);
-		boolean condition = o2 instanceof Map;
-		assertThat(condition).as("wron type returned for result set 2").isTrue();
+		assertThat(o2).as("wron type returned for result set 2").isInstanceOf(Map.class);
 		Map<String, String> m2 = (Map<String, String>) o2;
 		assertThat(m2.get("spam")).isEqualTo("Spam");
 		assertThat(m2.get("eggs")).isEqualTo("Eggs");
@@ -351,12 +334,10 @@ public void testStoredProcedureWithUndeclaredResults() throws Exception {
 	public void testStoredProcedureSkippingResultsProcessing() throws Exception {
 		given(callableStatement.execute()).willReturn(true);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
-		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")).willReturn(callableStatement);
 		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 		jdbcTemplate.setSkipResultsProcessing(true);
-		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(
-				jdbcTemplate);
+		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(jdbcTemplate);
 		Map<String, Object> res = sproc.execute();
 		assertThat(res.size()).as("incorrect number of returns").isEqualTo(0);
 	}
@@ -372,13 +353,11 @@ public void testStoredProcedureSkippingUndeclaredResults() throws Exception {
 		given(callableStatement.getResultSet()).willReturn(resultSet);
 		given(callableStatement.getMoreResults()).willReturn(true, false);
 		given(callableStatement.getUpdateCount()).willReturn(-1, -1);
-		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")).willReturn(callableStatement);
 
 		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 		jdbcTemplate.setSkipUndeclaredResults(true);
-		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(
-				jdbcTemplate);
+		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(jdbcTemplate);
 		Map<String, Object> res = sproc.execute();
 
 		assertThat(res.size()).as("incorrect number of returns").isEqualTo(1);
@@ -394,8 +373,7 @@ public void testParameterMapper() throws Exception {
 		given(callableStatement.execute()).willReturn(false);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
 		given(callableStatement.getObject(2)).willReturn("OK");
-		given(connection.prepareCall("{call " + ParameterMapperStoredProcedure.SQL + "(?, ?)}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + ParameterMapperStoredProcedure.SQL + "(?, ?)}")).willReturn(callableStatement);
 
 		ParameterMapperStoredProcedure pmsp = new ParameterMapperStoredProcedure(dataSource);
 		Map<String, Object> out = pmsp.executeTest();
@@ -411,8 +389,7 @@ public void testSqlTypeValue() throws Exception {
 		given(callableStatement.execute()).willReturn(false);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
 		given(callableStatement.getObject(2)).willReturn("OK");
-		given(connection.prepareCall("{call " + SqlTypeValueStoredProcedure.SQL + "(?, ?)}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + SqlTypeValueStoredProcedure.SQL + "(?, ?)}")).willReturn(callableStatement);
 
 		SqlTypeValueStoredProcedure stvsp = new SqlTypeValueStoredProcedure(dataSource);
 		Map<String, Object> out = stvsp.executeTest(testVal);
@@ -426,8 +403,7 @@ public void testNumericWithScale() throws Exception {
 		given(callableStatement.execute()).willReturn(false);
 		given(callableStatement.getUpdateCount()).willReturn(-1);
 		given(callableStatement.getObject(1)).willReturn(new BigDecimal("12345.6789"));
-		given(connection.prepareCall("{call " + NumericWithScaleStoredProcedure.SQL + "(?)}")
-				).willReturn(callableStatement);
+		given(connection.prepareCall("{call " + NumericWithScaleStoredProcedure.SQL + "(?)}")).willReturn(callableStatement);
 		NumericWithScaleStoredProcedure nwssp = new NumericWithScaleStoredProcedure(dataSource);
 		Map<String, Object> out = nwssp.executeTest();
 		assertThat(out.get("out")).isEqualTo(new BigDecimal("12345.6789"));
@@ -686,12 +662,7 @@ private static class StoredProcedureExceptionTranslator extends StoredProcedure
 		public StoredProcedureExceptionTranslator(DataSource ds) {
 			setDataSource(ds);
 			setSql(SQL);
-			getJdbcTemplate().setExceptionTranslator(new SQLExceptionTranslator() {
-				@Override
-				public DataAccessException translate(String task, @Nullable String sql, SQLException ex) {
-					return new CustomDataException(sql, ex);
-				}
-			});
+			getJdbcTemplate().setExceptionTranslator((task, sql, ex) -> new CustomDataException(sql, ex));
 			compile();
 		}
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
index 5cdfb7eda559..486ffbf9a8c2 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -87,7 +87,7 @@ public void errorCodeTranslation() {
 
 		SQLException dupKeyEx = new SQLException("", "", 10);
 		DataAccessException dksex = sext.translate("task", "SQL", dupKeyEx);
-		assertThat(DataIntegrityViolationException.class.isInstance(dksex)).as("Not instance of DataIntegrityViolationException").isTrue();
+		assertThat(dksex).isInstanceOf(DataIntegrityViolationException.class);
 
 		// Test fallback. We assume that no database will ever return this error code,
 		// but 07xxx will be bad grammar picked up by the fallback SQLState translator
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
index 0690e7d349d8..34bf543bddcd 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
@@ -200,12 +200,9 @@ void testSessionCallback() throws Exception {
 		JmsTemplate template = createTemplate();
 		template.setConnectionFactory(this.connectionFactory);
 
-		template.execute(new SessionCallback<Void>() {
-			@Override
-			public Void doInJms(Session session) throws JMSException {
-				session.getTransacted();
-				return null;
-			}
+		template.execute((SessionCallback<Void>) session -> {
+			session.getTransacted();
+			return null;
 		});
 
 		verify(this.session).close();
@@ -220,19 +217,13 @@ void testSessionCallbackWithinSynchronizedTransaction() throws Exception {
 
 		TransactionSynchronizationManager.initSynchronization();
 		try {
-			template.execute(new SessionCallback<Void>() {
-				@Override
-				public Void doInJms(Session session) throws JMSException {
-					session.getTransacted();
-					return null;
-				}
+			template.execute((SessionCallback<Void>) session -> {
+				session.getTransacted();
+				return null;
 			});
-			template.execute(new SessionCallback<Void>() {
-				@Override
-				public Void doInJms(Session session) throws JMSException {
-					session.getTransacted();
-					return null;
-				}
+			template.execute((SessionCallback<Void>) session -> {
+				session.getTransacted();
+				return null;
 			});
 
 			assertThat(ConnectionFactoryUtils.getTransactionalSession(scf, null, false)).isSameAs(this.session);
@@ -374,29 +365,14 @@ private void doTestSendDestination(
 		}
 
 		if (useDefaultDestination) {
-			template.send(new MessageCreator() {
-				@Override
-				public Message createMessage(Session session) throws JMSException {
-					return session.createTextMessage("just testing");
-				}
-			});
+			template.send(session -> session.createTextMessage("just testing"));
 		}
 		else {
 			if (explicitDestination) {
-				template.send(this.queue, new MessageCreator() {
-					@Override
-					public Message createMessage(Session session) throws JMSException {
-						return session.createTextMessage("just testing");
-					}
-				});
+				template.send(this.queue, (MessageCreator) session -> session.createTextMessage("just testing"));
 			}
 			else {
-				template.send(destinationName, new MessageCreator() {
-					@Override
-					public Message createMessage(Session session) throws JMSException {
-						return session.createTextMessage("just testing");
-					}
-				});
+				template.send(destinationName, (MessageCreator) session -> session.createTextMessage("just testing"));
 			}
 		}
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
index 76bd754e2cc5..5d3a1846c40f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.jms.StubQueue;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ErrorHandler;
@@ -183,16 +182,13 @@ public void testCorrectSessionExposedForSessionAwareMessageListenerInvocation()
 
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
-		this.container.setMessageListener(new SessionAwareMessageListener<Message>() {
-			@Override
-			public void onMessage(Message message, @Nullable Session sess) {
-				try {
-					// Check correct Session passed into SessionAwareMessageListener.
-					assertThat(session).isSameAs(sess);
-				}
-				catch (Throwable ex) {
-					failure.add("MessageListener execution failed: " + ex);
-				}
+		this.container.setMessageListener((SessionAwareMessageListener<Message>) (Message message, @Nullable Session sess) -> {
+			try {
+				// Check correct Session passed into SessionAwareMessageListener.
+				assertThat(session).isSameAs(sess);
+			}
+			catch (Throwable ex) {
+				failure.add("MessageListener execution failed: " + ex);
 			}
 		});
 
@@ -232,14 +228,11 @@ public void testTaskExecutorCorrectlyInvokedWhenSpecified() throws Exception {
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
 		this.container.setMessageListener(listener);
-		this.container.setTaskExecutor(new TaskExecutor() {
-			@Override
-			public void execute(Runnable task) {
-				listener.executorInvoked = true;
-				assertThat(listener.listenerInvoked).isFalse();
-				task.run();
-				assertThat(listener.listenerInvoked).isTrue();
-			}
+		this.container.setTaskExecutor(task -> {
+			listener.executorInvoked = true;
+			assertThat(listener.listenerInvoked).isFalse();
+			task.run();
+			assertThat(listener.listenerInvoked).isTrue();
 		});
 		this.container.afterPropertiesSet();
 		this.container.start();
@@ -279,11 +272,8 @@ public void testRegisteredExceptionListenerIsInvokedOnException() throws Excepti
 
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
-		this.container.setMessageListener(new SessionAwareMessageListener<Message>() {
-			@Override
-			public void onMessage(Message message, @Nullable Session session) throws JMSException {
-				throw theException;
-			}
+		this.container.setMessageListener((SessionAwareMessageListener<Message>) (Message message, @Nullable Session session1) -> {
+			throw theException;
 		});
 
 		ExceptionListener exceptionListener = mock(ExceptionListener.class);
@@ -329,11 +319,8 @@ public void testRegisteredErrorHandlerIsInvokedOnException() throws Exception {
 
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
-		this.container.setMessageListener(new SessionAwareMessageListener<Message>() {
-			@Override
-			public void onMessage(Message message, @Nullable Session session) throws JMSException {
-				throw theException;
-			}
+		this.container.setMessageListener((SessionAwareMessageListener<Message>) (Message message, @Nullable Session session1) -> {
+			throw theException;
 		});
 
 		ErrorHandler errorHandler = mock(ErrorHandler.class);
@@ -375,11 +362,8 @@ public void testNoRollbackOccursIfSessionIsNotTransactedAndThatExceptionsDo_NOT_
 
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
-		this.container.setMessageListener(new MessageListener() {
-			@Override
-			public void onMessage(Message message) {
-				throw new UnsupportedOperationException();
-			}
+		this.container.setMessageListener((MessageListener) message -> {
+			throw new UnsupportedOperationException();
 		});
 		this.container.afterPropertiesSet();
 		this.container.start();
@@ -419,11 +403,8 @@ public void testTransactedSessionsGetRollbackLogicAppliedAndThatExceptionsStillD
 
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
-		this.container.setMessageListener(new MessageListener() {
-			@Override
-			public void onMessage(Message message) {
-				throw new UnsupportedOperationException();
-			}
+		this.container.setMessageListener((MessageListener) message -> {
+			throw new UnsupportedOperationException();
 		});
 		this.container.afterPropertiesSet();
 		this.container.start();
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java
index 4a984a256e37..4e0d7bfa363c 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java
@@ -432,8 +432,8 @@ public void wrongParam(Integer i) {
 		}
 	}
 
-	interface Summary {};
-	interface Full extends Summary {};
+	interface Summary {}
+	interface Full extends Summary {}
 
 	@SuppressWarnings("unused")
 	private static class SampleResponse {
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
index 41aed17f47aa..ad2531d3bc66 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
@@ -30,8 +30,6 @@
 import javax.jms.TextMessage;
 
 import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import org.springframework.jms.support.converter.MessageConversionException;
 import org.springframework.jms.support.converter.SimpleMessageConverter;
@@ -77,12 +75,7 @@ public void testByteArrayConversion() throws JMSException {
 
 		given(session.createBytesMessage()).willReturn(message);
 		given(message.getBodyLength()).willReturn((long) content.length);
-		given(message.readBytes(any(byte[].class))).willAnswer(new Answer<Integer>() {
-			@Override
-			public Integer answer(InvocationOnMock invocation) throws Throwable {
-				return byteArrayInputStream.read((byte[]) invocation.getArguments()[0]);
-			}
-		});
+		given(message.readBytes(any(byte[].class))).willAnswer(invocation -> byteArrayInputStream.read((byte[]) invocation.getArguments()[0]));
 
 		SimpleMessageConverter converter = new SimpleMessageConverter();
 		Message msg = converter.toMessage(content, session);
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
index 4f428c270939..563ba5de605e 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
@@ -300,9 +300,9 @@ public int hashCode() {
 	}
 
 
-	private interface Summary {};
+	private interface Summary {}
 
-	private interface Full extends Summary {};
+	private interface Full extends Summary {}
 
 
 	@SuppressWarnings("unused")
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java
index 1e69ff4137f3..5fffc1657ffd 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java
@@ -319,9 +319,9 @@ public void setArray(String[] array) {
 	}
 
 
-	public interface MyJacksonView1 {};
+	public interface MyJacksonView1 {}
 
-	public interface MyJacksonView2 {};
+	public interface MyJacksonView2 {}
 
 
 	public static class JacksonViewBean {
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java
index e2b3c4602b9b..0ef6a331686d 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java
@@ -29,7 +29,6 @@
 import org.springframework.messaging.MessageDeliveryException;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.StubMessageChannel;
 import org.springframework.messaging.SubscribableChannel;
 import org.springframework.messaging.support.ExecutorSubscribableChannel;
@@ -112,12 +111,9 @@ public void sendWithTimeoutMutable() {
 	@Test
 	public void sendAndReceive() {
 		SubscribableChannel channel = new ExecutorSubscribableChannel(this.executor);
-		channel.subscribe(new MessageHandler() {
-			@Override
-			public void handleMessage(Message<?> message) throws MessagingException {
-				MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel();
-				replyChannel.send(new GenericMessage<>("response"));
-			}
+		channel.subscribe(message -> {
+			MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel();
+			replyChannel.send(new GenericMessage<>("response"));
 		});
 
 		String actual = this.template.convertSendAndReceive(channel, "request", String.class);
@@ -126,7 +122,7 @@ public void handleMessage(Message<?> message) throws MessagingException {
 
 	@Test
 	public void sendAndReceiveTimeout() throws InterruptedException {
-		final AtomicReference<Throwable> failure = new AtomicReference<Throwable>();
+		final AtomicReference<Throwable> failure = new AtomicReference<>();
 		final CountDownLatch latch = new CountDownLatch(1);
 
 		this.template.setReceiveTimeout(1);
@@ -152,7 +148,7 @@ public void sendAndReceiveTimeout() throws InterruptedException {
 
 	@Test
 	public void sendAndReceiveVariableTimeout() throws InterruptedException {
-		final AtomicReference<Throwable> failure = new AtomicReference<Throwable>();
+		final AtomicReference<Throwable> failure = new AtomicReference<>();
 		final CountDownLatch latch = new CountDownLatch(1);
 
 		this.template.setSendTimeout(20_000);
@@ -182,7 +178,7 @@ public void sendAndReceiveVariableTimeout() throws InterruptedException {
 
 	@Test
 	public void sendAndReceiveVariableTimeoutCustomHeaders() throws InterruptedException {
-		final AtomicReference<Throwable> failure = new AtomicReference<Throwable>();
+		final AtomicReference<Throwable> failure = new AtomicReference<>();
 		final CountDownLatch latch = new CountDownLatch(1);
 
 		this.template.setSendTimeout(20_000);
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java
index fe4c46e742bf..8c270485413b 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java
@@ -151,7 +151,7 @@ private MessageMappingMessageHandler initMesssageHandler() {
 	}
 
 	private Message<?> message(String destination, String... content) {
-		Flux<DataBuffer> payload = Flux.fromIterable(Arrays.asList(content)).map(parts -> toDataBuffer(parts));
+		Flux<DataBuffer> payload = Flux.fromIterable(Arrays.asList(content)).map(this::toDataBuffer);
 		MessageHeaderAccessor headers = new MessageHeaderAccessor();
 		headers.setLeaveMutable(true);
 		headers.setHeader(DestinationPatternsMessageCondition.LOOKUP_DESTINATION_HEADER,
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java
index f9290bf0faa9..3641cde73b70 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java
@@ -28,7 +28,6 @@
 
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
 import org.springframework.core.MethodParameter;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.converter.ByteArrayMessageConverter;
@@ -59,12 +58,7 @@ public class DefaultMessageHandlerMethodFactoryTests {
 	public void customConversion() throws Exception {
 		DefaultMessageHandlerMethodFactory instance = createInstance();
 		GenericConversionService conversionService = new GenericConversionService();
-		conversionService.addConverter(SampleBean.class, String.class, new Converter<SampleBean, String>() {
-			@Override
-			public String convert(SampleBean source) {
-				return "foo bar";
-			}
-		});
+		conversionService.addConverter(SampleBean.class, String.class, source -> "foo bar");
 		instance.setConversionService(conversionService);
 		instance.afterPropertiesSet();
 
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java
index ed76ea88e1e9..c42e8573924b 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java
@@ -131,8 +131,7 @@ public void currentAttributes() {
 
 	@Test
 	public void currentAttributesNone() {
-		assertThatIllegalStateException().isThrownBy(() ->
-				SimpAttributesContextHolder.currentAttributes())
+		assertThatIllegalStateException().isThrownBy(SimpAttributesContextHolder::currentAttributes)
 			.withMessageStartingWith("No thread-bound SimpAttributes found");
 	}
 
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java
index 92eefda1fbb4..f30579fe0c2a 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java
@@ -224,8 +224,8 @@ public JacksonViewBean getJsonView() {
 	}
 
 
-	private interface MyJacksonView1 {};
-	private interface MyJacksonView2 {};
+	private interface MyJacksonView1 {}
+	private interface MyJacksonView2 {}
 
 	private static class JacksonViewBean {
 
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java
index 70e35c35d969..3fc34442d7fd 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Callable;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -286,12 +285,7 @@ private Message<byte[]> message(StompCommand command, String sessionId, String u
 
 
 	private static ListenableFutureTask<Void> getVoidFuture() {
-		ListenableFutureTask<Void> futureTask = new ListenableFutureTask<>(new Callable<Void>() {
-			@Override
-			public Void call() {
-				return null;
-			}
-		});
+		ListenableFutureTask<Void> futureTask = new ListenableFutureTask<>(() -> null);
 		futureTask.run();
 		return futureTask;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
index 3a53b2cb9a1d..e0bc4a1da665 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
@@ -32,7 +32,6 @@
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.TransactionSystemException;
-import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -100,13 +99,10 @@ public void testTransactionCommit() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		Object result = tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-				return l;
-			}
+		Object result = tt.execute(status -> {
+			assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+			EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+			return l;
 		});
 		assertThat(result).isSameAs(l);
 
@@ -135,13 +131,10 @@ public void testTransactionCommitWithRollbackException() {
 		assertThat(condition2).isTrue();
 
 		try {
-			Object result = tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-					return l;
-				}
+			Object result = tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+				return l;
 			});
 			assertThat(result).isSameAs(l);
 		}
@@ -174,13 +167,10 @@ public void testTransactionRollback() {
 		assertThat(condition2).isTrue();
 
 		assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
-			tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
-					throw new RuntimeException("some exception");
-				}
+			tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
+				throw new RuntimeException("some exception");
 			})).withMessage("some exception");
 
 		boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
@@ -205,13 +195,10 @@ public void testTransactionRollbackWithAlreadyRolledBack() {
 		assertThat(condition2).isTrue();
 
 		assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
-			tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
-					throw new RuntimeException("some exception");
-				}
+			tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
+				throw new RuntimeException("some exception");
 			}));
 
 		boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
@@ -235,16 +222,13 @@ public void testTransactionRollbackOnly() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+		tt.execute(status -> {
+			assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
 
-				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-				status.setRollbackOnly();
+			EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+			status.setRollbackOnly();
 
-				return l;
-			}
+			return l;
 		});
 
 		boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
@@ -269,19 +253,13 @@ public void testParticipatingTransactionWithCommit() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+		tt.execute(status -> {
+			assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
 
-				return tt.execute(new TransactionCallback() {
-					@Override
-					public Object doInTransaction(TransactionStatus status) {
-						EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-						return l;
-					}
-				});
-			}
+			return tt.execute(status1 -> {
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+				return l;
+			});
 		});
 
 		boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
@@ -308,18 +286,12 @@ public void testParticipatingTransactionWithRollback() {
 		assertThat(condition2).isTrue();
 
 		assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
-			tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					return tt.execute(new TransactionCallback() {
-						@Override
-						public Object doInTransaction(TransactionStatus status) {
-							EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
-							throw new RuntimeException("some exception");
-						}
-					});
-				}
+			tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				return tt.execute(status1 -> {
+					EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
+					throw new RuntimeException("some exception");
+				});
 			}));
 
 		boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
@@ -348,20 +320,14 @@ public void testParticipatingTransactionWithRollbackOnly() {
 		assertThat(condition2).isTrue();
 
 		assertThatExceptionOfType(TransactionSystemException.class).isThrownBy(() ->
-				tt.execute(new TransactionCallback() {
-					@Override
-					public Object doInTransaction(TransactionStatus status) {
-						assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-
-						return tt.execute(new TransactionCallback() {
-							@Override
-							public Object doInTransaction(TransactionStatus status) {
-								EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-								status.setRollbackOnly();
-								return null;
-							}
-						});
-					}
+				tt.execute(status -> {
+					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+
+					return tt.execute(status1 -> {
+						EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+						status1.setRollbackOnly();
+						return null;
+					});
 				}))
 			.withCauseInstanceOf(RollbackException.class);
 
@@ -391,18 +357,12 @@ public void testParticipatingTransactionWithRequiresNew() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		Object result = tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-				return tt.execute(new TransactionCallback() {
-					@Override
-					public Object doInTransaction(TransactionStatus status) {
-						EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-						return l;
-					}
-				});
-			}
+		Object result = tt.execute(status -> {
+			assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+			return tt.execute(status1 -> {
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+				return l;
+			});
 		});
 		assertThat(result).isSameAs(l);
 
@@ -433,20 +393,14 @@ public void testParticipatingTransactionWithRequiresNewAndPrebound() {
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(manager));
 
 		try {
-			Object result = tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
+			Object result = tt.execute(status -> {
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
 
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					return tt.execute(new TransactionCallback() {
-						@Override
-						public Object doInTransaction(TransactionStatus status) {
-							EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-							return l;
-						}
-					});
-				}
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				return tt.execute(status1 -> {
+					EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+					return l;
+				});
 			});
 			assertThat(result).isSameAs(l);
 		}
@@ -479,20 +433,14 @@ public void testPropagationSupportsAndRequiresNew() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		Object result = tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse();
-				TransactionTemplate tt2 = new TransactionTemplate(tm);
-				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
-				return tt2.execute(new TransactionCallback() {
-					@Override
-					public Object doInTransaction(TransactionStatus status) {
-						EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-						return l;
-					}
-				});
-			}
+		Object result = tt.execute(status -> {
+			assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse();
+			TransactionTemplate tt2 = new TransactionTemplate(tm);
+			tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+			return tt2.execute(status1 -> {
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+				return l;
+			});
 		});
 		assertThat(result).isSameAs(l);
 
@@ -522,22 +470,16 @@ public void testPropagationSupportsAndRequiresNewAndEarlyAccess() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		Object result = tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
+		Object result = tt.execute(status -> {
+			EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
 
-				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-				TransactionTemplate tt2 = new TransactionTemplate(tm);
-				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
-				return tt2.execute(new TransactionCallback() {
-					@Override
-					public Object doInTransaction(TransactionStatus status) {
-						EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-						return l;
-					}
-				});
-			}
+			assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+			TransactionTemplate tt2 = new TransactionTemplate(tm);
+			tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+			return tt2.execute(status1 -> {
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+				return l;
+			});
 		});
 		assertThat(result).isSameAs(l);
 
@@ -568,24 +510,18 @@ public void testTransactionWithRequiresNewInAfterCompletion() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-				TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-					@Override
-					public void afterCompletion(int status) {
-						tt.execute(new TransactionCallback() {
-							@Override
-							public Object doInTransaction(TransactionStatus status) {
-								EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-								return null;
-							}
-						});
-					}
-				});
-				return null;
-			}
+		tt.execute(status -> {
+			EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+			TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+				@Override
+				public void afterCompletion(int status) {
+					tt.execute(status1 -> {
+						EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+						return null;
+					});
+				}
+			});
+			return null;
 		});
 
 		boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
@@ -616,17 +552,14 @@ public void testTransactionCommitWithPropagationSupports() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		Object result = tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
-				assertThat(condition1).isTrue();
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				boolean condition = !status.isNewTransaction();
-				assertThat(condition).isTrue();
-				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-				return l;
-			}
+		Object result = tt.execute(status -> {
+			boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
+			assertThat(condition1).isTrue();
+			assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
+			boolean condition = !status.isNewTransaction();
+			assertThat(condition).isTrue();
+			EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+			return l;
 		});
 		assertThat(result).isSameAs(l);
 
@@ -650,18 +583,15 @@ public void testTransactionRollbackWithPropagationSupports() {
 		boolean condition2 = !TransactionSynchronizationManager.isSynchronizationActive();
 		assertThat(condition2).isTrue();
 
-		tt.execute(new TransactionCallback() {
-			@Override
-			public Object doInTransaction(TransactionStatus status) {
-				boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
-				assertThat(condition1).isTrue();
-				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-				boolean condition = !status.isNewTransaction();
-				assertThat(condition).isTrue();
-				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-				status.setRollbackOnly();
-				return null;
-			}
+		tt.execute(status -> {
+			boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
+			assertThat(condition1).isTrue();
+			assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
+			boolean condition = !status.isNewTransaction();
+			assertThat(condition).isTrue();
+			EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+			status.setRollbackOnly();
+			return null;
 		});
 
 		boolean condition1 = !TransactionSynchronizationManager.hasResource(factory);
@@ -687,14 +617,11 @@ public void testTransactionCommitWithPrebound() {
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(manager));
 
 		try {
-			Object result = tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
-					return l;
-				}
+			Object result = tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
+				return l;
 			});
 			assertThat(result).isSameAs(l);
 
@@ -722,15 +649,12 @@ public void testTransactionRollbackWithPrebound() {
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(manager));
 
 		try {
-			tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
-					status.setRollbackOnly();
-					return null;
-				}
+			tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory);
+				status.setRollbackOnly();
+				return null;
 			});
 
 			assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
@@ -760,16 +684,13 @@ public void testTransactionCommitWithPreboundAndPropagationSupports() {
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(manager));
 
 		try {
-			Object result = tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-					boolean condition = !status.isNewTransaction();
-					assertThat(condition).isTrue();
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-					return l;
-				}
+			Object result = tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
+				boolean condition = !status.isNewTransaction();
+				assertThat(condition).isTrue();
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+				return l;
 			});
 			assertThat(result).isSameAs(l);
 
@@ -795,17 +716,14 @@ public void testTransactionRollbackWithPreboundAndPropagationSupports() {
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(manager));
 
 		try {
-			tt.execute(new TransactionCallback() {
-				@Override
-				public Object doInTransaction(TransactionStatus status) {
-					assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
-					assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
-					boolean condition = !status.isNewTransaction();
-					assertThat(condition).isTrue();
-					EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
-					status.setRollbackOnly();
-					return null;
-				}
+			tt.execute(status -> {
+				assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
+				assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue();
+				boolean condition = !status.isNewTransaction();
+				assertThat(condition).isTrue();
+				EntityManagerFactoryUtils.getTransactionalEntityManager(factory).flush();
+				status.setRollbackOnly();
+				return null;
 			});
 
 			assertThat(TransactionSynchronizationManager.hasResource(factory)).isTrue();
diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
index 82a3e79cb4c6..704fec2e1493 100644
--- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -72,13 +72,7 @@ public void basic() throws Exception {
 	@Test
 	public void noExecution() throws Exception {
 		List<ClientHttpRequestInterceptor> interceptors = new ArrayList<>();
-		interceptors.add(new ClientHttpRequestInterceptor() {
-			@Override
-			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
-					throws IOException {
-				return responseMock;
-			}
-		});
+		interceptors.add((request, body, execution) -> responseMock);
 
 		interceptors.add(new NoOpInterceptor());
 		requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, interceptors);
@@ -97,15 +91,11 @@ public void changeHeaders() throws Exception {
 		final String headerValue = "Bar";
 		final String otherValue = "Baz";
 
-		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
-			@Override
-			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
-					throws IOException {
+		ClientHttpRequestInterceptor interceptor = (request, body, execution) -> {
 				HttpRequestWrapper wrapper = new HttpRequestWrapper(request);
 				wrapper.getHeaders().add(headerName, otherValue);
 				return execution.execute(wrapper, body);
-			}
-		};
+			};
 
 		requestMock = new RequestMock() {
 			@Override
@@ -119,8 +109,7 @@ public ClientHttpResponse execute() throws IOException {
 		};
 		requestMock.getHeaders().add(headerName, headerValue);
 
-		requestFactory =
-				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
+		requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
 		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
@@ -130,19 +119,13 @@ public ClientHttpResponse execute() throws IOException {
 	public void changeURI() throws Exception {
 		final URI changedUri = new URI("https://example.com/2");
 
-		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
+		ClientHttpRequestInterceptor interceptor = (request, body, execution) -> execution.execute(new HttpRequestWrapper(request) {
 			@Override
-			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
-					throws IOException {
-				return execution.execute(new HttpRequestWrapper(request) {
-					@Override
-					public URI getURI() {
-						return changedUri;
-					}
-
-				}, body);
+			public URI getURI() {
+				return changedUri;
 			}
-		};
+
+		}, body);
 
 		requestFactoryMock = new RequestFactoryMock() {
 			@Override
@@ -152,8 +135,7 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 			}
 		};
 
-		requestFactory =
-				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
+		requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
 		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
@@ -163,19 +145,13 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 	public void changeMethod() throws Exception {
 		final HttpMethod changedMethod = HttpMethod.POST;
 
-		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
+		ClientHttpRequestInterceptor interceptor = (request, body, execution) -> execution.execute(new HttpRequestWrapper(request) {
 			@Override
-			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
-					throws IOException {
-				return execution.execute(new HttpRequestWrapper(request) {
-					@Override
-					public HttpMethod getMethod() {
-						return changedMethod;
-					}
-
-				}, body);
+			public HttpMethod getMethod() {
+				return changedMethod;
 			}
-		};
+
+		}, body);
 
 		requestFactoryMock = new RequestFactoryMock() {
 			@Override
@@ -185,8 +161,7 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 			}
 		};
 
-		requestFactory =
-				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
+		requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
 		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
@@ -196,16 +171,9 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 	public void changeBody() throws Exception {
 		final byte[] changedBody = "Foo".getBytes();
 
-		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
-			@Override
-			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
-					throws IOException {
-				return execution.execute(request, changedBody);
-			}
-		};
+		ClientHttpRequestInterceptor interceptor = (request, body, execution) -> execution.execute(request, changedBody);
 
-		requestFactory =
-				new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
+		requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
 
 		ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
 		request.execute();
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
index 1deac303b701..dcd4504e6f0e 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
@@ -279,9 +279,9 @@ public void setArray(String[] array) {
 	}
 
 
-	private interface MyJacksonView1 {};
+	private interface MyJacksonView1 {}
 
-	private interface MyJacksonView2 {};
+	private interface MyJacksonView2 {}
 
 
 	@SuppressWarnings("unused")
diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
index f6704d39e28c..9bf58625ccb1 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
@@ -249,13 +249,13 @@ protected void doTestTony(PropertyValues pvs) throws Exception {
 		m.put("forname", "Tony");
 		m.put("surname", "Blair");
 		m.put("age", "50");
-		for (int i = 0; i < ps.length; i++) {
-			Object val = m.get(ps[i].getName());
+		for (PropertyValue element : ps) {
+			Object val = m.get(element.getName());
 			assertThat(val != null).as("Can't have unexpected value").isTrue();
 			boolean condition = val instanceof String;
 			assertThat(condition).as("Val i string").isTrue();
-			assertThat(val.equals(ps[i].getValue())).as("val matches expected").isTrue();
-			m.remove(ps[i].getName());
+			assertThat(val.equals(element.getValue())).as("val matches expected").isTrue();
+			m.remove(element.getName());
 		}
 		assertThat(m.size() == 0).as("Map size is 0").isTrue();
 	}
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java
index 7a6f91b25f7e..8e7fff0f9cc2 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.web.context.request.async;
 
-import java.util.function.Consumer;
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.web.context.request.async.DeferredResult.DeferredResultHandler;
@@ -127,12 +125,7 @@ public void onError() throws Exception {
 		DeferredResult<String> result = new DeferredResult<>(null, "error result");
 		result.setResultHandler(handler);
 		Exception e = new Exception();
-		result.onError(new Consumer<Throwable>() {
-			@Override
-			public void accept(Throwable t) {
-				sb.append("error event");
-			}
-		});
+		result.onError(t -> sb.append("error event"));
 
 		result.getInterceptor().handleError(null, null, e);
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java
index 6ecb5fd2fd54..74cd1ca0b6c8 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java
@@ -17,7 +17,6 @@
 package org.springframework.web.context.request.async;
 
 import java.util.concurrent.Callable;
-import java.util.function.Consumer;
 
 import javax.servlet.AsyncEvent;
 
@@ -96,12 +95,7 @@ public void startCallableProcessingErrorAndResumeThroughCallback() throws Except
 
 		StubCallable callable = new StubCallable();
 		WebAsyncTask<Object> webAsyncTask = new WebAsyncTask<>(callable);
-		webAsyncTask.onError(new Callable<Object>() {
-			@Override
-			public Object call() throws Exception {
-				return 7;
-			}
-		});
+		webAsyncTask.onError(() -> 7);
 
 		this.asyncManager.startCallableProcessing(webAsyncTask);
 
@@ -202,12 +196,7 @@ public void startDeferredResultProcessingErrorAndResumeWithDefaultResult() throw
 	public void startDeferredResultProcessingErrorAndResumeThroughCallback() throws Exception {
 
 		final DeferredResult<Throwable> deferredResult = new DeferredResult<>();
-		deferredResult.onError(new Consumer<Throwable>() {
-			@Override
-			public void accept(Throwable t) {
-				deferredResult.setResult(t);
-			}
-		});
+		deferredResult.onError(t -> deferredResult.setResult(t));
 
 		this.asyncManager.startDeferredResultProcessing(deferredResult);
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
index e07100c00450..f463b1d6100f 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
@@ -97,12 +97,7 @@ public void startCallableProcessingTimeoutAndResumeThroughCallback() throws Exce
 
 		StubCallable callable = new StubCallable();
 		WebAsyncTask<Object> webAsyncTask = new WebAsyncTask<>(callable);
-		webAsyncTask.onTimeout(new Callable<Object>() {
-			@Override
-			public Object call() throws Exception {
-				return 7;
-			}
-		});
+		webAsyncTask.onTimeout(() -> 7);
 
 		this.asyncManager.startCallableProcessing(webAsyncTask);
 
diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java
index c35c86b60363..3ec794b1930d 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.Test;
@@ -68,14 +66,9 @@ private void filterWithParameterForMethod(String methodParam, String expectedMet
 		}
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		FilterChain filterChain = new FilterChain() {
-
-			@Override
-			public void doFilter(ServletRequest filterRequest,
-					ServletResponse filterResponse) throws IOException, ServletException {
-				assertThat(((HttpServletRequest) filterRequest).getMethod()).as("Invalid method").isEqualTo(expectedMethod);
-			}
-		};
+		FilterChain filterChain = (filterRequest, filterResponse) ->
+				assertThat(((HttpServletRequest) filterRequest).getMethod())
+					.as("Invalid method").isEqualTo(expectedMethod);
 		this.filter.doFilter(request, response, filterChain);
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java
index 9e4b9f3c0b37..005560c1f593 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -54,27 +54,24 @@
  *
  * @author Rossen Stoyanchev
  */
-public class ModelFactoryOrderingTests {
+class ModelFactoryOrderingTests {
 
 	private static final Log logger = LogFactory.getLog(ModelFactoryOrderingTests.class);
 
-	private NativeWebRequest webRequest;
+	private final NativeWebRequest webRequest = new ServletWebRequest(new MockHttpServletRequest(), new MockHttpServletResponse());
 
-	private ModelAndViewContainer mavContainer;
+	private final ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 
-	private SessionAttributeStore sessionAttributeStore;
+	private final SessionAttributeStore sessionAttributeStore = new DefaultSessionAttributeStore();
 
 
 	@BeforeEach
-	public void setup() {
-		this.sessionAttributeStore = new DefaultSessionAttributeStore();
-		this.webRequest = new ServletWebRequest(new MockHttpServletRequest(), new MockHttpServletResponse());
-		this.mavContainer = new ModelAndViewContainer();
+	void setup() {
 		this.mavContainer.addAttribute("methods", new ArrayList<String>());
 	}
 
 	@Test
-	public void straightLineDependency() throws Exception {
+	void straightLineDependency() throws Exception {
 		runTest(new StraightLineDependencyController());
 		assertInvokedBefore("getA", "getB1", "getB2", "getC1", "getC2", "getC3", "getC4");
 		assertInvokedBefore("getB1", "getB2", "getC1", "getC2", "getC3", "getC4");
@@ -85,7 +82,7 @@ public void straightLineDependency() throws Exception {
 	}
 
 	@Test
-	public void treeDependency() throws Exception {
+	void treeDependency() throws Exception {
 		runTest(new TreeDependencyController());
 		assertInvokedBefore("getA", "getB1", "getB2", "getC1", "getC2", "getC3", "getC4");
 		assertInvokedBefore("getB1", "getC1", "getC2");
@@ -93,7 +90,7 @@ public void treeDependency() throws Exception {
 	}
 
 	@Test
-	public void InvertedTreeDependency() throws Exception {
+	void InvertedTreeDependency() throws Exception {
 		runTest(new InvertedTreeDependencyController());
 		assertInvokedBefore("getC1", "getA", "getB1");
 		assertInvokedBefore("getC2", "getA", "getB1");
@@ -104,7 +101,7 @@ public void InvertedTreeDependency() throws Exception {
 	}
 
 	@Test
-	public void unresolvedDependency() throws Exception {
+	void unresolvedDependency() throws Exception {
 		runTest(new UnresolvedDependencyController());
 		assertInvokedBefore("getA", "getC1", "getC2", "getC3", "getC4");
 
@@ -133,19 +130,16 @@ private void runTest(Object controller) throws Exception {
 		ModelFactory factory = new ModelFactory(modelMethods, dataBinderFactory, sessionHandler);
 		factory.initModel(this.webRequest, this.mavContainer, new HandlerMethod(controller, "handle"));
 		if (logger.isDebugEnabled()) {
-			StringBuilder sb = new StringBuilder();
-			for (String name : getInvokedMethods()) {
-				sb.append(" >> ").append(name);
-			}
-			logger.debug(sb);
+			logger.debug(String.join(" >> ", getInvokedMethods()));
 		}
 	}
 
 	private void assertInvokedBefore(String beforeMethod, String... afterMethods) {
 		List<String> actual = getInvokedMethods();
 		for (String afterMethod : afterMethods) {
-			assertThat(actual.indexOf(beforeMethod) < actual.indexOf(afterMethod)).as(beforeMethod + " should be before " + afterMethod + ". Actual order: " +
-						actual.toString()).isTrue();
+			assertThat(actual.indexOf(beforeMethod) < actual.indexOf(afterMethod))
+				.as(beforeMethod + " should be before " + afterMethod + ". Actual order: " + actual.toString())
+				.isTrue();
 		}
 	}
 
@@ -321,13 +315,8 @@ private static class C3 { }
 	private static class C4 { }
 
 
-	private static final ReflectionUtils.MethodFilter METHOD_FILTER = new ReflectionUtils.MethodFilter() {
-
-		@Override
-		public boolean matches(Method method) {
-			return ((AnnotationUtils.findAnnotation(method, RequestMapping.class) == null) &&
-					(AnnotationUtils.findAnnotation(method, ModelAttribute.class) != null));
-		}
-	};
+	private static final ReflectionUtils.MethodFilter METHOD_FILTER = method ->
+			((AnnotationUtils.findAnnotation(method, RequestMapping.class) == null) &&
+			(AnnotationUtils.findAnnotation(method, ModelAttribute.class) != null));
 
 }
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
index bf1e58c2e5d5..a67e5b0deca0 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
@@ -111,7 +111,7 @@ public Map<String, Object> hints() {
 				return hints;
 			}
 		};
-		this.hints = new HashMap<String, Object>();
+		this.hints = new HashMap<>();
 	}
 
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
index ad6bfbdca9f7..b9d6fb39a425 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
@@ -36,7 +36,6 @@
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
 import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest;
 import org.springframework.web.testfixture.http.server.reactive.MockServerHttpResponse;
 import org.springframework.web.testfixture.server.MockServerWebExchange;
@@ -295,12 +294,9 @@ public Mono<Void> writeTo(ServerWebExchange exchange, Context context) {
 	public void toHttpHandlerWebFilter() {
 		AtomicBoolean filterInvoked = new AtomicBoolean();
 
-		WebFilter webFilter = new WebFilter() {
-			@Override
-			public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
-				filterInvoked.set(true);
-				return chain.filter(exchange);
-			}
+		WebFilter webFilter = (exchange, chain) -> {
+			filterInvoked.set(true);
+			return chain.filter(exchange);
 		};
 
 		HandlerFunction<ServerResponse> handlerFunction = request -> ServerResponse.accepted().build();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
index ec5d45344aaf..1b58da1e6ccc 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
@@ -164,7 +164,7 @@ void initializeOnCurrentContext() {
 
 
 	private Condition<PathPattern> pathPatternStringOf(String expected) {
-		return new Condition<PathPattern>(
+		return new Condition<>(
 				actual -> actual != null && actual.getPatternString().equals(expected),
 				"Pattern %s", expected);
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
index 1f04eb182ccc..b05fcb658b76 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -33,21 +33,24 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		super.setBeanFactory(beanFactory);
-		if (this.owningContext != null)
+		if (this.owningContext != null) {
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
+		}
 	}
 
 	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
-		if (this.owningContext == null)
+		if (this.owningContext == null) {
 			throw new RuntimeException("Factory didn't call setApplicationContext before afterPropertiesSet on lifecycle bean");
+		}
 	}
 
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		if (this.owningFactory == null)
+		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
+		}
 
 		this.owningContext = applicationContext;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
index aa6de67cdf8a..0444cfc1ce86 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,9 +25,7 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.NoSuchMessageException;
@@ -56,24 +54,15 @@ protected ConfigurableApplicationContext createContext() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		root.setServletContext(sc);
 		root.setConfigLocations("/org/springframework/web/context/WEB-INF/applicationContext.xml");
-		root.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() {
+		root.addBeanFactoryPostProcessor(beanFactory -> beanFactory.addBeanPostProcessor(new BeanPostProcessor() {
 			@Override
-			public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
-				beanFactory.addBeanPostProcessor(new BeanPostProcessor() {
-					@Override
-					public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
-						if (bean instanceof TestBean) {
-							((TestBean) bean).getFriends().add("myFriend");
-						}
-						return bean;
-					}
-					@Override
-					public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
-						return bean;
-					}
-				});
+			public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
+				if (bean instanceof TestBean) {
+					((TestBean) bean).getFriends().add("myFriend");
+				}
+				return bean;
 			}
-		});
+		}));
 		root.refresh();
 		XmlWebApplicationContext wac = new XmlWebApplicationContext();
 		wac.getEnvironment().addActiveProfile("wacProfile1");
@@ -109,7 +98,7 @@ protected void doTestEvents(TestApplicationListener listener, TestApplicationLis
 	@Test
 	@Override
 	public void count() {
-		assertThat(this.applicationContext.getBeanDefinitionCount() == 14).as("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount()).isTrue();
+		assertThat(this.applicationContext.getBeanDefinitionCount()).as("should have 14 beans").isEqualTo(14);
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
index 25880b6c1305..243249d6315c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.junit.jupiter.api.Test;
 
@@ -46,24 +44,21 @@ public class HttpRequestHandlerTests {
 	@Test
 	public void testHttpRequestHandlerServletPassThrough() throws Exception {
 		MockServletContext servletContext = new MockServletContext();
-		final MockHttpServletRequest request = new MockHttpServletRequest();
-		final MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
-		wac.getBeanFactory().registerSingleton("myHandler", new HttpRequestHandler() {
-			@Override
-			public void handleRequest(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-				assertThat(req).isSameAs(request);
-				assertThat(res).isSameAs(response);
-				String exception = request.getParameter("exception");
-				if ("ServletException".equals(exception)) {
-					throw new ServletException("test");
-				}
-				if ("IOException".equals(exception)) {
-					throw new IOException("test");
-				}
-				res.getWriter().write("myResponse");
+		wac.getBeanFactory().registerSingleton("myHandler", (HttpRequestHandler) (req, res) -> {
+			assertThat(req).isSameAs(request);
+			assertThat(res).isSameAs(response);
+			String exception = request.getParameter("exception");
+			if ("ServletException".equals(exception)) {
+				throw new ServletException("test");
 			}
+			if ("IOException".equals(exception)) {
+				throw new IOException("test");
+			}
+			res.getWriter().write("myResponse");
 		});
 		wac.setServletContext(servletContext);
 		wac.refresh();
@@ -76,13 +71,13 @@ public void handleRequest(HttpServletRequest req, HttpServletResponse res) throw
 		assertThat(response.getContentAsString()).isEqualTo("myResponse");
 
 		request.setParameter("exception", "ServletException");
-		assertThatExceptionOfType(ServletException.class).isThrownBy(() ->
-				servlet.service(request, response))
+		assertThatExceptionOfType(ServletException.class)
+			.isThrownBy(() -> servlet.service(request, response))
 			.withMessage("test");
 
 		request.setParameter("exception", "IOException");
-		assertThatIOException().isThrownBy(() ->
-				servlet.service(request, response))
+		assertThatIOException()
+			.isThrownBy(() -> servlet.service(request, response))
 			.withMessage("test");
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
index bcc0fe568d91..65c802cf5e09 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -29,7 +29,6 @@
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.Ordered;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.io.FileSystemResourceLoader;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.http.HttpStatus;
@@ -360,12 +359,7 @@ private class TestWebMvcConfigurationSupport extends WebMvcConfigurationSupport
 
 		@Override
 		public void addFormatters(FormatterRegistry registry) {
-			registry.addConverter(new Converter<TestBean, String>() {
-				@Override
-				public String convert(TestBean source) {
-					return "converted";
-				}
-			});
+			registry.addConverter(TestBean.class, String.class, testBean -> "converted");
 		}
 
 		@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
index 0d7553bb80d1..49e963f62231 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilderTests.java
@@ -36,7 +36,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.servlet.ModelAndView;
@@ -50,13 +49,7 @@
  */
 public class DefaultEntityResponseBuilderTests {
 
-	static final ServerResponse.Context EMPTY_CONTEXT = new ServerResponse.Context() {
-		@Override
-		public List<HttpMessageConverter<?>> messageConverters() {
-			return Collections.emptyList();
-		}
-
-	};
+	static final ServerResponse.Context EMPTY_CONTEXT = () -> Collections.emptyList();
 
 	@Test
 	public void fromObject() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
index 56fec0a442b5..915e9ac0768b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
@@ -20,7 +20,6 @@
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.Cookie;
@@ -29,7 +28,6 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.servlet.ModelAndView;
@@ -43,13 +41,7 @@
  */
 public class DefaultRenderingResponseTests {
 
-	static final ServerResponse.Context EMPTY_CONTEXT = new ServerResponse.Context() {
-		@Override
-		public List<HttpMessageConverter<?>> messageConverters() {
-			return Collections.emptyList();
-		}
-
-	};
+	static final ServerResponse.Context EMPTY_CONTEXT = () -> Collections.emptyList();
 
 	@Test
 	public void create() throws Exception {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java
index 07233b27ecec..931519a724d9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java
@@ -318,12 +318,7 @@ void session() {
 	@Test
 	void principal() {
 		MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
-		Principal principal = new Principal() {
-			@Override
-			public String getName() {
-				return "foo";
-			}
-		};
+		Principal principal = () -> "foo";
 		servletRequest.setUserPrincipal(principal);
 
 		DefaultServerRequest request = new DefaultServerRequest(servletRequest,
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
index 23621b73197c..e17601a0cb5d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerResponseBuilderTests.java
@@ -39,7 +39,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
@@ -55,14 +54,7 @@
  */
 public class DefaultServerResponseBuilderTests {
 
-	static final ServerResponse.Context EMPTY_CONTEXT = new ServerResponse.Context() {
-		@Override
-		public List<HttpMessageConverter<?>> messageConverters() {
-			return Collections.emptyList();
-
-		}
-
-	};
+	static final ServerResponse.Context EMPTY_CONTEXT = () -> Collections.emptyList();
 
 	@Test
 	public void status() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index bade64bf142e..8f7fec3139dd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -22,7 +22,6 @@
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -949,12 +948,7 @@ private void assertStringArray() throws JspException, DocumentException {
 	}
 
 	private Map getCountryToLocaleMap() {
-		Map map = new TreeMap(new Comparator() {
-			@Override
-			public int compare(Object o1, Object o2) {
-				return ((Country)o1).getName().compareTo(((Country)o2).getName());
-			}
-		});
+		Map map = new TreeMap((o1, o2) -> ((Country)o1).getName().compareTo(((Country)o2).getName()));
 		map.put(Country.COUNTRY_AT, LOCALE_AT);
 		map.put(Country.COUNTRY_NL, LOCALE_NL);
 		map.put(Country.COUNTRY_US, Locale.US);
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java
index d7fa58dcff08..558b547c0927 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java
@@ -28,7 +28,6 @@
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.messaging.simp.user.SimpSubscription;
-import org.springframework.messaging.simp.user.SimpSubscriptionMatcher;
 import org.springframework.messaging.simp.user.SimpUser;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.web.socket.CloseStatus;
@@ -143,12 +142,7 @@ public void findSubscriptions() throws Exception {
 		subscribeEvent = new SessionSubscribeEvent(this, message, user);
 		registry.onApplicationEvent(subscribeEvent);
 
-		Set<SimpSubscription> matches = registry.findSubscriptions(new SimpSubscriptionMatcher() {
-			@Override
-			public boolean match(SimpSubscription subscription) {
-				return subscription.getDestination().equals("/match");
-			}
-		});
+		Set<SimpSubscription> matches = registry.findSubscriptions(subscription -> subscription.getDestination().equals("/match"));
 
 		assertThat(matches.size()).isEqualTo(2);
 

From c263cbfbe486d7712b9e46b80ed151c1eda98c74 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 3 Feb 2022 15:16:27 +0100
Subject: [PATCH 632/735] Fix broken test missed in merge

---
 ...assPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
index aa32d4708c62..c059826c8255 100644
--- a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
+++ b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
@@ -318,7 +318,7 @@ else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(jakarta.inje
 						metadata.setScopedProxyMode(scopedProxyMode);
 						break;
 					}
-					else if (type.startsWith("javax.inject")) {
+					else if (type.startsWith("jakarta.inject")) {
 						metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
 					}
 				}

From 12342d7f8e3be33ac9d040451167a33f74a55b3b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 2 Feb 2022 16:57:27 +0100
Subject: [PATCH 633/735] Sync ScriptUtilsUnitTests implementations

---
 .../connection/init/ScriptUtilsUnitTests.java | 70 ++++++++++---------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsUnitTests.java
index 8cf650bcb423..63fe4ecd96c1 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -180,37 +180,43 @@ public void readAndSplitScriptContainingMultiLineNestedComments() throws Excepti
 	}
 
 	@ParameterizedTest
-	@CsvSource(delimiter = '#', value = {
-		// semicolon
-		"'select 1\n select '';'''                                                          # ;      # false",
-		"'select 1\n select \";\"'                                                          # ;      # false",
-		"'select 1; select 2'                                                               # ;      # true",
-		// newline
-		"'select 1; select ''\n'''                                                          # '\n'   # false",
-		"'select 1; select \"\n\"'                                                          # '\n'   # false",
-		"'select 1\n select 2'                                                              # '\n'   # true",
-		// double newline
-		"'select 1\n select 2'                                                              # '\n\n' # false",
-		"'select 1\n\n select 2'                                                            # '\n\n' # true",
-		// semicolon with MySQL style escapes '\\'
-		"'insert into users(first, last)\nvalues(''a\\\\'', ''b;'')'                        # ;      # false",
-		"'insert into users(first, last)\nvalues(''Charles'', ''d\\''Artagnan''); select 1' # ;      # true",
-		// semicolon inside comments
-		"'-- a;b;c\ninsert into colors(color_num) values(42);'                              # ;      # true",
-		"'/* a;b;c */\ninsert into colors(color_num) values(42);'                           # ;      # true",
-		"'-- a;b;c\ninsert into colors(color_num) values(42)'                               # ;      # false",
-		"'/* a;b;c */\ninsert into colors(color_num) values(42)'                            # ;      # false",
-		// single quotes inside comments
-		"'-- What\\''s your favorite color?\ninsert into colors(color_num) values(42);'     # ;      # true",
-		"'-- What''s your favorite color?\ninsert into colors(color_num) values(42);'       # ;      # true",
-		"'/* What\\''s your favorite color? */\ninsert into colors(color_num) values(42);'  # ;      # true",
-		"'/* What''s your favorite color? */\ninsert into colors(color_num) values(42);'    # ;      # true",
-		// double quotes inside comments
-		"'-- double \" quotes\ninsert into colors(color_num) values(42);'                   # ;      # true",
-		"'-- double \\\" quotes\ninsert into colors(color_num) values(42);'                 # ;      # true",
-		"'/* double \" quotes */\ninsert into colors(color_num) values(42);'                # ;      # true",
-		"'/* double \\\" quotes */\ninsert into colors(color_num) values(42);'              # ;      # true"
-	})
+	@CsvSource(delimiter = '|', quoteCharacter = '~', textBlock = """
+		# semicolon
+		~select 1\n select ';'~                                                            | ;      | false
+		~select 1\n select ";"~                                                            | ;      | false
+		~select 1; select 2~                                                               | ;      | true
+
+		# newline
+		~select 1; select '\n'~                                                            | ~\n~   | false
+		~select 1; select "\n"~                                                            | ~\n~   | false
+		~select 1\n select 2~                                                              | ~\n~   | true
+
+		# double newline
+		~select 1\n select 2~                                                              | ~\n\n~ | false
+		~select 1\n\n select 2~                                                            | ~\n\n~ | true
+
+		# semicolon with MySQL style escapes '\\'
+		~insert into users(first, last)\n values('a\\\\', 'b;')~                           | ;      | false
+		~insert into users(first, last)\n values('Charles', 'd\\'Artagnan'); select 1~     | ;      | true
+
+		# semicolon inside comments
+		~-- a;b;c\n insert into colors(color_num) values(42);~                             | ;      | true
+		~/* a;b;c */\n insert into colors(color_num) values(42);~                          | ;      | true
+		~-- a;b;c\n insert into colors(color_num) values(42)~                              | ;      | false
+		~/* a;b;c */\n insert into colors(color_num) values(42)~                           | ;      | false
+
+		# single quotes inside comments
+		~-- What\\'s your favorite color?\n insert into colors(color_num) values(42);~     | ;      | true
+		~-- What's your favorite color?\n insert into colors(color_num) values(42);~       | ;      | true
+		~/* What\\'s your favorite color? */\n insert into colors(color_num) values(42);~  | ;      | true
+		~/* What's your favorite color? */\n insert into colors(color_num) values(42);~    | ;      | true
+
+		# double quotes inside comments
+		~-- double " quotes\n insert into colors(color_num) values(42);~                   | ;      | true
+		~-- double \\" quotes\n insert into colors(color_num) values(42);~                 | ;      | true
+		~/* double " quotes */\n insert into colors(color_num) values(42);~                | ;      | true
+		~/* double \\" quotes */\n insert into colors(color_num) values(42);~              | ;      | true
+		""")
 	public void containsStatementSeparator(String script, String delimiter, boolean expected) {
 		boolean contains = ScriptUtils.containsStatementSeparator(null, script, delimiter, DEFAULT_COMMENT_PREFIXES,
 				DEFAULT_BLOCK_COMMENT_START_DELIMITER, DEFAULT_BLOCK_COMMENT_END_DELIMITER);

From 9a5ecd0c46ec81e211fb6286870f6091e7202397 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 2 Feb 2022 16:03:12 +0100
Subject: [PATCH 634/735] Apply "instanceof pattern matching" in spring-r2dbc

---
 .../springframework/r2dbc/core/NamedParameterUtils.java  | 9 +++------
 .../java/org/springframework/r2dbc/core/Parameter.java   | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
index 49eecd68e96f..8dae419eff3d 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
@@ -303,8 +303,7 @@ public static PreparedOperation<String> substituteNamedParameters(ParsedSql pars
 						}
 						k++;
 						Object entryItem = entryIter.next();
-						if (entryItem instanceof Object[]) {
-							Object[] expressionList = (Object[]) entryItem;
+						if (entryItem instanceof Object[] expressionList) {
 							actualSql.append('(');
 							for (int m = 0; m < expressionList.length; m++) {
 								if (m > 0) {
@@ -397,10 +396,9 @@ public boolean equals(Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (!(o instanceof ParameterHolder)) {
+			if (!(o instanceof ParameterHolder that)) {
 				return false;
 			}
-			ParameterHolder that = (ParameterHolder) o;
 			return this.startIndex == that.startIndex && this.endIndex == that.endIndex
 					&& Objects.equals(this.parameterName, that.parameterName);
 		}
@@ -522,8 +520,7 @@ public void bind(BindTarget target, String identifier, Object value) {
 				Iterator<BindMarker> markers = bindMarkers.iterator();
 				while (iterator.hasNext()) {
 					Object valueToBind = iterator.next();
-					if (valueToBind instanceof Object[]) {
-						Object[] objects = (Object[]) valueToBind;
+					if (valueToBind instanceof Object[] objects) {
 						for (Object object : objects) {
 							bind(target, markers, object);
 						}
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java
index 69f9ed92bd71..374ebec61be3 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java
@@ -113,10 +113,9 @@ public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
 		}
-		if (!(obj instanceof Parameter)) {
+		if (!(obj instanceof Parameter other)) {
 			return false;
 		}
-		Parameter other = (Parameter) obj;
 		return (ObjectUtils.nullSafeEquals(this.value, other.value) &&
 				ObjectUtils.nullSafeEquals(this.type, other.type));
 	}

From 32cd73261a3094a289b8d0d62f76c8e413fe3f86 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 2 Feb 2022 16:56:53 +0100
Subject: [PATCH 635/735] Apply "switch expressions" where applicable

---
 .../standard/DateTimeFormatterFactory.java    | 46 ++++++-------------
 .../EmbeddedDatabaseConfigurerFactory.java    | 18 +++-----
 .../SQLErrorCodeSQLExceptionTranslator.java   | 35 ++++++++------
 .../MappingJackson2MessageConverter.java      | 32 +++++--------
 4 files changed, 54 insertions(+), 77 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java
index df4f277e5de9..3d0f395a0846 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -139,14 +139,14 @@ public void setStylePattern(String style) {
 
 	@Nullable
 	private FormatStyle convertStyleCharacter(char c) {
-		switch (c) {
-			case 'S': return FormatStyle.SHORT;
-			case 'M': return FormatStyle.MEDIUM;
-			case 'L': return FormatStyle.LONG;
-			case 'F': return FormatStyle.FULL;
-			case '-': return null;
-			default: throw new IllegalArgumentException("Invalid style character '" + c + "'");
-		}
+		return switch (c) {
+			case 'S' -> FormatStyle.SHORT;
+			case 'M' -> FormatStyle.MEDIUM;
+			case 'L' -> FormatStyle.LONG;
+			case 'F' -> FormatStyle.FULL;
+			case '-' -> null;
+			default -> throw new IllegalArgumentException("Invalid style character '" + c + "'");
+		};
 	}
 
 	/**
@@ -183,28 +183,12 @@ public DateTimeFormatter createDateTimeFormatter(DateTimeFormatter fallbackForma
 			dateTimeFormatter = DateTimeFormatterUtils.createStrictDateTimeFormatter(this.pattern);
 		}
 		else if (this.iso != null && this.iso != ISO.NONE) {
-			// TODO Use switch expression once spring-javaformat 0.0.30 has been released.
-			// See https://github.com/spring-io/spring-javaformat/issues/300
-			//
-			// dateTimeFormatter = switch (this.iso) {
-			// 	case DATE -> DateTimeFormatter.ISO_DATE;
-			// 	case TIME -> DateTimeFormatter.ISO_TIME;
-			// 	case DATE_TIME -> DateTimeFormatter.ISO_DATE_TIME;
-			// 	default -> throw new IllegalStateException("Unsupported ISO format: " + this.iso);
-			// };
-			switch (this.iso) {
-				case DATE:
-					dateTimeFormatter = DateTimeFormatter.ISO_DATE;
-					break;
-				case TIME:
-					dateTimeFormatter = DateTimeFormatter.ISO_TIME;
-					break;
-				case DATE_TIME:
-					dateTimeFormatter = DateTimeFormatter.ISO_DATE_TIME;
-					break;
-				default:
-					throw new IllegalStateException("Unsupported ISO format: " + this.iso);
-			}
+			dateTimeFormatter = switch (this.iso) {
+				case DATE -> DateTimeFormatter.ISO_DATE;
+				case TIME -> DateTimeFormatter.ISO_TIME;
+				case DATE_TIME -> DateTimeFormatter.ISO_DATE_TIME;
+				default -> throw new IllegalStateException("Unsupported ISO format: " + this.iso);
+			};
 		}
 		else if (this.dateStyle != null && this.timeStyle != null) {
 			dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(this.dateStyle, this.timeStyle);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
index 09647976c080..f9b728acd024 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -42,16 +42,12 @@ private EmbeddedDatabaseConfigurerFactory() {
 	public static EmbeddedDatabaseConfigurer getConfigurer(EmbeddedDatabaseType type) throws IllegalStateException {
 		Assert.notNull(type, "EmbeddedDatabaseType is required");
 		try {
-			switch (type) {
-				case HSQL:
-					return HsqlEmbeddedDatabaseConfigurer.getInstance();
-				case H2:
-					return H2EmbeddedDatabaseConfigurer.getInstance();
-				case DERBY:
-					return DerbyEmbeddedDatabaseConfigurer.getInstance();
-				default:
-					throw new UnsupportedOperationException("Embedded database type [" + type + "] is not supported");
-			}
+			return switch (type) {
+				case HSQL -> HsqlEmbeddedDatabaseConfigurer.getInstance();
+				case H2 -> H2EmbeddedDatabaseConfigurer.getInstance();
+				case DERBY -> DerbyEmbeddedDatabaseConfigurer.getInstance();
+				default -> throw new UnsupportedOperationException("Embedded database type [" + type + "] is not supported");
+			};
 		}
 		catch (ClassNotFoundException | NoClassDefFoundError ex) {
 			throw new IllegalStateException("Driver for test database type [" + type + "] is not available", ex);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
index f50380fcdec0..ad612b4baf83 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@
  * @author Rod Johnson
  * @author Thomas Risberg
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @see SQLErrorCodesFactory
  * @see SQLStateSQLExceptionTranslator
  */
@@ -359,39 +360,45 @@ protected DataAccessException createCustomException(
 
 			// invoke constructor
 			Constructor<?> exceptionConstructor;
-			switch (constructorType) {
-				case MESSAGE_SQL_SQLEX_CONSTRUCTOR:
+			return switch (constructorType) {
+				case MESSAGE_SQL_SQLEX_CONSTRUCTOR -> {
 					Class<?>[] messageAndSqlAndSqlExArgsClass = new Class<?>[] {String.class, String.class, SQLException.class};
 					Object[] messageAndSqlAndSqlExArgs = new Object[] {task, sql, sqlEx};
 					exceptionConstructor = exceptionClass.getConstructor(messageAndSqlAndSqlExArgsClass);
-					return (DataAccessException) exceptionConstructor.newInstance(messageAndSqlAndSqlExArgs);
-				case MESSAGE_SQL_THROWABLE_CONSTRUCTOR:
+					yield (DataAccessException) exceptionConstructor.newInstance(messageAndSqlAndSqlExArgs);
+				}
+				case MESSAGE_SQL_THROWABLE_CONSTRUCTOR -> {
 					Class<?>[] messageAndSqlAndThrowableArgsClass = new Class<?>[] {String.class, String.class, Throwable.class};
 					Object[] messageAndSqlAndThrowableArgs = new Object[] {task, sql, sqlEx};
 					exceptionConstructor = exceptionClass.getConstructor(messageAndSqlAndThrowableArgsClass);
-					return (DataAccessException) exceptionConstructor.newInstance(messageAndSqlAndThrowableArgs);
-				case MESSAGE_SQLEX_CONSTRUCTOR:
+					yield (DataAccessException) exceptionConstructor.newInstance(messageAndSqlAndThrowableArgs);
+				}
+				case MESSAGE_SQLEX_CONSTRUCTOR -> {
 					Class<?>[] messageAndSqlExArgsClass = new Class<?>[] {String.class, SQLException.class};
 					Object[] messageAndSqlExArgs = new Object[] {task + ": " + sqlEx.getMessage(), sqlEx};
 					exceptionConstructor = exceptionClass.getConstructor(messageAndSqlExArgsClass);
-					return (DataAccessException) exceptionConstructor.newInstance(messageAndSqlExArgs);
-				case MESSAGE_THROWABLE_CONSTRUCTOR:
+					yield (DataAccessException) exceptionConstructor.newInstance(messageAndSqlExArgs);
+				}
+				case MESSAGE_THROWABLE_CONSTRUCTOR -> {
 					Class<?>[] messageAndThrowableArgsClass = new Class<?>[] {String.class, Throwable.class};
 					Object[] messageAndThrowableArgs = new Object[] {task + ": " + sqlEx.getMessage(), sqlEx};
 					exceptionConstructor = exceptionClass.getConstructor(messageAndThrowableArgsClass);
-					return (DataAccessException)exceptionConstructor.newInstance(messageAndThrowableArgs);
-				case MESSAGE_ONLY_CONSTRUCTOR:
+					yield (DataAccessException)exceptionConstructor.newInstance(messageAndThrowableArgs);
+				}
+				case MESSAGE_ONLY_CONSTRUCTOR -> {
 					Class<?>[] messageOnlyArgsClass = new Class<?>[] {String.class};
 					Object[] messageOnlyArgs = new Object[] {task + ": " + sqlEx.getMessage()};
 					exceptionConstructor = exceptionClass.getConstructor(messageOnlyArgsClass);
-					return (DataAccessException) exceptionConstructor.newInstance(messageOnlyArgs);
-				default:
+					yield (DataAccessException) exceptionConstructor.newInstance(messageOnlyArgs);
+				}
+				default -> {
 					if (logger.isWarnEnabled()) {
 						logger.warn("Unable to find appropriate constructor of custom exception class [" +
 								exceptionClass.getName() + "]");
 					}
-					return null;
+					yield null;
 				}
+			};
 		}
 		catch (Throwable ex) {
 			if (logger.isWarnEnabled()) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
index 429343f6b235..4428770630b4 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -179,16 +179,11 @@ public void setBeanClassLoader(ClassLoader classLoader) {
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		Message message;
 		try {
-			switch (this.targetType) {
-				case TEXT:
-					message = mapToTextMessage(object, session, this.objectMapper.writer());
-					break;
-				case BYTES:
-					message = mapToBytesMessage(object, session, this.objectMapper.writer());
-					break;
-				default:
-					message = mapToMessage(object, session, this.objectMapper.writer(), this.targetType);
-			}
+			message = switch (this.targetType) {
+				case TEXT -> mapToTextMessage(object, session, this.objectMapper.writer());
+				case BYTES -> mapToBytesMessage(object, session, this.objectMapper.writer());
+				default -> mapToMessage(object, session, this.objectMapper.writer(), this.targetType);
+			};
 		}
 		catch (IOException ex) {
 			throw new MessageConversionException("Could not map JSON object [" + object + "]", ex);
@@ -242,16 +237,11 @@ protected Message toMessage(Object object, Session session, ObjectWriter objectW
 
 		Message message;
 		try {
-			switch (this.targetType) {
-				case TEXT:
-					message = mapToTextMessage(object, session, objectWriter);
-					break;
-				case BYTES:
-					message = mapToBytesMessage(object, session, objectWriter);
-					break;
-				default:
-					message = mapToMessage(object, session, objectWriter, this.targetType);
-			}
+			message = switch (this.targetType) {
+				case TEXT -> mapToTextMessage(object, session, objectWriter);
+				case BYTES -> mapToBytesMessage(object, session, objectWriter);
+				default -> mapToMessage(object, session, objectWriter, this.targetType);
+			};
 		}
 		catch (IOException ex) {
 			throw new MessageConversionException("Could not map JSON object [" + object + "]", ex);

From b3f786728ea7ccfc1660cc5b2dfdbc8b4c20ab5f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 3 Feb 2022 15:35:32 +0100
Subject: [PATCH 636/735] Use modern language features in tests

---
 .../beans/support/PagedListHolderTests.java   | 24 ++++++++++++-------
 .../testfixture/beans/NestedTestBean.java     |  3 +--
 .../testfixture/beans/SerializablePerson.java |  3 +--
 .../beans/testfixture/beans/TestBean.java     |  3 +--
 .../factory/xml/AbstractBeanFactoryTests.java |  4 +---
 .../ConfigurationClassPostProcessorTests.java | 16 ++++++-------
 ...ithFactoryBeanBeanEarlyDeductionTests.java | 10 ++------
 .../PropertySourceAnnotationTests.java        |  4 ++--
 .../context/annotation/Spr15275Tests.java     |  8 +++----
 .../context/annotation/Spr16179Tests.java     |  2 +-
 .../AnnotationDrivenEventListenerTests.java   |  3 +--
 .../ConversionServiceFactoryBeanTests.java    |  2 +-
 ...ertySourcesPlaceholderConfigurerTests.java |  2 +-
 .../jmx/export/NotificationListenerTests.java |  6 ++---
 .../support/BitsCronFieldTests.java           |  8 +++----
 .../support/CronExpressionTests.java          |  2 +-
 .../support/GenericConversionService.java     |  4 ++--
 ...impleAnnotationMetadataReadingVisitor.java |  4 ++--
 .../core/ParameterizedTypeReferenceTests.java |  6 ++---
 .../DefaultConversionServiceTests.java        |  6 ++---
 .../core/env/CustomEnvironmentTests.java      |  2 +-
 .../core/env/PropertySourceTests.java         |  8 +++----
 .../util/concurrent/FutureAdapterTests.java   |  2 +-
 .../testfixture/security/TestPrincipal.java   |  3 +--
 .../jdbc/core/support/LobSupportTests.java    |  2 +-
 .../jdbc/object/SqlQueryTests.java            |  6 ++---
 .../jdbc/support/KeyHolderTests.java          | 15 +++---------
 .../simp/user/TestSimpSubscription.java       |  3 +--
 .../AbstractHttpRequestFactoryTests.java      |  6 ++---
 .../http/codec/xml/Jaxb2XmlDecoderTests.java  |  3 +--
 .../json/GsonHttpMessageConverterTests.java   |  6 ++---
 .../json/JsonbHttpMessageConverterTests.java  |  6 ++---
 ...pingJackson2HttpMessageConverterTests.java |  8 +++----
 ...b2CollectionHttpMessageConverterTests.java |  6 ++---
 .../reactive/ChannelSendOperatorTests.java    |  2 +-
 .../HttpMessageConverterExtractorTests.java   |  2 +-
 .../client/RestTemplateIntegrationTests.java  |  3 +--
 .../web/client/RestTemplateTests.java         |  2 +-
 .../AbstractHttpHandlerIntegrationTests.java  |  3 +--
 .../servlet/MockHttpServletRequest.java       |  3 +--
 .../servlet/MockHttpServletResponse.java      |  3 +--
 .../web/testfixture/xml/Pojo.java             |  3 +--
 .../DefaultClientRequestBuilderTests.java     |  2 +-
 .../support/ClientResponseWrapperTests.java   |  8 +++----
 .../DefaultEntityResponseBuilderTests.java    |  4 ++--
 .../server/DefaultServerRequestTests.java     |  4 ++--
 .../DispatcherHandlerIntegrationTests.java    |  2 +-
 ...lisherHandlerFunctionIntegrationTests.java |  2 +-
 .../support/ServerRequestWrapperTests.java    |  4 ++--
 .../MessageReaderArgumentResolverTests.java   |  3 +--
 ...pingMessageConversionIntegrationTests.java |  2 +-
 .../web/context/ContextLoaderTests.java       |  2 +-
 .../XmlWebApplicationContextTests.java        |  4 ++--
 .../annotation/InterceptorRegistryTests.java  |  3 +--
 .../web/servlet/i18n/LocaleResolverTests.java |  3 +--
 .../web/servlet/tags/form/ItemPet.java        |  3 +--
 .../web/servlet/tags/form/OptionTagTests.java |  3 +--
 .../web/socket/UndertowTestServer.java        |  4 ++--
 58 files changed, 118 insertions(+), 152 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
index 0afce6483444..e5189de08358 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
@@ -195,14 +195,22 @@ public void setExtendedInfo(String extendedInfo) {
 
 		@Override
 		public boolean equals(Object o) {
-			if (this == o) return true;
-			if (!(o instanceof MockFilter)) return false;
-
-			final MockFilter mockFilter = (MockFilter) o;
-
-			if (!age.equals(mockFilter.age)) return false;
-			if (!extendedInfo.equals(mockFilter.extendedInfo)) return false;
-			if (!name.equals(mockFilter.name)) return false;
+			if (this == o) {
+				return true;
+			}
+			if (!(o instanceof MockFilter mockFilter)) {
+				return false;
+			}
+
+			if (!age.equals(mockFilter.age)) {
+				return false;
+			}
+			if (!extendedInfo.equals(mockFilter.extendedInfo)) {
+				return false;
+			}
+			if (!name.equals(mockFilter.name)) {
+				return false;
+			}
 
 			return true;
 		}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/NestedTestBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/NestedTestBean.java
index ea26ec0072c0..1fb6b60081d2 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/NestedTestBean.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/NestedTestBean.java
@@ -44,10 +44,9 @@ public String getCompany() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
+		if (!(obj instanceof NestedTestBean ntb)) {
 			return false;
 		}
-		NestedTestBean ntb = (NestedTestBean) obj;
 		return this.company.equals(ntb.company);
 	}
 
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/SerializablePerson.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/SerializablePerson.java
index 6f9436906cc1..c406c5c47b06 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/SerializablePerson.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/SerializablePerson.java
@@ -64,10 +64,9 @@ public Object echo(Object o) throws Throwable {
 
 	@Override
 	public boolean equals(Object other) {
-		if (!(other instanceof SerializablePerson)) {
+		if (!(other instanceof SerializablePerson p)) {
 			return false;
 		}
-		SerializablePerson p = (SerializablePerson) other;
 		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
 	}
 
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/TestBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/TestBean.java
index ed54d0d05f4b..ec9b74286330 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/TestBean.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/TestBean.java
@@ -468,10 +468,9 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof TestBean)) {
+		if (!(other instanceof TestBean tb2)) {
 			return false;
 		}
-		TestBean tb2 = (TestBean) other;
 		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
 	}
 
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java
index 307a9d64c12d..3062dc62dcdf 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java
@@ -261,11 +261,9 @@ public void rejectsFactoryGetOnNormalBean() {
 	@Test
 	public void aliasing() {
 		BeanFactory bf = getBeanFactory();
-		if (!(bf instanceof ConfigurableBeanFactory)) {
+		if (!(bf instanceof ConfigurableBeanFactory cbf)) {
 			return;
 		}
-		ConfigurableBeanFactory cbf = (ConfigurableBeanFactory) bf;
-
 		String alias = "rods alias";
 
 		assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() ->
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
index cb405b959895..5b5c5de1bf67 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
@@ -1358,7 +1358,7 @@ public static class RepositoryConfiguration {
 
 		@Bean
 		public Repository<String> stringRepo() {
-			return new Repository<String>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<String>";
@@ -1368,7 +1368,7 @@ public String toString() {
 
 		@Bean
 		public Repository<Integer> integerRepo() {
-			return new Repository<Integer>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<Integer>";
@@ -1378,7 +1378,7 @@ public String toString() {
 
 		@Bean
 		public Repository<?> genericRepo() {
-			return new Repository<Object>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<Object>";
@@ -1423,7 +1423,7 @@ public static class ScopedRepositoryConfiguration {
 		@Bean
 		@Scope("prototype")
 		public Repository<String> stringRepo() {
-			return new Repository<String>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<String>";
@@ -1434,7 +1434,7 @@ public String toString() {
 		@Bean
 		@Scope("prototype")
 		public Repository<Integer> integerRepo() {
-			return new Repository<Integer>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<Integer>";
@@ -1446,7 +1446,7 @@ public String toString() {
 		@Scope("prototype")
 		@SuppressWarnings("rawtypes")
 		public Repository genericRepo() {
-			return new Repository<Object>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<Object>";
@@ -1468,7 +1468,7 @@ public static class ScopedProxyRepositoryConfiguration {
 		@Bean
 		@Scope(scopeName = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
 		public Repository<String> stringRepo() {
-			return new Repository<String>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<String>";
@@ -1479,7 +1479,7 @@ public String toString() {
 		@Bean
 		@PrototypeScoped
 		public Repository<Integer> integerRepo() {
-			return new Repository<Integer>() {
+			return new Repository<>() {
 				@Override
 				public String toString() {
 					return "Repository<Integer>";
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanBeanEarlyDeductionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanBeanEarlyDeductionTests.java
index 833e357f006e..74688cd5d81b 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanBeanEarlyDeductionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanBeanEarlyDeductionTests.java
@@ -95,7 +95,7 @@ public void preFreezeUnresolvedGenericFactoryBean() {
 		beanDefinition.setFactoryBeanName("factoryBean");
 		beanDefinition.setFactoryMethodName("myBean");
 		GenericApplicationContext context = new GenericApplicationContext();
-		try {
+		try (context) {
 			context.registerBeanDefinition("factoryBean", factoryBeanDefinition);
 			context.registerBeanDefinition("myBean", beanDefinition);
 			NameCollectingBeanFactoryPostProcessor postProcessor = new NameCollectingBeanFactoryPostProcessor();
@@ -103,9 +103,6 @@ public void preFreezeUnresolvedGenericFactoryBean() {
 			context.refresh();
 			assertContainsMyBeanName(postProcessor.getNames());
 		}
-		finally {
-			context.close();
-		}
 	}
 
 	private void assertPostFreeze(Class<?> configurationClass) {
@@ -118,16 +115,13 @@ private void assertPreFreeze(Class<?> configurationClass,
 			BeanFactoryPostProcessor... postProcessors) {
 		NameCollectingBeanFactoryPostProcessor postProcessor = new NameCollectingBeanFactoryPostProcessor();
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		try {
+		try (context) {
 			Arrays.stream(postProcessors).forEach(context::addBeanFactoryPostProcessor);
 			context.addBeanFactoryPostProcessor(postProcessor);
 			context.register(configurationClass);
 			context.refresh();
 			assertContainsMyBeanName(postProcessor.getNames());
 		}
-		finally {
-			context.close();
-		}
 	}
 
 	private void assertContainsMyBeanName(AnnotationConfigApplicationContext context) {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
index 8b73c760ee10..6e2161626a10 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
@@ -327,7 +327,7 @@ static class ConfigWithResolvablePlaceholderAndFactoryBean {
 		@Bean
 		FactoryBean<TestBean> testBean() {
 			final String name = env.getProperty("testbean.name");
-			return new FactoryBean<TestBean>() {
+			return new FactoryBean<>() {
 				@Override
 				public TestBean getObject() {
 					return new TestBean(name);
@@ -417,7 +417,7 @@ static class MyCustomFactory implements PropertySourceFactory {
 		@Override
 		public org.springframework.core.env.PropertySource<?> createPropertySource(String name, EncodedResource resource) throws IOException {
 			Properties props = PropertiesLoaderUtils.loadProperties(resource);
-			return new org.springframework.core.env.PropertySource<Properties>("my" + name, props) {
+			return new org.springframework.core.env.PropertySource<>("my" + name, props) {
 				@Override
 				public Object getProperty(String name) {
 					String value = props.getProperty(name);
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java
index ac8222f620a8..86080098d8f8 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr15275Tests.java
@@ -78,7 +78,7 @@ protected static class ConfigWithFactoryBean {
 
 		@Bean
 		public FactoryBean<Foo> foo() {
-			return new FactoryBean<Foo>() {
+			return new FactoryBean<>() {
 				@Override
 				public Foo getObject() {
 					return new Foo("x");
@@ -103,7 +103,7 @@ protected static class ConfigWithAbstractFactoryBean {
 
 		@Bean
 		public FactoryBean<Foo> foo() {
-			return new AbstractFactoryBean<Foo>() {
+			return new AbstractFactoryBean<>() {
 				@Override
 				public Foo createInstance() {
 					return new Foo("x");
@@ -128,7 +128,7 @@ protected static class ConfigWithAbstractFactoryBeanForInterface {
 
 		@Bean
 		public FactoryBean<FooInterface> foo() {
-			return new AbstractFactoryBean<FooInterface>() {
+			return new AbstractFactoryBean<>() {
 				@Override
 				public FooInterface createInstance() {
 					return new Foo("x");
@@ -153,7 +153,7 @@ protected static class ConfigWithAbstractFactoryBeanAsReturnType {
 
 		@Bean
 		public AbstractFactoryBean<FooInterface> foo() {
-			return new AbstractFactoryBean<FooInterface>() {
+			return new AbstractFactoryBean<>() {
 				@Override
 				public FooInterface createInstance() {
 					return new Foo("x");
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java
index 3bb817546445..8af39562cdc3 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java
@@ -53,7 +53,7 @@ PageAssemblerImpl<?> pageAssembler() {
 
 		@Bean
 		Assembler<SomeType> someAssembler() {
-			return new Assembler<SomeType>() {};
+			return new Assembler<>() {};
 		}
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
index 8c51dd29420b..9c81b50e2255 100644
--- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
@@ -774,8 +774,7 @@ public Object handle(AnotherTestEvent event) {
 			if (event.content == null) {
 				return null;
 			}
-			else if (event.content instanceof String) {
-				String s = (String) event.content;
+			else if (event.content instanceof String s) {
 				if (s.equals("String")) {
 					return event.content;
 				}
diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index d46d9fb61fa9..9c5f15218700 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -64,7 +64,7 @@ public Foo convert(String source) {
 		converters.add(new ConverterFactory<String, Bar>() {
 			@Override
 			public <T extends Bar> Converter<String, T> getConverter(Class<T> targetType) {
-				return new Converter<String, T> () {
+				return new Converter<> () {
 					@SuppressWarnings("unchecked")
 					@Override
 					public T convert(String source) {
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
index 839b4c5395bd..839044820bac 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
@@ -265,7 +265,7 @@ public void withNonEnumerablePropertySource() {
 
 		PropertySourcesPlaceholderConfigurer ppc = new PropertySourcesPlaceholderConfigurer();
 
-		PropertySource<?> ps = new PropertySource<Object>("simplePropertySource", new Object()) {
+		PropertySource<?> ps = new PropertySource<>("simplePropertySource", new Object()) {
 			@Override
 			public Object getProperty(String key) {
 				return "bar";
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
index c842a656fd37..4ccfbadfc841 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
@@ -168,8 +168,7 @@ public void testRegisterNotificationListenerWithFilter() throws Exception {
 		NotificationListenerBean listenerBean = new NotificationListenerBean();
 		listenerBean.setNotificationListener(listener);
 		listenerBean.setNotificationFilter(notification -> {
-			if (notification instanceof AttributeChangeNotification) {
-				AttributeChangeNotification changeNotification = (AttributeChangeNotification) notification;
+			if (notification instanceof AttributeChangeNotification changeNotification) {
 				return "Name".equals(changeNotification.getAttributeName());
 			}
 			else {
@@ -450,8 +449,7 @@ private static class CountingAttributeChangeNotificationListener implements Noti
 
 		@Override
 		public void handleNotification(Notification notification, Object handback) {
-			if (notification instanceof AttributeChangeNotification) {
-				AttributeChangeNotification attNotification = (AttributeChangeNotification) notification;
+			if (notification instanceof AttributeChangeNotification attNotification) {
 				String attributeName = attNotification.getAttributeName();
 
 				Integer currentCount = (Integer) this.attributeCounts.get(attributeName);
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java
index 37d6b30d4fd3..961312a64ff8 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java
@@ -108,7 +108,7 @@ void names() {
 	}
 
 	private static Condition<BitsCronField> set(int... indices) {
-		return new Condition<BitsCronField>(String.format("set bits %s", Arrays.toString(indices))) {
+		return new Condition<>(String.format("set bits %s", Arrays.toString(indices))) {
 			@Override
 			public boolean matches(BitsCronField value) {
 				for (int index : indices) {
@@ -122,7 +122,7 @@ public boolean matches(BitsCronField value) {
 	}
 
 	private static Condition<BitsCronField> setRange(int min, int max) {
-		return new Condition<BitsCronField>(String.format("set range %d-%d", min, max)) {
+		return new Condition<>(String.format("set range %d-%d", min, max)) {
 			@Override
 			public boolean matches(BitsCronField value) {
 				for (int i = min; i < max; i++) {
@@ -136,7 +136,7 @@ public boolean matches(BitsCronField value) {
 	}
 
 	private static Condition<BitsCronField> clear(int... indices) {
-		return new Condition<BitsCronField>(String.format("clear bits %s", Arrays.toString(indices))) {
+		return new Condition<>(String.format("clear bits %s", Arrays.toString(indices))) {
 			@Override
 			public boolean matches(BitsCronField value) {
 				for (int index : indices) {
@@ -150,7 +150,7 @@ public boolean matches(BitsCronField value) {
 	}
 
 	private static Condition<BitsCronField> clearRange(int min, int max) {
-		return new Condition<BitsCronField>(String.format("clear range %d-%d", min, max)) {
+		return new Condition<>(String.format("clear range %d-%d", min, max)) {
 			@Override
 			public boolean matches(BitsCronField value) {
 				for (int i = min; i < max; i++) {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
index 5abce9e2de30..bed392c9f26c 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
@@ -43,7 +43,7 @@
  */
 class CronExpressionTests {
 
-	private static final Condition<Temporal> weekday = new Condition<Temporal>("weekday") {
+	private static final Condition<Temporal> weekday = new Condition<>("weekday") {
 
 		@Override
 		public boolean matches(Temporal value) {
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
index 0c0e9c036474..ed9e495b7d57 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
@@ -85,8 +85,8 @@ public class GenericConversionService implements ConfigurableConversionService {
 	@Override
 	public void addConverter(Converter<?, ?> converter) {
 		ResolvableType[] typeInfo = getRequiredTypeInfo(converter.getClass(), Converter.class);
-		if (typeInfo == null && converter instanceof DecoratingProxy) {
-			typeInfo = getRequiredTypeInfo(((DecoratingProxy) converter).getDecoratedClass(), Converter.class);
+		if (typeInfo == null && converter instanceof DecoratingProxy decoratingProxy) {
+			typeInfo = getRequiredTypeInfo(decoratingProxy.getDecoratedClass(), Converter.class);
 		}
 		if (typeInfo == null) {
 			throw new IllegalArgumentException("Unable to determine source type <S> and target type <T> for your " +
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
index b156330eb761..7044ea7e4191 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadataReadingVisitor.java
@@ -85,8 +85,8 @@ public void visit(int version, int access, String name, String signature,
 		if (supername != null && !isInterface(access)) {
 			this.superClassName = toClassName(supername);
 		}
-		for (int i = 0; i < interfaces.length; i++) {
-			this.interfaceNames.add(toClassName(interfaces[i]));
+		for (String element : interfaces) {
+			this.interfaceNames.add(toClassName(element));
 		}
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTests.java b/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTests.java
index cb7e0414dfaa..900def51de73 100644
--- a/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTests.java
@@ -34,21 +34,21 @@ class ParameterizedTypeReferenceTests {
 
 	@Test
 	void stringTypeReference() {
-		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<>() {};
 		assertThat(typeReference.getType()).isEqualTo(String.class);
 	}
 
 	@Test
 	void mapTypeReference() throws Exception {
 		Type mapType = getClass().getMethod("mapMethod").getGenericReturnType();
-		ParameterizedTypeReference<Map<Object,String>> typeReference = new ParameterizedTypeReference<Map<Object,String>>() {};
+		ParameterizedTypeReference<Map<Object,String>> typeReference = new ParameterizedTypeReference<>() {};
 		assertThat(typeReference.getType()).isEqualTo(mapType);
 	}
 
 	@Test
 	void listTypeReference() throws Exception {
 		Type listType = getClass().getMethod("listMethod").getGenericReturnType();
-		ParameterizedTypeReference<List<String>> typeReference = new ParameterizedTypeReference<List<String>>() {};
+		ParameterizedTypeReference<List<String>> typeReference = new ParameterizedTypeReference<>() {};
 		assertThat(typeReference.getType()).isEqualTo(listType);
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
index 058a72adf3bf..f4ac87c81ce1 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
@@ -1096,10 +1096,9 @@ public SSN(String value) {
 
 		@Override
 		public boolean equals(Object o) {
-			if (!(o instanceof SSN)) {
+			if (!(o instanceof SSN ssn)) {
 				return false;
 			}
-			SSN ssn = (SSN) o;
 			return this.value.equals(ssn.value);
 		}
 
@@ -1137,10 +1136,9 @@ public ISBN(String value) {
 
 		@Override
 		public boolean equals(Object o) {
-			if (!(o instanceof ISBN)) {
+			if (!(o instanceof ISBN isbn)) {
 				return false;
 			}
-			ISBN isbn = (ISBN) o;
 			return this.value.equals(isbn.value);
 		}
 
diff --git a/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java
index cc6098f52b80..2c87ad806d98 100644
--- a/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java
@@ -75,7 +75,7 @@ class CustomEnvironment extends AbstractEnvironment {
 			@Override
 			@SuppressWarnings("serial")
 			protected Set<String> getReservedDefaultProfiles() {
-				return new HashSet<String>() {{
+				return new HashSet<>() {{
 						add("rd1");
 						add("rd2");
 				}};
diff --git a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
index 11f90d5b8cf5..6256832b2f63 100644
--- a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
@@ -37,10 +37,10 @@ class PropertySourceTests {
 	@Test
 	@SuppressWarnings("serial")
 	void equals() {
-		Map<String, Object> map1 = new HashMap<String, Object>() {{
+		Map<String, Object> map1 = new HashMap<>() {{
 			put("a", "b");
 		}};
-		Map<String, Object> map2 = new HashMap<String, Object>() {{
+		Map<String, Object> map2 = new HashMap<>() {{
 			put("c", "d");
 		}};
 		Properties props1 = new Properties() {{
@@ -69,10 +69,10 @@ void equals() {
 	@Test
 	@SuppressWarnings("serial")
 	void collectionsOperations() {
-		Map<String, Object> map1 = new HashMap<String, Object>() {{
+		Map<String, Object> map1 = new HashMap<>() {{
 			put("a", "b");
 		}};
-		Map<String, Object> map2 = new HashMap<String, Object>() {{
+		Map<String, Object> map2 = new HashMap<>() {{
 			put("c", "d");
 		}};
 
diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java
index c192888517d4..1ca2678043dd 100644
--- a/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java
+++ b/spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java
@@ -41,7 +41,7 @@ class FutureAdapterTests {
 	@SuppressWarnings("unchecked")
 	void setUp() {
 		adaptee = mock(Future.class);
-		adapter = new FutureAdapter<String, Integer>(adaptee) {
+		adapter = new FutureAdapter<>(adaptee) {
 			@Override
 			protected String adapt(Integer adapteeResult) throws ExecutionException {
 				return adapteeResult.toString();
diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/security/TestPrincipal.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/security/TestPrincipal.java
index 78c60b067b30..e3ec30853089 100644
--- a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/security/TestPrincipal.java
+++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/security/TestPrincipal.java
@@ -41,10 +41,9 @@ public boolean equals(Object obj) {
 		if (obj == this) {
 			return true;
 		}
-		if (!(obj instanceof TestPrincipal)) {
+		if (!(obj instanceof TestPrincipal p)) {
 			return false;
 		}
-		TestPrincipal p = (TestPrincipal) obj;
 		return this.name.equals(p.name);
 	}
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
index d0ba6edf8f9c..1100dd748d21 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
@@ -111,7 +111,7 @@ public void testAbstractLobStreamingResultSetExtractorCorrectException()
 	}
 
 	private AbstractLobStreamingResultSetExtractor<Void> getResultSetExtractor(final boolean ex) {
-		AbstractLobStreamingResultSetExtractor<Void> lobRse = new AbstractLobStreamingResultSetExtractor<Void>() {
+		AbstractLobStreamingResultSetExtractor<Void> lobRse = new AbstractLobStreamingResultSetExtractor<>() {
 
 			@Override
 			protected void streamData(ResultSet rs) throws SQLException, IOException {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
index e6c95ee1ddd5..9b18659c0f0f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
@@ -107,7 +107,7 @@ public void testQueryWithoutParams() throws SQLException {
 		given(resultSet.next()).willReturn(true, false);
 		given(resultSet.getInt(1)).willReturn(1);
 
-		SqlQuery<Integer> query = new MappingSqlQueryWithParameters<Integer>() {
+		SqlQuery<Integer> query = new MappingSqlQueryWithParameters<>() {
 			@Override
 			protected Integer mapRow(ResultSet rs, int rownum, @Nullable Object[] params, @Nullable Map<? ,?> context)
 					throws SQLException {
@@ -129,7 +129,7 @@ protected Integer mapRow(ResultSet rs, int rownum, @Nullable Object[] params, @N
 
 	@Test
 	public void testQueryWithoutEnoughParams() {
-		MappingSqlQuery<Integer> query = new MappingSqlQuery<Integer>() {
+		MappingSqlQuery<Integer> query = new MappingSqlQuery<>() {
 			@Override
 			protected Integer mapRow(ResultSet rs, int rownum) throws SQLException {
 				return rs.getInt(1);
@@ -147,7 +147,7 @@ protected Integer mapRow(ResultSet rs, int rownum) throws SQLException {
 
 	@Test
 	public void testQueryWithMissingMapParams() {
-		MappingSqlQuery<Integer> query = new MappingSqlQuery<Integer>() {
+		MappingSqlQuery<Integer> query = new MappingSqlQuery<>() {
 			@Override
 			protected Integer mapRow(ResultSet rs, int rownum) throws SQLException {
 				return rs.getInt(1);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
index c128b8fd3bcf..d77f57c7f341 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.jdbc.support;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
@@ -69,12 +68,7 @@ void getKeyWithNoKeysInMap() {
 
 	@Test
 	void getKeyWithMultipleKeysInMap() {
-		@SuppressWarnings("serial")
-		Map<String, Object> m = new HashMap<String, Object>() {{
-			put("key", 1);
-			put("seq", 2);
-		}};
-		kh.getKeyList().add(m);
+		kh.getKeyList().add(Map.of("key", 1, "seq", 2));
 
 		assertThat(kh.getKeys()).as("two keys should be in the map").hasSize(2);
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
@@ -110,10 +104,7 @@ void getKeyAsIntegerWithNullValue() {
 	@Test
 	void getKeysWithMultipleKeyRows() {
 		@SuppressWarnings("serial")
-		Map<String, Object> m = new HashMap<String, Object>() {{
-			put("key", 1);
-			put("seq", 2);
-		}};
+		Map<String, Object> m = Map.of("key", 1, "seq", 2);
 		kh.getKeyList().addAll(asList(m, m));
 
 		assertThat(kh.getKeyList()).as("two rows should be in the list").hasSize(2);
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/TestSimpSubscription.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/TestSimpSubscription.java
index 55fe630c881c..d7315bb328a8 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/TestSimpSubscription.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/TestSimpSubscription.java
@@ -61,10 +61,9 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof SimpSubscription)) {
+		if (!(other instanceof SimpSubscription otherSubscription)) {
 			return false;
 		}
-		SimpSubscription otherSubscription = (SimpSubscription) other;
 		return (ObjectUtils.nullSafeEquals(getSession(), otherSubscription.getSession()) &&
 				this.id.equals(otherSubscription.getId()));
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java
index f231495ddf97..427f21f61900 100644
--- a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTests.java
@@ -89,8 +89,7 @@ void echo() throws Exception {
 		final byte[] body = "Hello World".getBytes(StandardCharsets.UTF_8);
 		request.getHeaders().setContentLength(body.length);
 
-		if (request instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingRequest = (StreamingHttpOutputMessage) request;
+		if (request instanceof StreamingHttpOutputMessage streamingRequest) {
 			streamingRequest.setBody(outputStream -> StreamUtils.copy(body, outputStream));
 		}
 		else {
@@ -111,8 +110,7 @@ void multipleWrites() throws Exception {
 		ClientHttpRequest request = factory.createRequest(new URI(baseUrl + "/echo"), HttpMethod.POST);
 
 		final byte[] body = "Hello World".getBytes(StandardCharsets.UTF_8);
-		if (request instanceof StreamingHttpOutputMessage) {
-			StreamingHttpOutputMessage streamingRequest = (StreamingHttpOutputMessage) request;
+		if (request instanceof StreamingHttpOutputMessage streamingRequest) {
 			streamingRequest.setBody(outputStream -> {
 				StreamUtils.copy(body, outputStream);
 				outputStream.flush();
diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
index 64acde269375..cd2d89b632db 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java
@@ -289,8 +289,7 @@ public boolean equals(Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (o instanceof TypePojo) {
-				TypePojo other = (TypePojo) o;
+			if (o instanceof TypePojo other) {
 				return this.foo.equals(other.foo) && this.bar.equals(other.bar);
 			}
 			return false;
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
index 29cca1deef58..0bbabb216dba 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java
@@ -207,7 +207,7 @@ public void readAndWriteGenerics() throws Exception {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void readAndWriteParameterizedType() throws Exception {
-		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<List<MyBean>>() {
+		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<>() {
 		};
 
 		String body = "[{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," +
@@ -234,8 +234,8 @@ public void readAndWriteParameterizedType() throws Exception {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void writeParameterizedBaseType() throws Exception {
-		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<List<MyBean>>() {};
-		ParameterizedTypeReference<List<MyBase>> baseList = new ParameterizedTypeReference<List<MyBase>>() {};
+		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<>() {};
+		ParameterizedTypeReference<List<MyBase>> baseList = new ParameterizedTypeReference<>() {};
 
 		String body = "[{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," +
 				"\"number\":42,\"string\":\"Foo\",\"bool\":true,\"fraction\":42.0}]";
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
index df3052bbaeda..c0825f88d2f3 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java
@@ -207,7 +207,7 @@ public void readAndWriteGenerics() throws Exception {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void readAndWriteParameterizedType() throws Exception {
-		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<List<MyBean>>() {};
+		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<>() {};
 
 		String body = "[{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," +
 				"\"number\":42,\"string\":\"Foo\",\"bool\":true,\"fraction\":42.0}]";
@@ -233,8 +233,8 @@ public void readAndWriteParameterizedType() throws Exception {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void writeParameterizedBaseType() throws Exception {
-		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<List<MyBean>>() {};
-		ParameterizedTypeReference<List<MyBase>> baseList = new ParameterizedTypeReference<List<MyBase>>() {};
+		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<>() {};
+		ParameterizedTypeReference<List<MyBase>> baseList = new ParameterizedTypeReference<>() {};
 
 		String body = "[{\"bytes\":[1,2],\"array\":[\"Foo\",\"Bar\"]," +
 				"\"number\":42,\"string\":\"Foo\",\"bool\":true,\"fraction\":42.0}]";
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
index 76358796eabc..2f5a3c6ae2ee 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -281,7 +281,7 @@ protected JavaType getJavaType(Type type, @Nullable Class<?> contextClass) {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void readAndWriteParameterizedType() throws Exception {
-		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<List<MyBean>>() {};
+		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<>() {};
 
 		String body = "[{" +
 				"\"bytes\":\"AQI=\"," +
@@ -312,8 +312,8 @@ public void readAndWriteParameterizedType() throws Exception {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void writeParameterizedBaseType() throws Exception {
-		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<List<MyBean>>() {};
-		ParameterizedTypeReference<List<MyBase>> baseList = new ParameterizedTypeReference<List<MyBase>>() {};
+		ParameterizedTypeReference<List<MyBean>> beansList = new ParameterizedTypeReference<>() {};
+		ParameterizedTypeReference<List<MyBase>> baseList = new ParameterizedTypeReference<>() {};
 
 		String body = "[{" +
 				"\"bytes\":\"AQI=\"," +
@@ -468,7 +468,7 @@ public void writeSubTypeList() throws Exception {
 		bar.setNumber(123);
 		beans.add(bar);
 		ParameterizedTypeReference<List<MyInterface>> typeReference =
-				new ParameterizedTypeReference<List<MyInterface>>() {};
+				new ParameterizedTypeReference<>() {};
 
 		this.converter.writeInternal(beans, typeReference.getType(), outputMessage);
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
index c12f97c05b65..b4b06af76db8 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
@@ -224,8 +224,7 @@ public boolean equals(Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (o instanceof RootElement) {
-				RootElement other = (RootElement) o;
+			if (o instanceof RootElement other) {
 				return this.type.equals(other.type);
 			}
 			return false;
@@ -256,8 +255,7 @@ public boolean equals(Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (o instanceof TestType) {
-				TestType other = (TestType) o;
+			if (o instanceof TestType other) {
 				return this.s.equals(other.s);
 			}
 			return false;
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
index 7a050dd67e7b..cc1468359d00 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java
@@ -140,7 +140,7 @@ public void cancelWhileItemCached() {
 					return Mono.never();
 				});
 
-		BaseSubscriber<Void> subscriber = new BaseSubscriber<Void>() {};
+		BaseSubscriber<Void> subscriber = new BaseSubscriber<>() {};
 		operator.subscribe(subscriber);
 		subscriber.cancel();
 
diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index e9d6bd1da382..3a361737fea7 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -153,7 +153,7 @@ void cannotRead() throws IOException {
 	void generics() throws IOException {
 		responseHeaders.setContentType(contentType);
 		String expected = "Foo";
-		ParameterizedTypeReference<List<String>> reference = new ParameterizedTypeReference<List<String>>() {};
+		ParameterizedTypeReference<List<String>> reference = new ParameterizedTypeReference<>() {};
 		Type type = reference.getType();
 
 		GenericHttpMessageConverter<String> converter = mock(GenericHttpMessageConverter.class);
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
index e2a46d5919ed..d8b0648680e8 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
@@ -115,8 +115,7 @@ static Stream<ClientHttpRequestFactory> clientHttpRequestFactories() {
 	 */
 	@RegisterExtension
 	TestExecutionExceptionHandler serverErrorToAssertionErrorConverter = (context, throwable) -> {
-		if (throwable instanceof HttpServerErrorException) {
-			HttpServerErrorException ex = (HttpServerErrorException) throwable;
+		if (throwable instanceof HttpServerErrorException ex) {
 			String responseBody = ex.getResponseBodyAsString();
 			String prefix = AssertionError.class.getName() + ": ";
 			if (responseBody.startsWith(prefix)) {
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
index 85144efdeda2..2f8fb82c4e90 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
@@ -646,7 +646,7 @@ void exchange() throws Exception {
 	void exchangeParameterizedType() throws Exception {
 		GenericHttpMessageConverter converter = mock(GenericHttpMessageConverter.class);
 		template.setMessageConverters(Collections.<HttpMessageConverter<?>>singletonList(converter));
-		ParameterizedTypeReference<List<Integer>> intList = new ParameterizedTypeReference<List<Integer>>() {};
+		ParameterizedTypeReference<List<Integer>> intList = new ParameterizedTypeReference<>() {};
 		given(converter.canRead(intList.getType(), null, null)).willReturn(true);
 		given(converter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
 		given(converter.canWrite(String.class, String.class, null)).willReturn(true);
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/AbstractHttpHandlerIntegrationTests.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/AbstractHttpHandlerIntegrationTests.java
index 90d05db9f20a..1cb2ccf97f77 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/AbstractHttpHandlerIntegrationTests.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/AbstractHttpHandlerIntegrationTests.java
@@ -52,8 +52,7 @@ public abstract class AbstractHttpHandlerIntegrationTests {
 	 */
 	@RegisterExtension
 	TestExecutionExceptionHandler serverErrorToAssertionErrorConverter = (context, throwable) -> {
-		if (throwable instanceof HttpServerErrorException) {
-			HttpServerErrorException ex = (HttpServerErrorException) throwable;
+		if (throwable instanceof HttpServerErrorException ex) {
 			String responseBody = ex.getResponseBodyAsString();
 			if (StringUtils.hasText(responseBody)) {
 				String prefix = AssertionError.class.getName() + ": ";
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
index 4fa2620ca84b..1eb76b1f5aed 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
@@ -1282,8 +1282,7 @@ public String getServletPath() {
 
 	public void setSession(HttpSession session) {
 		this.session = session;
-		if (session instanceof MockHttpSession) {
-			MockHttpSession mockSession = ((MockHttpSession) session);
+		if (session instanceof MockHttpSession mockSession) {
 			mockSession.access();
 		}
 	}
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
index af9773ce330c..267b6087393d 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -447,8 +447,7 @@ else if (expires != null) {
 		if (cookie.isHttpOnly()) {
 			buf.append("; HttpOnly");
 		}
-		if (cookie instanceof MockCookie) {
-			MockCookie mockCookie = (MockCookie) cookie;
+		if (cookie instanceof MockCookie mockCookie) {
 			if (StringUtils.hasText(mockCookie.getSameSite())) {
 				buf.append("; SameSite=").append(mockCookie.getSameSite());
 			}
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java
index 87487adebc7c..e7bb736c01f9 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/xml/Pojo.java
@@ -57,8 +57,7 @@ public boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
-		if (o instanceof Pojo) {
-			Pojo other = (Pojo) o;
+		if (o instanceof Pojo other) {
 			return this.foo.equals(other.foo) && this.bar.equals(other.bar);
 		}
 		return false;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
index 5bff972bdd2e..14521cbac400 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
@@ -202,7 +202,7 @@ public void bodyClass() {
 	public void bodyParameterizedTypeReference() {
 		String body = "foo";
 		Publisher<String> publisher = Mono.just(body);
-		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<>() {};
 		ClientRequest result = ClientRequest.create(POST, DEFAULT_URL).body(publisher, typeReference).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java
index 5e7d13008cc9..0031134b417e 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/ClientResponseWrapperTests.java
@@ -111,7 +111,7 @@ public void bodyToMonoClass() {
 	@Test
 	public void bodyToMonoParameterizedTypeReference() {
 		Mono<String> result = Mono.just("foo");
-		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<>() {};
 		given(mockResponse.bodyToMono(reference)).willReturn(result);
 
 		assertThat(wrapper.bodyToMono(reference)).isSameAs(result);
@@ -128,7 +128,7 @@ public void bodyToFluxClass() {
 	@Test
 	public void bodyToFluxParameterizedTypeReference() {
 		Flux<String> result = Flux.just("foo");
-		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<>() {};
 		given(mockResponse.bodyToFlux(reference)).willReturn(result);
 
 		assertThat(wrapper.bodyToFlux(reference)).isSameAs(result);
@@ -145,7 +145,7 @@ public void toEntityClass() {
 	@Test
 	public void toEntityParameterizedTypeReference() {
 		Mono<ResponseEntity<String>> result = Mono.just(new ResponseEntity<>("foo", HttpStatus.OK));
-		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<>() {};
 		given(mockResponse.toEntity(reference)).willReturn(result);
 
 		assertThat(wrapper.toEntity(reference)).isSameAs(result);
@@ -162,7 +162,7 @@ public void toEntityListClass() {
 	@Test
 	public void toEntityListParameterizedTypeReference() {
 		Mono<ResponseEntity<List<String>>> result = Mono.just(new ResponseEntity<>(singletonList("foo"), HttpStatus.OK));
-		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<>() {};
 		given(mockResponse.toEntityList(reference)).willReturn(result);
 
 		assertThat(wrapper.toEntityList(reference)).isSameAs(result);
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java
index 1e180ccfb045..87bb8145de78 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultEntityResponseBuilderTests.java
@@ -71,7 +71,7 @@ public void fromPublisherClass() {
 	@Test
 	public void fromPublisher() {
 		Flux<String> body = Flux.just("foo", "bar");
-		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<>() {};
 		EntityResponse<Flux<String>> response = EntityResponse.fromPublisher(body, typeReference).build().block();
 		assertThat(response.entity()).isSameAs(body);
 	}
@@ -79,7 +79,7 @@ public void fromPublisher() {
 	@Test
 	public void fromProducer() {
 		Single<String> body = Single.just("foo");
-		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<>() {};
 		EntityResponse<Single<String>> response = EntityResponse.fromProducer(body, typeReference).build().block();
 		assertThat(response.entity()).isSameAs(body);
 	}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java
index d195f1f12fa4..65df3a89b219 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java
@@ -288,7 +288,7 @@ public void bodyToMonoParameterizedTypeReference() {
 				.body(body);
 		DefaultServerRequest request = new DefaultServerRequest(MockServerWebExchange.from(mockRequest), messageReaders);
 
-		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<>() {};
 		Mono<String> resultMono = request.bodyToMono(typeReference);
 		assertThat(resultMono.block()).isEqualTo("foo");
 	}
@@ -346,7 +346,7 @@ public void bodyToFluxParameterizedTypeReference() {
 				.body(body);
 		DefaultServerRequest request = new DefaultServerRequest(MockServerWebExchange.from(mockRequest), messageReaders);
 
-		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<>() {};
 		Flux<String> resultFlux = request.bodyToFlux(typeReference);
 		assertThat(resultFlux.collectList().block()).isEqualTo(Collections.singletonList("foo"));
 	}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
index 3bc9716124af..e80053a0ea7a 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
@@ -88,7 +88,7 @@ void mono(HttpServer httpServer) throws Exception {
 	void flux(HttpServer httpServer) throws Exception {
 		startServer(httpServer);
 
-		ParameterizedTypeReference<List<Person>> reference = new ParameterizedTypeReference<List<Person>>() {};
+		ParameterizedTypeReference<List<Person>> reference = new ParameterizedTypeReference<>() {};
 		ResponseEntity<List<Person>> result =
 				this.restTemplate
 						.exchange("http://localhost:" + this.port + "/flux", HttpMethod.GET, null, reference);
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
index b34685ea5632..02e47f48a93f 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
@@ -69,7 +69,7 @@ void mono(HttpServer httpServer) throws Exception {
 	void flux(HttpServer httpServer) throws Exception {
 		startServer(httpServer);
 
-		ParameterizedTypeReference<List<Person>> reference = new ParameterizedTypeReference<List<Person>>() {};
+		ParameterizedTypeReference<List<Person>> reference = new ParameterizedTypeReference<>() {};
 		ResponseEntity<List<Person>> result =
 				restTemplate.exchange("http://localhost:" + super.port + "/flux", HttpMethod.GET, null, reference);
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java
index fe2c8d120f83..7ad2f447ad5d 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java
@@ -159,7 +159,7 @@ public void bodyToMonoClass() {
 	@Test
 	public void bodyToMonoParameterizedTypeReference() {
 		Mono<String> result = Mono.just("foo");
-		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<>() {};
 		given(mockRequest.bodyToMono(reference)).willReturn(result);
 
 		assertThat(wrapper.bodyToMono(reference)).isSameAs(result);
@@ -176,7 +176,7 @@ public void bodyToFluxClass() {
 	@Test
 	public void bodyToFluxParameterizedTypeReference() {
 		Flux<String> result = Flux.just("foo");
-		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<String>() {};
+		ParameterizedTypeReference<String> reference = new ParameterizedTypeReference<>() {};
 		given(mockRequest.bodyToFlux(reference)).willReturn(result);
 
 		assertThat(wrapper.bodyToFlux(reference)).isSameAs(result);
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
index 9a5f73021663..59fc87fcad31 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
@@ -353,8 +353,7 @@ public boolean equals(Object o) {
 			if (this == o) {
 				return true;
 			}
-			if (o instanceof TestBean) {
-				TestBean other = (TestBean) o;
+			if (o instanceof TestBean other) {
 				return this.foo.equals(other.foo) && this.bar.equals(other.bar);
 			}
 			return false;
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
index e97d9b03b432..4a12bbc50745 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
@@ -71,7 +71,7 @@
 public class RequestMappingMessageConversionIntegrationTests extends AbstractRequestMappingIntegrationTests {
 
 	private static final ParameterizedTypeReference<List<Person>> PERSON_LIST =
-			new ParameterizedTypeReference<List<Person>>() {};
+			new ParameterizedTypeReference<>() {};
 
 	private static final MediaType JSON = MediaType.APPLICATION_JSON;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index 1bec3cd01aab..d6bed9d7d8bf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -347,7 +347,7 @@ private static class TestContextInitializer implements ApplicationContextInitial
 		@Override
 		public void initialize(ConfigurableApplicationContext applicationContext) {
 			ConfigurableEnvironment environment = applicationContext.getEnvironment();
-			environment.getPropertySources().addFirst(new PropertySource<Object>("testPropertySource") {
+			environment.getPropertySources().addFirst(new PropertySource<>("testPropertySource") {
 				@Override
 				public Object getProperty(String key) {
 					return "name".equals(key) ? "testName" : null;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
index 837bb1c78c68..d0ce3e8d8fe0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
@@ -56,8 +56,8 @@ protected ConfigurableApplicationContext createContext() throws Exception {
 		root.addBeanFactoryPostProcessor(beanFactory -> beanFactory.addBeanPostProcessor(new BeanPostProcessor() {
 			@Override
 			public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
-				if (bean instanceof TestBean) {
-					((TestBean) bean).getFriends().add("myFriend");
+				if (bean instanceof TestBean testBean) {
+					testBean.getFriends().add("myFriend");
 				}
 				return bean;
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
index d4bd763d6f64..803cb81af05f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
@@ -182,8 +182,7 @@ private List<HandlerInterceptor> getInterceptorsForPath(String lookupPath) {
 		PathMatcher pathMatcher = new AntPathMatcher();
 		List<HandlerInterceptor> result = new ArrayList<>();
 		for (Object interceptor : this.registry.getInterceptors()) {
-			if (interceptor instanceof MappedInterceptor) {
-				MappedInterceptor mappedInterceptor = (MappedInterceptor) interceptor;
+			if (interceptor instanceof MappedInterceptor mappedInterceptor) {
 				if (mappedInterceptor.matches(lookupPath, pathMatcher)) {
 					result.add(mappedInterceptor.getInterceptor());
 				}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
index 1b8a24f644d3..091f6596da71 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
@@ -83,8 +83,7 @@ private void doTest(LocaleResolver localeResolver, boolean shouldSet) {
 		}
 
 		// check LocaleContext
-		if (localeResolver instanceof LocaleContextResolver) {
-			LocaleContextResolver localeContextResolver = (LocaleContextResolver) localeResolver;
+		if (localeResolver instanceof LocaleContextResolver localeContextResolver) {
 			LocaleContext localeContext = localeContextResolver.resolveLocaleContext(request);
 			if (shouldSet) {
 				assertThat(localeContext.getLocale()).isEqualTo(Locale.GERMANY);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
index 18d833cbb421..96ee51c0ba22 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
@@ -46,10 +46,9 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ItemPet)) {
+		if (!(other instanceof ItemPet otherPet)) {
 			return false;
 		}
-		ItemPet otherPet = (ItemPet) other;
 		return (this.name != null && this.name.equals(otherPet.getName()));
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
index 608a62595e10..f96aeaddcbe9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
@@ -556,8 +556,7 @@ public static RulesVariant fromId(String id) {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (obj instanceof RulesVariant) {
-				RulesVariant other = (RulesVariant) obj;
+			if (obj instanceof RulesVariant other) {
 				return this.toId().equals(other.toId());
 			}
 			return false;
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
index 914450bec2e2..50f618eb8e83 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
@@ -144,7 +144,7 @@ public DispatcherServletInstanceFactory(WebApplicationContext wac) {
 
 		@Override
 		public InstanceHandle<Servlet> createInstance() throws InstantiationException {
-			return new InstanceHandle<Servlet>() {
+			return new InstanceHandle<>() {
 				@Override
 				public Servlet getInstance() {
 					return new DispatcherServlet(wac);
@@ -167,7 +167,7 @@ private FilterInstanceFactory(Filter filter) {
 
 		@Override
 		public InstanceHandle<Filter> createInstance() throws InstantiationException {
-			return new InstanceHandle<Filter>() {
+			return new InstanceHandle<>() {
 				@Override
 				public Filter getInstance() {
 					return filter;

From 05d3e820f9e1b20afbdbc352ee4d40c126474ff6 Mon Sep 17 00:00:00 2001
From: Pavel Anisimov <An1s9n@yandex.ru>
Date: Fri, 4 Feb 2022 08:20:45 +0300
Subject: [PATCH 637/735] Polish reference to ManagedBean annotation

See gh-28004
---
 src/docs/asciidoc/core/core-beans.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 95881a0d2cc9..1ef6724c1982 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -7490,7 +7490,7 @@ exact same way as when you use Spring annotations, as the following example show
 	}
 ----
 
-NOTE: In contrast to `@Component`, the JSR-330 `@Named` and the JSR-250 `ManagedBean`
+NOTE: In contrast to `@Component`, the JSR-330 `@Named` and the JSR-250 `@ManagedBean`
 annotations are not composable. You should use Spring's stereotype model for building
 custom component annotations.
 

From 5d7a632965aff526cb6bbd0380b445f102819dca Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 4 Feb 2022 19:41:46 +0100
Subject: [PATCH 638/735] Ensure Spring AOP generates JDK dynamic proxies for
 lambdas

Prior to this commit, if AOP proxy generation was configured with
proxyTargetClass=true (which is the default behavior in recent versions
of Spring Boot), beans implemented as lambda expressions or method
references could not be proxied with CGLIB on Java 16 or higher without
specifying `--add-opens java.base/java.lang=ALL-UNNAMED`.

This commit addresses this shortcoming by ensuring that beans
implemented as lambda expressions or method references are always
proxied using a JDK dynamic proxy even if proxyTargetClass=true.

Closes gh-27971
---
 .../aop/framework/AopProxyUtils.java          | 19 +++++-
 .../aop/framework/DefaultAopProxyFactory.java |  5 +-
 .../aop/framework/AopProxyUtilsTests.java     | 61 ++++++++++++++++++-
 .../AspectJAutoProxyCreatorTests.java         | 50 +++++++++++++++
 src/checkstyle/checkstyle.xml                 |  2 +-
 5 files changed, 131 insertions(+), 6 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
index 12ce1ce86cdc..b7c3de885c07 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,7 @@
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @see org.springframework.aop.support.AopUtils
  */
 public abstract class AopProxyUtils {
@@ -133,7 +134,7 @@ static Class<?>[] completeProxiedInterfaces(AdvisedSupport advised, boolean deco
 				if (targetClass.isInterface()) {
 					advised.setInterfaces(targetClass);
 				}
-				else if (Proxy.isProxyClass(targetClass)) {
+				else if (Proxy.isProxyClass(targetClass) || isLambda(targetClass)) {
 					advised.setInterfaces(targetClass.getInterfaces());
 				}
 				specifiedInterfaces = advised.getProxiedInterfaces();
@@ -244,4 +245,18 @@ static Object[] adaptArgumentsIfNecessary(Method method, @Nullable Object[] argu
 		return arguments;
 	}
 
+	/**
+	 * Determine if the supplied {@link Class} is a JVM-generated implementation
+	 * class for a lambda expression or method reference.
+	 * <p>This method makes a best-effort attempt at determining this, based on
+	 * checks that work on modern, main stream JVMs.
+	 * @param clazz the class to check
+	 * @return {@code true} if the class is a lambda implementation class
+	 * @since 5.2.16
+	 */
+	static boolean isLambda(Class<?> clazz) {
+		return (clazz.isSynthetic() && (clazz.getSuperclass() == Object.class) &&
+				(clazz.getInterfaces().length > 0) && clazz.getName().contains("$$Lambda"));
+	}
+
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
index 8692371d3a8c..5f1acad9a9a2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Sebastien Deleuze
+ * @author Sam Brannen
  * @since 12.03.2004
  * @see AdvisedSupport#setOptimize
  * @see AdvisedSupport#setProxyTargetClass
@@ -59,7 +60,7 @@ public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException
 				throw new AopConfigException("TargetSource cannot determine target class: " +
 						"Either an interface or a target is required for proxy creation.");
 			}
-			if (targetClass.isInterface() || Proxy.isProxyClass(targetClass)) {
+			if (targetClass.isInterface() || Proxy.isProxyClass(targetClass) || AopProxyUtils.isLambda(targetClass)) {
 				return new JdkDynamicAopProxy(config);
 			}
 			return new ObjenesisCglibAopProxy(config);
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
index c8475794f337..3dbf550a1211 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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 @@
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Supplier;
 
 import org.junit.jupiter.api.Test;
 
@@ -32,6 +33,7 @@
 /**
  * @author Rod Johnson
  * @author Chris Beams
+ * @author Sam Brannen
  */
 public class AopProxyUtilsTests {
 
@@ -132,4 +134,61 @@ public void testProxiedUserInterfacesWithNoInterface() {
 				AopProxyUtils.proxiedUserInterfaces(proxy));
 	}
 
+	@Test
+	void isLambda() {
+		assertIsLambda(AopProxyUtilsTests.staticLambdaExpression);
+		assertIsLambda(AopProxyUtilsTests::staticStringFactory);
+
+		assertIsLambda(this.instanceLambdaExpression);
+		assertIsLambda(this::instanceStringFactory);
+	}
+
+	@Test
+	void isNotLambda() {
+		assertIsNotLambda(new EnigmaSupplier());
+
+		assertIsNotLambda(new Supplier<String>() {
+			@Override
+			public String get() {
+				return "anonymous inner class";
+			}
+		});
+
+		assertIsNotLambda(new Fake$$LambdaSupplier());
+	}
+
+	private static void assertIsLambda(Supplier<String> supplier) {
+		assertThat(AopProxyUtils.isLambda(supplier.getClass())).isTrue();
+	}
+
+	private static void assertIsNotLambda(Supplier<String> supplier) {
+		assertThat(AopProxyUtils.isLambda(supplier.getClass())).isFalse();
+	}
+
+	private static final Supplier<String> staticLambdaExpression = () -> "static lambda expression";
+
+	private final Supplier<String> instanceLambdaExpression = () -> "instance lambda expressions";
+
+	private static String staticStringFactory() {
+		return "static string factory";
+	}
+
+	private String instanceStringFactory() {
+		return "instance string factory";
+	}
+
+	private static class EnigmaSupplier implements Supplier<String> {
+		@Override
+		public String get() {
+			return "enigma";
+		}
+	}
+
+	private static class Fake$$LambdaSupplier implements Supplier<String> {
+		@Override
+		public String get() {
+			return "fake lambda";
+		}
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 91e58722fea2..7c017cfa1aad 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -19,6 +19,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
+import java.util.function.Supplier;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -27,6 +28,8 @@
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator;
@@ -42,6 +45,11 @@
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.NestedRuntimeException;
@@ -292,6 +300,16 @@ public void testWithBeanNameAutoProxyCreator() {
 		assertThat(tb.getAge()).isEqualTo(68);
 	}
 
+	@ParameterizedTest(name = "[{index}] {0}")
+	@ValueSource(classes = {ProxyTargetClassFalseConfig.class, ProxyTargetClassTrueConfig.class})
+	void lambdaIsAlwaysProxiedWithJdkProxy(Class<?> configClass) {
+		try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(configClass)) {
+			Supplier<?> supplier = context.getBean(Supplier.class);
+			assertThat(AopUtils.isAopProxy(supplier)).as("AOP proxy").isTrue();
+			assertThat(AopUtils.isJdkDynamicProxy(supplier)).as("JDK Dynamic proxy").isTrue();
+			assertThat(supplier.get()).asString().isEqualTo("advised: lambda");
+		}
+	}
 
 	/**
 	 * Returns a new {@link ClassPathXmlApplicationContext} for the file ending in <var>fileSuffix</var>.
@@ -566,3 +584,35 @@ public boolean matches(Method method, @Nullable Class<?> targetClass) {
 	}
 
 }
+
+abstract class AbstractProxyTargetClassConfig {
+
+	@Bean
+	Supplier<String> stringSupplier() {
+		return () -> "lambda";
+	}
+
+	@Bean
+	SupplierAdvice supplierAdvice() {
+		return new SupplierAdvice();
+	}
+
+	@Aspect
+	static class SupplierAdvice {
+
+		@Around("execution(public * org.springframework.aop.aspectj.autoproxy..*.*(..))")
+		Object aroundSupplier(ProceedingJoinPoint joinPoint) throws Throwable {
+			return "advised: " + joinPoint.proceed();
+		}
+	}
+}
+
+@Configuration(proxyBeanMethods = false)
+@EnableAspectJAutoProxy(proxyTargetClass = false)
+class ProxyTargetClassFalseConfig extends AbstractProxyTargetClassConfig {
+}
+
+@Configuration(proxyBeanMethods = false)
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+class ProxyTargetClassTrueConfig extends AbstractProxyTargetClassConfig {
+}
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 5a9318ef3cbe..f94de141f9ab 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -51,7 +51,7 @@
 
 		<!-- Type Names -->
 		<module name="TypeName">
-			<property name="format" value="^[A-Z][a-zA-Z0-9_]*(?&lt;!Test)$" />
+			<property name="format" value="^[A-Z][a-zA-Z0-9_$]*(?&lt;!Test)$" />
 			<property name="tokens" value="CLASS_DEF" />
 			<message key="name.invalidPattern"
 				value="Class name ''{0}'' must not end with ''Test'' (checked pattern ''{1}'')." />

From 9688e61e2066b2fb45f865e64a75c29c99405192 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 21:01:02 +0100
Subject: [PATCH 639/735] Upgrade to Groovy 4.0

Closes gh-27985
---
 build.gradle                         | 2 +-
 spring-beans/spring-beans.gradle     | 2 +-
 spring-context/spring-context.gradle | 6 +++---
 spring-test/spring-test.gradle       | 2 +-
 spring-tx/spring-tx.gradle           | 2 +-
 spring-web/spring-web.gradle         | 2 +-
 spring-webmvc/spring-webmvc.gradle   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index ea7261b4e9d0..5bcc2c07d336 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ configure(allprojects) { project ->
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '3.0.9') {
+			dependencySet(group: 'org.apache.groovy', version: '4.0.0') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index ddc008baf973..6b8f69ff30ed 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -6,7 +6,7 @@ dependencies {
 	api(project(":spring-core"))
 	optional("jakarta.inject:jakarta.inject-api")
 	optional("org.yaml:snakeyaml")
-	optional("org.codehaus.groovy:groovy-xml")
+	optional("org.apache.groovy:groovy-xml")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation(testFixtures(project(":spring-core")))
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index ac2b497d0e3e..ffacfd8eb50f 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -16,7 +16,7 @@ dependencies {
 	optional("jakarta.validation:jakarta.validation-api")
 	optional("javax.money:money-api")
 	optional("org.aspectj:aspectjweaver")
-	optional("org.codehaus.groovy:groovy")
+	optional("org.apache.groovy:groovy")
 	optional("org.apache-extras.beanshell:bsh")
 	optional("org.hibernate:hibernate-validator")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
@@ -26,8 +26,8 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("io.projectreactor:reactor-core")
-	testImplementation("org.codehaus.groovy:groovy-jsr223")
-	testImplementation("org.codehaus.groovy:groovy-xml")
+	testImplementation("org.apache.groovy:groovy-jsr223")
+	testImplementation("org.apache.groovy:groovy-xml")
 	testImplementation("org.apache.commons:commons-pool2")
 	testImplementation("org.awaitility:awaitility")
 	testImplementation("jakarta.inject:jakarta.inject-tck")
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index d7725e34f4bc..d8596d9110fe 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -27,7 +27,7 @@ dependencies {
 	optional("org.junit.jupiter:junit-jupiter-api")
 	optional("org.testng:testng")
 	optional("org.aspectj:aspectjweaver")
-	optional("org.codehaus.groovy:groovy")
+	optional("org.apache.groovy:groovy")
 	optional("org.hamcrest:hamcrest")
 	optional("net.sourceforge.htmlunit:htmlunit")
 	optional("org.seleniumhq.selenium:htmlunit-driver") {
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
index 293804e78cd6..75d1b22a942e 100644
--- a/spring-tx/spring-tx.gradle
+++ b/spring-tx/spring-tx.gradle
@@ -21,7 +21,7 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("org.aspectj:aspectjweaver")
-	testImplementation("org.codehaus.groovy:groovy")
+	testImplementation("org.apache.groovy:groovy")
 	testImplementation("jakarta.persistence:jakarta.persistence-api")
 	testImplementation("io.projectreactor:reactor-test")
 }
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index 40d915ea6bf4..92fd58337145 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -47,7 +47,7 @@ dependencies {
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("com.googlecode.protobuf-java-format:protobuf-java-format")
 	optional("com.rometools:rome")
-	optional("org.codehaus.groovy:groovy")
+	optional("org.apache.groovy:groovy")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index cb8bd88e583f..c2ccacb2f0f1 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -26,7 +26,7 @@ dependencies {
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
-	optional("org.codehaus.groovy:groovy-templates")
+	optional("org.apache.groovy:groovy-templates")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")

From e5af4aa608746faf55ddb96c352f6c95065a9d93 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 21:09:02 +0100
Subject: [PATCH 640/735] Initial upgrade to R2DBC Borca

See gh-27976
---
 build.gradle                                         |  2 +-
 spring-r2dbc/spring-r2dbc.gradle                     |  5 +----
 .../r2dbc/core/ColumnMapRowMapper.java               |  3 ++-
 .../r2dbc/core/DefaultDatabaseClientUnitTests.java   | 12 ++++++------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5bcc2c07d336..a93eaeb875dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ configure(allprojects) { project ->
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.13.1"
 			mavenBom "io.netty:netty-bom:4.1.73.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.15"
-			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR12"
+			mavenBom "io.r2dbc:r2dbc-bom:Borca-RELEASE"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:11.0.7"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10"
diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle
index eb86b43f5173..07059231f523 100644
--- a/spring-r2dbc/spring-r2dbc.gradle
+++ b/spring-r2dbc/spring-r2dbc.gradle
@@ -17,10 +17,7 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.r2dbc:r2dbc-h2")
-	testImplementation("com.h2database:h2:1.4.200") {
-		because("r2dbc-h2 does not yet support H2 2.0")
-	}
-	testImplementation("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
+	testImplementation("io.r2dbc:r2dbc-spi-test:0.9.1.RELEASE") {
 		exclude group: "org.springframework", module: "spring-jdbc"
 	}
 }
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java
index 1dbb5c61b41b..585b6ff6eb24 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ColumnMapRowMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@ public class ColumnMapRowMapper implements BiFunction<Row, RowMetadata, Map<Stri
 	public final static ColumnMapRowMapper INSTANCE = new ColumnMapRowMapper();
 
 
+	@SuppressWarnings("deprecation")  // getColumnNames() is deprecated as of R2DBC 0.9
 	@Override
 	public Map<String, Object> apply(Row row, RowMetadata rowMetadata) {
 		Collection<String> columns = rowMetadata.getColumnNames();
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
index a1a520616647..1456a86b6f76 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -247,7 +247,7 @@ void rowsUpdatedShouldEmitSingleValue() {
 	@Test
 	void selectShouldEmitFirstValue() {
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
-				MockColumnMetadata.builder().name("name").build()).build();
+				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 
 		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
 		MockResult result = resultBuilder.row(MockRow.builder().identified(0, Object.class, "Walter").build())
@@ -267,7 +267,7 @@ void selectShouldEmitFirstValue() {
 	@Test
 	void selectShouldEmitAllValues() {
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
-				MockColumnMetadata.builder().name("name").build()).build();
+				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 
 		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
 		MockResult result = resultBuilder.row(MockRow.builder().identified(0, Object.class, "Walter").build())
@@ -289,7 +289,7 @@ void selectShouldEmitAllValues() {
 	void selectOneShouldFailWithException() {
 
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
-				MockColumnMetadata.builder().name("name").build()).build();
+				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 
 		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
 		MockResult result = resultBuilder.row(MockRow.builder().identified(0, Object.class, "Walter").build())
@@ -356,7 +356,7 @@ public void bindTo(BindTarget target) {
 	void shouldApplyStatementFilterFunctions() {
 
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
-				MockColumnMetadata.builder().name("name").build()).build();
+				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 		MockResult result = MockResult.builder().rowMetadata(metadata).build();
 
 		Statement statement = mockStatement(result);
@@ -434,7 +434,7 @@ private MockResult mockSingleColumnEmptyResult() {
 	private MockResult mockSingleColumnResult(@Nullable MockRow.Builder row) {
 
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
-				MockColumnMetadata.builder().name("name").build()).build();
+				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 
 		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
 		if (row != null) {

From 6b1c2dc944e9541720d8fd7de3ce3c54ca03d5c2 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 21:12:42 +0100
Subject: [PATCH 641/735] Consistently override (and prevent overriding for)
 aliases with bean definitions

Closes gh-27866
---
 .../BeanDefinitionOverrideException.java        |  4 ++--
 .../support/DefaultListableBeanFactory.java     | 17 +++++++++++++++++
 .../DefaultListableBeanFactoryTests.java        | 11 +++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionOverrideException.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionOverrideException.java
index c2c6281b7f94..f894298b151a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionOverrideException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionOverrideException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -49,7 +49,7 @@ public BeanDefinitionOverrideException(
 
 		super(beanDefinition.getResourceDescription(), beanName,
 				"Cannot register bean definition [" + beanDefinition + "] for bean '" + beanName +
-				"': There is already [" + existingDefinition + "] bound.");
+				"' since there is already [" + existingDefinition + "] bound.");
 		this.beanDefinition = beanDefinition;
 		this.existingDefinition = existingDefinition;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index 4186000c3031..8deda89418c8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -994,6 +994,23 @@ else if (!beanDefinition.equals(existingDefinition)) {
 			this.beanDefinitionMap.put(beanName, beanDefinition);
 		}
 		else {
+			if (isAlias(beanName)) {
+				if (!isAllowBeanDefinitionOverriding()) {
+					String aliasedName = canonicalName(beanName);
+					if (containsBeanDefinition(aliasedName)) {  // alias for existing bean definition
+						throw new BeanDefinitionOverrideException(
+								beanName, beanDefinition, getBeanDefinition(aliasedName));
+					}
+					else {  // alias pointing to non-existing bean definition
+						throw new BeanDefinitionStoreException(beanDefinition.getResourceDescription(), beanName,
+								"Cannot register bean definition for bean '" + beanName +
+								"' since there is already an alias for bean '" + aliasedName + "' bound.");
+					}
+				}
+				else {
+					removeAlias(beanName);
+				}
+			}
 			if (hasBeanCreationStarted()) {
 				// Cannot modify startup-time collection elements anymore (for stable iteration)
 				synchronized (this.beanDefinitionMap) {
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 8439900f3e02..27e81f1577ba 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -854,8 +854,11 @@ void beanDefinitionOverriding() {
 		lbf.registerBeanDefinition("test", new RootBeanDefinition(NestedTestBean.class));
 		lbf.registerAlias("otherTest", "test2");
 		lbf.registerAlias("test", "test2");
+		lbf.registerAlias("test", "testX");
+		lbf.registerBeanDefinition("testX", new RootBeanDefinition(TestBean.class));
 		assertThat(lbf.getBean("test")).isInstanceOf(NestedTestBean.class);
 		assertThat(lbf.getBean("test2")).isInstanceOf(NestedTestBean.class);
+		assertThat(lbf.getBean("testX")).isInstanceOf(TestBean.class);
 	}
 
 	@Test
@@ -864,6 +867,7 @@ void beanDefinitionOverridingNotAllowed() {
 		BeanDefinition oldDef = new RootBeanDefinition(TestBean.class);
 		BeanDefinition newDef = new RootBeanDefinition(NestedTestBean.class);
 		lbf.registerBeanDefinition("test", oldDef);
+		lbf.registerAlias("test", "testX");
 		assertThatExceptionOfType(BeanDefinitionOverrideException.class).isThrownBy(() ->
 				lbf.registerBeanDefinition("test", newDef))
 				.satisfies(ex -> {
@@ -871,6 +875,13 @@ void beanDefinitionOverridingNotAllowed() {
 					assertThat(ex.getBeanDefinition()).isEqualTo(newDef);
 					assertThat(ex.getExistingDefinition()).isEqualTo(oldDef);
 				});
+		assertThatExceptionOfType(BeanDefinitionOverrideException.class).isThrownBy(() ->
+						lbf.registerBeanDefinition("testX", newDef))
+				.satisfies(ex -> {
+					assertThat(ex.getBeanName()).isEqualTo("testX");
+					assertThat(ex.getBeanDefinition()).isEqualTo(newDef);
+					assertThat(ex.getExistingDefinition()).isEqualTo(oldDef);
+				});
 	}
 
 	@Test

From d07e1be623b607c77afe6faf8c02eda8a1b0b110 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 22:24:50 +0100
Subject: [PATCH 642/735] Retrieve JDBC Connection via JdbcCoordinator (for
 compatibility with Hibernate 6)

Closes gh-28007
---
 .../orm/jpa/vendor/HibernateJpaDialect.java            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
index acf70e0909c5..988c1c22d778 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -148,7 +148,7 @@ public Object beginTransaction(EntityManager entityManager, TransactionDefinitio
 		if (isolationLevelNeeded || definition.isReadOnly()) {
 			if (this.prepareConnection && ConnectionReleaseMode.ON_CLOSE.equals(
 					session.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode().getReleaseMode())) {
-				preparedCon = session.connection();
+				preparedCon = session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
 				previousIsolationLevel = DataSourceUtils.prepareConnectionForTransaction(preparedCon, definition);
 			}
 			else if (isolationLevelNeeded) {
@@ -356,9 +356,9 @@ public void resetSessionState() {
 			}
 			if (this.needsConnectionReset &&
 					this.session.getJdbcCoordinator().getLogicalConnection().isPhysicallyConnected()) {
-				Connection conToReset = this.session.connection();
+				Connection con = this.session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
 				DataSourceUtils.resetConnectionAfterTransaction(
-						conToReset, this.previousIsolationLevel, this.readOnly);
+						con, this.previousIsolationLevel, this.readOnly);
 			}
 		}
 	}
@@ -374,7 +374,7 @@ public HibernateConnectionHandle(SessionImplementor session) {
 
 		@Override
 		public Connection getConnection() {
-			return this.session.connection();
+			return this.session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection();
 		}
 	}
 

From 132d8c7f453f6770ec5ca08e72446b65fc0c8528 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 23:19:06 +0100
Subject: [PATCH 643/735] Support for CGLIB BeanMap utility on JDK 17

Closes gh-27802
---
 spring-core/spring-core.gradle                |   1 +
 .../springframework/cglib/beans/BeanMap.java  | 330 ++++++++++++++++++
 .../cglib/beans/package-info.java             |  10 +
 .../cglib/core/package-info.java              |   2 +-
 .../cglib/proxy/package-info.java             |   2 +-
 5 files changed, 343 insertions(+), 2 deletions(-)
 create mode 100644 spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
 create mode 100644 spring-core/src/main/java/org/springframework/cglib/beans/package-info.java

diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index e4c568f84b13..69f78fc73060 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -76,6 +76,7 @@ jar {
 	dependsOn cglibRepackJar
 	from(zipTree(cglibRepackJar.archivePath)) {
 		include "org/springframework/cglib/**"
+		exclude "org/springframework/cglib/beans/BeanMap*.class"
 		exclude "org/springframework/cglib/core/AbstractClassGenerator*.class"
 		exclude "org/springframework/cglib/core/AsmApi*.class"
 		exclude "org/springframework/cglib/core/KeyFactory.class"
diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java b/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
new file mode 100644
index 000000000000..cfe843635991
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
@@ -0,0 +1,330 @@
+/*
+ * Copyright 2003,2004 The Apache Software Foundation
+ *
+ *  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
+ *
+ *      http://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.cglib.beans;
+
+import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.asm.ClassVisitor;
+import org.springframework.cglib.core.AbstractClassGenerator;
+import org.springframework.cglib.core.KeyFactory;
+import org.springframework.cglib.core.ReflectUtils;
+
+/**
+ * A <code>Map</code>-based view of a JavaBean.  The default set of keys is the
+ * union of all property names (getters or setters). An attempt to set
+ * a read-only property will be ignored, and write-only properties will
+ * be returned as <code>null</code>. Removal of objects is not a
+ * supported (the key set is fixed).
+ * @author Chris Nokleberg
+ */
+@SuppressWarnings({"rawtypes", "unchecked"})
+abstract public class BeanMap implements Map {
+    /**
+     * Limit the properties reflected in the key set of the map
+     * to readable properties.
+     * @see BeanMap.Generator#setRequire
+     */
+    public static final int REQUIRE_GETTER = 1;
+
+    /**
+     * Limit the properties reflected in the key set of the map
+     * to writable properties.
+     * @see BeanMap.Generator#setRequire
+     */
+    public static final int REQUIRE_SETTER = 2;
+    
+    /**
+     * Helper method to create a new <code>BeanMap</code>.  For finer
+     * control over the generated instance, use a new instance of
+     * <code>BeanMap.Generator</code> instead of this static method.
+     * @param bean the JavaBean underlying the map
+     * @return a new <code>BeanMap</code> instance
+     */
+    public static BeanMap create(Object bean) {
+        Generator gen = new Generator();
+        gen.setBean(bean);
+        return gen.create();
+    }
+
+    public static class Generator extends AbstractClassGenerator {
+        private static final Source SOURCE = new Source(BeanMap.class.getName());
+
+        private static final BeanMapKey KEY_FACTORY =
+          (BeanMapKey)KeyFactory.create(BeanMapKey.class, KeyFactory.CLASS_BY_NAME);
+
+        interface BeanMapKey {
+            public Object newInstance(Class type, int require);
+        }
+        
+        private Object bean;
+        private Class beanClass;
+        private int require;
+        
+        public Generator() {
+            super(SOURCE);
+        }
+
+        /**
+         * Set the bean that the generated map should reflect. The bean may be swapped
+         * out for another bean of the same type using {@link #setBean}.
+         * Calling this method overrides any value previously set using {@link #setBeanClass}.
+         * You must call either this method or {@link #setBeanClass} before {@link #create}.
+         * @param bean the initial bean
+         */
+        public void setBean(Object bean) {
+            this.bean = bean;
+            if (bean != null) {
+				beanClass = bean.getClass();
+				setContextClass(beanClass);
+			}
+        }
+
+        /**
+         * Set the class of the bean that the generated map should support.
+         * You must call either this method or {@link #setBeanClass} before {@link #create}.
+         * @param beanClass the class of the bean
+         */
+        public void setBeanClass(Class beanClass) {
+            this.beanClass = beanClass;
+        }
+
+        /**
+         * Limit the properties reflected by the generated map.
+         * @param require any combination of {@link #REQUIRE_GETTER} and
+         * {@link #REQUIRE_SETTER}; default is zero (any property allowed)
+         */
+        public void setRequire(int require) {
+            this.require = require;
+        }
+
+        protected ClassLoader getDefaultClassLoader() {
+            return beanClass.getClassLoader();
+        }
+
+        protected ProtectionDomain getProtectionDomain() {
+        	return ReflectUtils.getProtectionDomain(beanClass);
+        }
+
+        /**
+         * Create a new instance of the <code>BeanMap</code>. An existing
+         * generated class will be reused if possible.
+         */
+        public BeanMap create() {
+            if (beanClass == null)
+                throw new IllegalArgumentException("Class of bean unknown");
+            setNamePrefix(beanClass.getName());
+            return (BeanMap)super.create(KEY_FACTORY.newInstance(beanClass, require));
+        }
+
+        public void generateClass(ClassVisitor v) throws Exception {
+            new BeanMapEmitter(v, getClassName(), beanClass, require);
+        }
+
+        protected Object firstInstance(Class type) {
+            return ((BeanMap)ReflectUtils.newInstance(type)).newInstance(bean);
+        }
+
+        protected Object nextInstance(Object instance) {
+            return ((BeanMap)instance).newInstance(bean);
+        }
+    }
+
+    /**
+     * Create a new <code>BeanMap</code> instance using the specified bean.
+     * This is faster than using the {@link #create} static method.
+     * @param bean the JavaBean underlying the map
+     * @return a new <code>BeanMap</code> instance
+     */
+    abstract public BeanMap newInstance(Object bean);
+
+    /**
+     * Get the type of a property.
+     * @param name the name of the JavaBean property
+     * @return the type of the property, or null if the property does not exist
+     */
+    abstract public Class getPropertyType(String name);
+
+    protected Object bean;
+
+    protected BeanMap() {
+    }
+
+    protected BeanMap(Object bean) {
+        setBean(bean);
+    }
+
+    public Object get(Object key) {
+        return get(bean, key);
+    }
+
+    public Object put(Object key, Object value) {
+        return put(bean, key, value);
+    }
+
+    /**
+     * Get the property of a bean. This allows a <code>BeanMap</code>
+     * to be used statically for multiple beans--the bean instance tied to the
+     * map is ignored and the bean passed to this method is used instead.
+     * @param bean the bean to query; must be compatible with the type of
+     * this <code>BeanMap</code>
+     * @param key must be a String
+     * @return the current value, or null if there is no matching property
+     */
+    abstract public Object get(Object bean, Object key);
+
+    /**
+     * Set the property of a bean. This allows a <code>BeanMap</code>
+     * to be used statically for multiple beans--the bean instance tied to the
+     * map is ignored and the bean passed to this method is used instead.
+     * @param key must be a String
+     * @return the old value, if there was one, or null
+     */
+    abstract public Object put(Object bean, Object key, Object value);
+
+    /**
+     * Change the underlying bean this map should use.
+     * @param bean the new JavaBean
+     * @see #getBean
+     */
+    public void setBean(Object bean) {
+        this.bean = bean;
+    }
+
+    /**
+     * Return the bean currently in use by this map.
+     * @return the current JavaBean
+     * @see #setBean
+     */
+    public Object getBean() {
+        return bean;
+    }
+
+    public void clear() {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean containsKey(Object key) {
+        return keySet().contains(key);
+    }
+
+    public boolean containsValue(Object value) {
+        for (Iterator it = keySet().iterator(); it.hasNext();) {
+            Object v = get(it.next());
+            if (((value == null) && (v == null)) || (value != null && value.equals(v)))
+                return true;
+        }
+        return false;
+    }
+
+    public int size() {
+        return keySet().size();
+    }
+
+    public boolean isEmpty() {
+        return size() == 0;
+    }
+
+    public Object remove(Object key) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void putAll(Map t) {
+        for (Iterator it = t.keySet().iterator(); it.hasNext();) {
+            Object key = it.next();
+            put(key, t.get(key));
+        }
+    }
+
+    public boolean equals(Object o) {
+        if (o == null || !(o instanceof Map)) {
+            return false;
+        }
+        Map other = (Map)o;
+        if (size() != other.size()) {
+            return false;
+        }
+        for (Iterator it = keySet().iterator(); it.hasNext();) {
+            Object key = it.next();
+            if (!other.containsKey(key)) {
+                return false;
+            }
+            Object v1 = get(key);
+            Object v2 = other.get(key);
+            if (!((v1 == null) ? v2 == null : v1.equals(v2))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public int hashCode() {
+        int code = 0;
+        for (Iterator it = keySet().iterator(); it.hasNext();) {
+            Object key = it.next();
+            Object value = get(key);
+            code += ((key == null) ? 0 : key.hashCode()) ^
+                ((value == null) ? 0 : value.hashCode());
+        }
+        return code;
+    }
+
+    // TODO: optimize
+    public Set entrySet() {
+        HashMap copy = new HashMap();
+        for (Iterator it = keySet().iterator(); it.hasNext();) {
+            Object key = it.next();
+            copy.put(key, get(key));
+        }
+        return Collections.unmodifiableMap(copy).entrySet();
+    }
+
+    public Collection values() {
+        Set keys = keySet();
+        List values = new ArrayList(keys.size());
+        for (Iterator it = keys.iterator(); it.hasNext();) {
+            values.add(get(it.next()));
+        }
+        return Collections.unmodifiableCollection(values);
+    }
+
+    /*
+     * @see java.util.AbstractMap#toString
+     */
+    public String toString()
+    {
+        StringBuffer sb = new StringBuffer();
+        sb.append('{');
+        for (Iterator it = keySet().iterator(); it.hasNext();) {
+            Object key = it.next();
+            sb.append(key);
+            sb.append('=');
+            sb.append(get(key));
+            if (it.hasNext()) {
+                sb.append(", ");
+            }
+        }
+        sb.append('}');
+        return sb.toString();
+    }
+}
diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/package-info.java b/spring-core/src/main/java/org/springframework/cglib/beans/package-info.java
new file mode 100644
index 000000000000..51cffc06e70a
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/cglib/beans/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * Spring's repackaging of the
+ * <a href="http://cglib.sourceforge.net">CGLIB</a> beans package
+ * (for internal use only).
+ *
+ * <p>As this repackaging happens at the class file level, sources
+ * and javadocs are not available here... except for a few files
+ * that have been patched for Spring's purposes on JDK 9-17.
+ */
+package org.springframework.cglib.beans;
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/package-info.java b/spring-core/src/main/java/org/springframework/cglib/core/package-info.java
index a2ed94ff2ead..6d43d8c8bcc2 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/package-info.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/package-info.java
@@ -5,6 +5,6 @@
  *
  * <p>As this repackaging happens at the class file level, sources
  * and javadocs are not available here... except for a few files
- * that have been patched for Spring's purposes on JDK 9/10/11.
+ * that have been patched for Spring's purposes on JDK 9-17.
  */
 package org.springframework.cglib.core;
diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java b/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java
index 0d651c8f0464..9f8cfe268e57 100644
--- a/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java
+++ b/spring-core/src/main/java/org/springframework/cglib/proxy/package-info.java
@@ -5,6 +5,6 @@
  *
  * <p>As this repackaging happens at the class file level, sources
  * and javadocs are not available here... except for a few files
- * that have been patched for Spring's purposes on JDK 9/10/11.
+ * that have been patched for Spring's purposes on JDK 9-17.
  */
 package org.springframework.cglib.proxy;

From a71a45e71965acd9b4c5d9863bcd6f378990a465 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 23:21:00 +0100
Subject: [PATCH 644/735] Deprecate AsyncTaskExecutor.execute(Runnable task,
 long startTimeout)

Closes gh-27959
---
 .../commonj/WorkManagerTaskExecutor.java      |  3 ++-
 .../quartz/SimpleThreadPoolTaskExecutor.java  |  3 ++-
 .../concurrent/ConcurrentTaskExecutor.java    |  3 ++-
 .../concurrent/ThreadPoolTaskExecutor.java    |  3 ++-
 .../concurrent/ThreadPoolTaskScheduler.java   |  3 ++-
 .../core/task/AsyncTaskExecutor.java          | 20 ++++++++++++++-----
 .../core/task/SimpleAsyncTaskExecutor.java    |  8 +++++++-
 .../core/task/TaskRejectedException.java      |  3 +--
 .../core/task/TaskTimeoutException.java       |  5 +++--
 .../task/support/TaskExecutorAdapter.java     |  3 ++-
 .../jca/work/SimpleTaskWorkManager.java       |  6 +++---
 .../jca/work/WorkManagerTaskExecutor.java     | 12 ++++++++---
 12 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
index a9adcc823d5a..8d2956844077 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -171,6 +171,7 @@ public void execute(Runnable task) {
 		}
 	}
 
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
index 35534962d9f9..6cfa717398ef 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -76,6 +76,7 @@ public void execute(Runnable task) {
 		}
 	}
 
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
index 0b976d3f00a3..9c19aad56603 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -147,6 +147,7 @@ public void execute(Runnable task) {
 		this.adaptedExecutor.execute(task);
 	}
 
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		this.adaptedExecutor.execute(task, startTimeout);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
index 928814524c67..6a8334feebfa 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -340,6 +340,7 @@ public void execute(Runnable task) {
 		}
 	}
 
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
index 718c5833929e..946f5bcc6f22 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -282,6 +282,7 @@ public void execute(Runnable task) {
 		}
 	}
 
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
diff --git a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
index 12ddd769cd62..d4cf0324bcad 100644
--- a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,7 @@
 
 /**
  * Extended interface for asynchronous {@link TaskExecutor} implementations,
- * offering an overloaded {@link #execute(Runnable, long)} variant with a start
- * timeout parameter as well support for {@link java.util.concurrent.Callable}.
+ * offering support for {@link java.util.concurrent.Callable}.
  *
  * <p>Note: The {@link java.util.concurrent.Executors} class includes a set of
  * methods that can convert some other common closure-like objects, for example,
@@ -41,10 +40,18 @@
  */
 public interface AsyncTaskExecutor extends TaskExecutor {
 
-	/** Constant that indicates immediate execution. */
+	/**
+	 * Constant that indicates immediate execution.
+	 * @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)}
+	 */
+	@Deprecated
 	long TIMEOUT_IMMEDIATE = 0;
 
-	/** Constant that indicates no time limit. */
+	/**
+	 * Constant that indicates no time limit.
+	 * @deprecated as of 5.3.16 along with {@link #execute(Runnable, long)}
+	 */
+	@Deprecated
 	long TIMEOUT_INDEFINITE = Long.MAX_VALUE;
 
 
@@ -58,7 +65,10 @@ public interface AsyncTaskExecutor extends TaskExecutor {
 	 * @throws TaskTimeoutException in case of the task being rejected because
 	 * of the timeout (i.e. it cannot be started in time)
 	 * @throws TaskRejectedException if the given task was not accepted
+	 * @see #execute(Runnable)
+	 * @deprecated as of 5.3.16 since the common executors do not support start timeouts
 	 */
+	@Deprecated
 	void execute(Runnable task, long startTimeout);
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
index 7d96032ad80b..072502a868c9 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -174,6 +174,7 @@ public final boolean isThrottleActive() {
 	 * if configured (through the superclass's settings).
 	 * @see #doExecute(Runnable)
 	 */
+	@SuppressWarnings("deprecation")
 	@Override
 	public void execute(Runnable task) {
 		execute(task, TIMEOUT_INDEFINITE);
@@ -188,6 +189,7 @@ public void execute(Runnable task) {
 	 * @see #TIMEOUT_IMMEDIATE
 	 * @see #doExecute(Runnable)
 	 */
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		Assert.notNull(task, "Runnable must not be null");
@@ -201,6 +203,7 @@ public void execute(Runnable task, long startTimeout) {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<>(task, null);
@@ -208,6 +211,7 @@ public Future<?> submit(Runnable task) {
 		return future;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<>(task);
@@ -215,6 +219,7 @@ public <T> Future<T> submit(Callable<T> task) {
 		return future;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public ListenableFuture<?> submitListenable(Runnable task) {
 		ListenableFutureTask<Object> future = new ListenableFutureTask<>(task, null);
@@ -222,6 +227,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {
 		return future;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
 		ListenableFutureTask<T> future = new ListenableFutureTask<>(task);
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
index f6294c521360..e77d4df1bc8c 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
  * @author Juergen Hoeller
  * @since 2.0.1
  * @see TaskExecutor#execute(Runnable)
- * @see TaskTimeoutException
  */
 @SuppressWarnings("serial")
 public class TaskRejectedException extends RejectedExecutionException {
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
index 3352a622bce1..ddec24acb697 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2022 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,8 +23,9 @@
  * @author Juergen Hoeller
  * @since 2.0.3
  * @see AsyncTaskExecutor#execute(Runnable, long)
- * @see TaskRejectedException
+ * @deprecated as of 5.3.16 since the common executors do not support start timeouts
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class TaskTimeoutException extends TaskRejectedException {
 
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
index 81da48db8e02..72a485b4eda0 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -97,6 +97,7 @@ public void execute(Runnable task) {
 		}
 	}
 
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
index 90b8214df344..b078744408f8 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -31,7 +31,6 @@
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.core.task.TaskRejectedException;
-import org.springframework.core.task.TaskTimeoutException;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -143,6 +142,7 @@ public void scheduleWork(Work work, long startTimeout, @Nullable ExecutionContex
 	 * (or -1 if not applicable or not known)
 	 * @throws WorkException if the TaskExecutor did not accept the Work
 	 */
+	@SuppressWarnings("deprecation")
 	protected long executeWork(TaskExecutor taskExecutor, Work work, long startTimeout, boolean blockUntilStarted,
 			@Nullable ExecutionContext executionContext, @Nullable WorkListener workListener) throws WorkException {
 
@@ -164,7 +164,7 @@ protected long executeWork(TaskExecutor taskExecutor, Work work, long startTimeo
 				taskExecutor.execute(workHandle);
 			}
 		}
-		catch (TaskTimeoutException ex) {
+		catch (org.springframework.core.task.TaskTimeoutException ex) {
 			WorkException wex = new WorkRejectedException("TaskExecutor rejected Work because of timeout: " + work, ex);
 			wex.setErrorCode(WorkException.START_TIMED_OUT);
 			workListenerToUse.workRejected(new WorkEvent(this, WorkEvent.WORK_REJECTED, work, wex));
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
index e4fe06bfeb35..496d4ca80d88 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
 import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.core.task.TaskDecorator;
 import org.springframework.core.task.TaskRejectedException;
-import org.springframework.core.task.TaskTimeoutException;
 import org.springframework.jca.context.BootstrapContextAware;
 import org.springframework.jndi.JndiLocatorSupport;
 import org.springframework.lang.Nullable;
@@ -218,11 +217,13 @@ private WorkManager obtainWorkManager() {
 	// Implementation of the Spring SchedulingTaskExecutor interface
 	//-------------------------------------------------------------------------
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public void execute(Runnable task) {
 		execute(task, TIMEOUT_INDEFINITE);
 	}
 
+	@Deprecated
 	@Override
 	public void execute(Runnable task, long startTimeout) {
 		Work work = new DelegatingWork(this.taskDecorator != null ? this.taskDecorator.decorate(task) : task);
@@ -254,7 +255,8 @@ else if (this.blockUntilStarted) {
 		}
 		catch (WorkRejectedException ex) {
 			if (WorkException.START_TIMED_OUT.equals(ex.getErrorCode())) {
-				throw new TaskTimeoutException("JCA WorkManager rejected task because of timeout: " + task, ex);
+				throw new org.springframework.core.task.TaskTimeoutException(
+						"JCA WorkManager rejected task because of timeout: " + task, ex);
 			}
 			else {
 				throw new TaskRejectedException("JCA WorkManager rejected task: " + task, ex);
@@ -265,6 +267,7 @@ else if (this.blockUntilStarted) {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<>(task, null);
@@ -272,6 +275,7 @@ public Future<?> submit(Runnable task) {
 		return future;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<>(task);
@@ -279,6 +283,7 @@ public <T> Future<T> submit(Callable<T> task) {
 		return future;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public ListenableFuture<?> submitListenable(Runnable task) {
 		ListenableFutureTask<Object> future = new ListenableFutureTask<>(task, null);
@@ -286,6 +291,7 @@ public ListenableFuture<?> submitListenable(Runnable task) {
 		return future;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
 		ListenableFutureTask<T> future = new ListenableFutureTask<>(task);

From bc9cd9a687b598a3d567ebcd9fb4108e0342ce84 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 23:21:27 +0100
Subject: [PATCH 645/735] Find interface method even for late-bound interface
 declaration in subclass

Closes gh-27995
---
 .../AbstractAutowireCapableBeanFactory.java   |  4 +-
 .../support/DisposableBeanAdapter.java        | 10 ++--
 .../org/springframework/util/ClassUtils.java  | 60 +++++++++++++------
 .../support/ReflectiveMethodExecutor.java     | 14 ++++-
 .../support/ReflectiveMethodResolver.java     |  8 +--
 .../support/ReflectivePropertyAccessor.java   | 24 ++++----
 6 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index e3908a2a7c30..7a94a91c86a8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -1908,7 +1908,7 @@ protected void invokeCustomInitMethod(String beanName, Object bean, RootBeanDefi
 		if (logger.isTraceEnabled()) {
 			logger.trace("Invoking init method  '" + initMethodName + "' on bean with name '" + beanName + "'");
 		}
-		Method methodToInvoke = ClassUtils.getInterfaceMethodIfPossible(initMethod);
+		Method methodToInvoke = ClassUtils.getInterfaceMethodIfPossible(initMethod, bean.getClass());
 
 		if (System.getSecurityManager() != null) {
 			AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
index e6f90239343d..b5fdef4dd813 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@ else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
 									beanName + "' has a non-boolean parameter - not supported as destroy method");
 						}
 					}
-					destroyMethod = ClassUtils.getInterfaceMethodIfPossible(destroyMethod);
+					destroyMethod = ClassUtils.getInterfaceMethodIfPossible(destroyMethod, bean.getClass());
 				}
 				this.destroyMethod = destroyMethod;
 			}
@@ -252,9 +252,9 @@ else if (this.destroyMethod != null) {
 			invokeCustomDestroyMethod(this.destroyMethod);
 		}
 		else if (this.destroyMethodName != null) {
-			Method methodToInvoke = determineDestroyMethod(this.destroyMethodName);
-			if (methodToInvoke != null) {
-				invokeCustomDestroyMethod(ClassUtils.getInterfaceMethodIfPossible(methodToInvoke));
+			Method destroyMethod = determineDestroyMethod(this.destroyMethodName);
+			if (destroyMethod != null) {
+				invokeCustomDestroyMethod(ClassUtils.getInterfaceMethodIfPossible(destroyMethod, this.bean.getClass()));
 			}
 		}
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
index c9fa24824afb..0c1cccf1d638 100644
--- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -1256,7 +1256,7 @@ public static boolean hasAtLeastOneMethodWithName(Class<?> clazz, String methodN
 	 * (may be {@code null} or may not even implement the method)
 	 * @return the specific target method, or the original method if the
 	 * {@code targetClass} does not implement it
-	 * @see #getInterfaceMethodIfPossible
+	 * @see #getInterfaceMethodIfPossible(Method, Class)
 	 */
 	public static Method getMostSpecificMethod(Method method, @Nullable Class<?> targetClass) {
 		if (targetClass != null && targetClass != method.getDeclaringClass() && isOverridable(method, targetClass)) {
@@ -1289,28 +1289,54 @@ public static Method getMostSpecificMethod(Method method, @Nullable Class<?> tar
 	 * @param method the method to be invoked, potentially from an implementation class
 	 * @return the corresponding interface method, or the original method if none found
 	 * @since 5.1
-	 * @see #getMostSpecificMethod
+	 * @deprecated in favor of {@link #getInterfaceMethodIfPossible(Method, Class)}
 	 */
+	@Deprecated
 	public static Method getInterfaceMethodIfPossible(Method method) {
+		return getInterfaceMethodIfPossible(method, null);
+	}
+
+	/**
+	 * Determine a corresponding interface method for the given method handle, if possible.
+	 * <p>This is particularly useful for arriving at a public exported type on Jigsaw
+	 * which can be reflectively invoked without an illegal access warning.
+	 * @param method the method to be invoked, potentially from an implementation class
+	 * @param targetClass the target class to check for declared interfaces
+	 * @return the corresponding interface method, or the original method if none found
+	 * @since 5.3.16
+	 * @see #getMostSpecificMethod
+	 */
+	public static Method getInterfaceMethodIfPossible(Method method, @Nullable Class<?> targetClass) {
 		if (!Modifier.isPublic(method.getModifiers()) || method.getDeclaringClass().isInterface()) {
 			return method;
 		}
-		return interfaceMethodCache.computeIfAbsent(method, key -> {
-			Class<?> current = key.getDeclaringClass();
-			while (current != null && current != Object.class) {
-				Class<?>[] ifcs = current.getInterfaces();
-				for (Class<?> ifc : ifcs) {
-					try {
-						return ifc.getMethod(key.getName(), key.getParameterTypes());
-					}
-					catch (NoSuchMethodException ex) {
-						// ignore
-					}
+		// Try cached version of method in its declaring class
+		Method result = interfaceMethodCache.computeIfAbsent(method,
+				key -> findInterfaceMethodIfPossible(key, key.getDeclaringClass(), Object.class));
+		if (result == method && targetClass != null) {
+			// No interface method found yet -> try given target class (possibly a subclass of the
+			// declaring class, late-binding a base class method to a subclass-declared interface:
+			// see e.g. HashMap.HashIterator.hasNext)
+			result = findInterfaceMethodIfPossible(method, targetClass, method.getDeclaringClass());
+		}
+		return result;
+	}
+
+	private static Method findInterfaceMethodIfPossible(Method method, Class<?> startClass, Class<?> endClass) {
+		Class<?> current = startClass;
+		while (current != null && current != endClass) {
+			Class<?>[] ifcs = current.getInterfaces();
+			for (Class<?> ifc : ifcs) {
+				try {
+					return ifc.getMethod(method.getName(), method.getParameterTypes());
+				}
+				catch (NoSuchMethodException ex) {
+					// ignore
 				}
-				current = current.getSuperclass();
 			}
-			return key;
-		});
+			current = current.getSuperclass();
+		}
+		return method;
 	}
 
 	/**
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
index 2de25448b470..5e4b50187f8c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -58,8 +58,18 @@ public class ReflectiveMethodExecutor implements MethodExecutor {
 	 * @param method the method to invoke
 	 */
 	public ReflectiveMethodExecutor(Method method) {
+		this(method, null);
+	}
+
+	/**
+	 * Create a new executor for the given method.
+	 * @param method the method to invoke
+	 * @param targetClass the target class to invoke the method on
+	 * @since 5.3.16
+	 */
+	public ReflectiveMethodExecutor(Method method, @Nullable Class<?> targetClass) {
 		this.originalMethod = method;
-		this.methodToInvoke = ClassUtils.getInterfaceMethodIfPossible(method);
+		this.methodToInvoke = ClassUtils.getInterfaceMethodIfPossible(method, targetClass);
 		if (method.isVarArgs()) {
 			this.varargsPosition = method.getParameterCount() - 1;
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
index 451aee275d99..86889dca73e2 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -176,7 +176,7 @@ else if (paramCount == argumentTypes.size()) {
 					}
 					if (matchInfo != null) {
 						if (matchInfo.isExactMatch()) {
-							return new ReflectiveMethodExecutor(method);
+							return new ReflectiveMethodExecutor(method, type);
 						}
 						else if (matchInfo.isCloseMatch()) {
 							if (this.useDistance) {
@@ -204,13 +204,13 @@ else if (matchInfo.isMatchRequiringConversion()) {
 				}
 			}
 			if (closeMatch != null) {
-				return new ReflectiveMethodExecutor(closeMatch);
+				return new ReflectiveMethodExecutor(closeMatch, type);
 			}
 			else if (matchRequiringConversion != null) {
 				if (multipleOptions) {
 					throw new SpelEvaluationException(SpelMessage.MULTIPLE_POSSIBLE_METHODS, name);
 				}
-				return new ReflectiveMethodExecutor(matchRequiringConversion);
+				return new ReflectiveMethodExecutor(matchRequiringConversion, type);
 			}
 			else {
 				return null;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
index 5fd48cdad88a..304645047db7 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -139,7 +139,7 @@ public boolean canRead(EvaluationContext context, @Nullable Object target, Strin
 			// The readerCache will only contain gettable properties (let's not worry about setters for now).
 			Property property = new Property(type, method, null);
 			TypeDescriptor typeDescriptor = new TypeDescriptor(property);
-			method = ClassUtils.getInterfaceMethodIfPossible(method);
+			method = ClassUtils.getInterfaceMethodIfPossible(method, type);
 			this.readerCache.put(cacheKey, new InvokerPair(method, typeDescriptor));
 			this.typeDescriptorCache.put(cacheKey, typeDescriptor);
 			return true;
@@ -182,7 +182,7 @@ public TypedValue read(EvaluationContext context, @Nullable Object target, Strin
 					// The readerCache will only contain gettable properties (let's not worry about setters for now).
 					Property property = new Property(type, method, null);
 					TypeDescriptor typeDescriptor = new TypeDescriptor(property);
-					method = ClassUtils.getInterfaceMethodIfPossible(method);
+					method = ClassUtils.getInterfaceMethodIfPossible(method, type);
 					invoker = new InvokerPair(method, typeDescriptor);
 					this.lastReadInvokerPair = invoker;
 					this.readerCache.put(cacheKey, invoker);
@@ -242,7 +242,7 @@ public boolean canWrite(EvaluationContext context, @Nullable Object target, Stri
 			// Treat it like a property
 			Property property = new Property(type, null, method);
 			TypeDescriptor typeDescriptor = new TypeDescriptor(property);
-			method = ClassUtils.getInterfaceMethodIfPossible(method);
+			method = ClassUtils.getInterfaceMethodIfPossible(method, type);
 			this.writerCache.put(cacheKey, method);
 			this.typeDescriptorCache.put(cacheKey, typeDescriptor);
 			return true;
@@ -291,7 +291,7 @@ public void write(EvaluationContext context, @Nullable Object target, String nam
 			if (method == null) {
 				method = findSetterForProperty(name, type, target);
 				if (method != null) {
-					method = ClassUtils.getInterfaceMethodIfPossible(method);
+					method = ClassUtils.getInterfaceMethodIfPossible(method, type);
 					cachedMember = method;
 					this.writerCache.put(cacheKey, cachedMember);
 				}
@@ -533,21 +533,21 @@ public PropertyAccessor createOptimalAccessor(EvaluationContext context, @Nullab
 		if (target == null) {
 			return this;
 		}
-		Class<?> clazz = (target instanceof Class ? (Class<?>) target : target.getClass());
-		if (clazz.isArray()) {
+		Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
+		if (type.isArray()) {
 			return this;
 		}
 
-		PropertyCacheKey cacheKey = new PropertyCacheKey(clazz, name, target instanceof Class);
+		PropertyCacheKey cacheKey = new PropertyCacheKey(type, name, target instanceof Class);
 		InvokerPair invocationTarget = this.readerCache.get(cacheKey);
 
 		if (invocationTarget == null || invocationTarget.member instanceof Method) {
 			Method method = (Method) (invocationTarget != null ? invocationTarget.member : null);
 			if (method == null) {
-				method = findGetterForProperty(name, clazz, target);
+				method = findGetterForProperty(name, type, target);
 				if (method != null) {
 					TypeDescriptor typeDescriptor = new TypeDescriptor(new MethodParameter(method, -1));
-					method = ClassUtils.getInterfaceMethodIfPossible(method);
+					method = ClassUtils.getInterfaceMethodIfPossible(method, type);
 					invocationTarget = new InvokerPair(method, typeDescriptor);
 					ReflectionUtils.makeAccessible(method);
 					this.readerCache.put(cacheKey, invocationTarget);
@@ -561,7 +561,7 @@ public PropertyAccessor createOptimalAccessor(EvaluationContext context, @Nullab
 		if (invocationTarget == null || invocationTarget.member instanceof Field) {
 			Field field = (invocationTarget != null ? (Field) invocationTarget.member : null);
 			if (field == null) {
-				field = findField(name, clazz, target instanceof Class);
+				field = findField(name, type, target instanceof Class);
 				if (field != null) {
 					invocationTarget = new InvokerPair(field, new TypeDescriptor(field));
 					ReflectionUtils.makeAccessible(field);
@@ -600,7 +600,7 @@ private static final class PropertyCacheKey implements Comparable<PropertyCacheK
 
 		private final String property;
 
-		private boolean targetIsClass;
+		private final boolean targetIsClass;
 
 		public PropertyCacheKey(Class<?> clazz, String name, boolean targetIsClass) {
 			this.clazz = clazz;

From a22feac8036393725113222055166eb9e7211c9a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 23:51:05 +0100
Subject: [PATCH 646/735] Update license header for https (nohttp rule)

See gh-27802
---
 .../src/main/java/org/springframework/cglib/beans/BeanMap.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java b/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
index cfe843635991..3a6dd8e02057 100644
--- a/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
+++ b/spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.cglib.beans;
 
 import java.security.ProtectionDomain;

From 5bbdd36e199dd53b237f168c34c81c7b4dcd8946 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 4 Feb 2022 23:51:23 +0100
Subject: [PATCH 647/735] Upgrade to Checkstyle 9.3, HtmlUnit 2.58, Apache
 HttpClient 5.1.3

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index dfb10e777ad1..58d99ed311c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -151,8 +151,8 @@ configure(allprojects) { project ->
 			}
 
 			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.10"
-			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2'
-			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2'
+			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
+			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
 			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
@@ -206,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.1"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.57.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.58.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.56.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.58.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "9.2.1"
+		toolVersion = "9.3"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 

From 4ab03fede8aa6fd501f136803277db7e868d9b7c Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Sat, 5 Feb 2022 21:48:09 +0900
Subject: [PATCH 648/735] Fix Javadoc since for AopProxyUtils.isLambda()

See gh-28010
---
 .../java/org/springframework/aop/framework/AopProxyUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
index b7c3de885c07..f6f7bd7acfd6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
@@ -252,7 +252,7 @@ static Object[] adaptArgumentsIfNecessary(Method method, @Nullable Object[] argu
 	 * checks that work on modern, main stream JVMs.
 	 * @param clazz the class to check
 	 * @return {@code true} if the class is a lambda implementation class
-	 * @since 5.2.16
+	 * @since 5.3.16
 	 */
 	static boolean isLambda(Class<?> clazz) {
 		return (clazz.isSynthetic() && (clazz.getSuperclass() == Object.class) &&

From 1e0e477833c90d13d60b4f8ed0649ab7bb3e1541 Mon Sep 17 00:00:00 2001
From: lijun695 <lijun695@jd.com>
Date: Sat, 5 Feb 2022 20:51:18 +0800
Subject: [PATCH 649/735] Apply "instanceof pattern matching" in
 AbstractRoutingDataSource

Closes gh-28011
---
 .../jdbc/datasource/lookup/AbstractRoutingDataSource.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
index ec33aba10199..50b6d6166749 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
@@ -153,11 +153,11 @@ protected Object resolveSpecifiedLookupKey(Object lookupKey) {
 	 * @throws IllegalArgumentException in case of an unsupported value type
 	 */
 	protected DataSource resolveSpecifiedDataSource(Object dataSource) throws IllegalArgumentException {
-		if (dataSource instanceof DataSource) {
-			return (DataSource) dataSource;
+		if (dataSource instanceof DataSource result) {
+			return result;
 		}
-		else if (dataSource instanceof String) {
-			return this.dataSourceLookup.getDataSource((String) dataSource);
+		else if (dataSource instanceof String name) {
+			return this.dataSourceLookup.getDataSource(name);
 		}
 		else {
 			throw new IllegalArgumentException(

From 04fbfddb13e45a729a93d88c5aee8092bff2ca9c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 5 Feb 2022 19:12:13 +0100
Subject: [PATCH 650/735] Polish contribution

See gh-28011
---
 .../lookup/AbstractRoutingDataSource.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
index 50b6d6166749..cc71ba2c9d18 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -147,21 +147,21 @@ protected Object resolveSpecifiedLookupKey(Object lookupKey) {
 	 * Resolve the specified data source object into a DataSource instance.
 	 * <p>The default implementation handles DataSource instances and data source
 	 * names (to be resolved via a {@link #setDataSourceLookup DataSourceLookup}).
-	 * @param dataSource the data source value object as specified in the
+	 * @param dataSourceObject the data source value object as specified in the
 	 * {@link #setTargetDataSources targetDataSources} map
 	 * @return the resolved DataSource (never {@code null})
 	 * @throws IllegalArgumentException in case of an unsupported value type
 	 */
-	protected DataSource resolveSpecifiedDataSource(Object dataSource) throws IllegalArgumentException {
-		if (dataSource instanceof DataSource result) {
-			return result;
+	protected DataSource resolveSpecifiedDataSource(Object dataSourceObject) throws IllegalArgumentException {
+		if (dataSourceObject instanceof DataSource dataSource) {
+			return dataSource;
 		}
-		else if (dataSource instanceof String name) {
-			return this.dataSourceLookup.getDataSource(name);
+		else if (dataSourceObject instanceof String dataSourceName) {
+			return this.dataSourceLookup.getDataSource(dataSourceName);
 		}
 		else {
 			throw new IllegalArgumentException(
-					"Illegal data source value - only [javax.sql.DataSource] and String supported: " + dataSource);
+					"Illegal data source value - only [javax.sql.DataSource] and String supported: " + dataSourceObject);
 		}
 	}
 

From a13ad3e96932683feb6f1272503aaa30dae6685e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 5 Feb 2022 19:43:45 +0100
Subject: [PATCH 651/735] Polishing

---
 .../test/util/JsonExpectationsHelper.java          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
index 4de0dba6eee3..7c6489a6da0d 100644
--- a/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
+++ b/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@ public class JsonExpectationsHelper {
 	/**
 	 * Parse the expected and actual strings as JSON and assert the two
 	 * are "similar" - i.e. they contain the same attribute-value pairs
-	 * regardless of formatting with a lenient checking (extensible, and non-strict
-	 * array ordering).
+	 * regardless of formatting with lenient checking (extensible content and
+	 * non-strict array ordering).
 	 * @param expected the expected JSON content
 	 * @param actual the actual JSON content
 	 * @since 4.1
@@ -47,14 +47,14 @@ public void assertJsonEqual(String expected, String actual) throws Exception {
 	 * Parse the expected and actual strings as JSON and assert the two
 	 * are "similar" - i.e. they contain the same attribute-value pairs
 	 * regardless of formatting.
-	 * <p>Can compare in two modes, depending on {@code strict} parameter value:
+	 * <p>Can compare in two modes, depending on the {@code strict} parameter value:
 	 * <ul>
-	 * <li>{@code true}: strict checking. Not extensible, and strict array ordering.</li>
-	 * <li>{@code false}: lenient checking. Extensible, and non-strict array ordering.</li>
+	 * <li>{@code true}: strict checking. Not extensible and strict array ordering.</li>
+	 * <li>{@code false}: lenient checking. Extensible and non-strict array ordering.</li>
 	 * </ul>
 	 * @param expected the expected JSON content
 	 * @param actual the actual JSON content
-	 * @param strict enables strict checking
+	 * @param strict enables strict checking if {@code true}
 	 * @since 4.2
 	 */
 	public void assertJsonEqual(String expected, String actual, boolean strict) throws Exception {

From 920be8e1b201fa947b07941eeace62ecf0f431a9 Mon Sep 17 00:00:00 2001
From: Gleidson Leopoldo <gleidson.leopoldo@ii.co.uk>
Date: Tue, 1 Feb 2022 09:26:14 +0000
Subject: [PATCH 652/735] Add support for strict JSON comparison in
 WebTestClient

Prior to this commit, WebTestClient only supported "lenient" comparison
of the expected JSON body.

This commit introduces an overloaded variant of `json()` in the
BodyContentSpec that accepts an additional boolean flag to specify
whether a "strict" comparison should be performed.

This new feature is analogous to the existing support in MockMvc.

Closes gh-27993
---
 .../reactive/server/DefaultWebTestClient.java |  4 +-
 .../web/reactive/server/WebTestClient.java    | 19 +++++++-
 .../server/samples/JsonContentTests.java      | 46 ++++++++++++++++++-
 3 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
index 8628ef262261..3c0a33cb67dc 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
@@ -659,10 +659,10 @@ public EntityExchangeResult<Void> isEmpty() {
 		}
 
 		@Override
-		public BodyContentSpec json(String json) {
+		public BodyContentSpec json(String json, boolean strict) {
 			this.result.assertWithDiagnostics(() -> {
 				try {
-					new JsonExpectationsHelper().assertJsonEqual(json, getBodyAsString());
+					new JsonExpectationsHelper().assertJsonEqual(json, getBodyAsString(), strict);
 				}
 				catch (Exception ex) {
 					throw new AssertionError("JSON parsing error", ex);
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 141428f171ab..b8115a2e549c 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -979,7 +979,24 @@ interface BodyContentSpec {
 		 * on to be on the classpath.
 		 * @param expectedJson the expected JSON content.
 		 */
-		BodyContentSpec json(String expectedJson);
+		default BodyContentSpec json(String expectedJson) {
+			return json(expectedJson, false);
+		}
+
+		/**
+		 * Parse the expected and actual response content as JSON and perform a
+		 * comparison in two modes, depending on {@code strict} parameter value, verifying the same attribute-value pairs.
+		 * <ul>
+		 * <li>{@code true}: strict checking.
+		 * <li>{@code false}: lenient checking.
+		 * </ul>
+		 * <p>Use of this option requires the
+		 * <a href="https://jsonassert.skyscreamer.org/">JSONassert</a> library
+		 * on to be on the classpath.
+		 * @param expectedJson the expected JSON content.
+		 * @param strict enables strict checking
+		 */
+		BodyContentSpec json(String expectedJson, boolean strict);
 
 		/**
 		 * Parse expected and actual response content as XML and assert that
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
index 82d271c87775..2df1ad44adc6 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
@@ -31,10 +31,10 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.hamcrest.Matchers.containsString;
 
 
-
 /**
  * Samples of tests using {@link WebTestClient} with serialized JSON content.
  *
@@ -49,13 +49,32 @@ public class JsonContentTests {
 
 	@Test
 	public void jsonContent() {
-		this.client.get().uri("/persons")
+		this.client.get().uri("/persons/extended")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
 				.expectStatus().isOk()
 				.expectBody().json("[{\"name\":\"Jane\"},{\"name\":\"Jason\"},{\"name\":\"John\"}]");
 	}
 
+	@Test
+	public void jsonContentStrictFail() {
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.client.get().uri("/persons/extended")
+				.accept(MediaType.APPLICATION_JSON)
+				.exchange()
+				.expectStatus().isOk()
+				.expectBody().json("[{\"name\":\"Jane\"},{\"name\":\"Jason\"},{\"name\":\"John\"}]", true)
+		);
+	}
+
+	@Test
+	public void jsonContentStrict() {
+		this.client.get().uri("/persons/extended")
+				.accept(MediaType.APPLICATION_JSON)
+				.exchange()
+				.expectStatus().isOk()
+				.expectBody().json("[{\"name\":\"Jane\",\"surname\":\"Williams\"},{\"name\":\"Jason\",\"surname\":\"Johnson\"},{\"name\":\"John\",\"surname\":\"Smith\"}]", true);
+	}
+
 	@Test
 	public void jsonPathIsEqualTo() {
 		this.client.get().uri("/persons")
@@ -98,6 +117,11 @@ Flux<Person> getPersons() {
 			return Flux.just(new Person("Jane"), new Person("Jason"), new Person("John"));
 		}
 
+		@GetMapping("/extended")
+		Flux<ExtendedPerson> getExtendedPersons() {
+			return Flux.just(new ExtendedPerson("Jane", "Williams"), new ExtendedPerson("Jason", "Johnson"), new ExtendedPerson("John", "Smith"));
+		}
+
 		@GetMapping("/{name}")
 		Person getPerson(@PathVariable String name) {
 			return new Person(name);
@@ -109,4 +133,22 @@ ResponseEntity<String> savePerson(@RequestBody Person person) {
 		}
 	}
 
+	static class ExtendedPerson {
+		private String name;
+		private String surname;
+
+		public ExtendedPerson(String name, String surname) {
+			this.name = name;
+			this.surname = surname;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public String getSurname() {
+			return surname;
+		}
+	}
+
 }

From eb84c843736aaa555d9078a544280bd70b714fbb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 5 Feb 2022 20:11:47 +0100
Subject: [PATCH 653/735] Polish contribution

See gh-27993
---
 .../reactive/server/DefaultWebTestClient.java |  2 +-
 .../web/reactive/server/WebTestClient.java    | 31 ++++---
 .../server/samples/JsonContentTests.java      | 85 ++++++++++---------
 3 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
index 3c0a33cb67dc..a3cc4c2890e6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index b8115a2e549c..481a8d999e88 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -973,11 +973,14 @@ interface BodyContentSpec {
 
 		/**
 		 * Parse the expected and actual response content as JSON and perform a
-		 * "lenient" comparison verifying the same attribute-value pairs.
-		 * <p>Use of this option requires the
+		 * comparison verifying that they contain the same attribute-value pairs
+		 * regardless of formatting with <em>lenient</em> checking (extensible
+		 * and non-strict array ordering).
+		 * <p>Use of this method requires the
 		 * <a href="https://jsonassert.skyscreamer.org/">JSONassert</a> library
-		 * on to be on the classpath.
-		 * @param expectedJson the expected JSON content.
+		 * to be on the classpath.
+		 * @param expectedJson the expected JSON content
+		 * @see #json(String, boolean)
 		 */
 		default BodyContentSpec json(String expectedJson) {
 			return json(expectedJson, false);
@@ -985,16 +988,20 @@ default BodyContentSpec json(String expectedJson) {
 
 		/**
 		 * Parse the expected and actual response content as JSON and perform a
-		 * comparison in two modes, depending on {@code strict} parameter value, verifying the same attribute-value pairs.
+		 * comparison verifying that they contain the same attribute-value pairs
+		 * regardless of formatting.
+		 * <p>Can compare in two modes, depending on the {@code strict} parameter value:
 		 * <ul>
-		 * <li>{@code true}: strict checking.
-		 * <li>{@code false}: lenient checking.
+		 * <li>{@code true}: strict checking. Not extensible and strict array ordering.</li>
+		 * <li>{@code false}: lenient checking. Extensible and non-strict array ordering.</li>
 		 * </ul>
-		 * <p>Use of this option requires the
+		 * <p>Use of this method requires the
 		 * <a href="https://jsonassert.skyscreamer.org/">JSONassert</a> library
-		 * on to be on the classpath.
-		 * @param expectedJson the expected JSON content.
-		 * @param strict enables strict checking
+		 * to be on the classpath.
+		 * @param expectedJson the expected JSON content
+		 * @param strict enables strict checking if {@code true}
+		 * @since 5.3.16
+		 * @see #json(String)
 		 */
 		BodyContentSpec json(String expectedJson, boolean strict);
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
index 2df1ad44adc6..f038fb513d82 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,6 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.hamcrest.Matchers.containsString;
 
-
 /**
  * Samples of tests using {@link WebTestClient} with serialized JSON content.
  *
@@ -48,31 +47,41 @@ public class JsonContentTests {
 
 
 	@Test
-	public void jsonContent() {
-		this.client.get().uri("/persons/extended")
+	public void jsonContentWithDefaultLenientMode() {
+		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
 				.expectStatus().isOk()
-				.expectBody().json("[{\"name\":\"Jane\"},{\"name\":\"Jason\"},{\"name\":\"John\"}]");
+				.expectBody().json(
+						"[{\"firstName\":\"Jane\"}," +
+						"{\"firstName\":\"Jason\"}," +
+						"{\"firstName\":\"John\"}]");
 	}
 
 	@Test
-	public void jsonContentStrictFail() {
-		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.client.get().uri("/persons/extended")
+	public void jsonContentWithStrictMode() {
+		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
 				.expectStatus().isOk()
-				.expectBody().json("[{\"name\":\"Jane\"},{\"name\":\"Jason\"},{\"name\":\"John\"}]", true)
-		);
+				.expectBody().json(
+						"[{\"firstName\":\"Jane\",\"lastName\":\"Williams\"}," +
+						"{\"firstName\":\"Jason\",\"lastName\":\"Johnson\"}," +
+						"{\"firstName\":\"John\",\"lastName\":\"Smith\"}]",
+						true);
 	}
 
 	@Test
-	public void jsonContentStrict() {
-		this.client.get().uri("/persons/extended")
+	public void jsonContentWithStrictModeAndMissingAttributes() {
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
-				.expectStatus().isOk()
-				.expectBody().json("[{\"name\":\"Jane\",\"surname\":\"Williams\"},{\"name\":\"Jason\",\"surname\":\"Johnson\"},{\"name\":\"John\",\"surname\":\"Smith\"}]", true);
+				.expectBody().json(
+						"[{\"firstName\":\"Jane\"}," +
+						"{\"firstName\":\"Jason\"}," +
+						"{\"firstName\":\"John\"}]",
+						true)
+		);
 	}
 
 	@Test
@@ -82,26 +91,26 @@ public void jsonPathIsEqualTo() {
 				.exchange()
 				.expectStatus().isOk()
 				.expectBody()
-				.jsonPath("$[0].name").isEqualTo("Jane")
-				.jsonPath("$[1].name").isEqualTo("Jason")
-				.jsonPath("$[2].name").isEqualTo("John");
+				.jsonPath("$[0].firstName").isEqualTo("Jane")
+				.jsonPath("$[1].firstName").isEqualTo("Jason")
+				.jsonPath("$[2].firstName").isEqualTo("John");
 	}
 
 	@Test
 	public void jsonPathMatches() {
-		this.client.get().uri("/persons/John")
+		this.client.get().uri("/persons/John/Smith")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
 				.expectStatus().isOk()
 				.expectBody()
-				.jsonPath("$.name").value(containsString("oh"));
+				.jsonPath("$.firstName").value(containsString("oh"));
 	}
 
 	@Test
 	public void postJsonContent() {
 		this.client.post().uri("/persons")
 				.contentType(MediaType.APPLICATION_JSON)
-				.bodyValue("{\"name\":\"John\"}")
+				.bodyValue("{\"firstName\":\"John\",\"lastName\":\"Smith\"}")
 				.exchange()
 				.expectStatus().isCreated()
 				.expectBody().isEmpty();
@@ -114,40 +123,38 @@ static class PersonController {
 
 		@GetMapping
 		Flux<Person> getPersons() {
-			return Flux.just(new Person("Jane"), new Person("Jason"), new Person("John"));
-		}
-
-		@GetMapping("/extended")
-		Flux<ExtendedPerson> getExtendedPersons() {
-			return Flux.just(new ExtendedPerson("Jane", "Williams"), new ExtendedPerson("Jason", "Johnson"), new ExtendedPerson("John", "Smith"));
+			return Flux.just(new Person("Jane", "Williams"), new Person("Jason", "Johnson"), new Person("John", "Smith"));
 		}
 
-		@GetMapping("/{name}")
-		Person getPerson(@PathVariable String name) {
-			return new Person(name);
+		@GetMapping("/{firstName}/{lastName}")
+		Person getPerson(@PathVariable String firstName, @PathVariable String lastName) {
+			return new Person(firstName, lastName);
 		}
 
 		@PostMapping
 		ResponseEntity<String> savePerson(@RequestBody Person person) {
-			return ResponseEntity.created(URI.create("/persons/" + person.getName())).build();
+			return ResponseEntity.created(URI.create(String.format("/persons/%s/%s", person.getFirstName(), person.getLastName()))).build();
 		}
 	}
 
-	static class ExtendedPerson {
-		private String name;
-		private String surname;
+	static class Person {
+		private String firstName;
+		private String lastName;
+
+		public Person() {
+		}
 
-		public ExtendedPerson(String name, String surname) {
-			this.name = name;
-			this.surname = surname;
+		public Person(String firstName, String lastName) {
+			this.firstName = firstName;
+			this.lastName = lastName;
 		}
 
-		public String getName() {
-			return name;
+		public String getFirstName() {
+			return this.firstName;
 		}
 
-		public String getSurname() {
-			return surname;
+		public String getLastName() {
+			return this.lastName;
 		}
 	}
 

From 038b88e2a1cc64c845aacc438d1b39979110bce5 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 5 Feb 2022 20:23:45 +0100
Subject: [PATCH 654/735] Polishing

---
 .../reactive/server/samples/ErrorTests.java   | 10 ++++----
 .../server/samples/ExchangeMutatorTests.java  | 23 +++++++-----------
 .../GlobalEntityResultConsumerTests.java      |  3 ++-
 .../server/samples/HeaderAndCookieTests.java  | 11 +++++----
 .../server/samples/JsonContentTests.java      | 14 +++++------
 .../server/samples/ResponseEntityTests.java   | 24 ++++++++-----------
 .../server/samples/XmlContentTests.java       | 17 ++++++-------
 7 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ErrorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ErrorTests.java
index f2637bc1709d..89a06defd642 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ErrorTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ErrorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,13 +37,13 @@
  * @author Rossen Stoyanchev
  * @since 5.0
  */
-public class ErrorTests {
+class ErrorTests {
 
 	private final WebTestClient client = WebTestClient.bindToController(new TestController()).build();
 
 
 	@Test
-	public void notFound(){
+	void notFound(){
 		this.client.get().uri("/invalid")
 				.exchange()
 				.expectStatus().isNotFound()
@@ -51,7 +51,7 @@ public void notFound(){
 	}
 
 	@Test
-	public void serverException() {
+	void serverException() {
 		this.client.get().uri("/server-error")
 				.exchange()
 				.expectStatus().isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
@@ -59,7 +59,7 @@ public void serverException() {
 	}
 
 	@Test // SPR-17363
-	public void badRequestBeforeRequestBodyConsumed() {
+	void badRequestBeforeRequestBodyConsumed() {
 		EntityExchangeResult<Void> result = this.client.post()
 				.uri("/post")
 				.contentType(MediaType.APPLICATION_JSON)
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java
index d5dbbd597ce9..759770bf6528 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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 @@
 
 import java.security.Principal;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
@@ -37,23 +36,18 @@
 
 /**
  * Samples tests that demonstrate applying ServerWebExchange initialization.
+ *
  * @author Rossen Stoyanchev
  */
-public class ExchangeMutatorTests {
-
-	private WebTestClient webTestClient;
+class ExchangeMutatorTests {
 
+	private final WebTestClient webTestClient = WebTestClient.bindToController(new TestController())
+			.apply(identity("Pablo"))
+			.build();
 
-	@BeforeEach
-	public void setUp() throws Exception {
-
-		this.webTestClient = WebTestClient.bindToController(new TestController())
-				.apply(identity("Pablo"))
-				.build();
-	}
 
 	@Test
-	public void useGloballyConfiguredIdentity() throws Exception {
+	void useGloballyConfiguredIdentity() {
 		this.webTestClient.get().uri("/userIdentity")
 				.exchange()
 				.expectStatus().isOk()
@@ -61,8 +55,7 @@ public void useGloballyConfiguredIdentity() throws Exception {
 	}
 
 	@Test
-	public void useLocallyConfiguredIdentity() throws Exception {
-
+	void useLocallyConfiguredIdentity() {
 		this.webTestClient
 				.mutateWith(identity("Giovanni"))
 				.get().uri("/userIdentity")
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java
index 24bf92ecbb31..1a68d62ca1c0 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -96,4 +96,5 @@ List<Person> getPersons() {
 			return Arrays.asList(new Person("Joe"), new Person("Joseph"));
 		}
 	}
+
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/HeaderAndCookieTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/HeaderAndCookieTests.java
index e42dff7c110d..a2b743c64255 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/HeaderAndCookieTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/HeaderAndCookieTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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,16 +29,17 @@
 
 /**
  * Tests with headers and cookies.
+ *
  * @author Rossen Stoyanchev
  * @since 5.0
  */
-public class HeaderAndCookieTests {
+class HeaderAndCookieTests {
 
 	private final WebTestClient client = WebTestClient.bindToController(new TestController()).build();
 
 
 	@Test
-	public void requestResponseHeaderPair() throws Exception {
+	void requestResponseHeaderPair() {
 		this.client.get().uri("/header-echo").header("h1", "in")
 				.exchange()
 				.expectStatus().isOk()
@@ -46,7 +47,7 @@ public void requestResponseHeaderPair() throws Exception {
 	}
 
 	@Test
-	public void headerMultipleValues() throws Exception {
+	void headerMultipleValues() {
 		this.client.get().uri("/header-multi-value")
 				.exchange()
 				.expectStatus().isOk()
@@ -54,7 +55,7 @@ public void headerMultipleValues() throws Exception {
 	}
 
 	@Test
-	public void setCookies() {
+	void setCookies() {
 		this.client.get().uri("/cookie-echo")
 				.cookies(cookies -> cookies.add("k1", "v1"))
 				.exchange()
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
index f038fb513d82..e6a4ed779950 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
@@ -41,13 +41,13 @@
  * @author Sam Brannen
  * @since 5.0
  */
-public class JsonContentTests {
+class JsonContentTests {
 
 	private final WebTestClient client = WebTestClient.bindToController(new PersonController()).build();
 
 
 	@Test
-	public void jsonContentWithDefaultLenientMode() {
+	void jsonContentWithDefaultLenientMode() {
 		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
@@ -59,7 +59,7 @@ public void jsonContentWithDefaultLenientMode() {
 	}
 
 	@Test
-	public void jsonContentWithStrictMode() {
+	void jsonContentWithStrictMode() {
 		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
@@ -72,7 +72,7 @@ public void jsonContentWithStrictMode() {
 	}
 
 	@Test
-	public void jsonContentWithStrictModeAndMissingAttributes() {
+	void jsonContentWithStrictModeAndMissingAttributes() {
 		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
@@ -85,7 +85,7 @@ public void jsonContentWithStrictModeAndMissingAttributes() {
 	}
 
 	@Test
-	public void jsonPathIsEqualTo() {
+	void jsonPathIsEqualTo() {
 		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
@@ -97,7 +97,7 @@ public void jsonPathIsEqualTo() {
 	}
 
 	@Test
-	public void jsonPathMatches() {
+	void jsonPathMatches() {
 		this.client.get().uri("/persons/John/Smith")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
@@ -107,7 +107,7 @@ public void jsonPathMatches() {
 	}
 
 	@Test
-	public void postJsonContent() {
+	void postJsonContent() {
 		this.client.post().uri("/persons")
 				.contentType(MediaType.APPLICATION_JSON)
 				.bodyValue("{\"firstName\":\"John\",\"lastName\":\"Smith\"}")
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ResponseEntityTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ResponseEntityTests.java
index 3acbf66d9842..f1619d618819 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ResponseEntityTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ResponseEntityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -49,7 +49,7 @@
  * @author Rossen Stoyanchev
  * @since 5.0
  */
-public class ResponseEntityTests {
+class ResponseEntityTests {
 
 	private final WebTestClient client = WebTestClient.bindToController(new PersonController())
 			.configureClient()
@@ -58,7 +58,7 @@ public class ResponseEntityTests {
 
 
 	@Test
-	public void entity() {
+	void entity() {
 		this.client.get().uri("/John")
 				.exchange()
 				.expectStatus().isOk()
@@ -67,7 +67,7 @@ public void entity() {
 	}
 
 	@Test
-	public void entityMatcher() {
+	void entityMatcher() {
 		this.client.get().uri("/John")
 				.exchange()
 				.expectStatus().isOk()
@@ -76,7 +76,7 @@ public void entityMatcher() {
 	}
 
 	@Test
-	public void entityWithConsumer() {
+	void entityWithConsumer() {
 		this.client.get().uri("/John")
 				.exchange()
 				.expectStatus().isOk()
@@ -86,8 +86,7 @@ public void entityWithConsumer() {
 	}
 
 	@Test
-	public void entityList() {
-
+	void entityList() {
 		List<Person> expected = Arrays.asList(
 				new Person("Jane"), new Person("Jason"), new Person("John"));
 
@@ -99,8 +98,7 @@ public void entityList() {
 	}
 
 	@Test
-	public void entityListWithConsumer() {
-
+	void entityListWithConsumer() {
 		this.client.get()
 				.exchange()
 				.expectStatus().isOk()
@@ -111,8 +109,7 @@ public void entityListWithConsumer() {
 	}
 
 	@Test
-	public void entityMap() {
-
+	void entityMap() {
 		Map<String, Person> map = new LinkedHashMap<>();
 		map.put("Jane", new Person("Jane"));
 		map.put("Jason", new Person("Jason"));
@@ -125,8 +122,7 @@ public void entityMap() {
 	}
 
 	@Test
-	public void entityStream() {
-
+	void entityStream() {
 		FluxExchangeResult<Person> result = this.client.get()
 				.accept(TEXT_EVENT_STREAM)
 				.exchange()
@@ -143,7 +139,7 @@ public void entityStream() {
 	}
 
 	@Test
-	public void postEntity() {
+	void postEntity() {
 		this.client.post()
 				.bodyValue(new Person("John"))
 				.exchange()
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java
index 870c7231e056..a24eda5db21e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/XmlContentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,15 +41,13 @@
 
 import static org.hamcrest.Matchers.startsWith;
 
-
-
 /**
  * Samples of tests using {@link WebTestClient} with XML content.
  *
  * @author Eric Deandrea
  * @since 5.1
  */
-public class XmlContentTests {
+class XmlContentTests {
 
 	private static final String persons_XML =
 			"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -64,7 +62,7 @@ public class XmlContentTests {
 
 
 	@Test
-	public void xmlContent() {
+	void xmlContent() {
 		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_XML)
 				.exchange()
@@ -73,7 +71,7 @@ public void xmlContent() {
 	}
 
 	@Test
-	public void xpathIsEqualTo() {
+	void xpathIsEqualTo() {
 		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_XML)
 				.exchange()
@@ -89,7 +87,7 @@ public void xpathIsEqualTo() {
 	}
 
 	@Test
-	public void xpathMatches() {
+	void xpathMatches() {
 		this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_XML)
 				.exchange()
@@ -99,7 +97,7 @@ public void xpathMatches() {
 	}
 
 	@Test
-	public void xpathContainsSubstringViaRegex() {
+	void xpathContainsSubstringViaRegex() {
 		this.client.get().uri("/persons/John")
 				.accept(MediaType.APPLICATION_XML)
 				.exchange()
@@ -109,8 +107,7 @@ public void xpathContainsSubstringViaRegex() {
 	}
 
 	@Test
-	public void postXmlContent() {
-
+	void postXmlContent() {
 		String content =
 				"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +
 				"<person><name>John</name></person>";

From e077a753f8ec528979eb47c4d3ce41b88437723d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 5 Feb 2022 20:37:42 +0100
Subject: [PATCH 655/735] Polish JsonContentTests

---
 .../server/samples/JsonContentTests.java      | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
index e6a4ed779950..31d8efd3693a 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/JsonContentTests.java
@@ -52,10 +52,13 @@ void jsonContentWithDefaultLenientMode() {
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
 				.expectStatus().isOk()
-				.expectBody().json(
-						"[{\"firstName\":\"Jane\"}," +
-						"{\"firstName\":\"Jason\"}," +
-						"{\"firstName\":\"John\"}]");
+				.expectBody().json("""
+						[
+							{"firstName":"Jane"},
+							{"firstName":"Jason"},
+							{"firstName":"John"}
+						]
+						""");
 	}
 
 	@Test
@@ -64,10 +67,13 @@ void jsonContentWithStrictMode() {
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
 				.expectStatus().isOk()
-				.expectBody().json(
-						"[{\"firstName\":\"Jane\",\"lastName\":\"Williams\"}," +
-						"{\"firstName\":\"Jason\",\"lastName\":\"Johnson\"}," +
-						"{\"firstName\":\"John\",\"lastName\":\"Smith\"}]",
+				.expectBody().json("""
+						[
+							{"firstName":"Jane", "lastName":"Williams"},
+							{"firstName":"Jason","lastName":"Johnson"},
+							{"firstName":"John", "lastName":"Smith"}
+						]
+						""",
 						true);
 	}
 
@@ -76,10 +82,13 @@ void jsonContentWithStrictModeAndMissingAttributes() {
 		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> this.client.get().uri("/persons")
 				.accept(MediaType.APPLICATION_JSON)
 				.exchange()
-				.expectBody().json(
-						"[{\"firstName\":\"Jane\"}," +
-						"{\"firstName\":\"Jason\"}," +
-						"{\"firstName\":\"John\"}]",
+				.expectBody().json("""
+						[
+							{"firstName":"Jane"},
+							{"firstName":"Jason"},
+							{"firstName":"John"}
+						]
+						""",
 						true)
 		);
 	}
@@ -110,7 +119,9 @@ void jsonPathMatches() {
 	void postJsonContent() {
 		this.client.post().uri("/persons")
 				.contentType(MediaType.APPLICATION_JSON)
-				.bodyValue("{\"firstName\":\"John\",\"lastName\":\"Smith\"}")
+				.bodyValue("""
+						{"firstName":"John", "lastName":"Smith"}
+						""")
 				.exchange()
 				.expectStatus().isCreated()
 				.expectBody().isEmpty();

From 6936f7e0cb1eae8357f3c700d2c2d33834475ec2 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 3 Feb 2022 14:41:20 +0100
Subject: [PATCH 656/735] Relocate runtime hints to aot package

See gh-27829
---
 .../{core => aot}/hint/AbstractTypeReference.java         | 2 +-
 .../{core => aot}/hint/ClassProxyHint.java                | 2 +-
 .../{core => aot}/hint/ExecutableHint.java                | 2 +-
 .../{core => aot}/hint/ExecutableMode.java                | 2 +-
 .../org/springframework/{core => aot}/hint/FieldHint.java | 2 +-
 .../{core => aot}/hint/JavaSerializationHints.java        | 2 +-
 .../springframework/{core => aot}/hint/JdkProxyHint.java  | 2 +-
 .../{core => aot}/hint/MemberCategory.java                | 2 +-
 .../springframework/{core => aot}/hint/MemberHint.java    | 2 +-
 .../springframework/{core => aot}/hint/ProxyHints.java    | 4 ++--
 .../{core => aot}/hint/ReflectionHints.java               | 4 ++--
 .../{core => aot}/hint/ReflectionTypeReference.java       | 2 +-
 .../{core => aot}/hint/ResourceBundleHint.java            | 2 +-
 .../springframework/{core => aot}/hint/ResourceHints.java | 4 ++--
 .../{core => aot}/hint/ResourcePatternHint.java           | 2 +-
 .../springframework/{core => aot}/hint/RuntimeHints.java  | 2 +-
 .../{core => aot}/hint/SimpleTypeReference.java           | 2 +-
 .../org/springframework/{core => aot}/hint/TypeHint.java  | 2 +-
 .../springframework/{core => aot}/hint/TypeReference.java | 2 +-
 .../springframework/{core => aot}/hint/package-info.java  | 2 +-
 .../{core => aot}/hint/ClassProxyHintTests.java           | 4 ++--
 .../{core => aot}/hint/JavaSerializationHintsTests.java   | 2 +-
 .../{core => aot}/hint/JdkProxyHintTests.java             | 4 ++--
 .../{core => aot}/hint/ProxyHintsTests.java               | 4 ++--
 .../{core => aot}/hint/ReflectionHintsTests.java          | 2 +-
 .../{core => aot}/hint/ResourceHintsTests.java            | 8 ++++----
 .../{core => aot}/hint/RuntimeHintsTests.java             | 2 +-
 .../springframework/{core => aot}/hint/TypeHintTests.java | 4 ++--
 .../{core => aot}/hint/TypeReferenceTests.java            | 2 +-
 29 files changed, 39 insertions(+), 39 deletions(-)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/AbstractTypeReference.java (97%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ClassProxyHint.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ExecutableHint.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ExecutableMode.java (96%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/FieldHint.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/JavaSerializationHints.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/JdkProxyHint.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/MemberCategory.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/MemberHint.java (96%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ProxyHints.java (97%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ReflectionHints.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ReflectionTypeReference.java (97%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ResourceBundleHint.java (96%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ResourceHints.java (97%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/ResourcePatternHint.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/RuntimeHints.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/SimpleTypeReference.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/TypeHint.java (99%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/TypeReference.java (98%)
 rename spring-core/src/main/java/org/springframework/{core => aot}/hint/package-info.java (73%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/ClassProxyHintTests.java (96%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/JavaSerializationHintsTests.java (96%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/JdkProxyHintTests.java (96%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/ProxyHintsTests.java (97%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/ReflectionHintsTests.java (99%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/ResourceHintsTests.java (93%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/RuntimeHintsTests.java (98%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/TypeHintTests.java (98%)
 rename spring-core/src/test/java/org/springframework/{core => aot}/hint/TypeReferenceTests.java (98%)

diff --git a/spring-core/src/main/java/org/springframework/core/hint/AbstractTypeReference.java b/spring-core/src/main/java/org/springframework/aot/hint/AbstractTypeReference.java
similarity index 97%
rename from spring-core/src/main/java/org/springframework/core/hint/AbstractTypeReference.java
rename to spring-core/src/main/java/org/springframework/aot/hint/AbstractTypeReference.java
index bbe77ec818ae..830fae9e4862 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/AbstractTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/AbstractTypeReference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.Objects;
 
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ClassProxyHint.java b/spring-core/src/main/java/org/springframework/aot/hint/ClassProxyHint.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/ClassProxyHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ClassProxyHint.java
index f7862fef21fd..3fe04b4f35dc 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ClassProxyHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ClassProxyHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ExecutableHint.java b/spring-core/src/main/java/org/springframework/aot/hint/ExecutableHint.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/ExecutableHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ExecutableHint.java
index c45dae559849..f654f2ff1340 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ExecutableHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ExecutableHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ExecutableMode.java b/spring-core/src/main/java/org/springframework/aot/hint/ExecutableMode.java
similarity index 96%
rename from spring-core/src/main/java/org/springframework/core/hint/ExecutableMode.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ExecutableMode.java
index c562eef6b254..9d5599ad83b8 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ExecutableMode.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ExecutableMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Executable;
 
diff --git a/spring-core/src/main/java/org/springframework/core/hint/FieldHint.java b/spring-core/src/main/java/org/springframework/aot/hint/FieldHint.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/FieldHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/FieldHint.java
index f40ae9843777..d5ef47b29766 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/FieldHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/FieldHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Field;
 
diff --git a/spring-core/src/main/java/org/springframework/core/hint/JavaSerializationHints.java b/spring-core/src/main/java/org/springframework/aot/hint/JavaSerializationHints.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/JavaSerializationHints.java
rename to spring-core/src/main/java/org/springframework/aot/hint/JavaSerializationHints.java
index b8d06a1ca261..b317569995ba 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/JavaSerializationHints.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/JavaSerializationHints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.io.Serializable;
 import java.util.LinkedHashSet;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/JdkProxyHint.java b/spring-core/src/main/java/org/springframework/aot/hint/JdkProxyHint.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/JdkProxyHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/JdkProxyHint.java
index 4429ac9f7d1a..a4989e07200a 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/JdkProxyHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/JdkProxyHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/MemberCategory.java b/spring-core/src/main/java/org/springframework/aot/hint/MemberCategory.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/MemberCategory.java
rename to spring-core/src/main/java/org/springframework/aot/hint/MemberCategory.java
index 6cf0b44fd814..06bc339774c0 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/MemberCategory.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/MemberCategory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/MemberHint.java b/spring-core/src/main/java/org/springframework/aot/hint/MemberHint.java
similarity index 96%
rename from spring-core/src/main/java/org/springframework/core/hint/MemberHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/MemberHint.java
index 16edee664834..e83740dcca89 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/MemberHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/MemberHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Member;
 
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ProxyHints.java b/spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java
similarity index 97%
rename from spring-core/src/main/java/org/springframework/core/hint/ProxyHints.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java
index e542212d88c1..a1ad157240e4 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ProxyHints.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.Arrays;
 import java.util.LinkedHashSet;
@@ -25,7 +25,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.springframework.core.hint.ClassProxyHint.Builder;
+import org.springframework.aot.hint.ClassProxyHint.Builder;
 
 /**
  * Gather the need of using proxies at runtime.
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ReflectionHints.java b/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHints.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/ReflectionHints.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ReflectionHints.java
index 1a8493e7e85d..f459c6a25822 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ReflectionHints.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
@@ -28,7 +28,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.springframework.core.hint.TypeHint.Builder;
+import org.springframework.aot.hint.TypeHint.Builder;
 
 /**
  * Gather the need for reflection at runtime.
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ReflectionTypeReference.java b/spring-core/src/main/java/org/springframework/aot/hint/ReflectionTypeReference.java
similarity index 97%
rename from spring-core/src/main/java/org/springframework/core/hint/ReflectionTypeReference.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ReflectionTypeReference.java
index 85d8d05dc101..ff215b0d9786 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ReflectionTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ReflectionTypeReference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ResourceBundleHint.java b/spring-core/src/main/java/org/springframework/aot/hint/ResourceBundleHint.java
similarity index 96%
rename from spring-core/src/main/java/org/springframework/core/hint/ResourceBundleHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ResourceBundleHint.java
index 0586d3f4cbd3..21efdfa289ed 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ResourceBundleHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ResourceBundleHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.ResourceBundle;
 
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ResourceHints.java b/spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java
similarity index 97%
rename from spring-core/src/main/java/org/springframework/core/hint/ResourceHints.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java
index bfeb162ecc93..c4db5c9d8252 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ResourceHints.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -24,7 +24,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import org.springframework.core.hint.ResourcePatternHint.Builder;
+import org.springframework.aot.hint.ResourcePatternHint.Builder;
 
 /**
  * Gather the need for resources available at runtime.
diff --git a/spring-core/src/main/java/org/springframework/core/hint/ResourcePatternHint.java b/spring-core/src/main/java/org/springframework/aot/hint/ResourcePatternHint.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/ResourcePatternHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/ResourcePatternHint.java
index 87ae0c2587d1..a48d59eaae94 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/ResourcePatternHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ResourcePatternHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/RuntimeHints.java b/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHints.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/RuntimeHints.java
rename to spring-core/src/main/java/org/springframework/aot/hint/RuntimeHints.java
index 0b869fd68ecd..5a0311ac3230 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/RuntimeHints.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 /**
  * Gather hints that can be used to optimize the application runtime.
diff --git a/spring-core/src/main/java/org/springframework/core/hint/SimpleTypeReference.java b/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/SimpleTypeReference.java
rename to spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java
index f19568c95cab..9d7300f45e80 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/SimpleTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/TypeHint.java b/spring-core/src/main/java/org/springframework/aot/hint/TypeHint.java
similarity index 99%
rename from spring-core/src/main/java/org/springframework/core/hint/TypeHint.java
rename to spring-core/src/main/java/org/springframework/aot/hint/TypeHint.java
index 16dfeddcf662..8c62db8ff69e 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/TypeHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/TypeHint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/spring-core/src/main/java/org/springframework/core/hint/TypeReference.java b/spring-core/src/main/java/org/springframework/aot/hint/TypeReference.java
similarity index 98%
rename from spring-core/src/main/java/org/springframework/core/hint/TypeReference.java
rename to spring-core/src/main/java/org/springframework/aot/hint/TypeReference.java
index f39260de8284..39bb07d2f24f 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/TypeReference.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/TypeReference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import org.springframework.lang.Nullable;
 
diff --git a/spring-core/src/main/java/org/springframework/core/hint/package-info.java b/spring-core/src/main/java/org/springframework/aot/hint/package-info.java
similarity index 73%
rename from spring-core/src/main/java/org/springframework/core/hint/package-info.java
rename to spring-core/src/main/java/org/springframework/aot/hint/package-info.java
index 8baf2b0d215d..b13bb68d6a9b 100644
--- a/spring-core/src/main/java/org/springframework/core/hint/package-info.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/package-info.java
@@ -2,4 +2,4 @@
  * Support for registering the need for reflection, resources, java serialization
  * and proxies.
  */
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ClassProxyHintTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ClassProxyHintTests.java
similarity index 96%
rename from spring-core/src/test/java/org/springframework/core/hint/ClassProxyHintTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/ClassProxyHintTests.java
index 215f8bda603b..91848f6bd00a 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/ClassProxyHintTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/ClassProxyHintTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.io.Closeable;
 import java.io.Serializable;
@@ -24,7 +24,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.core.hint.JdkProxyHint.Builder;
+import org.springframework.aot.hint.JdkProxyHint.Builder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-core/src/test/java/org/springframework/core/hint/JavaSerializationHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/JavaSerializationHintsTests.java
similarity index 96%
rename from spring-core/src/test/java/org/springframework/core/hint/JavaSerializationHintsTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/JavaSerializationHintsTests.java
index 3eb632cdcf9d..bb61475bd322 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/JavaSerializationHintsTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/JavaSerializationHintsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.net.URL;
 
diff --git a/spring-core/src/test/java/org/springframework/core/hint/JdkProxyHintTests.java b/spring-core/src/test/java/org/springframework/aot/hint/JdkProxyHintTests.java
similarity index 96%
rename from spring-core/src/test/java/org/springframework/core/hint/JdkProxyHintTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/JdkProxyHintTests.java
index 89a7669dfdd0..d0095e3083b5 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/JdkProxyHintTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/JdkProxyHintTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.core.hint.JdkProxyHint.Builder;
+import org.springframework.aot.hint.JdkProxyHint.Builder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ProxyHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java
similarity index 97%
rename from spring-core/src/test/java/org/springframework/core/hint/ProxyHintsTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java
index 9fe36f0ded67..337df262e3e5 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/ProxyHintsTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -26,7 +26,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.core.hint.JdkProxyHint.Builder;
+import org.springframework.aot.hint.JdkProxyHint.Builder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ReflectionHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java
similarity index 99%
rename from spring-core/src/test/java/org/springframework/core/hint/ReflectionHintsTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java
index 27460dcbf541..6b0f57d85cdc 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/ReflectionHintsTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.function.Consumer;
 
diff --git a/spring-core/src/test/java/org/springframework/core/hint/ResourceHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java
similarity index 93%
rename from spring-core/src/test/java/org/springframework/core/hint/ResourceHintsTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java
index 9ec2ed129b22..a5ee090923c2 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/ResourceHintsTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -23,7 +23,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.core.hint.ResourceHintsTests.Nested.Inner;
+import org.springframework.aot.hint.ResourceHintsTests.Nested.Inner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -47,14 +47,14 @@ void registerType() {
 	void registerTypeWithNestedType() {
 		this.resourceHints.registerType(TypeReference.of(Nested.class));
 		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
-				patternOf("org/springframework/core/hint/ResourceHintsTests$Nested.class"));
+				patternOf("org/springframework/aot/hint/ResourceHintsTests$Nested.class"));
 	}
 
 	@Test
 	void registerTypeWithInnerNestedType() {
 		this.resourceHints.registerType(TypeReference.of(Inner.class));
 		assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
-				patternOf("org/springframework/core/hint/ResourceHintsTests$Nested$Inner.class"));
+				patternOf("org/springframework/aot/hint/ResourceHintsTests$Nested$Inner.class"));
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/hint/RuntimeHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/RuntimeHintsTests.java
similarity index 98%
rename from spring-core/src/test/java/org/springframework/core/hint/RuntimeHintsTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/RuntimeHintsTests.java
index 46cec4a50cb4..c969057d7d8f 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/RuntimeHintsTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/RuntimeHintsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.function.Function;
 
diff --git a/spring-core/src/test/java/org/springframework/core/hint/TypeHintTests.java b/spring-core/src/test/java/org/springframework/aot/hint/TypeHintTests.java
similarity index 98%
rename from spring-core/src/test/java/org/springframework/core/hint/TypeHintTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/TypeHintTests.java
index 3916c7447314..89b1ad05826d 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/TypeHintTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/TypeHintTests.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.core.hint.TypeHint.Builder;
+import org.springframework.aot.hint.TypeHint.Builder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git a/spring-core/src/test/java/org/springframework/core/hint/TypeReferenceTests.java b/spring-core/src/test/java/org/springframework/aot/hint/TypeReferenceTests.java
similarity index 98%
rename from spring-core/src/test/java/org/springframework/core/hint/TypeReferenceTests.java
rename to spring-core/src/test/java/org/springframework/aot/hint/TypeReferenceTests.java
index e60dfd3d49aa..00bb853fccf6 100644
--- a/spring-core/src/test/java/org/springframework/core/hint/TypeReferenceTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/TypeReferenceTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.core.hint;
+package org.springframework.aot.hint;
 
 import org.junit.jupiter.api.Test;
 

From a0c97e4c36e5e07bc13bab4409ec740332a57871 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 3 Feb 2022 14:44:28 +0100
Subject: [PATCH 657/735] Polish

See gh-27829
---
 .../java/org/springframework/aot/hint/package-info.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/aot/hint/package-info.java b/spring-core/src/main/java/org/springframework/aot/hint/package-info.java
index b13bb68d6a9b..19bccf9a7fe3 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/package-info.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/package-info.java
@@ -1,5 +1,10 @@
 /**
- * Support for registering the need for reflection, resources, java serialization
- * and proxies.
+ * Support for registering the need for reflection, resources, java
+ * serialization and proxies at runtime.
  */
+@NonNullApi
+@NonNullFields
 package org.springframework.aot.hint;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;

From 669b05dc1d925cf88a084a1de6e582b6f0a773e1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 8 Feb 2022 14:04:11 +0100
Subject: [PATCH 658/735] Allow AutowiredAnnotationBeanPostProcessor to compile
 on JDK 11

---
 .../annotation/AutowiredAnnotationBeanPostProcessor.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 37f5884e671e..f31d48191a4d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -537,10 +537,10 @@ private MergedAnnotation<?> findAutowiredAnnotation(AccessibleObject ao) {
 	 * @param ann the Autowired annotation
 	 * @return whether the annotation indicates that a dependency is required
 	 */
-	@SuppressWarnings({"deprecation", "cast"})
+	@SuppressWarnings("deprecation")
 	protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
-		return determineRequiredStatus(
-				ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
+		return determineRequiredStatus(ann.<AnnotationAttributes> asMap(
+			mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
 	}
 
 	/**

From 7139a877f41f864b3a318c0dadd3450fa67deb19 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 8 Feb 2022 13:22:44 +0100
Subject: [PATCH 659/735] Ensure toString() for synthesized annotations is
 source code compatible

Since the introduction of synthesized annotation support in Spring
Framework 4.2 (a.k.a., merged annotations), the toString()
implementation attempted to align with the formatting used by the JDK
itself. However, Class annotation attributes were formatted using
Class#getName in Spring; whereas, the JDK used Class#toString up until
JDK 9.

In addition, JDK 9 introduced new formatting for toString() for
annotations, apparently intended to align with the syntax used in the
source code declaration of the annotation. However, JDK 9+ formats enum
annotation attributes using Enum#toString instead of Enum#name, which
can lead to issues if toString() is overridden in an enum.

This commit updates the formatting used for synthesized annotations by
ensuring that toString() generates a string that is compatible with the
syntax of the originating source code, going beyond the changes made in
JDK 9 by using Enum#name instead of Enum#toString.

Closes gh-28015
---
 ...izedMergedAnnotationInvocationHandler.java | 14 ++++--
 .../annotation/MergedAnnotationsTests.java    | 45 ++++++++++++++++---
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
index 0201e15e2698..6838dc377973 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -195,18 +195,24 @@ private String annotationToString() {
 	}
 
 	private String toString(Object value) {
+		if (value instanceof String) {
+			return '"' + value.toString() + '"';
+		}
+		if (value instanceof Enum) {
+			return ((Enum<?>) value).name();
+		}
 		if (value instanceof Class) {
-			return ((Class<?>) value).getName();
+			return ((Class<?>) value).getName() + ".class";
 		}
 		if (value.getClass().isArray()) {
-			StringBuilder builder = new StringBuilder("[");
+			StringBuilder builder = new StringBuilder("{");
 			for (int i = 0; i < Array.getLength(value); i++) {
 				if (i > 0) {
 					builder.append(", ");
 				}
 				builder.append(toString(Array.get(value, i)));
 			}
-			builder.append(']');
+			builder.append('}');
 			return builder.toString();
 		}
 		return String.valueOf(value);
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index 0c7708eee4be..0b92547863ed 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
 import javax.annotation.Resource;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.JRE;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.MergedAnnotation.Adapt;
@@ -1861,20 +1862,41 @@ void toStringForSynthesizedAnnotations() throws Exception {
 		Method methodWithPath = WebController.class.getMethod("handleMappedWithPathAttribute");
 		RequestMapping webMappingWithAliases = methodWithPath.getAnnotation(RequestMapping.class);
 		assertThat(webMappingWithAliases).isNotNull();
+
 		Method methodWithPathAndValue = WebController.class.getMethod("handleMappedWithSamePathAndValueAttributes");
 		RequestMapping webMappingWithPathAndValue = methodWithPathAndValue.getAnnotation(RequestMapping.class);
 		assertThat(methodWithPathAndValue).isNotNull();
+
 		RequestMapping synthesizedWebMapping1 = MergedAnnotation.from(webMappingWithAliases).synthesize();
 		RequestMapping synthesizedWebMapping2 = MergedAnnotation.from(webMappingWithPathAndValue).synthesize();
+
 		assertThat(webMappingWithAliases.toString()).isNotEqualTo(synthesizedWebMapping1.toString());
+
+		if (JRE.currentVersion().ordinal() > JRE.JAVA_8.ordinal()) {
+			// The unsynthesized annotation for handleMappedWithSamePathAndValueAttributes()
+			// should produce the same toString() results as synthesized annotations for
+			// handleMappedWithPathAttribute() on Java 9 or higher
+			assertToStringForWebMappingWithPathAndValue(webMappingWithPathAndValue);
+		}
 		assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping1);
 		assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping2);
 	}
 
 	private void assertToStringForWebMappingWithPathAndValue(RequestMapping webMapping) {
-		String prefix = "@" + RequestMapping.class.getName() + "(";
-		assertThat(webMapping.toString()).startsWith(prefix).contains("value=[/test]",
-				"path=[/test]", "name=bar", "method=", "[GET, POST]").endsWith(")");
+		String string = webMapping.toString();
+
+		// Formatting common to Spring and JDK 9+
+		assertThat(string)
+			.startsWith("@" + RequestMapping.class.getName() + "(")
+			.contains("value={\"/test\"}", "path={\"/test\"}", "name=\"bar\"", "clazz=java.lang.Object.class")
+			.endsWith(")");
+
+		if (webMapping instanceof SynthesizedAnnotation) {
+			assertThat(string).as("Spring uses Enum#name()").contains("method={GET, POST}");
+		}
+		else {
+			assertThat(string).as("JDK uses Enum#toString()").contains("method={method: get, method: post}");
+		}
 	}
 
 	@Test
@@ -2941,7 +2963,17 @@ static class SubSubMyRepeatableWithAdditionalLocalDeclarationsClass
 	}
 
 	enum RequestMethod {
-		GET, POST
+		GET,
+
+		POST;
+
+		/**
+		 * custom override to verify annotation toString() implementations.
+		 */
+		@Override
+		public String toString() {
+			return "method: " + name().toLowerCase();
+		}
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
@@ -2956,6 +2988,9 @@ enum RequestMethod {
 		String[] path() default "";
 
 		RequestMethod[] method() default {};
+
+		// clazz is only used for testing annotation toString() implementations
+		Class<?> clazz() default Object.class;
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)

From 839cc5f7f863669b0e8d59eb81fcc716f2712b79 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 8 Feb 2022 14:19:32 +0100
Subject: [PATCH 660/735] Remove unnecessary JDK 9+ check in
 MergedAnnotationsTests

---
 .../core/annotation/MergedAnnotationsTests.java       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index c1c293604e56..435a99a5adca 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -37,7 +37,6 @@
 
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.JRE;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.MergedAnnotation.Adapt;
@@ -1871,12 +1870,10 @@ void toStringForSynthesizedAnnotations() throws Exception {
 
 		assertThat(webMappingWithAliases.toString()).isNotEqualTo(synthesizedWebMapping1.toString());
 
-		if (JRE.currentVersion().ordinal() > JRE.JAVA_8.ordinal()) {
-			// The unsynthesized annotation for handleMappedWithSamePathAndValueAttributes()
-			// should produce the same toString() results as synthesized annotations for
-			// handleMappedWithPathAttribute() on Java 9 or higher
-			assertToStringForWebMappingWithPathAndValue(webMappingWithPathAndValue);
-		}
+		// The unsynthesized annotation for handleMappedWithSamePathAndValueAttributes()
+		// should produce the same toString() results as synthesized annotations for
+		// handleMappedWithPathAttribute() on Java 9 or higher
+		assertToStringForWebMappingWithPathAndValue(webMappingWithPathAndValue);
 		assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping1);
 		assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping2);
 	}

From 1deb6b04b86888d716b3e1bf53245d21e424c3ee Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 8 Feb 2022 14:27:08 +0100
Subject: [PATCH 661/735] Apply "instanceof pattern matching" in
 SynthesizedMergedAnnotationInvocationHandler

---
 ...izedMergedAnnotationInvocationHandler.java | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
index 6838dc377973..3d0ef51ab5c6 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
@@ -144,32 +144,32 @@ private Integer computeHashCode() {
 	private int getValueHashCode(Object value) {
 		// Use Arrays.hashCode(...) since Spring's ObjectUtils doesn't comply
 		// with the requirements specified in Annotation#hashCode().
-		if (value instanceof boolean[]) {
-			return Arrays.hashCode((boolean[]) value);
+		if (value instanceof boolean[] booleans) {
+			return Arrays.hashCode(booleans);
 		}
-		if (value instanceof byte[]) {
-			return Arrays.hashCode((byte[]) value);
+		if (value instanceof byte[] bytes) {
+			return Arrays.hashCode(bytes);
 		}
-		if (value instanceof char[]) {
-			return Arrays.hashCode((char[]) value);
+		if (value instanceof char[] chars) {
+			return Arrays.hashCode(chars);
 		}
-		if (value instanceof double[]) {
-			return Arrays.hashCode((double[]) value);
+		if (value instanceof double[] doubles) {
+			return Arrays.hashCode(doubles);
 		}
-		if (value instanceof float[]) {
-			return Arrays.hashCode((float[]) value);
+		if (value instanceof float[] floats) {
+			return Arrays.hashCode(floats);
 		}
-		if (value instanceof int[]) {
-			return Arrays.hashCode((int[]) value);
+		if (value instanceof int[] ints) {
+			return Arrays.hashCode(ints);
 		}
-		if (value instanceof long[]) {
-			return Arrays.hashCode((long[]) value);
+		if (value instanceof long[] longs) {
+			return Arrays.hashCode(longs);
 		}
-		if (value instanceof short[]) {
-			return Arrays.hashCode((short[]) value);
+		if (value instanceof short[] shorts) {
+			return Arrays.hashCode(shorts);
 		}
-		if (value instanceof Object[]) {
-			return Arrays.hashCode((Object[]) value);
+		if (value instanceof Object[] objects) {
+			return Arrays.hashCode(objects);
 		}
 		return value.hashCode();
 	}
@@ -195,14 +195,14 @@ private String annotationToString() {
 	}
 
 	private String toString(Object value) {
-		if (value instanceof String) {
-			return '"' + value.toString() + '"';
+		if (value instanceof String str) {
+			return '"' + str + '"';
 		}
-		if (value instanceof Enum) {
-			return ((Enum<?>) value).name();
+		if (value instanceof Enum<?> e) {
+			return e.name();
 		}
-		if (value instanceof Class) {
-			return ((Class<?>) value).getName() + ".class";
+		if (value instanceof Class<?> clazz) {
+			return clazz.getName() + ".class";
 		}
 		if (value.getClass().isArray()) {
 			StringBuilder builder = new StringBuilder("{");
@@ -239,29 +239,29 @@ private Object getAttributeValue(Method method) {
 	 * @param array the array to clone
 	 */
 	private Object cloneArray(Object array) {
-		if (array instanceof boolean[]) {
-			return ((boolean[]) array).clone();
+		if (array instanceof boolean[] booleans) {
+			return booleans.clone();
 		}
-		if (array instanceof byte[]) {
-			return ((byte[]) array).clone();
+		if (array instanceof byte[] bytes) {
+			return bytes.clone();
 		}
-		if (array instanceof char[]) {
-			return ((char[]) array).clone();
+		if (array instanceof char[] chars) {
+			return chars.clone();
 		}
-		if (array instanceof double[]) {
-			return ((double[]) array).clone();
+		if (array instanceof double[] doubles) {
+			return doubles.clone();
 		}
-		if (array instanceof float[]) {
-			return ((float[]) array).clone();
+		if (array instanceof float[] floats) {
+			return floats.clone();
 		}
-		if (array instanceof int[]) {
-			return ((int[]) array).clone();
+		if (array instanceof int[] ints) {
+			return ints.clone();
 		}
-		if (array instanceof long[]) {
-			return ((long[]) array).clone();
+		if (array instanceof long[] longs) {
+			return longs.clone();
 		}
-		if (array instanceof short[]) {
-			return ((short[]) array).clone();
+		if (array instanceof short[] shorts) {
+			return shorts.clone();
 		}
 
 		// else

From 5c60a721a7ab81f50e9b88a031bc8a1d3e17ccb4 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 8 Feb 2022 16:26:37 +0100
Subject: [PATCH 662/735] Upgrade to Gradle 7.4

Closes gh-28020
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e5897b528..41dfb87909a8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From d2c7dfb79ee62900a0c5ded12768fc18458d765a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 10 Feb 2022 12:37:19 +0100
Subject: [PATCH 663/735] Add convenience factory method for
 Managed[List|Set|Map]

Closes gh-28026
---
 .../beans/factory/support/ManagedList.java    | 17 +++++++++++-
 .../beans/factory/support/ManagedMap.java     | 22 +++++++++++++++-
 .../beans/factory/support/ManagedSet.java     | 17 +++++++++++-
 .../DefaultListableBeanFactoryTests.java      |  8 ++----
 .../PropertyResourceConfigurerTests.java      | 21 +++++++--------
 .../factory/support/ManagedListTests.java     | 26 ++++++-------------
 .../factory/support/ManagedMapTests.java      | 24 +++++++----------
 .../factory/support/ManagedSetTests.java      | 25 ++++++------------
 .../servlet/ComplexWebApplicationContext.java |  6 ++---
 9 files changed, 92 insertions(+), 74 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
index 7a282ed7fce6..28146701944c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.beans.factory.support;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.beans.BeanMetadataElement;
@@ -53,6 +54,20 @@ public ManagedList(int initialCapacity) {
 	}
 
 
+	/**
+	 * Return a new instance containing an arbitrary number of elements.
+	 * @param elements the elements to be contained in the list
+	 * @param <E> the {@code List}'s element type
+	 * @return a {@code List} containing the specified elements
+	 * @since 5.3.16
+	 */
+	@SuppressWarnings("unchecked")
+	public static <E> ManagedList<E> of(E... elements) {
+		ManagedList<E> list = new ManagedList<>();
+		list.addAll(Arrays.asList(elements));
+		return list;
+	}
+
 	/**
 	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
index 55b76f0317f0..acd80074bf7b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.Mergeable;
@@ -56,6 +57,25 @@ public ManagedMap(int initialCapacity) {
 	}
 
 
+	/**
+	 * Return a new instance containing keys and values extracted from the
+	 * given entries. The entries themselves are not stored in the map.
+	 * @param entries {@code Map.Entry}s containing the keys and values
+	 * from which the map is populated
+	 * @param <K> the {@code Map}'s key type
+	 * @param <V> the {@code Map}'s value type
+	 * @return a {@code Map} containing the specified mappings
+	 * @since 5.3.16
+	 */
+	@SuppressWarnings("unchecked")
+	public static <K,V> ManagedMap<K,V> ofEntries(Entry<? extends K, ? extends V>... entries) {
+		ManagedMap<K,V > map = new ManagedMap<>();
+		for (Entry<? extends K, ? extends V> entry : entries) {
+			map.put(entry.getKey(), entry.getValue());
+		}
+		return map;
+	}
+
 	/**
 	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
index 7f84ec7f4456..f5c72462379d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.beans.factory.support;
 
+import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -52,6 +53,20 @@ public ManagedSet(int initialCapacity) {
 	}
 
 
+	/**
+	 * Return a new instance containing an arbitrary number of elements.
+	 * @param elements the elements to be contained in the set
+	 * @param <E> the {@code Set}'s element type
+	 * @return a {@code Set} containing the specified elements
+	 * @since 5.3.16
+	 */
+	@SuppressWarnings("unchecked")
+	public static <E> ManagedSet<E> of(E... elements) {
+		ManagedSet<E> set = new ManagedSet<>();
+		set.addAll(Arrays.asList(elements));
+		return set;
+	}
+
 	/**
 	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index d76579eaf218..cbf9983dc0b6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -2298,9 +2298,7 @@ void prototypeStringCreatedRepeatedly() {
 
 	@Test
 	void prototypeWithArrayConversionForConstructor() {
-		List<String> list = new ManagedList<>();
-		list.add("myName");
-		list.add("myBeanName");
+		List<String> list = ManagedList.of("myName", "myBeanName");
 		RootBeanDefinition bd = new RootBeanDefinition(DerivedTestBean.class);
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		bd.getConstructorArgumentValues().addGenericArgumentValue(list);
@@ -2316,9 +2314,7 @@ void prototypeWithArrayConversionForConstructor() {
 
 	@Test
 	void prototypeWithArrayConversionForFactoryMethod() {
-		List<String> list = new ManagedList<>();
-		list.add("myName");
-		list.add("myBeanName");
+		List<String> list = ManagedList.of("myName", "myBeanName");
 		RootBeanDefinition bd = new RootBeanDefinition(DerivedTestBean.class);
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		bd.setFactoryMethodName("create");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
index 29ecb68699be..e51017df5d5b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.beans.factory.config;
 
+import java.util.AbstractMap.SimpleEntry;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -357,22 +358,18 @@ private void doTestPropertyPlaceholderConfigurer(boolean parentChildSeparation)
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("stringArray", new String[] {"${os.name}", "${age}"});
 
-		List<Object> friends = new ManagedList<>();
-		friends.add("na${age}me");
-		friends.add(new RuntimeBeanReference("${ref}"));
+		List<Object> friends = ManagedList.of("na${age}me", new RuntimeBeanReference("${ref}"));
 		pvs.add("friends", friends);
 
-		Set<Object> someSet = new ManagedSet<>();
-		someSet.add("na${age}me");
-		someSet.add(new RuntimeBeanReference("${ref}"));
-		someSet.add(new TypedStringValue("${age}", Integer.class));
+		Set<Object> someSet = ManagedSet.of("na${age}me",
+				new RuntimeBeanReference("${ref}"), new TypedStringValue("${age}", Integer.class));
 		pvs.add("someSet", someSet);
 
-		Map<Object, Object> someMap = new ManagedMap<>();
-		someMap.put(new TypedStringValue("key${age}"), new TypedStringValue("${age}"));
-		someMap.put(new TypedStringValue("key${age}ref"), new RuntimeBeanReference("${ref}"));
-		someMap.put("key1", new RuntimeBeanReference("${ref}"));
-		someMap.put("key2", "${age}name");
+		Map<Object, Object> someMap = ManagedMap.ofEntries(
+				new SimpleEntry<>(new TypedStringValue("key${age}"), new TypedStringValue("${age}")),
+				new SimpleEntry<>(new TypedStringValue("key${age}ref"), new RuntimeBeanReference("${ref}")),
+				new SimpleEntry<>("key1", new RuntimeBeanReference("${ref}")),
+				new SimpleEntry<>("key2", "${age}name"));
 		MutablePropertyValues innerPvs = new MutablePropertyValues();
 		innerPvs.add("country", "${os.name}");
 		RootBeanDefinition innerBd = new RootBeanDefinition(TestBean.class);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
index 9bf6576d518c..420226d173ad 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,11 +34,8 @@ public class ManagedListTests {
 
 	@Test
 	public void mergeSunnyDay() {
-		ManagedList parent = new ManagedList();
-		parent.add("one");
-		parent.add("two");
-		ManagedList child = new ManagedList();
-		child.add("three");
+		ManagedList parent = ManagedList.of("one", "two");
+		ManagedList child = ManagedList.of("three");
 		child.setMergeEnabled(true);
 		List mergedList = child.merge(parent);
 		assertThat(mergedList.size()).as("merge() obviously did not work.").isEqualTo(3);
@@ -46,8 +43,7 @@ public void mergeSunnyDay() {
 
 	@Test
 	public void mergeWithNullParent() {
-		ManagedList child = new ManagedList();
-		child.add("one");
+		ManagedList child = ManagedList.of("one");
 		child.setMergeEnabled(true);
 		assertThat(child.merge(null)).isSameAs(child);
 	}
@@ -61,8 +57,7 @@ public void mergeNotAllowedWhenMergeNotEnabled() {
 
 	@Test
 	public void mergeWithNonCompatibleParentType() {
-		ManagedList child = new ManagedList();
-		child.add("one");
+		ManagedList child = ManagedList.of("one");
 		child.setMergeEnabled(true);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				child.merge("hello"));
@@ -70,9 +65,7 @@ public void mergeWithNonCompatibleParentType() {
 
 	@Test
 	public void mergeEmptyChild() {
-		ManagedList parent = new ManagedList();
-		parent.add("one");
-		parent.add("two");
+		ManagedList parent = ManagedList.of("one", "two");
 		ManagedList child = new ManagedList();
 		child.setMergeEnabled(true);
 		List mergedList = child.merge(parent);
@@ -82,11 +75,8 @@ public void mergeEmptyChild() {
 	@Test
 	public void mergeChildValuesOverrideTheParents() {
 		// doesn't make much sense in the context of a list...
-		ManagedList parent = new ManagedList();
-		parent.add("one");
-		parent.add("two");
-		ManagedList child = new ManagedList();
-		child.add("one");
+		ManagedList parent = ManagedList.of("one", "two");
+		ManagedList child = ManagedList.of("one");
 		child.setMergeEnabled(true);
 		List mergedList = child.merge(parent);
 		assertThat(mergedList.size()).as("merge() obviously did not work.").isEqualTo(3);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
index 1f6dc5e416a4..b83fa176d311 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.beans.factory.support;
 
+import java.util.AbstractMap.SimpleEntry;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
@@ -34,11 +35,9 @@ public class ManagedMapTests {
 
 	@Test
 	public void mergeSunnyDay() {
-		ManagedMap parent = new ManagedMap();
-		parent.put("one", "one");
-		parent.put("two", "two");
-		ManagedMap child = new ManagedMap();
-		child.put("three", "three");
+		ManagedMap parent = ManagedMap.ofEntries(new SimpleEntry<>("one", "one"),
+				new SimpleEntry<>("two", "two"));
+		ManagedMap child = ManagedMap.ofEntries(new SimpleEntry<>("tree", "three"));
 		child.setMergeEnabled(true);
 		Map mergedMap = (Map) child.merge(parent);
 		assertThat(mergedMap.size()).as("merge() obviously did not work.").isEqualTo(3);
@@ -67,9 +66,8 @@ public void mergeNotAllowedWhenMergeNotEnabled() {
 
 	@Test
 	public void mergeEmptyChild() {
-		ManagedMap parent = new ManagedMap();
-		parent.put("one", "one");
-		parent.put("two", "two");
+		ManagedMap parent = ManagedMap.ofEntries(new SimpleEntry<>("one", "one"),
+				new SimpleEntry<>("two", "two"));
 		ManagedMap child = new ManagedMap();
 		child.setMergeEnabled(true);
 		Map mergedMap = (Map) child.merge(parent);
@@ -78,11 +76,9 @@ public void mergeEmptyChild() {
 
 	@Test
 	public void mergeChildValuesOverrideTheParents() {
-		ManagedMap parent = new ManagedMap();
-		parent.put("one", "one");
-		parent.put("two", "two");
-		ManagedMap child = new ManagedMap();
-		child.put("one", "fork");
+		ManagedMap parent = ManagedMap.ofEntries(new SimpleEntry<>("one", "one"),
+				new SimpleEntry<>("two", "two"));
+		ManagedMap child = ManagedMap.ofEntries(new SimpleEntry<>("one", "fork"));
 		child.setMergeEnabled(true);
 		Map mergedMap = (Map) child.merge(parent);
 		// child value for 'one' must override parent value...
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
index 39c08997814c..c11a63a6da83 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,10 +34,8 @@ public class ManagedSetTests {
 
 	@Test
 	public void mergeSunnyDay() {
-		ManagedSet parent = new ManagedSet();
-		parent.add("one");
-		parent.add("two");
-		ManagedSet child = new ManagedSet();
+		ManagedSet parent = ManagedSet.of("one", "two");
+		ManagedSet child = ManagedSet.of("three");
 		child.add("three");
 		child.setMergeEnabled(true);
 		Set mergedSet = child.merge(parent);
@@ -46,8 +44,7 @@ public void mergeSunnyDay() {
 
 	@Test
 	public void mergeWithNullParent() {
-		ManagedSet child = new ManagedSet();
-		child.add("one");
+		ManagedSet child = ManagedSet.of("one");
 		child.setMergeEnabled(true);
 		assertThat(child.merge(null)).isSameAs(child);
 	}
@@ -60,8 +57,7 @@ public void mergeNotAllowedWhenMergeNotEnabled() {
 
 	@Test
 	public void mergeWithNonCompatibleParentType() {
-		ManagedSet child = new ManagedSet();
-		child.add("one");
+		ManagedSet child = ManagedSet.of("one");
 		child.setMergeEnabled(true);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				child.merge("hello"));
@@ -69,9 +65,7 @@ public void mergeWithNonCompatibleParentType() {
 
 	@Test
 	public void mergeEmptyChild() {
-		ManagedSet parent = new ManagedSet();
-		parent.add("one");
-		parent.add("two");
+		ManagedSet parent = ManagedSet.of("one", "two");
 		ManagedSet child = new ManagedSet();
 		child.setMergeEnabled(true);
 		Set mergedSet = child.merge(parent);
@@ -81,11 +75,8 @@ public void mergeEmptyChild() {
 	@Test
 	public void mergeChildValuesOverrideTheParents() {
 		// asserts that the set contract is not violated during a merge() operation...
-		ManagedSet parent = new ManagedSet();
-		parent.add("one");
-		parent.add("two");
-		ManagedSet child = new ManagedSet();
-		child.add("one");
+		ManagedSet parent = ManagedSet.of("one", "two");
+		ManagedSet child = ManagedSet.of("one");
 		child.setMergeEnabled(true);
 		Set mergedSet = child.merge(parent);
 		assertThat(mergedSet.size()).as("merge() obviously did not work.").isEqualTo(2);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
index be08292460d1..3b1d2c944630 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -158,9 +158,7 @@ public void refresh() throws BeansException {
 		pvs = new MutablePropertyValues();
 		pvs.add("order", "0");
 		pvs.add("exceptionMappings", "java.lang.Exception=failed1");
-		List<RuntimeBeanReference> mappedHandlers = new ManagedList<>();
-		mappedHandlers.add(new RuntimeBeanReference("anotherLocaleHandler"));
-		pvs.add("mappedHandlers", mappedHandlers);
+		pvs.add("mappedHandlers", ManagedList.of(new RuntimeBeanReference("anotherLocaleHandler")));
 		pvs.add("defaultStatusCode", "500");
 		pvs.add("defaultErrorView", "failed2");
 		registerSingleton("handlerExceptionResolver", SimpleMappingExceptionResolver.class, pvs);

From 97582fd0a1f786c2cde12ba2af8196e423d47d87 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 9 Feb 2022 15:56:17 +0100
Subject: [PATCH 664/735] Update Eclipse template to @since 5.3.16

---
 src/eclipse/org.eclipse.jdt.ui.prefs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eclipse/org.eclipse.jdt.ui.prefs b/src/eclipse/org.eclipse.jdt.ui.prefs
index 1685154bbab8..ad75f7c7f2d3 100644
--- a/src/eclipse/org.eclipse.jdt.ui.prefs
+++ b/src/eclipse/org.eclipse.jdt.ui.prefs
@@ -63,4 +63,4 @@ org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=9999
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=9999
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 5.3.11\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 5.3.16\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

From dfae8effa8c26ab69cf7b237b3c2fdd382f64b75 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 6 Jan 2022 14:52:48 +0100
Subject: [PATCH 665/735] Repackage Javapoet in org.springframework.javapoet

This commit repackages the Javapoet library into spring-core so that it
can be used by the AOT engine without requiring a specific version.

Closes gh-27828
---
 spring-core/spring-core.gradle                | 23 ++++++++++++++++---
 .../javapoet/package-info.java                |  6 +++++
 src/docs/dist/license.txt                     |  8 +++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 spring-core/src/main/java/org/springframework/javapoet/package-info.java

diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index ed8730d957b6..452905bdf92a 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -4,14 +4,17 @@ description = "Spring Core"
 
 apply plugin: "kotlin"
 
-// spring-core includes asm and repackages cglib, inlining both into the spring-core jar.
-// cglib itself depends on asm and is therefore further transformed by the ShadowJar task to
-// depend on org.springframework.asm; this avoids including two different copies of asm.
+// spring-core includes asm, javapoet and repackages cglib, inlining all into the
+// spring-core jar. cglib itself depends on asm and is therefore further transformed by
+// the ShadowJar task to depend on org.springframework.asm; this avoids including two
+// different copies of asm.
 def cglibVersion = "3.3.0"
+def javapoetVersion = "1.13.0"
 def objenesisVersion = "3.2"
 
 configurations {
 	cglib
+	javapoet
 	objenesis
 }
 
@@ -23,6 +26,13 @@ task cglibRepackJar(type: ShadowJar) {
 	relocate 'org.objectweb.asm', 'org.springframework.asm'
 }
 
+task javapoetRepackJar(type: ShadowJar) {
+	archiveBaseName.set('spring-javapoet-repack')
+	archiveVersion.set(javapoetVersion)
+	configurations = [project.configurations.javapoet]
+	relocate 'com.squareup.javapoet', 'org.springframework.javapoet'
+}
+
 task objenesisRepackJar(type: ShadowJar) {
 	archiveBaseName.set('spring-objenesis-repack')
 	archiveVersion.set(objenesisVersion)
@@ -32,8 +42,10 @@ task objenesisRepackJar(type: ShadowJar) {
 
 dependencies {
 	cglib("cglib:cglib:${cglibVersion}@jar")
+	javapoet("com.squareup:javapoet:${javapoetVersion}@jar")
 	objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
 	api(files(cglibRepackJar))
+	api(files(javapoetRepackJar))
 	api(files(objenesisRepackJar))
 	api(project(":spring-jcl"))
 	compileOnly("io.projectreactor.tools:blockhound")
@@ -83,6 +95,11 @@ jar {
 		exclude "org/springframework/cglib/proxy/MethodProxy*.class"
 	}
 
+	dependsOn javapoetRepackJar
+	from(zipTree(javapoetRepackJar.archivePath)) {
+		include "org/springframework/javapoet/**"
+	}
+
 	dependsOn objenesisRepackJar
 	from(zipTree(objenesisRepackJar.archivePath)) {
 		include "org/springframework/objenesis/**"
diff --git a/spring-core/src/main/java/org/springframework/javapoet/package-info.java b/spring-core/src/main/java/org/springframework/javapoet/package-info.java
new file mode 100644
index 000000000000..5f7f7c3ff6ee
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/javapoet/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Spring's repackaging of
+ * <a href="https://github.com/square/javapoet">JavaPoet</a>
+ * (with Spring-specific utilities; for internal use only).
+ */
+package org.springframework.javapoet;
diff --git a/src/docs/dist/license.txt b/src/docs/dist/license.txt
index c68e1154b170..2170aa9784a1 100644
--- a/src/docs/dist/license.txt
+++ b/src/docs/dist/license.txt
@@ -255,6 +255,14 @@ CGLIB 3.3 is licensed under the Apache License, version 2.0, the text of which
 is included above.
 
 
+>>> JavaPoet 1.13.0 (com.squareup:javapoet:1.13.0):
+
+Per the LICENSE file in the CGLIB JAR distribution downloaded from
+https://github.com/square/javapoet/archive/refs/tags/javapoet-1.13.0.zip,
+JavaPoet 1.13.0 is licensed under the Apache License, version 2.0, the text of
+which is included above.
+
+
 >>> Objenesis 3.1 (org.objenesis:objenesis:3.1):
 
 Per the LICENSE file in the Objenesis ZIP distribution downloaded from

From b3ceb0f625a5b40d1007bb4dfe673be497fc2c9e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 10 Feb 2022 14:57:37 +0100
Subject: [PATCH 666/735] Add core JavaPoet utilities

This commit adds utilities that facilitate code generation patterns
used by the AOT engine.

Closes gh-28028
---
 .../javapoet/support/CodeSnippet.java         | 188 +++++++++++++++++
 .../javapoet/support/MultiCodeBlock.java      |  82 ++++++++
 .../javapoet/support/MultiStatement.java      | 194 ++++++++++++++++++
 .../javapoet/support/package-info.java        |   9 +
 .../javapoet/support/CodeSnippetTests.java    |  75 +++++++
 .../javapoet/support/MultiCodeBlockTests.java |  61 ++++++
 .../javapoet/support/MultiStatementTests.java | 131 ++++++++++++
 7 files changed, 740 insertions(+)
 create mode 100644 spring-core/src/main/java/org/springframework/javapoet/support/CodeSnippet.java
 create mode 100644 spring-core/src/main/java/org/springframework/javapoet/support/MultiCodeBlock.java
 create mode 100644 spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java
 create mode 100644 spring-core/src/main/java/org/springframework/javapoet/support/package-info.java
 create mode 100644 spring-core/src/test/java/org/springframework/javapoet/support/CodeSnippetTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/javapoet/support/MultiCodeBlockTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/javapoet/support/MultiStatementTests.java

diff --git a/spring-core/src/main/java/org/springframework/javapoet/support/CodeSnippet.java b/spring-core/src/main/java/org/springframework/javapoet/support/CodeSnippet.java
new file mode 100644
index 000000000000..ba2f47815cb7
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/javapoet/support/CodeSnippet.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2002-2022 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.javapoet.support;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import javax.lang.model.element.Modifier;
+
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.JavaFile;
+import org.springframework.javapoet.MethodSpec;
+import org.springframework.javapoet.TypeSpec;
+
+/**
+ * A code snippet using tabs indentation that is fully processed by JavaPoet so
+ * that imports are resolved.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class CodeSnippet {
+
+	private static final String START_SNIPPET = "// start-snippet\n";
+
+	private static final String END_SNIPPET = "// end-snippet";
+
+	private final String fileContent;
+
+	private final String snippet;
+
+
+	CodeSnippet(String fileContent, String snippet) {
+		this.fileContent = fileContent;
+		this.snippet = snippet;
+	}
+
+
+	String getFileContent() {
+		return this.fileContent;
+	}
+
+	/**
+	 * Return the rendered code snippet.
+	 * @return a code snippet where imports have been resolved
+	 */
+	public String getSnippet() {
+		return this.snippet;
+	}
+
+	/**
+	 * Specify if an import statement for the specified type is present.
+	 * @param type the type to check
+	 * @return true if this type has an import statement, false otherwise
+	 */
+	public boolean hasImport(Class<?> type) {
+		return hasImport(type.getName());
+	}
+
+	/**
+	 * Specify if an import statement for the specified class name is present.
+	 * @param className the name of the class to check
+	 * @return true if this type has an import statement, false otherwise
+	 */
+	public boolean hasImport(String className) {
+		return getFileContent().lines().anyMatch(candidate ->
+				candidate.equals(String.format("import %s;", className)));
+	}
+
+	/**
+	 * Return a new {@link CodeSnippet} where the specified number of indentations
+	 * have been removed.
+	 * @param indent the number of indent to remove
+	 * @return a CodeSnippet instance with the number of indentations removed
+	 */
+	public CodeSnippet removeIndent(int indent) {
+		return new CodeSnippet(this.fileContent, this.snippet.lines().map(line ->
+				removeIndent(line, indent)).collect(Collectors.joining("\n")));
+	}
+
+	/**
+	 * Create a {@link CodeSnippet} using the specified code.
+	 * @param code the code snippet
+	 * @return a {@link CodeSnippet} instance
+	 */
+	public static CodeSnippet of(CodeBlock code) {
+		return new Builder().build(code);
+	}
+
+	/**
+	 * Process the specified code and return a fully-processed code snippet
+	 * as a String.
+	 * @param code a consumer to use to generate the code snippet
+	 * @return a resolved code snippet
+	 */
+	public static String process(Consumer<CodeBlock.Builder> code) {
+		CodeBlock.Builder body = CodeBlock.builder();
+		code.accept(body);
+		return process(body.build());
+	}
+
+	/**
+	 * Process the specified {@link CodeBlock code} and return a
+	 * fully-processed code snippet as a String.
+	 * @param code the code snippet
+	 * @return a resolved code snippet
+	 */
+	public static String process(CodeBlock code) {
+		return of(code).getSnippet();
+	}
+
+	private String removeIndent(String line, int indent) {
+		for (int i = 0; i < indent; i++) {
+			if (line.startsWith("\t")) {
+				line = line.substring(1);
+			}
+		}
+		return line;
+	}
+
+	private static final class Builder {
+
+		private static final String INDENT = "\t";
+
+		private static final String SNIPPET_INDENT = INDENT + INDENT;
+
+		public CodeSnippet build(CodeBlock code) {
+			MethodSpec.Builder method = MethodSpec.methodBuilder("test")
+					.addModifiers(Modifier.PUBLIC);
+			CodeBlock.Builder body = CodeBlock.builder();
+			body.add(START_SNIPPET);
+			body.add(code);
+			body.add(END_SNIPPET);
+			method.addCode(body.build());
+			String fileContent = write(createTestJavaFile(method.build()));
+			String snippet = isolateGeneratedContent(fileContent);
+			return new CodeSnippet(fileContent, snippet);
+		}
+
+		private String isolateGeneratedContent(String javaFile) {
+			int start = javaFile.indexOf(START_SNIPPET);
+			String tmp = javaFile.substring(start + START_SNIPPET.length());
+			int end = tmp.indexOf(END_SNIPPET);
+			tmp = tmp.substring(0, end);
+			// Remove indent
+			return tmp.lines().map(line -> {
+				if (!line.startsWith(SNIPPET_INDENT)) {
+					throw new IllegalStateException("Missing indent for " + line);
+				}
+				return line.substring(SNIPPET_INDENT.length());
+			}).collect(Collectors.joining("\n"));
+		}
+
+		private JavaFile createTestJavaFile(MethodSpec method) {
+			return JavaFile.builder("example", TypeSpec.classBuilder("Test")
+					.addModifiers(Modifier.PUBLIC)
+					.addMethod(method).build()).indent(INDENT).build();
+		}
+
+		private String write(JavaFile file) {
+			try {
+				StringWriter out = new StringWriter();
+				file.writeTo(out);
+				return out.toString();
+			}
+			catch (IOException ex) {
+				throw new IllegalStateException("Failed to write " + file, ex);
+			}
+		}
+
+	}
+}
diff --git a/spring-core/src/main/java/org/springframework/javapoet/support/MultiCodeBlock.java b/spring-core/src/main/java/org/springframework/javapoet/support/MultiCodeBlock.java
new file mode 100644
index 000000000000..f1391b62d5a6
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/javapoet/support/MultiCodeBlock.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2002-2022 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.javapoet.support;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.CodeBlock.Builder;
+
+
+/**
+ * A {@link CodeBlock} wrapper for joining multiple blocks.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class MultiCodeBlock {
+
+	private final List<CodeBlock> codeBlocks = new ArrayList<>();
+
+
+	/**
+	 * Add the specified {@link CodeBlock}.
+	 * @param code the code block to add
+	 */
+	public void add(CodeBlock code) {
+		if (code.isEmpty()) {
+			throw new IllegalArgumentException("Could not add empty CodeBlock");
+		}
+		this.codeBlocks.add(code);
+	}
+
+	/**
+	 * Add a {@link CodeBlock} using the specified callback.
+	 * @param code the callback to use
+	 */
+	public void add(Consumer<Builder> code) {
+		Builder builder = CodeBlock.builder();
+		code.accept(builder);
+		add(builder.build());
+	}
+
+	/**
+	 * Add a code block using the specified formatted String and the specified
+	 * arguments.
+	 * @param code the code
+	 * @param arguments the arguments
+	 * @see Builder#add(String, Object...)
+	 */
+	public void add(String code, Object... arguments) {
+		add(CodeBlock.of(code, arguments));
+	}
+
+	/**
+	 * Return a {@link CodeBlock} that joins the different blocks registered in
+	 * this instance with the specified delimiter.
+	 * @param delimiter the delimiter to use (not {@literal null})
+	 * @return a {@link CodeBlock} joining the blocks of this instance with the
+	 * specified {@code delimiter}
+	 * @see CodeBlock#join(Iterable, String)
+	 */
+	public CodeBlock join(String delimiter) {
+		return CodeBlock.join(this.codeBlocks, delimiter);
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java b/spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java
new file mode 100644
index 000000000000..04bd02071e26
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2002-2022 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.javapoet.support;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.CodeBlock.Builder;
+
+
+/**
+ * A {@link CodeBlock} wrapper for multiple statements.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class MultiStatement {
+
+	private final List<Statement> statements = new ArrayList<>();
+
+
+	/**
+	 * Specify if this instance is empty.
+	 * @return {@code true} if no statement is registered, {@code false} otherwise
+	 */
+	public boolean isEmpty() {
+		return this.statements.isEmpty();
+	}
+
+	/**
+	 * Add the specified {@link CodeBlock codeblock} rendered as-is.
+	 * @param codeBlock the code block to add
+	 * @see #addStatement(CodeBlock) to add a code block that represents
+	 * a statement
+	 */
+	public void add(CodeBlock codeBlock) {
+		this.statements.add(Statement.of(codeBlock));
+	}
+
+	/**
+	 * Add a {@link CodeBlock} rendered as-is using the specified callback.
+	 * @param code the callback to use
+	 * @see #addStatement(CodeBlock) to add a code block that represents
+	 * a statement
+	 */
+	public void add(Consumer<Builder> code) {
+		CodeBlock.Builder builder = CodeBlock.builder();
+		code.accept(builder);
+		add(builder.build());
+	}
+
+	/**
+	 * Add a statement.
+	 * @param statement the statement to add
+	 */
+	public void addStatement(CodeBlock statement) {
+		this.statements.add(Statement.ofStatement(statement));
+	}
+
+	/**
+	 * Add a statement using the specified callback.
+	 * @param code the callback to use
+	 */
+	public void addStatement(Consumer<Builder> code) {
+		CodeBlock.Builder builder = CodeBlock.builder();
+		code.accept(builder);
+		addStatement(builder.build());
+	}
+
+	/**
+	 * Add a statement using the specified formatted String and the specified
+	 * arguments.
+	 * @param code the code of the statement
+	 * @param args the arguments for placeholders
+	 * @see CodeBlock#of(String, Object...)
+	 */
+	public void addStatement(String code, Object... args) {
+		addStatement(CodeBlock.of(code, args));
+	}
+
+	/**
+	 * Add the statements produced from the {@code itemGenerator} applied on the specified
+	 * items.
+	 * @param items the items to handle, each item is represented as a statement
+	 * @param itemGenerator the item generator
+	 * @param <T> the type of the item
+	 */
+	public <T> void addAll(Iterable<T> items, Function<T, CodeBlock> itemGenerator) {
+		items.forEach(element -> addStatement(itemGenerator.apply(element)));
+	}
+
+	/**
+	 * Return a {@link CodeBlock} that applies all the {@code statements} of this
+	 * instance. If only one statement is available, it is not completed using the
+	 * {@code ;} termination so that it can be used in the context of a lambda.
+	 * @return the statement(s)
+	 */
+	public CodeBlock toCodeBlock() {
+		Builder code = CodeBlock.builder();
+		for (int i = 0; i < this.statements.size(); i++) {
+			Statement statement = this.statements.get(i);
+			statement.contribute(code, this.isMulti(), i == this.statements.size() - 1);
+		}
+		return code.build();
+	}
+
+	/**
+	 * Return a {@link CodeBlock} that applies all the {@code statements} of this
+	 * instance in the context of a lambda.
+	 * @param lambda the context of the lambda, must end with {@code ->}
+	 * @return the lambda body
+	 */
+	public CodeBlock toCodeBlock(CodeBlock lambda) {
+		Builder code = CodeBlock.builder();
+		code.add(lambda);
+		if (isMulti()) {
+			code.beginControlFlow("");
+		}
+		else {
+			code.add(" ");
+		}
+		code.add(toCodeBlock());
+		if (isMulti()) {
+			code.add("\n").unindent().add("}");
+		}
+		return code.build();
+	}
+
+	/**
+	 * Return a {@link CodeBlock} that applies all the {@code statements} of this
+	 * instance in the context of a lambda.
+	 * @param lambda the context of the lambda, must end with {@code ->}
+	 * @return the lambda body
+	 */
+	public CodeBlock toCodeBlock(String lambda) {
+		return toCodeBlock(CodeBlock.of(lambda));
+	}
+
+	private boolean isMulti() {
+		return this.statements.size() > 1;
+	}
+
+
+	private static class Statement {
+
+		private final CodeBlock codeBlock;
+
+		private final boolean addStatementTermination;
+
+		Statement(CodeBlock codeBlock, boolean addStatementTermination) {
+			this.codeBlock = codeBlock;
+			this.addStatementTermination = addStatementTermination;
+		}
+
+		void contribute(CodeBlock.Builder code, boolean multi, boolean isLastStatement) {
+			code.add(this.codeBlock);
+			if (this.addStatementTermination) {
+				if (!isLastStatement) {
+					code.add(";\n");
+				}
+				else if (multi) {
+					code.add(";");
+				}
+			}
+		}
+
+		static Statement ofStatement(CodeBlock codeBlock) {
+			return new Statement(codeBlock, true);
+		}
+
+		static Statement of(CodeBlock codeBlock) {
+			return new Statement(codeBlock, false);
+		}
+
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/javapoet/support/package-info.java b/spring-core/src/main/java/org/springframework/javapoet/support/package-info.java
new file mode 100644
index 000000000000..6f2c37d88bc9
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/javapoet/support/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * Support classes for JavaPoet usage.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.javapoet.support;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-core/src/test/java/org/springframework/javapoet/support/CodeSnippetTests.java b/spring-core/src/test/java/org/springframework/javapoet/support/CodeSnippetTests.java
new file mode 100644
index 000000000000..d11383f2db3d
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/javapoet/support/CodeSnippetTests.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2002-2022 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.javapoet.support;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.javapoet.CodeBlock;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link CodeSnippet}.
+ *
+ * @author Stephane Nicoll
+ */
+class CodeSnippetTests {
+
+	@Test
+	void snippetUsesTabs() {
+		CodeBlock.Builder code = CodeBlock.builder();
+		code.beginControlFlow("if (condition)");
+		code.addStatement("bean.doThis()");
+		code.endControlFlow();
+		CodeSnippet codeSnippet = CodeSnippet.of(code.build());
+		assertThat(codeSnippet.getSnippet()).isEqualTo("""
+				if (condition) {
+					bean.doThis();
+				}
+				""");
+	}
+
+	@Test
+	void snippetResolvesImports() {
+		CodeSnippet codeSnippet = CodeSnippet.of(
+				CodeBlock.of("$T list = new $T<>()", List.class, ArrayList.class));
+		assertThat(codeSnippet.getSnippet()).isEqualTo("List list = new ArrayList<>()");
+		assertThat(codeSnippet.hasImport(List.class)).isTrue();
+		assertThat(codeSnippet.hasImport(ArrayList.class)).isTrue();
+	}
+
+	@Test
+	void removeIndent() {
+		CodeBlock.Builder code = CodeBlock.builder();
+		code.beginControlFlow("if (condition)");
+		code.addStatement("doStuff()");
+		code.endControlFlow();
+		CodeSnippet snippet = CodeSnippet.of(code.build());
+		assertThat(snippet.getSnippet().lines()).contains("\tdoStuff();");
+		assertThat(snippet.removeIndent(1).getSnippet().lines()).contains("doStuff();");
+	}
+
+	@Test
+	void processProvidesSnippet() {
+		assertThat(CodeSnippet.process(code -> code.add("$T list;", List.class)))
+				.isEqualTo("List list;");
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/javapoet/support/MultiCodeBlockTests.java b/spring-core/src/test/java/org/springframework/javapoet/support/MultiCodeBlockTests.java
new file mode 100644
index 000000000000..603aa10d3e59
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/javapoet/support/MultiCodeBlockTests.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2002-2022 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.javapoet.support;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.javapoet.CodeBlock;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+
+/**
+ * Tests for {@link MultiCodeBlock}.
+ *
+ * @author Stephane Nicoll
+ */
+class MultiCodeBlockTests {
+
+	@Test
+	void joinWithNoElement() {
+		MultiCodeBlock multi = new MultiCodeBlock();
+		assertThat(multi.join(", ").isEmpty()).isTrue();
+	}
+
+	@Test
+	void joinWithEmptyElement() {
+		MultiCodeBlock multi = new MultiCodeBlock();
+		assertThatIllegalArgumentException().isThrownBy(() -> multi.add(CodeBlock.builder().build()));
+	}
+
+	@Test
+	void joinWithSingleElement() {
+		MultiCodeBlock multi = new MultiCodeBlock();
+		multi.add(CodeBlock.of("$S", "Hello"));
+		assertThat(multi.join(", ")).hasToString("\"Hello\"");
+	}
+
+	@Test
+	void joinWithSeveralElement() {
+		MultiCodeBlock multi = new MultiCodeBlock();
+		multi.add(CodeBlock.of("$S", "Hello"));
+		multi.add(code -> code.add("42"));
+		multi.add("null");
+		assertThat(multi.join(", ")).hasToString("\"Hello\", 42, null");
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/javapoet/support/MultiStatementTests.java b/spring-core/src/test/java/org/springframework/javapoet/support/MultiStatementTests.java
new file mode 100644
index 000000000000..da766c523cc9
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/javapoet/support/MultiStatementTests.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2002-2022 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.javapoet.support;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.javapoet.CodeBlock;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link MultiStatement}.
+ *
+ * @author Stephane Nicoll
+ */
+class MultiStatementTests {
+
+	@Test
+	void isEmptyWithNoStatement() {
+		assertThat(new MultiStatement().isEmpty()).isTrue();
+	}
+
+	@Test
+	void isEmptyWithStatement() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement(CodeBlock.of("int i = 0"));
+		assertThat(statements.isEmpty()).isFalse();
+	}
+
+	@Test
+	void singleStatement() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement("field.method($S)", "hello");
+		CodeBlock codeBlock = statements.toCodeBlock();
+		assertThat(codeBlock.toString()).isEqualTo("field.method(\"hello\")");
+	}
+
+	@Test
+	void singleStatementWithCallback() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement(code -> code.add("field.method($S)", "hello"));
+		CodeBlock codeBlock = statements.toCodeBlock();
+		assertThat(codeBlock.toString()).isEqualTo("field.method(\"hello\")");
+	}
+
+	@Test
+	void singleStatementWithCodeBlock() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement(CodeBlock.of("field.method($S)", "hello"));
+		CodeBlock codeBlock = statements.toCodeBlock();
+		assertThat(codeBlock.toString()).isEqualTo("field.method(\"hello\")");
+	}
+
+	@Test
+	void multiStatements() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement("field.method($S)", "hello");
+		statements.addStatement("field.anotherMethod($S)", "hello");
+		CodeBlock codeBlock = statements.toCodeBlock();
+		assertThat(codeBlock.toString()).isEqualTo("""
+				field.method("hello");
+				field.anotherMethod("hello");""");
+	}
+
+	@Test
+	void multiStatementsWithCodeBlockRenderedAsIs() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement("field.method($S)", "hello");
+		statements.add(CodeBlock.of(("// Hello\n")));
+		statements.add(code -> code.add("// World\n"));
+		statements.addStatement("field.anotherMethod($S)", "hello");
+		CodeBlock codeBlock = statements.toCodeBlock();
+		assertThat(codeBlock.toString()).isEqualTo("""
+				field.method("hello");
+				// Hello
+				// World
+				field.anotherMethod("hello");""");
+	}
+
+	@Test
+	void singleStatementWithLambda() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement("field.method($S)", "hello");
+		CodeBlock codeBlock = statements.toCodeBlock(CodeBlock.of("() ->"));
+		assertThat(codeBlock.toString()).isEqualTo("() -> field.method(\"hello\")");
+	}
+
+	@Test
+	void multiStatementsWithLambda() {
+		MultiStatement statements = new MultiStatement();
+		statements.addStatement("field.method($S)", "hello");
+		statements.addStatement("field.anotherMethod($S)", "hello");
+		CodeBlock codeBlock = statements.toCodeBlock(CodeBlock.of("() ->"));
+		assertThat(codeBlock.toString().lines()).containsExactly(
+				"() -> {",
+				"  field.method(\"hello\");",
+				"  field.anotherMethod(\"hello\");",
+				"}");
+	}
+
+	@Test
+	void multiStatementsWithAddAll() {
+		MultiStatement statements = new MultiStatement();
+		statements.addAll(List.of(0, 1, 2),
+				index -> CodeBlock.of("field[$L] = $S", index, "hello"));
+		CodeBlock codeBlock = statements.toCodeBlock("() ->");
+		assertThat(codeBlock.toString().lines()).containsExactly(
+				"() -> {",
+				"  field[0] = \"hello\";",
+				"  field[1] = \"hello\";",
+				"  field[2] = \"hello\";",
+				"}");
+	}
+
+}

From d64f8c1a05f9b5a3cd6451a20261c5e6f7b4108d Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 10 Feb 2022 15:01:58 +0100
Subject: [PATCH 667/735] Make BeanDefinitionValueResolver public

Closes gh-28029
---
 .../support/BeanDefinitionValueResolver.java  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
index 0468bc4aadd1..be3a62e29458 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import java.util.Set;
 
 import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.TypeConverter;
 import org.springframework.beans.factory.BeanCreationException;
@@ -59,7 +60,7 @@
  * @since 1.2
  * @see AbstractAutowireCapableBeanFactory
  */
-class BeanDefinitionValueResolver {
+public class BeanDefinitionValueResolver {
 
 	private final AbstractAutowireCapableBeanFactory beanFactory;
 
@@ -71,7 +72,8 @@ class BeanDefinitionValueResolver {
 
 
 	/**
-	 * Create a BeanDefinitionValueResolver for the given BeanFactory and BeanDefinition.
+	 * Create a BeanDefinitionValueResolver for the given BeanFactory and BeanDefinition,
+	 * using the given {@link TypeConverter}.
 	 * @param beanFactory the BeanFactory to resolve against
 	 * @param beanName the name of the bean that we work on
 	 * @param beanDefinition the BeanDefinition of the bean that we work on
@@ -86,6 +88,24 @@ public BeanDefinitionValueResolver(AbstractAutowireCapableBeanFactory beanFactor
 		this.typeConverter = typeConverter;
 	}
 
+	/**
+	 * Create a BeanDefinitionValueResolver for the given BeanFactory and BeanDefinition
+	 * using a default {@link TypeConverter}.
+	 * @param beanFactory the BeanFactory to resolve against
+	 * @param beanName the name of the bean that we work on
+	 * @param beanDefinition the BeanDefinition of the bean that we work on
+	 */
+	public BeanDefinitionValueResolver(AbstractAutowireCapableBeanFactory beanFactory, String beanName,
+			BeanDefinition beanDefinition) {
+
+		this.beanFactory = beanFactory;
+		this.beanName = beanName;
+		this.beanDefinition = beanDefinition;
+		BeanWrapper beanWrapper = new BeanWrapperImpl();
+		beanFactory.initBeanWrapper(beanWrapper);
+		this.typeConverter = beanWrapper;
+	}
+
 
 	/**
 	 * Given a PropertyValue, return a value, resolving any references to other

From 1a4573641d3ae35d044e366b472e68cc6daaad8a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 10 Feb 2022 15:54:43 +0100
Subject: [PATCH 668/735] Add code contribution infrastructure

This commit adds an API that lets individual components contribute code,
runtime hints, and protected access information. This ease the cases
where code need to be written in a privileged package if necessary and
let contributors provide hints for the code they generate.

Closes gh-28030
---
 .../aot/generator/CodeContribution.java       |  53 ++++
 .../generator/DefaultCodeContribution.java    |  68 +++++
 .../aot/generator/ProtectedAccess.java        | 237 ++++++++++++++++
 .../generator/ProtectedAccessException.java   |  45 +++
 .../aot/generator/ProtectedElement.java       |  67 +++++
 .../aot/generator/package-info.java           |  10 +
 .../DefaultCodeContributionTests.java         |  46 ++++
 .../aot/generator/ProtectedAccessTests.java   | 258 ++++++++++++++++++
 .../visibility/ProtectedParameter.java        |  25 ++
 .../generator/visibility/ProtectedType.java   |  21 ++
 .../visibility/PublicFactoryBean.java         |  37 +++
 11 files changed, 867 insertions(+)
 create mode 100644 spring-core/src/main/java/org/springframework/aot/generator/CodeContribution.java
 create mode 100644 spring-core/src/main/java/org/springframework/aot/generator/DefaultCodeContribution.java
 create mode 100644 spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java
 create mode 100644 spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccessException.java
 create mode 100644 spring-core/src/main/java/org/springframework/aot/generator/ProtectedElement.java
 create mode 100644 spring-core/src/main/java/org/springframework/aot/generator/package-info.java
 create mode 100644 spring-core/src/test/java/org/springframework/aot/generator/DefaultCodeContributionTests.java
 create mode 100644 spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java
 create mode 100644 spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedParameter.java
 create mode 100644 spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedType.java
 create mode 100644 spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java

diff --git a/spring-core/src/main/java/org/springframework/aot/generator/CodeContribution.java b/spring-core/src/main/java/org/springframework/aot/generator/CodeContribution.java
new file mode 100644
index 000000000000..964c7090a422
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/aot/generator/CodeContribution.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.javapoet.support.MultiStatement;
+
+/**
+ * A code contribution that gathers the code, the {@linkplain RuntimeHints
+ * runtime hints}, and the {@linkplain ProtectedElement protected elements}
+ * that are necessary to execute it.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public interface CodeContribution {
+
+	/**
+	 * Return the {@linkplain MultiStatement statements} that can be used to
+	 * append code.
+	 * @return the statements instance to use to contribute code
+	 */
+	MultiStatement statements();
+
+	/**
+	 * Return the {@linkplain RuntimeHints hints} to use to register
+	 * potential optimizations for contributed code.
+	 * @return the runtime hints
+	 */
+	RuntimeHints runtimeHints();
+
+	/**
+	 * Return the {@linkplain ProtectedAccess protected access} to use to
+	 * analyze any privileged access, if necessary.
+	 * @return the protected access
+	 */
+	ProtectedAccess protectedAccess();
+
+}
diff --git a/spring-core/src/main/java/org/springframework/aot/generator/DefaultCodeContribution.java b/spring-core/src/main/java/org/springframework/aot/generator/DefaultCodeContribution.java
new file mode 100644
index 000000000000..3fd34922feb2
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/aot/generator/DefaultCodeContribution.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.javapoet.support.MultiStatement;
+
+/**
+ * A default {@link CodeContribution} implementation.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class DefaultCodeContribution implements CodeContribution {
+
+	private final MultiStatement statements;
+
+	private final RuntimeHints runtimeHints;
+
+	private final ProtectedAccess protectedAccess;
+
+
+	protected DefaultCodeContribution(MultiStatement statements, RuntimeHints runtimeHints,
+			ProtectedAccess protectedAccess) {
+
+		this.statements = statements;
+		this.runtimeHints = runtimeHints;
+		this.protectedAccess = protectedAccess;
+	}
+
+	/**
+	 * Create an instance with the {@link RuntimeHints} instance to use.
+	 * @param runtimeHints the runtime hints instance to use
+	 */
+	public DefaultCodeContribution(RuntimeHints runtimeHints) {
+		this(new MultiStatement(), runtimeHints, new ProtectedAccess());
+	}
+
+	@Override
+	public MultiStatement statements() {
+		return this.statements;
+	}
+
+	@Override
+	public RuntimeHints runtimeHints() {
+		return this.runtimeHints;
+	}
+
+	@Override
+	public ProtectedAccess protectedAccess() {
+		return this.protectedAccess;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java
new file mode 100644
index 000000000000..337be6f44202
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+
+import org.springframework.core.ResolvableType;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+
+/**
+ * Gather the need of non-public access and determine the priviledged package
+ * to use, if necessary.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class ProtectedAccess {
+
+	private final List<ProtectedElement> elements;
+
+	public ProtectedAccess() {
+		this.elements = new ArrayList<>();
+	}
+
+	/**
+	 * Specify whether the protected elements registered in this instance are
+	 * accessible from the specified package name.
+	 * @param packageName the target package name
+	 * @return {@code true} if the registered access can be safely used from
+	 * the specified package name
+	 */
+	public boolean isAccessible(String packageName) {
+		return getProtectedElements(packageName).isEmpty();
+	}
+
+	/**
+	 * Return the privileged package name to use for the specified package
+	 * name, or {@code null} if none is required.
+	 * @param packageName the target package name to use
+	 * @return the privileged package name to use, or {@code null}
+	 * @throws ProtectedAccessException if a single privileged package cannot
+	 * be identified
+	 * @see #isAccessible(String)
+	 */
+	@Nullable
+	public String getPrivilegedPackageName(String packageName) throws ProtectedAccessException {
+		List<ProtectedElement> protectedElements = getProtectedElements(packageName);
+		if (protectedElements.isEmpty()) {
+			return null;
+		}
+		List<String> packageNames = protectedElements.stream()
+				.map(element -> element.getType().toClass().getPackageName())
+				.distinct().toList();
+		if (packageNames.size() == 1) {
+			return packageNames.get(0);
+		}
+		throw new ProtectedAccessException("Multiple packages require a privileged access: "
+				+ packageNames, protectedElements);
+	}
+
+	private List<ProtectedElement> getProtectedElements(String packageName) {
+		List<ProtectedElement> matches = new ArrayList<>();
+		for (ProtectedElement element : this.elements) {
+			if (!element.getType().toClass().getPackage().getName().equals(packageName)) {
+				matches.add(element);
+			}
+		}
+		return matches;
+	}
+
+	/**
+	 * Analyze the specified {@linkplain ResolvableType type}, including its
+	 * full type signature.
+	 * @param type the type to analyze
+	 */
+	public void analyze(ResolvableType type) {
+		if (isProtected(type)) {
+			registerProtectedType(type, null);
+		}
+	}
+
+	/**
+	 * Analyze accessing the specified {@link Member} using the default
+	 * {@linkplain Options#DEFAULTS options}.
+	 * @param member the member to analyze
+	 */
+	public void analyze(Member member) {
+		analyze(member, Options.DEFAULTS);
+	}
+
+	/**
+	 * Analyze accessing the specified {@link Member} using the specified
+	 * {@link Options options}.
+	 * @param member the member to analyze
+	 * @param options the options to use
+	 */
+	public void analyze(Member member, Options options) {
+		if (isProtected(member.getDeclaringClass())) {
+			registerProtectedType(member.getDeclaringClass(), member);
+		}
+		if (!options.useReflection && isProtected(member.getModifiers())) {
+			registerProtectedType(member.getDeclaringClass(), member);
+		}
+		if (member instanceof Field field) {
+			ResolvableType fieldType = ResolvableType.forField(field);
+			if (options.assignReturnType && isProtected(fieldType)) {
+				registerProtectedType(fieldType, field);
+			}
+		}
+		else if (member instanceof Constructor<?> constructor) {
+			analyzeParameterTypes(constructor, i ->
+					ResolvableType.forConstructorParameter(constructor, i));
+		}
+		else if (member instanceof Method method) {
+			ResolvableType returnType = ResolvableType.forMethodReturnType(method);
+			if (!options.assignReturnType && isProtected(returnType)) {
+				registerProtectedType(returnType, method);
+			}
+			analyzeParameterTypes(method, i -> ResolvableType.forMethodParameter(method, i));
+		}
+	}
+
+	private void analyzeParameterTypes(Executable executable, Function<Integer,
+			ResolvableType> parameterTypeFactory) {
+
+		for (int i = 0; i < executable.getParameters().length; i++) {
+			ResolvableType parameterType = parameterTypeFactory.apply(i);
+			if (isProtected(parameterType)) {
+				registerProtectedType(parameterType, executable);
+			}
+		}
+	}
+
+	boolean isProtected(ResolvableType resolvableType) {
+		return isProtected(new HashSet<>(), resolvableType);
+	}
+
+	private boolean isProtected(Set<ResolvableType> seen, ResolvableType target) {
+		if (seen.contains(target)) {
+			return false;
+		}
+		seen.add(target);
+		ResolvableType nonProxyTarget = target.as(ClassUtils.getUserClass(target.toClass()));
+		if (isProtected(nonProxyTarget.toClass())) {
+			return true;
+		}
+		Class<?> declaringClass = nonProxyTarget.toClass().getDeclaringClass();
+		if (declaringClass != null) {
+			if (isProtected(declaringClass)) {
+				return true;
+			}
+		}
+		if (nonProxyTarget.hasGenerics()) {
+			for (ResolvableType generic : nonProxyTarget.getGenerics()) {
+				return isProtected(seen, generic);
+			}
+		}
+		return false;
+	}
+
+	private boolean isProtected(Class<?> type) {
+		Class<?> candidate = ClassUtils.getUserClass(type);
+		return isProtected(candidate.getModifiers());
+	}
+
+	private boolean isProtected(int modifiers) {
+		return !Modifier.isPublic(modifiers);
+	}
+
+	private void registerProtectedType(ResolvableType type, @Nullable Member member) {
+		this.elements.add(ProtectedElement.of(type, member));
+	}
+
+	private void registerProtectedType(Class<?> type, Member member) {
+		registerProtectedType(ResolvableType.forClass(type), member);
+	}
+
+	/**
+	 * Options to use to analyze if invoking a {@link Member} requires
+	 * privileged access.
+	 */
+	public static class Options {
+
+		/**
+		 * Default options that does fallback to reflection and does not
+		 * assign the default type.
+		 */
+		public static final Options DEFAULTS = new Options();
+
+		private final boolean useReflection;
+
+		private final boolean assignReturnType;
+
+		/**
+		 * Create a new instance with the specified options.
+		 * @param useReflection whether the writer can automatically use
+		 * reflection to invoke a protected member if it is not public
+		 * @param assignReturnType whether the writer needs to assign the
+		 * return type, or if it is irrelevant
+		 */
+		public Options(boolean useReflection, boolean assignReturnType) {
+			this.useReflection = useReflection;
+			this.assignReturnType = assignReturnType;
+		}
+
+		private Options() {
+			this(true, false);
+		}
+
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccessException.java b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccessException.java
new file mode 100644
index 000000000000..0a2c3fb8f577
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccessException.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import java.util.List;
+
+/**
+ * Thrown when a code block requires privileged access on multiple packages.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+@SuppressWarnings("serial")
+public class ProtectedAccessException extends RuntimeException {
+
+	private final List<ProtectedElement> protectedElements;
+
+	public ProtectedAccessException(String message, List<ProtectedElement> protectedElements) {
+		super(message);
+		this.protectedElements = protectedElements;
+	}
+
+	/**
+	 * Return the {@linkplain ProtectedElement protected elements}.
+	 * @return the protected access
+	 */
+	public List<ProtectedElement> getProtectedElements() {
+		return this.protectedElements;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/aot/generator/ProtectedElement.java b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedElement.java
new file mode 100644
index 000000000000..eb2615ed7bcf
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedElement.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import java.lang.reflect.Member;
+
+import org.springframework.core.ResolvableType;
+import org.springframework.lang.Nullable;
+
+/**
+ * A {@link Member} that is non-public, with the related type.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class ProtectedElement {
+
+	private final ResolvableType type;
+
+	@Nullable
+	private final Member target;
+
+
+	private ProtectedElement(ResolvableType type, @Nullable Member member) {
+		this.type = type;
+		this.target = member;
+	}
+
+	/**
+	 * Return the {@link ResolvableType type} that is non-public. For a plain
+	 * protected {@link Member member} access, the type of the declaring class
+	 * is used. Otherwise, the type in the member signature, such as a parameter
+	 * type for an executable, or the return type of a field is used.
+	 * @return the type that is not public
+	 */
+	public ResolvableType getType() {
+		return this.type;
+	}
+
+	/**
+	 * Return the {@link Member} that is not publicly accessible.
+	 * @return the member
+	 */
+	@Nullable
+	public Member getMember() {
+		return this.target;
+	}
+
+	static ProtectedElement of(ResolvableType type, @Nullable Member member) {
+		return new ProtectedElement(type, member);
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/aot/generator/package-info.java b/spring-core/src/main/java/org/springframework/aot/generator/package-info.java
new file mode 100644
index 000000000000..beef9af7464f
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/aot/generator/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * Support classes for components that contribute generated code equivalent
+ * to a runtime behavior.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.aot.generator;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-core/src/test/java/org/springframework/aot/generator/DefaultCodeContributionTests.java b/spring-core/src/test/java/org/springframework/aot/generator/DefaultCodeContributionTests.java
new file mode 100644
index 000000000000..ce69671ddf03
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/aot/generator/DefaultCodeContributionTests.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aot.hint.RuntimeHints;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link DefaultCodeContribution}.
+ *
+ * @author Stephane Nicoll
+ */
+class DefaultCodeContributionTests {
+
+	@Test
+	void newCodeContributionIsEmpty() {
+		CodeContribution contribution = new DefaultCodeContribution(new RuntimeHints());
+		assertThat(contribution.statements().isEmpty()).isTrue();
+		assertThat(contribution.protectedAccess().isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void codeContributionReusesRuntimeHints() {
+		RuntimeHints runtimeHints = new RuntimeHints();
+		CodeContribution contribution = new DefaultCodeContribution(runtimeHints);
+		assertThat(contribution.runtimeHints()).isSameAs(runtimeHints);
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java b/spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java
new file mode 100644
index 000000000000..5a996272ebc6
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aot.generator.ProtectedAccess.Options;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.testfixture.aot.generator.visibility.ProtectedParameter;
+import org.springframework.core.testfixture.aot.generator.visibility.PublicFactoryBean;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * Tests for {@link ProtectedAccess}.
+ *
+ * @author Stephane Nicoll
+ */
+class ProtectedAccessTests {
+
+	private final ProtectedAccess protectedAccess = new ProtectedAccess();
+
+	@Test
+	void analyzeWithPublicConstructor() throws NoSuchMethodException {
+		this.protectedAccess.analyze(PublicClass.class.getConstructor());
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateConstructorAndDefaultOptions() {
+		this.protectedAccess.analyze(ProtectedAccessor.class.getDeclaredConstructors()[0]);
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example")).isNull();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateConstructorAndReflectionDisabled() {
+		this.protectedAccess.analyze(ProtectedAccessor.class.getDeclaredConstructors()[0],
+				new Options(false, true));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedAccessor.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(ProtectedAccessor.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateClass() {
+		this.protectedAccess.analyze(ProtectedClass.class.getDeclaredConstructors()[0]);
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedClass.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateDeclaringType() {
+		this.protectedAccess.analyze(method(ProtectedClass.class, "stringBean"));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedClass.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateConstructorParameter() {
+		this.protectedAccess.analyze(ProtectedParameter.class.getConstructors()[0]);
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedParameter.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(ProtectedParameter.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateMethod() {
+		this.protectedAccess.analyze(method(PublicClass.class, "getProtectedMethod"));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateMethodAndReflectionDisabled() {
+		this.protectedAccess.analyze(method(PublicClass.class, "getProtectedMethod"),
+				new Options(false, false));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateMethodReturnType() {
+		this.protectedAccess.analyze(method(ProtectedAccessor.class, "methodWithProtectedReturnType"));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedAccessor.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(ProtectedAccessor.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateMethodParameter() {
+		this.protectedAccess.analyze(method(ProtectedAccessor.class, "methodWithProtectedParameter",
+				ProtectedClass.class));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedClass.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateField() {
+		this.protectedAccess.analyze(field(PublicClass.class, "protectedField"));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateFieldAndReflectionDisabled() {
+		this.protectedAccess.analyze(field(PublicClass.class, "protectedField"),
+				new Options(false, true));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(PublicClass.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(PublicClass.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPublicFieldAndProtectedType() {
+		this.protectedAccess.analyze(field(PublicClass.class, "protectedClassField"),
+				new Options(false, true));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedClass.class.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateGenericArgument() {
+		this.protectedAccess.analyze(method(PublicFactoryBean.class, "protectedTypeFactoryBean"));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.isAccessible(PublicFactoryBean.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeTypeWithProtectedGenericArgument() {
+		this.protectedAccess.analyze(PublicFactoryBean.resolveToProtectedGenericParameter());
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.isAccessible(PublicFactoryBean.class.getPackageName())).isTrue();
+	}
+
+	@Test
+	void analyzeWithRecursiveType() {
+		assertThat(this.protectedAccess.isProtected(ResolvableType.forClassWithGenerics(
+				SelfReference.class, SelfReference.class))).isTrue();
+	}
+
+	@Test
+	void getProtectedPackageWithPublicAccess() throws NoSuchMethodException {
+		this.protectedAccess.analyze(PublicClass.class.getConstructor());
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example")).isNull();
+	}
+
+	@Test
+	void getProtectedPackageWithProtectedAccessInOnePackage() {
+		this.protectedAccess.analyze(method(PublicFactoryBean.class, "protectedTypeFactoryBean"));
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isEqualTo(PublicFactoryBean.class.getPackageName());
+	}
+
+	@Test
+	void getProtectedPackageWithProtectedAccessInSeveralPackages() {
+		Method protectedMethodFirstPackage = method(PublicFactoryBean.class, "protectedTypeFactoryBean");
+		Method protectedMethodSecondPackage = method(ProtectedAccessor.class, "methodWithProtectedParameter",
+				ProtectedClass.class);
+		this.protectedAccess.analyze(protectedMethodFirstPackage);
+		this.protectedAccess.analyze(protectedMethodSecondPackage);
+		assertThatThrownBy(() -> this.protectedAccess.getPrivilegedPackageName("com.example"))
+				.isInstanceOfSatisfying(ProtectedAccessException.class, ex ->
+						assertThat(ex.getProtectedElements().stream().map(ProtectedElement::getMember))
+								.containsOnly(protectedMethodFirstPackage, protectedMethodSecondPackage));
+	}
+
+	private static Method method(Class<?> type, String name, Class<?>... parameterTypes) {
+		Method method = ReflectionUtils.findMethod(type, name, parameterTypes);
+		assertThat(method).isNotNull();
+		return method;
+	}
+
+	private static Field field(Class<?> type, String name) {
+		Field field = ReflectionUtils.findField(type, name);
+		assertThat(field).isNotNull();
+		return field;
+	}
+
+
+	@SuppressWarnings("unused")
+	public static class PublicClass {
+
+		String protectedField;
+
+		public ProtectedClass protectedClassField;
+
+		String getProtectedMethod() {
+			return this.protectedField;
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	public static class ProtectedAccessor {
+
+		ProtectedAccessor() {
+		}
+
+		public String methodWithProtectedParameter(ProtectedClass type) {
+			return "test";
+		}
+
+		public ProtectedClass methodWithProtectedReturnType() {
+			return new ProtectedClass();
+		}
+	}
+
+	@SuppressWarnings("unused")
+	static class ProtectedClass {
+
+		public ProtectedClass() {
+		}
+
+		public String stringBean() {
+			return "public";
+		}
+
+	}
+
+	static class SelfReference<T extends SelfReference<T>> {
+
+		@SuppressWarnings("unchecked")
+		T getThis() {
+			return (T) this;
+		}
+
+	}
+
+}
diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedParameter.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedParameter.java
new file mode 100644
index 000000000000..6812d6a13baf
--- /dev/null
+++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedParameter.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2002-2022 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.core.testfixture.aot.generator.visibility;
+
+public class ProtectedParameter {
+
+	public ProtectedParameter(ProtectedType type) {
+
+	}
+
+}
diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedType.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedType.java
new file mode 100644
index 000000000000..d1ce752b3b72
--- /dev/null
+++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/ProtectedType.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2002-2022 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.core.testfixture.aot.generator.visibility;
+
+class ProtectedType {
+
+}
diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java
new file mode 100644
index 000000000000..9e9bf8d58f18
--- /dev/null
+++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2022 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.core.testfixture.aot.generator.visibility;
+
+import org.springframework.core.ResolvableType;
+
+public class PublicFactoryBean<T> {
+
+	private final Class<T> type;
+
+	public PublicFactoryBean(Class<T> type) {
+		this.type = type;
+	}
+
+	public static PublicFactoryBean<ProtectedType> protectedTypeFactoryBean() {
+		return new PublicFactoryBean<>(ProtectedType.class);
+	}
+
+	public static ResolvableType resolveToProtectedGenericParameter() {
+		return ResolvableType.forClassWithGenerics(PublicFactoryBean.class, ProtectedType.class);
+	}
+
+}

From ce87285be5d4be7ab9d981273acac8a8624883dc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 10 Feb 2022 14:16:34 +0100
Subject: [PATCH 669/735] Use canonical names for types in synthesized
 annotation toString

My proposal for the same change in the JDK is currently targeted for
JDK 19.

- https://bugs.openjdk.java.net/browse/JDK-8281462
- https://bugs.openjdk.java.net/browse/JDK-8281568
- https://github.com/openjdk/jdk/pull/7418

See gh-28015
---
 ...izedMergedAnnotationInvocationHandler.java |  9 +++++++--
 .../annotation/MergedAnnotationsTests.java    | 20 +++++++++++++------
 .../test/context/BootstrapUtilsTests.java     |  6 +++---
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
index 6838dc377973..8cbfcc6f5a48 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
@@ -177,7 +177,7 @@ private int getValueHashCode(Object value) {
 	private String annotationToString() {
 		String string = this.string;
 		if (string == null) {
-			StringBuilder builder = new StringBuilder("@").append(this.type.getName()).append('(');
+			StringBuilder builder = new StringBuilder("@").append(getName(this.type)).append('(');
 			for (int i = 0; i < this.attributes.size(); i++) {
 				Method attribute = this.attributes.get(i);
 				if (i > 0) {
@@ -202,7 +202,7 @@ private String toString(Object value) {
 			return ((Enum<?>) value).name();
 		}
 		if (value instanceof Class) {
-			return ((Class<?>) value).getName() + ".class";
+			return getName((Class<?>) value) + ".class";
 		}
 		if (value.getClass().isArray()) {
 			StringBuilder builder = new StringBuilder("{");
@@ -277,6 +277,11 @@ static <A extends Annotation> A createProxy(MergedAnnotation<A> annotation, Clas
 		return (A) Proxy.newProxyInstance(classLoader, interfaces, handler);
 	}
 
+	private static String getName(Class<?> clazz) {
+		String canonicalName = clazz.getCanonicalName();
+		return (canonicalName != null ? canonicalName : clazz.getName());
+	}
+
 
 	private static boolean isVisible(ClassLoader classLoader, Class<?> interfaceClass) {
 		if (classLoader == interfaceClass.getClassLoader()) {
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index 0b92547863ed..a6ff5a0f07a6 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -1887,15 +1887,22 @@ private void assertToStringForWebMappingWithPathAndValue(RequestMapping webMappi
 
 		// Formatting common to Spring and JDK 9+
 		assertThat(string)
-			.startsWith("@" + RequestMapping.class.getName() + "(")
-			.contains("value={\"/test\"}", "path={\"/test\"}", "name=\"bar\"", "clazz=java.lang.Object.class")
+			.contains("value={\"/test\"}", "path={\"/test\"}", "name=\"bar\"")
 			.endsWith(")");
 
 		if (webMapping instanceof SynthesizedAnnotation) {
-			assertThat(string).as("Spring uses Enum#name()").contains("method={GET, POST}");
+			assertThat(string).as("Spring formatting")
+				.startsWith("@org.springframework.core.annotation.MergedAnnotationsTests.RequestMapping(")
+				.contains("method={GET, POST}",
+						"clazz=org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod.class",
+						"classes={org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod.class}");
 		}
 		else {
-			assertThat(string).as("JDK uses Enum#toString()").contains("method={method: get, method: post}");
+			assertThat(string).as("JDK 9-18 formatting")
+				.startsWith("@org.springframework.core.annotation.MergedAnnotationsTests$RequestMapping(")
+				.contains("method={method: get, method: post}",
+						"clazz=org.springframework.core.annotation.MergedAnnotationsTests$RequestMethod.class",
+						"classes={org.springframework.core.annotation.MergedAnnotationsTests$RequestMethod.class}");
 		}
 	}
 
@@ -2989,8 +2996,9 @@ public String toString() {
 
 		RequestMethod[] method() default {};
 
-		// clazz is only used for testing annotation toString() implementations
-		Class<?> clazz() default Object.class;
+		Class<?> clazz() default RequestMethod.class;
+
+		Class<?>[] classes() default {RequestMethod.class};
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
diff --git a/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java
index 7ed75786f8f3..5c409d880449 100644
--- a/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/BootstrapUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -72,8 +72,8 @@ void resolveTestContextBootstrapperWithDoubleMetaBootstrapWithAnnotations() {
 		assertThatIllegalStateException().isThrownBy(() ->
 				resolveTestContextBootstrapper(bootstrapContext))
 			.withMessageContaining("Configuration error: found multiple declarations of @BootstrapWith")
-			.withMessageContaining(FooBootstrapper.class.getName())
-			.withMessageContaining(BarBootstrapper.class.getName());
+			.withMessageContaining(FooBootstrapper.class.getCanonicalName())
+			.withMessageContaining(BarBootstrapper.class.getCanonicalName());
 	}
 
 	@Test

From 2fd39839f83e8923277cb89bcff0b5dc5a18abfc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 10 Feb 2022 16:58:36 +0100
Subject: [PATCH 670/735] Improve toString() for synthesized annotations

Although the initial report in gh-28015 only covered inconsistencies
for arrays and strings in the toString() implementations for
annotations between the JDK (after Java 9) and Spring, it has since
come to our attention that there was further room for improvement.

This commit therefore addresses the following in toString() output for
synthesized annotations.

- characters are now wrapped in single quotes.

- bytes are now properly formatted as "(byte) 0x##".

- long, float, and double values are now appended with "L", "f", and
  "d", respectively. The use of lowercase for "f" and "d" is solely to
  align with the choice made by the JDK team.

However, this commit does not address the following issues which we may
choose to address at a later point in time.

- non-ASCII, non-visible, and non-printable characters within a
  character or String literal are not escaped.

- formatting for float and double values does not take into account
  whether a value is not a number (NaN) or infinite.

Closes gh-28015
---
 ...izedMergedAnnotationInvocationHandler.java | 28 +++++++++++
 .../annotation/MergedAnnotationsTests.java    | 50 +++++++++++++++++--
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
index 8cbfcc6f5a48..5d3f9a40949f 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
@@ -194,10 +194,38 @@ private String annotationToString() {
 		return string;
 	}
 
+	/**
+	 * This method currently does not address the following issues which we may
+	 * choose to address at a later point in time.
+	 *
+	 * <ul>
+	 * <li>non-ASCII, non-visible, and non-printable characters within a character
+	 * or String literal are not escaped.</li>
+	 * <li>formatting for float and double values does not take into account whether
+	 * a value is not a number (NaN) or infinite.</li>
+	 * </ul>
+	 * @param value the attribute value to format
+	 * @return the formatted string representation
+	 */
 	private String toString(Object value) {
 		if (value instanceof String) {
 			return '"' + value.toString() + '"';
 		}
+		if (value instanceof Character) {
+			return '\'' + value.toString() + '\'';
+		}
+		if (value instanceof Byte) {
+			return String.format("(byte) 0x%02X", value);
+		}
+		if (value instanceof Long) {
+			return Long.toString(((Long) value)) + 'L';
+		}
+		if (value instanceof Float) {
+			return Float.toString(((Float) value)) + 'f';
+		}
+		if (value instanceof Double) {
+			return Double.toString(((Double) value)) + 'd';
+		}
 		if (value instanceof Enum) {
 			return ((Enum<?>) value).name();
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index a6ff5a0f07a6..acd8fc9abaf6 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -1887,7 +1887,7 @@ private void assertToStringForWebMappingWithPathAndValue(RequestMapping webMappi
 
 		// Formatting common to Spring and JDK 9+
 		assertThat(string)
-			.contains("value={\"/test\"}", "path={\"/test\"}", "name=\"bar\"")
+			.contains("value={\"/test\"}", "path={\"/test\"}", "name=\"bar\"", "ch='X'", "chars={'X'}")
 			.endsWith(")");
 
 		if (webMapping instanceof SynthesizedAnnotation) {
@@ -1895,14 +1895,36 @@ private void assertToStringForWebMappingWithPathAndValue(RequestMapping webMappi
 				.startsWith("@org.springframework.core.annotation.MergedAnnotationsTests.RequestMapping(")
 				.contains("method={GET, POST}",
 						"clazz=org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod.class",
-						"classes={org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod.class}");
+						"classes={int[][].class, org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod[].class}",
+						"byteValue=(byte) 0xFF", "bytes={(byte) 0xFF}",
+						"shortValue=9876", "shorts={9876}",
+						"longValue=42L", "longs={42L}",
+						"floatValue=3.14f", "floats={3.14f}",
+						"doubleValue=99.999d", "doubles={99.999d}"
+					);
 		}
 		else {
 			assertThat(string).as("JDK 9-18 formatting")
 				.startsWith("@org.springframework.core.annotation.MergedAnnotationsTests$RequestMapping(")
 				.contains("method={method: get, method: post}",
 						"clazz=org.springframework.core.annotation.MergedAnnotationsTests$RequestMethod.class",
-						"classes={org.springframework.core.annotation.MergedAnnotationsTests$RequestMethod.class}");
+						"classes={int[][].class, org.springframework.core.annotation.MergedAnnotationsTests$RequestMethod[].class}",
+						"shortValue=9876", "shorts={9876}",
+						"floatValue=3.14f", "floats={3.14f}",
+						"doubleValue=99.999", "doubles={99.999}"
+					);
+			if (JRE.currentVersion().ordinal() < JRE.JAVA_14.ordinal()) {
+				assertThat(string).as("JDK 9-13 formatting")
+					.contains("longValue=42", "longs={42}",
+							"byteValue=-1", "bytes={-1}"
+						);
+			}
+			else {
+				assertThat(string).as("JDK 14+ formatting")
+					.contains("longValue=42L", "longs={42L}",
+							"byteValue=(byte)0xff", "bytes={(byte)0xff}"
+						);
+			}
 		}
 	}
 
@@ -2996,9 +3018,29 @@ public String toString() {
 
 		RequestMethod[] method() default {};
 
+		// ---------------------------------------------------------------------
+		// All remaining attributes declare default values that are used solely
+		// for the purpose of testing the toString() implementations for annotations.
 		Class<?> clazz() default RequestMethod.class;
+		Class<?>[] classes() default {int[][].class, RequestMethod[].class};
+
+		char ch() default 'X';
+		char[] chars() default {'X'};
+
+		byte byteValue() default (byte) 0xFF;
+		byte[] bytes() default {(byte) 0xFF};
+
+		short shortValue() default 9876;
+		short[] shorts() default {9876};
+
+		long longValue() default 42L;
+		long[] longs() default {42L};
+
+		float floatValue() default 3.14F;
+		float[] floats() default {3.14F};
 
-		Class<?>[] classes() default {RequestMethod.class};
+		double doubleValue() default 99.999D;
+		double[] doubles() default {99.999D};
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)

From 2019e176ee9c75c2f20ce68a82df2cf1a2af872a Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Fri, 11 Feb 2022 11:13:52 +0100
Subject: [PATCH 671/735] Upgrade to AspectJ 1.9.8

This commit also upgades the dedicated Gradle plugin for AspectJ build
integration.

Closes gh-27416
---
 build.gradle             | 4 ++--
 gradle/toolchains.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 89992042dc29..8f0a3e29706f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
-	id "io.freefair.aspectj" version '6.3.0' apply false
+	id "io.freefair.aspectj" version '6.4.0' apply false
 	id 'org.jetbrains.dokka' version '1.6.0' apply false
 	id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
@@ -51,7 +51,7 @@ configure(allprojects) { project ->
 			}
 			dependency "com.google.code.findbugs:jsr305:3.0.2"
 
-			dependencySet(group: 'org.aspectj', version: '1.9.8.RC3') {
+			dependencySet(group: 'org.aspectj', version: '1.9.8') {
 				entry 'aspectjrt'
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 15ee3bcfc526..302504cabc7c 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -118,7 +118,7 @@ pluginManager.withPlugin("kotlin") {
 		}
 	}
 	else {
-		// Fallback to JDK11
+		// Fallback to JDK17
 		compileKotlin {
 			kotlinOptions {
 				jvmTarget = '1.8'

From 6c42bcfaec45128f7b0807676288552912a1b234 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Fri, 11 Feb 2022 11:39:32 +0100
Subject: [PATCH 672/735] Upgrade to Kotlin 1.6.20-M1

This commit upgrades the Kotlin dependencies to 1.6.20-M1 and configures
the build to generate Java 17 bytecode for Kotlin classes.

Closes gh-27814
---
 build.gradle                                  | 10 ++++----
 gradle/toolchains.gradle                      | 23 +++++++++----------
 .../KotlinReactiveAdapterRegistryTests.kt     |  2 ++
 .../annotation/CoroutinesIntegrationTests.kt  |  2 ++
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8f0a3e29706f..e047e6d07a90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.10'
 	id "io.freefair.aspectj" version '6.4.0' apply false
 	id 'org.jetbrains.dokka' version '1.6.0' apply false
-	id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.6.20-M1' apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version '1.6.20-M1' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
@@ -33,7 +33,7 @@ configure(allprojects) { project ->
 			mavenBom "io.r2dbc:r2dbc-bom:Borca-RELEASE"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:11.0.7"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.20-M1"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.0"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.3.2"
 			mavenBom "org.junit:junit-bom:5.8.2"
@@ -277,13 +277,13 @@ configure([rootProject] + javaProjects) { project ->
 			kotlinOptions {
 				languageVersion = "1.6"
 				apiVersion = "1.6"
-				freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings", "-Xopt-in=kotlin.RequiresOptIn"]
+				freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings", "-opt-in=kotlin.RequiresOptIn"]
 				allWarningsAsErrors = true
 			}
 		}
 		compileTestKotlin {
 			kotlinOptions {
-				freeCompilerArgs = ["-Xjsr305=strict"]
+				freeCompilerArgs = ["-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn"]
 			}
 		}
 	}
diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 302504cabc7c..b0bf0af03342 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -5,10 +5,10 @@
  * 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:
+ * {@code "./gradlew check -PmainToolchain=17 -PtestToolchain=18"} will use:
  * <ul>
- *     <li>a JDK8 toolchain for compiling the main SourceSet
- *     <li>a JDK11 toolchain for compiling and running the test SourceSet
+ *     <li>a JDK17 toolchain for compiling the main SourceSet
+ *     <li>a JDK18 toolchain for compiling and running the test SourceSet
  * </ul>
  *
  * By default, the build will fall back to using the current JDK and 17 language level for all sourceSets.
@@ -21,11 +21,11 @@
  *
  * 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
+ * $ echo JDK17
+ * /opt/openjdk/java17
+ * $ echo JDK18
+ * /opt/openjdk/java18
+ * $ ./gradlew -Porg.gradle.java.installations.fromEnv=JDK17,JDK18 check
  * }
  *
  * @author Brian Clozel
@@ -121,12 +121,12 @@ pluginManager.withPlugin("kotlin") {
 		// Fallback to JDK17
 		compileKotlin {
 			kotlinOptions {
-				jvmTarget = '1.8'
+				jvmTarget = '17'
 			}
 		}
 		compileTestKotlin {
 			kotlinOptions {
-				jvmTarget = '1.8'
+				jvmTarget = '17'
 			}
 		}
 	}
@@ -137,10 +137,9 @@ pluginManager.withPlugin("kotlin") {
 			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
+				jvmTarget = testLanguageVersion.toString()
 				jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
 			}
 		}
diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt b/spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt
index b58a236bf5ae..d74b6e20e7da 100644
--- a/spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt
+++ b/spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt
@@ -17,6 +17,7 @@
 package org.springframework.core
 
 import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.Flow
@@ -32,6 +33,7 @@ import reactor.test.StepVerifier
 import java.time.Duration
 import kotlin.reflect.KClass
 
+@OptIn(DelicateCoroutinesApi::class)
 class KotlinReactiveAdapterRegistryTests {
 
 	private val registry = ReactiveAdapterRegistry.getSharedInstance()
diff --git a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt
index 7a43168c7b35..a1f6fa9a32d1 100644
--- a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt
+++ b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt
@@ -17,6 +17,7 @@
 package org.springframework.web.reactive.result.method.annotation
 
 import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
@@ -115,6 +116,7 @@ class CoroutinesIntegrationTests : AbstractRequestMappingIntegrationTests() {
 	@ComponentScan(resourcePattern = "**/CoroutinesIntegrationTests*")
 	open class WebConfig
 
+	@OptIn(DelicateCoroutinesApi::class)
 	@RestController
 	class CoroutinesController {
 

From 7257f31ca8181027ef2eab540400d17384b37f62 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Fri, 11 Feb 2022 13:58:56 +0100
Subject: [PATCH 673/735] Upgrade Dokka to 1.6.10

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e047e6d07a90..2db6c8205281 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
 	id "io.freefair.aspectj" version '6.4.0' apply false
-	id 'org.jetbrains.dokka' version '1.6.0' apply false
+	id 'org.jetbrains.dokka' version '1.6.10' apply false
 	id 'org.jetbrains.kotlin.jvm' version '1.6.20-M1' apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version '1.6.20-M1' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'

From b60340b102ac1858c1527faab4c848561a860898 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 11 Feb 2022 15:33:14 +0100
Subject: [PATCH 674/735] Simplify tests for synthesized annotation toString()

See gh-28015
---
 .../annotation/MergedAnnotationsTests.java    | 79 +++++++------------
 1 file changed, 30 insertions(+), 49 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index acd8fc9abaf6..02ec8f0980e9 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -38,7 +38,6 @@
 import javax.annotation.Resource;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.JRE;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.MergedAnnotation.Adapt;
@@ -1872,60 +1871,42 @@ void toStringForSynthesizedAnnotations() throws Exception {
 
 		assertThat(webMappingWithAliases.toString()).isNotEqualTo(synthesizedWebMapping1.toString());
 
-		if (JRE.currentVersion().ordinal() > JRE.JAVA_8.ordinal()) {
-			// The unsynthesized annotation for handleMappedWithSamePathAndValueAttributes()
-			// should produce the same toString() results as synthesized annotations for
-			// handleMappedWithPathAttribute() on Java 9 or higher
-			assertToStringForWebMappingWithPathAndValue(webMappingWithPathAndValue);
-		}
+		// The unsynthesized annotation for handleMappedWithSamePathAndValueAttributes()
+		// should produce almost the same toString() results as synthesized annotations for
+		// handleMappedWithPathAttribute() on Java 9 or higher; however, due to multiple changes
+		// in the JDK's toString() implementation for annotations in JDK 9, 14, and 19,
+		// we do not test the JDK implementation.
+		// assertToStringForWebMappingWithPathAndValue(webMappingWithPathAndValue);
+
 		assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping1);
 		assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping2);
 	}
 
 	private void assertToStringForWebMappingWithPathAndValue(RequestMapping webMapping) {
-		String string = webMapping.toString();
-
-		// Formatting common to Spring and JDK 9+
-		assertThat(string)
-			.contains("value={\"/test\"}", "path={\"/test\"}", "name=\"bar\"", "ch='X'", "chars={'X'}")
+		assertThat(webMapping.toString())
+			.startsWith("@org.springframework.core.annotation.MergedAnnotationsTests.RequestMapping(")
+			.contains(
+				// Strings
+				"value={\"/test\"}", "path={\"/test\"}", "name=\"bar\"",
+				// Characters
+				"ch='X'", "chars={'X'}",
+				// Enums
+				"method={GET, POST}",
+				// Classes
+				"clazz=org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod.class",
+				"classes={int[][].class, org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod[].class}",
+				// Bytes
+				"byteValue=(byte) 0xFF", "bytes={(byte) 0xFF}",
+				// Shorts
+				"shortValue=9876", "shorts={9876}",
+				// Longs
+				"longValue=42L", "longs={42L}",
+				// Floats
+				"floatValue=3.14f", "floats={3.14f}",
+				// Doubles
+				"doubleValue=99.999d", "doubles={99.999d}"
+			)
 			.endsWith(")");
-
-		if (webMapping instanceof SynthesizedAnnotation) {
-			assertThat(string).as("Spring formatting")
-				.startsWith("@org.springframework.core.annotation.MergedAnnotationsTests.RequestMapping(")
-				.contains("method={GET, POST}",
-						"clazz=org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod.class",
-						"classes={int[][].class, org.springframework.core.annotation.MergedAnnotationsTests.RequestMethod[].class}",
-						"byteValue=(byte) 0xFF", "bytes={(byte) 0xFF}",
-						"shortValue=9876", "shorts={9876}",
-						"longValue=42L", "longs={42L}",
-						"floatValue=3.14f", "floats={3.14f}",
-						"doubleValue=99.999d", "doubles={99.999d}"
-					);
-		}
-		else {
-			assertThat(string).as("JDK 9-18 formatting")
-				.startsWith("@org.springframework.core.annotation.MergedAnnotationsTests$RequestMapping(")
-				.contains("method={method: get, method: post}",
-						"clazz=org.springframework.core.annotation.MergedAnnotationsTests$RequestMethod.class",
-						"classes={int[][].class, org.springframework.core.annotation.MergedAnnotationsTests$RequestMethod[].class}",
-						"shortValue=9876", "shorts={9876}",
-						"floatValue=3.14f", "floats={3.14f}",
-						"doubleValue=99.999", "doubles={99.999}"
-					);
-			if (JRE.currentVersion().ordinal() < JRE.JAVA_14.ordinal()) {
-				assertThat(string).as("JDK 9-13 formatting")
-					.contains("longValue=42", "longs={42}",
-							"byteValue=-1", "bytes={-1}"
-						);
-			}
-			else {
-				assertThat(string).as("JDK 14+ formatting")
-					.contains("longValue=42L", "longs={42L}",
-							"byteValue=(byte)0xff", "bytes={(byte)0xff}"
-						);
-			}
-		}
 	}
 
 	@Test

From 420147954621a4b1d653b6f441cbf59ad493173b Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 11 Feb 2022 15:41:49 +0100
Subject: [PATCH 675/735] Start building against Reactor 2020.0.16 snapshots

See gh-28039
---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 58d99ed311c7..f80d6519774c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
 			mavenBom "io.netty:netty-bom:4.1.73.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.15"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.16-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR12"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,6 +292,7 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
+			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From eca755ec88a6f9c91d335f4d0931cb79668164ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Fri, 11 Feb 2022 17:42:06 +0100
Subject: [PATCH 676/735] Upgrade to Dokka 1.6.10

Closes gh-28040
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f80d6519774c..e126405cff45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
 	id "io.freefair.aspectj" version '6.2.0' apply false
-	id 'org.jetbrains.dokka' version '1.5.0' apply false
+	id 'org.jetbrains.dokka' version '1.6.10' apply false
 	id 'org.jetbrains.kotlin.jvm' version '1.5.32' apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.32" apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'

From 4eaee1e7381d5f3d8cd6e3ab77c8cfcf7ef2d716 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 11 Feb 2022 20:41:23 +0100
Subject: [PATCH 677/735] Short circuit if-conditions in AttributeMethods

---
 .../springframework/core/annotation/AttributeMethods.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java b/spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java
index f5c06ff051e2..caf177214884 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
  * with consistent ordering as well as a few useful utility methods.
  *
  * @author Phillip Webb
+ * @author Sam Brannen
  * @since 5.2
  */
 final class AttributeMethods {
@@ -71,10 +72,10 @@ private AttributeMethods(@Nullable Class<? extends Annotation> annotationType, M
 		for (int i = 0; i < attributeMethods.length; i++) {
 			Method method = this.attributeMethods[i];
 			Class<?> type = method.getReturnType();
-			if (method.getDefaultValue() != null) {
+			if (!foundDefaultValueMethod && (method.getDefaultValue() != null)) {
 				foundDefaultValueMethod = true;
 			}
-			if (type.isAnnotation() || (type.isArray() && type.getComponentType().isAnnotation())) {
+			if (!foundNestedAnnotation && (type.isAnnotation() || (type.isArray() && type.getComponentType().isAnnotation()))) {
 				foundNestedAnnotation = true;
 			}
 			ReflectionUtils.makeAccessible(method);

From 3ec612aaf8611d2ad6e6f7f3d5868feee5024477 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 11 Feb 2022 20:51:19 +0100
Subject: [PATCH 678/735] Support recursive annotations in merged annotations

Although Java does not allow the definition of recursive annotations,
Kotlin does, and prior to this commit an attempt to synthesize a
merged annotation using the MergedAnnotation API resulted in a
StackOverflowError if there was a recursive cycle in the annotation
definitions.

This commit addresses this issue by tracking which annotations have
already been visited and short circuits the recursive algorithm if a
cycle is detected.

Closes gh-28012
---
 .../annotation/AnnotationTypeMapping.java     |  25 +++--
 .../annotation/AnnotationTypeMappings.java    |  77 +++++++++----
 .../AnnotationTypeMappingsTests.java          |   4 +-
 .../springframework/core/annotation/Filter.kt |  35 ++++++
 .../core/annotation/Filters.kt                |  29 +++++
 .../KotlinMergedAnnotationsTests.kt           | 105 ++++++++++++++++++
 .../springframework/core/annotation/Person.kt |  35 ++++++
 7 files changed, 279 insertions(+), 31 deletions(-)
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/Filters.kt
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
index ef87e2d066fd..77302db78ae9 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -82,8 +82,8 @@ final class AnnotationTypeMapping {
 	private final Set<Method> claimedAliases = new HashSet<>();
 
 
-	AnnotationTypeMapping(@Nullable AnnotationTypeMapping source,
-			Class<? extends Annotation> annotationType, @Nullable Annotation annotation) {
+	AnnotationTypeMapping(@Nullable AnnotationTypeMapping source, Class<? extends Annotation> annotationType,
+			@Nullable Annotation annotation, Set<Class<? extends Annotation>> visitedAnnotationTypes) {
 
 		this.source = source;
 		this.root = (source != null ? source.getRoot() : this);
@@ -103,7 +103,7 @@ final class AnnotationTypeMapping {
 		processAliases();
 		addConventionMappings();
 		addConventionAnnotationValues();
-		this.synthesizable = computeSynthesizableFlag();
+		this.synthesizable = computeSynthesizableFlag(visitedAnnotationTypes);
 	}
 
 
@@ -311,7 +311,10 @@ private boolean isBetterConventionAnnotationValue(int index, boolean isValueAttr
 	}
 
 	@SuppressWarnings("unchecked")
-	private boolean computeSynthesizableFlag() {
+	private boolean computeSynthesizableFlag(Set<Class<? extends Annotation>> visitedAnnotationTypes) {
+		// Track that we have visited the current annotation type.
+		visitedAnnotationTypes.add(this.annotationType);
+
 		// Uses @AliasFor for local aliases?
 		for (int index : this.aliasMappings) {
 			if (index != -1) {
@@ -340,9 +343,15 @@ private boolean computeSynthesizableFlag() {
 				if (type.isAnnotation() || (type.isArray() && type.getComponentType().isAnnotation())) {
 					Class<? extends Annotation> annotationType =
 							(Class<? extends Annotation>) (type.isAnnotation() ? type : type.getComponentType());
-					AnnotationTypeMapping mapping = AnnotationTypeMappings.forAnnotationType(annotationType).get(0);
-					if (mapping.isSynthesizable()) {
-						return true;
+					// Ensure we have not yet visited the current nested annotation type, in order
+					// to avoid infinite recursion for JVM languages other than Java that support
+					// recursive annotation definitions.
+					if (visitedAnnotationTypes.add(annotationType)) {
+						AnnotationTypeMapping mapping =
+								AnnotationTypeMappings.forAnnotationType(annotationType, visitedAnnotationTypes).get(0);
+						if (mapping.isSynthesizable()) {
+							return true;
+						}
 					}
 				}
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java
index 7bd535086ee5..a676583d570f 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,10 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ConcurrentReferenceHashMap;
@@ -40,6 +42,7 @@
  * be searched once, regardless of how many times they are actually used.
  *
  * @author Phillip Webb
+ * @author Sam Brannen
  * @since 5.2
  * @see AnnotationTypeMapping
  */
@@ -60,19 +63,22 @@ final class AnnotationTypeMappings {
 
 
 	private AnnotationTypeMappings(RepeatableContainers repeatableContainers,
-			AnnotationFilter filter, Class<? extends Annotation> annotationType) {
+			AnnotationFilter filter, Class<? extends Annotation> annotationType,
+			Set<Class<? extends Annotation>> visitedAnnotationTypes) {
 
 		this.repeatableContainers = repeatableContainers;
 		this.filter = filter;
 		this.mappings = new ArrayList<>();
-		addAllMappings(annotationType);
+		addAllMappings(annotationType, visitedAnnotationTypes);
 		this.mappings.forEach(AnnotationTypeMapping::afterAllMappingsSet);
 	}
 
 
-	private void addAllMappings(Class<? extends Annotation> annotationType) {
+	private void addAllMappings(Class<? extends Annotation> annotationType,
+			Set<Class<? extends Annotation>> visitedAnnotationTypes) {
+
 		Deque<AnnotationTypeMapping> queue = new ArrayDeque<>();
-		addIfPossible(queue, null, annotationType, null);
+		addIfPossible(queue, null, annotationType, null, visitedAnnotationTypes);
 		while (!queue.isEmpty()) {
 			AnnotationTypeMapping mapping = queue.removeFirst();
 			this.mappings.add(mapping);
@@ -102,14 +108,15 @@ private void addMetaAnnotationsToQueue(Deque<AnnotationTypeMapping> queue, Annot
 	}
 
 	private void addIfPossible(Deque<AnnotationTypeMapping> queue, AnnotationTypeMapping source, Annotation ann) {
-		addIfPossible(queue, source, ann.annotationType(), ann);
+		addIfPossible(queue, source, ann.annotationType(), ann, new HashSet<>());
 	}
 
 	private void addIfPossible(Deque<AnnotationTypeMapping> queue, @Nullable AnnotationTypeMapping source,
-			Class<? extends Annotation> annotationType, @Nullable Annotation ann) {
+			Class<? extends Annotation> annotationType, @Nullable Annotation ann,
+			Set<Class<? extends Annotation>> visitedAnnotationTypes) {
 
 		try {
-			queue.addLast(new AnnotationTypeMapping(source, annotationType, ann));
+			queue.addLast(new AnnotationTypeMapping(source, annotationType, ann, visitedAnnotationTypes));
 		}
 		catch (Exception ex) {
 			AnnotationUtils.rethrowAnnotationConfigurationException(ex);
@@ -166,20 +173,22 @@ AnnotationTypeMapping get(int index) {
 	 * @return type mappings for the annotation type
 	 */
 	static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> annotationType) {
-		return forAnnotationType(annotationType, AnnotationFilter.PLAIN);
+		return forAnnotationType(annotationType, new HashSet<>());
 	}
 
 	/**
 	 * Create {@link AnnotationTypeMappings} for the specified annotation type.
 	 * @param annotationType the source annotation type
-	 * @param annotationFilter the annotation filter used to limit which
-	 * annotations are considered
+	 * @param visitedAnnotationTypes the set of annotations that we have already
+	 * visited; used to avoid infinite recursion for recursive annotations which
+	 * some JVM languages support (such as Kotlin)
 	 * @return type mappings for the annotation type
 	 */
-	static AnnotationTypeMappings forAnnotationType(
-			Class<? extends Annotation> annotationType, AnnotationFilter annotationFilter) {
+	static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> annotationType,
+			Set<Class<? extends Annotation>> visitedAnnotationTypes) {
 
-		return forAnnotationType(annotationType, RepeatableContainers.standardRepeatables(), annotationFilter);
+		return forAnnotationType(annotationType, RepeatableContainers.standardRepeatables(),
+				AnnotationFilter.PLAIN, visitedAnnotationTypes);
 	}
 
 	/**
@@ -194,15 +203,34 @@ static AnnotationTypeMappings forAnnotationType(
 	static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> annotationType,
 			RepeatableContainers repeatableContainers, AnnotationFilter annotationFilter) {
 
+		return forAnnotationType(annotationType, repeatableContainers, annotationFilter, new HashSet<>());
+	}
+
+	/**
+	 * Create {@link AnnotationTypeMappings} for the specified annotation type.
+	 * @param annotationType the source annotation type
+	 * @param repeatableContainers the repeatable containers that may be used by
+	 * the meta-annotations
+	 * @param annotationFilter the annotation filter used to limit which
+	 * annotations are considered
+	 * @param visitedAnnotationTypes the set of annotations that we have already
+	 * visited; used to avoid infinite recursion for recursive annotations which
+	 * some JVM languages support (such as Kotlin)
+	 * @return type mappings for the annotation type
+	 */
+	private static AnnotationTypeMappings forAnnotationType(Class<? extends Annotation> annotationType,
+			RepeatableContainers repeatableContainers, AnnotationFilter annotationFilter,
+			Set<Class<? extends Annotation>> visitedAnnotationTypes) {
+
 		if (repeatableContainers == RepeatableContainers.standardRepeatables()) {
 			return standardRepeatablesCache.computeIfAbsent(annotationFilter,
-					key -> new Cache(repeatableContainers, key)).get(annotationType);
+					key -> new Cache(repeatableContainers, key)).get(annotationType, visitedAnnotationTypes);
 		}
 		if (repeatableContainers == RepeatableContainers.none()) {
 			return noRepeatablesCache.computeIfAbsent(annotationFilter,
-					key -> new Cache(repeatableContainers, key)).get(annotationType);
+					key -> new Cache(repeatableContainers, key)).get(annotationType, visitedAnnotationTypes);
 		}
-		return new AnnotationTypeMappings(repeatableContainers, annotationFilter, annotationType);
+		return new AnnotationTypeMappings(repeatableContainers, annotationFilter, annotationType, visitedAnnotationTypes);
 	}
 
 	static void clearCache() {
@@ -235,14 +263,21 @@ private static class Cache {
 		/**
 		 * Get or create {@link AnnotationTypeMappings} for the specified annotation type.
 		 * @param annotationType the annotation type
+		 * @param visitedAnnotationTypes the set of annotations that we have already
+		 * visited; used to avoid infinite recursion for recursive annotations which
+		 * some JVM languages support (such as Kotlin)
 		 * @return a new or existing {@link AnnotationTypeMappings} instance
 		 */
-		AnnotationTypeMappings get(Class<? extends Annotation> annotationType) {
-			return this.mappings.computeIfAbsent(annotationType, this::createMappings);
+		AnnotationTypeMappings get(Class<? extends Annotation> annotationType,
+				Set<Class<? extends Annotation>> visitedAnnotationTypes) {
+
+			return this.mappings.computeIfAbsent(annotationType, key -> createMappings(key, visitedAnnotationTypes));
 		}
 
-		AnnotationTypeMappings createMappings(Class<? extends Annotation> annotationType) {
-			return new AnnotationTypeMappings(this.repeatableContainers, this.filter, annotationType);
+		private AnnotationTypeMappings createMappings(Class<? extends Annotation> annotationType,
+				Set<Class<? extends Annotation>> visitedAnnotationTypes) {
+
+			return new AnnotationTypeMappings(this.repeatableContainers, this.filter, annotationType, visitedAnnotationTypes);
 		}
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
index a6baf3a8e71d..742dc9244053 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -88,7 +88,7 @@ void forAnnotationTypeWhenHasRepeatingMetaAnnotationReturnsMapping() {
 	@Test
 	void forAnnotationTypeWhenRepeatableMetaAnnotationIsFiltered() {
 		AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(WithRepeatedMetaAnnotations.class,
-				Repeating.class.getName()::equals);
+				RepeatableContainers.standardRepeatables(), Repeating.class.getName()::equals);
 		assertThat(getAll(mappings)).flatExtracting(AnnotationTypeMapping::getAnnotationType)
 				.containsExactly(WithRepeatedMetaAnnotations.class);
 	}
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt
new file mode 100644
index 000000000000..2755ba4d9b2f
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2022 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.core.annotation
+
+/**
+ * @author Sam Brannen
+ * @since 5.3.16
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+public annotation class Filter(
+
+	@get:AliasFor("name")
+	val value: String = "",
+
+	@get:AliasFor("value")
+	val name: String = "",
+
+	val and: Filters = Filters()
+
+)
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/Filters.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filters.kt
new file mode 100644
index 000000000000..7a044fa2bb5c
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filters.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2002-2022 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.core.annotation
+
+/**
+ * @author Sam Brannen
+ * @since 5.3.16
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+public annotation class Filters(
+
+	vararg val value: Filter
+
+)
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt
new file mode 100644
index 000000000000..dedd3ced4166
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2002-2022 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.core.annotation
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.springframework.core.annotation.MergedAnnotations
+import org.springframework.core.annotation.MergedAnnotation
+
+/**
+ * Tests for {@link MergedAnnotations} and {@link MergedAnnotation} in Kotlin.
+ *
+ * @author Sam Brannen
+ * @since 5.3.16
+ */
+class KotlinMergedAnnotationsTests {
+
+	@Test  // gh-28012
+	fun recursiveAnnotation() {
+		val method = javaClass.getMethod("personMethod")
+
+		// MergedAnnotations
+		val mergedAnnotations = MergedAnnotations.from(method)
+		assertThat(mergedAnnotations.isPresent(Person::class.java)).isTrue();
+
+		// MergedAnnotation
+		val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(Person::class.java))
+		assertThat(mergedAnnotation).isNotNull();
+
+		// Synthesized Annotations
+		val jane = mergedAnnotation.synthesize()
+		assertThat(jane).isInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(jane.value).isEqualTo("jane")
+		assertThat(jane.name).isEqualTo("jane")
+		val synthesizedFriends = jane.friends
+		assertThat(synthesizedFriends).hasSize(2)
+
+		val john = synthesizedFriends[0]
+		assertThat(john).isInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(john.value).isEqualTo("john")
+		assertThat(john.name).isEqualTo("john")
+
+		val sally = synthesizedFriends[1]
+		assertThat(sally).isInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(sally.value).isEqualTo("sally")
+		assertThat(sally.name).isEqualTo("sally")
+	}
+
+	@Test  // gh-28012
+	fun recursiveNestedAnnotation() {
+		val method = javaClass.getMethod("filterMethod")
+
+		// MergedAnnotations
+		val mergedAnnotations = MergedAnnotations.from(method)
+		assertThat(mergedAnnotations.isPresent(Filter::class.java)).isTrue();
+
+		// MergedAnnotation
+		val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(Filter::class.java))
+		assertThat(mergedAnnotation).isNotNull();
+
+		// Synthesized Annotations
+		val fooFilter = mergedAnnotation.synthesize()
+		assertThat(fooFilter).isInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(fooFilter.value).isEqualTo("foo")
+		assertThat(fooFilter.name).isEqualTo("foo")
+		val filters = fooFilter.and
+		assertThat(filters.value).hasSize(2)
+
+		val barFilter = filters.value[0]
+		assertThat(barFilter).isInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(barFilter.value).isEqualTo("bar")
+		assertThat(barFilter.name).isEqualTo("bar")
+		assertThat(barFilter.and.value).isEmpty()
+
+		val bazFilter = filters.value[1]
+		assertThat(bazFilter).isInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(bazFilter.value).isEqualTo("baz")
+		assertThat(bazFilter.name).isEqualTo("baz")
+		assertThat(bazFilter.and.value).isEmpty()
+	}
+
+
+	@Person("jane", friends = [Person("john"), Person("sally")])
+	fun personMethod() {
+	}
+
+	@Filter("foo", and = Filters(Filter("bar"), Filter("baz")))
+	fun filterMethod() {
+	}
+
+}
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt
new file mode 100644
index 000000000000..28d67c4a2364
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2022 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.core.annotation
+
+/**
+ * @author Sam Brannen
+ * @since 5.3.16
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+public annotation class Person(
+
+	@get:AliasFor("name")
+	val value: String = "",
+
+	@get:AliasFor("value")
+	val name: String = "",
+
+	vararg val friends: Person = []
+
+)

From 2f78abd56e39eb95c32fd211ca738359f8eec3e5 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 14 Feb 2022 10:29:45 +0100
Subject: [PATCH 679/735] Upgrade CI pipeline

This commit upgrades the CI pipeline with the following:

* replace JDK16 with JDK17 as build variant
* upgrade all JDK versions
* replace docker-image with registry-image resource for CI image
---
 ci/images/ci-image/Dockerfile |  2 +-
 ci/images/get-jdk-url.sh      |  9 ++++++---
 ci/parameters.yml             |  3 ---
 ci/pipeline.yml               | 16 ++++++++--------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index c38b735bb7b7..edc9eac649b0 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -6,6 +6,6 @@ RUN ./setup.sh java8
 
 ENV JAVA_HOME /opt/openjdk/java8
 ENV JDK11 /opt/openjdk/java11
-ENV JDK16 /opt/openjdk/java16
+ENV JDK17 /opt/openjdk/java17
 
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index 530866224d1a..d090494f6627 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -6,10 +6,13 @@ case "$1" in
 		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz"
+		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz"
 	;;
-  java16)
-		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
+  java17)
+		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz"
+  ;;
+  java18)
+		 echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-02-12-08-06-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-02-12-08-06.tar.gz"
   ;;
   *)
 		echo $"Unknown java version"
diff --git a/ci/parameters.yml b/ci/parameters.yml
index 28486ecec729..7f26578d27a2 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -1,6 +1,3 @@
-email-server: "smtp.svc.pivotal.io"
-email-from: "ci@spring.io"
-email-to: ["spring-framework-dev@pivotal.io"]
 github-repo: "https://github.com/spring-projects/spring-framework.git"
 github-repo-name: "spring-projects/spring-framework"
 docker-hub-organization: "springci"
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 64f6ffe3ad1a..03545186aea5 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -87,7 +87,7 @@ resources:
     branch: ((branch))
     paths: ["ci/images/*"]
 - name: ci-image
-  type: docker-image
+  type: registry-image
   icon: docker
   source:
     <<: *docker-resource-source
@@ -124,14 +124,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk16-build
+- name: repo-status-jdk17-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
     access_token: ((github-ci-status-token))
     branch: ((branch))
-    context: jdk16-build
+    context: jdk17-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -249,7 +249,7 @@ jobs:
           <<: *slack-fail-params
   - put: repo-status-jdk11-build
     params: { state: "success", commit: "git-repo" }
-- name: jdk16-build
+- name: jdk17-build
   serial: true
   public: true
   plan:
@@ -257,7 +257,7 @@ jobs:
     - get: git-repo
     - get: every-morning
       trigger: true
-    - put: repo-status-jdk16-build
+    - put: repo-status-jdk17-build
       params: { state: "pending", commit: "git-repo" }
     - do:
       - task: check-project
@@ -270,12 +270,12 @@ jobs:
           <<: *build-project-task-params
       on_failure:
         do:
-          - put: repo-status-jdk16-build
+          - put: repo-status-jdk17-build
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
               <<: *slack-fail-params
-    - put: repo-status-jdk16-build
+    - put: repo-status-jdk17-build
       params: { state: "success", commit: "git-repo" }
 - name: build-pull-requests
   serial: true
@@ -458,7 +458,7 @@ jobs:
 
 groups:
 - name: "builds"
-  jobs: ["build", "jdk11-build", "jdk16-build"]
+  jobs: ["build", "jdk11-build", "jdk17-build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"

From 8eb618b480896092cae04d1c5e412f7a5dba0c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Mon, 14 Feb 2022 10:08:42 +0100
Subject: [PATCH 680/735] Make Kotlin functions accessible in CoroutinesUtils

In order to allow using private classes like in Java
for example.

Closes gh-23840
---
 .../springframework/core/CoroutinesUtils.java    |  6 +++++-
 .../result/KotlinInvocableHandlerMethodTests.kt  | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
index 50aec2deb3a6..6770f01c0a04 100644
--- a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import kotlin.reflect.KClassifier;
 import kotlin.reflect.KFunction;
 import kotlin.reflect.full.KCallables;
+import kotlin.reflect.jvm.KCallablesJvm;
 import kotlin.reflect.jvm.ReflectJvmMapping;
 import kotlinx.coroutines.BuildersKt;
 import kotlinx.coroutines.CoroutineStart;
@@ -70,6 +71,9 @@ public static <T> Deferred<T> monoToDeferred(Mono<T> source) {
 	 */
 	public static Publisher<?> invokeSuspendingFunction(Method method, Object target, Object... args) {
 		KFunction<?> function = Objects.requireNonNull(ReflectJvmMapping.getKotlinFunction(method));
+		if (method.isAccessible() && !KCallablesJvm.isAccessible(function)) {
+			KCallablesJvm.setAccessible(function, true);
+		}
 		KClassifier classifier = function.getReturnType().getClassifier();
 		Mono<Object> mono = MonoKt.mono(Dispatchers.getUnconfined(), (scope, continuation) ->
 					KCallables.callSuspend(function, getSuspendedFunctionArgs(target, args), continuation))
diff --git a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/KotlinInvocableHandlerMethodTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/KotlinInvocableHandlerMethodTests.kt
index 8589ddc570fa..133046955275 100644
--- a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/KotlinInvocableHandlerMethodTests.kt
+++ b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/KotlinInvocableHandlerMethodTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -97,6 +97,14 @@ class KotlinInvocableHandlerMethodTests {
 		assertThat(this.exchange.response.headers.getFirst("foo")).isEqualTo("bar")
 	}
 
+	@Test
+	fun privateController() {
+		this.resolvers.add(stubResolver("foo"))
+		val method = PrivateCoroutinesController::singleArg.javaMethod!!
+		val result = invoke(PrivateCoroutinesController(), method,"foo")
+		assertHandlerResultValue(result, "success:foo")
+	}
+
 	private fun invoke(handler: Any, method: Method, vararg providedArgs: Any?): Mono<HandlerResult> {
 		val invocable = InvocableHandlerMethod(handler, method)
 		invocable.setArgumentResolvers(this.resolvers)
@@ -146,7 +154,13 @@ class KotlinInvocableHandlerMethodTests {
 			delay(10)
 			response.headers.add("foo", "bar")
 		}
+	}
 
+	private class PrivateCoroutinesController {
 
+		suspend fun singleArg(q: String?): String {
+			delay(10)
+			return "success:$q"
+		}
 	}
 }
\ No newline at end of file

From 0ab054c7b943d65bb9034d1d7987f556e9d54d05 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 14 Feb 2022 10:55:07 +0100
Subject: [PATCH 681/735] Upgrade concourse-release-scripts in CI

This commit also reverts the change of resource type for the publication
of the CI image and fixes a bug in the CI image setup with available
JDKs.
---
 ci/images/setup.sh | 4 ++--
 ci/pipeline.yml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index ff18f849f40c..3e1e0bc05c2d 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -14,7 +14,7 @@ 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 --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.3.3/concourse-release-scripts-0.3.3.jar
 
 ###########################################################
 # JAVA
@@ -22,7 +22,7 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java8 java11 java16
+for jdk in java8 java11 java17
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 03545186aea5..eb8de81ea1e1 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -87,7 +87,7 @@ resources:
     branch: ((branch))
     paths: ["ci/images/*"]
 - name: ci-image
-  type: registry-image
+  type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source

From 303e363adfdfde100f62fc28f08b34ab9fdfb96e Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 14 Feb 2022 11:47:16 +0100
Subject: [PATCH 682/735] Configure Gradle JVM toolchain for Kotlin tasks

---
 gradle/toolchains.gradle | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index b0bf0af03342..4f7c96e80ead 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -98,22 +98,22 @@ 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()
+		kotlin {
+			jvmToolchain {
+				languageVersion.set(mainLanguageVersion)
+			}
+		}
 		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
 			}
 		}
 	}
@@ -136,11 +136,15 @@ pluginManager.withPlugin("kotlin") {
 		def compiler = javaToolchains.compilerFor {
 			languageVersion = testLanguageVersion
 		}
+		kotlin {
+			jvmToolchain {
+				languageVersion.set(testLanguageVersion)
+			}
+		}
 		// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
 		compileTestKotlin {
 			kotlinOptions {
 				jvmTarget = testLanguageVersion.toString()
-				jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
 			}
 		}
 	}

From ad2722b3a3ac2bc8b036b37242e263f0d33e6339 Mon Sep 17 00:00:00 2001
From: heowc <heowc1992@gmail.com>
Date: Sat, 22 Jan 2022 15:22:47 +0900
Subject: [PATCH 683/735] MissingServletRequestPartException extends
 ServletRequestBindingException

Closes gh-27948
---
 .../MissingServletRequestPartException.java   |  8 ++++----
 .../ResponseEntityExceptionHandler.java       | 13 +++++++------
 .../DefaultHandlerExceptionResolver.java      | 19 ++++++++++---------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
index f19d587f5e2f..539ec6a5ea83 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,7 @@
 
 package org.springframework.web.multipart.support;
 
-import jakarta.servlet.ServletException;
-
+import org.springframework.web.bind.ServletRequestBindingException;
 import org.springframework.web.multipart.MultipartResolver;
 
 /**
@@ -30,10 +29,11 @@
  * e.g. no {@link MultipartResolver}.
  *
  * @author Rossen Stoyanchev
+ * @author Wonchul Heo
  * @since 3.1
  */
 @SuppressWarnings("serial")
-public class MissingServletRequestPartException extends ServletException {
+public class MissingServletRequestPartException extends ServletRequestBindingException {
 
 	private final String requestPartName;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
index c4f3076efa55..6c9e70c8e46a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@
  * detected, {@link ExceptionHandlerExceptionResolver} must be configured.
  *
  * @author Rossen Stoyanchev
+ * @author Wonchul Heo
  * @since 3.2
  * @see #handleException(Exception, WebRequest)
  * @see org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver
@@ -108,13 +109,13 @@ public abstract class ResponseEntityExceptionHandler {
 			HttpMediaTypeNotAcceptableException.class,
 			MissingPathVariableException.class,
 			MissingServletRequestParameterException.class,
+			MissingServletRequestPartException.class,
 			ServletRequestBindingException.class,
 			ConversionNotSupportedException.class,
 			TypeMismatchException.class,
 			HttpMessageNotReadableException.class,
 			HttpMessageNotWritableException.class,
 			MethodArgumentNotValidException.class,
-			MissingServletRequestPartException.class,
 			BindException.class,
 			NoHandlerFoundException.class,
 			AsyncRequestTimeoutException.class
@@ -143,6 +144,10 @@ else if (ex instanceof MissingServletRequestParameterException) {
 			HttpStatus status = HttpStatus.BAD_REQUEST;
 			return handleMissingServletRequestParameter((MissingServletRequestParameterException) ex, headers, status, request);
 		}
+		else if (ex instanceof MissingServletRequestPartException) {
+			HttpStatus status = HttpStatus.BAD_REQUEST;
+			return handleMissingServletRequestPart((MissingServletRequestPartException) ex, headers, status, request);
+		}
 		else if (ex instanceof ServletRequestBindingException) {
 			HttpStatus status = HttpStatus.BAD_REQUEST;
 			return handleServletRequestBindingException((ServletRequestBindingException) ex, headers, status, request);
@@ -167,10 +172,6 @@ else if (ex instanceof MethodArgumentNotValidException) {
 			HttpStatus status = HttpStatus.BAD_REQUEST;
 			return handleMethodArgumentNotValid((MethodArgumentNotValidException) ex, headers, status, request);
 		}
-		else if (ex instanceof MissingServletRequestPartException) {
-			HttpStatus status = HttpStatus.BAD_REQUEST;
-			return handleMissingServletRequestPart((MissingServletRequestPartException) ex, headers, status, request);
-		}
 		else if (ex instanceof BindException) {
 			HttpStatus status = HttpStatus.BAD_REQUEST;
 			return handleBindException((BindException) ex, headers, status, request);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index dfd379d7ac49..4aa1b2b6646d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -90,6 +90,10 @@
  * <td><p>400 (SC_BAD_REQUEST)</p></td>
  * </tr>
  * <tr class="rowColor">
+ * <td><p>MissingServletRequestPartException</p></td>
+ * <td><p>400 (SC_BAD_REQUEST)</p></td>
+ * </tr>
+ * <tr class="rowColor">
  * <td><p>ServletRequestBindingException</p></td>
  * <td><p>400 (SC_BAD_REQUEST)</p></td>
  * </tr>
@@ -113,10 +117,6 @@
  * <td><p>MethodArgumentNotValidException</p></td>
  * <td><p>400 (SC_BAD_REQUEST)</p></td>
  * </tr>
- * <tr class="rowColor">
- * <td><p>MissingServletRequestPartException</p></td>
- * <td><p>400 (SC_BAD_REQUEST)</p></td>
- * </tr>
  * <tr class="altColor">
  * <td><p>BindException</p></td>
  * <td><p>400 (SC_BAD_REQUEST)</p></td>
@@ -135,6 +135,7 @@
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
+ * @author Wonchul Heo
  * @since 3.0
  * @see org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler
  */
@@ -188,6 +189,10 @@ else if (ex instanceof MissingServletRequestParameterException) {
 				return handleMissingServletRequestParameter(
 						(MissingServletRequestParameterException) ex, request, response, handler);
 			}
+			else if (ex instanceof MissingServletRequestPartException) {
+				return handleMissingServletRequestPartException(
+						(MissingServletRequestPartException) ex, request, response, handler);
+			}
 			else if (ex instanceof ServletRequestBindingException) {
 				return handleServletRequestBindingException(
 						(ServletRequestBindingException) ex, request, response, handler);
@@ -212,10 +217,6 @@ else if (ex instanceof MethodArgumentNotValidException) {
 				return handleMethodArgumentNotValidException(
 						(MethodArgumentNotValidException) ex, request, response, handler);
 			}
-			else if (ex instanceof MissingServletRequestPartException) {
-				return handleMissingServletRequestPartException(
-						(MissingServletRequestPartException) ex, request, response, handler);
-			}
 			else if (ex instanceof BindException) {
 				return handleBindException((BindException) ex, request, response, handler);
 			}

From 7ecfce2386016803742e580fe246a3084d17a813 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Fri, 11 Feb 2022 11:04:35 +0000
Subject: [PATCH 684/735] Polishing contribution

See gh-27948
---
 .../support/MissingServletRequestPartException.java | 13 +++++--------
 .../annotation/ResponseEntityExceptionHandler.java  |  1 -
 .../support/DefaultHandlerExceptionResolver.java    |  1 -
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
index 539ec6a5ea83..93f332fabf86 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MissingServletRequestPartException.java
@@ -20,16 +20,13 @@
 import org.springframework.web.multipart.MultipartResolver;
 
 /**
- * Raised when the part of a "multipart/form-data" request identified by its
- * name cannot be found.
- *
- * <p>This may be because the request is not a multipart/form-data request,
- * because the part is not present in the request, or because the web
- * application is not configured correctly for processing multipart requests,
- * e.g. no {@link MultipartResolver}.
+ * Signals the part of a "multipart/form-data" request, identified by name
+ * could not be found. This may be because the request is not a multipart
+ * request, or a part with that name is not present, or because the application
+ * is not configured correctly for processing multipart requests, e.g. there
+ * is no {@link MultipartResolver}.
  *
  * @author Rossen Stoyanchev
- * @author Wonchul Heo
  * @since 3.1
  */
 @SuppressWarnings("serial")
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
index 6c9e70c8e46a..6252e7cf25f9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
@@ -73,7 +73,6 @@
  * detected, {@link ExceptionHandlerExceptionResolver} must be configured.
  *
  * @author Rossen Stoyanchev
- * @author Wonchul Heo
  * @since 3.2
  * @see #handleException(Exception, WebRequest)
  * @see org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index 4aa1b2b6646d..6ee73d49ab68 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -135,7 +135,6 @@
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
- * @author Wonchul Heo
  * @since 3.0
  * @see org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler
  */

From 4c410cbe54e1383cb5e6b6ee7e2f5330023c218a Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 14 Feb 2022 13:04:09 +0100
Subject: [PATCH 685/735] Remove toolchain configuration for Kotlin

Kotlin currently only supports JDK17 language level, which is our
minimum requirement so far.
This commit simplifies the toolchain setup until this is needed again.

See 303e363adfd
---
 gradle/toolchains.gradle | 56 +++++-----------------------------------
 1 file changed, 7 insertions(+), 49 deletions(-)

diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 4f7c96e80ead..f7eaeb8c2f4d 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -95,57 +95,15 @@ plugins.withType(GroovyPlugin) {
 }
 
 pluginManager.withPlugin("kotlin") {
-	// Configure the Kotlin compiler if the 'mainToolchain' property is defined
-	if (mainToolchainConfigured()) {
-		def mainLanguageVersion = mainToolchainLanguageVersion()
-		// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
-		def javaVersion = mainLanguageVersion.toString()
-		kotlin {
-			jvmToolchain {
-				languageVersion.set(mainLanguageVersion)
-			}
-		}
-		compileKotlin {
-			kotlinOptions {
-				jvmTarget = javaVersion
-			}
-		}
-		// Compile the test classes with the same version, 'testToolchain' will override if defined
-		compileTestKotlin {
-			kotlinOptions {
-				jvmTarget = javaVersion
-			}
-		}
-	}
-	else {
-		// Fallback to JDK17
-		compileKotlin {
-			kotlinOptions {
-				jvmTarget = '17'
-			}
-		}
-		compileTestKotlin {
-			kotlinOptions {
-				jvmTarget = '17'
-			}
+	// Fallback to JDK17
+	compileKotlin {
+		kotlinOptions {
+			jvmTarget = '17'
 		}
 	}
-
-	if (testToolchainConfigured()) {
-		def testLanguageVersion = testToolchainLanguageVersion()
-		def compiler = javaToolchains.compilerFor {
-			languageVersion = testLanguageVersion
-		}
-		kotlin {
-			jvmToolchain {
-				languageVersion.set(testLanguageVersion)
-			}
-		}
-		// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
-		compileTestKotlin {
-			kotlinOptions {
-				jvmTarget = testLanguageVersion.toString()
-			}
+	compileTestKotlin {
+		kotlinOptions {
+			jvmTarget = '17'
 		}
 	}
 }

From 88f73bffa0e98c1e14db065c86d17c5d6295cee0 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 14 Feb 2022 16:21:41 +0100
Subject: [PATCH 686/735] Make assertion message lazy in
 ServletRequestPathUtils

Closes gh-27946
---
 .../org/springframework/web/util/ServletRequestPathUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java b/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
index 1c4455dbbe99..43eda1c21d11 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ServletRequestPathUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -74,7 +74,7 @@ public static RequestPath parseAndCache(HttpServletRequest request) {
 	 */
 	public static RequestPath getParsedRequestPath(ServletRequest request) {
 		RequestPath path = (RequestPath) request.getAttribute(PATH_ATTRIBUTE);
-		Assert.notNull(path, "Expected parsed RequestPath in request attribute \"" + PATH_ATTRIBUTE + "\".");
+		Assert.notNull(path, () -> "Expected parsed RequestPath in request attribute \"" + PATH_ATTRIBUTE + "\".");
 		return path;
 	}
 

From c5e1a774a5a1e27eb1ca693b663ec37e6583ac41 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 14 Feb 2022 14:31:19 +0100
Subject: [PATCH 687/735] Add bean instance generator infrastructure

This commit provides the necessary infrastructure to let components
contribute statements that are used to fully instantiate a bean
instance.

To ease code generation, a dedicated infrastructure to register bean
definition is provided in the o.s.beans.factory.generator package.
BeanDefinitionRegistrar offers a builder style API that provides a way
to hide how injected elements are resolved at runtime and let
contributors provide code that may throw a checked exception.

BeanInstanceContributor is the interface that components can implement
to contribute to a bean instance setup. DefaultBeanInstanceGenerator
generates, for a particular bean definition, the necessary statements
to instantiate a bean.

Closes gh-28047
---
 .../generator/BeanInstanceContributor.java    |  51 ++
 .../generator/BeanParameterGenerator.java     | 218 ++++++++
 .../DefaultBeanInstanceGenerator.java         | 165 ++++++
 .../factory/generator/InjectionGenerator.java | 239 +++++++++
 .../config/BeanDefinitionRegistrar.java       | 408 +++++++++++++++
 .../config/InjectedConstructionResolver.java  | 175 +++++++
 .../config/InjectedElementAttributes.java     |  93 ++++
 .../config/InjectedElementResolver.java       |  75 +++
 .../config/InjectedFieldResolver.java         |  71 +++
 .../config/InjectedMethodResolver.java        |  86 ++++
 .../generator/config/package-info.java        |   9 +
 .../BeanParameterGeneratorTests.java          | 264 ++++++++++
 .../DefaultBeanInstanceGeneratorTests.java    | 255 ++++++++++
 .../generator/InjectionGeneratorTests.java    | 269 ++++++++++
 .../config/BeanDefinitionRegistrarTests.java  | 458 +++++++++++++++++
 .../InjectedConstructionResolverTests.java    | 476 ++++++++++++++++++
 .../InjectedElementAttributesTests.java       |  91 ++++
 .../config/InjectedFieldResolverTests.java    |  78 +++
 .../config/InjectedMethodResolverTests.java   | 124 +++++
 .../InnerComponentConfiguration.java          |  36 ++
 .../generator/SimpleConfiguration.java        |  32 ++
 .../generator/factory/NumberHolder.java       |  36 ++
 .../factory/NumberHolderFactoryBean.java      |  45 ++
 .../generator/factory/SampleFactory.java      |  41 ++
 .../injection/InjectionComponent.java         |  37 ++
 .../generator/property/ConfigurableBean.java  |  33 ++
 .../ProtectedConstructorComponent.java        |  24 +
 .../visibility/ProtectedFactoryMethod.java    |  25 +
 .../generator/ResolvableTypeGenerator.java    |  68 +++
 .../aot/hint/ReflectionHints.java             |  23 +
 .../javapoet/support/MultiStatement.java      |  26 +-
 .../ResolvableTypeGeneratorTests.java         |  62 +++
 .../aot/hint/ReflectionHintsTests.java        |  37 +-
 33 files changed, 4119 insertions(+), 11 deletions(-)
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceContributor.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanParameterGenerator.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolver.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementAttributes.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementResolver.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedFieldResolver.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedMethodResolver.java
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/config/package-info.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/BeanParameterGeneratorTests.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrarTests.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolverTests.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedElementAttributesTests.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedFieldResolverTests.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedMethodResolverTests.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/InnerComponentConfiguration.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/SimpleConfiguration.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolder.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolderFactoryBean.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/SampleFactory.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/injection/InjectionComponent.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/property/ConfigurableBean.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedConstructorComponent.java
 create mode 100644 spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedFactoryMethod.java
 create mode 100644 spring-core/src/main/java/org/springframework/aot/generator/ResolvableTypeGenerator.java
 create mode 100644 spring-core/src/test/java/org/springframework/aot/generator/ResolvableTypeGeneratorTests.java

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceContributor.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceContributor.java
new file mode 100644
index 000000000000..338334bbd257
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceContributor.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import org.springframework.aot.generator.CodeContribution;
+
+/**
+ * Strategy interface to be implemented by components that participates in a
+ * bean instance setup so that the generated code provides an equivalent
+ * setup.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+@FunctionalInterface
+public interface BeanInstanceContributor {
+
+	/**
+	 * A {@link BeanInstanceContributor} that does not contribute anything
+	 * to the {@link CodeContribution}.
+	 */
+	BeanInstanceContributor NO_OP = contribution -> { };
+
+	/**
+	 * Contribute to the specified {@link CodeContribution}.
+	 * <p>Implementation of this interface can assume the following variables
+	 * to be accessible:
+	 * <ul>
+	 * <li>{@code beanFactory}: the general {@code DefaultListableBeanFactory}</li>
+	 * <li>{@code instanceContext}: the {@code BeanInstanceContext} callback</li>
+	 * <li>{@code bean}: the variable that refers to the bean instance</li>
+	 * </ul>
+	 * @param contribution the {@link CodeContribution} to use
+	 */
+	void contribute(CodeContribution contribution);
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanParameterGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanParameterGenerator.java
new file mode 100644
index 000000000000..dccc5b660f55
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanParameterGenerator.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import java.lang.reflect.Executable;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.springframework.aot.generator.ResolvableTypeGenerator;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.beans.factory.support.ManagedSet;
+import org.springframework.core.ResolvableType;
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.CodeBlock.Builder;
+import org.springframework.javapoet.support.MultiCodeBlock;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Support for writing parameters.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class BeanParameterGenerator {
+
+	private final ResolvableTypeGenerator typeGenerator = new ResolvableTypeGenerator();
+
+	private final BiConsumer<BeanDefinition, Builder> innerBeanDefinitionWriter;
+
+
+	/**
+	 * Create an instance with the callback to use to write an inner bean
+	 * definition.
+	 * @param innerBeanDefinitionWriter the inner bean definition writer
+	 */
+	public BeanParameterGenerator(BiConsumer<BeanDefinition, Builder> innerBeanDefinitionWriter) {
+		this.innerBeanDefinitionWriter = innerBeanDefinitionWriter;
+	}
+
+	/**
+	 * Create an instance with no support for inner bean definitions.
+	 */
+	public BeanParameterGenerator() {
+		this((beanDefinition, builder) -> {
+			throw new IllegalStateException("Inner bean definition is not supported by this instance");
+		});
+	}
+
+
+	/**
+	 * Write the specified parameter {@code value}.
+	 * @param value the value of the parameter
+	 * @return the value of the parameter
+	 */
+	public CodeBlock writeParameterValue(@Nullable Object value) {
+		return writeParameterValue(value, () -> ResolvableType.forInstance(value));
+	}
+
+	/**
+	 * Write the specified parameter {@code value}.
+	 * @param value the value of the parameter
+	 * @param parameterType the type of the parameter
+	 * @return the value of the parameter
+	 */
+	public CodeBlock writeParameterValue(@Nullable Object value, Supplier<ResolvableType> parameterType) {
+		Builder code = CodeBlock.builder();
+		writeParameterValue(code, value, parameterType);
+		return code.build();
+	}
+
+	/**
+	 * Write the parameter types of the specified {@link Executable}.
+	 * @param executable the executable
+	 * @return the parameter types of the executable as a comma separated list
+	 */
+	public CodeBlock writeExecutableParameterTypes(Executable executable) {
+		Class<?>[] parameterTypes = Arrays.stream(executable.getParameters())
+				.map(Parameter::getType).toArray(Class<?>[]::new);
+		return CodeBlock.of(Arrays.stream(parameterTypes).map(d -> "$T.class")
+				.collect(Collectors.joining(", ")), (Object[]) parameterTypes);
+	}
+
+	private void writeParameterValue(Builder code, @Nullable Object value, Supplier<ResolvableType> parameterTypeSupplier) {
+		if (value == null) {
+			code.add("null");
+			return;
+		}
+		ResolvableType parameterType = parameterTypeSupplier.get();
+		if (parameterType.isArray()) {
+			code.add("new $T { ", parameterType.toClass());
+			code.add(writeAll(Arrays.asList(ObjectUtils.toObjectArray(value)),
+					item -> parameterType.getComponentType()));
+			code.add(" }");
+		}
+		else if (value instanceof List<?> list) {
+			if (list.isEmpty()) {
+				code.add("$T.emptyList()", Collections.class);
+			}
+			else {
+				Class<?> listType = (value instanceof ManagedList ? ManagedList.class : List.class);
+				code.add("$T.of(", listType);
+				ResolvableType collectionType = parameterType.as(List.class).getGenerics()[0];
+				code.add(writeAll(list, item -> collectionType));
+				code.add(")");
+			}
+		}
+		else if (value instanceof Set<?> set) {
+			if (set.isEmpty()) {
+				code.add("$T.emptySet()", Collections.class);
+			}
+			else {
+				Class<?> setType = (value instanceof ManagedSet ? ManagedSet.class : Set.class);
+				code.add("$T.of(", setType);
+				ResolvableType collectionType = parameterType.as(Set.class).getGenerics()[0];
+				code.add(writeAll(set, item -> collectionType));
+				code.add(")");
+			}
+		}
+		else if (value instanceof Map<?, ?> map) {
+			if (map.size() <= 10) {
+				code.add("$T.of(", Map.class);
+				List<Object> parameters = new ArrayList<>();
+				map.forEach((mapKey, mapValue) -> {
+					parameters.add(mapKey);
+					parameters.add(mapValue);
+				});
+				code.add(writeAll(parameters, ResolvableType::forInstance));
+				code.add(")");
+			}
+		}
+		else if (value instanceof Character character) {
+			String result = '\'' + characterLiteralWithoutSingleQuotes(character) + '\'';
+			code.add(result);
+		}
+		else if (isPrimitiveOrWrapper(value)) {
+			code.add("$L", value);
+		}
+		else if (value instanceof String) {
+			code.add("$S", value);
+		}
+		else if (value instanceof Enum<?> enumValue) {
+			code.add("$T.$N", enumValue.getClass(), enumValue.name());
+		}
+		else if (value instanceof Class) {
+			code.add("$T.class", value);
+		}
+		else if (value instanceof ResolvableType) {
+			code.add(this.typeGenerator.generateTypeFor((ResolvableType) value));
+		}
+		else if (value instanceof BeanDefinition) {
+			this.innerBeanDefinitionWriter.accept((BeanDefinition) value, code);
+		}
+		else if (value instanceof BeanReference) {
+			code.add("new $T($S)", RuntimeBeanReference.class, ((BeanReference) value).getBeanName());
+		}
+		else {
+			throw new IllegalArgumentException("Parameter of type " + parameterType + " is not supported");
+		}
+	}
+
+	private <T> CodeBlock writeAll(Iterable<T> items, Function<T, ResolvableType> elementType) {
+		MultiCodeBlock multi = new MultiCodeBlock();
+		items.forEach(item -> multi.add(code ->
+				writeParameterValue(code, item, () -> elementType.apply(item))));
+		return multi.join(", ");
+	}
+
+	private boolean isPrimitiveOrWrapper(Object value) {
+		Class<?> valueType = value.getClass();
+		return (valueType.isPrimitive() || valueType == Double.class || valueType == Float.class
+				|| valueType == Long.class || valueType == Integer.class || valueType == Short.class
+				|| valueType == Character.class || valueType == Byte.class || valueType == Boolean.class);
+	}
+
+	// Copied from com.squareup.javapoet.Util
+	private static String characterLiteralWithoutSingleQuotes(char c) {
+		// see https://docs.oracle.com/javase/specs/jls/se7/html/jls-3.html#jls-3.10.6
+		return switch (c) {
+			case '\b' -> "\\b"; /* \u0008: backspace (BS) */
+			case '\t' -> "\\t"; /* \u0009: horizontal tab (HT) */
+			case '\n' -> "\\n"; /* \u000a: linefeed (LF) */
+			case '\f' -> "\\f"; /* \u000c: form feed (FF) */
+			case '\r' -> "\\r"; /* \u000d: carriage return (CR) */
+			case '\"' -> "\""; /* \u0022: double quote (") */
+			case '\'' -> "\\'"; /* \u0027: single quote (') */
+			case '\\' -> "\\\\"; /* \u005c: backslash (\) */
+			default -> Character.isISOControl(c) ? String.format("\\u%04x", (int) c) : Character.toString(c);
+		};
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
new file mode 100644
index 000000000000..8c5006150f5c
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.aot.generator.CodeContribution;
+import org.springframework.aot.generator.DefaultCodeContribution;
+import org.springframework.aot.generator.ProtectedAccess.Options;
+import org.springframework.aot.hint.ExecutableMode;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.util.ClassUtils;
+
+/**
+ * Write the necessary statements to instantiate a bean.
+ *
+ * @author Stephane Nicoll
+ */
+class DefaultBeanInstanceGenerator {
+
+	private static final Options BEAN_INSTANCE_OPTIONS = new Options(false, true);
+
+	private final Executable instanceCreator;
+
+	private final List<BeanInstanceContributor> contributors;
+
+	private final InjectionGenerator injectionGenerator;
+
+
+	DefaultBeanInstanceGenerator(Executable instanceCreator, List<BeanInstanceContributor> contributors) {
+		this.instanceCreator = instanceCreator;
+		this.contributors = List.copyOf(contributors);
+		this.injectionGenerator = new InjectionGenerator();
+	}
+
+	/**
+	 * Return the necessary code to instantiate and post-process the bean
+	 * handled by this instance.
+	 * @param runtimeHints the runtime hints instance to use
+	 * @return a code contribution that provides an initialized bean instance
+	 */
+	public CodeContribution generateBeanInstance(RuntimeHints runtimeHints) {
+		DefaultCodeContribution contribution = new DefaultCodeContribution(runtimeHints);
+		contribution.protectedAccess().analyze(this.instanceCreator, BEAN_INSTANCE_OPTIONS);
+		if (this.instanceCreator instanceof Constructor<?> constructor) {
+			writeBeanInstantiation(contribution, constructor);
+		}
+		else if (this.instanceCreator instanceof Method method) {
+			writeBeanInstantiation(contribution, method);
+		}
+		return contribution;
+	}
+
+	private void writeBeanInstantiation(CodeContribution contribution, Constructor<?> constructor) {
+		Class<?> declaringType = ClassUtils.getUserClass(constructor.getDeclaringClass());
+		boolean innerClass = isInnerClass(declaringType);
+		boolean multiStatements = !this.contributors.isEmpty();
+		int minArgs = isInnerClass(declaringType) ? 2 : 1;
+		CodeBlock.Builder code = CodeBlock.builder();
+		// Shortcut for common case
+		if (!multiStatements && constructor.getParameterTypes().length < minArgs) {
+			if (innerClass) {
+				code.add("() -> beanFactory.getBean($T.class).new $L()",
+						declaringType.getEnclosingClass(), declaringType.getSimpleName());
+			}
+			else {
+				// Only apply the shortcut if there's one candidate
+				if (declaringType.getDeclaredConstructors().length > 1) {
+					code.add("() -> new $T()", declaringType);
+				}
+				else {
+					code.add("$T::new", declaringType);
+				}
+			}
+			contribution.statements().addStatement(code.build());
+			return;
+		}
+		contribution.runtimeHints().reflection().registerConstructor(constructor,
+				hint -> hint.withMode(ExecutableMode.INTROSPECT));
+		code.add("(instanceContext) ->");
+		branch(multiStatements, () -> code.beginControlFlow(""), () -> code.add(" "));
+		if (multiStatements) {
+			code.add("$T bean = ", declaringType);
+		}
+		code.add(this.injectionGenerator.writeInstantiation(constructor));
+		contribution.statements().addStatement(code.build());
+
+		if (multiStatements) {
+			for (BeanInstanceContributor contributor : this.contributors) {
+				contributor.contribute(contribution);
+			}
+			contribution.statements().addStatement("return bean")
+					.add(codeBlock -> codeBlock.unindent().add("}"));
+		}
+	}
+
+	private static boolean isInnerClass(Class<?> type) {
+		return type.isMemberClass() && !Modifier.isStatic(type.getModifiers());
+	}
+
+	private void writeBeanInstantiation(CodeContribution contribution, Method method) {
+		// Factory method can be introspected
+		contribution.runtimeHints().reflection().registerMethod(method,
+				hint -> hint.withMode(ExecutableMode.INTROSPECT));
+		List<Class<?>> parameterTypes = new ArrayList<>(Arrays.asList(method.getParameterTypes()));
+		boolean multiStatements = !this.contributors.isEmpty();
+		Class<?> declaringType = method.getDeclaringClass();
+		CodeBlock.Builder code = CodeBlock.builder();
+		// Shortcut for common case
+		if (!multiStatements && parameterTypes.isEmpty()) {
+			code.add("() -> ");
+			branch(Modifier.isStatic(method.getModifiers()),
+					() -> code.add("$T", declaringType),
+					() -> code.add("beanFactory.getBean($T.class)", declaringType));
+			code.add(".$L()", method.getName());
+			contribution.statements().addStatement(code.build());
+			return;
+		}
+		code.add("(instanceContext) ->");
+		branch(multiStatements, () -> code.beginControlFlow(""), () -> code.add(" "));
+		if (multiStatements) {
+			code.add("$T bean = ", method.getReturnType());
+		}
+		code.add(this.injectionGenerator.writeInstantiation(method));
+		contribution.statements().addStatement(code.build());
+		if (multiStatements) {
+			for (BeanInstanceContributor contributor : this.contributors) {
+				contributor.contribute(contribution);
+			}
+			contribution.statements().addStatement("return bean")
+					.add(codeBlock -> codeBlock.unindent().add("}"));
+		}
+	}
+
+	private static void branch(boolean condition, Runnable ifTrue, Runnable ifFalse) {
+		if (condition) {
+			ifTrue.run();
+		}
+		else {
+			ifFalse.run();
+		}
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java
new file mode 100644
index 000000000000..c4845b339b73
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.springframework.beans.factory.generator.config.BeanDefinitionRegistrar.BeanInstanceContext;
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.CodeBlock.Builder;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * Generate the necessary code to {@link #writeInstantiation(Executable)
+ * create a bean instance} or {@link #writeInjection(Member, boolean)
+ * inject dependencies}.
+ * <p/>
+ * The generator assumes a number of variables to be accessible:
+ * <ul>
+ *     <li>{@code beanFactory}: the general {@code DefaultListableBeanFactory}</li>
+ *     <li>{@code instanceContext}: the {@link BeanInstanceContext} callback</li>
+ *     <li>{@code bean}: the variable that refers to the bean instance</li>
+ * </ul>
+ *
+ * @author Stephane Nicoll
+ * @author Brian Clozel
+ */
+public class InjectionGenerator {
+
+	private final BeanParameterGenerator parameterGenerator = new BeanParameterGenerator();
+
+
+	/**
+	 * Write the necessary code to instantiate an object using the specified
+	 * {@link Executable}. The code is suitable to be assigned to a variable
+	 * or used as a {@literal return} statement.
+	 * @param creator the executable to invoke to create an instance of the
+	 * requested object
+	 * @return the code to instantiate an object using the specified executable
+	 */
+	public CodeBlock writeInstantiation(Executable creator) {
+		if (creator instanceof Constructor<?> constructor) {
+			return write(constructor);
+		}
+		if (creator instanceof Method method) {
+			return writeMethodInstantiation(method);
+		}
+		throw new IllegalArgumentException("Could not handle creator " + creator);
+	}
+
+	/**
+	 * Write the code to inject a value resolved by {@link BeanInstanceContext}
+	 * in the specified {@link Member}.
+	 * @param member the field or method to inject
+	 * @param required whether the value is required
+	 * @return a statement that injects a value to the specified membmer
+	 */
+	public CodeBlock writeInjection(Member member, boolean required) {
+		if (member instanceof Method method) {
+			return writeMethodInjection(method, required);
+		}
+		if (member instanceof Field field) {
+			return writeFieldInjection(field, required);
+		}
+		throw new IllegalArgumentException("Could not handle member " + member);
+	}
+
+	private CodeBlock write(Constructor<?> creator) {
+		Builder code = CodeBlock.builder();
+		Class<?> declaringType = ClassUtils.getUserClass(creator.getDeclaringClass());
+		boolean innerClass = isInnerClass(declaringType);
+		Class<?>[] parameterTypes = Arrays.stream(creator.getParameters()).map(Parameter::getType)
+				.toArray(Class<?>[]::new);
+		// Shortcut for common case
+		if (innerClass && parameterTypes.length == 1) {
+			code.add("beanFactory.getBean($T.class).new $L()", declaringType.getEnclosingClass(),
+					declaringType.getSimpleName());
+			return code.build();
+		}
+		if (parameterTypes.length == 0) {
+			code.add("new $T()", declaringType);
+			return code.build();
+		}
+		boolean isAmbiguous = Arrays.stream(creator.getDeclaringClass().getDeclaredConstructors())
+				.filter(constructor -> constructor.getParameterCount() == parameterTypes.length).count() > 1;
+		code.add("instanceContext.create(beanFactory, (attributes) ->");
+		List<CodeBlock> parameters = resolveParameters(creator.getParameters(), isAmbiguous);
+		if (innerClass) { // Remove the implicit argument
+			parameters.remove(0);
+		}
+
+		code.add(" ");
+		if (innerClass) {
+			code.add("beanFactory.getBean($T.class).new $L(", declaringType.getEnclosingClass(),
+					declaringType.getSimpleName());
+		}
+		else {
+			code.add("new $T(", declaringType);
+		}
+		for (int i = 0; i < parameters.size(); i++) {
+			code.add(parameters.get(i));
+			if (i < parameters.size() - 1) {
+				code.add(", ");
+			}
+		}
+		code.add(")");
+		code.add(")");
+		return code.build();
+	}
+
+	private static boolean isInnerClass(Class<?> type) {
+		return type.isMemberClass() && !Modifier.isStatic(type.getModifiers());
+	}
+
+	private CodeBlock writeMethodInstantiation(Method injectionPoint) {
+		if (injectionPoint.getParameterCount() == 0) {
+			Builder code = CodeBlock.builder();
+			Class<?> declaringType = injectionPoint.getDeclaringClass();
+			if (Modifier.isStatic(injectionPoint.getModifiers())) {
+				code.add("$T", declaringType);
+			}
+			else {
+				code.add("beanFactory.getBean($T.class)", declaringType);
+			}
+			code.add(".$L()", injectionPoint.getName());
+			return code.build();
+		}
+		return write(injectionPoint, code -> code.add(".create(beanFactory, (attributes) ->"), true);
+	}
+
+	private CodeBlock writeMethodInjection(Method injectionPoint, boolean required) {
+		Consumer<Builder> attributesResolver = code -> {
+			if (required) {
+				code.add(".invoke(beanFactory, (attributes) ->");
+			}
+			else {
+				code.add(".resolve(beanFactory, false).ifResolved((attributes) ->");
+			}
+		};
+		return write(injectionPoint, attributesResolver, false);
+	}
+
+	private CodeBlock write(Method injectionPoint, Consumer<Builder> attributesResolver, boolean instantiation) {
+		Builder code = CodeBlock.builder();
+		code.add("instanceContext");
+		if (!instantiation) {
+			code.add(".method($S, ", injectionPoint.getName());
+			code.add(this.parameterGenerator.writeExecutableParameterTypes(injectionPoint));
+			code.add(")\n").indent().indent();
+		}
+		attributesResolver.accept(code);
+		List<CodeBlock> parameters = resolveParameters(injectionPoint.getParameters(), false);
+		code.add(" ");
+		if (instantiation) {
+			if (Modifier.isStatic(injectionPoint.getModifiers())) {
+				code.add("$T", injectionPoint.getDeclaringClass());
+			}
+			else {
+				code.add("beanFactory.getBean($T.class)", injectionPoint.getDeclaringClass());
+			}
+		}
+		else {
+			code.add("bean");
+		}
+		code.add(".$L(", injectionPoint.getName());
+		code.add(CodeBlock.join(parameters, ", "));
+		code.add(")");
+		code.add(")");
+		if (!instantiation) {
+			code.unindent().unindent();
+		}
+		return code.build();
+	}
+
+	CodeBlock writeFieldInjection(Field injectionPoint, boolean required) {
+		Builder code = CodeBlock.builder();
+		code.add("instanceContext.field($S, $T.class", injectionPoint.getName(), injectionPoint.getType());
+		code.add(")\n").indent().indent();
+		if (required) {
+			code.add(".invoke(beanFactory, (attributes) ->");
+		}
+		else {
+			code.add(".resolve(beanFactory, false).ifResolved((attributes) ->");
+		}
+		boolean hasAssignment = Modifier.isPrivate(injectionPoint.getModifiers());
+		if (hasAssignment) {
+			code.beginControlFlow("");
+			String fieldName = String.format("%sField", injectionPoint.getName());
+			code.addStatement("$T $L = $T.findField($T.class, $S, $T.class)", Field.class, fieldName, ReflectionUtils.class,
+					injectionPoint.getDeclaringClass(), injectionPoint.getName(), injectionPoint.getType());
+			code.addStatement("$T.makeAccessible($L)", ReflectionUtils.class, fieldName);
+			code.addStatement("$T.setField($L, bean, attributes.get(0))", ReflectionUtils.class, fieldName);
+			code.unindent().add("}");
+		}
+		else {
+			code.add(" bean.$L = attributes.get(0)", injectionPoint.getName());
+		}
+		code.add(")").unindent().unindent();
+		return code.build();
+	}
+
+	private List<CodeBlock> resolveParameters(Parameter[] parameters, boolean shouldCast) {
+		List<CodeBlock> parameterValues = new ArrayList<>();
+		for (int i = 0; i < parameters.length; i++) {
+			if (shouldCast) {
+				parameterValues.add(CodeBlock.of("attributes.get($L, $T.class)", i, parameters[i].getType()));
+			}
+			else {
+				parameterValues.add(CodeBlock.of("attributes.get($L)", i));
+			}
+		}
+		return parameterValues;
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java
new file mode 100644
index 000000000000..149ddcc906af
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java
@@ -0,0 +1,408 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.beans.FatalBeanException;
+import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.core.MethodIntrospector;
+import org.springframework.core.ResolvableType;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * {@link BeanDefinition} registration mechanism offering transparent
+ * dependency resolution, as well as exception management.
+ *
+ * <p>Used by code generators and for internal use within the framework
+ * only.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class BeanDefinitionRegistrar {
+
+	private static final Log logger = LogFactory.getLog(BeanDefinitionRegistrar.class);
+
+	@Nullable
+	private final String beanName;
+
+	private final Class<?> beanClass;
+
+	@Nullable
+	private final ResolvableType beanType;
+
+	private final BeanDefinitionBuilder builder;
+
+	private final List<Consumer<RootBeanDefinition>> customizers;
+
+	@Nullable
+	private Executable instanceCreator;
+
+	@Nullable
+	private RootBeanDefinition beanDefinition;
+
+
+	private BeanDefinitionRegistrar(@Nullable String beanName, Class<?> beanClass, @Nullable ResolvableType beanType) {
+		this.beanName = beanName;
+		this.beanClass = beanClass;
+		this.beanType = beanType;
+		this.builder = BeanDefinitionBuilder.rootBeanDefinition(beanClass);
+		this.customizers = new ArrayList<>();
+	}
+
+
+	/**
+	 * Initialize the registration of a bean with the specified name and type.
+	 * @param beanName the name of the bean
+	 * @param beanType the type of the bean
+	 * @return a registrar for the specified bean
+	 */
+	public static BeanDefinitionRegistrar of(String beanName, ResolvableType beanType) {
+		return new BeanDefinitionRegistrar(beanName, beanType.toClass(), beanType);
+	}
+
+	/**
+	 * Initialize the registration of a bean with the specified name and type.
+	 * @param beanName the name of the bean
+	 * @param beanType the type of the bean
+	 * @return a registrar for the specified bean
+	 */
+	public static BeanDefinitionRegistrar of(String beanName, Class<?> beanType) {
+		return new BeanDefinitionRegistrar(beanName, beanType, null);
+	}
+
+	/**
+	 * Initialize the registration of an inner bean with the specified type.
+	 * @param beanType the type of the inner bean
+	 * @return a registrar for the specified inner bean
+	 */
+	public static BeanDefinitionRegistrar inner(ResolvableType beanType) {
+		return new BeanDefinitionRegistrar(null, beanType.toClass(), beanType);
+	}
+
+	/**
+	 * Initialize the registration of an inner bean with the specified type.
+	 * @param beanType the type of the inner bean
+	 * @return a registrar for the specified inner bean
+	 */
+	public static BeanDefinitionRegistrar inner(Class<?> beanType) {
+		return new BeanDefinitionRegistrar(null, beanType, null);
+	}
+
+	/**
+	 * Customize the {@link RootBeanDefinition} using the specified consumer.
+	 * @param bd a consumer for the bean definition
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public BeanDefinitionRegistrar customize(ThrowableConsumer<RootBeanDefinition> bd) {
+		this.customizers.add(bd);
+		return this;
+	}
+
+	/**
+	 * Specify the factory method to use to instantiate the bean.
+	 * @param declaredType the {@link Method#getDeclaringClass() declared type}
+	 * of the factory method.
+	 * @param name the name of the method
+	 * @param parameterTypes the parameter types of the method
+	 * @return {@code this}, to facilitate method chaining
+	 * @see RootBeanDefinition#getResolvedFactoryMethod()
+	 */
+	public BeanDefinitionRegistrar withFactoryMethod(Class<?> declaredType, String name, Class<?>... parameterTypes) {
+		this.instanceCreator = getMethod(declaredType, name, parameterTypes);
+		return this;
+	}
+
+	/**
+	 * Specify the constructor to use to instantiate the bean.
+	 * @param parameterTypes the parameter types of the constructor
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public BeanDefinitionRegistrar withConstructor(Class<?>... parameterTypes) {
+		this.instanceCreator = getConstructor(this.beanClass, parameterTypes);
+		return this;
+	}
+
+	/**
+	 * Specify how the bean instance should be created and initialized, using
+	 * the {@link BeanInstanceContext} to resolve dependencies if necessary.
+	 * @param instanceContext the {@link BeanInstanceContext} to use
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public BeanDefinitionRegistrar instanceSupplier(ThrowableFunction<BeanInstanceContext, ?> instanceContext) {
+		return customize(beanDefinition -> beanDefinition.setInstanceSupplier(() ->
+				instanceContext.apply(createBeanInstanceContext())));
+	}
+
+	/**
+	 * Specify how the bean instance should be created and initialized.
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public BeanDefinitionRegistrar instanceSupplier(ThrowableSupplier<?> instanceSupplier) {
+		return customize(beanDefinition -> beanDefinition.setInstanceSupplier(instanceSupplier));
+	}
+
+	/**
+	 * Register the {@link RootBeanDefinition} defined by this instance to
+	 * the specified bean factory.
+	 * @param beanFactory the bean factory to use
+	 */
+	public void register(DefaultListableBeanFactory beanFactory) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Register bean definition with name '" + this.beanName + "'");
+		}
+		BeanDefinition beanDefinition = toBeanDefinition();
+		if (this.beanName == null) {
+			throw new IllegalStateException("Bean name not set. Could not register " + beanDefinition);
+		}
+		beanFactory.registerBeanDefinition(this.beanName, beanDefinition);
+	}
+
+	/**
+	 * Return the {@link RootBeanDefinition} defined by this instance.
+	 * @return the bean definition
+	 */
+	public RootBeanDefinition toBeanDefinition() {
+		try {
+			this.beanDefinition = createBeanDefinition();
+			return this.beanDefinition;
+		}
+		catch (Exception ex) {
+			throw new FatalBeanException("Failed to create bean definition for bean with name '" + this.beanName + "'", ex);
+		}
+	}
+
+	private RootBeanDefinition createBeanDefinition() {
+		RootBeanDefinition bd = (RootBeanDefinition) this.builder.getBeanDefinition();
+		if (this.beanType != null) {
+			bd.setTargetType(this.beanType);
+		}
+		if (this.instanceCreator instanceof Method) {
+			bd.setResolvedFactoryMethod((Method) this.instanceCreator);
+		}
+		this.customizers.forEach(customizer -> customizer.accept(bd));
+		return bd;
+	}
+
+	private BeanInstanceContext createBeanInstanceContext() {
+		String resolvedBeanName = this.beanName != null ? this.beanName : createInnerBeanName();
+		return new BeanInstanceContext(resolvedBeanName, this.beanClass);
+	}
+
+	private String createInnerBeanName() {
+		return "(inner bean)" + BeanFactoryUtils.GENERATED_BEAN_NAME_SEPARATOR +
+				(this.beanDefinition != null ? ObjectUtils.getIdentityHexString(this.beanDefinition) : 0);
+	}
+
+	@Nullable
+	private BeanDefinition resolveBeanDefinition(DefaultListableBeanFactory beanFactory) {
+		return this.beanDefinition;
+	}
+
+	private static Constructor<?> getConstructor(Class<?> beanType, Class<?>... parameterTypes) {
+		try {
+			return beanType.getDeclaredConstructor(parameterTypes);
+		}
+		catch (NoSuchMethodException ex) {
+			String message = String.format("No constructor with type(s) [%s] found on %s",
+					toCommaSeparatedNames(parameterTypes), beanType.getName());
+			throw new IllegalArgumentException(message, ex);
+		}
+	}
+
+	private static Method getMethod(Class<?> declaredType, String methodName, Class<?>... parameterTypes) {
+		Method method = ReflectionUtils.findMethod(declaredType, methodName, parameterTypes);
+		if (method == null) {
+			String message = String.format("No method '%s' with type(s) [%s] found on %s", methodName,
+					toCommaSeparatedNames(parameterTypes), declaredType.getName());
+			throw new IllegalArgumentException(message);
+		}
+		return MethodIntrospector.selectInvocableMethod(method, declaredType);
+	}
+
+	private static String toCommaSeparatedNames(Class<?>... parameterTypes) {
+		return Arrays.stream(parameterTypes).map(Class::getName).collect(Collectors.joining(", "));
+	}
+
+	/**
+	 * Callback interface used by instance suppliers that need to resolve
+	 * dependencies for the {@link Executable} used to create the instance
+	 * as well as any {@link Member} that should be handled by the context.
+	 */
+	public final class BeanInstanceContext {
+
+		private final String beanName;
+
+		private final Class<?> beanType;
+
+		private BeanInstanceContext(String beanName, Class<?> beanType) {
+			this.beanName = beanName;
+			this.beanType = beanType;
+		}
+
+		/**
+		 * Return a bean instance using the specified {@code factory}.
+		 * @param beanFactory the bean factory to use
+		 * @param factory a function that returns a bean instance based on
+		 * the resolved attributes required by its instance creator
+		 * @param <T> the type of the bean
+		 * @return the bean instance
+		 */
+		public <T> T create(DefaultListableBeanFactory beanFactory, ThrowableFunction<InjectedElementAttributes, T> factory) {
+			return resolveInstanceCreator(BeanDefinitionRegistrar.this.instanceCreator).create(beanFactory, factory);
+		}
+
+		private InjectedElementResolver resolveInstanceCreator(@Nullable Executable instanceCreator) {
+			if (instanceCreator instanceof Method) {
+				return new InjectedConstructionResolver(instanceCreator, instanceCreator.getDeclaringClass(), this.beanName,
+						BeanDefinitionRegistrar.this::resolveBeanDefinition);
+			}
+			if (instanceCreator instanceof Constructor) {
+				return new InjectedConstructionResolver(instanceCreator, this.beanType, this.beanName,
+						BeanDefinitionRegistrar.this::resolveBeanDefinition);
+			}
+			throw new IllegalStateException("No factory method or constructor is set");
+		}
+
+		/**
+		 * Create an {@link InjectedElementResolver} for the specified field.
+		 * @param name the name of the field
+		 * @param type the type of the field
+		 * @return a resolved for the specified field
+		 */
+		public InjectedElementResolver field(String name, Class<?> type) {
+			return new InjectedFieldResolver(getField(name, type), this.beanName);
+		}
+
+		/**
+		 * Create an {@link InjectedElementResolver} for the specified bean method.
+		 * @param name the name of the method on the target bean
+		 * @param parameterTypes the method parameter types
+		 * @return a resolved for the specified bean method
+		 */
+		public InjectedElementResolver method(String name, Class<?>... parameterTypes) {
+			return new InjectedMethodResolver(getMethod(this.beanType, name, parameterTypes), this.beanType, this.beanName);
+		}
+
+		private Field getField(String fieldName, Class<?> fieldType) {
+			Field field = ReflectionUtils.findField(this.beanType, fieldName, fieldType);
+			if (field == null) {
+				throw new IllegalArgumentException("No field '" + fieldName + "' with type " + fieldType.getName() + " found on " + this.beanType);
+			}
+			return field;
+		}
+
+	}
+
+	/**
+	 * A {@link Consumer} that allows to invoke code that throws a checked exception.
+	 *
+	 * @author Stephane Nicoll
+	 * @param <T> the type of the input to the operation
+	 */
+	@FunctionalInterface
+	public interface ThrowableConsumer<T> extends Consumer<T> {
+
+		void acceptWithException(T t) throws Exception;
+
+		@Override
+		default void accept(T t) {
+			try {
+				acceptWithException(t);
+			}
+			catch (RuntimeException ex) {
+				throw ex;
+			}
+			catch (Exception ex) {
+				throw new RuntimeException(ex.getMessage(), ex);
+			}
+		}
+
+	}
+
+	/**
+	 * A {@link Function} that allows to invoke code that throws a checked exception.
+	 *
+	 * @author Stephane Nicoll
+	 * @param <T> the type of the input to the function
+	 * @param <R> the type of the result of the function
+	 */
+	@FunctionalInterface
+	public interface ThrowableFunction<T, R> extends Function<T, R> {
+
+		R applyWithException(T t) throws Exception;
+
+		@Override
+		default R apply(T t) {
+			try {
+				return applyWithException(t);
+			}
+			catch (RuntimeException ex) {
+				throw ex;
+			}
+			catch (Exception ex) {
+				throw new RuntimeException(ex.getMessage(), ex);
+			}
+		}
+	}
+
+	/**
+	 * A {@link Supplier} that allows to invoke code that throws a checked exception.
+	 *
+	 * @author Stephane Nicoll
+	 * @param <T> the type of results supplied by this supplier
+	 */
+	public interface ThrowableSupplier<T> extends Supplier<T> {
+
+		T getWithException() throws Exception;
+
+		@Override
+		default T get() {
+			try {
+				return getWithException();
+			}
+			catch (RuntimeException ex) {
+				throw ex;
+			}
+			catch (Exception ex) {
+				throw new RuntimeException(ex.getMessage(), ex);
+			}
+		}
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolver.java
new file mode 100644
index 000000000000..d1257a7eac7d
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolver.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.TypeConverter;
+import org.springframework.beans.factory.InjectionPoint;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConstructorArgumentValues;
+import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
+import org.springframework.beans.factory.config.DependencyDescriptor;
+import org.springframework.beans.factory.support.BeanDefinitionValueResolver;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.core.CollectionFactory;
+import org.springframework.core.MethodParameter;
+
+/**
+ * An {@link InjectedElementResolver} for an {@link Executable} that creates
+ * a bean instance.
+ *
+ * @author Stephane Nicoll
+ */
+
+class InjectedConstructionResolver implements InjectedElementResolver {
+
+	private final Executable executable;
+
+	private final Class<?> targetType;
+
+	private final String beanName;
+
+	private final Function<DefaultListableBeanFactory, BeanDefinition> beanDefinitionResolver;
+
+	InjectedConstructionResolver(Executable executable, Class<?> targetType, String beanName,
+			Function<DefaultListableBeanFactory, BeanDefinition> beanDefinitionResolver) {
+		this.executable = executable;
+		this.targetType = targetType;
+		this.beanName = beanName;
+		this.beanDefinitionResolver = beanDefinitionResolver;
+	}
+
+
+	Executable getExecutable() {
+		return this.executable;
+	}
+
+	@Override
+	public InjectedElementAttributes resolve(DefaultListableBeanFactory beanFactory, boolean required) {
+		int argumentCount = this.executable.getParameterCount();
+		List<Object> arguments = new ArrayList<>();
+		Set<String> autowiredBeans = new LinkedHashSet<>(argumentCount);
+		TypeConverter typeConverter = beanFactory.getTypeConverter();
+		ConstructorArgumentValues argumentValues = resolveArgumentValues(beanFactory);
+		for (int i = 0; i < argumentCount; i++) {
+			MethodParameter methodParam = createMethodParameter(i);
+			ValueHolder valueHolder = argumentValues.getIndexedArgumentValue(i, null);
+			if (valueHolder != null) {
+				if (valueHolder.isConverted()) {
+					arguments.add(valueHolder.getConvertedValue());
+				}
+				else {
+					Object userValue = beanFactory.getTypeConverter()
+							.convertIfNecessary(valueHolder.getValue(), methodParam.getParameterType());
+					arguments.add(userValue);
+				}
+			}
+			else {
+				DependencyDescriptor depDescriptor = new DependencyDescriptor(methodParam, true);
+				depDescriptor.setContainingClass(this.targetType);
+				try {
+					Object arg = resolveDependency(() -> beanFactory.resolveDependency(
+							depDescriptor, this.beanName, autowiredBeans, typeConverter), methodParam.getParameterType());
+					arguments.add(arg);
+				}
+				catch (BeansException ex) {
+					throw new UnsatisfiedDependencyException(null, this.beanName, new InjectionPoint(methodParam), ex);
+				}
+			}
+		}
+		return new InjectedElementAttributes(arguments);
+	}
+
+	private Object resolveDependency(Supplier<Object> resolvedDependency, Class<?> dependencyType) {
+		try {
+			return resolvedDependency.get();
+		}
+		catch (NoSuchBeanDefinitionException ex) {
+			// Single constructor or factory method -> let's return an empty array/collection
+			// for e.g. a vararg or a non-null List/Set/Map parameter.
+			if (dependencyType.isArray()) {
+				return Array.newInstance(dependencyType.getComponentType(), 0);
+			}
+			else if (CollectionFactory.isApproximableCollectionType(dependencyType)) {
+				return CollectionFactory.createCollection(dependencyType, 0);
+			}
+			else if (CollectionFactory.isApproximableMapType(dependencyType)) {
+				return CollectionFactory.createMap(dependencyType, 0);
+			}
+			throw ex;
+		}
+	}
+
+	private ConstructorArgumentValues resolveArgumentValues(DefaultListableBeanFactory beanFactory) {
+		ConstructorArgumentValues resolvedValues = new ConstructorArgumentValues();
+		BeanDefinition beanDefinition = this.beanDefinitionResolver.apply(beanFactory);
+		if (beanDefinition == null || !beanDefinition.hasConstructorArgumentValues()) {
+			return resolvedValues;
+		}
+		ConstructorArgumentValues argumentValues = beanDefinition.getConstructorArgumentValues();
+		BeanDefinitionValueResolver valueResolver = new BeanDefinitionValueResolver(beanFactory,
+				this.beanName, beanDefinition);
+		for (Map.Entry<Integer, ValueHolder> entry : argumentValues.getIndexedArgumentValues().entrySet()) {
+			int index = entry.getKey();
+			ValueHolder valueHolder = entry.getValue();
+			if (valueHolder.isConverted()) {
+				resolvedValues.addIndexedArgumentValue(index, valueHolder);
+			}
+			else {
+				Object resolvedValue =
+						valueResolver.resolveValueIfNecessary("constructor argument", valueHolder.getValue());
+				ValueHolder resolvedValueHolder =
+						new ValueHolder(resolvedValue, valueHolder.getType(), valueHolder.getName());
+				resolvedValueHolder.setSource(valueHolder);
+				resolvedValues.addIndexedArgumentValue(index, resolvedValueHolder);
+			}
+		}
+		return resolvedValues;
+	}
+
+	private MethodParameter createMethodParameter(int index) {
+		if (this.executable instanceof Constructor) {
+			return new MethodParameter((Constructor<?>) this.executable, index);
+		}
+		else {
+			return new MethodParameter((Method) this.executable, index);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return new StringJoiner(", ", InjectedConstructionResolver.class.getSimpleName() + "[", "]")
+				.add("executable=" + this.executable)
+				.toString();
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementAttributes.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementAttributes.java
new file mode 100644
index 000000000000..a8677f2ee140
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementAttributes.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Resolved attributes of an injected element.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public class InjectedElementAttributes {
+
+	@Nullable
+	private final List<Object> attributes;
+
+
+	InjectedElementAttributes(@Nullable List<Object> attributes) {
+		this.attributes = attributes;
+	}
+
+
+	/**
+	 * Specify if the attributes have been resolved.
+	 * @return the resolution of the injection
+	 */
+	public boolean isResolved() {
+		return (this.attributes != null);
+	}
+
+	/**
+	 * Run the specified {@linkplain Runnable task} only if this instance is
+	 * {@link #isResolved() resolved}.
+	 * @param task the task to invoke if attributes are available
+	 */
+	public void ifResolved(Runnable task) {
+		if (isResolved()) {
+			task.run();
+		}
+	}
+
+	/**
+	 * Invoke the specified {@link Consumer} with the resolved attributes.
+	 * @param attributes the consumer to invoke if this instance is resolved
+	 */
+	public void ifResolved(BeanDefinitionRegistrar.ThrowableConsumer<InjectedElementAttributes> attributes) {
+		ifResolved(() -> attributes.accept(this));
+	}
+
+	/**
+	 * Return the resolved attribute at the specified index.
+	 * @param index the attribute index
+	 * @param <T> the type of the attribute
+	 * @return the attribute
+	 */
+	@SuppressWarnings("unchecked")
+	public <T> T get(int index) {
+		Assert.notNull(this.attributes, "Attributes must not be null");
+		return (T) this.attributes.get(index);
+	}
+
+	/**
+	 * Return the resolved attribute at the specified index.
+	 * @param index the attribute index
+	 * @param type the attribute type
+	 * @param <T> the type of the attribute
+	 * @return the attribute
+	 */
+	@SuppressWarnings("unchecked")
+	public <T> T get(int index, Class<T> type) {
+		Assert.notNull(this.attributes, "Attributes must not be null");
+		return (T) this.attributes.get(index);
+	}
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementResolver.java
new file mode 100644
index 000000000000..5e87e10a289c
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedElementResolver.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+
+/**
+ * Resolve the attributes of an injected element such as a {@code Constructor}
+ * or a factory {@code Method}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public interface InjectedElementResolver {
+
+	/**
+	 * Resolve the attributes using the specified bean factory.
+	 * @param beanFactory the bean factory to use
+	 * @return the resolved attributes
+	 */
+	default InjectedElementAttributes resolve(DefaultListableBeanFactory beanFactory) {
+		return resolve(beanFactory, true);
+	}
+
+	/**
+	 * Resolve the attributes using the specified bean factory.
+	 * @param beanFactory the bean factory to use
+	 * @param required whether the injection point is mandatory
+	 * @return the resolved attributes
+	 */
+	InjectedElementAttributes resolve(DefaultListableBeanFactory beanFactory, boolean required);
+
+	/**
+	 * Invoke the specified consumer with the resolved
+	 * {@link InjectedElementAttributes attributes}.
+	 * @param beanFactory the bean factory to use to resolve the attributes
+	 * @param attributes a consumer of the resolved attributes
+	 */
+	default void invoke(DefaultListableBeanFactory beanFactory,
+			BeanDefinitionRegistrar.ThrowableConsumer<InjectedElementAttributes> attributes) {
+
+		InjectedElementAttributes elements = resolve(beanFactory);
+		attributes.accept(elements);
+	}
+
+	/**
+	 * Create an instance based on the resolved
+	 * {@link InjectedElementAttributes attributes}.
+	 * @param beanFactory the bean factory to use to resolve the attributes
+	 * @param factory a factory to create the instance based on the resolved attributes
+	 * @param <T> the type of the instance
+	 * @return a new instance
+	 */
+	default <T> T create(DefaultListableBeanFactory beanFactory,
+			BeanDefinitionRegistrar.ThrowableFunction<InjectedElementAttributes, T> factory) {
+
+		InjectedElementAttributes attributes = resolve(beanFactory);
+		return factory.apply(attributes);
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedFieldResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedFieldResolver.java
new file mode 100644
index 000000000000..a7d35c2ff03d
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedFieldResolver.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.TypeConverter;
+import org.springframework.beans.factory.InjectionPoint;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.beans.factory.config.DependencyDescriptor;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+
+/**
+ * An {@link InjectedElementResolver} for a {@link Field}.
+ *
+ * @author Stephane Nicoll
+ */
+class InjectedFieldResolver implements InjectedElementResolver {
+
+	private final Field field;
+
+	private final String beanName;
+
+
+	/**
+	 * Create a new instance.
+	 * @param field the field to handle
+	 * @param beanName the name of the bean, or {@code null}
+	 */
+	InjectedFieldResolver(Field field, String beanName) {
+		this.field = field;
+		this.beanName = beanName;
+	}
+
+	@Override
+	public InjectedElementAttributes resolve(DefaultListableBeanFactory beanFactory, boolean required) {
+		DependencyDescriptor desc = new DependencyDescriptor(this.field, required);
+		desc.setContainingClass(this.field.getType());
+		Set<String> autowiredBeanNames = new LinkedHashSet<>(1);
+		TypeConverter typeConverter = beanFactory.getTypeConverter();
+		try {
+			Object value = beanFactory.resolveDependency(desc, this.beanName, autowiredBeanNames, typeConverter);
+			if (value == null && !required) {
+				return new InjectedElementAttributes(null);
+			}
+			return new InjectedElementAttributes(Collections.singletonList(value));
+		}
+		catch (BeansException ex) {
+			throw new UnsatisfiedDependencyException(null, this.beanName, new InjectionPoint(this.field), ex);
+		}
+	}
+
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedMethodResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedMethodResolver.java
new file mode 100644
index 000000000000..c58d61673428
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/InjectedMethodResolver.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.TypeConverter;
+import org.springframework.beans.factory.InjectionPoint;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.beans.factory.config.DependencyDescriptor;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.core.MethodParameter;
+
+/**
+ * An {@link InjectedElementResolver} for a {@link Method}.
+ *
+ * @author Stephane Nicoll
+ */
+class InjectedMethodResolver implements InjectedElementResolver {
+
+	private final Method method;
+
+	private final Class<?> target;
+
+	private final String beanName;
+
+
+	/**
+	 * Create a new instance.
+	 * @param method the method to handle
+	 * @param target the type on which the method is declared
+	 * @param beanName the name of the bean, or {@code null}
+	 */
+	InjectedMethodResolver(Method method, Class<?> target, String beanName) {
+		this.method = method;
+		this.target = target;
+		this.beanName = beanName;
+	}
+
+
+	@Override
+	public InjectedElementAttributes resolve(DefaultListableBeanFactory beanFactory, boolean required) {
+		int argumentCount = this.method.getParameterCount();
+		List<Object> arguments = new ArrayList<>();
+		Set<String> autowiredBeans = new LinkedHashSet<>(argumentCount);
+		TypeConverter typeConverter = beanFactory.getTypeConverter();
+		for (int i = 0; i < argumentCount; i++) {
+			MethodParameter methodParam = new MethodParameter(this.method, i);
+			DependencyDescriptor depDescriptor = new DependencyDescriptor(methodParam, required);
+			depDescriptor.setContainingClass(this.target);
+			try {
+				Object arg = beanFactory.resolveDependency(depDescriptor, this.beanName, autowiredBeans, typeConverter);
+				if (arg == null && !required) {
+					arguments = null;
+					break;
+				}
+				arguments.add(arg);
+			}
+			catch (BeansException ex) {
+				throw new UnsatisfiedDependencyException(null, this.beanName, new InjectionPoint(methodParam), ex);
+			}
+		}
+		return new InjectedElementAttributes(arguments);
+	}
+
+}
+
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/package-info.java
new file mode 100644
index 000000000000..821c57180f6c
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * Classes used in generated code to ease bean registration.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.beans.factory.generator.config;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/BeanParameterGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/BeanParameterGeneratorTests.java
new file mode 100644
index 000000000000..8e85c3cdf075
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/BeanParameterGeneratorTests.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import java.io.StringWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.beans.factory.config.BeanReference;
+import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.beans.factory.support.ManagedSet;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.javapoet.support.CodeSnippet;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link BeanParameterGenerator}.
+ *
+ * @author Stephane Nicoll
+ */
+class BeanParameterGeneratorTests {
+
+	private final BeanParameterGenerator generator = new BeanParameterGenerator();
+
+	@Test
+	void writeCharArray() {
+		char[] value = new char[] { 'v', 'a', 'l', 'u', 'e' };
+		assertThat(write(value, ResolvableType.forArrayComponent(ResolvableType.forClass(char.class))))
+				.isEqualTo("new char[] { 'v', 'a', 'l', 'u', 'e' }");
+	}
+
+	@Test
+	void writeStringArray() {
+		String[] value = new String[] { "a", "test" };
+		assertThat(write(value, ResolvableType.forArrayComponent(ResolvableType.forClass(String.class))))
+				.isEqualTo("new String[] { \"a\", \"test\" }");
+	}
+
+	@Test
+	void writeStringList() {
+		List<String> value = List.of("a", "test");
+		CodeSnippet code = codeSnippet(value, ResolvableType.forClassWithGenerics(List.class, String.class));
+		assertThat(code.getSnippet()).isEqualTo(
+				"List.of(\"a\", \"test\")");
+		assertThat(code.hasImport(List.class)).isTrue();
+	}
+
+	@Test
+	void writeStringManagedList() {
+		ManagedList<String> value = ManagedList.of("a", "test");
+		CodeSnippet code = codeSnippet(value, ResolvableType.forClassWithGenerics(List.class, String.class));
+		assertThat(code.getSnippet()).isEqualTo(
+				"ManagedList.of(\"a\", \"test\")");
+		assertThat(code.hasImport(ManagedList.class)).isTrue();
+	}
+
+	@Test
+	void writeEmptyList() {
+		List<String> value = List.of();
+		CodeSnippet code = codeSnippet(value, ResolvableType.forClassWithGenerics(List.class, String.class));
+		assertThat(code.getSnippet()).isEqualTo("Collections.emptyList()");
+		assertThat(code.hasImport(Collections.class)).isTrue();
+	}
+
+	@Test
+	void writeStringSet() {
+		Set<String> value = Set.of("a", "test");
+		CodeSnippet code = codeSnippet(value, ResolvableType.forClassWithGenerics(Set.class, String.class));
+		assertThat(code.getSnippet()).startsWith("Set.of(").contains("a").contains("test");
+		assertThat(code.hasImport(Set.class)).isTrue();
+	}
+
+	@Test
+	void writeStringManagedSet() {
+		Set<String> value = ManagedSet.of("a", "test");
+		CodeSnippet code = codeSnippet(value, ResolvableType.forClassWithGenerics(Set.class, String.class));
+		assertThat(code.getSnippet()).isEqualTo(
+				"ManagedSet.of(\"a\", \"test\")");
+		assertThat(code.hasImport(ManagedSet.class)).isTrue();
+	}
+
+	@Test
+	void writeEmptySet() {
+		Set<String> value = Set.of();
+		CodeSnippet code = codeSnippet(value, ResolvableType.forClassWithGenerics(Set.class, String.class));
+		assertThat(code.getSnippet()).isEqualTo("Collections.emptySet()");
+		assertThat(code.hasImport(Collections.class)).isTrue();
+	}
+
+	@Test
+	void writeMap() {
+		Map<String, Object> value = new LinkedHashMap<>();
+		value.put("name", "Hello");
+		value.put("counter", 42);
+		assertThat(write(value)).isEqualTo("Map.of(\"name\", \"Hello\", \"counter\", 42)");
+	}
+
+	@Test
+	void writeMapWithEnum() {
+		Map<String, Object> value = new HashMap<>();
+		value.put("unit", ChronoUnit.DAYS);
+		assertThat(write(value)).isEqualTo("Map.of(\"unit\", ChronoUnit.DAYS)");
+	}
+
+	@Test
+	void writeEmptyMap() {
+		assertThat(write(Map.of())).isEqualTo("Map.of()");
+	}
+
+	@Test
+	void writeString() {
+		assertThat(write("test", ResolvableType.forClass(String.class))).isEqualTo("\"test\"");
+	}
+
+	@Test
+	void writeCharEscapeBackslash() {
+		assertThat(write('\\', ResolvableType.forType(char.class))).isEqualTo("'\\\\'");
+	}
+
+	@ParameterizedTest
+	@MethodSource("primitiveValues")
+	void writePrimitiveValue(Object value, String parameter) {
+		assertThat(write(value, ResolvableType.forClass(value.getClass()))).isEqualTo(parameter);
+	}
+
+	private static Stream<Arguments> primitiveValues() {
+		return Stream.of(Arguments.of((short) 0, "0"), Arguments.of((1), "1"), Arguments.of(2L, "2"),
+				Arguments.of(2.5d, "2.5"), Arguments.of(2.7f, "2.7"), Arguments.of('c', "'c'"),
+				Arguments.of((byte) 1, "1"), Arguments.of(true, "true"));
+	}
+
+	@Test
+	void writeEnum() {
+		assertThat(write(ChronoUnit.DAYS, ResolvableType.forClass(ChronoUnit.class)))
+				.isEqualTo("ChronoUnit.DAYS");
+	}
+
+	@Test
+	void writeClass() {
+		assertThat(write(Integer.class, ResolvableType.forClass(Class.class)))
+				.isEqualTo("Integer.class");
+	}
+
+	@Test
+	void writeResolvableType() {
+		ResolvableType type = ResolvableType.forClassWithGenerics(Consumer.class, Integer.class);
+		assertThat(write(type, type))
+				.isEqualTo("ResolvableType.forClassWithGenerics(Consumer.class, Integer.class)");
+	}
+
+	@Test
+	void writeExecutableParameterTypesWithConstructor() {
+		Constructor<?> constructor = TestSample.class.getDeclaredConstructors()[0];
+		assertThat(CodeSnippet.process(this.generator.writeExecutableParameterTypes(constructor)))
+				.isEqualTo("String.class, ResourceLoader.class");
+	}
+
+	@Test
+	void writeExecutableParameterTypesWithNoArgConstructor() {
+		Constructor<?> constructor = BeanParameterGeneratorTests.class.getDeclaredConstructors()[0];
+		assertThat(CodeSnippet.process(this.generator.writeExecutableParameterTypes(constructor)))
+				.isEmpty();
+	}
+
+	@Test
+	void writeExecutableParameterTypesWithMethod() {
+		Method method = ReflectionUtils.findMethod(TestSample.class, "createBean", String.class, Integer.class);
+		assertThat(CodeSnippet.process(this.generator.writeExecutableParameterTypes(method)))
+				.isEqualTo("String.class, Integer.class");
+	}
+
+	@Test
+	void writeNull() {
+		assertThat(write(null)).isEqualTo("null");
+	}
+
+	@Test
+	void writeBeanReference() {
+		BeanReference beanReference = mock(BeanReference.class);
+		given(beanReference.getBeanName()).willReturn("testBean");
+		assertThat(write(beanReference)).isEqualTo("new RuntimeBeanReference(\"testBean\")");
+	}
+
+	@Test
+	void writeBeanDefinitionCallsConsumer() {
+		BeanParameterGenerator customGenerator = new BeanParameterGenerator(
+				((beanDefinition, builder) -> builder.add("test")));
+		assertThat(CodeSnippet.process(customGenerator.writeParameterValue(new RootBeanDefinition()))).isEqualTo("test");
+	}
+
+	@Test
+	void writeBeanDefinitionWithoutConsumerFails() {
+		BeanParameterGenerator customGenerator = new BeanParameterGenerator();
+		assertThatIllegalStateException().isThrownBy(() -> customGenerator
+				.writeParameterValue(new RootBeanDefinition()));
+	}
+
+	@Test
+	void writeUnsupportedParameter() {
+		assertThatIllegalArgumentException().isThrownBy(() -> write(new StringWriter()))
+				.withMessageContaining(StringWriter.class.getName());
+	}
+
+	private String write(Object value) {
+		return CodeSnippet.process(this.generator.writeParameterValue(value));
+	}
+
+	private String write(Object value, ResolvableType resolvableType) {
+		return codeSnippet(value, resolvableType).getSnippet();
+	}
+
+	private CodeSnippet codeSnippet(Object value, ResolvableType resolvableType) {
+		return CodeSnippet.of(this.generator.writeParameterValue(value, () -> resolvableType));
+	}
+
+
+	@SuppressWarnings("unused")
+	static class TestSample {
+
+		public TestSample(String test, ResourceLoader resourceLoader) {
+		}
+
+		String createBean(String name, Integer counter) {
+			return "test";
+		}
+	}
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java
new file mode 100644
index 000000000000..d780d868145c
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aot.generator.CodeContribution;
+import org.springframework.aot.hint.ExecutableHint;
+import org.springframework.aot.hint.ExecutableMode;
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.TypeHint;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.beans.testfixture.beans.TestBean;
+import org.springframework.beans.testfixture.beans.factory.generator.InnerComponentConfiguration.EnvironmentAwareComponent;
+import org.springframework.beans.testfixture.beans.factory.generator.InnerComponentConfiguration.NoDependencyComponent;
+import org.springframework.beans.testfixture.beans.factory.generator.SimpleConfiguration;
+import org.springframework.beans.testfixture.beans.factory.generator.factory.NumberHolderFactoryBean;
+import org.springframework.beans.testfixture.beans.factory.generator.factory.SampleFactory;
+import org.springframework.beans.testfixture.beans.factory.generator.injection.InjectionComponent;
+import org.springframework.beans.testfixture.beans.factory.generator.visibility.ProtectedConstructorComponent;
+import org.springframework.beans.testfixture.beans.factory.generator.visibility.ProtectedFactoryMethod;
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.support.CodeSnippet;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link DefaultBeanInstanceGenerator}.
+ *
+ * @author Stephane Nicoll
+ */
+class DefaultBeanInstanceGeneratorTests {
+
+	@Test
+	void generateUsingDefaultConstructorUsesMethodReference() {
+		CodeContribution contribution = generate(SimpleConfiguration.class.getDeclaredConstructors()[0]);
+		assertThat(code(contribution)).isEqualTo("SimpleConfiguration::new");
+		assertThat(reflectionHints(contribution, SimpleConfiguration.class)).isNull();
+	}
+
+	@Test
+	void generateUsingConstructorWithoutParameterAndMultipleCandidatesDoesNotUseMethodReference() throws NoSuchMethodException {
+		CodeContribution contribution = generate(TestBean.class.getConstructor());
+		assertThat(code(contribution)).isEqualTo("() -> new TestBean()");
+		assertThat(reflectionHints(contribution, TestBean.class)).isNull();
+	}
+
+	@Test
+	void generateUsingConstructorWithParameter() {
+		Constructor<?> constructor = InjectionComponent.class.getDeclaredConstructors()[0];
+		CodeContribution contribution = generate(constructor);
+		assertThat(code(contribution).lines()).containsOnly(
+				"(instanceContext) -> instanceContext.create(beanFactory, (attributes) -> "
+						+ "new InjectionComponent(attributes.get(0)))");
+		assertThat(reflectionHints(contribution, InjectionComponent.class))
+				.satisfies(hasSingleQueryConstructor(constructor));
+	}
+
+	@Test
+	void generateUsingConstructorWithInnerClassAndNoExtraArg() {
+		CodeContribution contribution = generate(NoDependencyComponent.class.getDeclaredConstructors()[0]);
+		assertThat(code(contribution).lines()).containsOnly(
+				"() -> beanFactory.getBean(InnerComponentConfiguration.class).new NoDependencyComponent()");
+		assertThat(reflectionHints(contribution, NoDependencyComponent.class)).isNull();
+	}
+
+	@Test
+	void generateUsingConstructorWithInnerClassAndExtraArg() {
+		Constructor<?> constructor = EnvironmentAwareComponent.class.getDeclaredConstructors()[0];
+		CodeContribution contribution = generate(constructor);
+		assertThat(code(contribution).lines()).containsOnly(
+				"(instanceContext) -> instanceContext.create(beanFactory, (attributes) -> "
+						+ "beanFactory.getBean(InnerComponentConfiguration.class).new EnvironmentAwareComponent(attributes.get(1)))");
+		assertThat(reflectionHints(contribution, EnvironmentAwareComponent.class))
+				.satisfies(hasSingleQueryConstructor(constructor));
+	}
+
+	@Test
+	void generateUsingConstructorOfTypeWithGeneric() {
+		CodeContribution contribution = generate(NumberHolderFactoryBean.class.getDeclaredConstructors()[0]);
+		assertThat(code(contribution)).isEqualTo("NumberHolderFactoryBean::new");
+		assertThat(reflectionHints(contribution, NumberHolderFactoryBean.class)).isNull();
+	}
+
+	@Test
+	void generateUsingNoArgConstructorAndContributorsDoesNotUseMethodReference() {
+		CodeContribution contribution = generate(SimpleConfiguration.class.getDeclaredConstructors()[0],
+				contrib -> contrib.statements().add(CodeBlock.of("// hello\n")),
+				BeanInstanceContributor.NO_OP);
+		assertThat(code(contribution)).isEqualTo("""
+				(instanceContext) -> {
+					SimpleConfiguration bean = new SimpleConfiguration();
+					// hello
+					return bean;
+				}""");
+	}
+
+	@Test
+	void generateUsingContributorsRegisterHints() {
+		CodeContribution contribution = generate(SimpleConfiguration.class.getDeclaredConstructors()[0],
+				contrib -> {
+					contrib.statements().add(CodeBlock.of("// hello\n"));
+					contrib.runtimeHints().resources().registerPattern("com/example/*.properties");
+				},
+				contrib -> contrib.runtimeHints().reflection().registerType(TypeReference.of(String.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS)));
+		assertThat(code(contribution)).isEqualTo("""
+				(instanceContext) -> {
+					SimpleConfiguration bean = new SimpleConfiguration();
+					// hello
+					return bean;
+				}""");
+		assertThat(contribution.runtimeHints().resources().resourcePatterns()).singleElement().satisfies(hint ->
+				assertThat(hint.getIncludes()).containsOnly("com/example/*.properties"));
+		assertThat(contribution.runtimeHints().reflection().getTypeHint(String.class)).satisfies(hint -> {
+			assertThat(hint.getType()).isEqualTo(TypeReference.of(String.class));
+			assertThat(hint.getMemberCategories()).containsOnly(MemberCategory.INVOKE_PUBLIC_METHODS);
+		});
+	}
+
+	@Test
+	void generateUsingMethodWithNoArg() {
+		Method method = method(SimpleConfiguration.class, "stringBean");
+		CodeContribution contribution = generate(method);
+		assertThat(code(contribution)).isEqualTo("() -> beanFactory.getBean(SimpleConfiguration.class).stringBean()");
+		assertThat(reflectionHints(contribution, SimpleConfiguration.class))
+				.satisfies(hasSingleQueryMethod(method));
+	}
+
+	@Test
+	void generateUsingStaticMethodWithNoArg() {
+		Method method = method(SampleFactory.class, "integerBean");
+		CodeContribution contribution = generate(method);
+		assertThat(code(contribution)).isEqualTo("() -> SampleFactory.integerBean()");
+		assertThat(reflectionHints(contribution, SampleFactory.class))
+				.satisfies(hasSingleQueryMethod(method));
+	}
+
+	@Test
+	void generateUsingMethodWithArg() {
+		Method method = method(SampleFactory.class, "create", Number.class, String.class);
+		CodeContribution contribution = generate(method);
+		assertThat(code(contribution)).isEqualTo("(instanceContext) -> instanceContext.create(beanFactory, (attributes) -> "
+				+ "SampleFactory.create(attributes.get(0), attributes.get(1)))");
+		assertThat(reflectionHints(contribution, SampleFactory.class))
+				.satisfies(hasSingleQueryMethod(method));
+	}
+
+	@Test
+	void generateUsingMethodAndContributors() {
+		CodeContribution contribution = generate(method(SimpleConfiguration.class, "stringBean"),
+				contrib -> {
+					contrib.statements().add(CodeBlock.of("// hello\n"));
+					contrib.runtimeHints().resources().registerPattern("com/example/*.properties");
+				},
+				contrib -> contrib.runtimeHints().reflection().registerType(TypeReference.of(String.class),
+						hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS)));
+		assertThat(code(contribution)).isEqualTo("""
+				(instanceContext) -> {
+					String bean = beanFactory.getBean(SimpleConfiguration.class).stringBean();
+					// hello
+					return bean;
+				}""");
+		assertThat(contribution.runtimeHints().resources().resourcePatterns()).singleElement().satisfies(hint ->
+				assertThat(hint.getIncludes()).containsOnly("com/example/*.properties"));
+		assertThat(contribution.runtimeHints().reflection().getTypeHint(String.class)).satisfies(hint -> {
+			assertThat(hint.getType()).isEqualTo(TypeReference.of(String.class));
+			assertThat(hint.getMemberCategories()).containsOnly(MemberCategory.INVOKE_PUBLIC_METHODS);
+		});
+	}
+
+	@Test
+	void generateUsingProtectedConstructorRegistersProtectedAccess() {
+		CodeContribution contribution = generate(ProtectedConstructorComponent.class.getDeclaredConstructors()[0]);
+		assertThat(contribution.protectedAccess().isAccessible("com.example")).isFalse();
+		assertThat(contribution.protectedAccess().getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedConstructorComponent.class.getPackageName());
+	}
+
+	@Test
+	void generateUsingProtectedMethodRegistersProtectedAccess() {
+		CodeContribution contribution = generate(method(ProtectedFactoryMethod.class, "testBean", Integer.class));
+		assertThat(contribution.protectedAccess().isAccessible("com.example")).isFalse();
+		assertThat(contribution.protectedAccess().getPrivilegedPackageName("com.example"))
+				.isEqualTo(ProtectedFactoryMethod.class.getPackageName());
+	}
+
+	private String code(CodeContribution contribution) {
+		return CodeSnippet.process(contribution.statements().toCodeBlock());
+	}
+
+	@Nullable
+	private TypeHint reflectionHints(CodeContribution contribution, Class<?> type) {
+		return contribution.runtimeHints().reflection().getTypeHint(type);
+	}
+
+	private Consumer<TypeHint> hasSingleQueryConstructor(Constructor<?> constructor) {
+		return typeHint -> assertThat(typeHint.constructors()).singleElement()
+				.satisfies(match(constructor, "<init>", ExecutableMode.INTROSPECT));
+	}
+
+	private Consumer<TypeHint> hasSingleQueryMethod(Method method) {
+		return typeHint -> assertThat(typeHint.methods()).singleElement()
+				.satisfies(match(method, method.getName(), ExecutableMode.INTROSPECT));
+	}
+
+	private Consumer<ExecutableHint> match(Executable executable, String name, ExecutableMode... modes) {
+		return hint -> {
+			assertThat(hint.getName()).isEqualTo(name);
+			assertThat(hint.getParameterTypes()).hasSameSizeAs(executable.getParameterTypes());
+			for (int i = 0; i < hint.getParameterTypes().size(); i++) {
+				assertThat(hint.getParameterTypes().get(i))
+						.isEqualTo(TypeReference.of(executable.getParameterTypes()[i]));
+			}
+			assertThat(hint.getModes()).containsOnly(modes);
+		};
+	}
+
+	private CodeContribution generate(Executable executable,
+			BeanInstanceContributor... beanInstanceContributors) {
+		DefaultBeanInstanceGenerator generator = new DefaultBeanInstanceGenerator(executable,
+				Arrays.asList(beanInstanceContributors));
+		return generator.generateBeanInstance(new RuntimeHints());
+	}
+
+	private static Method method(Class<?> type, String methodName, Class<?>... parameterTypes) {
+		Method method = ReflectionUtils.findMethod(type, methodName, parameterTypes);
+		assertThat(method).isNotNull();
+		return method;
+	}
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java
new file mode 100644
index 000000000000..910e66b6db6c
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.generator.InjectionGeneratorTests.SimpleConstructorBean.InnerClass;
+import org.springframework.javapoet.support.CodeSnippet;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link InjectionGenerator}.
+ *
+ * @author Stephane Nicoll
+ */
+class InjectionGeneratorTests {
+
+	@Test
+	void writeInstantiationForConstructorWithNoArgUseShortcut() {
+		Constructor<?> constructor = SimpleBean.class.getDeclaredConstructors()[0];
+		assertThat(writeInstantiation(constructor).lines())
+				.containsExactly("new InjectionGeneratorTests.SimpleBean()");
+	}
+
+	@Test
+	void writeInstantiationForConstructorWithNonGenericParameter() {
+		Constructor<?> constructor = SimpleConstructorBean.class.getDeclaredConstructors()[0];
+		assertThat(writeInstantiation(constructor).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> new InjectionGeneratorTests.SimpleConstructorBean(attributes.get(0), attributes.get(1)))");
+	}
+
+	@Test
+	void writeInstantiationForConstructorWithGenericParameter() {
+		Constructor<?> constructor = GenericConstructorBean.class.getDeclaredConstructors()[0];
+		assertThat(writeInstantiation(constructor).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> new InjectionGeneratorTests.GenericConstructorBean(attributes.get(0)))");
+	}
+
+	@Test
+	void writeInstantiationForAmbiguousConstructor() throws Exception {
+		Constructor<?> constructor = AmbiguousConstructorBean.class.getDeclaredConstructor(String.class, Number.class);
+		assertThat(writeInstantiation(constructor).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> new InjectionGeneratorTests.AmbiguousConstructorBean(attributes.get(0, String.class), attributes.get(1, Number.class)))");
+	}
+
+	@Test
+	void writeInstantiationForConstructorInInnerClass() {
+		Constructor<?> constructor = InnerClass.class.getDeclaredConstructors()[0];
+		assertThat(writeInstantiation(constructor).lines()).containsExactly(
+				"beanFactory.getBean(InjectionGeneratorTests.SimpleConstructorBean.class).new InnerClass()");
+	}
+
+	@Test
+	void writeInstantiationForMethodWithNoArgUseShortcut() {
+		assertThat(writeInstantiation(method(SimpleBean.class, "name")).lines()).containsExactly(
+				"beanFactory.getBean(InjectionGeneratorTests.SimpleBean.class).name()");
+	}
+
+	@Test
+	void writeInstantiationForStaticMethodWithNoArgUseShortcut() {
+		assertThat(writeInstantiation(method(SimpleBean.class, "number")).lines()).containsExactly(
+				"InjectionGeneratorTests.SimpleBean.number()");
+	}
+
+	@Test
+	void writeInstantiationForMethodWithNonGenericParameter() {
+		assertThat(writeInstantiation(method(SampleBean.class, "source", Integer.class)).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> beanFactory.getBean(InjectionGeneratorTests.SampleBean.class).source(attributes.get(0)))");
+	}
+
+	@Test
+	void writeInstantiationForStaticMethodWithNonGenericParameter() {
+		assertThat(writeInstantiation(method(SampleBean.class, "staticSource", Integer.class)).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> InjectionGeneratorTests.SampleBean.staticSource(attributes.get(0)))");
+	}
+
+	@Test
+	void writeInstantiationForMethodWithGenericParameters() {
+		assertThat(writeInstantiation(method(SampleBean.class, "source", ObjectProvider.class)).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> beanFactory.getBean(InjectionGeneratorTests.SampleBean.class).source(attributes.get(0)))");
+	}
+
+	@Test
+	void writeInjectionForUnsupportedMember() {
+		assertThatIllegalArgumentException().isThrownBy(() -> writeInjection(mock(Member.class), false));
+	}
+
+	@Test
+	void writeInjectionForNonRequiredMethodWithNonGenericParameters() {
+		Method method = method(SampleBean.class, "sourceAndCounter", String.class, Integer.class);
+		assertThat(writeInjection(method, false)).isEqualTo("""
+				instanceContext.method("sourceAndCounter", String.class, Integer.class)
+						.resolve(beanFactory, false).ifResolved((attributes) -> bean.sourceAndCounter(attributes.get(0), attributes.get(1)))""");
+	}
+
+	@Test
+	void writeInjectionForRequiredMethodWithGenericParameter() {
+		Method method = method(SampleBean.class, "nameAndCounter", String.class, ObjectProvider.class);
+		assertThat(writeInjection(method, true)).isEqualTo("""
+				instanceContext.method("nameAndCounter", String.class, ObjectProvider.class)
+						.invoke(beanFactory, (attributes) -> bean.nameAndCounter(attributes.get(0), attributes.get(1)))""");
+	}
+
+	@Test
+	void writeInjectionForNonRequiredMethodWithGenericParameter() {
+		Method method = method(SampleBean.class, "nameAndCounter", String.class, ObjectProvider.class);
+		assertThat(writeInjection(method, false)).isEqualTo("""
+				instanceContext.method("nameAndCounter", String.class, ObjectProvider.class)
+						.resolve(beanFactory, false).ifResolved((attributes) -> bean.nameAndCounter(attributes.get(0), attributes.get(1)))""");
+	}
+
+	@Test
+	void writeInjectionForRequiredField() {
+		Field field = field(SampleBean.class, "counter");
+		assertThat(writeInjection(field, true)).isEqualTo("""
+				instanceContext.field("counter", Integer.class)
+						.invoke(beanFactory, (attributes) -> bean.counter = attributes.get(0))""");
+	}
+
+	@Test
+	void writeInjectionForNonRequiredField() {
+		Field field = field(SampleBean.class, "counter");
+		assertThat(writeInjection(field, false)).isEqualTo("""
+				instanceContext.field("counter", Integer.class)
+						.resolve(beanFactory, false).ifResolved((attributes) -> bean.counter = attributes.get(0))""");
+	}
+
+	@Test
+	void writeInjectionForRequiredPrivateField() {
+		Field field = field(SampleBean.class, "source");
+		assertThat(writeInjection(field, true)).isEqualTo("""
+				instanceContext.field("source", String.class)
+						.invoke(beanFactory, (attributes) -> {
+							Field sourceField = ReflectionUtils.findField(InjectionGeneratorTests.SampleBean.class, "source", String.class);
+							ReflectionUtils.makeAccessible(sourceField);
+							ReflectionUtils.setField(sourceField, bean, attributes.get(0));
+						})""");
+	}
+
+
+	private Method method(Class<?> type, String name, Class<?>... parameterTypes) {
+		Method method = ReflectionUtils.findMethod(type, name, parameterTypes);
+		assertThat(method).isNotNull();
+		return method;
+	}
+
+	private Field field(Class<?> type, String name) {
+		Field field = ReflectionUtils.findField(type, name);
+		assertThat(field).isNotNull();
+		return field;
+	}
+
+	private String writeInstantiation(Executable creator) {
+		return CodeSnippet.process(code -> code.add(new InjectionGenerator().writeInstantiation(creator)));
+	}
+
+	private String writeInjection(Member member, boolean required) {
+		return CodeSnippet.process(code -> code.add(new InjectionGenerator().writeInjection(member, required)));
+	}
+
+	@SuppressWarnings("unused")
+	static class SampleBean {
+
+		private String source;
+
+		Integer counter;
+
+
+		void sourceAndCounter(String source, Integer counter) {
+
+		}
+
+		void nameAndCounter(String name, ObjectProvider<Integer> counter) {
+
+		}
+
+		String source(Integer counter) {
+			return "source" + counter;
+		}
+
+		String source(ObjectProvider<Integer> counter) {
+			return "source" + counter.getIfAvailable(() -> 0);
+		}
+
+		static String staticSource(Integer counter) {
+			return counter + "source";
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class SimpleBean {
+
+		String name() {
+			return "test";
+		}
+
+		static Integer number() {
+			return 42;
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class SimpleConstructorBean {
+
+		private final String source;
+
+		private final Integer counter;
+
+		public SimpleConstructorBean(String source, Integer counter) {
+			this.source = source;
+			this.counter = counter;
+		}
+
+		class InnerClass {
+
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class GenericConstructorBean {
+
+		private final ObjectProvider<Integer> counter;
+
+		GenericConstructorBean(ObjectProvider<Integer> counter) {
+			this.counter = counter;
+		}
+
+	}
+
+	static class AmbiguousConstructorBean {
+
+		AmbiguousConstructorBean(String first, String second) {
+
+		}
+
+		AmbiguousConstructorBean(String first, Number second) {
+
+		}
+
+	}
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrarTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrarTests.java
new file mode 100644
index 000000000000..8c97229f6d61
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrarTests.java
@@ -0,0 +1,458 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.InOrder;
+
+import org.springframework.beans.FatalBeanException;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.generator.config.BeanDefinitionRegistrar.BeanInstanceContext;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link BeanDefinitionRegistrar}.
+ *
+ * @author Stephane Nicoll
+ */
+class BeanDefinitionRegistrarTests {
+
+	@Test
+	void beanDefinitionWithBeanClassDoesNotSetTargetType() {
+		RootBeanDefinition beanDefinition = BeanDefinitionRegistrar.of("test", String.class).toBeanDefinition();
+		assertThat(beanDefinition.getBeanClass()).isEqualTo(String.class);
+		assertThat(beanDefinition.getTargetType()).isNull();
+	}
+
+	@Test
+	void beanDefinitionWithResolvableTypeSetsTargetType() {
+		ResolvableType targetType = ResolvableType.forClassWithGenerics(NumberHolder.class, Integer.class);
+		RootBeanDefinition beanDefinition = BeanDefinitionRegistrar.of("test", targetType).toBeanDefinition();
+		assertThat(beanDefinition.getTargetType()).isNotNull().isEqualTo(NumberHolder.class);
+	}
+
+	@Test
+	void registerWithSimpleInstanceSupplier() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		BeanDefinitionRegistrar.of("test", InjectionSample.class)
+				.instanceSupplier(InjectionSample::new).register(beanFactory);
+		assertBeanFactory(beanFactory, () -> {
+			assertThat(beanFactory.containsBean("test")).isTrue();
+			assertThat(beanFactory.getBean(InjectionSample.class)).isNotNull();
+		});
+	}
+
+	@Test
+	void registerWithSimpleInstanceSupplierThatThrowsRuntimeException() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		Exception exception = new IllegalArgumentException("test exception");
+		BeanDefinitionRegistrar.of("testBean", InjectionSample.class)
+				.instanceSupplier(() -> {
+					throw exception;
+				}).register(beanFactory);
+		assertThatThrownBy(() -> beanFactory.getBean("testBean")).isInstanceOf(BeanCreationException.class)
+				.getRootCause().isEqualTo(exception);
+	}
+
+	@Test
+	void registerWithSimpleInstanceSupplierThatThrowsCheckedException() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		Exception exception = new IOException("test exception");
+		BeanDefinitionRegistrar.of("testBean", InjectionSample.class)
+				.instanceSupplier(() -> {
+					throw exception;
+				}).register(beanFactory);
+		assertThatThrownBy(() -> beanFactory.getBean("testBean")).isInstanceOf(BeanCreationException.class)
+				.getRootCause().isEqualTo(exception);
+	}
+
+	@Test
+	void registerWithoutBeanNameFails() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		BeanDefinitionRegistrar registrar = BeanDefinitionRegistrar.inner(InjectionSample.class)
+				.instanceSupplier(InjectionSample::new);
+		assertThatIllegalStateException().isThrownBy(() -> registrar.register(beanFactory))
+				.withMessageContaining("Bean name not set.");
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void registerWithCustomizer() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		BeanDefinitionRegistrar.ThrowableConsumer<RootBeanDefinition> first = mock(BeanDefinitionRegistrar.ThrowableConsumer.class);
+		BeanDefinitionRegistrar.ThrowableConsumer<RootBeanDefinition> second = mock(BeanDefinitionRegistrar.ThrowableConsumer.class);
+		BeanDefinitionRegistrar.of("test", InjectionSample.class)
+				.instanceSupplier(InjectionSample::new).customize(first).customize(second).register(beanFactory);
+		assertBeanFactory(beanFactory, () -> {
+			assertThat(beanFactory.containsBean("test")).isTrue();
+			InOrder ordered = inOrder(first, second);
+			ordered.verify(first).accept(any(RootBeanDefinition.class));
+			ordered.verify(second).accept(any(RootBeanDefinition.class));
+		});
+	}
+
+	@Test
+	void registerWithCustomizerThatThrowsRuntimeException() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		Exception exception = new RuntimeException("test exception");
+		BeanDefinitionRegistrar registrar = BeanDefinitionRegistrar.of("test", InjectionSample.class)
+				.instanceSupplier(InjectionSample::new).customize(bd -> {
+					throw exception;
+				});
+		assertThatThrownBy(() -> registrar.register(beanFactory)).isInstanceOf(FatalBeanException.class)
+				.hasMessageContaining("Failed to create bean definition for bean with name 'test'")
+				.hasMessageContaining("test exception")
+				.hasCause(exception);
+	}
+
+	@Test
+	void registerWithCustomizerThatThrowsCheckedException() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		Exception exception = new IOException("test exception");
+		BeanDefinitionRegistrar registrar = BeanDefinitionRegistrar.of("test", InjectionSample.class)
+				.instanceSupplier(InjectionSample::new).customize(bd -> {
+					throw exception;
+				});
+		assertThatThrownBy(() -> registrar.register(beanFactory)).isInstanceOf(FatalBeanException.class)
+				.hasMessageContaining("Failed to create bean definition for bean with name 'test'")
+				.hasMessageContaining("test exception");
+	}
+
+	@Test
+	void registerWithConstructorInstantiation() {
+		ResourceLoader resourceLoader = new DefaultResourceLoader();
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader);
+		BeanDefinitionRegistrar.of("test", ConstructorSample.class).withConstructor(ResourceLoader.class)
+				.instanceSupplier(instanceContext -> instanceContext.create(beanFactory, attributes ->
+						new ConstructorSample(attributes.get(0)))).register(beanFactory);
+		assertBeanFactory(beanFactory, () -> {
+			assertThat(beanFactory.containsBean("test")).isTrue();
+			assertThat(beanFactory.getBean(ConstructorSample.class).resourceLoader).isEqualTo(resourceLoader);
+		});
+	}
+
+	@Test
+	void registerWithConstructorInstantiationThatThrowsRuntimeException() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		Exception exception = new RuntimeException("test exception");
+		BeanDefinitionRegistrar.of("test", ConstructorSample.class).withConstructor(ResourceLoader.class)
+				.instanceSupplier(instanceContext -> {
+					throw exception;
+				}).register(beanFactory);
+		assertThatThrownBy(() -> beanFactory.getBean("test")).isInstanceOf(BeanCreationException.class)
+				.getRootCause().isEqualTo(exception);
+	}
+
+	@Test
+	void registerWithConstructorInstantiationThatThrowsCheckedException() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		Exception exception = new IOException("test exception");
+		BeanDefinitionRegistrar.of("test", ConstructorSample.class).withConstructor(ResourceLoader.class)
+				.instanceSupplier(instanceContext -> {
+					throw exception;
+				}).register(beanFactory);
+		assertThatThrownBy(() -> beanFactory.getBean("test")).isInstanceOf(BeanCreationException.class)
+				.getRootCause().isEqualTo(exception);
+	}
+
+	@Test
+	void registerWithConstructorOnInnerClass() {
+		Environment environment = mock(Environment.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("environment", environment);
+		beanFactory.registerBeanDefinition("sample", BeanDefinitionBuilder.rootBeanDefinition(InnerClassSample.class).getBeanDefinition());
+		BeanDefinitionRegistrar.of("test", InnerClassSample.Inner.class).withConstructor(InnerClassSample.class, Environment.class)
+				.instanceSupplier(instanceContext -> instanceContext.create(beanFactory, attributes ->
+						beanFactory.getBean(InnerClassSample.class).new Inner(attributes.get(1))))
+				.register(beanFactory);
+		assertBeanFactory(beanFactory, () -> {
+			assertThat(beanFactory.containsBean("test")).isTrue();
+			InnerClassSample.Inner bean = beanFactory.getBean(InnerClassSample.Inner.class);
+			assertThat(bean.environment).isEqualTo(environment);
+		});
+	}
+
+	@Test
+	void registerWithInvalidConstructor() {
+		assertThatThrownBy(() -> BeanDefinitionRegistrar.of("test", ConstructorSample.class).withConstructor(Object.class))
+				.isInstanceOf(IllegalArgumentException.class)
+				.hasMessageContaining("No constructor with type(s) [java.lang.Object] found on")
+				.hasMessageContaining(ConstructorSample.class.getName());
+	}
+
+	@Test
+	void registerWithFactoryMethod() {
+		ResourceLoader resourceLoader = new DefaultResourceLoader();
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader);
+		BeanDefinitionRegistrar.of("configuration", ConfigurationSample.class).instanceSupplier(ConfigurationSample::new)
+				.register(beanFactory);
+		BeanDefinitionRegistrar.of("test", ConstructorSample.class)
+				.withFactoryMethod(ConfigurationSample.class, "sampleBean", ResourceLoader.class)
+				.instanceSupplier(instanceContext -> instanceContext.create(beanFactory, attributes ->
+						beanFactory.getBean(ConfigurationSample.class).sampleBean(attributes.get(0))))
+				.register(beanFactory);
+		assertBeanFactory(beanFactory, () -> {
+			assertThat(beanFactory.containsBean("configuration")).isTrue();
+			assertThat(beanFactory.containsBean("test")).isTrue();
+			assertThat(beanFactory.getBean(ConstructorSample.class).resourceLoader).isEqualTo(resourceLoader);
+			RootBeanDefinition bd = (RootBeanDefinition) beanFactory.getBeanDefinition("test");
+			assertThat(bd.getResolvedFactoryMethod()).isNotNull().isEqualTo(
+					ReflectionUtils.findMethod(ConfigurationSample.class, "sampleBean", ResourceLoader.class));
+		});
+	}
+
+	@Test
+	void registerWithCreateShortcutWithoutFactoryMethod() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		BeanDefinitionRegistrar.of("configuration", ConfigurationSample.class).instanceSupplier(ConfigurationSample::new)
+				.register(beanFactory);
+		BeanDefinitionRegistrar.of("test", ConstructorSample.class)
+				.instanceSupplier(instanceContext -> instanceContext.create(beanFactory, attributes ->
+						beanFactory.getBean(ConfigurationSample.class).sampleBean(attributes.get(0))))
+				.register(beanFactory);
+		assertThatThrownBy(() -> beanFactory.getBean("test")).isInstanceOf(BeanCreationException.class)
+				.hasMessageContaining("No factory method or constructor is set");
+	}
+
+	@Test
+	void registerWithInjectedField() {
+		Environment environment = mock(Environment.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("environment", environment);
+		BeanDefinitionRegistrar.of("test", InjectionSample.class).instanceSupplier(instanceContext -> {
+			InjectionSample bean = new InjectionSample();
+			instanceContext.field("environment", Environment.class).invoke(beanFactory,
+					attributes -> bean.environment = (attributes.get(0)));
+			return bean;
+		}).register(beanFactory);
+		assertBeanFactory(beanFactory, () -> {
+			assertThat(beanFactory.containsBean("test")).isTrue();
+			assertThat(beanFactory.getBean(InjectionSample.class).environment).isEqualTo(environment);
+		});
+	}
+
+	@Test
+	void registerWithInvalidField() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		BeanDefinitionRegistrar.of("test", InjectionSample.class).instanceSupplier(instanceContext ->
+				instanceContext.field("doesNotExist", Object.class).resolve(beanFactory)).register(beanFactory);
+		assertThatThrownBy(() -> beanFactory.getBean(InjectionSample.class)
+		).isInstanceOf(BeanCreationException.class)
+				.hasMessageContaining("No field '%s' with type %s found", "doesNotExist", Object.class.getName())
+				.hasMessageContaining(InjectionSample.class.getName());
+	}
+
+	@Test
+	void registerWithInjectedMethod() {
+		Environment environment = mock(Environment.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("environment", environment);
+		BeanDefinitionRegistrar.of("test", InjectionSample.class).instanceSupplier(instanceContext -> {
+			InjectionSample bean = new InjectionSample();
+			instanceContext.method("setEnvironment", Environment.class).invoke(beanFactory,
+					attributes -> bean.setEnvironment(attributes.get(0)));
+			return bean;
+		}).register(beanFactory);
+		assertBeanFactory(beanFactory, () -> {
+			assertThat(beanFactory.containsBean("test")).isTrue();
+			assertThat(beanFactory.getBean(InjectionSample.class).environment).isEqualTo(environment);
+		});
+	}
+
+	@Test
+	void registerWithInvalidMethod() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		assertThatThrownBy(() -> {
+					BeanDefinitionRegistrar.of("test", InjectionSample.class).instanceSupplier(instanceContext ->
+							instanceContext.method("setEnvironment", Object.class).resolve(beanFactory)).register(beanFactory);
+					beanFactory.getBean(InjectionSample.class);
+				}
+		).isInstanceOf(BeanCreationException.class)
+				.hasMessageContaining("No method '%s' with type(s) [%s] found", "setEnvironment", Object.class.getName())
+				.hasMessageContaining(InjectionSample.class.getName());
+	}
+
+	@Test
+	void innerBeanDefinitionWithClass() {
+		RootBeanDefinition beanDefinition = BeanDefinitionRegistrar.inner(ConfigurationSample.class)
+				.customize(bd -> bd.setSynthetic(true)).toBeanDefinition();
+		assertThat(beanDefinition).isNotNull();
+		assertThat(beanDefinition.getResolvableType().resolve()).isEqualTo(ConfigurationSample.class);
+		assertThat(beanDefinition.isSynthetic()).isTrue();
+	}
+
+	@Test
+	void innerBeanDefinitionWithResolvableType() {
+		RootBeanDefinition beanDefinition = BeanDefinitionRegistrar.inner(ResolvableType.forClass(ConfigurationSample.class))
+				.customize(bd -> bd.setDescription("test")).toBeanDefinition();
+		assertThat(beanDefinition).isNotNull();
+		assertThat(beanDefinition.getResolvableType().resolve()).isEqualTo(ConfigurationSample.class);
+		assertThat(beanDefinition.getDescription()).isEqualTo("test");
+	}
+
+	@Test
+	void innerBeanDefinitionHasInnerBeanNameInInstanceSupplier() {
+		RootBeanDefinition beanDefinition = BeanDefinitionRegistrar.inner(String.class)
+				.instanceSupplier(instanceContext -> {
+					Field field = ReflectionUtils.findField(BeanInstanceContext.class, "beanName", String.class);
+					ReflectionUtils.makeAccessible(field);
+					return ReflectionUtils.getField(field, instanceContext);
+				}).toBeanDefinition();
+		assertThat(beanDefinition).isNotNull();
+		String beanName = (String) beanDefinition.getInstanceSupplier().get();
+		assertThat(beanName).isNotNull().startsWith("(inner bean)#");
+	}
+
+
+	private void assertBeanFactory(DefaultListableBeanFactory beanFactory, Runnable assertions) {
+		assertions.run();
+	}
+
+
+	static class ConfigurationSample {
+
+		ConstructorSample sampleBean(ResourceLoader resourceLoader) {
+			return new ConstructorSample(resourceLoader);
+		}
+
+	}
+
+	static class ConstructorSample {
+		private final ResourceLoader resourceLoader;
+
+		ConstructorSample(ResourceLoader resourceLoader) {
+			this.resourceLoader = resourceLoader;
+		}
+	}
+
+	static class MultiArgConstructorSample {
+
+		private final String name;
+
+		private final Integer counter;
+
+		public MultiArgConstructorSample(String name, Integer counter) {
+			this.name = name;
+			this.counter = counter;
+		}
+
+	}
+
+	static class InjectionSample {
+
+		private Environment environment;
+
+		private String name;
+
+		private Integer counter;
+
+		void setEnvironment(Environment environment) {
+			this.environment = environment;
+		}
+
+		void setNameAndCounter(@Value("${test.name:test}") String name, @Value("${test.counter:42}") Integer counter) {
+			this.name = name;
+			this.counter = counter;
+		}
+
+	}
+
+	static class InnerClassSample {
+
+		class Inner {
+
+			private Environment environment;
+
+			Inner(Environment environment) {
+				this.environment = environment;
+			}
+
+		}
+
+	}
+
+	static class GenericFactoryBeanConfiguration {
+
+		FactoryBean<NumberHolder<?>> integerHolderFactory() {
+			return new GenericFactoryBean<>(integerHolder());
+		}
+
+		NumberHolder<?> integerHolder() {
+			return new NumberHolder<>(42);
+		}
+
+	}
+
+	static class GenericFactoryBean<T> implements FactoryBean<T> {
+
+		private final T value;
+
+		public GenericFactoryBean(T value) {
+			this.value = value;
+		}
+
+		@Override
+		public T getObject() {
+			return this.value;
+		}
+
+		@Override
+		public Class<?> getObjectType() {
+			return this.value.getClass();
+		}
+	}
+
+	static class NumberHolder<N extends Number> {
+
+		private final N number;
+
+		public NumberHolder(N number) {
+			this.number = number;
+		}
+
+	}
+
+	static class NumberHolderSample {
+
+		@Autowired
+		private NumberHolder<Integer> numberHolder;
+
+	}
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolverTests.java
new file mode 100644
index 000000000000..ff599eb4ff10
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedConstructionResolverTests.java
@@ -0,0 +1,476 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.assertj.core.util.Arrays;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.entry;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link InjectedConstructionResolver}.
+ *
+ * @author Stephane Nicoll
+ */
+class InjectedConstructionResolverTests {
+
+	@Test
+	void resolveNoArgConstructor() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		InjectedElementAttributes attributes = createResolverForConstructor(
+				InjectedConstructionResolverTests.class).resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+	}
+
+	@ParameterizedTest
+	@MethodSource("singleArgConstruction")
+	void resolveSingleArgConstructor(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("one", "1");
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		assertThat((String) attributes.get(0)).isEqualTo("1");
+	}
+
+	@ParameterizedTest
+	@MethodSource("singleArgConstruction")
+	void resolveRequiredDependencyNotPresentThrowsUnsatisfiedDependencyException(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		assertThatThrownBy(() -> resolver.resolve(beanFactory))
+				.isInstanceOfSatisfying(UnsatisfiedDependencyException.class, ex -> {
+					assertThat(ex.getBeanName()).isEqualTo("test");
+					assertThat(ex.getInjectionPoint()).isNotNull();
+					assertThat(ex.getInjectionPoint().getMember()).isEqualTo(resolver.getExecutable());
+				});
+	}
+
+	@ParameterizedTest
+	@MethodSource("arrayOfBeansConstruction")
+	void resolveArrayOfBeans(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("one", "1");
+		beanFactory.registerSingleton("two", "2");
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(Arrays.isArray(attribute)).isTrue();
+		assertThat((Object[]) attribute).containsExactly("1", "2");
+	}
+
+	@ParameterizedTest
+	@MethodSource("arrayOfBeansConstruction")
+	void resolveRequiredArrayOfBeansInjectEmptyArray(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(Arrays.isArray(attribute)).isTrue();
+		assertThat((Object[]) attribute).isEmpty();
+
+	}
+
+	static Stream<Arguments> arrayOfBeansConstruction() {
+		return Stream.of(Arguments.of(createResolverForConstructor(BeansCollectionConstructor.class, String[].class)),
+				Arguments.of(createResolverForFactoryMethod(BeansCollectionFactory.class, "array", String[].class)));
+	}
+
+	@ParameterizedTest
+	@MethodSource("listOfBeansConstruction")
+	void resolveListOfBeans(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("one", "1");
+		beanFactory.registerSingleton("two", "2");
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isInstanceOf(List.class).asList().containsExactly("1", "2");
+	}
+
+	@ParameterizedTest
+	@MethodSource("listOfBeansConstruction")
+	void resolveRequiredListOfBeansInjectEmptyList(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isInstanceOf(List.class);
+		assertThat((List<?>) attribute).isEmpty();
+	}
+
+	static Stream<Arguments> listOfBeansConstruction() {
+		return Stream.of(Arguments.of(createResolverForConstructor(BeansCollectionConstructor.class, List.class)),
+				Arguments.of(createResolverForFactoryMethod(BeansCollectionFactory.class, "list", List.class)));
+	}
+
+	@ParameterizedTest
+	@MethodSource("setOfBeansConstruction")
+	@SuppressWarnings("unchecked")
+	void resolveSetOfBeans(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("one", "1");
+		beanFactory.registerSingleton("two", "2");
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isInstanceOf(Set.class);
+		assertThat((Set<String>) attribute).containsExactly("1", "2");
+	}
+
+	@ParameterizedTest
+	@MethodSource("setOfBeansConstruction")
+	void resolveRequiredSetOfBeansInjectEmptySet(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isInstanceOf(Set.class);
+		assertThat((Set<?>) attribute).isEmpty();
+	}
+
+	static Stream<Arguments> setOfBeansConstruction() {
+		return Stream.of(Arguments.of(createResolverForConstructor(BeansCollectionConstructor.class, Set.class)),
+				Arguments.of(createResolverForFactoryMethod(BeansCollectionFactory.class, "set", Set.class)));
+	}
+
+	@ParameterizedTest
+	@MethodSource("mapOfBeansConstruction")
+	@SuppressWarnings("unchecked")
+	void resolveMapOfBeans(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("one", "1");
+		beanFactory.registerSingleton("two", "2");
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isInstanceOf(Map.class);
+		assertThat((Map<String, String>) attribute).containsExactly(entry("one", "1"), entry("two", "2"));
+	}
+
+	@ParameterizedTest
+	@MethodSource("mapOfBeansConstruction")
+	void resolveRequiredMapOfBeansInjectEmptySet(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isInstanceOf(Map.class);
+		assertThat((Map<?, ?>) attribute).isEmpty();
+	}
+
+	static Stream<Arguments> mapOfBeansConstruction() {
+		return Stream.of(Arguments.of(createResolverForConstructor(BeansCollectionConstructor.class, Map.class)),
+				Arguments.of(createResolverForFactoryMethod(BeansCollectionFactory.class, "map", Map.class)));
+	}
+
+	@ParameterizedTest
+	@MethodSource("multiArgsConstruction")
+	void resolveMultiArgsConstructor(InjectedConstructionResolver resolver) {
+		ResourceLoader resourceLoader = new DefaultResourceLoader();
+		Environment environment = mock(Environment.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader);
+		beanFactory.registerSingleton("environment", environment);
+		beanFactory.registerSingleton("one", "1");
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		assertThat((ResourceLoader) attributes.get(0)).isEqualTo(resourceLoader);
+		assertThat((Environment) attributes.get(1)).isEqualTo(environment);
+		ObjectProvider<String> provider = attributes.get(2);
+		assertThat(provider.getIfAvailable()).isEqualTo("1");
+	}
+
+	@ParameterizedTest
+	@MethodSource("mixedArgsConstruction")
+	void resolveMixedArgsConstructorWithUserValue(InjectedConstructionResolver resolver) {
+		ResourceLoader resourceLoader = new DefaultResourceLoader();
+		Environment environment = mock(Environment.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader);
+		beanFactory.registerSingleton("environment", environment);
+		AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(MixedArgsConstructor.class)
+				.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR).getBeanDefinition();
+		beanDefinition.getConstructorArgumentValues().addIndexedArgumentValue(1, "user-value");
+		beanFactory.registerBeanDefinition("test", beanDefinition);
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		assertThat((ResourceLoader) attributes.get(0)).isEqualTo(resourceLoader);
+		assertThat((String) attributes.get(1)).isEqualTo("user-value");
+		assertThat((Environment) attributes.get(2)).isEqualTo(environment);
+	}
+
+	@ParameterizedTest
+	@MethodSource("mixedArgsConstruction")
+	void resolveMixedArgsConstructorWithUserBeanReference(InjectedConstructionResolver resolver) {
+		ResourceLoader resourceLoader = new DefaultResourceLoader();
+		Environment environment = mock(Environment.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerResolvableDependency(ResourceLoader.class, resourceLoader);
+		beanFactory.registerSingleton("environment", environment);
+		beanFactory.registerSingleton("one", "1");
+		beanFactory.registerSingleton("two", "2");
+		AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(MixedArgsConstructor.class)
+				.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR).getBeanDefinition();
+		beanDefinition.getConstructorArgumentValues().addIndexedArgumentValue(1, new RuntimeBeanReference("two"));
+		beanFactory.registerBeanDefinition("test", beanDefinition);
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		assertThat((ResourceLoader) attributes.get(0)).isEqualTo(resourceLoader);
+		assertThat((String) attributes.get(1)).isEqualTo("2");
+		assertThat((Environment) attributes.get(2)).isEqualTo(environment);
+	}
+
+	@Test
+	void resolveUserValueWithTypeConversionRequired() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(CharDependency.class)
+				.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR).getBeanDefinition();
+		beanDefinition.getConstructorArgumentValues().addIndexedArgumentValue(0, "\\");
+		beanFactory.registerBeanDefinition("test", beanDefinition);
+		InjectedElementAttributes attributes = createResolverForConstructor(CharDependency.class, char.class).resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isInstanceOf(Character.class);
+		assertThat((Character) attribute).isEqualTo('\\');
+	}
+
+	@ParameterizedTest
+	@MethodSource("singleArgConstruction")
+	void resolveUserValueWithBeanReference(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("stringBean", "string");
+		beanFactory.registerBeanDefinition("test", BeanDefinitionBuilder.rootBeanDefinition(SingleArgConstructor.class)
+				.addConstructorArgReference("stringBean").getBeanDefinition());
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isEqualTo("string");
+	}
+
+	@ParameterizedTest
+	@MethodSource("singleArgConstruction")
+	void resolveUserValueWithBeanDefinition(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		AbstractBeanDefinition userValue = BeanDefinitionBuilder.rootBeanDefinition(String.class, () -> "string").getBeanDefinition();
+		beanFactory.registerBeanDefinition("test", BeanDefinitionBuilder.rootBeanDefinition(SingleArgConstructor.class)
+				.addConstructorArgValue(userValue).getBeanDefinition());
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isEqualTo("string");
+	}
+
+	@ParameterizedTest
+	@MethodSource("singleArgConstruction")
+	void resolveUserValueThatIsAlreadyResolved(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(SingleArgConstructor.class).getBeanDefinition();
+		ValueHolder valueHolder = new ValueHolder('a');
+		valueHolder.setConvertedValue("this is an a");
+		beanDefinition.getConstructorArgumentValues().addIndexedArgumentValue(0, valueHolder);
+		beanFactory.registerBeanDefinition("test", beanDefinition);
+		InjectedElementAttributes attributes = resolver.resolve(beanFactory);
+		assertThat(attributes.isResolved()).isTrue();
+		Object attribute = attributes.get(0);
+		assertThat(attribute).isEqualTo("this is an a");
+	}
+
+	@ParameterizedTest
+	@MethodSource("singleArgConstruction")
+	void createInvokeFactory(InjectedConstructionResolver resolver) {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("one", "1");
+		String instance = resolver.create(beanFactory, attributes -> attributes.get(0));
+		assertThat(instance).isEqualTo("1");
+	}
+
+	private static InjectedConstructionResolver createResolverForConstructor(Class<?> beanType, Class<?>... parameterTypes) {
+		try {
+			Constructor<?> executable = beanType.getDeclaredConstructor(parameterTypes);
+			return new InjectedConstructionResolver(executable, beanType, "test",
+					InjectedConstructionResolverTests::safeGetBeanDefinition);
+		}
+		catch (NoSuchMethodException ex) {
+			throw new IllegalStateException(ex);
+		}
+	}
+
+	private static InjectedConstructionResolver createResolverForFactoryMethod(Class<?> targetType,
+			String methodName, Class<?>... parameterTypes) {
+		Method executable = ReflectionUtils.findMethod(targetType, methodName, parameterTypes);
+		return new InjectedConstructionResolver(executable, targetType, "test",
+				InjectedConstructionResolverTests::safeGetBeanDefinition);
+	}
+
+	private static BeanDefinition safeGetBeanDefinition(DefaultListableBeanFactory beanFactory) {
+		try {
+			return beanFactory.getBeanDefinition("test");
+		}
+		catch (NoSuchBeanDefinitionException ex) {
+			return null;
+		}
+	}
+
+	static Stream<Arguments> singleArgConstruction() {
+		return Stream.of(Arguments.of(createResolverForConstructor(SingleArgConstructor.class, String.class)),
+				Arguments.of(createResolverForFactoryMethod(SingleArgFactory.class, "single", String.class)));
+	}
+
+	@SuppressWarnings("unused")
+	static class SingleArgConstructor {
+
+		public SingleArgConstructor(String s) {
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class SingleArgFactory {
+
+		String single(String s) {
+			return s;
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class BeansCollectionConstructor {
+
+		public BeansCollectionConstructor(String[] beans) {
+
+		}
+
+		public BeansCollectionConstructor(List<String> beans) {
+
+		}
+
+		public BeansCollectionConstructor(Set<String> beans) {
+
+		}
+
+		public BeansCollectionConstructor(Map<String, String> beans) {
+
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class BeansCollectionFactory {
+
+		public String array(String[] beans) {
+			return "test";
+		}
+
+		public String list(List<String> beans) {
+			return "test";
+		}
+
+		public String set(Set<String> beans) {
+			return "test";
+		}
+
+		public String map(Map<String, String> beans) {
+			return "test";
+		}
+
+	}
+
+	static Stream<Arguments> multiArgsConstruction() {
+		return Stream.of(
+				Arguments.of(createResolverForConstructor(MultiArgsConstructor.class, ResourceLoader.class,
+						Environment.class, ObjectProvider.class)),
+				Arguments.of(createResolverForFactoryMethod(MultiArgsFactory.class, "multiArgs", ResourceLoader.class,
+						Environment.class, ObjectProvider.class)));
+	}
+
+	@SuppressWarnings("unused")
+	static class MultiArgsConstructor {
+
+		public MultiArgsConstructor(ResourceLoader resourceLoader, Environment environment, ObjectProvider<String> provider) {
+		}
+	}
+
+	@SuppressWarnings("unused")
+	static class MultiArgsFactory {
+
+		String multiArgs(ResourceLoader resourceLoader, Environment environment, ObjectProvider<String> provider) {
+			return "test";
+		}
+	}
+
+	static Stream<Arguments> mixedArgsConstruction() {
+		return Stream.of(
+				Arguments.of(createResolverForConstructor(MixedArgsConstructor.class, ResourceLoader.class,
+						String.class, Environment.class)),
+				Arguments.of(createResolverForFactoryMethod(MixedArgsFactory.class, "mixedArgs", ResourceLoader.class,
+						String.class, Environment.class)));
+	}
+
+	@SuppressWarnings("unused")
+	static class MixedArgsConstructor {
+
+		public MixedArgsConstructor(ResourceLoader resourceLoader, String test, Environment environment) {
+
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class MixedArgsFactory {
+
+		String mixedArgs(ResourceLoader resourceLoader, String test, Environment environment) {
+			return "test";
+		}
+
+	}
+
+	@SuppressWarnings("unused")
+	static class CharDependency {
+
+		CharDependency(char escapeChar) {
+		}
+
+	}
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedElementAttributesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedElementAttributesTests.java
new file mode 100644
index 000000000000..f2f66811b926
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedElementAttributesTests.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+/**
+ * Tests for {@link InjectedElementAttributes}.
+ *
+ * @author Stephane Nicoll
+ */
+class InjectedElementAttributesTests {
+
+	private static final InjectedElementAttributes unresolved = new InjectedElementAttributes(null);
+
+	private static final InjectedElementAttributes resolved = new InjectedElementAttributes(Collections.singletonList("test"));
+
+	@Test
+	void isResolvedWithUnresolvedAttributes() {
+		assertThat(unresolved.isResolved()).isFalse();
+	}
+
+	@Test
+	void isResolvedWithResoledAttributes() {
+		assertThat(resolved.isResolved()).isTrue();
+	}
+
+	@Test
+	void ifResolvedWithUnresolvedAttributesDoesNotInvokeRunnable() {
+		Runnable runnable = mock(Runnable.class);
+		unresolved.ifResolved(runnable);
+		verifyNoInteractions(runnable);
+	}
+
+	@Test
+	void ifResolvedWithResolvedAttributesInvokesRunnable() {
+		Runnable runnable = mock(Runnable.class);
+		resolved.ifResolved(runnable);
+		verify(runnable).run();
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void ifResolvedWithUnresolvedAttributesDoesNotInvokeConsumer() {
+		BeanDefinitionRegistrar.ThrowableConsumer<InjectedElementAttributes> consumer = mock(BeanDefinitionRegistrar.ThrowableConsumer.class);
+		unresolved.ifResolved(consumer);
+		verifyNoInteractions(consumer);
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void ifResolvedWithResolvedAttributesInvokesConsumer() {
+		BeanDefinitionRegistrar.ThrowableConsumer<InjectedElementAttributes> consumer = mock(BeanDefinitionRegistrar.ThrowableConsumer.class);
+		resolved.ifResolved(consumer);
+		verify(consumer).accept(resolved);
+	}
+
+	@Test
+	void getWithAvailableAttribute() {
+		InjectedElementAttributes attributes = new InjectedElementAttributes(Collections.singletonList("test"));
+		assertThat((String) attributes.get(0)).isEqualTo("test");
+	}
+
+	@Test
+	void getWithTypeAndAvailableAttribute() {
+		InjectedElementAttributes attributes = new InjectedElementAttributes(Collections.singletonList("test"));
+		assertThat(attributes.get(0, String.class)).isEqualTo("test");
+	}
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedFieldResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedFieldResolverTests.java
new file mode 100644
index 000000000000..39f90cca7f8e
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedFieldResolverTests.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.lang.reflect.Field;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * Tests for {@link InjectedFieldResolver}.
+ *
+ * @author Stephane Nicoll
+ */
+class InjectedFieldResolverTests {
+
+	@Test
+	void resolveDependency() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("one", "1");
+		InjectedElementAttributes attributes = createResolver(TestBean.class, "string",
+				String.class).resolve(beanFactory, true);
+		assertThat(attributes.isResolved()).isTrue();
+		assertThat((String) attributes.get(0)).isEqualTo("1");
+	}
+
+	@Test
+	void resolveRequiredDependencyNotPresentThrowsUnsatisfiedDependencyException() {
+		Field field = ReflectionUtils.findField(TestBean.class, "string", String.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		assertThatThrownBy(() -> createResolver(TestBean.class, "string", String.class).resolve(beanFactory))
+				.isInstanceOfSatisfying(UnsatisfiedDependencyException.class, ex -> {
+					assertThat(ex.getBeanName()).isEqualTo("test");
+					assertThat(ex.getInjectionPoint()).isNotNull();
+					assertThat(ex.getInjectionPoint().getField()).isEqualTo(field);
+				});
+	}
+
+	@Test
+	void resolveNonRequiredDependency() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		InjectedElementAttributes attributes = createResolver(TestBean.class, "string", String.class).resolve(beanFactory, false);
+		assertThat(attributes.isResolved()).isFalse();
+	}
+
+	private InjectedFieldResolver createResolver(Class<?> beanType, String fieldName, Class<?> fieldType) {
+		Field field = ReflectionUtils.findField(beanType, fieldName, fieldType);
+		assertThat(field).isNotNull();
+		return new InjectedFieldResolver(field, "test");
+	}
+
+	static class TestBean {
+
+		private String string;
+
+	}
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedMethodResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedMethodResolverTests.java
new file mode 100644
index 000000000000..d9b9e2aee24f
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/config/InjectedMethodResolverTests.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator.config;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.core.env.Environment;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+/**
+ * Tests for {@link InjectedMethodResolver}.
+ *
+ * @author Stephane Nicoll
+ */
+class InjectedMethodResolverTests {
+
+	@Test
+	void resolveSingleDependency() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("test", "testValue");
+		InjectedElementAttributes attributes = createResolver(TestBean.class, "injectString", String.class)
+				.resolve(beanFactory, true);
+		assertThat(attributes.isResolved()).isTrue();
+		assertThat((String) attributes.get(0)).isEqualTo("testValue");
+	}
+
+	@Test
+	void resolveRequiredDependencyNotPresentThrowsUnsatisfiedDependencyException() {
+		Method method = ReflectionUtils.findMethod(TestBean.class, "injectString", String.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		assertThatThrownBy(() -> createResolver(TestBean.class, "injectString", String.class)
+				.resolve(beanFactory)).isInstanceOfSatisfying(UnsatisfiedDependencyException.class, ex -> {
+			assertThat(ex.getBeanName()).isEqualTo("test");
+			assertThat(ex.getInjectionPoint()).isNotNull();
+			assertThat(ex.getInjectionPoint().getMember()).isEqualTo(method);
+		});
+	}
+
+	@Test
+	void resolveNonRequiredDependency() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		InjectedElementAttributes attributes = createResolver(TestBean.class, "injectString", String.class)
+				.resolve(beanFactory, false);
+		assertThat(attributes.isResolved()).isFalse();
+	}
+
+	@Test
+	void resolveDependencyAndEnvironment() {
+		Environment environment = mock(Environment.class);
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("environment", environment);
+		beanFactory.registerSingleton("test", "testValue");
+		InjectedElementAttributes attributes = createResolver(TestBean.class, "injectStringAndEnvironment",
+				String.class, Environment.class).resolve(beanFactory, true);
+		assertThat(attributes.isResolved()).isTrue();
+		String string = attributes.get(0);
+		assertThat(string).isEqualTo("testValue");
+		assertThat((Environment) attributes.get(1)).isEqualTo(environment);
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void createWithUnresolvedAttributesDoesNotInvokeCallback() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		BeanDefinitionRegistrar.ThrowableFunction<InjectedElementAttributes, ?> callback = mock(BeanDefinitionRegistrar.ThrowableFunction.class);
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() ->
+				createResolver(TestBean.class, "injectString", String.class).create(beanFactory, callback));
+		verifyNoInteractions(callback);
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void invokeWithUnresolvedAttributesDoesNotInvokeCallback() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		BeanDefinitionRegistrar.ThrowableConsumer<InjectedElementAttributes> callback = mock(BeanDefinitionRegistrar.ThrowableConsumer.class);
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() ->
+				createResolver(TestBean.class, "injectString", String.class).invoke(beanFactory, callback));
+		verifyNoInteractions(callback);
+	}
+
+	private InjectedMethodResolver createResolver(Class<?> beanType, String methodName, Class<?>... parameterTypes) {
+		Method method = ReflectionUtils.findMethod(beanType, methodName, parameterTypes);
+		assertThat(method).isNotNull();
+		return new InjectedMethodResolver(method, beanType, "test");
+	}
+
+	@SuppressWarnings("unused")
+	static class TestBean {
+
+		public void injectString(String string) {
+
+		}
+
+		public void injectStringAndEnvironment(String string, Environment environment) {
+
+		}
+
+	}
+
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/InnerComponentConfiguration.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/InnerComponentConfiguration.java
new file mode 100644
index 000000000000..28188b2a52a0
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/InnerComponentConfiguration.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator;
+
+import org.springframework.core.env.Environment;
+
+public class InnerComponentConfiguration {
+
+	public class NoDependencyComponent {
+
+		public NoDependencyComponent() {
+
+		}
+	}
+
+	public class EnvironmentAwareComponent {
+
+		public EnvironmentAwareComponent(Environment environment) {
+
+		}
+	}
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/SimpleConfiguration.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/SimpleConfiguration.java
new file mode 100644
index 000000000000..0f5ba99ad057
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/SimpleConfiguration.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator;
+
+public class SimpleConfiguration {
+
+	public SimpleConfiguration() {
+	}
+
+	public String stringBean() {
+		return "Hello";
+	}
+
+	public Integer integerBean() {
+		return 42;
+	}
+
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolder.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolder.java
new file mode 100644
index 000000000000..d49475656e17
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolder.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator.factory;
+
+import java.io.Serializable;
+
+/**
+ * A sample object with a generic type.
+ *
+ * @param <T> the number type
+ * @author Stephane Nicoll
+ */
+@SuppressWarnings("serial")
+public class NumberHolder<T extends Number> implements Serializable {
+
+	private final T number;
+
+	public NumberHolder(T number) {
+		this.number = number;
+	}
+
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolderFactoryBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolderFactoryBean.java
new file mode 100644
index 000000000000..a837a8dcaf53
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/NumberHolderFactoryBean.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator.factory;
+
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ * A sample factory bean with a generic type.
+ *
+ * @param <T> the type of the number generated by this factory bean
+ * @author Stephane Nicoll
+ */
+public class NumberHolderFactoryBean<T extends Number> implements FactoryBean<NumberHolder<T>> {
+
+	private T number;
+
+	public void setNumber(T number) {
+		this.number = number;
+	}
+
+	@Override
+	public NumberHolder<T> getObject() {
+		return new NumberHolder<>(this.number);
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return NumberHolder.class;
+	}
+
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/SampleFactory.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/SampleFactory.java
new file mode 100644
index 000000000000..eca5e0d7bfdf
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/factory/SampleFactory.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator.factory;
+
+public abstract class SampleFactory {
+
+	public static String create(String testBean) {
+		return testBean;
+	}
+
+	public static String create(char character) {
+		return String.valueOf(character);
+	}
+
+	public static String create(Number number, String test) {
+		return number + test;
+	}
+
+	public static String create(Class<?> type) {
+		return type.getName();
+	}
+
+	public static Integer integerBean() {
+		return 42;
+	}
+
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/injection/InjectionComponent.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/injection/InjectionComponent.java
new file mode 100644
index 000000000000..9d772ade5a34
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/injection/InjectionComponent.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator.injection;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+@SuppressWarnings("unused")
+public class InjectionComponent {
+
+	private final String bean;
+
+	private Integer counter;
+
+	public InjectionComponent(String bean) {
+		this.bean = bean;
+	}
+
+	@Autowired(required = false)
+	public void setCounter(Integer counter) {
+		this.counter = counter;
+	}
+
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/property/ConfigurableBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/property/ConfigurableBean.java
new file mode 100644
index 000000000000..0a8319223b36
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/property/ConfigurableBean.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator.property;
+
+public class ConfigurableBean {
+
+	private String name;
+
+	private Integer counter;
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setCounter(Integer counter) {
+		this.counter = counter;
+	}
+
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedConstructorComponent.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedConstructorComponent.java
new file mode 100644
index 000000000000..5b27a375cdd2
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedConstructorComponent.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator.visibility;
+
+public class ProtectedConstructorComponent {
+
+	ProtectedConstructorComponent() {
+
+	}
+}
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedFactoryMethod.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedFactoryMethod.java
new file mode 100644
index 000000000000..7d2fd2b5574d
--- /dev/null
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/generator/visibility/ProtectedFactoryMethod.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2002-2022 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.beans.testfixture.beans.factory.generator.visibility;
+
+public class ProtectedFactoryMethod {
+
+	String testBean(Integer number) {
+		return "test-" + number;
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/aot/generator/ResolvableTypeGenerator.java b/spring-core/src/main/java/org/springframework/aot/generator/ResolvableTypeGenerator.java
new file mode 100644
index 000000000000..339a993bf95b
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/aot/generator/ResolvableTypeGenerator.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import java.util.Arrays;
+
+import org.springframework.core.ResolvableType;
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.support.MultiCodeBlock;
+import org.springframework.util.ClassUtils;
+
+/**
+ * Code generator for {@link ResolvableType}.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+public final class ResolvableTypeGenerator {
+
+	/**
+	 * Generate a type signature for the specified {@link ResolvableType}.
+	 * @param target the type to generate
+	 * @return the representation of that type
+	 */
+	public CodeBlock generateTypeFor(ResolvableType target) {
+		CodeBlock.Builder code = CodeBlock.builder();
+		generate(code, target, false);
+		return code.build();
+	}
+
+	private void generate(CodeBlock.Builder code, ResolvableType target, boolean forceResolvableType) {
+		Class<?> type = ClassUtils.getUserClass(target.toClass());
+		if (!target.hasGenerics()) {
+			if (forceResolvableType) {
+				code.add("$T.forClass($T.class)", ResolvableType.class, type);
+			}
+			else {
+				code.add("$T.class", type);
+			}
+		}
+		else {
+			code.add("$T.forClassWithGenerics($T.class, ", ResolvableType.class, type);
+			ResolvableType[] generics = target.getGenerics();
+			boolean hasGenericParameter = Arrays.stream(generics).anyMatch(ResolvableType::hasGenerics);
+			MultiCodeBlock multi = new MultiCodeBlock();
+			for (int i = 0; i < generics.length; i++) {
+				ResolvableType parameter = target.getGeneric(i);
+				multi.add(parameterCode -> generate(parameterCode, parameter, hasGenericParameter));
+			}
+			code.add(multi.join(", ")).add(")");
+		}
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHints.java b/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHints.java
index f459c6a25822..1f7be98f33fe 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHints.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHints.java
@@ -29,6 +29,7 @@
 import java.util.stream.Stream;
 
 import org.springframework.aot.hint.TypeHint.Builder;
+import org.springframework.lang.Nullable;
 
 /**
  * Gather the need for reflection at runtime.
@@ -49,6 +50,28 @@ public Stream<TypeHint> typeHints() {
 		return this.types.values().stream().map(TypeHint.Builder::build);
 	}
 
+	/**
+	 * Return the reflection hints for the type defined by the specified
+	 * {@link TypeReference}.
+	 * @param type the type to inspect
+	 * @return the reflection hints for this type, or {@code null}
+	 */
+	@Nullable
+	public TypeHint getTypeHint(TypeReference type) {
+		Builder typeHintBuilder = this.types.get(type);
+		return (typeHintBuilder != null ? typeHintBuilder.build() : null);
+	}
+
+	/**
+	 * Return the reflection hints for the specified type.
+	 * @param type the type to inspect
+	 * @return the reflection hints for this type, or {@code null}
+	 */
+	@Nullable
+	public TypeHint getTypeHint(Class<?> type) {
+		return getTypeHint(TypeReference.of(type));
+	}
+
 	/**
 	 * Register or customize reflection hints for the type defined by the
 	 * specified {@link TypeReference}.
diff --git a/spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java b/spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java
index 04bd02071e26..2442b8585004 100644
--- a/spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java
+++ b/spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java
@@ -47,41 +47,48 @@ public boolean isEmpty() {
 	/**
 	 * Add the specified {@link CodeBlock codeblock} rendered as-is.
 	 * @param codeBlock the code block to add
+	 * @return {@code this}, to facilitate method chaining
 	 * @see #addStatement(CodeBlock) to add a code block that represents
 	 * a statement
 	 */
-	public void add(CodeBlock codeBlock) {
+	public MultiStatement add(CodeBlock codeBlock) {
 		this.statements.add(Statement.of(codeBlock));
+		return this;
 	}
 
 	/**
 	 * Add a {@link CodeBlock} rendered as-is using the specified callback.
 	 * @param code the callback to use
+	 * @return {@code this}, to facilitate method chaining
 	 * @see #addStatement(CodeBlock) to add a code block that represents
 	 * a statement
 	 */
-	public void add(Consumer<Builder> code) {
+	public MultiStatement add(Consumer<Builder> code) {
 		CodeBlock.Builder builder = CodeBlock.builder();
 		code.accept(builder);
 		add(builder.build());
+		return this;
 	}
 
 	/**
 	 * Add a statement.
 	 * @param statement the statement to add
+	 * @return {@code this}, to facilitate method chaining
 	 */
-	public void addStatement(CodeBlock statement) {
+	public MultiStatement addStatement(CodeBlock statement) {
 		this.statements.add(Statement.ofStatement(statement));
+		return this;
 	}
 
 	/**
 	 * Add a statement using the specified callback.
 	 * @param code the callback to use
+	 * @return {@code this}, to facilitate method chaining
 	 */
-	public void addStatement(Consumer<Builder> code) {
+	public MultiStatement addStatement(Consumer<Builder> code) {
 		CodeBlock.Builder builder = CodeBlock.builder();
 		code.accept(builder);
-		addStatement(builder.build());
+		return addStatement(builder.build());
 	}
 
 	/**
@@ -89,10 +96,11 @@ public void addStatement(Consumer<Builder> code) {
 	 * arguments.
 	 * @param code the code of the statement
 	 * @param args the arguments for placeholders
+	 * @return {@code this}, to facilitate method chaining
 	 * @see CodeBlock#of(String, Object...)
 	 */
-	public void addStatement(String code, Object... args) {
-		addStatement(CodeBlock.of(code, args));
+	public MultiStatement addStatement(String code, Object... args) {
+		return addStatement(CodeBlock.of(code, args));
 	}
 
 	/**
@@ -101,9 +109,11 @@ public void addStatement(String code, Object... args) {
 	 * @param items the items to handle, each item is represented as a statement
 	 * @param itemGenerator the item generator
 	 * @param <T> the type of the item
+	 * @return {@code this}, to facilitate method chaining
 	 */
-	public <T> void addAll(Iterable<T> items, Function<T, CodeBlock> itemGenerator) {
+	public <T> MultiStatement addAll(Iterable<T> items, Function<T, CodeBlock> itemGenerator) {
 		items.forEach(element -> addStatement(itemGenerator.apply(element)));
+		return this;
 	}
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/aot/generator/ResolvableTypeGeneratorTests.java b/spring-core/src/test/java/org/springframework/aot/generator/ResolvableTypeGeneratorTests.java
new file mode 100644
index 000000000000..34ab0f867111
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/aot/generator/ResolvableTypeGeneratorTests.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2022 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.aot.generator;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.ResolvableType;
+import org.springframework.javapoet.support.CodeSnippet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link ResolvableTypeGenerator}.
+ *
+ * @author Stephane Nicoll
+ */
+class ResolvableTypeGeneratorTests {
+
+	@Test
+	void generateTypeForResolvableTypeWithGenericParameter() {
+		assertThat(generateTypeFor(
+				ResolvableType.forClassWithGenerics(Function.class,
+						ResolvableType.forClassWithGenerics(Supplier.class, String.class),
+						ResolvableType.forClassWithGenerics(Supplier.class, Integer.class))))
+				.isEqualTo("ResolvableType.forClassWithGenerics(Function.class, "
+						+ "ResolvableType.forClassWithGenerics(Supplier.class, String.class), "
+						+ "ResolvableType.forClassWithGenerics(Supplier.class, Integer.class))");
+	}
+
+	@Test
+	void generateTypeForResolvableTypeWithMixedParameter() {
+		assertThat(generateTypeFor(
+				ResolvableType.forClassWithGenerics(Function.class,
+						ResolvableType.forClassWithGenerics(Supplier.class, String.class),
+						ResolvableType.forClass(Integer.class))))
+				.isEqualTo("ResolvableType.forClassWithGenerics(Function.class, "
+						+ "ResolvableType.forClassWithGenerics(Supplier.class, String.class), "
+						+ "ResolvableType.forClass(Integer.class))");
+	}
+
+	private String generateTypeFor(ResolvableType type) {
+		return CodeSnippet.process(new ResolvableTypeGenerator().generateTypeFor(type));
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java
index 6b0f57d85cdc..8d96f72190a8 100644
--- a/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsTests.java
@@ -16,10 +16,13 @@
 
 package org.springframework.aot.hint;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.function.Consumer;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,11 +44,34 @@ void registerType() {
 				typeWithMemberCategories(String.class, MemberCategory.DECLARED_FIELDS));
 	}
 
+	@Test
+	void getTypeUsingType() {
+		this.reflectionHints.registerType(TypeReference.of(String.class),
+				hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS));
+		assertThat(this.reflectionHints.getTypeHint(String.class)).satisfies(
+				typeWithMemberCategories(String.class, MemberCategory.DECLARED_FIELDS));
+	}
+
+	@Test
+	void getTypeUsingTypeReference() {
+		this.reflectionHints.registerType(String.class,
+				hint -> hint.withMembers(MemberCategory.DECLARED_FIELDS));
+		assertThat(this.reflectionHints.getTypeHint(TypeReference.of(String.class))).satisfies(
+				typeWithMemberCategories(String.class, MemberCategory.DECLARED_FIELDS));
+	}
+
+	@Test
+	void getTypeForNonExistingType() {
+		assertThat(this.reflectionHints.getTypeHint(String.class)).isNull();
+	}
+
 	@Test
 	void registerTypeReuseBuilder() {
 		this.reflectionHints.registerType(TypeReference.of(String.class),
 				typeHint -> typeHint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS));
-		this.reflectionHints.registerField(ReflectionUtils.findField(String.class, "value"));
+		Field field = ReflectionUtils.findField(String.class, "value");
+		assertThat(field).isNotNull();
+		this.reflectionHints.registerField(field);
 		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(typeHint -> {
 			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(String.class.getCanonicalName());
 			assertThat(typeHint.fields()).singleElement().satisfies(fieldHint -> assertThat(fieldHint.getName()).isEqualTo("value"));
@@ -63,7 +89,9 @@ void registerClass() {
 
 	@Test
 	void registerField() {
-		this.reflectionHints.registerField(ReflectionUtils.findField(TestType.class, "field"));
+		Field field = ReflectionUtils.findField(TestType.class, "field");
+		assertThat(field).isNotNull();
+		this.reflectionHints.registerField(field);
 		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(typeHint -> {
 			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(TestType.class.getCanonicalName());
 			assertThat(typeHint.fields()).singleElement().satisfies(fieldHint ->
@@ -92,7 +120,9 @@ void registerConstructor() {
 
 	@Test
 	void registerMethod() {
-		this.reflectionHints.registerMethod(ReflectionUtils.findMethod(TestType.class, "setName", String.class));
+		Method method = ReflectionUtils.findMethod(TestType.class, "setName", String.class);
+		assertThat(method).isNotNull();
+		this.reflectionHints.registerMethod(method);
 		assertThat(this.reflectionHints.typeHints()).singleElement().satisfies(typeHint -> {
 			assertThat(typeHint.getType().getCanonicalName()).isEqualTo(TestType.class.getCanonicalName());
 			assertThat(typeHint.fields()).isEmpty();
@@ -119,6 +149,7 @@ private Consumer<TypeHint> typeWithMemberCategories(Class<?> type, MemberCategor
 	@SuppressWarnings("unused")
 	static class TestType {
 
+		@Nullable
 		private String field;
 
 		void setName(String name) {

From f004bb1b64cd9f39d58adc181607a1d5f3034b29 Mon Sep 17 00:00:00 2001
From: Ivan Zbykovskyi <>
Date: Thu, 3 Feb 2022 13:34:02 +0200
Subject: [PATCH 688/735] Add formatting for SockJS GoAway frame

Prevents infinite loop for xhr-polling and xhr-streaming transports.

See gh-28000
---
 .../handler/AbstractHttpSendingTransportHandler.java          | 4 +++-
 .../sockjs/transport/session/AbstractHttpSockJsSession.java   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
index ef566c7f8db1..73aac7449e4d 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
@@ -79,9 +79,11 @@ else if (sockJsSession.isClosed()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Connection already closed (but not removed yet) for " + sockJsSession);
 			}
+			SockJsFrameFormat frameFormat = this.getFrameFormat(request);
 			SockJsFrame frame = SockJsFrame.closeFrameGoAway();
+			String formattedFrame = frameFormat.format(frame);
 			try {
-				response.getBody().write(frame.getContentBytes());
+				response.getBody().write(formattedFrame.getBytes(SockJsFrame.CHARSET));
 			}
 			catch (IOException ex) {
 				throw new SockJsException("Failed to send " + frame, sockJsSession.getId(), ex);
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
index a3d492ecf564..ab90363c7f1c 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
@@ -257,7 +257,8 @@ public void handleSuccessiveRequest(ServerHttpRequest request, ServerHttpRespons
 		synchronized (this.responseLock) {
 			try {
 				if (isClosed()) {
-					response.getBody().write(SockJsFrame.closeFrameGoAway().getContentBytes());
+					String formattedFrame = frameFormat.format(SockJsFrame.closeFrameGoAway());
+					response.getBody().write(formattedFrame.getBytes(SockJsFrame.CHARSET));
 					return;
 				}
 				this.response = response;

From 11cb93823270e8c7003c6bf21909bef0601f062d Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Mon, 14 Feb 2022 16:34:40 +0000
Subject: [PATCH 689/735] Polishing contribution

Closes gh-28000
---
 .../AbstractHttpSendingTransportHandler.java  | 32 +++++++++----------
 .../session/AbstractHttpSockJsSession.java    |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
index 73aac7449e4d..9a2f75d1ba08 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -79,15 +79,7 @@ else if (sockJsSession.isClosed()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Connection already closed (but not removed yet) for " + sockJsSession);
 			}
-			SockJsFrameFormat frameFormat = this.getFrameFormat(request);
-			SockJsFrame frame = SockJsFrame.closeFrameGoAway();
-			String formattedFrame = frameFormat.format(frame);
-			try {
-				response.getBody().write(formattedFrame.getBytes(SockJsFrame.CHARSET));
-			}
-			catch (IOException ex) {
-				throw new SockJsException("Failed to send " + frame, sockJsSession.getId(), ex);
-			}
+			writeFrame(SockJsFrame.closeFrameGoAway(), request, response, sockJsSession);
 		}
 		else if (!sockJsSession.isActive()) {
 			if (logger.isTraceEnabled()) {
@@ -99,13 +91,19 @@ else if (!sockJsSession.isActive()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Another " + getTransportType() + " connection still open for " + sockJsSession);
 			}
-			String formattedFrame = getFrameFormat(request).format(SockJsFrame.closeFrameAnotherConnectionOpen());
-			try {
-				response.getBody().write(formattedFrame.getBytes(SockJsFrame.CHARSET));
-			}
-			catch (IOException ex) {
-				throw new SockJsException("Failed to send " + formattedFrame, sockJsSession.getId(), ex);
-			}
+			writeFrame(SockJsFrame.closeFrameAnotherConnectionOpen(), request, response, sockJsSession);
+		}
+	}
+
+	private void writeFrame(SockJsFrame frame, ServerHttpRequest request, ServerHttpResponse response,
+			AbstractHttpSockJsSession sockJsSession) {
+
+		String formattedFrame = getFrameFormat(request).format(frame);
+		try {
+			response.getBody().write(formattedFrame.getBytes(SockJsFrame.CHARSET));
+		}
+		catch (IOException ex) {
+			throw new SockJsException("Failed to send " + formattedFrame, sockJsSession.getId(), ex);
 		}
 	}
 
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
index ab90363c7f1c..04372fb52bf5 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.

From ec03e8830ed0edb3cffbda1395c491127c0353b6 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Mon, 14 Feb 2022 20:50:38 +0000
Subject: [PATCH 690/735] Remove path variables from pathWithinMapping

Closes gh-27913
---
 .../web/servlet/handler/AbstractUrlHandlerMapping.java    | 8 ++++----
 .../web/servlet/handler/SimpleUrlHandlerMappingTests.java | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
index 2f7be313ca98..812060198e63 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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 org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
-import org.springframework.http.server.PathContainer;
 import org.springframework.http.server.RequestPath;
 import org.springframework.lang.Nullable;
 import org.springframework.util.AntPathMatcher;
@@ -216,8 +215,9 @@ protected Object lookupHandler(
 			handler = obtainApplicationContext().getBean(handlerName);
 		}
 		validateHandler(handler, request);
-		PathContainer pathWithinMapping = pattern.extractPathWithinPattern(path.pathWithinApplication());
-		return buildPathExposingHandler(handler, pattern.getPatternString(), pathWithinMapping.value(), null);
+		String pathWithinMapping = pattern.extractPathWithinPattern(path.pathWithinApplication()).value();
+		pathWithinMapping = UrlPathHelper.defaultInstance.removeSemicolonContent(pathWithinMapping);
+		return buildPathExposingHandler(handler, pattern.getPatternString(), pathWithinMapping, null);
 	}
 
 	/**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
index d3cace663e37..c47a5e04485e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -102,7 +102,7 @@ void checkMappings(String beanName) throws Exception {
 		assertThat(request.getAttribute(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("/welcome.html");
 		assertThat(request.getAttribute(BEST_MATCHING_HANDLER_ATTRIBUTE)).isEqualTo(bean);
 
-		request = PathPatternsTestUtils.initRequest("GET", "/welcome.x", usePathPatterns);
+		request = PathPatternsTestUtils.initRequest("GET", "/welcome.x;jsessionid=123", usePathPatterns);
 		chain = getHandler(hm, request);
 		assertThat(chain.getHandler()).isSameAs(otherBean);
 		assertThat(request.getAttribute(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE)).isEqualTo("welcome.x");

From 5bbc7dbce237f049a53291d47d6b1e5f6f897907 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 15 Feb 2022 13:15:20 +0100
Subject: [PATCH 691/735] Polish ProtectedAccess options

This commit improves how protected access analysis operates. Rather than
providing a static boolean, a function callback for the member to
analyse is used. This permits to change the decision whether reflection
can be used, or if the return type is assigned.

Both of those are already applicable, with InjectionGenerator relying
on reflection for private fields, and DefaultBeanInstanceGenerator
assigning the bean instance if additional contributors are present.

This commit also moves the logic of computing the options where the code
is actually generated.

See gh-28030
---
 .../DefaultBeanInstanceGenerator.java         |   8 +-
 .../factory/generator/InjectionGenerator.java |  28 +++-
 .../generator/InjectionGeneratorTests.java    |  62 +++++++-
 .../aot/generator/ProtectedAccess.java        | 103 +++++++++----
 .../aot/generator/ProtectedAccessTests.java   | 136 +++++++++---------
 5 files changed, 237 insertions(+), 100 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
index 8c5006150f5c..b513aea16efa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
@@ -39,19 +39,21 @@
  */
 class DefaultBeanInstanceGenerator {
 
-	private static final Options BEAN_INSTANCE_OPTIONS = new Options(false, true);
-
 	private final Executable instanceCreator;
 
 	private final List<BeanInstanceContributor> contributors;
 
 	private final InjectionGenerator injectionGenerator;
 
+	private final Options beanInstanceOptions;
+
 
 	DefaultBeanInstanceGenerator(Executable instanceCreator, List<BeanInstanceContributor> contributors) {
 		this.instanceCreator = instanceCreator;
 		this.contributors = List.copyOf(contributors);
 		this.injectionGenerator = new InjectionGenerator();
+		this.beanInstanceOptions = Options.defaults().useReflection(member -> false)
+				.assignReturnType(member -> !this.contributors.isEmpty()).build();
 	}
 
 	/**
@@ -62,7 +64,7 @@ class DefaultBeanInstanceGenerator {
 	 */
 	public CodeContribution generateBeanInstance(RuntimeHints runtimeHints) {
 		DefaultCodeContribution contribution = new DefaultCodeContribution(runtimeHints);
-		contribution.protectedAccess().analyze(this.instanceCreator, BEAN_INSTANCE_OPTIONS);
+		contribution.protectedAccess().analyze(this.instanceCreator, this.beanInstanceOptions);
 		if (this.instanceCreator instanceof Constructor<?> constructor) {
 			writeBeanInstantiation(contribution, constructor);
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java
index c4845b339b73..ce8c94818d05 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.springframework.aot.generator.ProtectedAccess;
+import org.springframework.aot.generator.ProtectedAccess.Options;
 import org.springframework.beans.factory.generator.config.BeanDefinitionRegistrar.BeanInstanceContext;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.CodeBlock.Builder;
@@ -51,6 +53,12 @@
  */
 public class InjectionGenerator {
 
+	private static final Options FIELD_INJECTION_OPTIONS = Options.defaults()
+			.useReflection(member -> Modifier.isPrivate(member.getModifiers())).build();
+
+	private static final Options METHOD_INJECTION_OPTIONS = Options.defaults()
+			.useReflection(member -> false).build();
+
 	private final BeanParameterGenerator parameterGenerator = new BeanParameterGenerator();
 
 
@@ -77,7 +85,8 @@ public CodeBlock writeInstantiation(Executable creator) {
 	 * in the specified {@link Member}.
 	 * @param member the field or method to inject
 	 * @param required whether the value is required
-	 * @return a statement that injects a value to the specified membmer
+	 * @return a statement that injects a value to the specified member
+	 * @see #getProtectedAccessInjectionOptions(Member)
 	 */
 	public CodeBlock writeInjection(Member member, boolean required) {
 		if (member instanceof Method method) {
@@ -89,6 +98,23 @@ public CodeBlock writeInjection(Member member, boolean required) {
 		throw new IllegalArgumentException("Could not handle member " + member);
 	}
 
+	/**
+	 * Return the {@link Options} to use if protected access analysis is
+	 * required for the specified {@link Member}.
+	 * @param member the field or method to handle
+	 * @return the options to use to analyse protected access
+	 * @see ProtectedAccess
+	 */
+	public Options getProtectedAccessInjectionOptions(Member member) {
+		if (member instanceof Method) {
+			return METHOD_INJECTION_OPTIONS;
+		}
+		if (member instanceof Field) {
+			return FIELD_INJECTION_OPTIONS;
+		}
+		throw new IllegalArgumentException("Could not handle member " + member);
+	}
+
 	private CodeBlock write(Constructor<?> creator) {
 		Builder code = CodeBlock.builder();
 		Class<?> declaringType = ClassUtils.getUserClass(creator.getDeclaringClass());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java
index 910e66b6db6c..e782db598bc7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java
@@ -24,6 +24,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.aot.generator.ProtectedAccess;
+import org.springframework.aot.generator.ProtectedAccess.Options;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.generator.InjectionGeneratorTests.SimpleConstructorBean.InnerClass;
 import org.springframework.javapoet.support.CodeSnippet;
@@ -40,6 +42,8 @@
  */
 class InjectionGeneratorTests {
 
+	private final ProtectedAccess protectedAccess = new ProtectedAccess();
+
 	@Test
 	void writeInstantiationForConstructorWithNoArgUseShortcut() {
 		Constructor<?> constructor = SimpleBean.class.getDeclaredConstructors()[0];
@@ -162,6 +166,42 @@ void writeInjectionForRequiredPrivateField() {
 						})""");
 	}
 
+	@Test
+	void getProtectedAccessInjectionOptionsForUnsupportedMember() {
+		assertThatIllegalArgumentException().isThrownBy(() ->
+				getProtectedAccessInjectionOptions(mock(Member.class)));
+	}
+
+	@Test
+	void getProtectedAccessInjectionOptionsForPackagePublicField() {
+		analyzeProtectedAccess(field(SampleBean.class, "enabled"));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void getProtectedAccessInjectionOptionsForPackageProtectedField() {
+		analyzeProtectedAccess(field(SampleBean.class, "counter"));
+		assertPrivilegedAccess(SampleBean.class);
+	}
+
+	@Test
+	void getProtectedAccessInjectionOptionsForPrivateField() {
+		analyzeProtectedAccess(field(SampleBean.class, "source"));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void getProtectedAccessInjectionOptionsForPublicMethod() {
+		analyzeProtectedAccess(method(SampleBean.class, "setEnabled", Boolean.class));
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void getProtectedAccessInjectionOptionsForPackageProtectedMethod() {
+		analyzeProtectedAccess(method(SampleBean.class, "sourceAndCounter", String.class, Integer.class));
+		assertPrivilegedAccess(SampleBean.class);
+	}
+
 
 	private Method method(Class<?> type, String name, Class<?>... parameterTypes) {
 		Method method = ReflectionUtils.findMethod(type, name, parameterTypes);
@@ -183,14 +223,34 @@ private String writeInjection(Member member, boolean required) {
 		return CodeSnippet.process(code -> code.add(new InjectionGenerator().writeInjection(member, required)));
 	}
 
+	private void analyzeProtectedAccess(Member member) {
+		this.protectedAccess.analyze(member, getProtectedAccessInjectionOptions(member));
+	}
+
+	private Options getProtectedAccessInjectionOptions(Member member) {
+		return new InjectionGenerator().getProtectedAccessInjectionOptions(member);
+	}
+
+	private void assertPrivilegedAccess(Class<?> target) {
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example")).isEqualTo(target.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(target.getPackageName())).isTrue();
+	}
+
 	@SuppressWarnings("unused")
-	static class SampleBean {
+	public static class SampleBean {
+
+		public Boolean enabled;
 
 		private String source;
 
 		Integer counter;
 
 
+		public void setEnabled(Boolean enabled) {
+
+		}
+
 		void sourceAndCounter(String source, Integer counter) {
 
 		}
diff --git a/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java
index 337be6f44202..f0fc6c84a2dc 100644
--- a/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java
+++ b/spring-core/src/main/java/org/springframework/aot/generator/ProtectedAccess.java
@@ -33,7 +33,7 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * Gather the need of non-public access and determine the priviledged package
+ * Gather the need of non-public access and determine the privileged package
  * to use, if necessary.
  *
  * @author Stephane Nicoll
@@ -104,15 +104,6 @@ public void analyze(ResolvableType type) {
 		}
 	}
 
-	/**
-	 * Analyze accessing the specified {@link Member} using the default
-	 * {@linkplain Options#DEFAULTS options}.
-	 * @param member the member to analyze
-	 */
-	public void analyze(Member member) {
-		analyze(member, Options.DEFAULTS);
-	}
-
 	/**
 	 * Analyze accessing the specified {@link Member} using the specified
 	 * {@link Options options}.
@@ -123,12 +114,12 @@ public void analyze(Member member, Options options) {
 		if (isProtected(member.getDeclaringClass())) {
 			registerProtectedType(member.getDeclaringClass(), member);
 		}
-		if (!options.useReflection && isProtected(member.getModifiers())) {
+		if (isProtected(member.getModifiers()) && !options.useReflection.apply(member)) {
 			registerProtectedType(member.getDeclaringClass(), member);
 		}
 		if (member instanceof Field field) {
 			ResolvableType fieldType = ResolvableType.forField(field);
-			if (options.assignReturnType && isProtected(fieldType)) {
+			if (isProtected(fieldType) && options.assignReturnType.apply(field)) {
 				registerProtectedType(fieldType, field);
 			}
 		}
@@ -138,7 +129,7 @@ else if (member instanceof Constructor<?> constructor) {
 		}
 		else if (member instanceof Method method) {
 			ResolvableType returnType = ResolvableType.forMethodReturnType(method);
-			if (!options.assignReturnType && isProtected(returnType)) {
+			if (isProtected(returnType) && options.assignReturnType.apply(method)) {
 				registerProtectedType(returnType, method);
 			}
 			analyzeParameterTypes(method, i -> ResolvableType.forMethodParameter(method, i));
@@ -204,32 +195,82 @@ private void registerProtectedType(Class<?> type, Member member) {
 	 * Options to use to analyze if invoking a {@link Member} requires
 	 * privileged access.
 	 */
-	public static class Options {
+	public static final class Options {
 
-		/**
-		 * Default options that does fallback to reflection and does not
-		 * assign the default type.
-		 */
-		public static final Options DEFAULTS = new Options();
+		private final Function<Member, Boolean> assignReturnType;
+
+		private final Function<Member, Boolean> useReflection;
 
-		private final boolean useReflection;
 
-		private final boolean assignReturnType;
+		private Options(Builder builder) {
+			this.assignReturnType = builder.assignReturnType;
+			this.useReflection = builder.useReflection;
+		}
 
 		/**
-		 * Create a new instance with the specified options.
-		 * @param useReflection whether the writer can automatically use
-		 * reflection to invoke a protected member if it is not public
-		 * @param assignReturnType whether the writer needs to assign the
-		 * return type, or if it is irrelevant
+		 * Initialize a {@link Builder} with default options, that is use
+		 * reflection if the member is private and does not assign the
+		 * return type.
+		 * @return an options builder
 		 */
-		public Options(boolean useReflection, boolean assignReturnType) {
-			this.useReflection = useReflection;
-			this.assignReturnType = assignReturnType;
+		public static Builder defaults() {
+			return new Builder(member -> false,
+					member -> Modifier.isPrivate(member.getModifiers()));
 		}
 
-		private Options() {
-			this(true, false);
+		public static final class Builder {
+
+			private Function<Member, Boolean> assignReturnType;
+
+			private Function<Member, Boolean> useReflection;
+
+			private Builder(Function<Member, Boolean> assignReturnType,
+					Function<Member, Boolean> useReflection) {
+				this.assignReturnType = assignReturnType;
+				this.useReflection = useReflection;
+			}
+
+			/**
+			 * Specify if the return type is assigned so that its type can be
+			 * analyzed if necessary.
+			 * @param assignReturnType whether the return type is assigned
+			 * @return {@code this}, to facilitate method chaining
+			 */
+			public Builder assignReturnType(boolean assignReturnType) {
+				return assignReturnType(member -> assignReturnType);
+			}
+
+			/**
+			 * Specify a function that determines whether the return type is
+			 * assigned so that its type can be analyzed.
+			 * @param assignReturnType whether the return type is assigned
+			 * @return {@code this}, to facilitate method chaining
+			 */
+			public Builder assignReturnType(Function<Member, Boolean> assignReturnType) {
+				this.assignReturnType = assignReturnType;
+				return this;
+			}
+
+			/**
+			 * Specify a function that determines whether reflection can be
+			 * used for a given {@link Member}.
+			 * @param useReflection whether reflection can be used
+			 * @return {@code this}, to facilitate method chaining
+			 */
+			public Builder useReflection(Function<Member, Boolean> useReflection) {
+				this.useReflection = useReflection;
+				return this;
+			}
+
+			/**
+			 * Build an {@link Options} instance based on the state of this
+			 * builder.
+			 * @return a new options instance
+			 */
+			public Options build() {
+				return new Options(this);
+			}
+
 		}
 
 	}
diff --git a/spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java b/spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java
index 5a996272ebc6..9c1cc19897a1 100644
--- a/spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/generator/ProtectedAccessTests.java
@@ -16,8 +16,10 @@
 
 package org.springframework.aot.generator;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 
 import org.junit.jupiter.api.Test;
 
@@ -37,128 +39,126 @@
  */
 class ProtectedAccessTests {
 
+	public static final Options DEFAULT_OPTIONS = Options.defaults().build();
+
 	private final ProtectedAccess protectedAccess = new ProtectedAccess();
 
 	@Test
 	void analyzeWithPublicConstructor() throws NoSuchMethodException {
-		this.protectedAccess.analyze(PublicClass.class.getConstructor());
+		this.protectedAccess.analyze(PublicClass.class.getConstructor(), DEFAULT_OPTIONS);
 		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
 	}
 
 	@Test
-	void analyzeWithPackagePrivateConstructorAndDefaultOptions() {
-		this.protectedAccess.analyze(ProtectedAccessor.class.getDeclaredConstructors()[0]);
-		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example")).isNull();
+	void analyzeWithPackagePrivateConstructor() {
+		this.protectedAccess.analyze(ProtectedAccessor.class.getDeclaredConstructors()[0],
+				DEFAULT_OPTIONS);
+		assertPrivilegedAccess(ProtectedAccessor.class);
 	}
 
 	@Test
-	void analyzeWithPackagePrivateConstructorAndReflectionDisabled() {
-		this.protectedAccess.analyze(ProtectedAccessor.class.getDeclaredConstructors()[0],
-				new Options(false, true));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(ProtectedAccessor.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(ProtectedAccessor.class.getPackageName())).isTrue();
+	void analyzeWithPackagePrivateConstructorAndReflectionEnabled() {
+		Constructor<?> constructor = ProtectedAccessor.class.getDeclaredConstructors()[0];
+		this.protectedAccess.analyze(constructor,
+				Options.defaults().useReflection(member -> member.equals(constructor)).build());
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
 	}
 
 	@Test
 	void analyzeWithPackagePrivateClass() {
-		this.protectedAccess.analyze(ProtectedClass.class.getDeclaredConstructors()[0]);
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(ProtectedClass.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+		this.protectedAccess.analyze(ProtectedClass.class.getDeclaredConstructors()[0], DEFAULT_OPTIONS);
+		assertPrivilegedAccess(ProtectedClass.class);
 	}
 
 	@Test
 	void analyzeWithPackagePrivateDeclaringType() {
-		this.protectedAccess.analyze(method(ProtectedClass.class, "stringBean"));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(ProtectedClass.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+		this.protectedAccess.analyze(method(ProtectedClass.class, "stringBean"), DEFAULT_OPTIONS);
+		assertPrivilegedAccess(ProtectedClass.class);
 	}
 
 	@Test
 	void analyzeWithPackagePrivateConstructorParameter() {
-		this.protectedAccess.analyze(ProtectedParameter.class.getConstructors()[0]);
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(ProtectedParameter.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(ProtectedParameter.class.getPackageName())).isTrue();
+		this.protectedAccess.analyze(ProtectedParameter.class.getConstructors()[0], DEFAULT_OPTIONS);
+		assertPrivilegedAccess(ProtectedParameter.class);
 	}
 
 	@Test
 	void analyzeWithPackagePrivateMethod() {
-		this.protectedAccess.analyze(method(PublicClass.class, "getProtectedMethod"));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+		this.protectedAccess.analyze(method(PublicClass.class, "getProtectedMethod"), DEFAULT_OPTIONS);
+		assertPrivilegedAccess(PublicClass.class);
 	}
 
 	@Test
-	void analyzeWithPackagePrivateMethodAndReflectionDisabled() {
+	void analyzeWithPackagePrivateMethodAndReflectionEnabled() {
 		this.protectedAccess.analyze(method(PublicClass.class, "getProtectedMethod"),
-				new Options(false, false));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+				Options.defaults().useReflection(member -> !Modifier.isPublic(member.getModifiers())).build());
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
 	}
 
 	@Test
 	void analyzeWithPackagePrivateMethodReturnType() {
-		this.protectedAccess.analyze(method(ProtectedAccessor.class, "methodWithProtectedReturnType"));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(ProtectedAccessor.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(ProtectedAccessor.class.getPackageName())).isTrue();
+		this.protectedAccess.analyze(method(ProtectedAccessor.class, "methodWithProtectedReturnType"), DEFAULT_OPTIONS);
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateMethodReturnTypeAndAssignReturnTypeFunction() {
+		this.protectedAccess.analyze(method(ProtectedAccessor.class, "methodWithProtectedReturnType"),
+				Options.defaults().assignReturnType(member -> false).build());
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void analyzeWithPackagePrivateMethodReturnTypeAndAssignReturnType() {
+		this.protectedAccess.analyze(method(ProtectedAccessor.class, "methodWithProtectedReturnType"),
+				Options.defaults().assignReturnType(true).build());
+		assertPrivilegedAccess(ProtectedAccessor.class);
 	}
 
 	@Test
 	void analyzeWithPackagePrivateMethodParameter() {
 		this.protectedAccess.analyze(method(ProtectedAccessor.class, "methodWithProtectedParameter",
-				ProtectedClass.class));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(ProtectedClass.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+				ProtectedClass.class), DEFAULT_OPTIONS);
+		assertPrivilegedAccess(ProtectedAccessor.class);
 	}
 
 	@Test
 	void analyzeWithPackagePrivateField() {
-		this.protectedAccess.analyze(field(PublicClass.class, "protectedField"));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+		this.protectedAccess.analyze(field(PublicClass.class, "protectedField"), DEFAULT_OPTIONS);
+		assertPrivilegedAccess(PublicClass.class);
 	}
 
 	@Test
-	void analyzeWithPackagePrivateFieldAndReflectionDisabled() {
+	void analyzeWithPackagePrivateFieldAndReflectionEnabled() {
 		this.protectedAccess.analyze(field(PublicClass.class, "protectedField"),
-				new Options(false, true));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(PublicClass.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(PublicClass.class.getPackageName())).isTrue();
+				Options.defaults().useReflection(member -> true).build());
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
 	}
 
 	@Test
 	void analyzeWithPublicFieldAndProtectedType() {
+		this.protectedAccess.analyze(field(PublicClass.class, "protectedClassField"), DEFAULT_OPTIONS);
+		assertThat(this.protectedAccess.isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void analyzeWithPublicFieldAndProtectedTypeAssigned() {
 		this.protectedAccess.analyze(field(PublicClass.class, "protectedClassField"),
-				new Options(false, true));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
-				.isEqualTo(ProtectedClass.class.getPackageName());
-		assertThat(this.protectedAccess.isAccessible(ProtectedClass.class.getPackageName())).isTrue();
+				Options.defaults().assignReturnType(true).build());
+		assertPrivilegedAccess(ProtectedClass.class);
 	}
 
 	@Test
 	void analyzeWithPackagePrivateGenericArgument() {
-		this.protectedAccess.analyze(method(PublicFactoryBean.class, "protectedTypeFactoryBean"));
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.isAccessible(PublicFactoryBean.class.getPackageName())).isTrue();
+		this.protectedAccess.analyze(method(PublicFactoryBean.class, "protectedTypeFactoryBean"),
+				Options.defaults().assignReturnType(true).build());
+		assertPrivilegedAccess(PublicFactoryBean.class);
 	}
 
 	@Test
 	void analyzeTypeWithProtectedGenericArgument() {
 		this.protectedAccess.analyze(PublicFactoryBean.resolveToProtectedGenericParameter());
-		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
-		assertThat(this.protectedAccess.isAccessible(PublicFactoryBean.class.getPackageName())).isTrue();
+		assertPrivilegedAccess(PublicFactoryBean.class);
 	}
 
 	@Test
@@ -169,13 +169,14 @@ void analyzeWithRecursiveType() {
 
 	@Test
 	void getProtectedPackageWithPublicAccess() throws NoSuchMethodException {
-		this.protectedAccess.analyze(PublicClass.class.getConstructor());
+		this.protectedAccess.analyze(PublicClass.class.getConstructor(), DEFAULT_OPTIONS);
 		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example")).isNull();
 	}
 
 	@Test
 	void getProtectedPackageWithProtectedAccessInOnePackage() {
-		this.protectedAccess.analyze(method(PublicFactoryBean.class, "protectedTypeFactoryBean"));
+		this.protectedAccess.analyze(method(PublicFactoryBean.class, "protectedTypeFactoryBean"),
+				Options.defaults().assignReturnType(true).build());
 		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example"))
 				.isEqualTo(PublicFactoryBean.class.getPackageName());
 	}
@@ -185,14 +186,21 @@ void getProtectedPackageWithProtectedAccessInSeveralPackages() {
 		Method protectedMethodFirstPackage = method(PublicFactoryBean.class, "protectedTypeFactoryBean");
 		Method protectedMethodSecondPackage = method(ProtectedAccessor.class, "methodWithProtectedParameter",
 				ProtectedClass.class);
-		this.protectedAccess.analyze(protectedMethodFirstPackage);
-		this.protectedAccess.analyze(protectedMethodSecondPackage);
+		this.protectedAccess.analyze(protectedMethodFirstPackage,
+				Options.defaults().assignReturnType(true).build());
+		this.protectedAccess.analyze(protectedMethodSecondPackage, DEFAULT_OPTIONS);
 		assertThatThrownBy(() -> this.protectedAccess.getPrivilegedPackageName("com.example"))
 				.isInstanceOfSatisfying(ProtectedAccessException.class, ex ->
 						assertThat(ex.getProtectedElements().stream().map(ProtectedElement::getMember))
 								.containsOnly(protectedMethodFirstPackage, protectedMethodSecondPackage));
 	}
 
+	private void assertPrivilegedAccess(Class<?> target) {
+		assertThat(this.protectedAccess.isAccessible("com.example")).isFalse();
+		assertThat(this.protectedAccess.getPrivilegedPackageName("com.example")).isEqualTo(target.getPackageName());
+		assertThat(this.protectedAccess.isAccessible(target.getPackageName())).isTrue();
+	}
+
 	private static Method method(Class<?> type, String name, Class<?>... parameterTypes) {
 		Method method = ReflectionUtils.findMethod(type, name, parameterTypes);
 		assertThat(method).isNotNull();

From 2141373c432dfc18bb665ec4f54b1e3c3b121c99 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 15 Feb 2022 09:00:47 +0100
Subject: [PATCH 692/735] Introduce AOT variant of BeanPostProcessor

This commit introduces an optional interface that a BeanPostProcessor
can implement to opt-in for providing a generated code equivalent of
what it does with a regular runtime.

This commit has a first implementation of this interface with
AutowiredAnnotationBeanPostProcessor replacing its processing of
autowired annotations by generated code.

Closes gh-27921
---
 .../AutowiredAnnotationBeanPostProcessor.java |  71 +++++++-
 .../factory/annotation/InjectionMetadata.java |  10 +-
 .../BeanInstanceAotPostProcessor.java         |  46 +++++
 ...nnotationBeanInstanceContributorTests.java | 167 ++++++++++++++++++
 4 files changed, 292 insertions(+), 2 deletions(-)
 create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceAotPostProcessor.java
 create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 9e7fabe5c33f..dd644c9dd98a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -22,10 +22,12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -37,6 +39,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.aot.generator.CodeContribution;
+import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
@@ -48,9 +52,13 @@
 import org.springframework.beans.factory.InjectionPoint;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.beans.factory.annotation.InjectionMetadata.InjectedElement;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
+import org.springframework.beans.factory.generator.BeanInstanceAotPostProcessor;
+import org.springframework.beans.factory.generator.BeanInstanceContributor;
+import org.springframework.beans.factory.generator.InjectionGenerator;
 import org.springframework.beans.factory.support.LookupOverride;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -65,6 +73,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -131,7 +140,7 @@
  * @see Value
  */
 public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationAwareBeanPostProcessor,
-		MergedBeanDefinitionPostProcessor, PriorityOrdered, BeanFactoryAware {
+		MergedBeanDefinitionPostProcessor, BeanInstanceAotPostProcessor, PriorityOrdered, BeanFactoryAware {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
@@ -255,8 +264,22 @@ public void setBeanFactory(BeanFactory beanFactory) {
 
 	@Override
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
+		findInjectionMetadata(beanName, beanType, beanDefinition);
+	}
+
+	@Override
+	public BeanInstanceContributor buildAotContributor(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
+		InjectionMetadata metadata = findInjectionMetadata(beanName, beanType, beanDefinition);
+		Collection<InjectedElement> injectedElements = metadata.getInjectedElements();
+		return (!ObjectUtils.isEmpty(injectedElements)
+				? new AutowiredAnnotationBeanInstanceContributor(injectedElements)
+				: BeanInstanceContributor.NO_OP);
+	}
+
+	private InjectionMetadata findInjectionMetadata(String beanName, Class<?> beanType, RootBeanDefinition beanDefinition) {
 		InjectionMetadata metadata = findAutowiringMetadata(beanName, beanType, null);
 		metadata.checkConfigMembers(beanDefinition);
+		return metadata;
 	}
 
 	@Override
@@ -798,6 +821,52 @@ private Object[] resolveMethodArguments(Method method, Object bean, @Nullable St
 		}
 	}
 
+	private static final class AutowiredAnnotationBeanInstanceContributor implements BeanInstanceContributor {
+
+		private final Collection<InjectedElement> injectedElements;
+
+		private final InjectionGenerator generator;
+
+		AutowiredAnnotationBeanInstanceContributor(Collection<InjectedElement> injectedElements) {
+			this.injectedElements = injectedElements;
+			this.generator = new InjectionGenerator();
+		}
+
+		@Override
+		public void contribute(CodeContribution contribution) {
+			this.injectedElements.forEach(element -> {
+				boolean isRequired = isRequired(element);
+				Member member = element.getMember();
+				analyzeMember(contribution, member);
+				contribution.statements().addStatement(this.generator.writeInjection(member, isRequired));
+			});
+		}
+
+		private boolean isRequired(InjectedElement element) {
+			if (element instanceof AutowiredMethodElement injectedMethod) {
+				return injectedMethod.required;
+			}
+			else if (element instanceof AutowiredFieldElement injectedField) {
+				return injectedField.required;
+			}
+			return true;
+		}
+
+		private void analyzeMember(CodeContribution contribution, Member member) {
+			if (member instanceof Method method) {
+				contribution.runtimeHints().reflection().registerMethod(method,
+						hint -> hint.setModes(ExecutableMode.INTROSPECT));
+				contribution.protectedAccess().analyze(member,
+						this.generator.getProtectedAccessInjectionOptions(member));
+			}
+			else if (member instanceof Field field) {
+				contribution.runtimeHints().reflection().registerField(field);
+				contribution.protectedAccess().analyze(member,
+						this.generator.getProtectedAccessInjectionOptions(member));
+			}
+		}
+
+	}
 
 	/**
 	 * DependencyDescriptor variant with a pre-resolved target bean name.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
index 4e205558523d..8898dea97a40 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -88,6 +88,14 @@ public InjectionMetadata(Class<?> targetClass, Collection<InjectedElement> eleme
 	}
 
 
+	/**
+	 * Return the {@link InjectedElement elements} to inject.
+	 * @return the elements to inject
+	 */
+	public Collection<InjectedElement> getInjectedElements() {
+		return Collections.unmodifiableCollection(this.injectedElements);
+	}
+
 	/**
 	 * Determine whether this metadata instance needs to be refreshed.
 	 * @param clazz the current target class
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceAotPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceAotPostProcessor.java
new file mode 100644
index 000000000000..af2e87620d42
--- /dev/null
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceAotPostProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.generator;
+
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+
+/**
+ * Strategy interface to be implemented by a {@link BeanPostProcessor} that
+ * participates in a bean instance setup and can provide an equivalent setup
+ * using generated code.
+ *
+ * <p>Contrary to other bean post processors, implementations of this interface
+ * are instantiated at build-time and should not rely on other beans in the
+ * context.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+@FunctionalInterface
+public interface BeanInstanceAotPostProcessor extends BeanPostProcessor {
+
+	/**
+	 * Build a {@link BeanInstanceContributor} for the given bean definition.
+	 * @param beanDefinition the merged bean definition for the bean
+	 * @param beanType the actual type of the managed bean instance
+	 * @param beanName the name of the bean
+	 * @return the contributor to use
+	 */
+	BeanInstanceContributor buildAotContributor(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName);
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java
new file mode 100644
index 000000000000..f0d1b7aa591e
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2002-2022 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.beans.factory.annotation;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aot.generator.CodeContribution;
+import org.springframework.aot.generator.DefaultCodeContribution;
+import org.springframework.aot.hint.ExecutableMode;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessorTests.ResourceInjectionBean;
+import org.springframework.beans.factory.generator.BeanInstanceContributor;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.beans.testfixture.beans.TestBean;
+import org.springframework.core.env.Environment;
+import org.springframework.javapoet.support.CodeSnippet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for code contribution of {@link AutowiredAnnotationBeanPostProcessor}.
+ *
+ * @author Stephane Nicoll
+ */
+class AutowiredAnnotationBeanInstanceContributorTests {
+
+	@Test
+	void buildAotContributorWithPackageProtectedFieldInjection() {
+		CodeContribution contribution = contribute(PackageProtectedFieldInjectionSample.class);
+		assertThat(CodeSnippet.process(contribution.statements().toCodeBlock())).isEqualTo("""
+				instanceContext.field("environment", Environment.class)
+						.invoke(beanFactory, (attributes) -> bean.environment = attributes.get(0))""");
+		assertThat(contribution.runtimeHints().reflection().typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getType()).isEqualTo(TypeReference.of(PackageProtectedFieldInjectionSample.class));
+			assertThat(typeHint.fields()).singleElement().satisfies(fieldHint -> {
+				assertThat(fieldHint.getName()).isEqualTo("environment");
+				assertThat(fieldHint.isAllowWrite()).isTrue();
+				assertThat(fieldHint.isAllowUnsafeAccess()).isFalse();
+			});
+		});
+		assertThat(contribution.protectedAccess().getPrivilegedPackageName("com.example"))
+				.isEqualTo(PackageProtectedFieldInjectionSample.class.getPackageName());
+	}
+
+	@Test
+	void buildAotContributorWithPrivateFieldInjection() {
+		CodeContribution contribution = contribute(PrivateFieldInjectionSample.class);
+		assertThat(CodeSnippet.process(contribution.statements().toCodeBlock())).isEqualTo("""
+				instanceContext.field("environment", Environment.class)
+						.invoke(beanFactory, (attributes) -> {
+							Field environmentField = ReflectionUtils.findField(AutowiredAnnotationBeanInstanceContributorTests.PrivateFieldInjectionSample.class, "environment", Environment.class);
+							ReflectionUtils.makeAccessible(environmentField);
+							ReflectionUtils.setField(environmentField, bean, attributes.get(0));
+						})""");
+		assertThat(contribution.runtimeHints().reflection().typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getType()).isEqualTo(TypeReference.of(PrivateFieldInjectionSample.class));
+			assertThat(typeHint.fields()).singleElement().satisfies(fieldHint -> {
+				assertThat(fieldHint.getName()).isEqualTo("environment");
+				assertThat(fieldHint.isAllowWrite()).isTrue();
+				assertThat(fieldHint.isAllowUnsafeAccess()).isFalse();
+			});
+		});
+		assertThat(contribution.protectedAccess().isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void buildAotContributorWithPublicMethodInjection() {
+		CodeContribution contribution = contribute(PublicMethodInjectionSample.class);
+		assertThat(CodeSnippet.process(contribution.statements().toCodeBlock())).isEqualTo("""
+				instanceContext.method("setTestBean", TestBean.class)
+						.invoke(beanFactory, (attributes) -> bean.setTestBean(attributes.get(0)))""");
+		assertThat(contribution.runtimeHints().reflection().typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.getType()).isEqualTo(TypeReference.of(PublicMethodInjectionSample.class));
+			assertThat(typeHint.methods()).singleElement().satisfies(methodHint -> {
+				assertThat(methodHint.getName()).isEqualTo("setTestBean");
+				assertThat(methodHint.getModes()).contains(ExecutableMode.INTROSPECT);
+			});
+		});
+		assertThat(contribution.protectedAccess().isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void buildAotContributorWithInjectionPoints() {
+		CodeContribution contribution = contribute(ResourceInjectionBean.class);
+		assertThat(CodeSnippet.process(contribution.statements().toCodeBlock())).isEqualTo("""
+				instanceContext.field("testBean", TestBean.class)
+						.resolve(beanFactory, false).ifResolved((attributes) -> {
+							Field testBeanField = ReflectionUtils.findField(AutowiredAnnotationBeanPostProcessorTests.ResourceInjectionBean.class, "testBean", TestBean.class);
+							ReflectionUtils.makeAccessible(testBeanField);
+							ReflectionUtils.setField(testBeanField, bean, attributes.get(0));
+						});
+				instanceContext.method("setTestBean2", TestBean.class)
+						.invoke(beanFactory, (attributes) -> bean.setTestBean2(attributes.get(0)));""");
+		assertThat(contribution.runtimeHints().reflection().typeHints()).singleElement().satisfies(typeHint -> {
+			assertThat(typeHint.fields()).singleElement().satisfies(fieldHint ->
+					assertThat(fieldHint.getName()).isEqualTo("testBean"));
+			assertThat(typeHint.methods()).singleElement().satisfies(methodHint ->
+					assertThat(methodHint.getName()).isEqualTo("setTestBean2"));
+		});
+		assertThat(contribution.protectedAccess().isAccessible("com.example")).isTrue();
+	}
+
+	@Test
+	void buildAotContributorWithoutInjectionPoints() {
+		BeanInstanceContributor contributor = createAotContributor(String.class);
+		assertThat(contributor).isNotNull().isSameAs(BeanInstanceContributor.NO_OP);
+	}
+
+	private DefaultCodeContribution contribute(Class<?> type) {
+		BeanInstanceContributor contributor = createAotContributor(type);
+		assertThat(contributor).isNotNull();
+		DefaultCodeContribution contribution = new DefaultCodeContribution(new RuntimeHints());
+		contributor.contribute(contribution);
+		return contribution;
+	}
+
+	private BeanInstanceContributor createAotContributor(Class<?> type) {
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		RootBeanDefinition beanDefinition = new RootBeanDefinition(type);
+		return bpp.buildAotContributor(beanDefinition, type, "test");
+	}
+
+
+	public static class PackageProtectedFieldInjectionSample {
+
+		@Autowired
+		Environment environment;
+
+	}
+
+	public static class PrivateFieldInjectionSample {
+
+		@Autowired
+		private Environment environment;
+
+	}
+
+	public static class PublicMethodInjectionSample {
+
+		@Autowired
+		public void setTestBean(TestBean testBean) {
+
+		}
+
+		public void setUnrelated(String unrelated) {
+
+		}
+
+	}
+
+
+}

From 3ea540adbce6fd61ee745b7b7a103f3a16ef95ec Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 15 Feb 2022 13:37:08 +0100
Subject: [PATCH 693/735] Upgrade to Reactor 2020.0.16

Closes gh-28039
---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e126405cff45..7ef36356d006 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
 			mavenBom "io.netty:netty-bom:4.1.73.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.16-SNAPSHOT"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.16"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR12"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
@@ -292,7 +292,6 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
-			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From 3188c0f7db54cffdb95e7127e2adde959dd078f9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 15 Feb 2022 13:47:03 +0100
Subject: [PATCH 694/735] Ensure fix for gh-28012 is actually tested

In 3ec612aaf8, I accidentally removed tests that verified support for
non-synthesizable merged annotations for recursive annotations in
Kotlin.

This commit reinstates those non-synthesizable tests while retaining
the synthesizable tests.
---
 .../springframework/core/annotation/Filter.kt |  4 --
 .../KotlinMergedAnnotationsTests.kt           | 68 ++++++++++++++++++-
 .../springframework/core/annotation/Person.kt |  4 --
 .../core/annotation/SynthesizableFilter.kt    | 35 ++++++++++
 .../core/annotation/SynthesizableFilters.kt   | 29 ++++++++
 .../core/annotation/SynthesizablePerson.kt    | 35 ++++++++++
 6 files changed, 166 insertions(+), 9 deletions(-)
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt

diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt
index 2755ba4d9b2f..9a05b5ba1adc 100644
--- a/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt
@@ -24,12 +24,8 @@ package org.springframework.core.annotation
 @Retention(AnnotationRetention.RUNTIME)
 public annotation class Filter(
 
-	@get:AliasFor("name")
 	val value: String = "",
 
-	@get:AliasFor("value")
-	val name: String = "",
-
 	val and: Filters = Filters()
 
 )
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt
index dedd3ced4166..fa32cfe3650d 100644
--- a/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt
@@ -41,6 +41,34 @@ class KotlinMergedAnnotationsTests {
 		val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(Person::class.java))
 		assertThat(mergedAnnotation).isNotNull();
 
+		// NON-Synthesized Annotations
+		val jane = mergedAnnotation.synthesize()
+		assertThat(jane).isNotInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(jane.name).isEqualTo("jane")
+		val synthesizedFriends = jane.friends
+		assertThat(synthesizedFriends).hasSize(2)
+
+		val john = synthesizedFriends[0]
+		assertThat(john).isNotInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(john.name).isEqualTo("john")
+
+		val sally = synthesizedFriends[1]
+		assertThat(sally).isNotInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(sally.name).isEqualTo("sally")
+	}
+
+	@Test  // gh-28012
+	fun recursiveAnnotationWithAttributeAliases() {
+		val method = javaClass.getMethod("synthesizablePersonMethod")
+
+		// MergedAnnotations
+		val mergedAnnotations = MergedAnnotations.from(method)
+		assertThat(mergedAnnotations.isPresent(SynthesizablePerson::class.java)).isTrue();
+
+		// MergedAnnotation
+		val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(SynthesizablePerson::class.java))
+		assertThat(mergedAnnotation).isNotNull();
+
 		// Synthesized Annotations
 		val jane = mergedAnnotation.synthesize()
 		assertThat(jane).isInstanceOf(SynthesizedAnnotation::class.java)
@@ -72,6 +100,36 @@ class KotlinMergedAnnotationsTests {
 		val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(Filter::class.java))
 		assertThat(mergedAnnotation).isNotNull();
 
+		// NON-Synthesized Annotations
+		val fooFilter = mergedAnnotation.synthesize()
+		assertThat(fooFilter).isNotInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(fooFilter.value).isEqualTo("foo")
+		val filters = fooFilter.and
+		assertThat(filters.value).hasSize(2)
+
+		val barFilter = filters.value[0]
+		assertThat(barFilter).isNotInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(barFilter.value).isEqualTo("bar")
+		assertThat(barFilter.and.value).isEmpty()
+
+		val bazFilter = filters.value[1]
+		assertThat(bazFilter).isNotInstanceOf(SynthesizedAnnotation::class.java)
+		assertThat(bazFilter.value).isEqualTo("baz")
+		assertThat(bazFilter.and.value).isEmpty()
+	}
+
+	@Test  // gh-28012
+	fun recursiveNestedAnnotationWithAttributeAliases() {
+		val method = javaClass.getMethod("synthesizableFilterMethod")
+
+		// MergedAnnotations
+		val mergedAnnotations = MergedAnnotations.from(method)
+		assertThat(mergedAnnotations.isPresent(SynthesizableFilter::class.java)).isTrue();
+
+		// MergedAnnotation
+		val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(SynthesizableFilter::class.java))
+		assertThat(mergedAnnotation).isNotNull();
+
 		// Synthesized Annotations
 		val fooFilter = mergedAnnotation.synthesize()
 		assertThat(fooFilter).isInstanceOf(SynthesizedAnnotation::class.java)
@@ -94,12 +152,20 @@ class KotlinMergedAnnotationsTests {
 	}
 
 
-	@Person("jane", friends = [Person("john"), Person("sally")])
+	@Person(name = "jane", friends = [Person(name = "john"), Person(name = "sally")])
 	fun personMethod() {
 	}
 
+	@SynthesizablePerson(name = "jane", friends = [SynthesizablePerson(name = "john"), SynthesizablePerson(name = "sally")])
+	fun synthesizablePersonMethod() {
+	}
+
 	@Filter("foo", and = Filters(Filter("bar"), Filter("baz")))
 	fun filterMethod() {
 	}
 
+	@SynthesizableFilter("foo", and = SynthesizableFilters(SynthesizableFilter("bar"), SynthesizableFilter("baz")))
+	fun synthesizableFilterMethod() {
+	}
+
 }
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt
index 28d67c4a2364..4ae45e5feb0c 100644
--- a/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt
@@ -24,10 +24,6 @@ package org.springframework.core.annotation
 @Retention(AnnotationRetention.RUNTIME)
 public annotation class Person(
 
-	@get:AliasFor("name")
-	val value: String = "",
-
-	@get:AliasFor("value")
 	val name: String = "",
 
 	vararg val friends: Person = []
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt
new file mode 100644
index 000000000000..b10a970fdc6d
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2022 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.core.annotation
+
+/**
+ * @author Sam Brannen
+ * @since 5.3.16
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+public annotation class SynthesizableFilter(
+
+	@get:AliasFor("name")
+	val value: String = "",
+
+	@get:AliasFor("value")
+	val name: String = "",
+
+	val and: SynthesizableFilters = SynthesizableFilters()
+
+)
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt
new file mode 100644
index 000000000000..b961de1abe7a
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2002-2022 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.core.annotation
+
+/**
+ * @author Sam Brannen
+ * @since 5.3.16
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+public annotation class SynthesizableFilters(
+
+	vararg val value: SynthesizableFilter
+
+)
diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt
new file mode 100644
index 000000000000..01d6f870c7cb
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2022 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.core.annotation
+
+/**
+ * @author Sam Brannen
+ * @since 5.3.16
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+public annotation class SynthesizablePerson(
+
+	@get:AliasFor("name")
+	val value: String = "",
+
+	@get:AliasFor("value")
+	val name: String = "",
+
+	vararg val friends: SynthesizablePerson = []
+
+)

From 685a195ba17be18479ab682f808b14d8c586b3fa Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 15 Feb 2022 14:28:50 +0100
Subject: [PATCH 695/735] Deprecate SocketUtils

SocketUtils was introduced in Spring Framework 4.0, primarily to assist
in writing integration tests which start an external server on an
available random port. However, these utilities make no guarantee about
the subsequent availability of a given port and are therefore
unreliable. Instead of using SocketUtils to find an available local
port for a server, it is recommended that users rely on a server's
ability to start on a random port that it selects or is assigned by the
operating system. To interact with that server, the user should query
the server for the port it is currently using.

SocketUtils is now deprecated in 5.3.16 and will be removed in 6.0.

Closes gh-28052
---
 .../access/MBeanClientInterceptorTests.java   |  6 +-
 .../RemoteMBeanClientInterceptorTests.java    |  7 +--
 .../ConnectorServerFactoryBeanTests.java      |  6 +-
 ...MBeanServerConnectionFactoryBeanTests.java |  6 +-
 .../org/springframework/util/SocketUtils.java | 14 ++++-
 .../util/SocketUtilsTests.java                | 63 ++++++++++---------
 .../ReactorNettyTcpStompClientTests.java      |  6 +-
 ...erRelayMessageHandlerIntegrationTests.java |  6 +-
 .../remoting/caucho/CauchoRemotingTests.java  |  5 +-
 .../client/WebClientIntegrationTests.java     |  6 +-
 10 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
index f98384c231ac..f9863819b447 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -39,7 +39,6 @@
 import org.springframework.jmx.JmxTestBean;
 import org.springframework.jmx.export.MBeanExporter;
 import org.springframework.jmx.export.assembler.AbstractReflectiveMBeanInfoAssembler;
-import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -177,7 +176,8 @@ void invokeUnexposedMethodWithException() throws Exception {
 	void lazyConnectionToRemote() throws Exception {
 		assumeTrue(runTests);
 
-		final int port = SocketUtils.findAvailableTcpPort();
+		@SuppressWarnings("deprecation")
+		final int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
 
 		JMXServiceURL url = new JMXServiceURL("service:jmx:jmxmp://localhost:" + port);
 		JMXConnectorServer connector = JMXConnectorServerFactory.newJMXConnectorServer(url, null, getServer());
diff --git a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
index 5c4c4a3c0820..a617803188d7 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,8 +28,6 @@
 
 import org.junit.jupiter.api.AfterEach;
 
-import org.springframework.util.SocketUtils;
-
 /**
  * @author Rob Harrop
  * @author Chris Beams
@@ -37,7 +35,8 @@
  */
 class RemoteMBeanClientInterceptorTests extends MBeanClientInterceptorTests {
 
-	private final int servicePort = SocketUtils.findAvailableTcpPort();
+	@SuppressWarnings("deprecation")
+	private final int servicePort = org.springframework.util.SocketUtils.findAvailableTcpPort();
 
 	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + servicePort;
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java
index 111721d749b1..fad3ed40ec00 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.jmx.AbstractMBeanServerTests;
-import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -47,7 +46,8 @@ class ConnectorServerFactoryBeanTests extends AbstractMBeanServerTests {
 
 	private static final String OBJECT_NAME = "spring:type=connector,name=test";
 
-	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + SocketUtils.findAvailableTcpPort();
+	@SuppressWarnings("deprecation")
+	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + org.springframework.util.SocketUtils.findAvailableTcpPort();
 
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
index faee0ae016c2..64159c6e5146 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.jmx.AbstractMBeanServerTests;
-import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -39,7 +38,8 @@
  */
 class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTests {
 
-	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + SocketUtils.findAvailableTcpPort();
+	@SuppressWarnings("deprecation")
+	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + org.springframework.util.SocketUtils.findAvailableTcpPort();
 
 
 	@Test
diff --git a/spring-core/src/main/java/org/springframework/util/SocketUtils.java b/spring-core/src/main/java/org/springframework/util/SocketUtils.java
index 557173e7e59c..a100bc6d8685 100644
--- a/spring-core/src/main/java/org/springframework/util/SocketUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/SocketUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,13 +32,25 @@
  * <p>Within this class, a TCP port refers to a port for a {@link ServerSocket};
  * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
  *
+ * <p>{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
+ * assist in writing integration tests which start an external server on an
+ * available random port. However, these utilities make no guarantee about the
+ * subsequent availability of a given port and are therefore unreliable. Instead
+ * of using {@code SocketUtils} to find an available local port for a server, it
+ * is recommended that you rely on a server's ability to start on a random port
+ * that it selects or is assigned by the operating system. To interact with that
+ * server, you should query the server for the port it is currently using.
+ *
  * @author Sam Brannen
  * @author Ben Hale
  * @author Arjen Poutsma
  * @author Gunnar Hillert
  * @author Gary Russell
  * @since 4.0
+ * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
+ * {@link SocketUtils class-level Javadoc} for details.
  */
+@Deprecated
 public class SocketUtils {
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java b/spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
index d13e78e6c61b..c0f8748195be 100644
--- a/spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,8 +28,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.springframework.util.SocketUtils.PORT_RANGE_MAX;
-import static org.springframework.util.SocketUtils.PORT_RANGE_MIN;
 
 /**
  * Unit tests for {@link SocketUtils}.
@@ -37,6 +35,7 @@
  * @author Sam Brannen
  * @author Gary Russell
  */
+@SuppressWarnings("deprecation")
 class SocketUtilsTests {
 
 	@Test
@@ -44,7 +43,7 @@ void canBeInstantiated() {
 		// Just making sure somebody doesn't try to make SocketUtils abstract,
 		// since that would be a breaking change due to the intentional public
 		// constructor.
-		new SocketUtils();
+		new org.springframework.util.SocketUtils();
 	}
 
 	// TCP
@@ -52,36 +51,37 @@ void canBeInstantiated() {
 	@Test
 	void findAvailableTcpPortWithZeroMinPort() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
-				SocketUtils.findAvailableTcpPort(0));
+				org.springframework.util.SocketUtils.findAvailableTcpPort(0));
 	}
 
 	@Test
 	void findAvailableTcpPortWithNegativeMinPort() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
-				SocketUtils.findAvailableTcpPort(-500));
+				org.springframework.util.SocketUtils.findAvailableTcpPort(-500));
 	}
 
 	@Test
 	void findAvailableTcpPort() {
-		int port = SocketUtils.findAvailableTcpPort();
-		assertPortInRange(port, PORT_RANGE_MIN, PORT_RANGE_MAX);
+		int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
+		assertPortInRange(port, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
+				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
 	}
 
 	@Test
 	void findAvailableTcpPortWithMinPortEqualToMaxPort() {
-		int minMaxPort = SocketUtils.findAvailableTcpPort();
-		int port = SocketUtils.findAvailableTcpPort(minMaxPort, minMaxPort);
+		int minMaxPort = org.springframework.util.SocketUtils.findAvailableTcpPort();
+		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(minMaxPort, minMaxPort);
 		assertThat(port).isEqualTo(minMaxPort);
 	}
 
 	@Test
 	void findAvailableTcpPortWhenPortOnLoopbackInterfaceIsNotAvailable() throws Exception {
-		int port = SocketUtils.findAvailableTcpPort();
+		int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
 		try (ServerSocket socket = ServerSocketFactory.getDefault().createServerSocket(port, 1, InetAddress.getByName("localhost"))) {
 			assertThat(socket).isNotNull();
 			// will only look for the exact port
 			assertThatIllegalStateException().isThrownBy(() ->
-					SocketUtils.findAvailableTcpPort(port, port))
+					org.springframework.util.SocketUtils.findAvailableTcpPort(port, port))
 				.withMessageStartingWith("Could not find an available TCP port")
 				.withMessageEndingWith("after 1 attempts");
 		}
@@ -89,15 +89,15 @@ void findAvailableTcpPortWhenPortOnLoopbackInterfaceIsNotAvailable() throws Exce
 
 	@Test
 	void findAvailableTcpPortWithMin() {
-		int port = SocketUtils.findAvailableTcpPort(50000);
-		assertPortInRange(port, 50000, PORT_RANGE_MAX);
+		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(50000);
+		assertPortInRange(port, 50000, org.springframework.util.SocketUtils.PORT_RANGE_MAX);
 	}
 
 	@Test
 	void findAvailableTcpPortInRange() {
 		int minPort = 20000;
 		int maxPort = minPort + 1000;
-		int port = SocketUtils.findAvailableTcpPort(minPort, maxPort);
+		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(minPort, maxPort);
 		assertPortInRange(port, minPort, maxPort);
 	}
 
@@ -133,29 +133,30 @@ void findAvailableTcpPortsWithRequestedNumberGreaterThanSizeOfRange() {
 	@Test
 	void findAvailableUdpPortWithZeroMinPort() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
-				SocketUtils.findAvailableUdpPort(0));
+				org.springframework.util.SocketUtils.findAvailableUdpPort(0));
 	}
 
 	@Test
 	void findAvailableUdpPortWithNegativeMinPort() {
 		assertThatIllegalArgumentException().isThrownBy(() ->
-				SocketUtils.findAvailableUdpPort(-500));
+				org.springframework.util.SocketUtils.findAvailableUdpPort(-500));
 	}
 
 	@Test
 	void findAvailableUdpPort() {
-		int port = SocketUtils.findAvailableUdpPort();
-		assertPortInRange(port, PORT_RANGE_MIN, PORT_RANGE_MAX);
+		int port = org.springframework.util.SocketUtils.findAvailableUdpPort();
+		assertPortInRange(port, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
+				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
 	}
 
 	@Test
 	void findAvailableUdpPortWhenPortOnLoopbackInterfaceIsNotAvailable() throws Exception {
-		int port = SocketUtils.findAvailableUdpPort();
+		int port = org.springframework.util.SocketUtils.findAvailableUdpPort();
 		try (DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"))) {
 			assertThat(socket).isNotNull();
 			// will only look for the exact port
 			assertThatIllegalStateException().isThrownBy(() ->
-					SocketUtils.findAvailableUdpPort(port, port))
+					org.springframework.util.SocketUtils.findAvailableUdpPort(port, port))
 				.withMessageStartingWith("Could not find an available UDP port")
 				.withMessageEndingWith("after 1 attempts");
 		}
@@ -163,15 +164,15 @@ void findAvailableUdpPortWhenPortOnLoopbackInterfaceIsNotAvailable() throws Exce
 
 	@Test
 	void findAvailableUdpPortWithMin() {
-		int port = SocketUtils.findAvailableUdpPort(50000);
-		assertPortInRange(port, 50000, PORT_RANGE_MAX);
+		int port = org.springframework.util.SocketUtils.findAvailableUdpPort(50000);
+		assertPortInRange(port, 50000, org.springframework.util.SocketUtils.PORT_RANGE_MAX);
 	}
 
 	@Test
 	void findAvailableUdpPortInRange() {
 		int minPort = 20000;
 		int maxPort = minPort + 1000;
-		int port = SocketUtils.findAvailableUdpPort(minPort, maxPort);
+		int port = org.springframework.util.SocketUtils.findAvailableUdpPort(minPort, maxPort);
 		assertPortInRange(port, minPort, maxPort);
 	}
 
@@ -205,22 +206,24 @@ void findAvailableUdpPortsWithRequestedNumberGreaterThanSizeOfRange() {
 	// Helpers
 
 	private void findAvailableTcpPorts(int numRequested) {
-		SortedSet<Integer> ports = SocketUtils.findAvailableTcpPorts(numRequested);
-		assertAvailablePorts(ports, numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
+		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableTcpPorts(numRequested);
+		assertAvailablePorts(ports, numRequested, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
+				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
 	}
 
 	private void findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
-		SortedSet<Integer> ports = SocketUtils.findAvailableTcpPorts(numRequested, minPort, maxPort);
+		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableTcpPorts(numRequested, minPort, maxPort);
 		assertAvailablePorts(ports, numRequested, minPort, maxPort);
 	}
 
 	private void findAvailableUdpPorts(int numRequested) {
-		SortedSet<Integer> ports = SocketUtils.findAvailableUdpPorts(numRequested);
-		assertAvailablePorts(ports, numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
+		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableUdpPorts(numRequested);
+		assertAvailablePorts(ports, numRequested, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
+				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
 	}
 
 	private void findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
-		SortedSet<Integer> ports = SocketUtils.findAvailableUdpPorts(numRequested, minPort, maxPort);
+		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableUdpPorts(numRequested, minPort, maxPort);
 		assertAvailablePorts(ports, numRequested, minPort, maxPort);
 	}
 	private void assertPortInRange(int port, int minPort, int maxPort) {
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java
index 90985f35d79b..502969e4d5de 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,6 @@
 import org.springframework.messaging.simp.stomp.StompSession.Subscription;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.util.Assert;
-import org.springframework.util.SocketUtils;
 import org.springframework.util.concurrent.ListenableFuture;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -61,7 +60,8 @@ public class ReactorNettyTcpStompClientTests {
 	public void setup(TestInfo testInfo) throws Exception {
 		logger.debug("Setting up before '" + testInfo.getTestMethod().get().getName() + "'");
 
-		int port = SocketUtils.findAvailableTcpPort(61613);
+		@SuppressWarnings("deprecation")
+		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(61613);
 
 		this.activeMQBroker = new BrokerService();
 		this.activeMQBroker.addConnector("stomp://127.0.0.1:" + port);
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
index c3c0d0293466..835cb47f769d 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.messaging.support.ExecutorSubscribableChannel;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.util.Assert;
-import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -75,10 +74,11 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
 
 
 	@BeforeEach
+	@SuppressWarnings("deprecation")
 	public void setup(TestInfo testInfo) throws Exception {
 		logger.debug("Setting up before '" + testInfo.getTestMethod().get().getName() + "'");
 
-		this.port = SocketUtils.findAvailableTcpPort(61613);
+		this.port = org.springframework.util.SocketUtils.findAvailableTcpPort(61613);
 		this.responseChannel = new ExecutorSubscribableChannel();
 		this.responseHandler = new TestMessageHandler();
 		this.responseChannel.subscribe(this.responseHandler);
diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
index 58d1846bcf4a..e76b992d2c33 100644
--- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,7 +27,6 @@
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.remoting.RemoteAccessException;
-import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -109,7 +108,7 @@ public void hessianProxyFactoryBeanWithCustomProxyFactory() throws Exception {
 	@Test
 	@SuppressWarnings("deprecation")
 	public void simpleHessianServiceExporter() throws IOException {
-		final int port = SocketUtils.findAvailableTcpPort();
+		final int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
 
 		TestBean tb = new TestBean("tb");
 		SimpleHessianServiceExporter exporter = new SimpleHessianServiceExporter();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index e7fa002ff51b..4410e2102266 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,7 +69,6 @@
 import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.util.SocketUtils;
 import org.springframework.web.reactive.function.BodyExtractors;
 import org.springframework.web.reactive.function.client.WebClient.ResponseSpec;
 import org.springframework.web.testfixture.xml.Pojo;
@@ -1245,7 +1244,8 @@ void malformedResponseChunksOnEntityWithBody(ClientHttpConnector connector) {
 	private <T> Mono<T> doMalformedChunkedResponseTest(
 			ClientHttpConnector connector, Function<ResponseSpec, Mono<T>> handler) {
 
-		int port = SocketUtils.findAvailableTcpPort();
+		@SuppressWarnings("deprecation")
+		int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
 
 		Thread serverThread = new Thread(() -> {
 			// No way to simulate a malformed chunked response through MockWebServer.

From 552e02cb4421ea071bc119c0da3dcebaba0be5ac Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 15 Feb 2022 14:44:46 +0100
Subject: [PATCH 696/735] Polishing

---
 .../function/client/WebClientIntegrationTests.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index 311603aa9773..4fd096fa1c13 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -1259,10 +1259,13 @@ private <T> Mono<T> doMalformedChunkedResponseTest(
 				is.read(new byte[4096]);
 
 				OutputStream os = socket.getOutputStream();
-				os.write("HTTP/1.1 200 OK\r\n".getBytes(StandardCharsets.UTF_8));
-				os.write("Transfer-Encoding: chunked\r\n".getBytes(StandardCharsets.UTF_8));
-				os.write("\r\n".getBytes(StandardCharsets.UTF_8));
-				os.write("lskdu018973t09sylgasjkfg1][]'./.sdlv".getBytes(StandardCharsets.UTF_8));
+				os.write("""
+						HTTP/1.1 200 OK
+						Transfer-Encoding: chunked
+
+						lskdu018973t09sylgasjkfg1][]'./.sdlv"""
+						.replace("\n", "\r\n").getBytes(StandardCharsets.UTF_8));
+
 				socket.close();
 			}
 			catch (IOException ex) {
@@ -1322,4 +1325,5 @@ public void setContainerValue(T containerValue) {
 			this.containerValue = containerValue;
 		}
 	}
+
 }

From c42023f20e6f06f9be55e70102818b3f2e9dbe84 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 15 Feb 2022 14:59:09 +0100
Subject: [PATCH 697/735] Stop using SocketUtils in WebClientIntegrationTests

See gh-28052
---
 .../function/client/WebClientIntegrationTests.java         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
index 4fd096fa1c13..d48d17a82155 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
@@ -34,6 +34,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1246,12 +1247,12 @@ void malformedResponseChunksOnEntityWithBody(ClientHttpConnector connector) {
 	private <T> Mono<T> doMalformedChunkedResponseTest(
 			ClientHttpConnector connector, Function<ResponseSpec, Mono<T>> handler) {
 
-		@SuppressWarnings("deprecation")
-		int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
+		AtomicInteger port = new AtomicInteger();
 
 		Thread serverThread = new Thread(() -> {
 			// No way to simulate a malformed chunked response through MockWebServer.
-			try (ServerSocket serverSocket = new ServerSocket(port)) {
+			try (ServerSocket serverSocket = new ServerSocket(0)) {
+				port.set(serverSocket.getLocalPort());
 				Socket socket = serverSocket.accept();
 				InputStream is = socket.getInputStream();
 

From d2d54c826f22e885d0401aeccc07c8838cd219c6 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 15 Feb 2022 14:57:56 +0100
Subject: [PATCH 698/735] Increase max memory for Gradle to 2048m

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 886369712793..22e37de470b7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 version=6.0.0-SNAPSHOT
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 org.gradle.parallel=true
 kotlin.stdlib.default.dependency=false

From 5fbd01f28f17965a0fa4661ee31dab3b929ec092 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 15 Feb 2022 15:25:45 +0100
Subject: [PATCH 699/735] Polish

---
 .../java/org/springframework/aot/hint/TypeHint.java   | 11 +++++++++++
 .../org/springframework/aot/hint/TypeHintTests.java   |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/aot/hint/TypeHint.java b/spring-core/src/main/java/org/springframework/aot/hint/TypeHint.java
index 8c62db8ff69e..ff7a1956541d 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/TypeHint.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/TypeHint.java
@@ -23,10 +23,12 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.StringJoiner;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -39,6 +41,7 @@ public final class TypeHint {
 
 	private final TypeReference type;
 
+	@Nullable
 	private final TypeReference reachableType;
 
 	private final Set<FieldHint> fields;
@@ -83,6 +86,7 @@ public TypeReference getType() {
 	 * {@code null} if this hint should always been applied.
 	 * @return the reachable type, if any
 	 */
+	@Nullable
 	public TypeReference getReachableType() {
 		return this.reachableType;
 	}
@@ -119,6 +123,12 @@ public Set<MemberCategory> getMemberCategories() {
 		return this.memberCategories;
 	}
 
+	@Override
+	public String toString() {
+		return new StringJoiner(", ", TypeHint.class.getSimpleName() + "[", "]")
+				.add("type=" + this.type)
+				.toString();
+	}
 
 	/**
 	 * Builder for {@link TypeHint}.
@@ -127,6 +137,7 @@ public static class Builder {
 
 		private final TypeReference type;
 
+		@Nullable
 		private TypeReference reachableType;
 
 		private final Map<String, FieldHint.Builder> fields = new HashMap<>();
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/TypeHintTests.java b/spring-core/src/test/java/org/springframework/aot/hint/TypeHintTests.java
index 89b1ad05826d..d6922c26bd76 100644
--- a/spring-core/src/test/java/org/springframework/aot/hint/TypeHintTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/TypeHintTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -137,4 +137,10 @@ void createWithMemberCategory() {
 		assertThat(hint.getMemberCategories()).containsOnly(MemberCategory.DECLARED_FIELDS);
 	}
 
+	@Test
+	void typeHintHasAppropriateToString() {
+		TypeHint hint = TypeHint.of(TypeReference.of(String.class)).build();
+		assertThat(hint).hasToString("TypeHint[type=java.lang.String]");
+	}
+
 }

From bbd35ded9161f34c7f9a3d70f640a78d1258febc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 15 Feb 2022 15:53:43 +0100
Subject: [PATCH 700/735] Stop using SocketUtils in ActiveMQ STOMP broker tests

See gh-28052
---
 .../ReactorNettyTcpStompClientTests.java      | 16 +++++++++++-----
 ...erRelayMessageHandlerIntegrationTests.java | 19 ++++++++++++++++---
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java
index 502969e4d5de..ee2ee306f521 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java
@@ -17,6 +17,7 @@
 package org.springframework.messaging.simp.stomp;
 
 import java.lang.reflect.Type;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -24,6 +25,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.AfterEach;
@@ -60,11 +62,9 @@ public class ReactorNettyTcpStompClientTests {
 	public void setup(TestInfo testInfo) throws Exception {
 		logger.debug("Setting up before '" + testInfo.getTestMethod().get().getName() + "'");
 
-		@SuppressWarnings("deprecation")
-		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(61613);
-
+		TransportConnector stompConnector = createStompConnector();
 		this.activeMQBroker = new BrokerService();
-		this.activeMQBroker.addConnector("stomp://127.0.0.1:" + port);
+		this.activeMQBroker.addConnector(stompConnector);
 		this.activeMQBroker.setStartAsync(false);
 		this.activeMQBroker.setPersistent(false);
 		this.activeMQBroker.setUseJmx(false);
@@ -75,11 +75,17 @@ public void setup(TestInfo testInfo) throws Exception {
 		ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
 		taskScheduler.afterPropertiesSet();
 
-		this.client = new ReactorNettyTcpStompClient("127.0.0.1", port);
+		this.client = new ReactorNettyTcpStompClient("127.0.0.1", stompConnector.getServer().getSocketAddress().getPort());
 		this.client.setMessageConverter(new StringMessageConverter());
 		this.client.setTaskScheduler(taskScheduler);
 	}
 
+	private TransportConnector createStompConnector() throws Exception {
+		TransportConnector connector = new TransportConnector();
+		connector.setUri(new URI("stomp://127.0.0.1:0"));
+		return connector;
+	}
+
 	@AfterEach
 	public void shutdown() throws Exception {
 		try {
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
index 835cb47f769d..4eb0416973b1 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.messaging.simp.stomp;
 
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,6 +27,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.AfterEach;
@@ -70,7 +72,8 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
 
 	private TestEventPublisher eventPublisher;
 
-	private int port;
+	// initial value of zero implies that a random ephemeral port should be used
+	private int port = 0;
 
 
 	@BeforeEach
@@ -78,7 +81,6 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
 	public void setup(TestInfo testInfo) throws Exception {
 		logger.debug("Setting up before '" + testInfo.getTestMethod().get().getName() + "'");
 
-		this.port = org.springframework.util.SocketUtils.findAvailableTcpPort(61613);
 		this.responseChannel = new ExecutorSubscribableChannel();
 		this.responseHandler = new TestMessageHandler();
 		this.responseChannel.subscribe(this.responseHandler);
@@ -88,14 +90,25 @@ public void setup(TestInfo testInfo) throws Exception {
 	}
 
 	private void startActiveMQBroker() throws Exception {
+		TransportConnector stompConnector = createStompConnector(this.port);
 		this.activeMQBroker = new BrokerService();
-		this.activeMQBroker.addConnector("stomp://localhost:" + this.port);
+		this.activeMQBroker.addConnector(stompConnector);
 		this.activeMQBroker.setStartAsync(false);
 		this.activeMQBroker.setPersistent(false);
 		this.activeMQBroker.setUseJmx(false);
 		this.activeMQBroker.getSystemUsage().getMemoryUsage().setLimit(1024 * 1024 * 5);
 		this.activeMQBroker.getSystemUsage().getTempUsage().setLimit(1024 * 1024 * 5);
 		this.activeMQBroker.start();
+
+		// Reuse existing ephemeral port on restart (i.e., the next time this method
+		// is invoked) since it will already be configured in the relay
+		this.port = (this.port != 0 ? this.port : stompConnector.getServer().getSocketAddress().getPort());
+	}
+
+	private TransportConnector createStompConnector(int port) throws Exception {
+		TransportConnector connector = new TransportConnector();
+		connector.setUri(new URI("stomp://localhost:" + port));
+		return connector;
 	}
 
 	private void createAndStartRelay() throws InterruptedException {

From 2cee63491d1fbb6e21a9044715d98838fec9a51b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 15 Feb 2022 16:19:11 +0100
Subject: [PATCH 701/735] Remove deprecated SocketUtils

Closes gh-28052
---
 .../access/MBeanClientInterceptorTests.java   |   3 +-
 .../RemoteMBeanClientInterceptorTests.java    |   4 +-
 .../ConnectorServerFactoryBeanTests.java      |   3 +-
 ...MBeanServerConnectionFactoryBeanTests.java |   3 +-
 .../org/springframework/util/SocketUtils.java | 319 ------------------
 .../util/SocketUtilsTests.java                | 241 -------------
 .../core/testfixture/net/TestSocketUtils.java | 140 ++++++++
 7 files changed, 149 insertions(+), 564 deletions(-)
 delete mode 100644 spring-core/src/main/java/org/springframework/util/SocketUtils.java
 delete mode 100644 spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
 create mode 100644 spring-core/src/testFixtures/java/org/springframework/core/testfixture/net/TestSocketUtils.java

diff --git a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
index f9863819b447..65b3d032bed7 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
@@ -34,6 +34,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.core.testfixture.net.TestSocketUtils;
 import org.springframework.jmx.AbstractMBeanServerTests;
 import org.springframework.jmx.IJmxTestBean;
 import org.springframework.jmx.JmxTestBean;
@@ -177,7 +178,7 @@ void lazyConnectionToRemote() throws Exception {
 		assumeTrue(runTests);
 
 		@SuppressWarnings("deprecation")
-		final int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
+		final int port = TestSocketUtils.findAvailableTcpPort();
 
 		JMXServiceURL url = new JMXServiceURL("service:jmx:jmxmp://localhost:" + port);
 		JMXConnectorServer connector = JMXConnectorServerFactory.newJMXConnectorServer(url, null, getServer());
diff --git a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
index a617803188d7..f315bd46e113 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
@@ -28,6 +28,8 @@
 
 import org.junit.jupiter.api.AfterEach;
 
+import org.springframework.core.testfixture.net.TestSocketUtils;
+
 /**
  * @author Rob Harrop
  * @author Chris Beams
@@ -36,7 +38,7 @@
 class RemoteMBeanClientInterceptorTests extends MBeanClientInterceptorTests {
 
 	@SuppressWarnings("deprecation")
-	private final int servicePort = org.springframework.util.SocketUtils.findAvailableTcpPort();
+	private final int servicePort = TestSocketUtils.findAvailableTcpPort();
 
 	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + servicePort;
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java
index fad3ed40ec00..5f349774451f 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java
@@ -30,6 +30,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.core.testfixture.net.TestSocketUtils;
 import org.springframework.jmx.AbstractMBeanServerTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +48,7 @@ class ConnectorServerFactoryBeanTests extends AbstractMBeanServerTests {
 	private static final String OBJECT_NAME = "spring:type=connector,name=test";
 
 	@SuppressWarnings("deprecation")
-	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + org.springframework.util.SocketUtils.findAvailableTcpPort();
+	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + TestSocketUtils.findAvailableTcpPort();
 
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
index 64159c6e5146..6391f607f93c 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.support.AopUtils;
+import org.springframework.core.testfixture.net.TestSocketUtils;
 import org.springframework.jmx.AbstractMBeanServerTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -39,7 +40,7 @@
 class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTests {
 
 	@SuppressWarnings("deprecation")
-	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + org.springframework.util.SocketUtils.findAvailableTcpPort();
+	private final String serviceUrl = "service:jmx:jmxmp://localhost:" + TestSocketUtils.findAvailableTcpPort();
 
 
 	@Test
diff --git a/spring-core/src/main/java/org/springframework/util/SocketUtils.java b/spring-core/src/main/java/org/springframework/util/SocketUtils.java
deleted file mode 100644
index a100bc6d8685..000000000000
--- a/spring-core/src/main/java/org/springframework/util/SocketUtils.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright 2002-2022 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.util;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.net.ServerSocketFactory;
-
-/**
- * Simple utility methods for working with network sockets &mdash; for example,
- * for finding available ports on {@code localhost}.
- *
- * <p>Within this class, a TCP port refers to a port for a {@link ServerSocket};
- * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
- *
- * <p>{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
- * assist in writing integration tests which start an external server on an
- * available random port. However, these utilities make no guarantee about the
- * subsequent availability of a given port and are therefore unreliable. Instead
- * of using {@code SocketUtils} to find an available local port for a server, it
- * is recommended that you rely on a server's ability to start on a random port
- * that it selects or is assigned by the operating system. To interact with that
- * server, you should query the server for the port it is currently using.
- *
- * @author Sam Brannen
- * @author Ben Hale
- * @author Arjen Poutsma
- * @author Gunnar Hillert
- * @author Gary Russell
- * @since 4.0
- * @deprecated as of Spring Framework 5.3.16, to be removed in 6.0; see
- * {@link SocketUtils class-level Javadoc} for details.
- */
-@Deprecated
-public class SocketUtils {
-
-	/**
-	 * The default minimum value for port ranges used when finding an available
-	 * socket port.
-	 */
-	public static final int PORT_RANGE_MIN = 1024;
-
-	/**
-	 * The default maximum value for port ranges used when finding an available
-	 * socket port.
-	 */
-	public static final int PORT_RANGE_MAX = 65535;
-
-
-	private static final Random random = new Random(System.nanoTime());
-
-
-	/**
-	 * Although {@code SocketUtils} consists solely of static utility methods,
-	 * this constructor is intentionally {@code public}.
-	 * <h4>Rationale</h4>
-	 * <p>Static methods from this class may be invoked from within XML
-	 * configuration files using the Spring Expression Language (SpEL) and the
-	 * following syntax.
-	 * <pre><code>&lt;bean id="bean1" ... p:port="#{T(org.springframework.util.SocketUtils).findAvailableTcpPort(12000)}" /&gt;</code></pre>
-	 * If this constructor were {@code private}, you would be required to supply
-	 * the fully qualified class name to SpEL's {@code T()} function for each usage.
-	 * Thus, the fact that this constructor is {@code public} allows you to reduce
-	 * boilerplate configuration with SpEL as can be seen in the following example.
-	 * <pre><code>&lt;bean id="socketUtils" class="org.springframework.util.SocketUtils" /&gt;
-	 * &lt;bean id="bean1" ... p:port="#{socketUtils.findAvailableTcpPort(12000)}" /&gt;
-	 * &lt;bean id="bean2" ... p:port="#{socketUtils.findAvailableTcpPort(30000)}" /&gt;</code></pre>
-	 */
-	public SocketUtils() {
-	}
-
-
-	/**
-	 * Find an available TCP port randomly selected from the range
-	 * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
-	 * @return an available TCP port number
-	 * @throws IllegalStateException if no available port could be found
-	 */
-	public static int findAvailableTcpPort() {
-		return findAvailableTcpPort(PORT_RANGE_MIN);
-	}
-
-	/**
-	 * Find an available TCP port randomly selected from the range
-	 * [{@code minPort}, {@value #PORT_RANGE_MAX}].
-	 * @param minPort the minimum port number
-	 * @return an available TCP port number
-	 * @throws IllegalStateException if no available port could be found
-	 */
-	public static int findAvailableTcpPort(int minPort) {
-		return findAvailableTcpPort(minPort, PORT_RANGE_MAX);
-	}
-
-	/**
-	 * Find an available TCP port randomly selected from the range
-	 * [{@code minPort}, {@code maxPort}].
-	 * @param minPort the minimum port number
-	 * @param maxPort the maximum port number
-	 * @return an available TCP port number
-	 * @throws IllegalStateException if no available port could be found
-	 */
-	public static int findAvailableTcpPort(int minPort, int maxPort) {
-		return SocketType.TCP.findAvailablePort(minPort, maxPort);
-	}
-
-	/**
-	 * Find the requested number of available TCP ports, each randomly selected
-	 * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
-	 * @param numRequested the number of available ports to find
-	 * @return a sorted set of available TCP port numbers
-	 * @throws IllegalStateException if the requested number of available ports could not be found
-	 */
-	public static SortedSet<Integer> findAvailableTcpPorts(int numRequested) {
-		return findAvailableTcpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
-	}
-
-	/**
-	 * Find the requested number of available TCP ports, each randomly selected
-	 * from the range [{@code minPort}, {@code maxPort}].
-	 * @param numRequested the number of available ports to find
-	 * @param minPort the minimum port number
-	 * @param maxPort the maximum port number
-	 * @return a sorted set of available TCP port numbers
-	 * @throws IllegalStateException if the requested number of available ports could not be found
-	 */
-	public static SortedSet<Integer> findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
-		return SocketType.TCP.findAvailablePorts(numRequested, minPort, maxPort);
-	}
-
-	/**
-	 * Find an available UDP port randomly selected from the range
-	 * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
-	 * @return an available UDP port number
-	 * @throws IllegalStateException if no available port could be found
-	 */
-	public static int findAvailableUdpPort() {
-		return findAvailableUdpPort(PORT_RANGE_MIN);
-	}
-
-	/**
-	 * Find an available UDP port randomly selected from the range
-	 * [{@code minPort}, {@value #PORT_RANGE_MAX}].
-	 * @param minPort the minimum port number
-	 * @return an available UDP port number
-	 * @throws IllegalStateException if no available port could be found
-	 */
-	public static int findAvailableUdpPort(int minPort) {
-		return findAvailableUdpPort(minPort, PORT_RANGE_MAX);
-	}
-
-	/**
-	 * Find an available UDP port randomly selected from the range
-	 * [{@code minPort}, {@code maxPort}].
-	 * @param minPort the minimum port number
-	 * @param maxPort the maximum port number
-	 * @return an available UDP port number
-	 * @throws IllegalStateException if no available port could be found
-	 */
-	public static int findAvailableUdpPort(int minPort, int maxPort) {
-		return SocketType.UDP.findAvailablePort(minPort, maxPort);
-	}
-
-	/**
-	 * Find the requested number of available UDP ports, each randomly selected
-	 * from the range [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
-	 * @param numRequested the number of available ports to find
-	 * @return a sorted set of available UDP port numbers
-	 * @throws IllegalStateException if the requested number of available ports could not be found
-	 */
-	public static SortedSet<Integer> findAvailableUdpPorts(int numRequested) {
-		return findAvailableUdpPorts(numRequested, PORT_RANGE_MIN, PORT_RANGE_MAX);
-	}
-
-	/**
-	 * Find the requested number of available UDP ports, each randomly selected
-	 * from the range [{@code minPort}, {@code maxPort}].
-	 * @param numRequested the number of available ports to find
-	 * @param minPort the minimum port number
-	 * @param maxPort the maximum port number
-	 * @return a sorted set of available UDP port numbers
-	 * @throws IllegalStateException if the requested number of available ports could not be found
-	 */
-	public static SortedSet<Integer> findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
-		return SocketType.UDP.findAvailablePorts(numRequested, minPort, maxPort);
-	}
-
-
-	private enum SocketType {
-
-		TCP {
-			@Override
-			protected boolean isPortAvailable(int port) {
-				try {
-					ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
-							port, 1, InetAddress.getByName("localhost"));
-					serverSocket.close();
-					return true;
-				}
-				catch (Exception ex) {
-					return false;
-				}
-			}
-		},
-
-		UDP {
-			@Override
-			protected boolean isPortAvailable(int port) {
-				try {
-					DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"));
-					socket.close();
-					return true;
-				}
-				catch (Exception ex) {
-					return false;
-				}
-			}
-		};
-
-		/**
-		 * Determine if the specified port for this {@code SocketType} is
-		 * currently available on {@code localhost}.
-		 */
-		protected abstract boolean isPortAvailable(int port);
-
-		/**
-		 * Find a pseudo-random port number within the range
-		 * [{@code minPort}, {@code maxPort}].
-		 * @param minPort the minimum port number
-		 * @param maxPort the maximum port number
-		 * @return a random port number within the specified range
-		 */
-		private int findRandomPort(int minPort, int maxPort) {
-			int portRange = maxPort - minPort;
-			return minPort + random.nextInt(portRange + 1);
-		}
-
-		/**
-		 * Find an available port for this {@code SocketType}, randomly selected
-		 * from the range [{@code minPort}, {@code maxPort}].
-		 * @param minPort the minimum port number
-		 * @param maxPort the maximum port number
-		 * @return an available port number for this socket type
-		 * @throws IllegalStateException if no available port could be found
-		 */
-		int findAvailablePort(int minPort, int maxPort) {
-			Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
-			Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
-			Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-
-			int portRange = maxPort - minPort;
-			int candidatePort;
-			int searchCounter = 0;
-			do {
-				if (searchCounter > portRange) {
-					throw new IllegalStateException(String.format(
-							"Could not find an available %s port in the range [%d, %d] after %d attempts",
-							name(), minPort, maxPort, searchCounter));
-				}
-				candidatePort = findRandomPort(minPort, maxPort);
-				searchCounter++;
-			}
-			while (!isPortAvailable(candidatePort));
-
-			return candidatePort;
-		}
-
-		/**
-		 * Find the requested number of available ports for this {@code SocketType},
-		 * each randomly selected from the range [{@code minPort}, {@code maxPort}].
-		 * @param numRequested the number of available ports to find
-		 * @param minPort the minimum port number
-		 * @param maxPort the maximum port number
-		 * @return a sorted set of available port numbers for this socket type
-		 * @throws IllegalStateException if the requested number of available ports could not be found
-		 */
-		SortedSet<Integer> findAvailablePorts(int numRequested, int minPort, int maxPort) {
-			Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
-			Assert.isTrue(maxPort > minPort, "'maxPort' must be greater than 'minPort'");
-			Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
-			Assert.isTrue(numRequested > 0, "'numRequested' must be greater than 0");
-			Assert.isTrue((maxPort - minPort) >= numRequested,
-					"'numRequested' must not be greater than 'maxPort' - 'minPort'");
-
-			SortedSet<Integer> availablePorts = new TreeSet<>();
-			int attemptCount = 0;
-			while ((++attemptCount <= numRequested + 100) && availablePorts.size() < numRequested) {
-				availablePorts.add(findAvailablePort(minPort, maxPort));
-			}
-
-			if (availablePorts.size() != numRequested) {
-				throw new IllegalStateException(String.format(
-						"Could not find %d available %s ports in the range [%d, %d]",
-						numRequested, name(), minPort, maxPort));
-			}
-
-			return availablePorts;
-		}
-	}
-
-}
diff --git a/spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java b/spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
deleted file mode 100644
index c0f8748195be..000000000000
--- a/spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright 2002-2022 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.util;
-
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.SortedSet;
-
-import javax.net.ServerSocketFactory;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-
-/**
- * Unit tests for {@link SocketUtils}.
- *
- * @author Sam Brannen
- * @author Gary Russell
- */
-@SuppressWarnings("deprecation")
-class SocketUtilsTests {
-
-	@Test
-	void canBeInstantiated() {
-		// Just making sure somebody doesn't try to make SocketUtils abstract,
-		// since that would be a breaking change due to the intentional public
-		// constructor.
-		new org.springframework.util.SocketUtils();
-	}
-
-	// TCP
-
-	@Test
-	void findAvailableTcpPortWithZeroMinPort() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				org.springframework.util.SocketUtils.findAvailableTcpPort(0));
-	}
-
-	@Test
-	void findAvailableTcpPortWithNegativeMinPort() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				org.springframework.util.SocketUtils.findAvailableTcpPort(-500));
-	}
-
-	@Test
-	void findAvailableTcpPort() {
-		int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
-		assertPortInRange(port, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
-				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
-	}
-
-	@Test
-	void findAvailableTcpPortWithMinPortEqualToMaxPort() {
-		int minMaxPort = org.springframework.util.SocketUtils.findAvailableTcpPort();
-		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(minMaxPort, minMaxPort);
-		assertThat(port).isEqualTo(minMaxPort);
-	}
-
-	@Test
-	void findAvailableTcpPortWhenPortOnLoopbackInterfaceIsNotAvailable() throws Exception {
-		int port = org.springframework.util.SocketUtils.findAvailableTcpPort();
-		try (ServerSocket socket = ServerSocketFactory.getDefault().createServerSocket(port, 1, InetAddress.getByName("localhost"))) {
-			assertThat(socket).isNotNull();
-			// will only look for the exact port
-			assertThatIllegalStateException().isThrownBy(() ->
-					org.springframework.util.SocketUtils.findAvailableTcpPort(port, port))
-				.withMessageStartingWith("Could not find an available TCP port")
-				.withMessageEndingWith("after 1 attempts");
-		}
-	}
-
-	@Test
-	void findAvailableTcpPortWithMin() {
-		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(50000);
-		assertPortInRange(port, 50000, org.springframework.util.SocketUtils.PORT_RANGE_MAX);
-	}
-
-	@Test
-	void findAvailableTcpPortInRange() {
-		int minPort = 20000;
-		int maxPort = minPort + 1000;
-		int port = org.springframework.util.SocketUtils.findAvailableTcpPort(minPort, maxPort);
-		assertPortInRange(port, minPort, maxPort);
-	}
-
-	@Test
-	void find4AvailableTcpPorts() {
-		findAvailableTcpPorts(4);
-	}
-
-	@Test
-	void find50AvailableTcpPorts() {
-		findAvailableTcpPorts(50);
-	}
-
-	@Test
-	void find4AvailableTcpPortsInRange() {
-		findAvailableTcpPorts(4, 30000, 35000);
-	}
-
-	@Test
-	void find50AvailableTcpPortsInRange() {
-		findAvailableTcpPorts(50, 40000, 45000);
-	}
-
-	@Test
-	void findAvailableTcpPortsWithRequestedNumberGreaterThanSizeOfRange() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				findAvailableTcpPorts(50, 45000, 45010));
-	}
-
-
-	// UDP
-
-	@Test
-	void findAvailableUdpPortWithZeroMinPort() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				org.springframework.util.SocketUtils.findAvailableUdpPort(0));
-	}
-
-	@Test
-	void findAvailableUdpPortWithNegativeMinPort() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				org.springframework.util.SocketUtils.findAvailableUdpPort(-500));
-	}
-
-	@Test
-	void findAvailableUdpPort() {
-		int port = org.springframework.util.SocketUtils.findAvailableUdpPort();
-		assertPortInRange(port, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
-				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
-	}
-
-	@Test
-	void findAvailableUdpPortWhenPortOnLoopbackInterfaceIsNotAvailable() throws Exception {
-		int port = org.springframework.util.SocketUtils.findAvailableUdpPort();
-		try (DatagramSocket socket = new DatagramSocket(port, InetAddress.getByName("localhost"))) {
-			assertThat(socket).isNotNull();
-			// will only look for the exact port
-			assertThatIllegalStateException().isThrownBy(() ->
-					org.springframework.util.SocketUtils.findAvailableUdpPort(port, port))
-				.withMessageStartingWith("Could not find an available UDP port")
-				.withMessageEndingWith("after 1 attempts");
-		}
-	}
-
-	@Test
-	void findAvailableUdpPortWithMin() {
-		int port = org.springframework.util.SocketUtils.findAvailableUdpPort(50000);
-		assertPortInRange(port, 50000, org.springframework.util.SocketUtils.PORT_RANGE_MAX);
-	}
-
-	@Test
-	void findAvailableUdpPortInRange() {
-		int minPort = 20000;
-		int maxPort = minPort + 1000;
-		int port = org.springframework.util.SocketUtils.findAvailableUdpPort(minPort, maxPort);
-		assertPortInRange(port, minPort, maxPort);
-	}
-
-	@Test
-	void find4AvailableUdpPorts() {
-		findAvailableUdpPorts(4);
-	}
-
-	@Test
-	void find50AvailableUdpPorts() {
-		findAvailableUdpPorts(50);
-	}
-
-	@Test
-	void find4AvailableUdpPortsInRange() {
-		findAvailableUdpPorts(4, 30000, 35000);
-	}
-
-	@Test
-	void find50AvailableUdpPortsInRange() {
-		findAvailableUdpPorts(50, 40000, 45000);
-	}
-
-	@Test
-	void findAvailableUdpPortsWithRequestedNumberGreaterThanSizeOfRange() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				findAvailableUdpPorts(50, 45000, 45010));
-	}
-
-
-	// Helpers
-
-	private void findAvailableTcpPorts(int numRequested) {
-		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableTcpPorts(numRequested);
-		assertAvailablePorts(ports, numRequested, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
-				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
-	}
-
-	private void findAvailableTcpPorts(int numRequested, int minPort, int maxPort) {
-		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableTcpPorts(numRequested, minPort, maxPort);
-		assertAvailablePorts(ports, numRequested, minPort, maxPort);
-	}
-
-	private void findAvailableUdpPorts(int numRequested) {
-		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableUdpPorts(numRequested);
-		assertAvailablePorts(ports, numRequested, org.springframework.util.SocketUtils.PORT_RANGE_MIN,
-				org.springframework.util.SocketUtils.PORT_RANGE_MAX);
-	}
-
-	private void findAvailableUdpPorts(int numRequested, int minPort, int maxPort) {
-		SortedSet<Integer> ports = org.springframework.util.SocketUtils.findAvailableUdpPorts(numRequested, minPort, maxPort);
-		assertAvailablePorts(ports, numRequested, minPort, maxPort);
-	}
-	private void assertPortInRange(int port, int minPort, int maxPort) {
-		assertThat(port >= minPort).as("port [" + port + "] >= " + minPort).isTrue();
-		assertThat(port <= maxPort).as("port [" + port + "] <= " + maxPort).isTrue();
-	}
-
-	private void assertAvailablePorts(SortedSet<Integer> ports, int numRequested, int minPort, int maxPort) {
-		assertThat(ports.size()).as("number of ports requested").isEqualTo(numRequested);
-		for (int port : ports) {
-			assertPortInRange(port, minPort, maxPort);
-		}
-	}
-
-}
diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/net/TestSocketUtils.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/net/TestSocketUtils.java
new file mode 100644
index 000000000000..ca94026b0dc2
--- /dev/null
+++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/net/TestSocketUtils.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2002-2022 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.core.testfixture.net;
+
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.util.Random;
+
+import javax.net.ServerSocketFactory;
+
+import org.springframework.util.Assert;
+
+/**
+ * Removed from spring-core and introduced as an internal test utility in
+ * spring-context in Spring Framework 6.0.
+ *
+ * <p>Simple utility methods for working with network sockets &mdash; for example,
+ * for finding available ports on {@code localhost}.
+ *
+ * <p>Within this class, a TCP port refers to a port for a {@link ServerSocket};
+ * whereas, a UDP port refers to a port for a {@link DatagramSocket}.
+ *
+ * <p>{@code SocketUtils} was introduced in Spring Framework 4.0, primarily to
+ * assist in writing integration tests which start an external server on an
+ * available random port. However, these utilities make no guarantee about the
+ * subsequent availability of a given port and are therefore unreliable. Instead
+ * of using {@code SocketUtils} to find an available local port for a server, it
+ * is recommended that you rely on a server's ability to start on a random port
+ * that it selects or is assigned by the operating system. To interact with that
+ * server, you should query the server for the port it is currently using.
+ *
+ * @author Sam Brannen
+ * @author Ben Hale
+ * @author Arjen Poutsma
+ * @author Gunnar Hillert
+ * @author Gary Russell
+ * @since 4.0
+ */
+public class TestSocketUtils {
+
+	/**
+	 * The default minimum value for port ranges used when finding an available
+	 * socket port.
+	 */
+	private static final int PORT_RANGE_MIN = 1024;
+
+	/**
+	 * The default maximum value for port ranges used when finding an available
+	 * socket port.
+	 */
+	private static final int PORT_RANGE_MAX = 65535;
+
+
+	private static final Random random = new Random(System.nanoTime());
+
+
+	/**
+	 * Find an available TCP port randomly selected from the range
+	 * [{@value #PORT_RANGE_MIN}, {@value #PORT_RANGE_MAX}].
+	 * @return an available TCP port number
+	 * @throws IllegalStateException if no available port could be found
+	 */
+	public static int findAvailableTcpPort() {
+		return findAvailablePort(PORT_RANGE_MIN, PORT_RANGE_MAX);
+	}
+
+	/**
+	 * Find an available port for this {@code SocketType}, randomly selected
+	 * from the range [{@code minPort}, {@code maxPort}].
+	 * @param minPort the minimum port number
+	 * @param maxPort the maximum port number
+	 * @return an available port number for this socket type
+	 * @throws IllegalStateException if no available port could be found
+	 */
+	private static int findAvailablePort(int minPort, int maxPort) {
+		Assert.isTrue(minPort > 0, "'minPort' must be greater than 0");
+		Assert.isTrue(maxPort >= minPort, "'maxPort' must be greater than or equal to 'minPort'");
+		Assert.isTrue(maxPort <= PORT_RANGE_MAX, "'maxPort' must be less than or equal to " + PORT_RANGE_MAX);
+
+		int portRange = maxPort - minPort;
+		int candidatePort;
+		int searchCounter = 0;
+		do {
+			if (searchCounter > portRange) {
+				throw new IllegalStateException(String.format(
+						"Could not find an available TCP port in the range [%d, %d] after %d attempts",
+						minPort, maxPort, searchCounter));
+			}
+			candidatePort = findRandomPort(minPort, maxPort);
+			searchCounter++;
+		}
+		while (!isPortAvailable(candidatePort));
+
+		return candidatePort;
+	}
+
+	/**
+	 * Find a pseudo-random port number within the range
+	 * [{@code minPort}, {@code maxPort}].
+	 * @param minPort the minimum port number
+	 * @param maxPort the maximum port number
+	 * @return a random port number within the specified range
+	 */
+	private static int findRandomPort(int minPort, int maxPort) {
+		int portRange = maxPort - minPort;
+		return minPort + random.nextInt(portRange + 1);
+	}
+
+	/**
+	 * Determine if the specified port for this {@code SocketType} is
+	 * currently available on {@code localhost}.
+	 */
+	private static boolean isPortAvailable(int port) {
+		try {
+			ServerSocket serverSocket = ServerSocketFactory.getDefault().createServerSocket(
+					port, 1, InetAddress.getByName("localhost"));
+			serverSocket.close();
+			return true;
+		}
+		catch (Exception ex) {
+			return false;
+		}
+	}
+
+}

From 18b8e4ec5c00c526cc03be70e8e3e283bf801f63 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 15 Feb 2022 15:06:43 -0800
Subject: [PATCH 702/735] Add mavenCentral() to pluginManagement repositories

Update the pluginManagement repositories used by Grade to include
`mavenCentral()` since `gradlePluginPortal()` has been suffering
from timeouts recently.
---
 settings.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.gradle b/settings.gradle
index 6913d57d47dd..e1638d26c9ad 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
 pluginManagement {
 	repositories {
+		mavenCentral()
 		gradlePluginPortal()
 		maven { url "https://repo.spring.io/release" }
 	}

From b3306f4e3d9ea78c10a2620568707ed08f75b7b0 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 15 Feb 2022 15:10:27 -0800
Subject: [PATCH 703/735] Suppress deprecation warning in WebAsyncManagerTests

See gh-27959
---
 .../web/context/request/async/WebAsyncManagerTests.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
index 2a88cd9566b3..caa2b02e2977 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -380,6 +380,7 @@ public Object call() throws Exception {
 	private static class SyncTaskExecutor extends SimpleAsyncTaskExecutor {
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public void execute(Runnable task, long startTimeout) {
 			task.run();
 		}

From 7276752e7cbc87aead678ae84ec8a83e7603a141 Mon Sep 17 00:00:00 2001
From: vikey <vikeytk@gmail.com>
Date: Sat, 12 Feb 2022 18:51:24 +0800
Subject: [PATCH 704/735] Fix CronExpression issue with DST

This commit fixes an issue with CronExpression fails to calculate next
execution on the day of daylight saving time.

Closes gh-28038
---
 .../springframework/scheduling/support/CronField.java    | 9 +++++++--
 .../scheduling/support/CronExpressionTests.java          | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
index bed950663452..e01e00b63229 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
@@ -260,7 +260,7 @@ public <T extends Temporal & Comparable<? super T>> T elapseUntil(T temporal, in
 		 * Roll forward the give temporal until it reaches the next higher
 		 * order field. Calling this method is equivalent to calling
 		 * {@link #elapseUntil(Temporal, int)} with goal set to the
-		 * minimum value of this field's range.
+		 * minimum value of this field's range, except for daylight saving.
 		 * @param temporal the temporal to roll forward
 		 * @param <T> the type of temporal
 		 * @return the rolled forward temporal
@@ -269,7 +269,12 @@ public <T extends Temporal & Comparable<? super T>> T rollForward(T temporal) {
 			int current = get(temporal);
 			ValueRange range = temporal.range(this.field);
 			long amount = range.getMaximum() - current + 1;
-			return this.field.getBaseUnit().addTo(temporal, amount);
+			T result =  this.field.getBaseUnit().addTo(temporal, amount);
+			//adjust daylight saving
+			if (get(result) != range.getMinimum()) {
+				result = this.field.adjustInto(result,result.range(this.field).getMinimum());
+			}
+			return result;
 		}
 
 		/**
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
index 5abce9e2de30..5de5362fc1dd 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
@@ -1336,6 +1336,14 @@ public void daylightSaving() {
 		actual = cronExpression.next(last);
 		assertThat(actual).isNotNull();
 		assertThat(actual).isEqualTo(expected);
+
+		cronExpression = CronExpression.parse("0 5 0 * * *");
+
+		last = ZonedDateTime.parse("2021-03-28T01:00:00+01:00[Europe/Amsterdam]");
+		expected = ZonedDateTime.parse("2021-03-29T00:05+02:00[Europe/Amsterdam]");
+		actual = cronExpression.next(last);
+		assertThat(actual).isNotNull();
+		assertThat(actual).isEqualTo(expected);
 	}
 
 	@Test

From 5ab966fbdefc33840ff2ac4c12b26a6c306b59cf Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Wed, 16 Feb 2022 11:16:27 +0100
Subject: [PATCH 705/735] Polish contribution

See gh-28038
---
 .../scheduling/support/CronField.java                | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
index e01e00b63229..adc2c2ffe5d6 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
@@ -260,7 +260,7 @@ public <T extends Temporal & Comparable<? super T>> T elapseUntil(T temporal, in
 		 * Roll forward the give temporal until it reaches the next higher
 		 * order field. Calling this method is equivalent to calling
 		 * {@link #elapseUntil(Temporal, int)} with goal set to the
-		 * minimum value of this field's range, except for daylight saving.
+		 * minimum value of this field's range.
 		 * @param temporal the temporal to roll forward
 		 * @param <T> the type of temporal
 		 * @return the rolled forward temporal
@@ -269,10 +269,12 @@ public <T extends Temporal & Comparable<? super T>> T rollForward(T temporal) {
 			int current = get(temporal);
 			ValueRange range = temporal.range(this.field);
 			long amount = range.getMaximum() - current + 1;
-			T result =  this.field.getBaseUnit().addTo(temporal, amount);
-			//adjust daylight saving
-			if (get(result) != range.getMinimum()) {
-				result = this.field.adjustInto(result,result.range(this.field).getMinimum());
+			T result = this.field.getBaseUnit().addTo(temporal, amount);
+			current = get(result);
+			range = result.range(this.field);
+			// adjust for daylight savings
+			if (current != range.getMinimum()) {
+				result = this.field.adjustInto(result, range.getMinimum());
 			}
 			return result;
 		}

From e3ceb9b23dacbed3db0811b7535cbe07ccda58cb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 16 Feb 2022 12:01:14 +0100
Subject: [PATCH 706/735] Polish @Target declarations for stereotype
 annotations

---
 .../main/java/org/springframework/stereotype/Controller.java  | 4 ++--
 .../main/java/org/springframework/stereotype/Repository.java  | 4 ++--
 .../src/main/java/org/springframework/stereotype/Service.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/stereotype/Controller.java b/spring-context/src/main/java/org/springframework/stereotype/Controller.java
index ef4167c13714..6629feea4b3e 100644
--- a/spring-context/src/main/java/org/springframework/stereotype/Controller.java
+++ b/spring-context/src/main/java/org/springframework/stereotype/Controller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -39,7 +39,7 @@
  * @see org.springframework.web.bind.annotation.RequestMapping
  * @see org.springframework.context.annotation.ClassPathBeanDefinitionScanner
  */
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Component
diff --git a/spring-context/src/main/java/org/springframework/stereotype/Repository.java b/spring-context/src/main/java/org/springframework/stereotype/Repository.java
index 97cb1358080b..d44864877011 100644
--- a/spring-context/src/main/java/org/springframework/stereotype/Repository.java
+++ b/spring-context/src/main/java/org/springframework/stereotype/Repository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -55,7 +55,7 @@
  * @see org.springframework.dao.DataAccessException
  * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor
  */
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Component
diff --git a/spring-context/src/main/java/org/springframework/stereotype/Service.java b/spring-context/src/main/java/org/springframework/stereotype/Service.java
index 18e61c53d283..5c714540bbca 100644
--- a/spring-context/src/main/java/org/springframework/stereotype/Service.java
+++ b/spring-context/src/main/java/org/springframework/stereotype/Service.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
  * @see Component
  * @see Repository
  */
-@Target({ElementType.TYPE})
+@Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Component

From 3ac60147f3b9a37f136f25fcd60d145c49110251 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 16 Feb 2022 12:11:33 +0100
Subject: [PATCH 707/735] Improve documentation for uri(URI) method in
 WebTestClient

Prior to this commit, it was not clear that a configured base URI would
not be applied when invoking uri(URI).

This commit adds a note to the Javadoc to clarify that behavior.

Closes gh-28058
---
 .../test/web/reactive/server/WebTestClient.java       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 481a8d999e88..ece5800cc5ec 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -526,14 +526,19 @@ interface Builder {
 	interface UriSpec<S extends RequestHeadersSpec<?>> {
 
 		/**
-		 * Specify the URI using an absolute, fully constructed {@link URI}.
+		 * Specify the URI using an absolute, fully constructed {@link java.net.URI}.
+		 * <p>If a {@link UriBuilderFactory} was configured for the client with
+		 * a base URI, that base URI will <strong>not</strong> be applied to the
+		 * supplied {@code java.net.URI}. If you wish to have a base URI applied to a
+		 * {@code java.net.URI} you must invoke either {@link #uri(String, Object...)}
+		 * or {@link #uri(String, Map)} &mdash; for example, {@code uri(myUri.toString())}.
 		 * @return spec to add headers or perform the exchange
 		 */
 		S uri(URI uri);
 
 		/**
 		 * Specify the URI for the request using a URI template and URI variables.
-		 * If a {@link UriBuilderFactory} was configured for the client (e.g.
+		 * <p>If a {@link UriBuilderFactory} was configured for the client (e.g.
 		 * with a base URI) it will be used to expand the URI template.
 		 * @return spec to add headers or perform the exchange
 		 */
@@ -541,7 +546,7 @@ interface UriSpec<S extends RequestHeadersSpec<?>> {
 
 		/**
 		 * Specify the URI for the request using a URI template and URI variables.
-		 * If a {@link UriBuilderFactory} was configured for the client (e.g.
+		 * <p>If a {@link UriBuilderFactory} was configured for the client (e.g.
 		 * with a base URI) it will be used to expand the URI template.
 		 * @return spec to add headers or perform the exchange
 		 */

From 36dc4e4c5f3827cf9f13a691c8007cc5f2a46f17 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 15 Feb 2022 15:06:43 -0800
Subject: [PATCH 708/735] Add mavenCentral() to pluginManagement repositories

Update the pluginManagement repositories used by Grade to include
`mavenCentral()` since `gradlePluginPortal()` has been suffering
from timeouts recently.
---
 settings.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.gradle b/settings.gradle
index 6913d57d47dd..e1638d26c9ad 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
 pluginManagement {
 	repositories {
+		mavenCentral()
 		gradlePluginPortal()
 		maven { url "https://repo.spring.io/release" }
 	}

From 1166577d2c7f1a2b2dba84ba3f1026f5b3ca9b2a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 16 Feb 2022 20:04:27 +0100
Subject: [PATCH 709/735] Upgrade to Netty 4.1.74, Jetty 9.4.45, Undertow
 2.2.16, Hibernate Validator 6.2.2, Apache Johnzon 1.2.16, EclipseLink 2.7.10

---
 build.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ef36356d006..58352ec87409 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,11 +28,11 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
-			mavenBom "io.netty:netty-bom:4.1.73.Final"
+			mavenBom "io.netty:netty-bom:4.1.74.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.16"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR12"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.44.v20210927"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.45.v20220203"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
@@ -83,7 +83,7 @@ configure(allprojects) { project ->
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.15"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.16"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -124,7 +124,7 @@ configure(allprojects) { project ->
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
 			dependency "org.hibernate:hibernate-core:5.4.33.Final"
-			dependency "org.hibernate:hibernate-validator:6.2.1.Final"
+			dependency "org.hibernate:hibernate-validator:6.2.2.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
@@ -139,7 +139,7 @@ configure(allprojects) { project ->
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.14.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.16.Final') {
 				entry 'undertow-core'
 				entry('undertow-servlet') {
 					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
@@ -238,7 +238,7 @@ configure(allprojects) { project ->
 			dependency "com.ibm.websphere:uow:6.0.2.17"
 			dependency "com.jamonapi:jamon:2.82"
 			dependency "joda-time:joda-time:2.10.13"
-			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.9"
+			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10"
 			dependency "org.javamoney:moneta:1.3"
 
 			dependency "com.sun.activation:javax.activation:1.2.0"

From f8a59c267f318e06522fdfa968c9b251cf1b07d9 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 16 Feb 2022 20:04:51 +0100
Subject: [PATCH 710/735] Polishing

---
 .../annotation/AbstractAspectJAdvisorFactoryTests.java | 10 +++++-----
 .../aop/aspectj/annotation/AspectMetadataTests.java    |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index 9aeeef0f1564..3f5a7b562c5b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -98,7 +98,7 @@ void rejectsPerCflowBelowAspect() {
 	}
 
 	@Test
-	void perTargetAspect() throws SecurityException, NoSuchMethodException {
+	void perTargetAspect() throws Exception {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
@@ -130,7 +130,7 @@ void perTargetAspect() throws SecurityException, NoSuchMethodException {
 	}
 
 	@Test
-	void multiplePerTargetAspects() throws SecurityException, NoSuchMethodException {
+	void multiplePerTargetAspects() throws Exception {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
@@ -158,7 +158,7 @@ void multiplePerTargetAspects() throws SecurityException, NoSuchMethodException
 	}
 
 	@Test
-	void multiplePerTargetAspectsWithOrderAnnotation() throws SecurityException, NoSuchMethodException {
+	void multiplePerTargetAspectsWithOrderAnnotation() throws Exception {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
@@ -184,7 +184,7 @@ void multiplePerTargetAspectsWithOrderAnnotation() throws SecurityException, NoS
 	}
 
 	@Test
-	void perThisAspect() throws SecurityException, NoSuchMethodException {
+	void perThisAspect() throws Exception {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
@@ -220,7 +220,7 @@ void perThisAspect() throws SecurityException, NoSuchMethodException {
 	}
 
 	@Test
-	void perTypeWithinAspect() throws SecurityException, NoSuchMethodException {
+	void perTypeWithinAspect() throws Exception {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
index 637baa2450a8..2554895430fb 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.assertThatIllegalArgumentException;
 
 /**
- * @since 2.0
  * @author Rod Johnson
  * @author Chris Beams
  * @author Sam Brannen
@@ -56,7 +55,7 @@ void perTargetAspect() {
 		assertThat(am.getAjType().getPerClause().getKind()).isEqualTo(PerClauseKind.PERTARGET);
 		assertThat(am.getPerClausePointcut()).isInstanceOf(AspectJExpressionPointcut.class);
 		assertThat(((AspectJExpressionPointcut) am.getPerClausePointcut()).getExpression())
-			.isEqualTo("execution(* *.getSpouse())");
+				.isEqualTo("execution(* *.getSpouse())");
 	}
 
 	@Test
@@ -67,7 +66,7 @@ void perThisAspect() {
 		assertThat(am.getAjType().getPerClause().getKind()).isEqualTo(PerClauseKind.PERTHIS);
 		assertThat(am.getPerClausePointcut()).isInstanceOf(AspectJExpressionPointcut.class);
 		assertThat(((AspectJExpressionPointcut) am.getPerClausePointcut()).getExpression())
-			.isEqualTo("execution(* *.getSpouse())");
+				.isEqualTo("execution(* *.getSpouse())");
 	}
 
 }

From 3c0a5fd0630c1cf9edb1646aabc24d41e704010b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 16 Feb 2022 20:12:59 +0100
Subject: [PATCH 711/735] Upgrade to POI 5.2

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 574e8b87b657..733fe830322a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,7 @@ configure(allprojects) { project ->
 				entry 'derby'
 				entry 'derbyclient'
 			}
-			dependency "org.apache.poi:poi-ooxml:5.1.0"
+			dependency "org.apache.poi:poi-ooxml:5.2.0"
 			dependency "org.apache-extras.beanshell:bsh:2.0b6"
 			dependency "org.freemarker:freemarker:2.3.31"
 			dependency "org.hsqldb:hsqldb:2.5.2"

From 4571626839a00c924d7e38b8d0b02cb2518345b5 Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Thu, 17 Feb 2022 07:45:38 +0000
Subject: [PATCH 712/735] Next development version (v5.3.17-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ce5199c44137..c51960841a5e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.16-SNAPSHOT
+version=5.3.17-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From 2ffefbb21116dda66973b920218c79ffe13cbac8 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 17 Feb 2022 09:44:22 +0100
Subject: [PATCH 713/735] Downgrade to concourse-release-scripts 0.3.2

This commit reverts partially "0ab054c7b943d65bb9034d1d7987f556e9d54d05"
as 0.3.3 is breaking promition.
---
 ci/images/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index 3e1e0bc05c2d..6c02f65ef665 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -14,7 +14,7 @@ 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 --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.3/concourse-release-scripts-0.3.3.jar
+curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar
 
 ###########################################################
 # JAVA

From ff20a06876209e6dafd519e732801f292230f9d9 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Thu, 17 Feb 2022 11:51:14 +0100
Subject: [PATCH 714/735] Added .sdkmanrc file

This commit adds a .sdkmanrc file, so that we can automatically switch
to JDK 8 when building the 5.3. branch.
---
 .sdkmanrc | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .sdkmanrc

diff --git a/.sdkmanrc b/.sdkmanrc
new file mode 100644
index 000000000000..a59545673245
--- /dev/null
+++ b/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.322-librca

From 85067786088306452a762f74396f5c5937d0c7f0 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Thu, 17 Feb 2022 11:55:25 +0100
Subject: [PATCH 715/735] Use JDK 17 on main branch in .sdkmanrc

This commit makes sure that JDK 17 is used on the main branch.
---
 .sdkmanrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.sdkmanrc b/.sdkmanrc
index a59545673245..347a6808efc3 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.322-librca
+java=17.0.2-librca

From 41ee23345d72623d18accb9484ce5119403c39d5 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 17 Feb 2022 18:14:09 +0100
Subject: [PATCH 716/735] Support for registering multiple init/destroy methods
 on AbstractBeanDefinition

Closes gh-28013
---
 .../AbstractAutowireCapableBeanFactory.java   |  19 +--
 .../support/AbstractBeanDefinition.java       |  78 ++++++++++---
 .../support/DisposableBeanAdapter.java        | 103 ++++++++++-------
 .../DefaultListableBeanFactoryTests.java      |  53 ++++++++-
 .../support/ScriptFactoryPostProcessor.java   |   4 +-
 .../Spr3775InitDestroyLifecycleTests.java     | 108 ++++++++----------
 6 files changed, 229 insertions(+), 136 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index 2fb13145124b..a013c2bdce16 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -74,7 +74,6 @@
 import org.springframework.core.PriorityOrdered;
 import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
@@ -1789,11 +1788,15 @@ protected void invokeInitMethods(String beanName, Object bean, @Nullable RootBea
 		}
 
 		if (mbd != null && bean.getClass() != NullBean.class) {
-			String initMethodName = mbd.getInitMethodName();
-			if (StringUtils.hasLength(initMethodName) &&
-					!(isInitializingBean && "afterPropertiesSet".equals(initMethodName)) &&
-					!mbd.isExternallyManagedInitMethod(initMethodName)) {
-				invokeCustomInitMethod(beanName, bean, mbd);
+			String[] initMethodNames = mbd.getInitMethodNames();
+			if (initMethodNames != null) {
+				for (String initMethodName : initMethodNames) {
+					if (StringUtils.hasLength(initMethodName) &&
+							!(isInitializingBean && "afterPropertiesSet".equals(initMethodName)) &&
+							!mbd.isExternallyManagedInitMethod(initMethodName)) {
+						invokeCustomInitMethod(beanName, bean, mbd, initMethodName);
+					}
+				}
 			}
 		}
 	}
@@ -1805,11 +1808,9 @@ protected void invokeInitMethods(String beanName, Object bean, @Nullable RootBea
 	 * methods with arguments.
 	 * @see #invokeInitMethods
 	 */
-	protected void invokeCustomInitMethod(String beanName, Object bean, RootBeanDefinition mbd)
+	protected void invokeCustomInitMethod(String beanName, Object bean, RootBeanDefinition mbd, String initMethodName)
 			throws Throwable {
 
-		String initMethodName = mbd.getInitMethodName();
-		Assert.state(initMethodName != null, "No init method set");
 		Method initMethod = (mbd.isNonPublicAccessAllowed() ?
 				BeanUtils.findMethod(bean.getClass(), initMethodName) :
 				ClassUtils.getMethodIfAvailable(bean.getClass(), initMethodName));
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
index 847574dbd2ec..0176af001a95 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -184,10 +184,10 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	private MethodOverrides methodOverrides = new MethodOverrides();
 
 	@Nullable
-	private String initMethodName;
+	private String[] initMethodNames;
 
 	@Nullable
-	private String destroyMethodName;
+	private String[] destroyMethodNames;
 
 	private boolean enforceInitMethod = true;
 
@@ -262,9 +262,9 @@ protected AbstractBeanDefinition(BeanDefinition original) {
 			setInstanceSupplier(originalAbd.getInstanceSupplier());
 			setNonPublicAccessAllowed(originalAbd.isNonPublicAccessAllowed());
 			setLenientConstructorResolution(originalAbd.isLenientConstructorResolution());
-			setInitMethodName(originalAbd.getInitMethodName());
+			setInitMethodNames(originalAbd.getInitMethodNames());
 			setEnforceInitMethod(originalAbd.isEnforceInitMethod());
-			setDestroyMethodName(originalAbd.getDestroyMethodName());
+			setDestroyMethodNames(originalAbd.getDestroyMethodNames());
 			setEnforceDestroyMethod(originalAbd.isEnforceDestroyMethod());
 			setSynthetic(originalAbd.isSynthetic());
 			setResource(originalAbd.getResource());
@@ -338,12 +338,12 @@ public void overrideFrom(BeanDefinition other) {
 			setInstanceSupplier(otherAbd.getInstanceSupplier());
 			setNonPublicAccessAllowed(otherAbd.isNonPublicAccessAllowed());
 			setLenientConstructorResolution(otherAbd.isLenientConstructorResolution());
-			if (otherAbd.getInitMethodName() != null) {
-				setInitMethodName(otherAbd.getInitMethodName());
+			if (otherAbd.getInitMethodNames() != null) {
+				setInitMethodNames(otherAbd.getInitMethodNames());
 				setEnforceInitMethod(otherAbd.isEnforceInitMethod());
 			}
-			if (otherAbd.getDestroyMethodName() != null) {
-				setDestroyMethodName(otherAbd.getDestroyMethodName());
+			if (otherAbd.getDestroyMethodNames() != null) {
+				setDestroyMethodNames(otherAbd.getDestroyMethodNames());
 				setEnforceDestroyMethod(otherAbd.isEnforceDestroyMethod());
 			}
 			setSynthetic(otherAbd.isSynthetic());
@@ -918,22 +918,42 @@ public boolean hasMethodOverrides() {
 		return !this.methodOverrides.isEmpty();
 	}
 
+	/**
+	 * Specify the names of multiple initializer methods.
+	 * <p>The default is {@code null} in which case there are no initializer methods.
+	 * @since 6.0
+	 * @see #setInitMethodName
+	 */
+	public void setInitMethodNames(@Nullable String... initMethodNames) {
+		this.initMethodNames = initMethodNames;
+	}
+
+	/**
+	 * Return the names of the initializer methods.
+	 * @since 6.0
+	 */
+	@Nullable
+	public String[] getInitMethodNames() {
+		return this.initMethodNames;
+	}
+
 	/**
 	 * Set the name of the initializer method.
 	 * <p>The default is {@code null} in which case there is no initializer method.
+	 * @see #setInitMethodNames
 	 */
 	@Override
 	public void setInitMethodName(@Nullable String initMethodName) {
-		this.initMethodName = initMethodName;
+		this.initMethodNames = (initMethodName != null ? new String[] {initMethodName} : null);
 	}
 
 	/**
-	 * Return the name of the initializer method.
+	 * Return the name of the initializer method (the first one in case of multiple methods).
 	 */
 	@Override
 	@Nullable
 	public String getInitMethodName() {
-		return this.initMethodName;
+		return (!ObjectUtils.isEmpty(this.initMethodNames) ? this.initMethodNames[0] : null);
 	}
 
 	/**
@@ -957,22 +977,42 @@ public boolean isEnforceInitMethod() {
 		return this.enforceInitMethod;
 	}
 
+	/**
+	 * Specify the names of multiple destroy methods.
+	 * <p>The default is {@code null} in which case there are no destroy methods.
+	 * @since 6.0
+	 * @see #setDestroyMethodName
+	 */
+	public void setDestroyMethodNames(@Nullable String... destroyMethodNames) {
+		this.destroyMethodNames = destroyMethodNames;
+	}
+
+	/**
+	 * Return the names of the destroy methods.
+	 * @since 6.0
+	 */
+	@Nullable
+	public String[] getDestroyMethodNames() {
+		return this.destroyMethodNames;
+	}
+
 	/**
 	 * Set the name of the destroy method.
 	 * <p>The default is {@code null} in which case there is no destroy method.
+	 * @see #setDestroyMethodNames
 	 */
 	@Override
 	public void setDestroyMethodName(@Nullable String destroyMethodName) {
-		this.destroyMethodName = destroyMethodName;
+		this.destroyMethodNames = (destroyMethodName != null ? new String[] {destroyMethodName} : null);
 	}
 
 	/**
-	 * Return the name of the destroy method.
+	 * Return the name of the destroy method (the first one in case of multiple methods).
 	 */
 	@Override
 	@Nullable
 	public String getDestroyMethodName() {
-		return this.destroyMethodName;
+		return (!ObjectUtils.isEmpty(this.destroyMethodNames) ? this.destroyMethodNames[0] : null);
 	}
 
 	/**
@@ -1189,9 +1229,9 @@ public boolean equals(@Nullable Object other) {
 				ObjectUtils.nullSafeEquals(this.methodOverrides, that.methodOverrides) &&
 				ObjectUtils.nullSafeEquals(this.factoryBeanName, that.factoryBeanName) &&
 				ObjectUtils.nullSafeEquals(this.factoryMethodName, that.factoryMethodName) &&
-				ObjectUtils.nullSafeEquals(this.initMethodName, that.initMethodName) &&
+				ObjectUtils.nullSafeEquals(this.initMethodNames, that.initMethodNames) &&
 				this.enforceInitMethod == that.enforceInitMethod &&
-				ObjectUtils.nullSafeEquals(this.destroyMethodName, that.destroyMethodName) &&
+				ObjectUtils.nullSafeEquals(this.destroyMethodNames, that.destroyMethodNames) &&
 				this.enforceDestroyMethod == that.enforceDestroyMethod &&
 				this.synthetic == that.synthetic &&
 				this.role == that.role &&
@@ -1241,8 +1281,8 @@ public String toString() {
 		sb.append("; primary=").append(this.primary);
 		sb.append("; factoryBeanName=").append(this.factoryBeanName);
 		sb.append("; factoryMethodName=").append(this.factoryMethodName);
-		sb.append("; initMethodName=").append(this.initMethodName);
-		sb.append("; destroyMethodName=").append(this.destroyMethodName);
+		sb.append("; initMethodNames=").append(this.initMethodNames);
+		sb.append("; destroyMethodNames=").append(this.destroyMethodNames);
 		if (this.resource != null) {
 			sb.append("; defined in ").append(this.resource.getDescription());
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
index 0f1b5ecd4673..23354b6cccb2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
@@ -32,6 +32,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -51,7 +52,7 @@
  * @see AbstractBeanFactory
  * @see org.springframework.beans.factory.DisposableBean
  * @see org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor
- * @see AbstractBeanDefinition#getDestroyMethodName()
+ * @see AbstractBeanDefinition#getDestroyMethodNames()
  */
 @SuppressWarnings("serial")
 class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
@@ -76,10 +77,10 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 	private boolean invokeAutoCloseable;
 
 	@Nullable
-	private String destroyMethodName;
+	private String[] destroyMethodNames;
 
 	@Nullable
-	private transient Method destroyMethod;
+	private transient Method[] destroyMethods;
 
 	@Nullable
 	private final List<DestructionAwareBeanPostProcessor> beanPostProcessors;
@@ -103,36 +104,42 @@ public DisposableBeanAdapter(Object bean, String beanName, RootBeanDefinition be
 		this.invokeDisposableBean = (bean instanceof DisposableBean &&
 				!beanDefinition.isExternallyManagedDestroyMethod(DESTROY_METHOD_NAME));
 
-		String destroyMethodName = inferDestroyMethodIfNecessary(bean, beanDefinition);
-		if (destroyMethodName != null &&
-				!(this.invokeDisposableBean && DESTROY_METHOD_NAME.equals(destroyMethodName)) &&
-				!beanDefinition.isExternallyManagedDestroyMethod(destroyMethodName)) {
+		String[] destroyMethodNames = inferDestroyMethodsIfNecessary(bean, beanDefinition);
+		if (!ObjectUtils.isEmpty(destroyMethodNames) &&
+				!(this.invokeDisposableBean && DESTROY_METHOD_NAME.equals(destroyMethodNames[0])) &&
+				!beanDefinition.isExternallyManagedDestroyMethod(destroyMethodNames[0])) {
 
-			this.invokeAutoCloseable = (bean instanceof AutoCloseable && CLOSE_METHOD_NAME.equals(destroyMethodName));
+			this.invokeAutoCloseable =
+					(bean instanceof AutoCloseable && CLOSE_METHOD_NAME.equals(destroyMethodNames[0]));
 			if (!this.invokeAutoCloseable) {
-				this.destroyMethodName = destroyMethodName;
-				Method destroyMethod = determineDestroyMethod(destroyMethodName);
-				if (destroyMethod == null) {
-					if (beanDefinition.isEnforceDestroyMethod()) {
-						throw new BeanDefinitionValidationException("Could not find a destroy method named '" +
-								destroyMethodName + "' on bean with name '" + beanName + "'");
-					}
-				}
-				else {
-					if (destroyMethod.getParameterCount() > 0) {
-						Class<?>[] paramTypes = destroyMethod.getParameterTypes();
-						if (paramTypes.length > 1) {
-							throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
-									beanName + "' has more than one parameter - not supported as destroy method");
+				this.destroyMethodNames = destroyMethodNames;
+				Method[] destroyMethods = new Method[destroyMethodNames.length];
+				for (int i = 0; i < destroyMethodNames.length; i++) {
+					String destroyMethodName = destroyMethodNames[i];
+					Method destroyMethod = determineDestroyMethod(destroyMethodName);
+					if (destroyMethod == null) {
+						if (beanDefinition.isEnforceDestroyMethod()) {
+							throw new BeanDefinitionValidationException("Could not find a destroy method named '" +
+									destroyMethodName + "' on bean with name '" + beanName + "'");
 						}
-						else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
-							throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
-									beanName + "' has a non-boolean parameter - not supported as destroy method");
+					}
+					else {
+						if (destroyMethod.getParameterCount() > 0) {
+							Class<?>[] paramTypes = destroyMethod.getParameterTypes();
+							if (paramTypes.length > 1) {
+								throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
+										beanName + "' has more than one parameter - not supported as destroy method");
+							}
+							else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
+								throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
+										beanName + "' has a non-boolean parameter - not supported as destroy method");
+							}
 						}
+						destroyMethod = ClassUtils.getInterfaceMethodIfPossible(destroyMethod, bean.getClass());
 					}
-					destroyMethod = ClassUtils.getInterfaceMethodIfPossible(destroyMethod, bean.getClass());
+					destroyMethods[i] = destroyMethod;
 				}
-				this.destroyMethod = destroyMethod;
+				this.destroyMethods = destroyMethods;
 			}
 		}
 
@@ -158,7 +165,7 @@ public DisposableBeanAdapter(Object bean, List<DestructionAwareBeanPostProcessor
 	 * Create a new DisposableBeanAdapter for the given bean.
 	 */
 	private DisposableBeanAdapter(Object bean, String beanName, boolean nonPublicAccessAllowed,
-			boolean invokeDisposableBean, boolean invokeAutoCloseable, @Nullable String destroyMethodName,
+			boolean invokeDisposableBean, boolean invokeAutoCloseable, @Nullable String[] destroyMethodNames,
 			@Nullable List<DestructionAwareBeanPostProcessor> postProcessors) {
 
 		this.bean = bean;
@@ -166,7 +173,7 @@ private DisposableBeanAdapter(Object bean, String beanName, boolean nonPublicAcc
 		this.nonPublicAccessAllowed = nonPublicAccessAllowed;
 		this.invokeDisposableBean = invokeDisposableBean;
 		this.invokeAutoCloseable = invokeAutoCloseable;
-		this.destroyMethodName = destroyMethodName;
+		this.destroyMethodNames = destroyMethodNames;
 		this.beanPostProcessors = postProcessors;
 	}
 
@@ -219,13 +226,18 @@ public void destroy() {
 				}
 			}
 		}
-		else if (this.destroyMethod != null) {
-			invokeCustomDestroyMethod(this.destroyMethod);
+		else if (this.destroyMethods != null) {
+			for (Method destroyMethod : this.destroyMethods) {
+				invokeCustomDestroyMethod(destroyMethod);
+			}
 		}
-		else if (this.destroyMethodName != null) {
-			Method destroyMethod = determineDestroyMethod(this.destroyMethodName);
-			if (destroyMethod != null) {
-				invokeCustomDestroyMethod(ClassUtils.getInterfaceMethodIfPossible(destroyMethod, this.bean.getClass()));
+		else if (this.destroyMethodNames != null) {
+			for (String destroyMethodName: this.destroyMethodNames) {
+				Method destroyMethod = determineDestroyMethod(destroyMethodName);
+				if (destroyMethod != null) {
+					invokeCustomDestroyMethod(
+							ClassUtils.getInterfaceMethodIfPossible(destroyMethod, this.bean.getClass()));
+				}
 			}
 		}
 	}
@@ -255,14 +267,14 @@ private Method findDestroyMethod(String name) {
 	 * for a method with a single boolean argument (passing in "true",
 	 * assuming a "force" parameter), else logging an error.
 	 */
-	private void invokeCustomDestroyMethod(final Method destroyMethod) {
+	private void invokeCustomDestroyMethod(Method destroyMethod) {
 		int paramCount = destroyMethod.getParameterCount();
 		final Object[] args = new Object[paramCount];
 		if (paramCount == 1) {
 			args[0] = Boolean.TRUE;
 		}
 		if (logger.isTraceEnabled()) {
-			logger.trace("Invoking custom destroy method '" + this.destroyMethodName +
+			logger.trace("Invoking custom destroy method '" + destroyMethod.getName() +
 					"' on bean with name '" + this.beanName + "'");
 		}
 		try {
@@ -270,7 +282,7 @@ private void invokeCustomDestroyMethod(final Method destroyMethod) {
 			destroyMethod.invoke(this.bean, args);
 		}
 		catch (InvocationTargetException ex) {
-			String msg = "Custom destroy method '" + this.destroyMethodName + "' on bean with name '" +
+			String msg = "Custom destroy method '" + destroyMethod.getName() + "' on bean with name '" +
 					this.beanName + "' threw an exception";
 			if (logger.isDebugEnabled()) {
 				logger.warn(msg, ex.getTargetException());
@@ -280,7 +292,7 @@ private void invokeCustomDestroyMethod(final Method destroyMethod) {
 			}
 		}
 		catch (Throwable ex) {
-			logger.warn("Failed to invoke custom destroy method '" + this.destroyMethodName +
+			logger.warn("Failed to invoke custom destroy method '" + destroyMethod.getName() +
 					"' on bean with name '" + this.beanName + "'", ex);
 		}
 	}
@@ -302,7 +314,7 @@ protected Object writeReplace() {
 		}
 		return new DisposableBeanAdapter(
 				this.bean, this.beanName, this.nonPublicAccessAllowed, this.invokeDisposableBean,
-				this.invokeAutoCloseable, this.destroyMethodName, serializablePostProcessors);
+				this.invokeAutoCloseable, this.destroyMethodNames, serializablePostProcessors);
 	}
 
 
@@ -312,7 +324,7 @@ protected Object writeReplace() {
 	 * @param beanDefinition the corresponding bean definition
 	 */
 	public static boolean hasDestroyMethod(Object bean, RootBeanDefinition beanDefinition) {
-		return (bean instanceof DisposableBean || inferDestroyMethodIfNecessary(bean, beanDefinition) != null);
+		return (bean instanceof DisposableBean || inferDestroyMethodsIfNecessary(bean, beanDefinition) != null);
 	}
 
 
@@ -330,7 +342,12 @@ public static boolean hasDestroyMethod(Object bean, RootBeanDefinition beanDefin
 	 * interfaces, reflectively calling the "close" method on implementing beans as well.
 	 */
 	@Nullable
-	private static String inferDestroyMethodIfNecessary(Object bean, RootBeanDefinition beanDefinition) {
+	private static String[] inferDestroyMethodsIfNecessary(Object bean, RootBeanDefinition beanDefinition) {
+		String[] destroyMethodNames = beanDefinition.getDestroyMethodNames();
+		if (destroyMethodNames != null && destroyMethodNames.length > 1) {
+			return destroyMethodNames;
+		}
+
 		String destroyMethodName = beanDefinition.resolvedDestroyMethodName;
 		if (destroyMethodName == null) {
 			destroyMethodName = beanDefinition.getDestroyMethodName();
@@ -361,7 +378,7 @@ private static String inferDestroyMethodIfNecessary(Object bean, RootBeanDefinit
 			}
 			beanDefinition.resolvedDestroyMethodName = (destroyMethodName != null ? destroyMethodName : "");
 		}
-		return (StringUtils.hasLength(destroyMethodName) ? destroyMethodName : null);
+		return (StringUtils.hasLength(destroyMethodName) ? new String[] {destroyMethodName} : null);
 	}
 
 	/**
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index db7454073cf1..accf86ef058b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -22,6 +22,7 @@
 import java.net.MalformedURLException;
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -2333,6 +2334,19 @@ void prototypeWithArrayConversionForFactoryMethod() {
 		assertThat(tb2.getBeanName()).isEqualTo("myBeanName");
 	}
 
+	@Test
+	void multipleInitAndDestroyMethods() {
+		RootBeanDefinition bd = new RootBeanDefinition(BeanWithInitAndDestroyMethods.class);
+		bd.setInitMethodNames("init1", "init2");
+		bd.setDestroyMethodNames("destroy2", "destroy1");
+		lbf.registerBeanDefinition("test", bd);
+		BeanWithInitAndDestroyMethods bean = lbf.getBean("test", BeanWithInitAndDestroyMethods.class);
+		assertThat(bean.initMethods).containsExactly("init", "init1", "init2");
+		assertThat(bean.destroyMethods).isEmpty();
+		lbf.destroySingletons();
+		assertThat(bean.destroyMethods).containsExactly("destroy", "destroy2", "destroy1");
+	}
+
 	@Test
 	void beanPostProcessorWithWrappedObjectAndDisposableBean() {
 		RootBeanDefinition bd = new RootBeanDefinition(BeanWithDisposableBean.class);
@@ -2758,9 +2772,42 @@ public ConstructorDependencyWithClassResolution() {
 	}
 
 
+	static class BeanWithInitAndDestroyMethods implements InitializingBean, DisposableBean {
+
+		final List<String> initMethods = new ArrayList<>();
+		final List<String> destroyMethods = new ArrayList<>();
+
+		@Override
+		public void afterPropertiesSet() {
+			initMethods.add("init");
+		}
+
+		void init1() {
+			initMethods.add("init1");
+		}
+
+		void init2() {
+			initMethods.add("init2");
+		}
+
+		@Override
+		public void destroy() {
+			destroyMethods.add("destroy");
+		}
+
+		void destroy1() {
+			destroyMethods.add("destroy1");
+		}
+
+		void destroy2() {
+			destroyMethods.add("destroy2");
+		}
+	}
+
+
 	public static class BeanWithDisposableBean implements DisposableBean {
 
-		private static boolean closed;
+		static boolean closed;
 
 		@Override
 		public void destroy() {
@@ -2771,7 +2818,7 @@ public void destroy() {
 
 	public static class BeanWithCloseable implements Closeable {
 
-		private static boolean closed;
+		static boolean closed;
 
 		@Override
 		public void close() {
@@ -2788,7 +2835,7 @@ public static abstract class BaseClassWithDestroyMethod {
 
 	public static class BeanWithDestroyMethod extends BaseClassWithDestroyMethod {
 
-		private static int closeCount = 0;
+		static int closeCount = 0;
 
 		@SuppressWarnings("unused")
 		private BeanWithDestroyMethod inner;
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
index 39772475c057..949da723710a 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -510,7 +510,7 @@ protected Class<?> createConfigInterface(BeanDefinition bd, @Nullable Class<?>[]
 			Signature signature = new Signature(setterName, Type.VOID_TYPE, new Type[] {Type.getType(propertyType)});
 			maker.add(signature, new Type[0]);
 		}
-		if (bd.getInitMethodName() != null) {
+		if (StringUtils.hasText(bd.getInitMethodName())) {
 			Signature signature = new Signature(bd.getInitMethodName(), Type.VOID_TYPE, new Type[0]);
 			maker.add(signature, new Type[0]);
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
index 82caf5254e98..821fffffcf57 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,8 +22,6 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.DisposableBean;
@@ -35,15 +33,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * <p>
- * JUnit-3.8-based unit test which verifies expected <em>init</em> and
- * <em>destroy</em> bean lifecycle behavior as requested in <a
- * href="https://opensource.atlassian.com/projects/spring/browse/SPR-3775"
+ * Unit test which verifies expected <em>init</em> and <em>destroy</em>
+ * bean lifecycle behavior as requested in
+ * <a href="https://opensource.atlassian.com/projects/spring/browse/SPR-3775"
  * target="_blank">SPR-3775</a>.
- * </p>
- * <p>
- * Specifically, combinations of the following are tested:
- * </p>
+ *
+ * <p>Specifically, combinations of the following are tested:
  * <ul>
  * <li>{@link InitializingBean} &amp; {@link DisposableBean} interfaces</li>
  * <li>Custom {@link RootBeanDefinition#getInitMethodName() init} &amp;
@@ -57,26 +52,17 @@
  */
 public class Spr3775InitDestroyLifecycleTests {
 
-	private static final Log logger = LogFactory.getLog(Spr3775InitDestroyLifecycleTests.class);
-
-	/** LIFECYCLE_TEST_BEAN. */
 	private static final String LIFECYCLE_TEST_BEAN = "lifecycleTestBean";
 
 
-	private void debugMethods(Class<?> clazz, String category, List<String> methodNames) {
-		if (logger.isDebugEnabled()) {
-			logger.debug(clazz.getSimpleName() + ": " + category + ": " + methodNames);
-		}
+	private void assertMethodOrdering(String category, List<String> expectedMethods, List<String> actualMethods) {
+		assertThat(ObjectUtils.nullSafeEquals(expectedMethods, actualMethods)).
+				as("Verifying " + category + ": expected<" + expectedMethods + "> but got<" + actualMethods + ">.").isTrue();
 	}
 
-	private void assertMethodOrdering(Class<?> clazz, String category, List<String> expectedMethods,
-			List<String> actualMethods) {
-		debugMethods(clazz, category, actualMethods);
-		assertThat(ObjectUtils.nullSafeEquals(expectedMethods, actualMethods)).as("Verifying " + category + ": expected<" + expectedMethods + "> but got<" + actualMethods + ">.").isTrue();
-	}
+	private DefaultListableBeanFactory createBeanFactoryAndRegisterBean(
+			Class<?> beanClass, String initMethodName, String destroyMethodName) {
 
-	private DefaultListableBeanFactory createBeanFactoryAndRegisterBean(final Class<?> beanClass,
-			final String initMethodName, final String destroyMethodName) {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		RootBeanDefinition beanDefinition = new RootBeanDefinition(beanClass);
 		beanDefinition.setInitMethodName(initMethodName);
@@ -88,75 +74,77 @@ private DefaultListableBeanFactory createBeanFactoryAndRegisterBean(final Class<
 
 	@Test
 	public void testInitDestroyMethods() {
-		final Class<?> beanClass = InitDestroyBean.class;
-		final DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass,
+		Class<?> beanClass = InitDestroyBean.class;
+		DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass,
 				"afterPropertiesSet", "destroy");
-		final InitDestroyBean bean = (InitDestroyBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
-		assertMethodOrdering(beanClass, "init-methods", Arrays.asList("afterPropertiesSet"), bean.initMethods);
+		InitDestroyBean bean = (InitDestroyBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
+		assertMethodOrdering("init-methods", Arrays.asList("afterPropertiesSet"), bean.initMethods);
 		beanFactory.destroySingletons();
-		assertMethodOrdering(beanClass, "destroy-methods", Arrays.asList("destroy"), bean.destroyMethods);
+		assertMethodOrdering("destroy-methods", Arrays.asList("destroy"), bean.destroyMethods);
 	}
 
 	@Test
 	public void testInitializingDisposableInterfaces() {
-		final Class<?> beanClass = CustomInitializingDisposableBean.class;
-		final DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass, "customInit",
+		Class<?> beanClass = CustomInitializingDisposableBean.class;
+		DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass, "customInit",
 				"customDestroy");
-		final CustomInitializingDisposableBean bean = (CustomInitializingDisposableBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
-		assertMethodOrdering(beanClass, "init-methods", Arrays.asList("afterPropertiesSet", "customInit"),
+		CustomInitializingDisposableBean bean = (CustomInitializingDisposableBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
+		assertMethodOrdering("init-methods", Arrays.asList("afterPropertiesSet", "customInit"),
 				bean.initMethods);
 		beanFactory.destroySingletons();
-		assertMethodOrdering(beanClass, "destroy-methods", Arrays.asList("destroy", "customDestroy"),
+		assertMethodOrdering("destroy-methods", Arrays.asList("destroy", "customDestroy"),
 				bean.destroyMethods);
 	}
 
 	@Test
 	public void testInitializingDisposableInterfacesWithShadowedMethods() {
-		final Class<?> beanClass = InitializingDisposableWithShadowedMethodsBean.class;
-		final DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass,
+		Class<?> beanClass = InitializingDisposableWithShadowedMethodsBean.class;
+		DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass,
 				"afterPropertiesSet", "destroy");
-		final InitializingDisposableWithShadowedMethodsBean bean = (InitializingDisposableWithShadowedMethodsBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
-		assertMethodOrdering(beanClass, "init-methods", Arrays.asList("InitializingBean.afterPropertiesSet"),
+		InitializingDisposableWithShadowedMethodsBean bean =
+				(InitializingDisposableWithShadowedMethodsBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
+		assertMethodOrdering("init-methods", Arrays.asList("InitializingBean.afterPropertiesSet"),
 				bean.initMethods);
 		beanFactory.destroySingletons();
-		assertMethodOrdering(beanClass, "destroy-methods", Arrays.asList("DisposableBean.destroy"), bean.destroyMethods);
+		assertMethodOrdering("destroy-methods", Arrays.asList("DisposableBean.destroy"), bean.destroyMethods);
 	}
 
 	@Test
 	public void testJsr250Annotations() {
-		final Class<?> beanClass = CustomAnnotatedInitDestroyBean.class;
-		final DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass, "customInit",
+		Class<?> beanClass = CustomAnnotatedInitDestroyBean.class;
+		DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass, "customInit",
 				"customDestroy");
-		final CustomAnnotatedInitDestroyBean bean = (CustomAnnotatedInitDestroyBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
-		assertMethodOrdering(beanClass, "init-methods", Arrays.asList("postConstruct", "afterPropertiesSet",
+		CustomAnnotatedInitDestroyBean bean = (CustomAnnotatedInitDestroyBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
+		assertMethodOrdering("init-methods", Arrays.asList("postConstruct", "afterPropertiesSet",
 				"customInit"), bean.initMethods);
 		beanFactory.destroySingletons();
-		assertMethodOrdering(beanClass, "destroy-methods", Arrays.asList("preDestroy", "destroy", "customDestroy"),
+		assertMethodOrdering("destroy-methods", Arrays.asList("preDestroy", "destroy", "customDestroy"),
 				bean.destroyMethods);
 	}
 
 	@Test
 	public void testJsr250AnnotationsWithShadowedMethods() {
-		final Class<?> beanClass = CustomAnnotatedInitDestroyWithShadowedMethodsBean.class;
-		final DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass, "customInit",
+		Class<?> beanClass = CustomAnnotatedInitDestroyWithShadowedMethodsBean.class;
+		DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass, "customInit",
 				"customDestroy");
-		final CustomAnnotatedInitDestroyWithShadowedMethodsBean bean = (CustomAnnotatedInitDestroyWithShadowedMethodsBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
-		assertMethodOrdering(beanClass, "init-methods",
+		CustomAnnotatedInitDestroyWithShadowedMethodsBean bean =
+				(CustomAnnotatedInitDestroyWithShadowedMethodsBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
+		assertMethodOrdering("init-methods",
 				Arrays.asList("@PostConstruct.afterPropertiesSet", "customInit"), bean.initMethods);
 		beanFactory.destroySingletons();
-		assertMethodOrdering(beanClass, "destroy-methods", Arrays.asList("@PreDestroy.destroy", "customDestroy"),
+		assertMethodOrdering("destroy-methods", Arrays.asList("@PreDestroy.destroy", "customDestroy"),
 				bean.destroyMethods);
 	}
 
 	@Test
 	public void testAllLifecycleMechanismsAtOnce() {
-		final Class<?> beanClass = AllInOneBean.class;
-		final DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass,
+		Class<?> beanClass = AllInOneBean.class;
+		DefaultListableBeanFactory beanFactory = createBeanFactoryAndRegisterBean(beanClass,
 				"afterPropertiesSet", "destroy");
-		final AllInOneBean bean = (AllInOneBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
-		assertMethodOrdering(beanClass, "init-methods", Arrays.asList("afterPropertiesSet"), bean.initMethods);
+		AllInOneBean bean = (AllInOneBean) beanFactory.getBean(LIFECYCLE_TEST_BEAN);
+		assertMethodOrdering("init-methods", Arrays.asList("afterPropertiesSet"), bean.initMethods);
 		beanFactory.destroySingletons();
-		assertMethodOrdering(beanClass, "destroy-methods", Arrays.asList("destroy"), bean.destroyMethods);
+		assertMethodOrdering("destroy-methods", Arrays.asList("destroy"), bean.destroyMethods);
 	}
 
 
@@ -165,7 +153,6 @@ public static class InitDestroyBean {
 		final List<String> initMethods = new ArrayList<>();
 		final List<String> destroyMethods = new ArrayList<>();
 
-
 		public void afterPropertiesSet() throws Exception {
 			this.initMethods.add("afterPropertiesSet");
 		}
@@ -175,8 +162,9 @@ public void destroy() throws Exception {
 		}
 	}
 
-	public static class InitializingDisposableWithShadowedMethodsBean extends InitDestroyBean implements
-			InitializingBean, DisposableBean {
+
+	public static class InitializingDisposableWithShadowedMethodsBean extends InitDestroyBean
+			implements InitializingBean, DisposableBean {
 
 		@Override
 		public void afterPropertiesSet() throws Exception {
@@ -255,14 +243,14 @@ public static class AllInOneBean implements InitializingBean, DisposableBean {
 		final List<String> initMethods = new ArrayList<>();
 		final List<String> destroyMethods = new ArrayList<>();
 
-		@Override
 		@PostConstruct
+		@Override
 		public void afterPropertiesSet() throws Exception {
 			this.initMethods.add("afterPropertiesSet");
 		}
 
-		@Override
 		@PreDestroy
+		@Override
 		public void destroy() throws Exception {
 			this.destroyMethods.add("destroy");
 		}

From 4a470e0a37f44f084f79422fd3252cab3e86ff29 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 17 Feb 2022 22:37:34 +0100
Subject: [PATCH 717/735] Prevent @Bean method overloading by default (with
 enforceUniqueMethods flag)

Closes gh-22609
---
 .../context/annotation/Configuration.java     | 14 ++++++-
 .../annotation/ConfigurationClass.java        | 33 +++++++++++++++-
 .../annotation/ConfigurationClassParser.java  | 11 ++----
 .../BeanMethodPolymorphismTests.java          | 38 ++++++++++---------
 .../ConfigurationClassProcessingTests.java    |  4 +-
 5 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
index c228da0ddb17..54b089b53dcb 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -460,4 +460,16 @@
 	 */
 	boolean proxyBeanMethods() default true;
 
+	/**
+	 * Specify whether {@code @Bean} methods need to have unique method names,
+	 * raising an exception otherwise in order to prevent accidental overloading.
+	 * <p>The default is {@code true}, preventing accidental method overloads which
+	 * get interpreted as overloaded factory methods for the same bean definition
+	 * (as opposed to separate bean definitions with individual conditions etc).
+	 * Switch this flag to {@code false} in order to allow for method overloading
+	 * according to those semantics, accepting the risk for accidental overlaps.
+	 * @since 6.0
+	 */
+	boolean enforceUniqueMethods() default true;
+
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
index b6155f6d7bfa..58293278b46c 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,6 +29,7 @@
 import org.springframework.core.io.DescriptiveResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.MethodMetadata;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -210,8 +211,9 @@ Map<String, Class<? extends BeanDefinitionReader>> getImportedResources() {
 	}
 
 	void validate(ProblemReporter problemReporter) {
-		// A configuration class may not be final (CGLIB limitation) unless it declares proxyBeanMethods=false
 		Map<String, Object> attributes = this.metadata.getAnnotationAttributes(Configuration.class.getName());
+
+		// A configuration class may not be final (CGLIB limitation) unless it declares proxyBeanMethods=false
 		if (attributes != null && (Boolean) attributes.get("proxyBeanMethods")) {
 			if (this.metadata.isFinal()) {
 				problemReporter.error(new FinalConfigurationProblem());
@@ -220,6 +222,18 @@ void validate(ProblemReporter problemReporter) {
 				beanMethod.validate(problemReporter);
 			}
 		}
+
+		// A configuration class may not contain overloaded bean methods unless it declares enforceUniqueMethods=false
+		if (attributes != null && (Boolean) attributes.get("enforceUniqueMethods")) {
+			Map<String, MethodMetadata> beanMethodsByName = new LinkedHashMap<>();
+			for (BeanMethod beanMethod : this.beanMethods) {
+				MethodMetadata current = beanMethod.getMetadata();
+				MethodMetadata existing = beanMethodsByName.put(current.getMethodName(), current);
+				if (existing != null && existing.getDeclaringClassName().equals(current.getDeclaringClassName())) {
+					problemReporter.error(new BeanMethodOverloadingProblem(existing.getMethodName()));
+				}
+			}
+		}
 	}
 
 	@Override
@@ -250,4 +264,19 @@ private class FinalConfigurationProblem extends Problem {
 		}
 	}
 
+
+	/**
+	 * Configuration classes are not allowed to contain overloaded bean methods
+	 * by default (as of 6.0).
+	 */
+	private class BeanMethodOverloadingProblem extends Problem {
+
+		BeanMethodOverloadingProblem(String methodName) {
+			super(String.format("@Configuration class '%s' contains overloaded @Bean methods with name '%s'. Use " +
+							"unique method names for separate bean definitions (with individual conditions etc) " +
+							"or switch '@Configuration.enforceUniqueMethods' to 'false'.",
+					getSimpleName(), methodName), new Location(getResource(), getMetadata()));
+		}
+	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
index 423078625f97..204b54ec23a5 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -967,8 +967,7 @@ public ConfigurationClass asConfigClass(ConfigurationClass importedBy) {
 
 		public Collection<SourceClass> getMemberClasses() throws IOException {
 			Object sourceToProcess = this.source;
-			if (sourceToProcess instanceof Class) {
-				Class<?> sourceClass = (Class<?>) sourceToProcess;
+			if (sourceToProcess instanceof Class<?> sourceClass) {
 				try {
 					Class<?>[] declaredClasses = sourceClass.getDeclaredClasses();
 					List<SourceClass> members = new ArrayList<>(declaredClasses.length);
@@ -1013,8 +1012,7 @@ public SourceClass getSuperClass() throws IOException {
 
 		public Set<SourceClass> getInterfaces() throws IOException {
 			Set<SourceClass> result = new LinkedHashSet<>();
-			if (this.source instanceof Class) {
-				Class<?> sourceClass = (Class<?>) this.source;
+			if (this.source instanceof Class<?> sourceClass) {
 				for (Class<?> ifcClass : sourceClass.getInterfaces()) {
 					result.add(asSourceClass(ifcClass, DEFAULT_EXCLUSION_FILTER));
 				}
@@ -1029,8 +1027,7 @@ public Set<SourceClass> getInterfaces() throws IOException {
 
 		public Set<SourceClass> getAnnotations() {
 			Set<SourceClass> result = new LinkedHashSet<>();
-			if (this.source instanceof Class) {
-				Class<?> sourceClass = (Class<?>) this.source;
+			if (this.source instanceof Class<?> sourceClass) {
 				for (Annotation ann : sourceClass.getDeclaredAnnotations()) {
 					Class<?> annType = ann.annotationType();
 					if (!annType.getName().startsWith("java")) {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
index 170a02cc961f..4e62e4212c5d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public class BeanMethodPolymorphismTests {
 	@Test
 	public void beanMethodDetectedOnSuperClass() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class);
-		assertThat(ctx.getBean("testBean", TestBean.class)).isNotNull();
+		assertThat(ctx.getBean("testBean", BaseTestBean.class)).isNotNull();
 	}
 
 	@Test
@@ -51,7 +51,7 @@ public void beanMethodOverriding() {
 		ctx.setAllowBeanDefinitionOverriding(false);
 		ctx.refresh();
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isFalse();
-		assertThat(ctx.getBean("testBean", TestBean.class).toString()).isEqualTo("overridden");
+		assertThat(ctx.getBean("testBean", BaseTestBean.class).toString()).isEqualTo("overridden");
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isTrue();
 	}
 
@@ -62,7 +62,7 @@ public void beanMethodOverridingOnASM() {
 		ctx.setAllowBeanDefinitionOverriding(false);
 		ctx.refresh();
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isFalse();
-		assertThat(ctx.getBean("testBean", TestBean.class).toString()).isEqualTo("overridden");
+		assertThat(ctx.getBean("testBean", BaseTestBean.class).toString()).isEqualTo("overridden");
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isTrue();
 	}
 
@@ -73,7 +73,7 @@ public void beanMethodOverridingWithNarrowedReturnType() {
 		ctx.setAllowBeanDefinitionOverriding(false);
 		ctx.refresh();
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isFalse();
-		assertThat(ctx.getBean("testBean", TestBean.class).toString()).isEqualTo("overridden");
+		assertThat(ctx.getBean("testBean", BaseTestBean.class).toString()).isEqualTo("overridden");
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isTrue();
 	}
 
@@ -84,7 +84,7 @@ public void beanMethodOverridingWithNarrowedReturnTypeOnASM() {
 		ctx.setAllowBeanDefinitionOverriding(false);
 		ctx.refresh();
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isFalse();
-		assertThat(ctx.getBean("testBean", TestBean.class).toString()).isEqualTo("overridden");
+		assertThat(ctx.getBean("testBean", BaseTestBean.class).toString()).isEqualTo("overridden");
 		assertThat(ctx.getDefaultListableBeanFactory().containsSingleton("testBean")).isTrue();
 	}
 
@@ -171,7 +171,15 @@ public void beanMethodThroughAopProxy() {
 		ctx.register(AnnotationAwareAspectJAutoProxyCreator.class);
 		ctx.register(TestAdvisor.class);
 		ctx.refresh();
-		ctx.getBean("testBean", TestBean.class);
+		ctx.getBean("testBean", BaseTestBean.class);
+	}
+
+
+	static class BaseTestBean {
+	}
+
+
+	static class ExtendedTestBean extends BaseTestBean {
 	}
 
 
@@ -179,8 +187,8 @@ public void beanMethodThroughAopProxy() {
 	static class BaseConfig {
 
 		@Bean
-		public TestBean testBean() {
-			return new TestBean();
+		public BaseTestBean testBean() {
+			return new BaseTestBean();
 		}
 	}
 
@@ -195,8 +203,8 @@ static class OverridingConfig extends BaseConfig {
 
 		@Bean @Lazy
 		@Override
-		public TestBean testBean() {
-			return new TestBean() {
+		public BaseTestBean testBean() {
+			return new BaseTestBean() {
 				@Override
 				public String toString() {
 					return "overridden";
@@ -206,10 +214,6 @@ public String toString() {
 	}
 
 
-	static class ExtendedTestBean extends TestBean {
-	}
-
-
 	@Configuration
 	static class NarrowedOverridingConfig extends BaseConfig {
 
@@ -226,7 +230,7 @@ public String toString() {
 	}
 
 
-	@Configuration
+	@Configuration(enforceUniqueMethods = false)
 	static class ConfigWithOverloading {
 
 		@Bean
@@ -241,7 +245,7 @@ String aString(Integer dependency) {
 	}
 
 
-	@Configuration
+	@Configuration(enforceUniqueMethods = false)
 	static class ConfigWithOverloadingAndAdditionalMetadata {
 
 		@Bean @Lazy
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
index 491617d0bfe8..d4ceff45574e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -626,7 +626,7 @@ public ApplicationListener<ContextClosedEvent> listener() {
 	}
 
 
-	@Configuration
+	@Configuration(enforceUniqueMethods = false)
 	public static class OverloadedBeanMismatch {
 
 		@Bean(name = "other")

From 94af2ca06bf711de03286999b1c64a703d6de552 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Feb 2022 15:31:59 +0100
Subject: [PATCH 718/735] Recover from error during SpEL MIXED mode compilation

Prior to this commit, SpEL was able to recover from an error that
occurred while running a CompiledExpression; however, SpEL was not able
to recover from an error that occurred while compiling the expression
(such as a java.lang.VerifyError). The latter can occur when multiple
threads concurrently change types involved in the expression, such as
the concrete type of a custom variable registered via
EvaluationContext.setVariable(...), which can result in SpEL generating
invalid bytecode.

This commit addresses this issue by catching exceptions thrown while
compiling an expression and updating the `failedAttempts` and
`interpretedCount` counters accordingly. If an exception is caught
while operating in SpelCompilerMode.IMMEDIATE mode, the exception will
be propagated via a SpelEvaluationException with a new
SpelMessage.EXCEPTION_COMPILING_EXPRESSION error category.

Closes gh-28043
---
 .../expression/spel/SpelMessage.java          | 11 ++++--
 .../spel/standard/SpelCompiler.java           |  5 ++-
 .../spel/standard/SpelExpression.java         | 36 ++++++++++++-----
 .../spel/standard/SpelCompilerTests.java      | 39 +++++++++++++++++++
 4 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
index 3a03cfd9a1a4..b8f5f92d0554 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,11 @@
  * <p>When a message is formatted, it will have this kind of form, capturing the prefix
  * and the error kind:
  *
- * <pre class="code">EL1004E: Type cannot be found 'String'</pre>
+ * <pre class="code">EL1005E: Type cannot be found 'String'</pre>
  *
  * @author Andy Clement
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.0
  */
 public enum SpelMessage {
@@ -255,7 +256,11 @@ public enum SpelMessage {
 
 	/** @since 4.3.17 */
 	FLAWED_PATTERN(Kind.ERROR, 1073,
-			"Failed to efficiently evaluate pattern ''{0}'': consider redesigning it");
+			"Failed to efficiently evaluate pattern ''{0}'': consider redesigning it"),
+
+	/** @since 5.3.16 */
+	EXCEPTION_COMPILING_EXPRESSION(Kind.ERROR, 1074,
+			"An exception occurred while compiling an expression");
 
 
 	private final Kind kind;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java
index f2a225952a0d..d94c18ea5c7f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -110,7 +110,8 @@ public CompiledExpression compile(SpelNodeImpl expression) {
 					return ReflectionUtils.accessibleConstructor(clazz).newInstance();
 				}
 				catch (Throwable ex) {
-					throw new IllegalStateException("Failed to instantiate CompiledExpression", ex);
+					throw new IllegalStateException("Failed to instantiate CompiledExpression for expression: " +
+							expression.toStringAST(), ex);
 				}
 			}
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
index 86ed383c3892..660fb23ddc11 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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,7 @@
  *
  * @author Andy Clement
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.0
  */
 public class SpelExpression implements Expression {
@@ -522,17 +523,34 @@ public boolean compileExpression() {
 				// Compiled by another thread before this thread got into the sync block
 				return true;
 			}
-			SpelCompiler compiler = SpelCompiler.getCompiler(this.configuration.getCompilerClassLoader());
-			compiledAst = compiler.compile(this.ast);
-			if (compiledAst != null) {
-				// Successfully compiled
-				this.compiledAst = compiledAst;
-				return true;
+			try {
+				SpelCompiler compiler = SpelCompiler.getCompiler(this.configuration.getCompilerClassLoader());
+				compiledAst = compiler.compile(this.ast);
+				if (compiledAst != null) {
+					// Successfully compiled
+					this.compiledAst = compiledAst;
+					return true;
+				}
+				else {
+					// Failed to compile
+					this.failedAttempts.incrementAndGet();
+					return false;
+				}
 			}
-			else {
+			catch (Exception ex) {
 				// Failed to compile
 				this.failedAttempts.incrementAndGet();
-				return false;
+
+				// If running in mixed mode, revert to interpreted
+				if (this.configuration.getCompilerMode() == SpelCompilerMode.MIXED) {
+					this.compiledAst = null;
+					this.interpretedCount.set(0);
+					return false;
+				}
+				else {
+					// Running in SpelCompilerMode.immediate mode - propagate exception to caller
+					throw new SpelEvaluationException(ex, SpelMessage.EXCEPTION_COMPILING_EXPRESSION);
+				}
 			}
 		}
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
index 5046f58189aa..a3ee9cb08355 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/standard/SpelCompilerTests.java
@@ -76,6 +76,21 @@ void defaultMethodInvocation() {
 		assertThat(expression.getValue(context)).asInstanceOf(BOOLEAN).isTrue();
 	}
 
+	@Test  // gh-28043
+	void changingRegisteredVariableTypeDoesNotResultInFailureInMixedMode() {
+		SpelParserConfiguration config = new SpelParserConfiguration(SpelCompilerMode.MIXED, null);
+		SpelExpressionParser parser = new SpelExpressionParser(config);
+		Expression sharedExpression = parser.parseExpression("#bean.value");
+		StandardEvaluationContext context = new StandardEvaluationContext();
+
+		Object[] beans = new Object[] {new Bean1(), new Bean2(), new Bean3(), new Bean4()};
+
+		IntStream.rangeClosed(1, 1_000_000).parallel().forEach(count -> {
+			context.setVariable("bean", beans[count % 4]);
+			assertThat(sharedExpression.getValue(context)).asString().startsWith("1");
+		});
+	}
+
 
 	static class OrderedComponent implements Ordered {
 
@@ -121,4 +136,28 @@ default boolean isEditable2() {
 		boolean hasSomeProperty();
 	}
 
+	public static class Bean1 {
+		public String getValue() {
+			return "11";
+		}
+	}
+
+	public static class Bean2 {
+		public Integer getValue() {
+			return 111;
+		}
+	}
+
+	public static class Bean3 {
+		public Float getValue() {
+			return 1.23f;
+		}
+	}
+
+	public static class Bean4 {
+		public Character getValue() {
+			return '1';
+		}
+	}
+
 }

From 071c2988d55b1ad823b79fd4be8908666fc466a8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Feb 2022 16:18:13 +0100
Subject: [PATCH 719/735] Suppress deprecation warnings in tests in build

---
 .../orm/jpa/support/OpenEntityManagerInViewTests.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
index 70360c26dea6..6d8c3157bf46 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -419,6 +419,7 @@ private static class TestTaskExecutor extends SimpleAsyncTaskExecutor {
 		private final CountDownLatch latch = new CountDownLatch(1);
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public void execute(Runnable task, long startTimeout) {
 			Runnable decoratedTask = () -> {
 				try {

From 8c5a407a7d40c397a46110ed2c29c93cd4542331 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 18 Feb 2022 16:22:43 +0100
Subject: [PATCH 720/735] Suppress deprecation warnings in tests in build

---
 .../core/DefaultDatabaseClientUnitTests.java  | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
index 1456a86b6f76..530cfdb043d9 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
@@ -249,9 +249,10 @@ void selectShouldEmitFirstValue() {
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
 				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 
-		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
-		MockResult result = resultBuilder.row(MockRow.builder().identified(0, Object.class, "Walter").build())
-				.row(MockRow.builder().identified(0, Object.class, "White").build()).build();
+		MockResult result = MockResult.builder().row(
+					MockRow.builder().identified(0, Object.class, "Walter").metadata(metadata).build(),
+					MockRow.builder().identified(0, Object.class, "White").metadata(metadata).build()
+				).build();
 
 		mockStatementFor("SELECT * FROM person", result);
 
@@ -269,9 +270,10 @@ void selectShouldEmitAllValues() {
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
 				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 
-		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
-		MockResult result = resultBuilder.row(MockRow.builder().identified(0, Object.class, "Walter").build())
-				.row(MockRow.builder().identified(0, Object.class, "White").build()).build();
+		MockResult result = MockResult.builder().row(
+					MockRow.builder().identified(0, Object.class, "Walter").metadata(metadata).build(),
+					MockRow.builder().identified(0, Object.class, "White").metadata(metadata).build()
+				).build();
 
 		mockStatementFor("SELECT * FROM person", result);
 
@@ -287,13 +289,13 @@ void selectShouldEmitAllValues() {
 
 	@Test
 	void selectOneShouldFailWithException() {
-
 		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
 				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
 
-		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
-		MockResult result = resultBuilder.row(MockRow.builder().identified(0, Object.class, "Walter").build())
-				.row(MockRow.builder().identified(0, Object.class, "White").build()).build();
+		MockResult result = MockResult.builder().row(
+					MockRow.builder().identified(0, Object.class, "Walter").metadata(metadata).build(),
+					MockRow.builder().identified(0, Object.class, "White").metadata(metadata).build()
+				).build();
 
 		mockStatementFor("SELECT * FROM person", result);
 
@@ -307,7 +309,6 @@ void selectOneShouldFailWithException() {
 
 	@Test
 	void shouldApplyExecuteFunction() {
-
 		Statement statement = mockStatement();
 		MockResult result = mockSingleColumnResult(
 				MockRow.builder().identified(0, Object.class, "Walter"));
@@ -323,7 +324,6 @@ void shouldApplyExecuteFunction() {
 
 	@Test
 	void shouldApplyPreparedOperation() {
-
 		MockResult result = mockSingleColumnResult(
 				MockRow.builder().identified(0, Object.class, "Walter"));
 		Statement statement = mockStatementFor("SELECT * FROM person", result);
@@ -354,10 +354,7 @@ public void bindTo(BindTarget target) {
 
 	@Test
 	void shouldApplyStatementFilterFunctions() {
-
-		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
-				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
-		MockResult result = MockResult.builder().rowMetadata(metadata).build();
+		MockResult result = MockResult.builder().build();
 
 		Statement statement = mockStatement(result);
 
@@ -378,7 +375,6 @@ void shouldApplyStatementFilterFunctions() {
 
 	@Test
 	void shouldApplySimpleStatementFilterFunctions() {
-
 		MockResult result = mockSingleColumnEmptyResult();
 
 		Statement statement = mockStatement(result);
@@ -410,7 +406,6 @@ private Statement mockStatementFor(String sql) {
 	}
 
 	private Statement mockStatementFor(@Nullable String sql, @Nullable Result result) {
-
 		Statement statement = mock(Statement.class);
 		when(connection.createStatement(sql == null ? anyString() : eq(sql))).thenReturn(
 				statement);
@@ -432,13 +427,11 @@ private MockResult mockSingleColumnEmptyResult() {
 	 * row is provided.
 	 */
 	private MockResult mockSingleColumnResult(@Nullable MockRow.Builder row) {
-
-		MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
-				MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
-
-		MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
+		MockResult.Builder resultBuilder = MockResult.builder();
 		if (row != null) {
-			resultBuilder = resultBuilder.row(row.build());
+			MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(
+					MockColumnMetadata.builder().name("name").javaType(String.class).build()).build();
+			resultBuilder = resultBuilder.row(row.metadata(metadata).build());
 		}
 		return resultBuilder.build();
 	}

From 42d114534bfdb42c41c42d9e65f3148ccf1aff62 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Fri, 18 Feb 2022 00:50:00 +0100
Subject: [PATCH 721/735] Polish BeanDefinitionRegistrar

---
 .../config/BeanDefinitionRegistrar.java       | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java
index 149ddcc906af..ce38e3292cda 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/config/BeanDefinitionRegistrar.java
@@ -40,7 +40,9 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.MethodIntrospector;
 import org.springframework.core.ResolvableType;
+import org.springframework.core.log.LogMessage;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
@@ -66,8 +68,6 @@ public final class BeanDefinitionRegistrar {
 	@Nullable
 	private final ResolvableType beanType;
 
-	private final BeanDefinitionBuilder builder;
-
 	private final List<Consumer<RootBeanDefinition>> customizers;
 
 	@Nullable
@@ -81,11 +81,9 @@ private BeanDefinitionRegistrar(@Nullable String beanName, Class<?> beanClass, @
 		this.beanName = beanName;
 		this.beanClass = beanClass;
 		this.beanType = beanType;
-		this.builder = BeanDefinitionBuilder.rootBeanDefinition(beanClass);
 		this.customizers = new ArrayList<>();
 	}
 
-
 	/**
 	 * Initialize the registration of a bean with the specified name and type.
 	 * @param beanName the name of the bean
@@ -124,16 +122,6 @@ public static BeanDefinitionRegistrar inner(Class<?> beanType) {
 		return new BeanDefinitionRegistrar(null, beanType, null);
 	}
 
-	/**
-	 * Customize the {@link RootBeanDefinition} using the specified consumer.
-	 * @param bd a consumer for the bean definition
-	 * @return {@code this}, to facilitate method chaining
-	 */
-	public BeanDefinitionRegistrar customize(ThrowableConsumer<RootBeanDefinition> bd) {
-		this.customizers.add(bd);
-		return this;
-	}
-
 	/**
 	 * Specify the factory method to use to instantiate the bean.
 	 * @param declaredType the {@link Method#getDeclaringClass() declared type}
@@ -177,19 +165,25 @@ public BeanDefinitionRegistrar instanceSupplier(ThrowableSupplier<?> instanceSup
 		return customize(beanDefinition -> beanDefinition.setInstanceSupplier(instanceSupplier));
 	}
 
+	/**
+	 * Customize the {@link RootBeanDefinition} using the specified consumer.
+	 * @param bd a consumer for the bean definition
+	 * @return {@code this}, to facilitate method chaining
+	 */
+	public BeanDefinitionRegistrar customize(ThrowableConsumer<RootBeanDefinition> bd) {
+		this.customizers.add(bd);
+		return this;
+	}
+
 	/**
 	 * Register the {@link RootBeanDefinition} defined by this instance to
 	 * the specified bean factory.
 	 * @param beanFactory the bean factory to use
 	 */
 	public void register(DefaultListableBeanFactory beanFactory) {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Register bean definition with name '" + this.beanName + "'");
-		}
 		BeanDefinition beanDefinition = toBeanDefinition();
-		if (this.beanName == null) {
-			throw new IllegalStateException("Bean name not set. Could not register " + beanDefinition);
-		}
+		Assert.state(this.beanName != null, () -> "Bean name not set. Could not register " + beanDefinition);
+		logger.debug(LogMessage.format("Register bean definition with name '%s'", this.beanName));
 		beanFactory.registerBeanDefinition(this.beanName, beanDefinition);
 	}
 
@@ -208,7 +202,8 @@ public RootBeanDefinition toBeanDefinition() {
 	}
 
 	private RootBeanDefinition createBeanDefinition() {
-		RootBeanDefinition bd = (RootBeanDefinition) this.builder.getBeanDefinition();
+		RootBeanDefinition bd = (RootBeanDefinition) BeanDefinitionBuilder
+				.rootBeanDefinition(this.beanClass).getBeanDefinition();
 		if (this.beanType != null) {
 			bd.setTargetType(this.beanType);
 		}
@@ -259,6 +254,7 @@ private static String toCommaSeparatedNames(Class<?>... parameterTypes) {
 		return Arrays.stream(parameterTypes).map(Class::getName).collect(Collectors.joining(", "));
 	}
 
+
 	/**
 	 * Callback interface used by instance suppliers that need to resolve
 	 * dependencies for the {@link Executable} used to create the instance
@@ -276,9 +272,9 @@ private BeanInstanceContext(String beanName, Class<?> beanType) {
 		}
 
 		/**
-		 * Return a bean instance using the specified {@code factory}.
+		 * Return the bean instance using the {@code factory}.
 		 * @param beanFactory the bean factory to use
-		 * @param factory a function that returns a bean instance based on
+		 * @param factory a function that returns the bean instance based on
 		 * the resolved attributes required by its instance creator
 		 * @param <T> the type of the bean
 		 * @return the bean instance
@@ -321,9 +317,7 @@ public InjectedElementResolver method(String name, Class<?>... parameterTypes) {
 
 		private Field getField(String fieldName, Class<?> fieldType) {
 			Field field = ReflectionUtils.findField(this.beanType, fieldName, fieldType);
-			if (field == null) {
-				throw new IllegalArgumentException("No field '" + fieldName + "' with type " + fieldType.getName() + " found on " + this.beanType);
-			}
+			Assert.notNull(field, () -> "No field '" + fieldName + "' with type " + fieldType.getName() + " found on " + this.beanType);
 			return field;
 		}
 

From c5c926726dc46f5135645d79ddc12c4027e1d061 Mon Sep 17 00:00:00 2001
From: "a.yazychyan" <a.yazychyan@tinkoff.ru>
Date: Mon, 7 Feb 2022 20:51:32 +0300
Subject: [PATCH 722/735] Use enhanced switch expressions where feasible

Closes gh-28014
---
 .../aspectj/annotation/AspectMetadata.java    | 18 ++++----
 ...ntiationModelAwarePointcutAdvisorImpl.java | 15 +++----
 .../ReflectiveAspectJAdvisorFactory.java      | 34 +++++++--------
 .../AbstractPropertyAccessorBenchmark.java    | 20 ++++-----
 .../mail/javamail/MimeMessageHelper.java      | 20 ++++-----
 .../CachingConfigurationSelector.java         | 12 ++----
 .../context/annotation/TypeFilterUtils.java   | 28 +++++--------
 .../standard/DateTimeFormatterRegistrar.java  | 10 ++---
 .../AsyncConfigurationSelector.java           | 16 +++----
 .../org/springframework/asm/TypePath.java     | 23 ++++------
 .../core/annotation/AnnotationsScanner.java   | 41 +++++++-----------
 .../core/env/ProfilesParser.java              | 23 +++++-----
 .../core/io/buffer/DataBufferUtils.java       | 13 +++---
 .../ListenableFutureCallbackRegistry.java     | 28 ++++---------
 .../expression/spel/SpelMessage.java          |  6 +--
 .../expression/spel/ast/OpDivide.java         | 21 +++-------
 .../expression/spel/ast/OpMinus.java          | 42 ++++++-------------
 .../expression/spel/ast/OpModulus.java        | 21 +++-------
 .../expression/spel/ast/OpMultiply.java       | 21 +++-------
 .../expression/spel/ast/OpPlus.java           | 21 +++-------
 .../expression/spel/ast/Selection.java        | 12 +++---
 .../apache/commons/logging/LogAdapter.java    | 29 ++++++-------
 .../MarshallingMessageConverter.java          | 13 +++---
 .../DefaultSubscriptionRegistryBenchmark.java | 15 +++----
 .../RSocketFrameTypeMessageCondition.java     | 24 +++++------
 .../orm/jpa/SharedEntityManagerCreator.java   |  9 ++--
 .../vendor/EclipseLinkJpaVendorAdapter.java   | 26 ++++++------
 .../jpa/vendor/HibernateJpaVendorAdapter.java | 28 ++++++-------
 .../connection/R2dbcTransactionManager.java   | 18 ++++----
 .../mock/web/MockPageContext.java             | 38 +++++------------
 .../HeuristicCompletionException.java         | 16 +++----
 .../jta/SpringJtaSynchronizationAdapter.java  | 11 ++---
 .../http/codec/json/Jackson2Tokenizer.java    | 16 ++-----
 .../client/DefaultResponseErrorHandler.java   |  9 ++--
 .../testfixture/servlet/MockPageContext.java  | 38 +++++------------
 .../ViewControllerBeanDefinitionParser.java   | 19 ++++-----
 .../ConcurrentWebSocketSessionDecorator.java  | 11 ++---
 .../session/AbstractSockJsSession.java        | 19 ++++-----
 38 files changed, 291 insertions(+), 493 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
index 048cc603ccc1..64bb2fe1d0a8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
@@ -101,24 +101,22 @@ public AspectMetadata(Class<?> aspectClass, String aspectName) {
 		this.ajType = ajType;
 
 		switch (this.ajType.getPerClause().getKind()) {
-			case SINGLETON:
+			case SINGLETON -> {
 				this.perClausePointcut = Pointcut.TRUE;
-				return;
-			case PERTARGET:
-			case PERTHIS:
+			}
+			case PERTARGET, PERTHIS -> {
 				AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
 				ajexp.setLocation(aspectClass.getName());
 				ajexp.setExpression(findPerClause(aspectClass));
 				ajexp.setPointcutDeclarationScope(aspectClass);
 				this.perClausePointcut = ajexp;
-				return;
-			case PERTYPEWITHIN:
+			}
+			case PERTYPEWITHIN -> {
 				// Works with a type pattern
 				this.perClausePointcut = new ComposablePointcut(new TypePatternClassFilter(findPerClause(aspectClass)));
-				return;
-			default:
-				throw new AopConfigException(
-						"PerClause " + ajType.getPerClause().getKind() + " not supported by Spring AOP for " + aspectClass);
+			}
+			default -> throw new AopConfigException(
+					"PerClause " + ajType.getPerClause().getKind() + " not supported by Spring AOP for " + aspectClass);
 		}
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
index 7d89175c8c2d..ea5705cf8e4b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -220,21 +220,18 @@ private void determineAdviceType() {
 		}
 		else {
 			switch (aspectJAnnotation.getAnnotationType()) {
-				case AtPointcut:
-				case AtAround:
+				case AtPointcut, AtAround -> {
 					this.isBeforeAdvice = false;
 					this.isAfterAdvice = false;
-					break;
-				case AtBefore:
+				}
+				case AtBefore -> {
 					this.isBeforeAdvice = true;
 					this.isAfterAdvice = false;
-					break;
-				case AtAfter:
-				case AtAfterReturning:
-				case AtAfterThrowing:
+				}
+				case AtAfter, AtAfterReturning, AtAfterThrowing -> {
 					this.isBeforeAdvice = false;
 					this.isAfterAdvice = true;
-					break;
+				}
 			}
 		}
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
index c1c10c946ed6..f24e2ac7a0a3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
@@ -261,42 +261,36 @@ public Advice getAdvice(Method candidateAdviceMethod, AspectJExpressionPointcut
 		AbstractAspectJAdvice springAdvice;
 
 		switch (aspectJAnnotation.getAnnotationType()) {
-			case AtPointcut:
+			case AtPointcut -> {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Processing pointcut '" + candidateAdviceMethod.getName() + "'");
 				}
 				return null;
-			case AtAround:
-				springAdvice = new AspectJAroundAdvice(
-						candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
-				break;
-			case AtBefore:
-				springAdvice = new AspectJMethodBeforeAdvice(
-						candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
-				break;
-			case AtAfter:
-				springAdvice = new AspectJAfterAdvice(
-						candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
-				break;
-			case AtAfterReturning:
+			}
+			case AtAround -> springAdvice = new AspectJAroundAdvice(
+					candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
+			case AtBefore -> springAdvice = new AspectJMethodBeforeAdvice(
+					candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
+			case AtAfter -> springAdvice = new AspectJAfterAdvice(
+					candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
+			case AtAfterReturning -> {
 				springAdvice = new AspectJAfterReturningAdvice(
 						candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
 				AfterReturning afterReturningAnnotation = (AfterReturning) aspectJAnnotation.getAnnotation();
 				if (StringUtils.hasText(afterReturningAnnotation.returning())) {
 					springAdvice.setReturningName(afterReturningAnnotation.returning());
 				}
-				break;
-			case AtAfterThrowing:
+			}
+			case AtAfterThrowing -> {
 				springAdvice = new AspectJAfterThrowingAdvice(
 						candidateAdviceMethod, expressionPointcut, aspectInstanceFactory);
 				AfterThrowing afterThrowingAnnotation = (AfterThrowing) aspectJAnnotation.getAnnotation();
 				if (StringUtils.hasText(afterThrowingAnnotation.throwing())) {
 					springAdvice.setThrowingName(afterThrowingAnnotation.throwing());
 				}
-				break;
-			default:
-				throw new UnsupportedOperationException(
-						"Unsupported advice type on method: " + candidateAdviceMethod);
+			}
+			default -> throw new UnsupportedOperationException(
+					"Unsupported advice type on method: " + candidateAdviceMethod);
 		}
 
 		// Now to configure the advice...
diff --git a/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java b/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java
index d407318f103c..d71837d6b75b 100644
--- a/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java
+++ b/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java
@@ -61,18 +61,14 @@ public void setup() {
 				this.propertyAccessor = new BeanWrapperImpl(this.target);
 			}
 			switch (this.customEditor) {
-				case "stringTrimmer":
-					this.propertyAccessor.registerCustomEditor(String.class, new StringTrimmerEditor(false));
-					break;
-				case "numberOnPath":
-					this.propertyAccessor.registerCustomEditor(int.class, "array.somePath", new CustomNumberEditor(Integer.class, false));
-					break;
-				case "numberOnNestedPath":
-					this.propertyAccessor.registerCustomEditor(int.class, "array[0].somePath", new CustomNumberEditor(Integer.class, false));
-					break;
-				case "numberOnType":
-					this.propertyAccessor.registerCustomEditor(int.class, new CustomNumberEditor(Integer.class, false));
-					break;
+				case "stringTrimmer" -> this.propertyAccessor.registerCustomEditor(String.class,
+						new StringTrimmerEditor(false));
+				case "numberOnPath" -> this.propertyAccessor.registerCustomEditor(int.class, "array.somePath",
+						new CustomNumberEditor(Integer.class, false));
+				case "numberOnNestedPath" -> this.propertyAccessor.registerCustomEditor(int.class, "array[0].somePath",
+						new CustomNumberEditor(Integer.class, false));
+				case "numberOnType" -> this.propertyAccessor.registerCustomEditor(int.class,
+						new CustomNumberEditor(Integer.class, false));
 			}
 
 		}
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index 3d7bf4c7b0dc..23eaee1dd207 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -333,20 +333,18 @@ public final MimeMessage getMimeMessage() {
 	 */
 	protected void createMimeMultiparts(MimeMessage mimeMessage, int multipartMode) throws MessagingException {
 		switch (multipartMode) {
-			case MULTIPART_MODE_NO:
-				setMimeMultiparts(null, null);
-				break;
-			case MULTIPART_MODE_MIXED:
+			case MULTIPART_MODE_NO -> setMimeMultiparts(null, null);
+			case MULTIPART_MODE_MIXED -> {
 				MimeMultipart mixedMultipart = new MimeMultipart(MULTIPART_SUBTYPE_MIXED);
 				mimeMessage.setContent(mixedMultipart);
 				setMimeMultiparts(mixedMultipart, mixedMultipart);
-				break;
-			case MULTIPART_MODE_RELATED:
+			}
+			case MULTIPART_MODE_RELATED -> {
 				MimeMultipart relatedMultipart = new MimeMultipart(MULTIPART_SUBTYPE_RELATED);
 				mimeMessage.setContent(relatedMultipart);
 				setMimeMultiparts(relatedMultipart, relatedMultipart);
-				break;
-			case MULTIPART_MODE_MIXED_RELATED:
+			}
+			case MULTIPART_MODE_MIXED_RELATED -> {
 				MimeMultipart rootMixedMultipart = new MimeMultipart(MULTIPART_SUBTYPE_MIXED);
 				mimeMessage.setContent(rootMixedMultipart);
 				MimeMultipart nestedRelatedMultipart = new MimeMultipart(MULTIPART_SUBTYPE_RELATED);
@@ -354,9 +352,9 @@ protected void createMimeMultiparts(MimeMessage mimeMessage, int multipartMode)
 				relatedBodyPart.setContent(nestedRelatedMultipart);
 				rootMixedMultipart.addBodyPart(relatedBodyPart);
 				setMimeMultiparts(rootMixedMultipart, nestedRelatedMultipart);
-				break;
-			default:
-				throw new IllegalArgumentException("Only multipart modes MIXED_RELATED, RELATED and NO supported");
+			}
+			default -> throw new IllegalArgumentException(
+					"Only multipart modes MIXED_RELATED, RELATED and NO supported");
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
index 3c55c95d5992..1af81080ebb8 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
@@ -68,14 +68,10 @@ public class CachingConfigurationSelector extends AdviceModeImportSelector<Enabl
 	 */
 	@Override
 	public String[] selectImports(AdviceMode adviceMode) {
-		switch (adviceMode) {
-			case PROXY:
-				return getProxyImports();
-			case ASPECTJ:
-				return getAspectJImports();
-			default:
-				return null;
-		}
+		return switch (adviceMode) {
+			case PROXY -> getProxyImports();
+			case ASPECTJ -> getAspectJImports();
+		};
 	}
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
index 340c232f60f1..4f02a7ebb129 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
@@ -78,38 +78,32 @@ public static List<TypeFilter> createTypeFiltersFor(AnnotationAttributes filterA
 
 		for (Class<?> filterClass : filterAttributes.getClassArray("classes")) {
 			switch (filterType) {
-				case ANNOTATION:
+				case ANNOTATION -> {
 					Assert.isAssignable(Annotation.class, filterClass,
 							"@ComponentScan ANNOTATION type filter requires an annotation type");
 					@SuppressWarnings("unchecked")
 					Class<Annotation> annotationType = (Class<Annotation>) filterClass;
 					typeFilters.add(new AnnotationTypeFilter(annotationType));
-					break;
-				case ASSIGNABLE_TYPE:
-					typeFilters.add(new AssignableTypeFilter(filterClass));
-					break;
-				case CUSTOM:
+				}
+				case ASSIGNABLE_TYPE -> typeFilters.add(new AssignableTypeFilter(filterClass));
+				case CUSTOM -> {
 					Assert.isAssignable(TypeFilter.class, filterClass,
 							"@ComponentScan CUSTOM type filter requires a TypeFilter implementation");
 					TypeFilter filter = ParserStrategyUtils.instantiateClass(filterClass, TypeFilter.class,
 							environment, resourceLoader, registry);
 					typeFilters.add(filter);
-					break;
-				default:
-					throw new IllegalArgumentException("Filter type not supported with Class value: " + filterType);
+				}
+				default -> throw new IllegalArgumentException(
+						"Filter type not supported with Class value: " + filterType);
 			}
 		}
 
 		for (String expression : filterAttributes.getStringArray("pattern")) {
 			switch (filterType) {
-				case ASPECTJ:
-					typeFilters.add(new AspectJTypeFilter(expression, resourceLoader.getClassLoader()));
-					break;
-				case REGEX:
-					typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
-					break;
-				default:
-					throw new IllegalArgumentException("Filter type not supported with String pattern: " + filterType);
+				case ASPECTJ -> typeFilters.add(new AspectJTypeFilter(expression, resourceLoader.getClassLoader()));
+				case REGEX -> typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
+				default -> throw new IllegalArgumentException(
+						"Filter type not supported with String pattern: " + filterType);
 			}
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
index ec4964b0e149..0d35e95cd4ca 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
@@ -209,11 +209,11 @@ private DateTimeFormatter getFormatter(Type type) {
 	}
 
 	private DateTimeFormatter getFallbackFormatter(Type type) {
-		switch (type) {
-			case DATE: return DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT);
-			case TIME: return DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT);
-			default: return DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT);
-		}
+		return switch (type) {
+			case DATE -> DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT);
+			case TIME -> DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT);
+			case DATE_TIME -> DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT);
+		};
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
index 76c338090feb..0acc985d3ea0 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
@@ -18,7 +18,7 @@
 
 import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AdviceModeImportSelector;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.NonNull;
 
 /**
  * Selects which implementation of {@link AbstractAsyncConfiguration} should
@@ -43,16 +43,12 @@ public class AsyncConfigurationSelector extends AdviceModeImportSelector<EnableA
 	 * respectively.
 	 */
 	@Override
-	@Nullable
+	@NonNull
 	public String[] selectImports(AdviceMode adviceMode) {
-		switch (adviceMode) {
-			case PROXY:
-				return new String[] {ProxyAsyncConfiguration.class.getName()};
-			case ASPECTJ:
-				return new String[] {ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME};
-			default:
-				return null;
-		}
+		return switch (adviceMode) {
+			case PROXY -> new String[]{ProxyAsyncConfiguration.class.getName()};
+			case ASPECTJ -> new String[]{ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME};
+		};
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/asm/TypePath.java b/spring-core/src/main/java/org/springframework/asm/TypePath.java
index b7cf845e7a4d..be95d3a55fac 100644
--- a/spring-core/src/main/java/org/springframework/asm/TypePath.java
+++ b/spring-core/src/main/java/org/springframework/asm/TypePath.java
@@ -163,22 +163,13 @@ public String toString() {
     int length = getLength();
     StringBuilder result = new StringBuilder(length * 2);
     for (int i = 0; i < length; ++i) {
-      switch (getStep(i)) {
-        case ARRAY_ELEMENT:
-          result.append('[');
-          break;
-        case INNER_TYPE:
-          result.append('.');
-          break;
-        case WILDCARD_BOUND:
-          result.append('*');
-          break;
-        case TYPE_ARGUMENT:
-          result.append(getStepArgument(i)).append(';');
-          break;
-        default:
-          throw new AssertionError();
-      }
+		switch (getStep(i)) {
+			case ARRAY_ELEMENT -> result.append('[');
+			case INNER_TYPE -> result.append('.');
+			case WILDCARD_BOUND -> result.append('*');
+			case TYPE_ARGUMENT -> result.append(getStepArgument(i)).append(';');
+			default -> throw new AssertionError();
+		}
     }
     return result.toString();
   }
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
index 19d520c3c14a..88e65703a0e4 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
@@ -95,19 +95,13 @@ private static <C, R> R process(C context, AnnotatedElement source,
 	private static <C, R> R processClass(C context, Class<?> source,
 			SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor) {
 
-		switch (searchStrategy) {
-			case DIRECT:
-				return processElement(context, source, processor);
-			case INHERITED_ANNOTATIONS:
-				return processClassInheritedAnnotations(context, source, searchStrategy, processor);
-			case SUPERCLASS:
-				return processClassHierarchy(context, source, processor, false, false);
-			case TYPE_HIERARCHY:
-				return processClassHierarchy(context, source, processor, true, false);
-			case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES:
-				return processClassHierarchy(context, source, processor, true, true);
-		}
-		throw new IllegalStateException("Unsupported search strategy " + searchStrategy);
+		return switch (searchStrategy) {
+			case DIRECT -> processElement(context, source, processor);
+			case INHERITED_ANNOTATIONS -> processClassInheritedAnnotations(context, source, searchStrategy, processor);
+			case SUPERCLASS -> processClassHierarchy(context, source, processor, false, false);
+			case TYPE_HIERARCHY -> processClassHierarchy(context, source, processor, true, false);
+			case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES -> processClassHierarchy(context, source, processor, true, true);
+		};
 	}
 
 	@Nullable
@@ -238,19 +232,14 @@ private static <C, R> R processClassHierarchy(C context, int[] aggregateIndex, C
 	private static <C, R> R processMethod(C context, Method source,
 			SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor) {
 
-		switch (searchStrategy) {
-			case DIRECT:
-			case INHERITED_ANNOTATIONS:
-				return processMethodInheritedAnnotations(context, source, processor);
-			case SUPERCLASS:
-				return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(),
-						processor, source, false);
-			case TYPE_HIERARCHY:
-			case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES:
-				return processMethodHierarchy(context, new int[] {0}, source.getDeclaringClass(),
-						processor, source, true);
-		}
-		throw new IllegalStateException("Unsupported search strategy " + searchStrategy);
+		return switch (searchStrategy) {
+			case DIRECT, INHERITED_ANNOTATIONS -> processMethodInheritedAnnotations(context, source, processor);
+			case SUPERCLASS -> processMethodHierarchy(context, new int[]{0}, source.getDeclaringClass(),
+					processor, source, false);
+			case TYPE_HIERARCHY, TYPE_HIERARCHY_AND_ENCLOSING_CLASSES -> processMethodHierarchy(context, new int[]{0},
+					source.getDeclaringClass(),
+					processor, source, true);
+		};
 	}
 
 	@Nullable
diff --git a/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java b/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java
index 5d4dd0c86b41..b8f030dd52a4 100644
--- a/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java
+++ b/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java
@@ -70,25 +70,23 @@ private static Profiles parseTokens(String expression, StringTokenizer tokens, C
 				continue;
 			}
 			switch (token) {
-				case "(":
+				case "(" -> {
 					Profiles contents = parseTokens(expression, tokens, Context.BRACKET);
 					if (context == Context.INVERT) {
 						return contents;
 					}
 					elements.add(contents);
-					break;
-				case "&":
+				}
+				case "&" -> {
 					assertWellFormed(expression, operator == null || operator == Operator.AND);
 					operator = Operator.AND;
-					break;
-				case "|":
+				}
+				case "|" -> {
 					assertWellFormed(expression, operator == null || operator == Operator.OR);
 					operator = Operator.OR;
-					break;
-				case "!":
-					elements.add(not(parseTokens(expression, tokens, Context.INVERT)));
-					break;
-				case ")":
+				}
+				case "!" -> elements.add(not(parseTokens(expression, tokens, Context.INVERT)));
+				case ")" -> {
 					Profiles merged = merge(expression, elements, operator);
 					if (context == Context.BRACKET) {
 						return merged;
@@ -96,13 +94,14 @@ private static Profiles parseTokens(String expression, StringTokenizer tokens, C
 					elements.clear();
 					elements.add(merged);
 					operator = null;
-					break;
-				default:
+				}
+				default -> {
 					Profiles value = equals(token);
 					if (context == Context.INVERT) {
 						return value;
 					}
 					elements.add(value);
+				}
 			}
 		}
 		return merge(expression, elements, operator);
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
index d97a59fe45e0..73f4579c1a84 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
@@ -608,14 +608,11 @@ public static Matcher matcher(byte[]... delimiters) {
 
 	private static NestedMatcher createMatcher(byte[] delimiter) {
 		Assert.isTrue(delimiter.length > 0, "Delimiter must not be empty");
-		switch (delimiter.length) {
-			case 1:
-				return (delimiter[0] == 10 ? SingleByteMatcher.NEWLINE_MATCHER : new SingleByteMatcher(delimiter));
-			case 2:
-				return new TwoByteMatcher(delimiter);
-			default:
-				return new KnuthMorrisPrattMatcher(delimiter);
-		}
+		return switch (delimiter.length) {
+			case 1 -> (delimiter[0] == 10 ? SingleByteMatcher.NEWLINE_MATCHER : new SingleByteMatcher(delimiter));
+			case 2 -> new TwoByteMatcher(delimiter);
+			default -> new KnuthMorrisPrattMatcher(delimiter);
+		};
 	}
 
 
diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
index d3be92bbcd56..343e81c07164 100644
--- a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
+++ b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
@@ -56,16 +56,12 @@ public void addCallback(ListenableFutureCallback<? super T> callback) {
 		Assert.notNull(callback, "'callback' must not be null");
 		synchronized (this.mutex) {
 			switch (this.state) {
-				case NEW:
+				case NEW -> {
 					this.successCallbacks.add(callback);
 					this.failureCallbacks.add(callback);
-					break;
-				case SUCCESS:
-					notifySuccess(callback);
-					break;
-				case FAILURE:
-					notifyFailure(callback);
-					break;
+				}
+				case SUCCESS -> notifySuccess(callback);
+				case FAILURE -> notifyFailure(callback);
 			}
 		}
 	}
@@ -99,12 +95,8 @@ public void addSuccessCallback(SuccessCallback<? super T> callback) {
 		Assert.notNull(callback, "'callback' must not be null");
 		synchronized (this.mutex) {
 			switch (this.state) {
-				case NEW:
-					this.successCallbacks.add(callback);
-					break;
-				case SUCCESS:
-					notifySuccess(callback);
-					break;
+				case NEW -> this.successCallbacks.add(callback);
+				case SUCCESS -> notifySuccess(callback);
 			}
 		}
 	}
@@ -118,12 +110,8 @@ public void addFailureCallback(FailureCallback callback) {
 		Assert.notNull(callback, "'callback' must not be null");
 		synchronized (this.mutex) {
 			switch (this.state) {
-				case NEW:
-					this.failureCallbacks.add(callback);
-					break;
-				case FAILURE:
-					notifyFailure(callback);
-					break;
+				case NEW -> this.failureCallbacks.add(callback);
+				case FAILURE -> notifyFailure(callback);
 			}
 		}
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
index b8f5f92d0554..381a67ae3361 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
@@ -287,10 +287,8 @@ public enum SpelMessage {
 	public String formatMessage(Object... inserts) {
 		StringBuilder formattedMessage = new StringBuilder();
 		formattedMessage.append("EL").append(this.code);
-		switch (this.kind) {
-			case ERROR:
-				formattedMessage.append('E');
-				break;
+		if (this.kind == Kind.ERROR) {
+			formattedMessage.append('E');
 		}
 		formattedMessage.append(": ");
 		formattedMessage.append(MessageFormat.format(this.message, inserts));
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
index f555d75f3209..7ade8deaee24 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
@@ -115,21 +115,12 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) {
 			cf.exitCompilationScope();
 			CodeFlow.insertNumericUnboxOrPrimitiveTypeCoercion(mv, rightDesc, targetDesc);
 			switch (targetDesc) {
-				case 'I':
-					mv.visitInsn(IDIV);
-					break;
-				case 'J':
-					mv.visitInsn(LDIV);
-					break;
-				case 'F':
-					mv.visitInsn(FDIV);
-					break;
-				case 'D':
-					mv.visitInsn(DDIV);
-					break;
-				default:
-					throw new IllegalStateException(
-							"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
+				case 'I' -> mv.visitInsn(IDIV);
+				case 'J' -> mv.visitInsn(LDIV);
+				case 'F' -> mv.visitInsn(FDIV);
+				case 'D' -> mv.visitInsn(DDIV);
+				default -> throw new IllegalStateException(
+						"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
 			}
 		}
 		cf.pushDescriptor(this.exitTypeDescriptor);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
index ddbc9c7d6f67..9d69f0a6fa0c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
@@ -184,40 +184,22 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) {
 			cf.exitCompilationScope();
 			CodeFlow.insertNumericUnboxOrPrimitiveTypeCoercion(mv, rightDesc, targetDesc);
 			switch (targetDesc) {
-				case 'I':
-					mv.visitInsn(ISUB);
-					break;
-				case 'J':
-					mv.visitInsn(LSUB);
-					break;
-				case 'F':
-					mv.visitInsn(FSUB);
-					break;
-				case 'D':
-					mv.visitInsn(DSUB);
-					break;
-				default:
-					throw new IllegalStateException(
-							"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
+				case 'I' -> mv.visitInsn(ISUB);
+				case 'J' -> mv.visitInsn(LSUB);
+				case 'F' -> mv.visitInsn(FSUB);
+				case 'D' -> mv.visitInsn(DSUB);
+				default -> throw new IllegalStateException(
+						"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
 			}
 		}
 		else {
 			switch (targetDesc) {
-				case 'I':
-					mv.visitInsn(INEG);
-					break;
-				case 'J':
-					mv.visitInsn(LNEG);
-					break;
-				case 'F':
-					mv.visitInsn(FNEG);
-					break;
-				case 'D':
-					mv.visitInsn(DNEG);
-					break;
-				default:
-					throw new IllegalStateException(
-							"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
+				case 'I' -> mv.visitInsn(INEG);
+				case 'J' -> mv.visitInsn(LNEG);
+				case 'F' -> mv.visitInsn(FNEG);
+				case 'D' -> mv.visitInsn(DNEG);
+				default -> throw new IllegalStateException(
+						"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
 			}
 		}
 		cf.pushDescriptor(this.exitTypeDescriptor);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
index 51385a3603ea..3d229cedd68a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
@@ -112,21 +112,12 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) {
 			cf.exitCompilationScope();
 			CodeFlow.insertNumericUnboxOrPrimitiveTypeCoercion(mv, rightDesc, targetDesc);
 			switch (targetDesc) {
-				case 'I':
-					mv.visitInsn(IREM);
-					break;
-				case 'J':
-					mv.visitInsn(LREM);
-					break;
-				case 'F':
-					mv.visitInsn(FREM);
-					break;
-				case 'D':
-					mv.visitInsn(DREM);
-					break;
-				default:
-					throw new IllegalStateException(
-							"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
+				case 'I' -> mv.visitInsn(IREM);
+				case 'J' -> mv.visitInsn(LREM);
+				case 'F' -> mv.visitInsn(FREM);
+				case 'D' -> mv.visitInsn(DREM);
+				default -> throw new IllegalStateException(
+						"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
 			}
 		}
 		cf.pushDescriptor(this.exitTypeDescriptor);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
index 83c406e01d09..3db753c15a64 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
@@ -140,21 +140,12 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) {
 			cf.exitCompilationScope();
 			CodeFlow.insertNumericUnboxOrPrimitiveTypeCoercion(mv, rightDesc, targetDesc);
 			switch (targetDesc) {
-				case 'I':
-					mv.visitInsn(IMUL);
-					break;
-				case 'J':
-					mv.visitInsn(LMUL);
-					break;
-				case 'F':
-					mv.visitInsn(FMUL);
-					break;
-				case 'D':
-					mv.visitInsn(DMUL);
-					break;
-				default:
-					throw new IllegalStateException(
-							"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
+				case 'I' -> mv.visitInsn(IMUL);
+				case 'J' -> mv.visitInsn(LMUL);
+				case 'F' -> mv.visitInsn(FMUL);
+				case 'D' -> mv.visitInsn(DMUL);
+				default -> throw new IllegalStateException(
+						"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
 			}
 		}
 		cf.pushDescriptor(this.exitTypeDescriptor);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
index 098f96dca123..f4ff34235f72 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
@@ -226,21 +226,12 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) {
 				cf.exitCompilationScope();
 				CodeFlow.insertNumericUnboxOrPrimitiveTypeCoercion(mv, rightDesc, targetDesc);
 				switch (targetDesc) {
-					case 'I':
-						mv.visitInsn(IADD);
-						break;
-					case 'J':
-						mv.visitInsn(LADD);
-						break;
-					case 'F':
-						mv.visitInsn(FADD);
-						break;
-					case 'D':
-						mv.visitInsn(DADD);
-						break;
-					default:
-						throw new IllegalStateException(
-								"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
+					case 'I' -> mv.visitInsn(IADD);
+					case 'J' -> mv.visitInsn(LADD);
+					case 'F' -> mv.visitInsn(FADD);
+					case 'D' -> mv.visitInsn(DADD);
+					default -> throw new IllegalStateException(
+							"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
 				}
 			}
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
index d2034ef761b8..63da77012cde 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
@@ -209,12 +209,12 @@ public String toStringAST() {
 	}
 
 	private String prefix() {
-		switch (this.variant) {
-			case ALL:   return "?[";
-			case FIRST: return "^[";
-			case LAST:  return "$[";
-		}
-		return "";
+		return switch (this.variant) {
+			case ALL -> "?[";
+			case FIRST -> "^[";
+			case LAST -> "$[";
+			default -> "";
+		};
 	}
 
 }
diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
index 09ae22efe052..5ba97293f38c 100644
--- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
+++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
@@ -84,22 +84,19 @@ private LogAdapter() {
 	 * @param name the logger name
 	 */
 	public static Log createLog(String name) {
-		switch (logApi) {
-			case LOG4J:
-				return Log4jAdapter.createLog(name);
-			case SLF4J_LAL:
-				return Slf4jAdapter.createLocationAwareLog(name);
-			case SLF4J:
-				return Slf4jAdapter.createLog(name);
-			default:
-				// Defensively use lazy-initializing adapter class here as well since the
-				// java.logging module is not present by default on JDK 9. We are requiring
-				// its presence if neither Log4j nor SLF4J is available; however, in the
-				// case of Log4j or SLF4J, we are trying to prevent early initialization
-				// of the JavaUtilLog adapter - e.g. by a JVM in debug mode - when eagerly
-				// trying to parse the bytecode for all the cases of this switch clause.
-				return JavaUtilAdapter.createLog(name);
-		}
+		return switch (logApi) {
+			case LOG4J -> Log4jAdapter.createLog(name);
+			case SLF4J_LAL -> Slf4jAdapter.createLocationAwareLog(name);
+			case SLF4J -> Slf4jAdapter.createLog(name);
+			default ->
+					// Defensively use lazy-initializing adapter class here as well since the
+					// java.logging module is not present by default on JDK 9. We are requiring
+					// its presence if neither Log4j nor SLF4J is available; however, in the
+					// case of Log4j or SLF4J, we are trying to prevent early initialization
+					// of the JavaUtilLog adapter - e.g. by a JVM in debug mode - when eagerly
+					// trying to parse the bytecode for all the cases of this switch clause.
+					JavaUtilAdapter.createLog(name);
+		};
 	}
 
 	private static boolean isPresent(String className) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
index e8524239e9e4..a6cec5ce4ebc 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
@@ -155,14 +155,11 @@ public void afterPropertiesSet() {
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		Assert.state(this.marshaller != null, "No Marshaller set");
 		try {
-			switch (this.targetType) {
-				case TEXT:
-					return marshalToTextMessage(object, session, this.marshaller);
-				case BYTES:
-					return marshalToBytesMessage(object, session, this.marshaller);
-				default:
-					return marshalToMessage(object, session, this.marshaller, this.targetType);
-			}
+			return switch (this.targetType) {
+				case TEXT -> marshalToTextMessage(object, session, this.marshaller);
+				case BYTES -> marshalToBytesMessage(object, session, this.marshaller);
+				default -> marshalToMessage(object, session, this.marshaller, this.targetType);
+			};
 		}
 		catch (XmlMappingException | IOException ex) {
 			throw new MessageConversionException("Could not marshal [" + object + "]", ex);
diff --git a/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java b/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java
index d33412bbab47..c80415c6fbbd 100644
--- a/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java
+++ b/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java
@@ -145,18 +145,15 @@ public static class FindRequest {
 		@Setup(Level.Trial)
 		public void doSetup(ServerState serverState) {
 			switch (this.contention) {
-				case "noSubscribers":
+				case "noSubscribers" -> {
 					this.destination = "someDestination_withNoSubscribers_" + serverState.uniqueIdGenerator.incrementAndGet();
-					break;
-				case "sameDestination":
-					this.destination = serverState.destinationIds[0];
-					break;
-				case "none":
+				}
+				case "sameDestination" -> this.destination = serverState.destinationIds[0];
+				case "none" -> {
 					int uniqueNumber = serverState.uniqueIdGenerator.getAndIncrement();
 					this.destination = serverState.destinationIds[uniqueNumber % serverState.destinationIds.length];
-					break;
-				default:
-					throw new IllegalStateException();
+				}
+				default -> throw new IllegalStateException();
 			}
 		}
 	}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
index 12ab2ead21c2..fb09da86c146 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
@@ -192,20 +192,16 @@ public int compareTo(RSocketFrameTypeMessageCondition other, Message<?> message)
 	 * @since 5.2.2
 	 */
 	public static RSocketFrameTypeMessageCondition getCondition(int cardinalityIn, int cardinalityOut) {
-		switch (cardinalityIn) {
-			case 0:
-			case 1:
-				switch (cardinalityOut) {
-					case 0: return REQUEST_FNF_OR_RESPONSE_CONDITION;
-					case 1: return REQUEST_RESPONSE_CONDITION;
-					case 2: return REQUEST_STREAM_CONDITION;
-					default: throw new IllegalStateException("Invalid cardinality: " + cardinalityOut);
-				}
-			case 2:
-				return REQUEST_CHANNEL_CONDITION;
-			default:
-				throw new IllegalStateException("Invalid cardinality: " + cardinalityIn);
-		}
+		return switch (cardinalityIn) {
+			case 0, 1 -> switch (cardinalityOut) {
+				case 0 -> REQUEST_FNF_OR_RESPONSE_CONDITION;
+				case 1 -> REQUEST_RESPONSE_CONDITION;
+				case 2 -> REQUEST_STREAM_CONDITION;
+				default -> throw new IllegalStateException("Invalid cardinality: " + cardinalityOut);
+			};
+			case 2 -> REQUEST_CHANNEL_CONDITION;
+			default -> throw new IllegalStateException("Invalid cardinality: " + cardinalityIn);
+		};
 	}
 
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index 0fb6acc3bab5..977b71de1398 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -266,13 +266,14 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 					this.targetFactory, this.properties, this.synchronizedWithTransaction);
 
 			switch (method.getName()) {
-				case "getTargetEntityManager":
+				case "getTargetEntityManager" -> {
 					// Handle EntityManagerProxy interface.
 					if (target == null) {
 						throw new IllegalStateException("No transactional EntityManager available");
 					}
 					return target;
-				case "unwrap":
+				}
+				case "unwrap" -> {
 					Class<?> targetClass = (Class<?>) args[0];
 					if (targetClass == null) {
 						return (target != null ? target : proxy);
@@ -281,8 +282,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 					if (target == null) {
 						throw new IllegalStateException("No transactional EntityManager available");
 					}
-					// Still perform unwrap call on target EntityManager.
-					break;
+				}
+				// Still perform unwrap call on target EntityManager.
 			}
 
 			if (transactionRequiringMethods.contains(method.getName())) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
index b64258d9dbf0..2ad8daaff308 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
@@ -94,19 +94,19 @@ public Map<String, Object> getJpaPropertyMap() {
 	 */
 	@Nullable
 	protected String determineTargetDatabaseName(Database database) {
-		switch (database) {
-			case DB2: return TargetDatabase.DB2;
-			case DERBY: return TargetDatabase.Derby;
-			case HANA: return TargetDatabase.HANA;
-			case HSQL: return TargetDatabase.HSQL;
-			case INFORMIX: return TargetDatabase.Informix;
-			case MYSQL: return TargetDatabase.MySQL;
-			case ORACLE: return TargetDatabase.Oracle;
-			case POSTGRESQL: return TargetDatabase.PostgreSQL;
-			case SQL_SERVER: return TargetDatabase.SQLServer;
-			case SYBASE: return TargetDatabase.Sybase;
-			default: return null;
-		}
+		return switch (database) {
+			case DB2 -> TargetDatabase.DB2;
+			case DERBY -> TargetDatabase.Derby;
+			case HANA -> TargetDatabase.HANA;
+			case HSQL -> TargetDatabase.HSQL;
+			case INFORMIX -> TargetDatabase.Informix;
+			case MYSQL -> TargetDatabase.MySQL;
+			case ORACLE -> TargetDatabase.Oracle;
+			case POSTGRESQL -> TargetDatabase.PostgreSQL;
+			case SQL_SERVER -> TargetDatabase.SQLServer;
+			case SYBASE -> TargetDatabase.Sybase;
+			default -> null;
+		};
 	}
 
 	@Override
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index 67d86d87e0bb..041f23da5fb3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -169,20 +169,20 @@ private Map<String, Object> buildJpaPropertyMap(boolean connectionReleaseOnClose
 	 */
 	@Nullable
 	protected Class<?> determineDatabaseDialectClass(Database database) {
-		switch (database) {
-			case DB2: return DB2Dialect.class;
-			case DERBY: return DerbyTenSevenDialect.class;
-			case H2: return H2Dialect.class;
-			case HANA: return HANAColumnStoreDialect.class;
-			case HSQL: return HSQLDialect.class;
-			case INFORMIX: return Informix10Dialect.class;
-			case MYSQL: return MySQL57Dialect.class;
-			case ORACLE: return Oracle12cDialect.class;
-			case POSTGRESQL: return PostgreSQL95Dialect.class;
-			case SQL_SERVER: return SQLServer2012Dialect.class;
-			case SYBASE: return SybaseDialect.class;
-			default: return null;
-		}
+		return switch (database) {
+			case DB2 -> DB2Dialect.class;
+			case DERBY -> DerbyTenSevenDialect.class;
+			case H2 -> H2Dialect.class;
+			case HANA -> HANAColumnStoreDialect.class;
+			case HSQL -> HSQLDialect.class;
+			case INFORMIX -> Informix10Dialect.class;
+			case MYSQL -> MySQL57Dialect.class;
+			case ORACLE -> Oracle12cDialect.class;
+			case POSTGRESQL -> PostgreSQL95Dialect.class;
+			case SQL_SERVER -> SQLServer2012Dialect.class;
+			case SYBASE -> SybaseDialect.class;
+			default -> null;
+		};
 	}
 
 	@Override
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
index e22c7a1dac9f..fdce9d94e4e8 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
@@ -415,17 +415,13 @@ protected Mono<Void> prepareTransactionalConnection(
 	 */
 	@Nullable
 	protected IsolationLevel resolveIsolationLevel(int isolationLevel) {
-		switch (isolationLevel) {
-			case TransactionDefinition.ISOLATION_READ_COMMITTED:
-				return IsolationLevel.READ_COMMITTED;
-			case TransactionDefinition.ISOLATION_READ_UNCOMMITTED:
-				return IsolationLevel.READ_UNCOMMITTED;
-			case TransactionDefinition.ISOLATION_REPEATABLE_READ:
-				return IsolationLevel.REPEATABLE_READ;
-			case TransactionDefinition.ISOLATION_SERIALIZABLE:
-				return IsolationLevel.SERIALIZABLE;
-		}
-		return null;
+		return switch (isolationLevel) {
+			case TransactionDefinition.ISOLATION_READ_COMMITTED -> IsolationLevel.READ_COMMITTED;
+			case TransactionDefinition.ISOLATION_READ_UNCOMMITTED -> IsolationLevel.READ_UNCOMMITTED;
+			case TransactionDefinition.ISOLATION_REPEATABLE_READ -> IsolationLevel.REPEATABLE_READ;
+			case TransactionDefinition.ISOLATION_SERIALIZABLE -> IsolationLevel.SERIALIZABLE;
+			default -> null;
+		};
 	}
 
 	/**
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
index 9911449917c9..a5feb9e78215 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -154,20 +154,11 @@ public void setAttribute(String name, @Nullable Object value) {
 	public void setAttribute(String name, @Nullable Object value, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
-			case PAGE_SCOPE:
-				setAttribute(name, value);
-				break;
-			case REQUEST_SCOPE:
-				this.request.setAttribute(name, value);
-				break;
-			case SESSION_SCOPE:
-				this.request.getSession().setAttribute(name, value);
-				break;
-			case APPLICATION_SCOPE:
-				this.servletContext.setAttribute(name, value);
-				break;
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
+			case PAGE_SCOPE -> setAttribute(name, value);
+			case REQUEST_SCOPE -> this.request.setAttribute(name, value);
+			case SESSION_SCOPE -> this.request.getSession().setAttribute(name, value);
+			case APPLICATION_SCOPE -> this.servletContext.setAttribute(name, value);
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
 		}
 	}
 
@@ -226,20 +217,11 @@ public void removeAttribute(String name) {
 	public void removeAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
-			case PAGE_SCOPE:
-				this.attributes.remove(name);
-				break;
-			case REQUEST_SCOPE:
-				this.request.removeAttribute(name);
-				break;
-			case SESSION_SCOPE:
-				this.request.getSession().removeAttribute(name);
-				break;
-			case APPLICATION_SCOPE:
-				this.servletContext.removeAttribute(name);
-				break;
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
+			case PAGE_SCOPE -> this.attributes.remove(name);
+			case REQUEST_SCOPE -> this.request.removeAttribute(name);
+			case SESSION_SCOPE -> this.request.getSession().removeAttribute(name);
+			case APPLICATION_SCOPE -> this.servletContext.removeAttribute(name);
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
index c5b6b71f1853..1d661868df2c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
@@ -49,16 +49,12 @@ public class HeuristicCompletionException extends TransactionException {
 
 
 	public static String getStateString(int state) {
-		switch (state) {
-			case STATE_COMMITTED:
-				return "committed";
-			case STATE_ROLLED_BACK:
-				return "rolled back";
-			case STATE_MIXED:
-				return "mixed";
-			default:
-				return "unknown";
-		}
+		return switch (state) {
+			case STATE_COMMITTED -> "committed";
+			case STATE_ROLLED_BACK -> "rolled back";
+			case STATE_MIXED -> "mixed";
+			default -> "unknown";
+		};
 	}
 
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
index aa718d7aed61..84f54c85a238 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
@@ -171,14 +171,9 @@ public void afterCompletion(int status) {
 		}
 		// Call afterCompletion with the appropriate status indication.
 		switch (status) {
-			case Status.STATUS_COMMITTED:
-				this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_COMMITTED);
-				break;
-			case Status.STATUS_ROLLEDBACK:
-				this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_ROLLED_BACK);
-				break;
-			default:
-				this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_UNKNOWN);
+			case Status.STATUS_COMMITTED -> this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_COMMITTED);
+			case Status.STATUS_ROLLEDBACK -> this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_ROLLED_BACK);
+			default -> this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_UNKNOWN);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
index 43f380719a52..75458f488a67 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
@@ -154,18 +154,10 @@ else if (token == null ) { // !previousNull
 
 	private void updateDepth(JsonToken token) {
 		switch (token) {
-			case START_OBJECT:
-				this.objectDepth++;
-				break;
-			case END_OBJECT:
-				this.objectDepth--;
-				break;
-			case START_ARRAY:
-				this.arrayDepth++;
-				break;
-			case END_ARRAY:
-				this.arrayDepth--;
-				break;
+			case START_OBJECT -> this.objectDepth++;
+			case END_OBJECT -> this.objectDepth--;
+			case START_ARRAY -> this.arrayDepth++;
+			case END_ARRAY -> this.arrayDepth--;
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index 70664a2e4c27..2ac7fac2acb6 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -164,12 +164,9 @@ protected void handleError(ClientHttpResponse response, HttpStatus statusCode) t
 		String message = getErrorMessage(statusCode.value(), statusText, body, charset);
 
 		switch (statusCode.series()) {
-			case CLIENT_ERROR:
-				throw HttpClientErrorException.create(message, statusCode, statusText, headers, body, charset);
-			case SERVER_ERROR:
-				throw HttpServerErrorException.create(message, statusCode, statusText, headers, body, charset);
-			default:
-				throw new UnknownHttpStatusCodeException(message, statusCode.value(), statusText, headers, body, charset);
+			case CLIENT_ERROR -> throw HttpClientErrorException.create(message, statusCode, statusText, headers, body, charset);
+			case SERVER_ERROR -> throw HttpServerErrorException.create(message, statusCode, statusText, headers, body, charset);
+			default -> throw new UnknownHttpStatusCodeException(message, statusCode.value(), statusText, headers, body, charset);
 		}
 	}
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
index f45973ef9d03..bab4b1939472 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
@@ -154,20 +154,11 @@ public void setAttribute(String name, @Nullable Object value) {
 	public void setAttribute(String name, @Nullable Object value, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
-			case PAGE_SCOPE:
-				setAttribute(name, value);
-				break;
-			case REQUEST_SCOPE:
-				this.request.setAttribute(name, value);
-				break;
-			case SESSION_SCOPE:
-				this.request.getSession().setAttribute(name, value);
-				break;
-			case APPLICATION_SCOPE:
-				this.servletContext.setAttribute(name, value);
-				break;
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
+			case PAGE_SCOPE -> setAttribute(name, value);
+			case REQUEST_SCOPE -> this.request.setAttribute(name, value);
+			case SESSION_SCOPE -> this.request.getSession().setAttribute(name, value);
+			case APPLICATION_SCOPE -> this.servletContext.setAttribute(name, value);
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
 		}
 	}
 
@@ -226,20 +217,11 @@ public void removeAttribute(String name) {
 	public void removeAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
-			case PAGE_SCOPE:
-				this.attributes.remove(name);
-				break;
-			case REQUEST_SCOPE:
-				this.request.removeAttribute(name);
-				break;
-			case SESSION_SCOPE:
-				this.request.getSession().removeAttribute(name);
-				break;
-			case APPLICATION_SCOPE:
-				this.servletContext.removeAttribute(name);
-				break;
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
+			case PAGE_SCOPE -> this.attributes.remove(name);
+			case REQUEST_SCOPE -> this.request.removeAttribute(name);
+			case SESSION_SCOPE -> this.request.getSession().removeAttribute(name);
+			case APPLICATION_SCOPE -> this.servletContext.removeAttribute(name);
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
 		}
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
index f08152d3f652..8660adf04c58 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
@@ -82,24 +82,23 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 		String name = element.getLocalName();
 		switch (name) {
-			case "view-controller":
+			case "view-controller" -> {
 				if (element.hasAttribute("view-name")) {
 					controller.getPropertyValues().add("viewName", element.getAttribute("view-name"));
 				}
 				if (statusCode != null) {
 					controller.getPropertyValues().add("statusCode", statusCode);
 				}
-				break;
-			case "redirect-view-controller":
-				controller.getPropertyValues().add("view", getRedirectView(element, statusCode, source));
-				break;
-			case "status-controller":
+			}
+			case "redirect-view-controller" -> controller.getPropertyValues()
+					.add("view", getRedirectView(element, statusCode, source));
+			case "status-controller" -> {
 				controller.getPropertyValues().add("statusCode", statusCode);
 				controller.getPropertyValues().add("statusOnly", true);
-				break;
-			default:
-				// Should never happen...
-				throw new IllegalStateException("Unexpected tag name: " + name);
+			}
+			default ->
+					// Should never happen...
+					throw new IllegalStateException("Unexpected tag name: " + name);
 		}
 
 		Map<String, BeanDefinition> urlMap = (Map<String, BeanDefinition>) hm.getPropertyValues().get("urlMap");
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java
index 46f3149fe852..812b49d377b3 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java
@@ -210,12 +210,12 @@ private void checkSessionLimits() {
 				}
 				else if (getBufferSize() > getBufferSizeLimit()) {
 					switch (this.overflowStrategy) {
-						case TERMINATE:
+						case TERMINATE -> {
 							String format = "Buffer size %d bytes for session '%s' exceeds the allowed limit %d";
 							String reason = String.format(format, getBufferSize(), getId(), getBufferSizeLimit());
 							limitExceeded(reason);
-							break;
-						case DROP:
+						}
+						case DROP -> {
 							int i = 0;
 							while (getBufferSize() > getBufferSizeLimit()) {
 								WebSocketMessage<?> message = this.buffer.poll();
@@ -228,10 +228,7 @@ else if (getBufferSize() > getBufferSizeLimit()) {
 							if (logger.isDebugEnabled()) {
 								logger.debug("Dropped " + i + " messages, buffer size: " + getBufferSize());
 							}
-							break;
-						default:
-							// Should never happen..
-							throw new IllegalStateException("Unexpected OverflowStrategy: " + this.overflowStrategy);
+						}
 					}
 				}
 			}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
index 3f33a3de8960..889444609449 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
@@ -407,17 +407,14 @@ private void logUndeliveredMessages(int index, String[] messages) {
 	}
 
 	private static List<String> getUndelivered(String[] messages, int i) {
-		switch (messages.length - i) {
-			case 0:
-				return Collections.emptyList();
-			case 1:
-				return (messages[i].trim().isEmpty() ?
-						Collections.emptyList() : Collections.singletonList(messages[i]));
-			default:
-				return Arrays.stream(Arrays.copyOfRange(messages, i, messages.length))
-						.filter(message -> !message.trim().isEmpty())
-						.collect(Collectors.toList());
-		}
+		return switch (messages.length - i) {
+			case 0 -> Collections.emptyList();
+			case 1 -> (messages[i].trim().isEmpty() ?
+					   Collections.<String>emptyList() : Collections.singletonList(messages[i]));
+			default -> Arrays.stream(Arrays.copyOfRange(messages, i, messages.length))
+					.filter(message -> !message.trim().isEmpty())
+					.collect(Collectors.toList());
+		};
 	}
 
 	/**

From 8c6d59aaaf8d0ff31e7d91c6d0ed7de7cd9f518e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 19 Feb 2022 14:32:57 +0100
Subject: [PATCH 723/735] Polish contribution

See gh-28014
---
 .../aspectj/annotation/AspectMetadata.java    |  2 +-
 ...ntiationModelAwarePointcutAdvisorImpl.java |  2 +-
 .../ReflectiveAspectJAdvisorFactory.java      |  2 +-
 .../AbstractPropertyAccessorBenchmark.java    | 20 ++++-----
 .../mail/javamail/MimeMessageHelper.java      |  6 +--
 .../CachingConfigurationSelector.java         |  2 +-
 .../context/annotation/TypeFilterUtils.java   | 10 ++---
 .../standard/DateTimeFormatterRegistrar.java  |  2 +-
 .../AsyncConfigurationSelector.java           |  6 +--
 .../org/springframework/asm/TypePath.java     | 23 +++++++---
 .../core/annotation/AnnotationsScanner.java   |  2 +-
 .../core/env/ProfilesParser.java              |  2 +-
 .../core/io/buffer/DataBufferUtils.java       |  8 ++--
 .../ListenableFutureCallbackRegistry.java     |  2 +-
 .../expression/spel/ast/OpDivide.java         |  2 +-
 .../expression/spel/ast/OpMinus.java          |  2 +-
 .../expression/spel/ast/OpModulus.java        |  2 +-
 .../expression/spel/ast/OpMultiply.java       |  2 +-
 .../expression/spel/ast/OpPlus.java           |  2 +-
 .../expression/spel/ast/Selection.java        |  2 +-
 .../apache/commons/logging/LogAdapter.java    |  2 +-
 .../MarshallingMessageConverter.java          |  2 +-
 .../DefaultSubscriptionRegistryBenchmark.java |  5 +--
 .../RSocketFrameTypeMessageCondition.java     |  6 +--
 .../orm/jpa/SharedEntityManagerCreator.java   |  2 +-
 .../vendor/EclipseLinkJpaVendorAdapter.java   |  2 +-
 .../jpa/vendor/HibernateJpaVendorAdapter.java |  2 +-
 .../connection/R2dbcTransactionManager.java   |  2 +-
 .../mock/web/MockPageContext.java             | 44 ++++++++-----------
 .../HeuristicCompletionException.java         |  2 +-
 .../jta/SpringJtaSynchronizationAdapter.java  | 11 +++--
 .../http/codec/json/Jackson2Tokenizer.java    |  2 +-
 .../client/DefaultResponseErrorHandler.java   | 11 +++--
 .../testfixture/servlet/MockPageContext.java  | 44 ++++++++-----------
 .../ViewControllerBeanDefinitionParser.java   | 10 ++---
 .../ConcurrentWebSocketSessionDecorator.java  |  5 ++-
 .../session/AbstractSockJsSession.java        |  4 +-
 37 files changed, 132 insertions(+), 125 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
index 64bb2fe1d0a8..49e31e6beca4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
index ea5705cf8e4b..33af3adfc309 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
index f24e2ac7a0a3..00e7ad567ef6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java b/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java
index d71837d6b75b..6cdd116b4cb0 100644
--- a/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java
+++ b/spring-beans/src/jmh/java/org/springframework/beans/AbstractPropertyAccessorBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,16 +61,15 @@ public void setup() {
 				this.propertyAccessor = new BeanWrapperImpl(this.target);
 			}
 			switch (this.customEditor) {
-				case "stringTrimmer" -> this.propertyAccessor.registerCustomEditor(String.class,
-						new StringTrimmerEditor(false));
-				case "numberOnPath" -> this.propertyAccessor.registerCustomEditor(int.class, "array.somePath",
-						new CustomNumberEditor(Integer.class, false));
-				case "numberOnNestedPath" -> this.propertyAccessor.registerCustomEditor(int.class, "array[0].somePath",
-						new CustomNumberEditor(Integer.class, false));
-				case "numberOnType" -> this.propertyAccessor.registerCustomEditor(int.class,
-						new CustomNumberEditor(Integer.class, false));
+				case "stringTrimmer" ->
+					this.propertyAccessor.registerCustomEditor(String.class, new StringTrimmerEditor(false));
+				case "numberOnPath" ->
+					this.propertyAccessor.registerCustomEditor(int.class, "array.somePath", new CustomNumberEditor(Integer.class, false));
+				case "numberOnNestedPath" ->
+					this.propertyAccessor.registerCustomEditor(int.class, "array[0].somePath", new CustomNumberEditor(Integer.class, false));
+				case "numberOnType" ->
+					this.propertyAccessor.registerCustomEditor(int.class, new CustomNumberEditor(Integer.class, false));
 			}
-
 		}
 
 	}
@@ -94,4 +93,5 @@ public void setArray(int[] array) {
 			this.array = array;
 		}
 	}
+
 }
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index 23eaee1dd207..84400943ced9 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -353,8 +353,8 @@ protected void createMimeMultiparts(MimeMessage mimeMessage, int multipartMode)
 				rootMixedMultipart.addBodyPart(relatedBodyPart);
 				setMimeMultiparts(rootMixedMultipart, nestedRelatedMultipart);
 			}
-			default -> throw new IllegalArgumentException(
-					"Only multipart modes MIXED_RELATED, RELATED and NO supported");
+			default ->
+				throw new IllegalArgumentException("Only multipart modes MIXED_RELATED, RELATED and NO supported");
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
index 1af81080ebb8..b170593bdcb4 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
index 4f02a7ebb129..6ffb77b42bf3 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -93,8 +93,8 @@ public static List<TypeFilter> createTypeFiltersFor(AnnotationAttributes filterA
 							environment, resourceLoader, registry);
 					typeFilters.add(filter);
 				}
-				default -> throw new IllegalArgumentException(
-						"Filter type not supported with Class value: " + filterType);
+				default ->
+					throw new IllegalArgumentException("Filter type not supported with Class value: " + filterType);
 			}
 		}
 
@@ -102,8 +102,8 @@ public static List<TypeFilter> createTypeFiltersFor(AnnotationAttributes filterA
 			switch (filterType) {
 				case ASPECTJ -> typeFilters.add(new AspectJTypeFilter(expression, resourceLoader.getClassLoader()));
 				case REGEX -> typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
-				default -> throw new IllegalArgumentException(
-						"Filter type not supported with String pattern: " + filterType);
+				default ->
+					throw new IllegalArgumentException("Filter type not supported with String pattern: " + filterType);
 			}
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
index 0d35e95cd4ca..1a72d4494938 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
index 0acc985d3ea0..c7f50aed70a8 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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,8 +46,8 @@ public class AsyncConfigurationSelector extends AdviceModeImportSelector<EnableA
 	@NonNull
 	public String[] selectImports(AdviceMode adviceMode) {
 		return switch (adviceMode) {
-			case PROXY -> new String[]{ProxyAsyncConfiguration.class.getName()};
-			case ASPECTJ -> new String[]{ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME};
+			case PROXY -> new String[] {ProxyAsyncConfiguration.class.getName()};
+			case ASPECTJ -> new String[] {ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME};
 		};
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/asm/TypePath.java b/spring-core/src/main/java/org/springframework/asm/TypePath.java
index be95d3a55fac..b7cf845e7a4d 100644
--- a/spring-core/src/main/java/org/springframework/asm/TypePath.java
+++ b/spring-core/src/main/java/org/springframework/asm/TypePath.java
@@ -163,13 +163,22 @@ public String toString() {
     int length = getLength();
     StringBuilder result = new StringBuilder(length * 2);
     for (int i = 0; i < length; ++i) {
-		switch (getStep(i)) {
-			case ARRAY_ELEMENT -> result.append('[');
-			case INNER_TYPE -> result.append('.');
-			case WILDCARD_BOUND -> result.append('*');
-			case TYPE_ARGUMENT -> result.append(getStepArgument(i)).append(';');
-			default -> throw new AssertionError();
-		}
+      switch (getStep(i)) {
+        case ARRAY_ELEMENT:
+          result.append('[');
+          break;
+        case INNER_TYPE:
+          result.append('.');
+          break;
+        case WILDCARD_BOUND:
+          result.append('*');
+          break;
+        case TYPE_ARGUMENT:
+          result.append(getStepArgument(i)).append(';');
+          break;
+        default:
+          throw new AssertionError();
+      }
     }
     return result.toString();
   }
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
index 88e65703a0e4..5a2666d1b760 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java b/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java
index b8f030dd52a4..8e1e7c5561c9 100644
--- a/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java
+++ b/spring-core/src/main/java/org/springframework/core/env/ProfilesParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
index 73f4579c1a84..438d7bf082d9 100644
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -607,8 +607,10 @@ public static Matcher matcher(byte[]... delimiters) {
 	}
 
 	private static NestedMatcher createMatcher(byte[] delimiter) {
-		Assert.isTrue(delimiter.length > 0, "Delimiter must not be empty");
-		return switch (delimiter.length) {
+		// extract length due to Eclipse IDE compiler error in switch expression
+		int length = delimiter.length;
+		Assert.isTrue(length > 0, "Delimiter must not be empty");
+		return switch (length) {
 			case 1 -> (delimiter[0] == 10 ? SingleByteMatcher.NEWLINE_MATCHER : new SingleByteMatcher(delimiter));
 			case 2 -> new TwoByteMatcher(delimiter);
 			default -> new KnuthMorrisPrattMatcher(delimiter);
diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
index 343e81c07164..e2a016cc6cb7 100644
--- a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
+++ b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
index 7ade8deaee24..7ac8326eedf3 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
index 9d69f0a6fa0c..1098e15897c7 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
index 3d229cedd68a..a21d5caf529b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
index 3db753c15a64..d86965acafb3 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
index f4ff34235f72..3bbf0615cdb1 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
index 63da77012cde..9daa3b94aa78 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
index 5ba97293f38c..8ae19384f5be 100644
--- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
+++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
index a6cec5ce4ebc..c3dd8389ae16 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java b/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java
index c80415c6fbbd..ebce89c7086b 100644
--- a/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java
+++ b/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -145,9 +145,8 @@ public static class FindRequest {
 		@Setup(Level.Trial)
 		public void doSetup(ServerState serverState) {
 			switch (this.contention) {
-				case "noSubscribers" -> {
+				case "noSubscribers" ->
 					this.destination = "someDestination_withNoSubscribers_" + serverState.uniqueIdGenerator.incrementAndGet();
-				}
 				case "sameDestination" -> this.destination = serverState.destinationIds[0];
 				case "none" -> {
 					int uniqueNumber = serverState.uniqueIdGenerator.getAndIncrement();
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
index fb09da86c146..865a0c0b09d2 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -197,10 +197,10 @@ public static RSocketFrameTypeMessageCondition getCondition(int cardinalityIn, i
 				case 0 -> REQUEST_FNF_OR_RESPONSE_CONDITION;
 				case 1 -> REQUEST_RESPONSE_CONDITION;
 				case 2 -> REQUEST_STREAM_CONDITION;
-				default -> throw new IllegalStateException("Invalid cardinality: " + cardinalityOut);
+				default -> throw new IllegalStateException("Invalid response cardinality: " + cardinalityOut);
 			};
 			case 2 -> REQUEST_CHANNEL_CONDITION;
-			default -> throw new IllegalStateException("Invalid cardinality: " + cardinalityIn);
+			default -> throw new IllegalStateException("Invalid request cardinality: " + cardinalityIn);
 		};
 	}
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index 977b71de1398..f0665ec7e684 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
index 2ad8daaff308..d26bd1e67b57 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index 041f23da5fb3..1af984c6fde1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
index fdce9d94e4e8..557427ecb6cf 100644
--- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
+++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
index a5feb9e78215..f4a1b9b00483 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -173,19 +173,16 @@ public Object getAttribute(String name) {
 	@Nullable
 	public Object getAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
-		switch (scope) {
-			case PAGE_SCOPE:
-				return getAttribute(name);
-			case REQUEST_SCOPE:
-				return this.request.getAttribute(name);
-			case SESSION_SCOPE:
+		return switch (scope) {
+			case PAGE_SCOPE -> getAttribute(name);
+			case REQUEST_SCOPE -> this.request.getAttribute(name);
+			case SESSION_SCOPE -> {
 				HttpSession session = this.request.getSession(false);
-				return (session != null ? session.getAttribute(name) : null);
-			case APPLICATION_SCOPE:
-				return this.servletContext.getAttribute(name);
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
-		}
+				yield (session != null ? session.getAttribute(name) : null);
+			}
+			case APPLICATION_SCOPE -> this.servletContext.getAttribute(name);
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
+		};
 	}
 
 	@Override
@@ -250,19 +247,16 @@ public Enumeration<String> getAttributeNames() {
 
 	@Override
 	public Enumeration<String> getAttributeNamesInScope(int scope) {
-		switch (scope) {
-			case PAGE_SCOPE:
-				return getAttributeNames();
-			case REQUEST_SCOPE:
-				return this.request.getAttributeNames();
-			case SESSION_SCOPE:
+		return switch (scope) {
+			case PAGE_SCOPE -> getAttributeNames();
+			case REQUEST_SCOPE -> this.request.getAttributeNames();
+			case SESSION_SCOPE -> {
 				HttpSession session = this.request.getSession(false);
-				return (session != null ? session.getAttributeNames() : Collections.emptyEnumeration());
-			case APPLICATION_SCOPE:
-				return this.servletContext.getAttributeNames();
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
-		}
+				yield (session != null ? session.getAttributeNames() : Collections.emptyEnumeration());
+			}
+			case APPLICATION_SCOPE -> this.servletContext.getAttributeNames();
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
+		};
 	}
 
 	@Override
diff --git a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
index 1d661868df2c..554ecf26305f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
index 84f54c85a238..89c5b9a5eee4 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -171,9 +171,12 @@ public void afterCompletion(int status) {
 		}
 		// Call afterCompletion with the appropriate status indication.
 		switch (status) {
-			case Status.STATUS_COMMITTED -> this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_COMMITTED);
-			case Status.STATUS_ROLLEDBACK -> this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_ROLLED_BACK);
-			default -> this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_UNKNOWN);
+			case Status.STATUS_COMMITTED ->
+				this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_COMMITTED);
+			case Status.STATUS_ROLLEDBACK ->
+				this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_ROLLED_BACK);
+			default ->
+				this.springSynchronization.afterCompletion(TransactionSynchronization.STATUS_UNKNOWN);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
index 75458f488a67..73e87eb0b8bc 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index 2ac7fac2acb6..55165060d0a1 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -164,9 +164,12 @@ protected void handleError(ClientHttpResponse response, HttpStatus statusCode) t
 		String message = getErrorMessage(statusCode.value(), statusText, body, charset);
 
 		switch (statusCode.series()) {
-			case CLIENT_ERROR -> throw HttpClientErrorException.create(message, statusCode, statusText, headers, body, charset);
-			case SERVER_ERROR -> throw HttpServerErrorException.create(message, statusCode, statusText, headers, body, charset);
-			default -> throw new UnknownHttpStatusCodeException(message, statusCode.value(), statusText, headers, body, charset);
+			case CLIENT_ERROR ->
+				throw HttpClientErrorException.create(message, statusCode, statusText, headers, body, charset);
+			case SERVER_ERROR ->
+				throw HttpServerErrorException.create(message, statusCode, statusText, headers, body, charset);
+			default ->
+				throw new UnknownHttpStatusCodeException(message, statusCode.value(), statusText, headers, body, charset);
 		}
 	}
 
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
index bab4b1939472..e3976304882f 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockPageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -173,19 +173,16 @@ public Object getAttribute(String name) {
 	@Nullable
 	public Object getAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
-		switch (scope) {
-			case PAGE_SCOPE:
-				return getAttribute(name);
-			case REQUEST_SCOPE:
-				return this.request.getAttribute(name);
-			case SESSION_SCOPE:
+		return switch (scope) {
+			case PAGE_SCOPE -> getAttribute(name);
+			case REQUEST_SCOPE -> this.request.getAttribute(name);
+			case SESSION_SCOPE -> {
 				HttpSession session = this.request.getSession(false);
-				return (session != null ? session.getAttribute(name) : null);
-			case APPLICATION_SCOPE:
-				return this.servletContext.getAttribute(name);
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
-		}
+				yield (session != null ? session.getAttribute(name) : null);
+			}
+			case APPLICATION_SCOPE -> this.servletContext.getAttribute(name);
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
+		};
 	}
 
 	@Override
@@ -250,19 +247,16 @@ public Enumeration<String> getAttributeNames() {
 
 	@Override
 	public Enumeration<String> getAttributeNamesInScope(int scope) {
-		switch (scope) {
-			case PAGE_SCOPE:
-				return getAttributeNames();
-			case REQUEST_SCOPE:
-				return this.request.getAttributeNames();
-			case SESSION_SCOPE:
+		return switch (scope) {
+			case PAGE_SCOPE -> getAttributeNames();
+			case REQUEST_SCOPE -> this.request.getAttributeNames();
+			case SESSION_SCOPE -> {
 				HttpSession session = this.request.getSession(false);
-				return (session != null ? session.getAttributeNames() : Collections.emptyEnumeration());
-			case APPLICATION_SCOPE:
-				return this.servletContext.getAttributeNames();
-			default:
-				throw new IllegalArgumentException("Invalid scope: " + scope);
-		}
+				yield (session != null ? session.getAttributeNames() : Collections.emptyEnumeration());
+			}
+			case APPLICATION_SCOPE -> this.servletContext.getAttributeNames();
+			default -> throw new IllegalArgumentException("Invalid scope: " + scope);
+		};
 	}
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
index 8660adf04c58..b2109def5dc6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -90,15 +90,15 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 					controller.getPropertyValues().add("statusCode", statusCode);
 				}
 			}
-			case "redirect-view-controller" -> controller.getPropertyValues()
-					.add("view", getRedirectView(element, statusCode, source));
+			case "redirect-view-controller" ->
+				controller.getPropertyValues().add("view", getRedirectView(element, statusCode, source));
 			case "status-controller" -> {
 				controller.getPropertyValues().add("statusCode", statusCode);
 				controller.getPropertyValues().add("statusOnly", true);
 			}
 			default ->
-					// Should never happen...
-					throw new IllegalStateException("Unexpected tag name: " + name);
+				// Should never happen...
+				throw new IllegalStateException("Unexpected tag name: " + name);
 		}
 
 		Map<String, BeanDefinition> urlMap = (Map<String, BeanDefinition>) hm.getPropertyValues().get("urlMap");
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java
index 812b49d377b3..5e538550a64b 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -229,6 +229,9 @@ else if (getBufferSize() > getBufferSizeLimit()) {
 								logger.debug("Dropped " + i + " messages, buffer size: " + getBufferSize());
 							}
 						}
+						default ->
+							// Should never happen..
+							throw new IllegalStateException("Unexpected OverflowStrategy: " + this.overflowStrategy);
 					}
 				}
 			}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
index 889444609449..9773f03a6d4d 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -410,7 +410,7 @@ private static List<String> getUndelivered(String[] messages, int i) {
 		return switch (messages.length - i) {
 			case 0 -> Collections.emptyList();
 			case 1 -> (messages[i].trim().isEmpty() ?
-					   Collections.<String>emptyList() : Collections.singletonList(messages[i]));
+					Collections.<String>emptyList() : Collections.singletonList(messages[i]));
 			default -> Arrays.stream(Arrays.copyOfRange(messages, i, messages.length))
 					.filter(message -> !message.trim().isEmpty())
 					.collect(Collectors.toList());

From 6a73d2655f15000214912765ce75059b714b5995 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 19 Feb 2022 14:59:54 +0100
Subject: [PATCH 724/735] Polishing

---
 .../interceptor/AsyncExecutionAspectSupport.java |  6 +++---
 .../annotation/BeanFactoryAnnotationUtils.java   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
index 66dbc3042f9c..45221f36744f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
@@ -156,7 +156,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 
 	/**
 	 * Determine the specific executor to use when executing the given method.
-	 * Should preferably return an {@link AsyncListenableTaskExecutor} implementation.
+	 * <p>Should preferably return an {@link AsyncListenableTaskExecutor} implementation.
 	 * @return the executor to use (or {@code null}, but just if no default executor is available)
 	 */
 	@Nullable
@@ -184,7 +184,7 @@ protected AsyncTaskExecutor determineAsyncExecutor(Method method) {
 	/**
 	 * Return the qualifier or bean name of the executor to be used when executing the
 	 * given async method, typically specified in the form of an annotation attribute.
-	 * Returning an empty string or {@code null} indicates that no specific executor has
+	 * <p>Returning an empty string or {@code null} indicates that no specific executor has
 	 * been specified and that the {@linkplain #setExecutor(Executor) default executor}
 	 * should be used.
 	 * @param method the method to inspect for executor qualifier metadata
@@ -213,7 +213,7 @@ protected Executor findQualifiedExecutor(@Nullable BeanFactory beanFactory, Stri
 
 	/**
 	 * Retrieve or build a default executor for this advice instance.
-	 * An executor returned from here will be cached for further use.
+	 * <p>An executor returned from here will be cached for further use.
 	 * <p>The default implementation searches for a unique {@link TaskExecutor} bean
 	 * in the context, or for an {@link Executor} bean named "taskExecutor" otherwise.
 	 * If neither of the two is resolvable, this implementation will return {@code null}.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
index 722995aabec4..fd41a5cfe0a1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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,7 +48,7 @@
 public abstract class BeanFactoryAnnotationUtils {
 
 	/**
-	 * Retrieve all bean of type {@code T} from the given {@code BeanFactory} declaring a
+	 * Retrieve all beans of type {@code T} from the given {@code BeanFactory} declaring a
 	 * qualifier (e.g. via {@code <qualifier>} or {@code @Qualifier}) matching the given
 	 * qualifier, or having a bean name matching the given qualifier.
 	 * @param beanFactory the factory to get the target beans from (also searching ancestors)
@@ -90,9 +90,9 @@ public static <T> T qualifiedBeanOfType(BeanFactory beanFactory, Class<T> beanTy
 
 		Assert.notNull(beanFactory, "BeanFactory must not be null");
 
-		if (beanFactory instanceof ListableBeanFactory) {
+		if (beanFactory instanceof ListableBeanFactory lbf) {
 			// Full qualifier matching supported.
-			return qualifiedBeanOfType((ListableBeanFactory) beanFactory, beanType, qualifier);
+			return qualifiedBeanOfType(lbf, beanType, qualifier);
 		}
 		else if (beanFactory.containsBean(qualifier)) {
 			// Fallback: target bean at least found by bean name.
@@ -163,8 +163,8 @@ public static boolean isQualifierMatch(
 			}
 			try {
 				Class<?> beanType = beanFactory.getType(beanName);
-				if (beanFactory instanceof ConfigurableBeanFactory) {
-					BeanDefinition bd = ((ConfigurableBeanFactory) beanFactory).getMergedBeanDefinition(beanName);
+				if (beanFactory instanceof ConfigurableBeanFactory cbf) {
+					BeanDefinition bd = cbf.getMergedBeanDefinition(beanName);
 					// Explicit qualifier metadata on bean definition? (typically in XML definition)
 					if (bd instanceof AbstractBeanDefinition abd) {
 						AutowireCandidateQualifier candidate = abd.getQualifier(Qualifier.class.getName());
@@ -176,8 +176,8 @@ public static boolean isQualifierMatch(
 						}
 					}
 					// Corresponding qualifier on factory method? (typically in configuration class)
-					if (bd instanceof RootBeanDefinition) {
-						Method factoryMethod = ((RootBeanDefinition) bd).getResolvedFactoryMethod();
+					if (bd instanceof RootBeanDefinition rbd) {
+						Method factoryMethod = rbd.getResolvedFactoryMethod();
 						if (factoryMethod != null) {
 							Qualifier targetAnnotation = AnnotationUtils.getAnnotation(factoryMethod, Qualifier.class);
 							if (targetAnnotation != null) {

From 01214b3473c4a9e4db66b2036b3c44d6ed7f1678 Mon Sep 17 00:00:00 2001
From: Guirong Hu <ugrong@163.com>
Date: Wed, 15 Dec 2021 13:24:45 +0800
Subject: [PATCH 725/735] Allow @Async qualifier to be declared with a
 placeholder or SpEL expression

Closes gh-27818
---
 .../AsyncExecutionAspectSupport.java          |  8 +++
 .../scheduling/annotation/Async.java          |  4 +-
 .../annotation/EnableAsyncTests.java          | 61 ++++++++++++++++++-
 3 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
index 45221f36744f..69ec0b65562d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
@@ -34,6 +34,8 @@
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.beans.factory.config.EmbeddedValueResolver;
 import org.springframework.core.task.AsyncListenableTaskExecutor;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
@@ -41,6 +43,7 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.util.StringValueResolver;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.function.SingletonSupplier;
 
@@ -208,6 +211,11 @@ protected Executor findQualifiedExecutor(@Nullable BeanFactory beanFactory, Stri
 			throw new IllegalStateException("BeanFactory must be set on " + getClass().getSimpleName() +
 					" to access qualified executor '" + qualifier + "'");
 		}
+		if (beanFactory instanceof ConfigurableBeanFactory configurableBeanFactory) {
+			StringValueResolver embeddedValueResolver = new EmbeddedValueResolver(configurableBeanFactory);
+			String resolvedValue = embeddedValueResolver.resolveStringValue(qualifier);
+			qualifier = resolvedValue != null ? resolvedValue : "";
+		}
 		return BeanFactoryAnnotationUtils.qualifiedBeanOfType(beanFactory, Executor.class, qualifier);
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
index 40e572f0e8cc..b288c32c0583 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,6 +57,8 @@
 
 	/**
 	 * A qualifier value for the specified asynchronous operation(s).
+	 * <p>The value support expression such as <code>#{systemProperties.myExecutor}</code>
+	 * or property placeholder such as <code>${my.app.myExecutor}</code>.
 	 * <p>May be used to determine the target executor to be used when executing
 	 * the asynchronous operation(s), matching the qualifier value (or the bean
 	 * name) of a specific {@link java.util.concurrent.Executor Executor} or
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
index e60333950f40..5bde1c950bd1 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
+import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -47,6 +48,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.Ordered;
 import org.springframework.lang.Nullable;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
@@ -130,6 +132,29 @@ public void withAsyncBeanWithExecutorQualifiedByName() throws ExecutionException
 		ctx.close();
 	}
 
+	@Test
+	public void withAsyncBeanWithExecutorQualifiedByExpression() throws ExecutionException, InterruptedException {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		System.getProperties().put("myExecutor", "myExecutor1");
+		PropertySourcesPlaceholderConfigurer placeholderConfigurer = new PropertySourcesPlaceholderConfigurer();
+		placeholderConfigurer.setProperties(new Properties() {{
+			put("my.app.myExecutor", "myExecutor2");
+		}});
+		placeholderConfigurer.postProcessBeanFactory(context.getBeanFactory());
+
+		context.register(AsyncWithExecutorQualifiedByExpressionConfig.class);
+		context.refresh();
+
+		AsyncBeanWithExecutorQualifiedByExpression asyncBean = context.getBean(AsyncBeanWithExecutorQualifiedByExpression.class);
+		Future<Thread> workerThread1 = asyncBean.myWork1();
+		assertThat(workerThread1.get().getName()).doesNotStartWith("myExecutor2-").startsWith("myExecutor1-");
+
+		Future<Thread> workerThread2 = asyncBean.myWork2();
+		assertThat(workerThread2.get().getName()).startsWith("myExecutor2-");
+
+		context.close();
+	}
+
 	@Test
 	public void asyncProcessorIsOrderedLowestPrecedenceByDefault() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
@@ -346,6 +371,19 @@ public Future<Thread> work3() {
 		}
 	}
 
+	static class AsyncBeanWithExecutorQualifiedByExpression {
+
+		@Async("#{systemProperties.myExecutor}")
+		public Future<Thread> myWork1() {
+			return new AsyncResult<>(Thread.currentThread());
+		}
+
+		@Async("${my.app.myExecutor}")
+		public Future<Thread> myWork2() {
+			return new AsyncResult<>(Thread.currentThread());
+		}
+	}
+
 
 	static class AsyncBean {
 
@@ -475,6 +513,27 @@ public Executor otherExecutor() {
 		}
 	}
 
+	@Configuration
+	@EnableAsync
+	static class AsyncWithExecutorQualifiedByExpressionConfig {
+
+		@Bean
+		public AsyncBeanWithExecutorQualifiedByExpression asyncBean() {
+			return new AsyncBeanWithExecutorQualifiedByExpression();
+		}
+
+		@Bean
+		public Executor myExecutor1() {
+			return new ThreadPoolTaskExecutor();
+		}
+
+		@Bean
+		@Qualifier("myExecutor")
+		public Executor myExecutor2() {
+			return new ThreadPoolTaskExecutor();
+		}
+	}
+
 
 	@Configuration
 	@EnableAsync

From be8224a5909f140122a1f25bc02a769b42d11e8f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 19 Feb 2022 15:55:11 +0100
Subject: [PATCH 726/735] Polish contribution

See gh-27818
---
 .../AsyncExecutionAspectSupport.java          |  6 +--
 .../scheduling/annotation/Async.java          | 15 ++++---
 .../annotation/EnableAsyncTests.java          | 44 +++++++++----------
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
index 69ec0b65562d..50a62a0f84a0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
@@ -43,7 +43,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.util.StringValueResolver;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.function.SingletonSupplier;
 
@@ -212,9 +211,8 @@ protected Executor findQualifiedExecutor(@Nullable BeanFactory beanFactory, Stri
 					" to access qualified executor '" + qualifier + "'");
 		}
 		if (beanFactory instanceof ConfigurableBeanFactory configurableBeanFactory) {
-			StringValueResolver embeddedValueResolver = new EmbeddedValueResolver(configurableBeanFactory);
-			String resolvedValue = embeddedValueResolver.resolveStringValue(qualifier);
-			qualifier = resolvedValue != null ? resolvedValue : "";
+			EmbeddedValueResolver embeddedValueResolver = new EmbeddedValueResolver(configurableBeanFactory);
+			qualifier = embeddedValueResolver.resolveStringValue(qualifier);
 		}
 		return BeanFactoryAnnotationUtils.qualifiedBeanOfType(beanFactory, Executor.class, qualifier);
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
index b288c32c0583..adc9b1359e40 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
@@ -24,7 +24,8 @@
 
 /**
  * Annotation that marks a method as a candidate for <i>asynchronous</i> execution.
- * Can also be used at the type level, in which case all of the type's methods are
+ *
+ * <p>Can also be used at the type level, in which case all of the type's methods are
  * considered as asynchronous. Note, however, that {@code @Async} is not supported
  * on methods declared within a
  * {@link org.springframework.context.annotation.Configuration @Configuration} class.
@@ -41,7 +42,7 @@
  * {@code Future} that can be used to track the result of the asynchronous method
  * execution. However, since the target method needs to implement the same signature,
  * it will have to return a temporary {@code Future} handle that just passes a value
- * through: e.g. Spring's {@link AsyncResult}, EJB 3.1's {@link jakarta.ejb.AsyncResult},
+ * through: for example, Spring's {@link AsyncResult}, EJB 3.1's {@link jakarta.ejb.AsyncResult},
  * or {@link java.util.concurrent.CompletableFuture#completedFuture(Object)}.
  *
  * @author Juergen Hoeller
@@ -57,16 +58,18 @@
 
 	/**
 	 * A qualifier value for the specified asynchronous operation(s).
-	 * <p>The value support expression such as <code>#{systemProperties.myExecutor}</code>
-	 * or property placeholder such as <code>${my.app.myExecutor}</code>.
 	 * <p>May be used to determine the target executor to be used when executing
 	 * the asynchronous operation(s), matching the qualifier value (or the bean
 	 * name) of a specific {@link java.util.concurrent.Executor Executor} or
 	 * {@link org.springframework.core.task.TaskExecutor TaskExecutor}
 	 * bean definition.
-	 * <p>When specified on a class-level {@code @Async} annotation, indicates that the
+	 * <p>When specified in a class-level {@code @Async} annotation, indicates that the
 	 * given executor should be used for all methods within the class. Method-level use
-	 * of {@code Async#value} always overrides any value set at the class level.
+	 * of {@code Async#value} always overrides any qualifier value configured at
+	 * the class level.
+	 * <p>The qualifier value will be resolved dynamically if supplied as a SpEL
+	 * expression (for example, {@code "#{environment['myExecutor']}"}) or a
+	 * property placeholder (for example, {@code "${my.app.myExecutor}"}).
 	 * @since 3.1.2
 	 */
 	String value() default "";
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
index 5bde1c950bd1..08c182785c28 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
@@ -21,7 +21,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
-import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -42,13 +41,13 @@
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.Ordered;
 import org.springframework.lang.Nullable;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
@@ -133,26 +132,25 @@ public void withAsyncBeanWithExecutorQualifiedByName() throws ExecutionException
 	}
 
 	@Test
-	public void withAsyncBeanWithExecutorQualifiedByExpression() throws ExecutionException, InterruptedException {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		System.getProperties().put("myExecutor", "myExecutor1");
-		PropertySourcesPlaceholderConfigurer placeholderConfigurer = new PropertySourcesPlaceholderConfigurer();
-		placeholderConfigurer.setProperties(new Properties() {{
-			put("my.app.myExecutor", "myExecutor2");
-		}});
-		placeholderConfigurer.postProcessBeanFactory(context.getBeanFactory());
+	public void withAsyncBeanWithExecutorQualifiedByExpressionOrPlaceholder() throws Exception {
+		System.setProperty("myExecutor", "myExecutor1");
+		System.setProperty("my.app.myExecutor", "myExecutor2");
 
-		context.register(AsyncWithExecutorQualifiedByExpressionConfig.class);
-		context.refresh();
+		Class<?> configClass = AsyncWithExecutorQualifiedByExpressionConfig.class;
+		try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(configClass)) {
+			AsyncBeanWithExecutorQualifiedByExpressionOrPlaceholder asyncBean =
+					context.getBean(AsyncBeanWithExecutorQualifiedByExpressionOrPlaceholder.class);
 
-		AsyncBeanWithExecutorQualifiedByExpression asyncBean = context.getBean(AsyncBeanWithExecutorQualifiedByExpression.class);
-		Future<Thread> workerThread1 = asyncBean.myWork1();
-		assertThat(workerThread1.get().getName()).doesNotStartWith("myExecutor2-").startsWith("myExecutor1-");
+			Future<Thread> workerThread1 = asyncBean.myWork1();
+			assertThat(workerThread1.get().getName()).startsWith("myExecutor1-");
 
-		Future<Thread> workerThread2 = asyncBean.myWork2();
-		assertThat(workerThread2.get().getName()).startsWith("myExecutor2-");
-
-		context.close();
+			Future<Thread> workerThread2 = asyncBean.myWork2();
+			assertThat(workerThread2.get().getName()).startsWith("myExecutor2-");
+		}
+		finally {
+			System.clearProperty("myExecutor");
+			System.clearProperty("my.app.myExecutor");
+		}
 	}
 
 	@Test
@@ -371,9 +369,9 @@ public Future<Thread> work3() {
 		}
 	}
 
-	static class AsyncBeanWithExecutorQualifiedByExpression {
+	static class AsyncBeanWithExecutorQualifiedByExpressionOrPlaceholder {
 
-		@Async("#{systemProperties.myExecutor}")
+		@Async("#{environment['myExecutor']}")
 		public Future<Thread> myWork1() {
 			return new AsyncResult<>(Thread.currentThread());
 		}
@@ -518,8 +516,8 @@ public Executor otherExecutor() {
 	static class AsyncWithExecutorQualifiedByExpressionConfig {
 
 		@Bean
-		public AsyncBeanWithExecutorQualifiedByExpression asyncBean() {
-			return new AsyncBeanWithExecutorQualifiedByExpression();
+		public AsyncBeanWithExecutorQualifiedByExpressionOrPlaceholder asyncBean() {
+			return new AsyncBeanWithExecutorQualifiedByExpressionOrPlaceholder();
 		}
 
 		@Bean

From 5689395678f57fe967a3b21ed7d9087cfec7b622 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 19 Feb 2022 16:51:00 +0100
Subject: [PATCH 727/735] Deprecate "enclosing classes" search strategy for
 MergedAnnotations

The TYPE_HIERARCHY_AND_ENCLOSING_CLASSES search strategy for
MergedAnnotations was originally introduced to support @Nested test
classes in JUnit Jupiter (see #23378).

However, while implementing #19930, we determined that the
TYPE_HIERARCHY_AND_ENCLOSING_CLASSES search strategy unfortunately
could not be used since it does not allow the user to control when to
recurse up the enclosing class hierarchy. For example, this search
strategy will automatically search on enclosing classes for static
nested classes as well as for inner classes, when the user probably
only wants one such category of "enclosing class" to be searched.
Consequently, TestContextAnnotationUtils was introduced in the Spring
TestContext Framework to address the shortcomings of the
TYPE_HIERARCHY_AND_ENCLOSING_CLASSES search strategy.

Since this search strategy is unlikely to be useful to general users,
the team has decided to deprecate this search strategy in Spring
Framework 5.3.x and remove it in 6.0.

Closes gh-28079
---
 .../springframework/core/annotation/AnnotationsScanner.java  | 5 ++++-
 .../springframework/core/annotation/MergedAnnotations.java   | 2 ++
 .../core/annotation/AnnotationsScannerTests.java             | 5 ++++-
 .../core/annotation/MergedAnnotationsTests.java              | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
index 626413838c9b..70efaeea41c7 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -92,6 +92,7 @@ private static <C, R> R process(C context, AnnotatedElement source,
 	}
 
 	@Nullable
+	@SuppressWarnings("deprecation")
 	private static <C, R> R processClass(C context, Class<?> source,
 			SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor) {
 
@@ -235,6 +236,7 @@ private static <C, R> R processClassHierarchy(C context, int[] aggregateIndex, C
 	}
 
 	@Nullable
+	@SuppressWarnings("deprecation")
 	private static <C, R> R processMethod(C context, Method source,
 			SearchStrategy searchStrategy, AnnotationsProcessor<C, R> processor) {
 
@@ -510,6 +512,7 @@ static boolean hasPlainJavaAnnotationsOnly(Class<?> type) {
 		return (type.getName().startsWith("java.") || type == Ordered.class);
 	}
 
+	@SuppressWarnings("deprecation")
 	private static boolean isWithoutHierarchy(AnnotatedElement source, SearchStrategy searchStrategy) {
 		if (source == Object.class) {
 			return true;
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
index 55dff9086f74..28f7cf009a99 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
@@ -482,7 +482,9 @@ enum SearchStrategy {
 		 * need to be meta-annotated with {@link Inherited @Inherited}. When
 		 * searching a {@link Method} source, this strategy is identical to
 		 * {@link #TYPE_HIERARCHY}.
+		 * @deprecated as of Spring Framework 5.3.17; to be removed in Spring Framework 6.0
 		 */
+		@Deprecated
 		TYPE_HIERARCHY_AND_ENCLOSING_CLASSES
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
index 83518d9b3846..e848090b1241 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -421,6 +421,7 @@ void typeHierarchyStrategyOnMethodWithGenericParameterNonOverrideScansAnnotation
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void typeHierarchyWithEnclosedStrategyOnEnclosedStaticClassScansAnnotations() {
 		Class<?> source = AnnotationEnclosingClassSample.EnclosedStatic.EnclosedStaticStatic.class;
 		assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES))
@@ -428,6 +429,7 @@ void typeHierarchyWithEnclosedStrategyOnEnclosedStaticClassScansAnnotations() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void typeHierarchyWithEnclosedStrategyOnEnclosedInnerClassScansAnnotations() {
 		Class<?> source = AnnotationEnclosingClassSample.EnclosedInner.EnclosedInnerInner.class;
 		assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES))
@@ -435,6 +437,7 @@ void typeHierarchyWithEnclosedStrategyOnEnclosedInnerClassScansAnnotations() {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void typeHierarchyWithEnclosedStrategyOnMethodHierarchyUsesTypeHierarchyScan() {
 		Method source = methodFrom(WithHierarchy.class);
 		assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES)).containsExactly(
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index 02ec8f0980e9..e175e6e030da 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -712,6 +712,7 @@ void streamTypeHierarchyFromClassWithInterface() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void streamTypeHierarchyAndEnclosingClassesFromNonAnnotatedInnerClassWithAnnotatedEnclosingClass() {
 		Stream<Class<?>> classes = MergedAnnotations.from(AnnotatedClass.NonAnnotatedInnerClass.class,
 				SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES).stream().map(MergedAnnotation::getType);
@@ -719,6 +720,7 @@ void streamTypeHierarchyAndEnclosingClassesFromNonAnnotatedInnerClassWithAnnotat
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void streamTypeHierarchyAndEnclosingClassesFromNonAnnotatedStaticNestedClassWithAnnotatedEnclosingClass() {
 		Stream<Class<?>> classes = MergedAnnotations.from(AnnotatedClass.NonAnnotatedStaticNestedClass.class,
 				SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES).stream().map(MergedAnnotation::getType);

From 84b4cebb3913ddd4a803939fdc8dde1b0401ff35 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 19 Feb 2022 16:54:16 +0100
Subject: [PATCH 728/735] Fix (@)since tag in SpelMessage

See gh-28043
---
 .../java/org/springframework/expression/spel/SpelMessage.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
index b8f5f92d0554..9c08841158ed 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
@@ -258,7 +258,7 @@ public enum SpelMessage {
 	FLAWED_PATTERN(Kind.ERROR, 1073,
 			"Failed to efficiently evaluate pattern ''{0}'': consider redesigning it"),
 
-	/** @since 5.3.16 */
+	/** @since 5.3.17 */
 	EXCEPTION_COMPILING_EXPRESSION(Kind.ERROR, 1074,
 			"An exception occurred while compiling an expression");
 

From 819d4256b7984fdec58840a56b82e411bc53c9c9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 19 Feb 2022 17:25:50 +0100
Subject: [PATCH 729/735] Remove deprecated "enclosing classes" search strategy
 for MergedAnnotations

Closes gh-28080
---
 .../core/annotation/AnnotationsScanner.java   | 47 ++++---------------
 .../core/annotation/MergedAnnotations.java    | 16 +------
 .../annotation/AnnotationsScannerTests.java   | 26 ----------
 .../annotation/MergedAnnotationsTests.java    | 16 -------
 4 files changed, 12 insertions(+), 93 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
index fa90a703b4e8..4b8a86af8084 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationsScanner.java
@@ -99,9 +99,8 @@ private static <C, R> R processClass(C context, Class<?> source,
 		return switch (searchStrategy) {
 			case DIRECT -> processElement(context, source, processor);
 			case INHERITED_ANNOTATIONS -> processClassInheritedAnnotations(context, source, searchStrategy, processor);
-			case SUPERCLASS -> processClassHierarchy(context, source, processor, false, false);
-			case TYPE_HIERARCHY -> processClassHierarchy(context, source, processor, true, false);
-			case TYPE_HIERARCHY_AND_ENCLOSING_CLASSES -> processClassHierarchy(context, source, processor, true, true);
+			case SUPERCLASS -> processClassHierarchy(context, source, processor, false);
+			case TYPE_HIERARCHY -> processClassHierarchy(context, source, processor, true);
 		};
 	}
 
@@ -161,15 +160,14 @@ private static <C, R> R processClassInheritedAnnotations(C context, Class<?> sou
 
 	@Nullable
 	private static <C, R> R processClassHierarchy(C context, Class<?> source,
-			AnnotationsProcessor<C, R> processor, boolean includeInterfaces, boolean includeEnclosing) {
+			AnnotationsProcessor<C, R> processor, boolean includeInterfaces) {
 
-		return processClassHierarchy(context, new int[] {0}, source, processor,
-				includeInterfaces, includeEnclosing);
+		return processClassHierarchy(context, new int[] {0}, source, processor, includeInterfaces);
 	}
 
 	@Nullable
 	private static <C, R> R processClassHierarchy(C context, int[] aggregateIndex, Class<?> source,
-			AnnotationsProcessor<C, R> processor, boolean includeInterfaces, boolean includeEnclosing) {
+			AnnotationsProcessor<C, R> processor, boolean includeInterfaces) {
 
 		try {
 			R result = processor.doWithAggregate(context, aggregateIndex[0]);
@@ -188,7 +186,7 @@ private static <C, R> R processClassHierarchy(C context, int[] aggregateIndex, C
 			if (includeInterfaces) {
 				for (Class<?> interfaceType : source.getInterfaces()) {
 					R interfacesResult = processClassHierarchy(context, aggregateIndex,
-						interfaceType, processor, true, includeEnclosing);
+						interfaceType, processor, true);
 					if (interfacesResult != null) {
 						return interfacesResult;
 					}
@@ -197,31 +195,11 @@ private static <C, R> R processClassHierarchy(C context, int[] aggregateIndex, C
 			Class<?> superclass = source.getSuperclass();
 			if (superclass != Object.class && superclass != null) {
 				R superclassResult = processClassHierarchy(context, aggregateIndex,
-					superclass, processor, includeInterfaces, includeEnclosing);
+					superclass, processor, includeInterfaces);
 				if (superclassResult != null) {
 					return superclassResult;
 				}
 			}
-			if (includeEnclosing) {
-				// Since merely attempting to load the enclosing class may result in
-				// automatic loading of sibling nested classes that in turn results
-				// in an exception such as NoClassDefFoundError, we wrap the following
-				// in its own dedicated try-catch block in order not to preemptively
-				// halt the annotation scanning process.
-				try {
-					Class<?> enclosingClass = source.getEnclosingClass();
-					if (enclosingClass != null) {
-						R enclosingResult = processClassHierarchy(context, aggregateIndex,
-							enclosingClass, processor, includeInterfaces, true);
-						if (enclosingResult != null) {
-							return enclosingResult;
-						}
-					}
-				}
-				catch (Throwable ex) {
-					AnnotationUtils.handleIntrospectionFailure(source, ex);
-				}
-			}
 		}
 		catch (Throwable ex) {
 			AnnotationUtils.handleIntrospectionFailure(source, ex);
@@ -238,8 +216,7 @@ private static <C, R> R processMethod(C context, Method source,
 			case DIRECT, INHERITED_ANNOTATIONS -> processMethodInheritedAnnotations(context, source, processor);
 			case SUPERCLASS -> processMethodHierarchy(context, new int[]{0}, source.getDeclaringClass(),
 					processor, source, false);
-			case TYPE_HIERARCHY, TYPE_HIERARCHY_AND_ENCLOSING_CLASSES -> processMethodHierarchy(context, new int[]{0},
-					source.getDeclaringClass(),
+			case TYPE_HIERARCHY -> processMethodHierarchy(context, new int[]{0}, source.getDeclaringClass(),
 					processor, source, true);
 		};
 	}
@@ -506,12 +483,8 @@ private static boolean isWithoutHierarchy(AnnotatedElement source, SearchStrateg
 		if (source == Object.class) {
 			return true;
 		}
-		if (source instanceof Class) {
-			Class<?> sourceClass = (Class<?>) source;
-			boolean noSuperTypes = (sourceClass.getSuperclass() == Object.class &&
-					sourceClass.getInterfaces().length == 0);
-			return (searchStrategy == SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES ? noSuperTypes &&
-					sourceClass.getEnclosingClass() == null : noSuperTypes);
+		if (source instanceof Class<?> sourceClass) {
+			return (sourceClass.getSuperclass() == Object.class && sourceClass.getInterfaces().length == 0);
 		}
 		if (source instanceof Method sourceMethod) {
 			return (Modifier.isPrivate(sourceMethod.getModifiers()) ||
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
index 28f7cf009a99..a488d29e8751 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/MergedAnnotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -472,20 +472,8 @@ enum SearchStrategy {
 		 * superclasses and implemented interfaces. Superclass annotations do
 		 * not need to be meta-annotated with {@link Inherited @Inherited}.
 		 */
-		TYPE_HIERARCHY,
+		TYPE_HIERARCHY
 
-		/**
-		 * Perform a full search of the entire type hierarchy on the source
-		 * <em>and</em> any enclosing classes. This strategy is similar to
-		 * {@link #TYPE_HIERARCHY} except that {@linkplain Class#getEnclosingClass()
-		 * enclosing classes} are also searched. Superclass annotations do not
-		 * need to be meta-annotated with {@link Inherited @Inherited}. When
-		 * searching a {@link Method} source, this strategy is identical to
-		 * {@link #TYPE_HIERARCHY}.
-		 * @deprecated as of Spring Framework 5.3.17; to be removed in Spring Framework 6.0
-		 */
-		@Deprecated
-		TYPE_HIERARCHY_AND_ENCLOSING_CLASSES
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
index e848090b1241..dbbb4f00ceb2 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
@@ -420,32 +420,6 @@ void typeHierarchyStrategyOnMethodWithGenericParameterNonOverrideScansAnnotation
 		assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY)).containsExactly("0:TestAnnotation1");
 	}
 
-	@Test
-	@SuppressWarnings("deprecation")
-	void typeHierarchyWithEnclosedStrategyOnEnclosedStaticClassScansAnnotations() {
-		Class<?> source = AnnotationEnclosingClassSample.EnclosedStatic.EnclosedStaticStatic.class;
-		assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES))
-				.containsExactly("0:EnclosedThree", "1:EnclosedTwo", "2:EnclosedOne");
-	}
-
-	@Test
-	@SuppressWarnings("deprecation")
-	void typeHierarchyWithEnclosedStrategyOnEnclosedInnerClassScansAnnotations() {
-		Class<?> source = AnnotationEnclosingClassSample.EnclosedInner.EnclosedInnerInner.class;
-		assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES))
-				.containsExactly("0:EnclosedThree", "1:EnclosedTwo", "2:EnclosedOne");
-	}
-
-	@Test
-	@SuppressWarnings("deprecation")
-	void typeHierarchyWithEnclosedStrategyOnMethodHierarchyUsesTypeHierarchyScan() {
-		Method source = methodFrom(WithHierarchy.class);
-		assertThat(scan(source, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES)).containsExactly(
-				"0:TestAnnotation1", "1:TestAnnotation5", "1:TestInheritedAnnotation5",
-				"2:TestAnnotation6", "3:TestAnnotation2", "3:TestInheritedAnnotation2",
-				"4:TestAnnotation3", "5:TestAnnotation4");
-	}
-
 	@Test
 	void scanWhenProcessorReturnsFromDoWithAggregateExitsEarly() {
 		String result = AnnotationsScanner.scan(this, WithSingleSuperclass.class,
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
index 53e82bf4a612..5c754da93e0a 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
@@ -710,22 +710,6 @@ void streamTypeHierarchyFromClassWithInterface() throws Exception {
 				Transactional.class)).hasSize(1);
 	}
 
-	@Test
-	@SuppressWarnings("deprecation")
-	void streamTypeHierarchyAndEnclosingClassesFromNonAnnotatedInnerClassWithAnnotatedEnclosingClass() {
-		Stream<Class<?>> classes = MergedAnnotations.from(AnnotatedClass.NonAnnotatedInnerClass.class,
-				SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES).stream().map(MergedAnnotation::getType);
-		assertThat(classes).containsExactly(Component.class, Indexed.class);
-	}
-
-	@Test
-	@SuppressWarnings("deprecation")
-	void streamTypeHierarchyAndEnclosingClassesFromNonAnnotatedStaticNestedClassWithAnnotatedEnclosingClass() {
-		Stream<Class<?>> classes = MergedAnnotations.from(AnnotatedClass.NonAnnotatedStaticNestedClass.class,
-				SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES).stream().map(MergedAnnotation::getType);
-		assertThat(classes).containsExactly(Component.class, Indexed.class);
-	}
-
 	@Test
 	void getFromMethodWithMethodAnnotationOnLeaf() throws Exception {
 		Method method = Leaf.class.getMethod("annotatedOnLeaf");

From e85001f332bc4627a094cd2b57973e8eea370c81 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 19 Feb 2022 17:32:15 +0100
Subject: [PATCH 730/735] Clean up warnings in test fixture

---
 .../aot/generator/visibility/PublicFactoryBean.java          | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java
index 9e9bf8d58f18..e4c2a69e7bfc 100644
--- a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java
+++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/aot/generator/visibility/PublicFactoryBean.java
@@ -20,10 +20,7 @@
 
 public class PublicFactoryBean<T> {
 
-	private final Class<T> type;
-
-	public PublicFactoryBean(Class<T> type) {
-		this.type = type;
+	PublicFactoryBean(Class<T> type) {
 	}
 
 	public static PublicFactoryBean<ProtectedType> protectedTypeFactoryBean() {

From b4eb895927e55ba92917cc7522dc93606d84f442 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 22 Feb 2022 16:07:52 +0100
Subject: [PATCH 731/735] Polish naming

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
---
 .../AutowiredAnnotationBeanPostProcessor.java    | 16 ++++++++--------
 ...ava => AotContributingBeanPostProcessor.java} | 14 +++++++-------
 ...or.java => BeanInstantiationContributor.java} | 11 +++++------
 ...va => DefaultBeanInstantiationGenerator.java} | 13 +++++++------
 ...tationBeanInstantiationContributorTests.java} | 14 +++++++-------
 ... DefaultBeanInstantiationGeneratorTests.java} | 14 +++++++-------
 6 files changed, 41 insertions(+), 41 deletions(-)
 rename spring-beans/src/main/java/org/springframework/beans/factory/generator/{BeanInstanceAotPostProcessor.java => AotContributingBeanPostProcessor.java} (70%)
 rename spring-beans/src/main/java/org/springframework/beans/factory/generator/{BeanInstanceContributor.java => BeanInstantiationContributor.java} (80%)
 rename spring-beans/src/main/java/org/springframework/beans/factory/generator/{DefaultBeanInstanceGenerator.java => DefaultBeanInstantiationGenerator.java} (92%)
 rename spring-beans/src/test/java/org/springframework/beans/factory/annotation/{AutowiredAnnotationBeanInstanceContributorTests.java => AutowiredAnnotationBeanInstantiationContributorTests.java} (92%)
 rename spring-beans/src/test/java/org/springframework/beans/factory/generator/{DefaultBeanInstanceGeneratorTests.java => DefaultBeanInstantiationGeneratorTests.java} (96%)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index dd644c9dd98a..b0156447762a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -56,8 +56,8 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import org.springframework.beans.factory.generator.BeanInstanceAotPostProcessor;
-import org.springframework.beans.factory.generator.BeanInstanceContributor;
+import org.springframework.beans.factory.generator.AotContributingBeanPostProcessor;
+import org.springframework.beans.factory.generator.BeanInstantiationContributor;
 import org.springframework.beans.factory.generator.InjectionGenerator;
 import org.springframework.beans.factory.support.LookupOverride;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
@@ -140,7 +140,7 @@
  * @see Value
  */
 public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationAwareBeanPostProcessor,
-		MergedBeanDefinitionPostProcessor, BeanInstanceAotPostProcessor, PriorityOrdered, BeanFactoryAware {
+		MergedBeanDefinitionPostProcessor, AotContributingBeanPostProcessor, PriorityOrdered, BeanFactoryAware {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
@@ -268,12 +268,12 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C
 	}
 
 	@Override
-	public BeanInstanceContributor buildAotContributor(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
+	public BeanInstantiationContributor buildAotContributor(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 		InjectionMetadata metadata = findInjectionMetadata(beanName, beanType, beanDefinition);
 		Collection<InjectedElement> injectedElements = metadata.getInjectedElements();
 		return (!ObjectUtils.isEmpty(injectedElements)
-				? new AutowiredAnnotationBeanInstanceContributor(injectedElements)
-				: BeanInstanceContributor.NO_OP);
+				? new AutowiredAnnotationBeanInstantiationContributor(injectedElements)
+				: BeanInstantiationContributor.NO_OP);
 	}
 
 	private InjectionMetadata findInjectionMetadata(String beanName, Class<?> beanType, RootBeanDefinition beanDefinition) {
@@ -821,13 +821,13 @@ private Object[] resolveMethodArguments(Method method, Object bean, @Nullable St
 		}
 	}
 
-	private static final class AutowiredAnnotationBeanInstanceContributor implements BeanInstanceContributor {
+	private static final class AutowiredAnnotationBeanInstantiationContributor implements BeanInstantiationContributor {
 
 		private final Collection<InjectedElement> injectedElements;
 
 		private final InjectionGenerator generator;
 
-		AutowiredAnnotationBeanInstanceContributor(Collection<InjectedElement> injectedElements) {
+		AutowiredAnnotationBeanInstantiationContributor(Collection<InjectedElement> injectedElements) {
 			this.injectedElements = injectedElements;
 			this.generator = new InjectionGenerator();
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceAotPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/AotContributingBeanPostProcessor.java
similarity index 70%
rename from spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceAotPostProcessor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/generator/AotContributingBeanPostProcessor.java
index af2e87620d42..b3197e04d8c0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceAotPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/AotContributingBeanPostProcessor.java
@@ -20,9 +20,9 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 
 /**
- * Strategy interface to be implemented by a {@link BeanPostProcessor} that
- * participates in a bean instance setup and can provide an equivalent setup
- * using generated code.
+ * Specialization of {@link BeanPostProcessor} that contributes to bean
+ * instantiation ahead of time, providing generated code that is equivalent to
+ * its runtime behavior.
  *
  * <p>Contrary to other bean post processors, implementations of this interface
  * are instantiated at build-time and should not rely on other beans in the
@@ -32,15 +32,15 @@
  * @since 6.0
  */
 @FunctionalInterface
-public interface BeanInstanceAotPostProcessor extends BeanPostProcessor {
+public interface AotContributingBeanPostProcessor extends BeanPostProcessor {
 
 	/**
-	 * Build a {@link BeanInstanceContributor} for the given bean definition.
+	 * Build a {@link BeanInstantiationContributor} for the given bean definition.
 	 * @param beanDefinition the merged bean definition for the bean
-	 * @param beanType the actual type of the managed bean instance
+	 * @param beanType the inferred type of the bean
 	 * @param beanName the name of the bean
 	 * @return the contributor to use
 	 */
-	BeanInstanceContributor buildAotContributor(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName);
+	BeanInstantiationContributor buildAotContributor(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName);
 
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceContributor.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstantiationContributor.java
similarity index 80%
rename from spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceContributor.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstantiationContributor.java
index 338334bbd257..83cd1ec698a0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstanceContributor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanInstantiationContributor.java
@@ -19,21 +19,20 @@
 import org.springframework.aot.generator.CodeContribution;
 
 /**
- * Strategy interface to be implemented by components that participates in a
- * bean instance setup so that the generated code provides an equivalent
- * setup.
+ * Contributor to the code that instantiates a bean following ahead of time
+ * processing.
  *
  * @author Stephane Nicoll
  * @since 6.0
  */
 @FunctionalInterface
-public interface BeanInstanceContributor {
+public interface BeanInstantiationContributor {
 
 	/**
-	 * A {@link BeanInstanceContributor} that does not contribute anything
+	 * A {@link BeanInstantiationContributor} that does not contribute anything
 	 * to the {@link CodeContribution}.
 	 */
-	BeanInstanceContributor NO_OP = contribution -> { };
+	BeanInstantiationContributor NO_OP = contribution -> { };
 
 	/**
 	 * Contribute to the specified {@link CodeContribution}.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstantiationGenerator.java
similarity index 92%
rename from spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
rename to spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstantiationGenerator.java
index b513aea16efa..fe40951b9743 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/generator/DefaultBeanInstantiationGenerator.java
@@ -36,19 +36,20 @@
  * Write the necessary statements to instantiate a bean.
  *
  * @author Stephane Nicoll
+ * @see BeanInstantiationContributor
  */
-class DefaultBeanInstanceGenerator {
+class DefaultBeanInstantiationGenerator {
 
 	private final Executable instanceCreator;
 
-	private final List<BeanInstanceContributor> contributors;
+	private final List<BeanInstantiationContributor> contributors;
 
 	private final InjectionGenerator injectionGenerator;
 
 	private final Options beanInstanceOptions;
 
 
-	DefaultBeanInstanceGenerator(Executable instanceCreator, List<BeanInstanceContributor> contributors) {
+	DefaultBeanInstantiationGenerator(Executable instanceCreator, List<BeanInstantiationContributor> contributors) {
 		this.instanceCreator = instanceCreator;
 		this.contributors = List.copyOf(contributors);
 		this.injectionGenerator = new InjectionGenerator();
@@ -62,7 +63,7 @@ class DefaultBeanInstanceGenerator {
 	 * @param runtimeHints the runtime hints instance to use
 	 * @return a code contribution that provides an initialized bean instance
 	 */
-	public CodeContribution generateBeanInstance(RuntimeHints runtimeHints) {
+	public CodeContribution generateBeanInstantiation(RuntimeHints runtimeHints) {
 		DefaultCodeContribution contribution = new DefaultCodeContribution(runtimeHints);
 		contribution.protectedAccess().analyze(this.instanceCreator, this.beanInstanceOptions);
 		if (this.instanceCreator instanceof Constructor<?> constructor) {
@@ -109,7 +110,7 @@ private void writeBeanInstantiation(CodeContribution contribution, Constructor<?
 		contribution.statements().addStatement(code.build());
 
 		if (multiStatements) {
-			for (BeanInstanceContributor contributor : this.contributors) {
+			for (BeanInstantiationContributor contributor : this.contributors) {
 				contributor.contribute(contribution);
 			}
 			contribution.statements().addStatement("return bean")
@@ -147,7 +148,7 @@ private void writeBeanInstantiation(CodeContribution contribution, Method method
 		code.add(this.injectionGenerator.writeInstantiation(method));
 		contribution.statements().addStatement(code.build());
 		if (multiStatements) {
-			for (BeanInstanceContributor contributor : this.contributors) {
+			for (BeanInstantiationContributor contributor : this.contributors) {
 				contributor.contribute(contribution);
 			}
 			contribution.statements().addStatement("return bean")
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstantiationContributorTests.java
similarity index 92%
rename from spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstantiationContributorTests.java
index f0d1b7aa591e..a85b5cdd3749 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstanceContributorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanInstantiationContributorTests.java
@@ -24,7 +24,7 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessorTests.ResourceInjectionBean;
-import org.springframework.beans.factory.generator.BeanInstanceContributor;
+import org.springframework.beans.factory.generator.BeanInstantiationContributor;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.env.Environment;
@@ -37,7 +37,7 @@
  *
  * @author Stephane Nicoll
  */
-class AutowiredAnnotationBeanInstanceContributorTests {
+class AutowiredAnnotationBeanInstantiationContributorTests {
 
 	@Test
 	void buildAotContributorWithPackageProtectedFieldInjection() {
@@ -63,7 +63,7 @@ void buildAotContributorWithPrivateFieldInjection() {
 		assertThat(CodeSnippet.process(contribution.statements().toCodeBlock())).isEqualTo("""
 				instanceContext.field("environment", Environment.class)
 						.invoke(beanFactory, (attributes) -> {
-							Field environmentField = ReflectionUtils.findField(AutowiredAnnotationBeanInstanceContributorTests.PrivateFieldInjectionSample.class, "environment", Environment.class);
+							Field environmentField = ReflectionUtils.findField(AutowiredAnnotationBeanInstantiationContributorTests.PrivateFieldInjectionSample.class, "environment", Environment.class);
 							ReflectionUtils.makeAccessible(environmentField);
 							ReflectionUtils.setField(environmentField, bean, attributes.get(0));
 						})""");
@@ -117,19 +117,19 @@ void buildAotContributorWithInjectionPoints() {
 
 	@Test
 	void buildAotContributorWithoutInjectionPoints() {
-		BeanInstanceContributor contributor = createAotContributor(String.class);
-		assertThat(contributor).isNotNull().isSameAs(BeanInstanceContributor.NO_OP);
+		BeanInstantiationContributor contributor = createAotContributor(String.class);
+		assertThat(contributor).isNotNull().isSameAs(BeanInstantiationContributor.NO_OP);
 	}
 
 	private DefaultCodeContribution contribute(Class<?> type) {
-		BeanInstanceContributor contributor = createAotContributor(type);
+		BeanInstantiationContributor contributor = createAotContributor(type);
 		assertThat(contributor).isNotNull();
 		DefaultCodeContribution contribution = new DefaultCodeContribution(new RuntimeHints());
 		contributor.contribute(contribution);
 		return contribution;
 	}
 
-	private BeanInstanceContributor createAotContributor(Class<?> type) {
+	private BeanInstantiationContributor createAotContributor(Class<?> type) {
 		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
 		RootBeanDefinition beanDefinition = new RootBeanDefinition(type);
 		return bpp.buildAotContributor(beanDefinition, type, "test");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstantiationGeneratorTests.java
similarity index 96%
rename from spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstantiationGeneratorTests.java
index d780d868145c..29f5d49995e5 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstanceGeneratorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/generator/DefaultBeanInstantiationGeneratorTests.java
@@ -48,11 +48,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link DefaultBeanInstanceGenerator}.
+ * Tests for {@link DefaultBeanInstantiationGenerator}.
  *
  * @author Stephane Nicoll
  */
-class DefaultBeanInstanceGeneratorTests {
+class DefaultBeanInstantiationGeneratorTests {
 
 	@Test
 	void generateUsingDefaultConstructorUsesMethodReference() {
@@ -109,7 +109,7 @@ void generateUsingConstructorOfTypeWithGeneric() {
 	void generateUsingNoArgConstructorAndContributorsDoesNotUseMethodReference() {
 		CodeContribution contribution = generate(SimpleConfiguration.class.getDeclaredConstructors()[0],
 				contrib -> contrib.statements().add(CodeBlock.of("// hello\n")),
-				BeanInstanceContributor.NO_OP);
+				BeanInstantiationContributor.NO_OP);
 		assertThat(code(contribution)).isEqualTo("""
 				(instanceContext) -> {
 					SimpleConfiguration bean = new SimpleConfiguration();
@@ -240,10 +240,10 @@ private Consumer<ExecutableHint> match(Executable executable, String name, Execu
 	}
 
 	private CodeContribution generate(Executable executable,
-			BeanInstanceContributor... beanInstanceContributors) {
-		DefaultBeanInstanceGenerator generator = new DefaultBeanInstanceGenerator(executable,
-				Arrays.asList(beanInstanceContributors));
-		return generator.generateBeanInstance(new RuntimeHints());
+			BeanInstantiationContributor... beanInstantiationContributors) {
+		DefaultBeanInstantiationGenerator generator = new DefaultBeanInstantiationGenerator(executable,
+				Arrays.asList(beanInstantiationContributors));
+		return generator.generateBeanInstantiation(new RuntimeHints());
 	}
 
 	private static Method method(Class<?> type, String methodName, Class<?>... parameterTypes) {

From a28b49ac27738b8b9c62fa220d81485b3c840d16 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Wed, 23 Feb 2022 20:52:36 +0900
Subject: [PATCH 732/735] Fix library name for JavaPoet in
 src/docs/dist/license.txt

This commit also updates Objenesis version in the file to align with the
version that Spring Framework is using.

See gh-28100
---
 src/docs/dist/license.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/docs/dist/license.txt b/src/docs/dist/license.txt
index 2170aa9784a1..89cf3d232fa7 100644
--- a/src/docs/dist/license.txt
+++ b/src/docs/dist/license.txt
@@ -257,16 +257,16 @@ is included above.
 
 >>> JavaPoet 1.13.0 (com.squareup:javapoet:1.13.0):
 
-Per the LICENSE file in the CGLIB JAR distribution downloaded from
+Per the LICENSE file in the JavaPoet JAR distribution downloaded from
 https://github.com/square/javapoet/archive/refs/tags/javapoet-1.13.0.zip,
 JavaPoet 1.13.0 is licensed under the Apache License, version 2.0, the text of
 which is included above.
 
 
->>> Objenesis 3.1 (org.objenesis:objenesis:3.1):
+>>> Objenesis 3.2 (org.objenesis:objenesis:3.2):
 
 Per the LICENSE file in the Objenesis ZIP distribution downloaded from
-http://objenesis.org/download.html, Objenesis 3.1 is licensed under the
+http://objenesis.org/download.html, Objenesis 3.2 is licensed under the
 Apache License, version 2.0, the text of which is included above.
 
 Per the NOTICE file in the Objenesis ZIP distribution downloaded from

From 453c6d41f71acc54bb3928f9c7b9787d29e84a43 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 24 Feb 2022 10:54:52 +0100
Subject: [PATCH 733/735] Fix Objenesis version

See gh-28100
---
 src/docs/dist/license.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docs/dist/license.txt b/src/docs/dist/license.txt
index c68e1154b170..0eb8edb06324 100644
--- a/src/docs/dist/license.txt
+++ b/src/docs/dist/license.txt
@@ -255,10 +255,10 @@ CGLIB 3.3 is licensed under the Apache License, version 2.0, the text of which
 is included above.
 
 
->>> Objenesis 3.1 (org.objenesis:objenesis:3.1):
+>>> Objenesis 3.2 (org.objenesis:objenesis:3.2):
 
 Per the LICENSE file in the Objenesis ZIP distribution downloaded from
-http://objenesis.org/download.html, Objenesis 3.1 is licensed under the
+http://objenesis.org/download.html, Objenesis 3.2 is licensed under the
 Apache License, version 2.0, the text of which is included above.
 
 Per the NOTICE file in the Objenesis ZIP distribution downloaded from

From 7e2106b850ea65866dc97d24d108c7fe1ea64c8c Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <poutsmaa@vmware.com>
Date: Thu, 24 Feb 2022 14:46:26 +0100
Subject: [PATCH 734/735] Refactor roll forward in CronField

Before this commit, CronField.Type::rollForward added temporal units
to reach the higher order field. This caused issues with DST, where
the added amount of hours was either too small or too large.

This commit refactors the implementation so that it now adds one to the
higher order field, and reset the current field to the minimum value.

Closes gh-28095
---
 .../scheduling/support/CronField.java         | 34 ++++++++-----------
 .../support/CronExpressionTests.java          |  8 +++++
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
index adc2c2ffe5d6..f794645d654f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronField.java
@@ -18,6 +18,7 @@
 
 import java.time.DateTimeException;
 import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
 import java.time.temporal.ValueRange;
 import java.util.function.BiFunction;
@@ -168,22 +169,25 @@ protected static <T extends Temporal & Comparable<? super T>> T cast(Temporal te
 	 * day-of-month, month, day-of-week.
 	 */
 	protected enum Type {
-		NANO(ChronoField.NANO_OF_SECOND),
-		SECOND(ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
-		MINUTE(ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
-		HOUR(ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
-		DAY_OF_MONTH(ChronoField.DAY_OF_MONTH, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
-		MONTH(ChronoField.MONTH_OF_YEAR, ChronoField.DAY_OF_MONTH, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
-		DAY_OF_WEEK(ChronoField.DAY_OF_WEEK, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND);
+		NANO(ChronoField.NANO_OF_SECOND, ChronoUnit.SECONDS),
+		SECOND(ChronoField.SECOND_OF_MINUTE, ChronoUnit.MINUTES, ChronoField.NANO_OF_SECOND),
+		MINUTE(ChronoField.MINUTE_OF_HOUR, ChronoUnit.HOURS, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
+		HOUR(ChronoField.HOUR_OF_DAY, ChronoUnit.DAYS, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
+		DAY_OF_MONTH(ChronoField.DAY_OF_MONTH, ChronoUnit.MONTHS, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
+		MONTH(ChronoField.MONTH_OF_YEAR, ChronoUnit.YEARS, ChronoField.DAY_OF_MONTH, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
+		DAY_OF_WEEK(ChronoField.DAY_OF_WEEK, ChronoUnit.WEEKS, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND);
 
 
 		private final ChronoField field;
 
+		private final ChronoUnit higherOrder;
+
 		private final ChronoField[] lowerOrders;
 
 
-		Type(ChronoField field, ChronoField... lowerOrders) {
+		Type(ChronoField field, ChronoUnit higherOrder, ChronoField... lowerOrders) {
 			this.field = field;
+			this.higherOrder = higherOrder;
 			this.lowerOrders = lowerOrders;
 		}
 
@@ -266,17 +270,9 @@ public <T extends Temporal & Comparable<? super T>> T elapseUntil(T temporal, in
 		 * @return the rolled forward temporal
 		 */
 		public <T extends Temporal & Comparable<? super T>> T rollForward(T temporal) {
-			int current = get(temporal);
-			ValueRange range = temporal.range(this.field);
-			long amount = range.getMaximum() - current + 1;
-			T result = this.field.getBaseUnit().addTo(temporal, amount);
-			current = get(result);
-			range = result.range(this.field);
-			// adjust for daylight savings
-			if (current != range.getMinimum()) {
-				result = this.field.adjustInto(result, range.getMinimum());
-			}
-			return result;
+			T result = this.higherOrder.addTo(temporal, 1);
+			ValueRange range = result.range(this.field);
+			return this.field.adjustInto(result, range.getMinimum());
 		}
 
 		/**
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
index 5de5362fc1dd..5dd837e0379f 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java
@@ -1344,6 +1344,14 @@ public void daylightSaving() {
 		actual = cronExpression.next(last);
 		assertThat(actual).isNotNull();
 		assertThat(actual).isEqualTo(expected);
+
+		cronExpression = CronExpression.parse("0 5 0 * * *");
+
+		last = ZonedDateTime.parse("2019-10-27T01:05+02:00[Europe/Amsterdam]");
+		expected = ZonedDateTime.parse("2019-10-28T00:05+01:00[Europe/Amsterdam]");
+		actual = cronExpression.next(last);
+		assertThat(actual).isNotNull();
+		assertThat(actual).isEqualTo(expected);
 	}
 
 	@Test

From 91426e6cc40a907fb807b6f9aec2981a7ca16dca Mon Sep 17 00:00:00 2001
From: chenrl <raymond2366@outlook.com>
Date: Sun, 21 Mar 2021 16:46:15 +0800
Subject: [PATCH 735/735] check file with realPath is existing

---
 .../web/context/support/ServletContextResource.java    |  9 +++++++--
 .../web/context/support/ResourceTests.java             | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
index bf498cda8587..8cae262fc2ef 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
@@ -139,10 +139,15 @@ public boolean isFile() {
 				return true;
 			}
 			else {
-				return (this.servletContext.getRealPath(this.path) != null);
+				String realPath = this.servletContext.getRealPath(this.path);
+				if (realPath == null) {
+					return false;
+				}
+				File file = new File(realPath);
+				return (file.exists() && file.isFile());
 			}
 		}
-		catch (MalformedURLException ex) {
+		catch (IOException ex) {
 			return false;
 		}
 	}
diff --git a/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java b/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
index 340838871814..937885e107f7 100644
--- a/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/support/ResourceTests.java
@@ -36,6 +36,8 @@ public void testServletContextResource() throws IOException {
 		MockServletContext sc = new MockServletContext();
 		Resource resource = new ServletContextResource(sc, "org/springframework/core/io/Resource.class");
 		doTestResource(resource);
+		Resource resourceNotExists = new ServletContextResource(sc, "org/springframework/core/io/ResourceNotExists.class");
+		doTestNotExistsResource(resourceNotExists);
 		assertThat(new ServletContextResource(sc, "org/springframework/core/../core/io/./Resource.class")).isEqualTo(resource);
 	}
 
@@ -48,6 +50,9 @@ public void testServletContextResourceWithRelativePath() throws IOException {
 	}
 
 	private void doTestResource(Resource resource) throws IOException {
+		assertThat(resource.getFile()).isNotNull();
+		assertThat(resource.exists()).isTrue();
+		assertThat(resource.isFile()).isTrue();
 		assertThat(resource.getFilename()).isEqualTo("Resource.class");
 		assertThat(resource.getURL().getFile().endsWith("Resource.class")).isTrue();
 
@@ -61,4 +66,9 @@ private void doTestResource(Resource resource) throws IOException {
 		assertThat(relative2.getURL().getFile().endsWith("ResourcePatternResolver.class")).isTrue();
 		assertThat(relative2.exists()).isTrue();
 	}
+
+	private void doTestNotExistsResource(Resource resource) throws IOException {
+		assertThat(resource.exists()).isFalse();
+		assertThat(resource.isFile()).isFalse();
+	}
 }